d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: deinline non-critical ethernet functions

Browse Source 
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>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
This commit is contained in:
Stephen Hemminger 2019-07-05 10:16:16 -07:00 committed by Ferruh Yigit
parent 3e912e39d1
commit 3bdd09ae07
8 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/axgbe/Makefile
View File

@ -17,7 +17,7 @@ LIBABIVER := 1
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
LDLIBS += -lrte_pci -lrte_bus_pci
LDLIBS += -lrte_ethdev
LDLIBS += -lrte_ethdev -lrte_net
#
# all source are stored in SRCS-y

2
drivers/net/memif/Makefile
View File

@ -21,7 +21,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API
# - rte_mp_reply
# - rte_mp_request_sync
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
LDLIBS += -lrte_ethdev -lrte_kvargs
LDLIBS += -lrte_ethdev -lrte_kvargs -lrte_net
LDLIBS += -lrte_hash
LDLIBS += -lrte_bus_vdev

2
drivers/net/octeontx2/Makefile
View File

@ -54,7 +54,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_ethdev_debug.c \
otx2_ethdev_devargs.c
LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal
LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal -lrte_net
LDLIBS += -lrte_ethdev -lrte_bus_pci -lrte_kvargs -lrte_mbuf -lrte_mempool -lm
include $(RTE_SDK)/mk/rte.lib.mk

1
lib/librte_net/Makefile
View File

@ -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

2
lib/librte_net/meson.build
View File

@ -16,5 +16,5 @@ headers = files('rte_ip.h',
'rte_net_crc.h',
'rte_mpls.h')
sources = files('rte_arp.c', 'rte_net.c', 'rte_net_crc.c')
sources = files('rte_arp.c', 'rte_ether.c', 'rte_net.c', 'rte_net_crc.c')
deps += ['mbuf']

29
lib/librte_net/rte_ether.c Normal file
View File

@ -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]);
}

25
lib/librte_net/rte_ether.h
View File

@ -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.

8
lib/librte_net/rte_net_version.map
View File

@ -13,6 +13,14 @@ DPDK_17.05 {
} DPDK_16.11;
DPDK_19.08 {
global:
rte_eth_random_addr;
rte_ether_format_addr;
} DPDK_17.05;
EXPERIMENTAL {
global: