From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by dpdk.org (Postfix) with ESMTP id 892A71B021 for ; Tue, 16 Jan 2018 19:38:06 +0100 (CET) Received: by mail-pl0-f65.google.com with SMTP id bd8so6825040plb.9 for ; Tue, 16 Jan 2018 10:38:06 -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=MilCPq+sKXQ9iqiHrepPC9qsJ5QTKPFy1cPHKZYuZro=; b=Goy6Y5+CNUzonp1gNE9llXxo2BHC8oJ7uC5BRkRKEOroRHprcjpvPDk5fXRth60tZh kOyvZIMAKrmf8aKYHtVsnfAb4s03n23i4ZCWMGIxdFZCaTDq2ba+QEiQH1IA3njN9/hv C4uI1yOBbckUmX3VrjIu+e+/1CuTIxtBfZ3rxr929WhoAG+nmfdW3rz5SEOmzy05Bun5 0nuJ21tsUP8Htyq1CJ4GNqPvy8cLz7f6NirUV6/Gb7hIFtqPQ6i7eRaMd2Udp2RioiXN 1JLGasvogH9VHQKrR5xxzEggTFIqiLeqHnZAonz0I2SHYZHj2CdqYWzCeZ3jiyp70Hu6 Fg4g== 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=MilCPq+sKXQ9iqiHrepPC9qsJ5QTKPFy1cPHKZYuZro=; b=P7etrRZ6uXG17JpKHrI+7B91rIA1DeiZC5rnrFuMAnIzeaQ8xZ0/MAPBcc1a+1AyDy fe6x+qb7GV+ge+w9SCMXvyo/nCuCoZKQNRF9dcNbbGmGbuivpY/hqIp1mTr+bIncxRRa QxBm9KGtc0LpCO5XwvTqsd8IsdCllNJnJWhfWnrOYd0/vUNSaQsByy2WFFes6zJN/JOi VlcTpxxyU3rSzrw+7rA4lnQGtptG5Ux45+JUALcUkfOAk3YYLY5RC3LZeTf+yKUTbRLC wRj4tHjlF/1DCMdjEWXRo/ju70j2feD8snDFzVswpzP+R/6ZD9btft5/feV7RpKdCDdX DMvA== X-Gm-Message-State: AKwxytdfESAK/Zwz4cv/kv5NAFci65489hM9KDmE/hI5y6WCMbs/ju41 XSbzB3op11Tt/+NwXMUohJa6xYaxoHI= X-Google-Smtp-Source: ACJfBoveN7Jlg9oZOWyRaZwJ9PC8QMLIF1JnQe50A7bZoV78+o61N+QOgI/MmisqJmV7fcEoiZoSxw== X-Received: by 10.159.207.139 with SMTP id z11mr2219122plo.43.1516127885338; Tue, 16 Jan 2018 10:38:05 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id 77sm4560351pfc.187.2018.01.16.10.38.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 10:38:04 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 16 Jan 2018 10:37:42 -0800 Message-Id: <20180116183755.24542-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116183755.24542-1-stephen@networkplumber.org> References: <20180116183755.24542-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v5 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: Tue, 16 Jan 2018 18:38:07 -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 --- lib/librte_ether/rte_ethdev.c | 22 +++------------ lib/librte_ether/rte_ethdev.h | 62 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 18 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index a524af740f4a..d6433af35a19 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1447,20 +1447,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) { @@ -1469,8 +1455,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); @@ -1486,8 +1472,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.h b/lib/librte_ether/rte_ethdev.h index b10e2a92da71..ec8255656967 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -2218,6 +2218,68 @@ 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 + * 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 +} + /** * Reset a Ethernet device and keep its port id. * -- 2.15.1