From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by dpdk.org (Postfix) with ESMTP id 71BB312009 for ; Tue, 23 Jan 2018 00:55:05 +0100 (CET) Received: by mail-pg0-f68.google.com with SMTP id w17so8345082pgv.6 for ; Mon, 22 Jan 2018 15:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ixRxVfHpMPQsk2zs0PW2M8++4Rx51Au86BPuHPp/Knc=; b=THFu+I1occYBy+XiGKjB71dH0+zAo6B5snAPbswOgBNTlgJ1AyIiQOjP3DSIv0wDp4 ZPDWKjyYNyefVSAnu67FQEajhxoqkcrPRLg6QyYy9W0SrOiqTwwLnIASQqkujYHMBg4N Rx+VgUudiFpbl5k1lGUkJAl6flxauZ4wgfIrqmCLgsBwZV5aYJrpl/ueY3dUpzge/46z VD11qpzYWoWWpOXNBOSyJI/UDPHRYX6r3wRSlIixrSmPym/sWPWl7F7z5fWepQvZBnRd bZxpMziT5gciJnt6Ufe0BPbYzBGRITvdmTJgYxqlluMzY1tZyHpr6RzrH422Tz6FYP0J 3cXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ixRxVfHpMPQsk2zs0PW2M8++4Rx51Au86BPuHPp/Knc=; b=d6TXsw4a1PcdPSEcnkJGfOvb73vo1F9i3dvR8rjKPXNk756QJPkk7PHJHoOVEC0wpO qYa9A0uYQEtGde+te2w7Kq3JkiFJ7L+aH5W7OapDOSG3B2GIbxduMJI0qJGppFzLJSvU lKVVg8smdqm/DEQs5I8V7tSNoKFDojutB7de1PXNmh8nQaiPZm0JG3jJeAOKgxRGX3xP miPZbjQO6m8fTDEJVktwv18f5wE+IfHcR3w6Os5oEomk2gIGgXeJx1/qydtj+Y+R4M85 md19rcpXILt0je7kMI2RL/PGly0JzMvaA1CkG5zSX7PDPxHn2iGI1m69j8BVuJPJFKxX 1t2w== X-Gm-Message-State: AKwxytcMJTEfI/3oUMt3wqU88OaZupHGSjmR2ElbwWBxZTO0S9UiZGab 6uF8JjrillLbvo86/Rgq4CY3YoW5dnI= X-Google-Smtp-Source: AH8x2265ZoZW7rbwuJBjf3mpejN/Pcwui2kdoz7P4JMDaTJQai5hGFFwMDZStxe8m7mmYZyKJYYECw== X-Received: by 10.98.33.198 with SMTP id o67mr9283289pfj.0.1516665304382; Mon, 22 Jan 2018 15:55:04 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id a24sm1623825pff.160.2018.01.22.15.55.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 15:55:03 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 22 Jan 2018 15:54:45 -0800 Message-Id: <20180122235458.28562-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180122235458.28562-1-stephen@networkplumber.org> References: <20180122235458.28562-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v7 02/15] ethdev: add linkstatus get/set helper functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2018 23:55:06 -0000 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 Acked-by: Shreyansh Jain --- lib/librte_ether/rte_ethdev.c | 22 +++---------- lib/librte_ether/rte_ethdev_driver.h | 61 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 18 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index f285ba278967..344397101abd 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1578,20 +1578,6 @@ rte_eth_allmulticast_get(uint16_t port_id) return dev->data->all_multicast; } -static inline int -rte_eth_dev_atomic_read_link_status(struct rte_eth_dev *dev, - struct rte_eth_link *link) -{ - struct rte_eth_link *dst = link; - struct rte_eth_link *src = &(dev->data->dev_link); - - if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst, - *(uint64_t *)src) == 0) - return -1; - - return 0; -} - void rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link) { @@ -1600,8 +1586,8 @@ rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link) RTE_ETH_VALID_PORTID_OR_RET(port_id); dev = &rte_eth_devices[port_id]; - if (dev->data->dev_conf.intr_conf.lsc != 0) - rte_eth_dev_atomic_read_link_status(dev, eth_link); + if (dev->data->dev_conf.intr_conf.lsc) + rte_eth_linkstatus_get(dev, eth_link); else { RTE_FUNC_PTR_OR_RET(*dev->dev_ops->link_update); (*dev->dev_ops->link_update)(dev, 1); @@ -1617,8 +1603,8 @@ rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *eth_link) RTE_ETH_VALID_PORTID_OR_RET(port_id); dev = &rte_eth_devices[port_id]; - if (dev->data->dev_conf.intr_conf.lsc != 0) - rte_eth_dev_atomic_read_link_status(dev, eth_link); + if (dev->data->dev_conf.intr_conf.lsc) + rte_eth_linkstatus_get(dev, eth_link); else { RTE_FUNC_PTR_OR_RET(*dev->dev_ops->link_update); (*dev->dev_ops->link_update)(dev, 0); diff --git a/lib/librte_ether/rte_ethdev_driver.h b/lib/librte_ether/rte_ethdev_driver.h index 45f08c65ec1e..66da1fb68bbf 100644 --- a/lib/librte_ether/rte_ethdev_driver.h +++ b/lib/librte_ether/rte_ethdev_driver.h @@ -68,6 +68,67 @@ struct rte_eth_dev *rte_eth_dev_attach_secondary(const char *name); */ int rte_eth_dev_release_port(struct rte_eth_dev *eth_dev); +/** + * @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 + * 1 if link status has changed; + * 0 if link status is unchanged. + */ +static inline 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; +} + +/** + * @internal + * Atomically get the link speed and status. + * + * @param dev + * Pointer to struct rte_eth_dev. + * @param link + * link status value. + */ +static inline 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 *dst = (uint64_t *)link; + + RTE_BUILD_BUG_ON(sizeof(*link) != sizeof(uint64_t)); + + /* can't use rte_atomic64_read because it returns signed int */ +#ifdef __LP64__ + *dst = *src; +#else + do { + *dst = *src; + } while (!rte_atomic64_cmpset(src, *dst, *dst)); +#endif +} + /** * @internal * Release device queues and clear its configuration to force the user -- 2.15.1