From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C9F98A034F; Mon, 30 Aug 2021 16:27:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE5EE410F3; Mon, 30 Aug 2021 16:27:34 +0200 (CEST) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by mails.dpdk.org (Postfix) with ESMTP id 8F901410E9 for ; Mon, 30 Aug 2021 16:27:33 +0200 (CEST) Received: by mail-lf1-f44.google.com with SMTP id m28so1392105lfj.6 for ; Mon, 30 Aug 2021 07:27:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nfware.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0xUMz/oOAqmCORJCRbLHfMjjSqbbqG4m8Thtynta/is=; b=Y+qjlwFI+Dlu5TKJACBSrF+zIlQ+HLJRGOO/WG/7s7ycUfZqzsP23nNCouZDY40AtR feaLvO5URK9Q+meeuLlVxUapbMUCf6s7AQEblDdaolQ/3MphMFWH4y5SB/emwq95r9y0 Hn+aHKne/65jiHnetrOkHNTBw85oLumSB8nvNhz2OwYdnDRBjG0hv78tNCmRPbW47Qcu sFKzrwCKhxoJ1wflkve1CM6oXbdBjByhI9E8jqc4SWpok25piILDEm6W86k7+XxxL+Pc mHkLImwc45oFnfuZfykEw/aRoIl5joRGMHQhXOHdxhIQ3Yd9dDNPNfXR/Dq68og5OZHv 2VDQ== 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:mime-version:content-transfer-encoding; bh=0xUMz/oOAqmCORJCRbLHfMjjSqbbqG4m8Thtynta/is=; b=dU5O7S7FCJ2VzvHkrk7ocW9Vd1KoVDxF960E6tH1k+djo4H0qKtg9IMdL5eiP21t7I +CV0CXQkBs8CDUVt5+5NmUKWm6CR4KQB9dRW7kDoKG9Yety1EDzRXqXG9o6NggSf5H/p sZ+6y9OIBq+FBRNJF4L3vtoZxmAwRjH2AOvSNKgZc9EddetT4Au4U23JVlbG5yxJNBWj t9MtZKHPYUEKvsZFMxXTlS8ilbLJ4ZPuJnE/yWUJGXpLiZJ6QbzCYuZufHptLh4L2jt/ nLG4LkNRebXorvML1OZkHx82YA8VOEsDyscZd444byvObePMl/obk6lBCQk937ATZSNH 2L+g== X-Gm-Message-State: AOAM533AhHBfm3K4sd8aEFrGjK+xFRr+Bpusfa6IBkmTC23/Kj6CYIM1 vLbm3XsI0DZTHZ4rKPLXKRd2mDLP+fBCEg== X-Google-Smtp-Source: ABdhPJxHDremQjwcO66GE7Rr1ab15w+e9fMGUbOJWVkP0zexhHeTm8V6GP9E8nwWI/vuoq5rx5WXfw== X-Received: by 2002:a05:6512:1503:: with SMTP id bq3mr16929643lfb.625.1630333652666; Mon, 30 Aug 2021 07:27:32 -0700 (PDT) Received: from localhost.localdomain ([77.105.181.112]) by smtp.gmail.com with ESMTPSA id p1sm692516lfo.255.2021.08.30.07.27.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Aug 2021 07:27:32 -0700 (PDT) From: Igor Ryzhov To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Dan Gora Date: Mon, 30 Aug 2021 17:27:29 +0300 Message-Id: <20210830142731.32524-1-iryzhov@nfware.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210826151911.15699-1-iryzhov@nfware.com> References: <20210826151911.15699-1-iryzhov@nfware.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v6 1/3] kni: rework rte_kni_update_link using ioctl X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Current implementation doesn't allow us to update KNI carrier if the interface is not yet UP in kernel. It means that we can't use it in the same thread which is processing rte_kni_ops.config_network_if, which is very convenient, because it allows us to have correct carrier status of the interface right after we enabled it and we don't have to use any additional thread to track link status. Propagating speed/duplex/autoneg to the kernel module also allows us to implement ethtool_ops.get_link_ksettings callback. Suggested-by: Dan Gora Signed-off-by: Igor Ryzhov --- app/test/test_kni.c | 62 +++++++++++++++++++++++++++---------- examples/kni/main.c | 8 +++-- kernel/linux/kni/kni_dev.h | 5 +++ kernel/linux/kni/kni_misc.c | 47 ++++++++++++++++++++++++++++ lib/kni/rte_kni.c | 41 ++++++------------------ lib/kni/rte_kni.h | 12 +++---- lib/kni/rte_kni_common.h | 9 ++++++ 7 files changed, 126 insertions(+), 58 deletions(-) diff --git a/app/test/test_kni.c b/app/test/test_kni.c index 96733554b6c4..0df028696f36 100644 --- a/app/test/test_kni.c +++ b/app/test/test_kni.c @@ -122,9 +122,32 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) return 0; } +static int +kni_get_carrier(const char *name) +{ + FILE *fd; + char path[128]; + int carrier; + + snprintf(path, sizeof(path), "/sys/devices/virtual/net/%s/carrier", + name); + fd = fopen(path, "r"); + if (fd == NULL) + return -1; + + if (fscanf(fd, "%d", &carrier) != 1) + return -1; + + fclose(fd); + + return carrier; +} + static int test_kni_link_change(void) { + struct rte_eth_link link; + int carrier; int ret; int pid; @@ -135,42 +158,47 @@ test_kni_link_change(void) } if (pid == 0) { + link.link_speed = ETH_SPEED_NUM_10G; + link.link_duplex = ETH_LINK_FULL_DUPLEX; + link.link_autoneg = ETH_LINK_AUTONEG; + printf("Starting KNI Link status change tests.\n"); if (system(IFCONFIG TEST_KNI_PORT" up") == -1) { ret = -1; goto error; } - ret = rte_kni_update_link(test_kni_ctx, 1); + link.link_status = ETH_LINK_UP; + ret = rte_kni_update_link(test_kni_ctx, &link); if (ret < 0) { printf("Failed to change link state to Up ret=%d.\n", ret); goto error; } rte_delay_ms(1000); - printf("KNI: Set LINKUP, previous state=%d\n", ret); - - ret = rte_kni_update_link(test_kni_ctx, 0); - if (ret != 1) { - printf( - "Failed! Previous link state should be 1, returned %d.\n", - ret); + carrier = kni_get_carrier(TEST_KNI_PORT); + if (carrier != 1) { + printf("Carrier did not change to Up in kernel.\n"); + ret = -1; goto error; } - rte_delay_ms(1000); - printf("KNI: Set LINKDOWN, previous state=%d\n", ret); + printf("KNI: Set LINKUP\n"); - ret = rte_kni_update_link(test_kni_ctx, 1); - if (ret != 0) { - printf( - "Failed! Previous link state should be 0, returned %d.\n", + link.link_status = ETH_LINK_DOWN; + ret = rte_kni_update_link(test_kni_ctx, &link); + if (ret < 0) { + printf("Failed to change link state to Down ret=%d.\n", ret); goto error; } - printf("KNI: Set LINKUP, previous state=%d\n", ret); - - ret = 0; rte_delay_ms(1000); + carrier = kni_get_carrier(TEST_KNI_PORT); + if (carrier != 0) { + printf("Carrier did not change to Down in kernel.\n"); + ret = -1; + goto error; + } + printf("KNI: Set LINKDOWN\n"); error: if (system(IFCONFIG TEST_KNI_PORT" down") == -1) diff --git a/examples/kni/main.c b/examples/kni/main.c index beabb3c848aa..aea44beac550 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c @@ -85,6 +85,7 @@ struct kni_port_params { unsigned lcore_tx; /* lcore ID for TX */ uint32_t nb_lcore_k; /* Number of lcores for KNI multi kernel threads */ uint32_t nb_kni; /* Number of KNI devices to be created */ + uint8_t link_status; /* Current link status of the port */ unsigned lcore_k[KNI_MAX_KTHREAD]; /* lcore ID list for kthreads */ struct rte_kni *kni[KNI_MAX_KTHREAD]; /* KNI context pointers */ } __rte_cache_aligned; @@ -720,7 +721,7 @@ log_link_state(struct rte_kni *kni, int prev, struct rte_eth_link *link) rte_eth_link_to_str(link_status_text, sizeof(link_status_text), link); if (prev != link->link_status) - RTE_LOG(INFO, APP, "%s NIC %s", + RTE_LOG(INFO, APP, "%s NIC %s\n", rte_kni_get_name(kni), link_status_text); } @@ -754,9 +755,10 @@ monitor_all_ports_link_status(void *arg) continue; } for (i = 0; i < p[portid]->nb_kni; i++) { - prev = rte_kni_update_link(p[portid]->kni[i], - link.link_status); + rte_kni_update_link(p[portid]->kni[i], &link); + prev = p[portid]->link_status; log_link_state(p[portid]->kni[i], prev, &link); + p[portid]->link_status = link.link_status; } } } diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h index c15da311ba25..969108cc30f8 100644 --- a/kernel/linux/kni/kni_dev.h +++ b/kernel/linux/kni/kni_dev.h @@ -88,6 +88,11 @@ struct kni_dev { void *alloc_va[MBUF_BURST_SZ]; struct task_struct *usr_tsk; + + /* correct when netif_carrier_ok */ + uint32_t speed; + uint8_t duplex; + uint8_t autoneg; }; #ifdef HAVE_IOVA_TO_KVA_MAPPING_SUPPORT diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c index 2b464c438113..30ee69661935 100644 --- a/kernel/linux/kni/kni_misc.c +++ b/kernel/linux/kni/kni_misc.c @@ -481,6 +481,50 @@ kni_ioctl_release(struct net *net, uint32_t ioctl_num, return ret; } +static int +kni_ioctl_link(struct net *net, uint32_t ioctl_num, + unsigned long ioctl_param) +{ + struct kni_net *knet = net_generic(net, kni_net_id); + int ret = -EINVAL; + struct kni_dev *dev, *n; + struct rte_kni_link_info link_info; + struct net_device *netdev; + + if (_IOC_SIZE(ioctl_num) > sizeof(link_info)) + return -EINVAL; + + if (copy_from_user(&link_info, (void *)ioctl_param, sizeof(link_info))) + return -EFAULT; + + if (strlen(link_info.name) == 0) + return -EINVAL; + + down_read(&knet->kni_list_lock); + list_for_each_entry_safe(dev, n, &knet->kni_list_head, list) { + if (strncmp(dev->name, link_info.name, RTE_KNI_NAMESIZE) != 0) + continue; + + netdev = dev->net_dev; + + if (link_info.status) { + netif_carrier_on(netdev); + + dev->speed = link_info.speed; + dev->duplex = link_info.duplex; + dev->autoneg = link_info.autoneg; + } else { + netif_carrier_off(netdev); + } + + ret = 0; + break; + } + up_read(&knet->kni_list_lock); + + return ret; +} + static int kni_ioctl(struct inode *inode, uint32_t ioctl_num, unsigned long ioctl_param) { @@ -502,6 +546,9 @@ kni_ioctl(struct inode *inode, uint32_t ioctl_num, unsigned long ioctl_param) case _IOC_NR(RTE_KNI_IOCTL_RELEASE): ret = kni_ioctl_release(net, ioctl_num, ioctl_param); break; + case _IOC_NR(RTE_KNI_IOCTL_LINK): + ret = kni_ioctl_link(net, ioctl_num, ioctl_param); + break; default: pr_debug("IOCTL default\n"); break; diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c index d3e236005ed5..0a7b562abf11 100644 --- a/lib/kni/rte_kni.c +++ b/lib/kni/rte_kni.c @@ -784,46 +784,25 @@ rte_kni_unregister_handlers(struct rte_kni *kni) } int -rte_kni_update_link(struct rte_kni *kni, unsigned int linkup) +rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link) { - char path[64]; - char old_carrier[2]; - const char *new_carrier; - int old_linkup; - int fd, ret; + struct rte_kni_link_info link_info; if (kni == NULL) return -1; - snprintf(path, sizeof(path), "/sys/devices/virtual/net/%s/carrier", - kni->name); + snprintf(link_info.name, RTE_KNI_NAMESIZE, "%s", kni->name); + link_info.speed = link->link_speed; + link_info.duplex = link->link_duplex; + link_info.autoneg = link->link_autoneg; + link_info.status = link->link_status; - fd = open(path, O_RDWR); - if (fd == -1) { - RTE_LOG(ERR, KNI, "Failed to open file: %s.\n", path); + if (ioctl(kni_fd, RTE_KNI_IOCTL_LINK, &link_info) < 0) { + RTE_LOG(ERR, KNI, "Fail to update KNI link\n"); return -1; } - ret = read(fd, old_carrier, 2); - if (ret < 1) { - close(fd); - return -1; - } - old_linkup = (old_carrier[0] == '1'); - - if (old_linkup == (int)linkup) - goto out; - - new_carrier = linkup ? "1" : "0"; - ret = write(fd, new_carrier, 1); - if (ret < 1) { - RTE_LOG(ERR, KNI, "Failed to write file: %s.\n", path); - close(fd); - return -1; - } -out: - close(fd); - return old_linkup; + return 0; } void diff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h index b0eaf4610416..c891e0e1f9a5 100644 --- a/lib/kni/rte_kni.h +++ b/lib/kni/rte_kni.h @@ -21,6 +21,7 @@ #include #include #include +#include #include @@ -244,19 +245,16 @@ int rte_kni_unregister_handlers(struct rte_kni *kni); * * @param kni * pointer to struct rte_kni. - * @param linkup - * New link state: - * 0 for linkdown. - * > 0 for linkup. + * @param link + * new link state, speed, duplex, autoneg. * * @return + * On success: 0 * On failure: -1 - * Previous link state == linkdown: 0 - * Previous link state == linkup: 1 */ __rte_experimental int -rte_kni_update_link(struct rte_kni *kni, unsigned int linkup); +rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link); /** * Close KNI device. diff --git a/lib/kni/rte_kni_common.h b/lib/kni/rte_kni_common.h index b547ea550171..e27cb3330b35 100644 --- a/lib/kni/rte_kni_common.h +++ b/lib/kni/rte_kni_common.h @@ -130,10 +130,19 @@ struct rte_kni_device_info { uint8_t iova_mode; }; +struct rte_kni_link_info { + char name[RTE_KNI_NAMESIZE]; + uint32_t speed; + uint8_t duplex; + uint8_t autoneg; + uint8_t status; +}; + #define KNI_DEVICE "kni" #define RTE_KNI_IOCTL_TEST _IOWR(0, 1, int) #define RTE_KNI_IOCTL_CREATE _IOWR(0, 2, struct rte_kni_device_info) #define RTE_KNI_IOCTL_RELEASE _IOWR(0, 3, struct rte_kni_device_info) +#define RTE_KNI_IOCTL_LINK _IOWR(0, 4, struct rte_kni_link_info) #endif /* _RTE_KNI_COMMON_H_ */ -- 2.33.0