From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by dpdk.org (Postfix) with ESMTP id 5A15E1B1BE for ; Fri, 26 Jan 2018 03:01:57 +0100 (CET) Received: by mail-pf0-f196.google.com with SMTP id y26so7198456pfi.10 for ; Thu, 25 Jan 2018 18:01:57 -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=WoPS4OdWDA8FtVLt/8SVRJfDQ7pFP89bcmolSz1ed00=; b=kyMA4hIpfzDgbkFd+PeG/OrpCnEENMYs/wATsUNdLFMXOGduyZhqKWnqujMZb7EXIZ I41hxbim4JFajh5yT++HjbP821lCZQNIgzV2WNIha1nnStYxnHpgz2wyuimth61TmjFu mwVaW+b1iAJxm5oyXdqETVTbG1s0lXWsCOB5Qa1uRnmoTyGK4rWk9oMeFsxObaX180Nf XNTr2MjY68xztqJByjX9a2qN2sHWdsXv8MkxnAKAftpHIl+lUsNJ9M1VsN1ENJQwjiox UH8xxfewxqUOj3VwCKIJTdyR6G61ravbMLUoZtc6GfHICISJMj7f6H9pO2R+I3bG9lin GDcA== 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=WoPS4OdWDA8FtVLt/8SVRJfDQ7pFP89bcmolSz1ed00=; b=cN8Rt0aCTueGwHnzaULE7+hYlPC9go/SKpylwXpc0vAo6rl2OxxMr9rptEloOZEH6Z PTv3uCEyc1/doCGgk2QFthsHLiikkwzGvfuSVJfVw2G1V08hrlmNKCvbTSXI5FgOjjaZ KDn1fiSmoz7BFNTLi9IdTDox44qfA4Z0GRW2I5r6CiP9OnmlxxISpD21e7rYAtcLitHs PAZNiXn3JFQ8ZP8haTGVyShtJe/V9fP5PEJTB9v40BxvI50k8f2U6zNby7w6B/3PWA6p egxeNl5dB+5na308tS1MaQEOy4KO6XuQnqD7g8i4k9L7QQh4EvxOL5zy3U4TcD/MnP/S +4Mw== X-Gm-Message-State: AKwxyteFN9wypXwfaqnNkzoyw41ffsNaU6gF596u3URwVxcKYSdSx6Pr YRqUQ6ZXCn/wt9kjbJ3pb89QQkb2eAs= X-Google-Smtp-Source: AH8x226I+hKHxI8UjT5yiOLjnWTF4RXnwRm4jjrVHKj/ksDYk79aOVfbQhPi2C2OyuWkxqR/K+tJnw== X-Received: by 10.98.63.214 with SMTP id z83mr17461189pfj.95.1516932115983; Thu, 25 Jan 2018 18:01:55 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id d5sm22141492pfk.2.2018.01.25.18.01.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 18:01:55 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 25 Jan 2018 18:01:38 -0800 Message-Id: <20180126020151.979-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180126020151.979-1-stephen@networkplumber.org> References: <20180126020151.979-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v8 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: Fri, 26 Jan 2018 02:01:57 -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_driver.h | 63 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 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..fd3e1c0bd21f 100644 --- a/lib/librte_ether/rte_ethdev_driver.h +++ b/lib/librte_ether/rte_ethdev_driver.h @@ -68,6 +68,69 @@ 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 + * Same convention as eth_link_update operation. + * 0 if link up status has changed + * -1 if link up status was 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) ? -1 : 0; +} + +/** + * @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)); + +#ifdef __LP64__ + /* if cpu arch has 64 bit unsigned lon then implicitly atomic */ + *dst = *src; +#else + /* can't use rte_atomic64_read because it returns signed int */ + 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