[v3,1/6] net/rte_ether: deinline non-critical functions
Checks
Commit Message
Formatting ethernet address and getting a random value are
not in critical path so they should not be inlined.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Rami Rosen <ramirose@gmail.com>
---
lib/librte_net/Makefile | 1 +
lib/librte_net/rte_ether.c | 29 +++++++++++++++++++++++++++++
lib/librte_net/rte_ether.h | 25 ++++---------------------
lib/librte_net/rte_net_version.map | 7 +++++++
4 files changed, 41 insertions(+), 21 deletions(-)
create mode 100644 lib/librte_net/rte_ether.c
Comments
On 6/5/19 4:08 AM, Stephen Hemminger wrote:
> Formatting ethernet address and getting a random value are
> not in critical path so they should not be inlined.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> Acked-by: Rami Rosen <ramirose@gmail.com>
Meson build is lost plus one nit below.
Other than that:
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
[...]
> diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map
> index 26c06e7c7ae7..dae6e420cded 100644
> --- a/lib/librte_net/rte_net_version.map
> +++ b/lib/librte_net/rte_net_version.map
> @@ -13,6 +13,13 @@ DPDK_17.05 {
>
> } DPDK_16.11;
>
> +DPDK_19.08 {
> + global:
> +
> + eth_random_addr;
> + eth_format_addr;
rte_ prefix is lost
> +} DPDK_17.05;
> +
> EXPERIMENTAL {
> global:
>
On Wed, 5 Jun 2019 11:44:42 +0300
Andrew Rybchenko <arybchenko@solarflare.com> wrote:
> On 6/5/19 4:08 AM, Stephen Hemminger wrote:
> > Formatting ethernet address and getting a random value are
> > not in critical path so they should not be inlined.
> >
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> > Acked-by: Rami Rosen <ramirose@gmail.com>
>
> Meson build is lost plus one nit below.
> Other than that:
>
> Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
>
> [...]
>
> > diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map
> > index 26c06e7c7ae7..dae6e420cded 100644
> > --- a/lib/librte_net/rte_net_version.map
> > +++ b/lib/librte_net/rte_net_version.map
> > @@ -13,6 +13,13 @@ DPDK_17.05 {
> >
> > } DPDK_16.11;
> >
> > +DPDK_19.08 {
> > + global:
> > +
> > + eth_random_addr;
> > + eth_format_addr;
>
> rte_ prefix is lost
>
> > +} DPDK_17.05;
> > +
> > EXPERIMENTAL {
> > global:
> >
>
Fixing those now for v4
@@ -14,6 +14,7 @@ LIBABIVER := 1
SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c
SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c
+SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_ether.c
SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c
# install includes
new file mode 100644
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include <rte_ether.h>
+
+void
+rte_eth_random_addr(uint8_t *addr)
+{
+ uint64_t rand = rte_rand();
+ uint8_t *p = (uint8_t *)&rand;
+
+ rte_memcpy(addr, p, RTE_ETHER_ADDR_LEN);
+ addr[0] &= (uint8_t)~RTE_ETHER_GROUP_ADDR; /* clear multicast bit */
+ addr[0] |= RTE_ETHER_LOCAL_ADMIN_ADDR; /* set local assignment bit */
+}
+
+void
+rte_ether_format_addr(char *buf, uint16_t size,
+ const struct rte_ether_addr *eth_addr)
+{
+ snprintf(buf, size, "%02X:%02X:%02X:%02X:%02X:%02X",
+ eth_addr->addr_bytes[0],
+ eth_addr->addr_bytes[1],
+ eth_addr->addr_bytes[2],
+ eth_addr->addr_bytes[3],
+ eth_addr->addr_bytes[4],
+ eth_addr->addr_bytes[5]);
+}
@@ -207,15 +207,8 @@ static inline int rte_is_valid_assigned_ether_addr(const struct rte_ether_addr *
* @param addr
* A pointer to Ethernet address.
*/
-static inline void rte_eth_random_addr(uint8_t *addr)
-{
- uint64_t rand = rte_rand();
- uint8_t *p = (uint8_t *)&rand;
-
- rte_memcpy(addr, p, RTE_ETHER_ADDR_LEN);
- addr[0] &= (uint8_t)~RTE_ETHER_GROUP_ADDR; /* clear multicast bit */
- addr[0] |= RTE_ETHER_LOCAL_ADMIN_ADDR; /* set local assignment bit */
-}
+void
+rte_eth_random_addr(uint8_t *addr);
/**
* Fast copy an Ethernet address.
@@ -254,19 +247,9 @@ static inline void rte_ether_addr_copy(const struct rte_ether_addr *ea_from,
* @param eth_addr
* A pointer to a ether_addr structure.
*/
-static inline void
+void
rte_ether_format_addr(char *buf, uint16_t size,
- const struct rte_ether_addr *eth_addr)
-{
- snprintf(buf, size, "%02X:%02X:%02X:%02X:%02X:%02X",
- eth_addr->addr_bytes[0],
- eth_addr->addr_bytes[1],
- eth_addr->addr_bytes[2],
- eth_addr->addr_bytes[3],
- eth_addr->addr_bytes[4],
- eth_addr->addr_bytes[5]);
-}
-
+ const struct rte_ether_addr *eth_addr);
/**
* Ethernet header: Contains the destination address, source address
* and frame type.
@@ -13,6 +13,13 @@ DPDK_17.05 {
} DPDK_16.11;
+DPDK_19.08 {
+ global:
+
+ eth_random_addr;
+ eth_format_addr;
+} DPDK_17.05;
+
EXPERIMENTAL {
global: