From: Stephen Hemminger <step...@networkplumber.org> Many drivers are all doing copy/paste of the same code to atomically update the link status. Reduce duplication, and allow for future changes by having common function for this.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org> --- lib/librte_ether/rte_ethdev.c | 36 +++++++++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 28 +++++++++++++++++++++++++ lib/librte_ether/rte_ethdev_version.map | 8 ++++++++ 3 files changed, 72 insertions(+) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index b3495992d..4d67248e5 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1500,6 +1500,42 @@ rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *eth_link) } } +int +_rte_eth_linkstatus_set(struct rte_eth_dev *dev, + const struct rte_eth_link *new_link) +{ + volatile uint64_t *dev_link + = (volatile uint64_t *)&(dev->data->dev_link); + union { + uint64_t val64; + struct rte_eth_link link; + } orig; + + RTE_BUILD_BUG_ON(sizeof(*new_link) != sizeof(uint64_t)); + + orig.val64 = rte_atomic64_exchange(dev_link, + *(const uint64_t *)new_link); + + return (orig.link.link_status == new_link->link_status) ? -1 : 0; +} + +void +_rte_eth_linkstatus_get(const struct rte_eth_dev *dev, + struct rte_eth_link *link) +{ + volatile uint64_t *src = (uint64_t *)&(dev->data->dev_link); + uint64_t tmp; + + RTE_BUILD_BUG_ON(sizeof(*link) != sizeof(uint64_t)); + + /* can't use rte_atomic64_read because it returns signed int */ + do { + tmp = *src; + } while (!rte_atomic64_cmpset(src, tmp, tmp)); + + memcpy(link, &tmp, sizeof(tmp)); +} + int rte_eth_stats_get(uint16_t port_id, struct rte_eth_stats *stats) { diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index f0eeefe6a..ffeac5aeb 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -2220,6 +2220,34 @@ int rte_eth_dev_set_link_down(uint16_t port_id); */ void rte_eth_dev_close(uint16_t port_id); + +/** + * @internal + * Atomically set the link status for the specific device. + * It is for use by DPDK device driver use only. + * User applications should not call it + * + * @param dev + * Pointer to struct rte_eth_dev. + * @param link + * New link status value. + * @return + * 0 if link state has changed, -1 if the same. + */ +int _rte_eth_linkstatus_set(struct rte_eth_dev *dev, + const struct rte_eth_link *link); + +/** + * @internal + * Atomically get the link speed and status. + * @param dev + * Pointer to struct rte_eth_dev. + * @param link + * link status value. + */ +void _rte_eth_linkstatus_get(const struct rte_eth_dev *dev, + struct rte_eth_link *link); + /** * Reset a Ethernet device and keep its port id. * diff --git a/lib/librte_ether/rte_ethdev_version.map b/lib/librte_ether/rte_ethdev_version.map index e9681ac8e..5ff629cb9 100644 --- a/lib/librte_ether/rte_ethdev_version.map +++ b/lib/librte_ether/rte_ethdev_version.map @@ -198,6 +198,14 @@ DPDK_17.11 { } DPDK_17.08; +DPDK_18.02 { + global: + + _rte_eth_linkstatus_get; + _rte_eth_linkstatus_set; + +} DPDK_17.11; + EXPERIMENTAL { global: -- 2.14.3