Optimize RISC-V copyin(9)/copyout(9) routines

[mhorne063_gmail.com]

Summary

The existing copyin(9) and copyout(9) routines on RISC-V perform only a
simple byte-by-byte copy. Improve their performance by performing
word-sized copies where possible.

Overall approach: For best performance, all load's and stores must occur
on their native boundary, i.e. a 64-bit load must occur on a 64-bit
aligned address. Misaligned loads and stores are possible, but they
require trapping into the SBI, which introduces an even bigger overhead.
Therefore, we will perform word-sized loads and stores only where
possible.

For cases where the source and destination addresses are not aligned to
each other, we have no choice but to do a byte-by- byte copy for the
entire thing. So long as this is not the case, then we can perform word
copy for some or all of the buffer. In some cases this will require byte
copy at the beginning or end to account for addresses that are not
initially word-aligned or any remainder due to buffer length.

Test Plan

Boots successfully to the login prompt.

I will perform a few simple tests to get some numbers on the performance improvement.

I could also try running the copyin tests, but I'm not sure if I'm set up to do that yet.

[markj]

sys/riscv/include/riscvreg.h

159

XLEN is defined to be the width of the CPU's general purpose registers - what's the reason for adding a new constant?

[mhorne063_gmail.com]

sys/riscv/include/riscvreg.h

159

Whoops, I had a comment about this but didn't submit it.

The spec uses XLEN to refer to the GPR width in bits. In my opinion, defining it here in bytes is a miss-use of the name.
A quick grep shows that it isn't referenced by any existing code, so rather than using it in mine I added the new constant.

Perhaps we could adjust it to XLEN = 64, and rename REG_SIZE to XLEN_BYTES? Having a proper XLEN in bits would be useful for eventually making some existing constants width-agnostic.

[markj]

sys/riscv/include/riscvreg.h

159

Ahh, I see. Indeed, we don't use XLEN, but there is the compiler-provided __riscv_xlen which has a couple of usages.

I like the suggestion of fixing XLEN's value (probably just define XLEN to be __riscv_xlen?) and introducing XLEN_BYTES.

[mhorne063_gmail.com]

Adjust XLEN constant names and values.

[markj]

You can add your copyright to this file if you feel so inclined.

[mhorne063_gmail.com]

In D18851#403510, @markj wrote:

You can add your copyright to this file if you feel so inclined.

Sure, might as well :)

sys/riscv/include/riscvreg.h

 STATIC int sysctl_set_queue_rxthtime(SYSCTL_HANDLER_ARGS);
 STATIC void sysctl_mvneta_init(struct mvneta_softc *);
 
 /* MIB */
 STATIC void mvneta_clear_mib(struct mvneta_softc *);
 STATIC void mvneta_update_mib(struct mvneta_softc *);
 
 /* Switch */
+STATIC boolean_t mvneta_find_ethernet_prop_switch(phandle_t, phandle_t);
 STATIC boolean_t mvneta_has_switch(device_t);
 
 #define mvneta_sc_lock(sc) mtx_lock(&sc->mtx)
 #define mvneta_sc_unlock(sc) mtx_unlock(&sc->mtx)
 
 STATIC struct mtx mii_mutex;
 STATIC int mii_init = 0;
 
 /* Device */
 STATIC int mvneta_detach(device_t);
 /* MII */
#endif
         addr[2] = (mac_h & 0x0000ff00) >> 8;
         addr[3] = (mac_h & 0x000000ff);
         addr[4] = (mac_l & 0x0000ff00) >> 8;
         addr[5] = (mac_l & 0x000000ff);
         return (0);
 }
 
 STATIC boolean_t
-mvneta_has_switch(device_t self)
+mvneta_find_ethernet_prop_switch(phandle_t ethernet, phandle_t node)
 {
-        phandle_t node, switch_node, switch_eth, switch_eth_handle;
+        boolean_t ret;
+        phandle_t child, switch_eth_handle, switch_eth;
 
-        node = ofw_bus_get_node(self);
-        switch_node =
-            ofw_bus_find_compatible(OF_finddevice("/"), "marvell,dsa");
-        switch_eth = 0;
+        for (child = OF_child(node); child != 0; child = OF_peer(child)) {
+                if (OF_getencprop(child, "ethernet", (void*)&switch_eth_handle,
+                    sizeof(switch_eth_handle)) > 0) {
+                        if (switch_eth_handle > 0) {
+                                switch_eth = OF_node_from_xref(
+                                    switch_eth_handle);
 
-        OF_getencprop(switch_node, "dsa,ethernet",
-            (void*)&switch_eth_handle, sizeof(switch_eth_handle));
+                                if (switch_eth == ethernet)
+                                        return (true);
+                        }
+                }
 
-        if (switch_eth_handle > 0)
-                switch_eth = OF_node_from_xref(switch_eth_handle);
+                ret = mvneta_find_ethernet_prop_switch(ethernet, child);
+                if (ret != 0)
+                        return (ret);
+        }
 
-        /* Return true if dsa,ethernet cell points to us */
-        return (node == switch_eth);
+        return (false);
 }
 
+STATIC boolean_t
+mvneta_has_switch(device_t self)
+{
+        phandle_t node;
+
+        node = ofw_bus_get_node(self);
+        return mvneta_find_ethernet_prop_switch(node, OF_finddevice("/"));
+}
+
 STATIC int
 mvneta_dma_create(struct mvneta_softc *sc)
 {
         size_t maxsize, maxsegsz;
         size_t q;
         int error;
 
         /*
if ((sc->phy_addr != MII_PHY_ANY) && (!sc->use_inband_status)) {
                 else
                         ifm_target |= IFM_HDX;
 
                 ifmedia_add(&sc->mvneta_ifmedia, ifm_target, 0, NULL);
                 ifmedia_set(&sc->mvneta_ifmedia, ifm_target);
                 if_link_state_change(sc->ifp, LINK_STATE_UP);
 
                 if (mvneta_has_switch(self)) {
+                        if (bootverbose)
+                                device_printf(self, "This device is attached to a switch\n");
                         child = device_add_child(sc->dev, "mdio", -1);
                         if (child == NULL) {
                                 ether_ifdetach(sc->ifp);
                                 mvneta_detach(self);
                                 return (ENXIO);
                         }
                         bus_generic_attach(sc->dev);
                         bus_generic_attach(child);
+                } else if (bootverbose) {
+                        device_printf(self, "This device is not attached to a switch\n");
                 }
 
                 /* Configure MAC media */
                 mvneta_update_media(sc, ifm_target);
         }
 
         sysctl_mvneta_init(sc);
 

sys/riscv/riscv/copyinout.S

 STATIC int sysctl_set_queue_rxthtime(SYSCTL_HANDLER_ARGS);
 STATIC void sysctl_mvneta_init(struct mvneta_softc *);
 
 /* MIB */
 STATIC void mvneta_clear_mib(struct mvneta_softc *);
 STATIC void mvneta_update_mib(struct mvneta_softc *);
 
 /* Switch */
+STATIC boolean_t mvneta_find_ethernet_prop_switch(phandle_t, phandle_t);
 STATIC boolean_t mvneta_has_switch(device_t);
 
 #define mvneta_sc_lock(sc) mtx_lock(&sc->mtx)
 #define mvneta_sc_unlock(sc) mtx_unlock(&sc->mtx)
 
 STATIC struct mtx mii_mutex;
 STATIC int mii_init = 0;
 
 /* Device */
 STATIC int mvneta_detach(device_t);
 /* MII */
#endif
         addr[2] = (mac_h & 0x0000ff00) >> 8;
         addr[3] = (mac_h & 0x000000ff);
         addr[4] = (mac_l & 0x0000ff00) >> 8;
         addr[5] = (mac_l & 0x000000ff);
         return (0);
 }
 
 STATIC boolean_t
-mvneta_has_switch(device_t self)
+mvneta_find_ethernet_prop_switch(phandle_t ethernet, phandle_t node)
 {
-        phandle_t node, switch_node, switch_eth, switch_eth_handle;
+        boolean_t ret;
+        phandle_t child, switch_eth_handle, switch_eth;
 
-        node = ofw_bus_get_node(self);
-        switch_node =
-            ofw_bus_find_compatible(OF_finddevice("/"), "marvell,dsa");
-        switch_eth = 0;
+        for (child = OF_child(node); child != 0; child = OF_peer(child)) {
+                if (OF_getencprop(child, "ethernet", (void*)&switch_eth_handle,
+                    sizeof(switch_eth_handle)) > 0) {
+                        if (switch_eth_handle > 0) {
+                                switch_eth = OF_node_from_xref(
+                                    switch_eth_handle);
 
-        OF_getencprop(switch_node, "dsa,ethernet",
-            (void*)&switch_eth_handle, sizeof(switch_eth_handle));
+                                if (switch_eth == ethernet)
+                                        return (true);
+                        }
+                }
 
-        if (switch_eth_handle > 0)
-                switch_eth = OF_node_from_xref(switch_eth_handle);
+                ret = mvneta_find_ethernet_prop_switch(ethernet, child);
+                if (ret != 0)
+                        return (ret);
+        }
 
-        /* Return true if dsa,ethernet cell points to us */
-        return (node == switch_eth);
+        return (false);
 }
 
+STATIC boolean_t
+mvneta_has_switch(device_t self)
+{
+        phandle_t node;
+
+        node = ofw_bus_get_node(self);
+        return mvneta_find_ethernet_prop_switch(node, OF_finddevice("/"));
+}
+
 STATIC int
 mvneta_dma_create(struct mvneta_softc *sc)
 {
         size_t maxsize, maxsegsz;
         size_t q;
         int error;
 
         /*
if ((sc->phy_addr != MII_PHY_ANY) && (!sc->use_inband_status)) {
                 else
                         ifm_target |= IFM_HDX;
 
                 ifmedia_add(&sc->mvneta_ifmedia, ifm_target, 0, NULL);
                 ifmedia_set(&sc->mvneta_ifmedia, ifm_target);
                 if_link_state_change(sc->ifp, LINK_STATE_UP);
 
                 if (mvneta_has_switch(self)) {
+                        if (bootverbose)
+                                device_printf(self, "This device is attached to a switch\n");
                         child = device_add_child(sc->dev, "mdio", -1);
                         if (child == NULL) {
                                 ether_ifdetach(sc->ifp);
                                 mvneta_detach(self);
                                 return (ENXIO);
                         }
                         bus_generic_attach(sc->dev);
                         bus_generic_attach(child);
+                } else if (bootverbose) {
+                        device_printf(self, "This device is not attached to a switch\n");
                 }
 
                 /* Configure MAC media */
                 mvneta_update_media(sc, ifm_target);
         }
 
         sysctl_mvneta_init(sc);