Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/97553/?format=api
{ "id": 97553, "url": "http://patches.dpdk.org/api/patches/97553/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210830142731.32524-1-iryzhov@nfware.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210830142731.32524-1-iryzhov@nfware.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210830142731.32524-1-iryzhov@nfware.com", "date": "2021-08-30T14:27:29", "name": "[v6,1/3] kni: rework rte_kni_update_link using ioctl", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "da08534fad25e78d895aca3b8a48a693e0fb3bf8", "submitter": { "id": 175, "url": "http://patches.dpdk.org/api/people/175/?format=api", "name": "Igor Ryzhov", "email": "iryzhov@nfware.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210830142731.32524-1-iryzhov@nfware.com/mbox/", "series": [ { "id": 18529, "url": "http://patches.dpdk.org/api/series/18529/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=18529", "date": "2021-08-30T14:27:29", "name": "[v6,1/3] kni: rework rte_kni_update_link using ioctl", "version": 6, "mbox": "http://patches.dpdk.org/series/18529/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/97553/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/97553/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id C9F98A034F;\n\tMon, 30 Aug 2021 16:27:34 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AE5EE410F3;\n\tMon, 30 Aug 2021 16:27:34 +0200 (CEST)", "from mail-lf1-f44.google.com (mail-lf1-f44.google.com\n [209.85.167.44]) by mails.dpdk.org (Postfix) with ESMTP id 8F901410E9\n for <dev@dpdk.org>; Mon, 30 Aug 2021 16:27:33 +0200 (CEST)", "by mail-lf1-f44.google.com with SMTP id m28so1392105lfj.6\n for <dev@dpdk.org>; Mon, 30 Aug 2021 07:27:33 -0700 (PDT)", "from localhost.localdomain ([77.105.181.112])\n by smtp.gmail.com with ESMTPSA id p1sm692516lfo.255.2021.08.30.07.27.31\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 30 Aug 2021 07:27:32 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=nfware.com; s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=0xUMz/oOAqmCORJCRbLHfMjjSqbbqG4m8Thtynta/is=;\n b=Y+qjlwFI+Dlu5TKJACBSrF+zIlQ+HLJRGOO/WG/7s7ycUfZqzsP23nNCouZDY40AtR\n feaLvO5URK9Q+meeuLlVxUapbMUCf6s7AQEblDdaolQ/3MphMFWH4y5SB/emwq95r9y0\n Hn+aHKne/65jiHnetrOkHNTBw85oLumSB8nvNhz2OwYdnDRBjG0hv78tNCmRPbW47Qcu\n sFKzrwCKhxoJ1wflkve1CM6oXbdBjByhI9E8jqc4SWpok25piILDEm6W86k7+XxxL+Pc\n mHkLImwc45oFnfuZfykEw/aRoIl5joRGMHQhXOHdxhIQ3Yd9dDNPNfXR/Dq68og5OZHv\n 2VDQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=0xUMz/oOAqmCORJCRbLHfMjjSqbbqG4m8Thtynta/is=;\n b=dU5O7S7FCJ2VzvHkrk7ocW9Vd1KoVDxF960E6tH1k+djo4H0qKtg9IMdL5eiP21t7I\n +CV0CXQkBs8CDUVt5+5NmUKWm6CR4KQB9dRW7kDoKG9Yety1EDzRXqXG9o6NggSf5H/p\n sZ+6y9OIBq+FBRNJF4L3vtoZxmAwRjH2AOvSNKgZc9EddetT4Au4U23JVlbG5yxJNBWj\n t9MtZKHPYUEKvsZFMxXTlS8ilbLJ4ZPuJnE/yWUJGXpLiZJ6QbzCYuZufHptLh4L2jt/\n nLG4LkNRebXorvML1OZkHx82YA8VOEsDyscZd444byvObePMl/obk6lBCQk937ATZSNH\n 2L+g==", "X-Gm-Message-State": "AOAM533AhHBfm3K4sd8aEFrGjK+xFRr+Bpusfa6IBkmTC23/Kj6CYIM1\n vLbm3XsI0DZTHZ4rKPLXKRd2mDLP+fBCEg==", "X-Google-Smtp-Source": "\n ABdhPJxHDremQjwcO66GE7Rr1ab15w+e9fMGUbOJWVkP0zexhHeTm8V6GP9E8nwWI/vuoq5rx5WXfw==", "X-Received": "by 2002:a05:6512:1503:: with SMTP id\n bq3mr16929643lfb.625.1630333652666;\n Mon, 30 Aug 2021 07:27:32 -0700 (PDT)", "From": "Igor Ryzhov <iryzhov@nfware.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com,\n\tDan Gora <dg@adax.com>", "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\n ioctl", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Current implementation doesn't allow us to update KNI carrier if the\ninterface is not yet UP in kernel. It means that we can't use it in the\nsame thread which is processing rte_kni_ops.config_network_if, which is\nvery convenient, because it allows us to have correct carrier status\nof the interface right after we enabled it and we don't have to use any\nadditional thread to track link status.\n\nPropagating speed/duplex/autoneg to the kernel module also allows us to\nimplement ethtool_ops.get_link_ksettings callback.\n\nSuggested-by: Dan Gora <dg@adax.com>\nSigned-off-by: Igor Ryzhov <iryzhov@nfware.com>\n---\n app/test/test_kni.c | 62 +++++++++++++++++++++++++++----------\n examples/kni/main.c | 8 +++--\n kernel/linux/kni/kni_dev.h | 5 +++\n kernel/linux/kni/kni_misc.c | 47 ++++++++++++++++++++++++++++\n lib/kni/rte_kni.c | 41 ++++++------------------\n lib/kni/rte_kni.h | 12 +++----\n lib/kni/rte_kni_common.h | 9 ++++++\n 7 files changed, 126 insertions(+), 58 deletions(-)", "diff": "diff --git a/app/test/test_kni.c b/app/test/test_kni.c\nindex 96733554b6c4..0df028696f36 100644\n--- a/app/test/test_kni.c\n+++ b/app/test/test_kni.c\n@@ -122,9 +122,32 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)\n \treturn 0;\n }\n \n+static int\n+kni_get_carrier(const char *name)\n+{\n+\tFILE *fd;\n+\tchar path[128];\n+\tint carrier;\n+\n+\tsnprintf(path, sizeof(path), \"/sys/devices/virtual/net/%s/carrier\",\n+\t\tname);\n+\tfd = fopen(path, \"r\");\n+\tif (fd == NULL)\n+\t\treturn -1;\n+\n+\tif (fscanf(fd, \"%d\", &carrier) != 1)\n+\t\treturn -1;\n+\n+\tfclose(fd);\n+\n+\treturn carrier;\n+}\n+\n static int\n test_kni_link_change(void)\n {\n+\tstruct rte_eth_link link;\n+\tint carrier;\n \tint ret;\n \tint pid;\n \n@@ -135,42 +158,47 @@ test_kni_link_change(void)\n \t}\n \n \tif (pid == 0) {\n+\t\tlink.link_speed = ETH_SPEED_NUM_10G;\n+\t\tlink.link_duplex = ETH_LINK_FULL_DUPLEX;\n+\t\tlink.link_autoneg = ETH_LINK_AUTONEG;\n+\n \t\tprintf(\"Starting KNI Link status change tests.\\n\");\n \t\tif (system(IFCONFIG TEST_KNI_PORT\" up\") == -1) {\n \t\t\tret = -1;\n \t\t\tgoto error;\n \t\t}\n \n-\t\tret = rte_kni_update_link(test_kni_ctx, 1);\n+\t\tlink.link_status = ETH_LINK_UP;\n+\t\tret = rte_kni_update_link(test_kni_ctx, &link);\n \t\tif (ret < 0) {\n \t\t\tprintf(\"Failed to change link state to Up ret=%d.\\n\",\n \t\t\t\tret);\n \t\t\tgoto error;\n \t\t}\n \t\trte_delay_ms(1000);\n-\t\tprintf(\"KNI: Set LINKUP, previous state=%d\\n\", ret);\n-\n-\t\tret = rte_kni_update_link(test_kni_ctx, 0);\n-\t\tif (ret != 1) {\n-\t\t\tprintf(\n-\t\t\"Failed! Previous link state should be 1, returned %d.\\n\",\n-\t\t\t\tret);\n+\t\tcarrier = kni_get_carrier(TEST_KNI_PORT);\n+\t\tif (carrier != 1) {\n+\t\t\tprintf(\"Carrier did not change to Up in kernel.\\n\");\n+\t\t\tret = -1;\n \t\t\tgoto error;\n \t\t}\n-\t\trte_delay_ms(1000);\n-\t\tprintf(\"KNI: Set LINKDOWN, previous state=%d\\n\", ret);\n+\t\tprintf(\"KNI: Set LINKUP\\n\");\n \n-\t\tret = rte_kni_update_link(test_kni_ctx, 1);\n-\t\tif (ret != 0) {\n-\t\t\tprintf(\n-\t\t\"Failed! Previous link state should be 0, returned %d.\\n\",\n+\t\tlink.link_status = ETH_LINK_DOWN;\n+\t\tret = rte_kni_update_link(test_kni_ctx, &link);\n+\t\tif (ret < 0) {\n+\t\t\tprintf(\"Failed to change link state to Down ret=%d.\\n\",\n \t\t\t\tret);\n \t\t\tgoto error;\n \t\t}\n-\t\tprintf(\"KNI: Set LINKUP, previous state=%d\\n\", ret);\n-\n-\t\tret = 0;\n \t\trte_delay_ms(1000);\n+\t\tcarrier = kni_get_carrier(TEST_KNI_PORT);\n+\t\tif (carrier != 0) {\n+\t\t\tprintf(\"Carrier did not change to Down in kernel.\\n\");\n+\t\t\tret = -1;\n+\t\t\tgoto error;\n+\t\t}\n+\t\tprintf(\"KNI: Set LINKDOWN\\n\");\n \n error:\n \t\tif (system(IFCONFIG TEST_KNI_PORT\" down\") == -1)\ndiff --git a/examples/kni/main.c b/examples/kni/main.c\nindex beabb3c848aa..aea44beac550 100644\n--- a/examples/kni/main.c\n+++ b/examples/kni/main.c\n@@ -85,6 +85,7 @@ struct kni_port_params {\n \tunsigned lcore_tx; /* lcore ID for TX */\n \tuint32_t nb_lcore_k; /* Number of lcores for KNI multi kernel threads */\n \tuint32_t nb_kni; /* Number of KNI devices to be created */\n+\tuint8_t link_status; /* Current link status of the port */\n \tunsigned lcore_k[KNI_MAX_KTHREAD]; /* lcore ID list for kthreads */\n \tstruct rte_kni *kni[KNI_MAX_KTHREAD]; /* KNI context pointers */\n } __rte_cache_aligned;\n@@ -720,7 +721,7 @@ log_link_state(struct rte_kni *kni, int prev, struct rte_eth_link *link)\n \n \trte_eth_link_to_str(link_status_text, sizeof(link_status_text), link);\n \tif (prev != link->link_status)\n-\t\tRTE_LOG(INFO, APP, \"%s NIC %s\",\n+\t\tRTE_LOG(INFO, APP, \"%s NIC %s\\n\",\n \t\t\trte_kni_get_name(kni),\n \t\t\tlink_status_text);\n }\n@@ -754,9 +755,10 @@ monitor_all_ports_link_status(void *arg)\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\tfor (i = 0; i < p[portid]->nb_kni; i++) {\n-\t\t\t\tprev = rte_kni_update_link(p[portid]->kni[i],\n-\t\t\t\t\t\tlink.link_status);\n+\t\t\t\trte_kni_update_link(p[portid]->kni[i], &link);\n+\t\t\t\tprev = p[portid]->link_status;\n \t\t\t\tlog_link_state(p[portid]->kni[i], prev, &link);\n+\t\t\t\tp[portid]->link_status = link.link_status;\n \t\t\t}\n \t\t}\n \t}\ndiff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h\nindex c15da311ba25..969108cc30f8 100644\n--- a/kernel/linux/kni/kni_dev.h\n+++ b/kernel/linux/kni/kni_dev.h\n@@ -88,6 +88,11 @@ struct kni_dev {\n \tvoid *alloc_va[MBUF_BURST_SZ];\n \n \tstruct task_struct *usr_tsk;\n+\n+\t/* correct when netif_carrier_ok */\n+\tuint32_t speed;\n+\tuint8_t duplex;\n+\tuint8_t autoneg;\n };\n \n #ifdef HAVE_IOVA_TO_KVA_MAPPING_SUPPORT\ndiff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c\nindex 2b464c438113..30ee69661935 100644\n--- a/kernel/linux/kni/kni_misc.c\n+++ b/kernel/linux/kni/kni_misc.c\n@@ -481,6 +481,50 @@ kni_ioctl_release(struct net *net, uint32_t ioctl_num,\n \treturn ret;\n }\n \n+static int\n+kni_ioctl_link(struct net *net, uint32_t ioctl_num,\n+\t\tunsigned long ioctl_param)\n+{\n+\tstruct kni_net *knet = net_generic(net, kni_net_id);\n+\tint ret = -EINVAL;\n+\tstruct kni_dev *dev, *n;\n+\tstruct rte_kni_link_info link_info;\n+\tstruct net_device *netdev;\n+\n+\tif (_IOC_SIZE(ioctl_num) > sizeof(link_info))\n+\t\treturn -EINVAL;\n+\n+\tif (copy_from_user(&link_info, (void *)ioctl_param, sizeof(link_info)))\n+\t\treturn -EFAULT;\n+\n+\tif (strlen(link_info.name) == 0)\n+\t\treturn -EINVAL;\n+\n+\tdown_read(&knet->kni_list_lock);\n+\tlist_for_each_entry_safe(dev, n, &knet->kni_list_head, list) {\n+\t\tif (strncmp(dev->name, link_info.name, RTE_KNI_NAMESIZE) != 0)\n+\t\t\tcontinue;\n+\n+\t\tnetdev = dev->net_dev;\n+\n+\t\tif (link_info.status) {\n+\t\t\tnetif_carrier_on(netdev);\n+\n+\t\t\tdev->speed = link_info.speed;\n+\t\t\tdev->duplex = link_info.duplex;\n+\t\t\tdev->autoneg = link_info.autoneg;\n+\t\t} else {\n+\t\t\tnetif_carrier_off(netdev);\n+\t\t}\n+\n+\t\tret = 0;\n+\t\tbreak;\n+\t}\n+\tup_read(&knet->kni_list_lock);\n+\n+\treturn ret;\n+}\n+\n static int\n kni_ioctl(struct inode *inode, uint32_t ioctl_num, unsigned long ioctl_param)\n {\n@@ -502,6 +546,9 @@ kni_ioctl(struct inode *inode, uint32_t ioctl_num, unsigned long ioctl_param)\n \tcase _IOC_NR(RTE_KNI_IOCTL_RELEASE):\n \t\tret = kni_ioctl_release(net, ioctl_num, ioctl_param);\n \t\tbreak;\n+\tcase _IOC_NR(RTE_KNI_IOCTL_LINK):\n+\t\tret = kni_ioctl_link(net, ioctl_num, ioctl_param);\n+\t\tbreak;\n \tdefault:\n \t\tpr_debug(\"IOCTL default\\n\");\n \t\tbreak;\ndiff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c\nindex d3e236005ed5..0a7b562abf11 100644\n--- a/lib/kni/rte_kni.c\n+++ b/lib/kni/rte_kni.c\n@@ -784,46 +784,25 @@ rte_kni_unregister_handlers(struct rte_kni *kni)\n }\n \n int\n-rte_kni_update_link(struct rte_kni *kni, unsigned int linkup)\n+rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link)\n {\n-\tchar path[64];\n-\tchar old_carrier[2];\n-\tconst char *new_carrier;\n-\tint old_linkup;\n-\tint fd, ret;\n+\tstruct rte_kni_link_info link_info;\n \n \tif (kni == NULL)\n \t\treturn -1;\n \n-\tsnprintf(path, sizeof(path), \"/sys/devices/virtual/net/%s/carrier\",\n-\t\tkni->name);\n+\tsnprintf(link_info.name, RTE_KNI_NAMESIZE, \"%s\", kni->name);\n+\tlink_info.speed = link->link_speed;\n+\tlink_info.duplex = link->link_duplex;\n+\tlink_info.autoneg = link->link_autoneg;\n+\tlink_info.status = link->link_status;\n \n-\tfd = open(path, O_RDWR);\n-\tif (fd == -1) {\n-\t\tRTE_LOG(ERR, KNI, \"Failed to open file: %s.\\n\", path);\n+\tif (ioctl(kni_fd, RTE_KNI_IOCTL_LINK, &link_info) < 0) {\n+\t\tRTE_LOG(ERR, KNI, \"Fail to update KNI link\\n\");\n \t\treturn -1;\n \t}\n \n-\tret = read(fd, old_carrier, 2);\n-\tif (ret < 1) {\n-\t\tclose(fd);\n-\t\treturn -1;\n-\t}\n-\told_linkup = (old_carrier[0] == '1');\n-\n-\tif (old_linkup == (int)linkup)\n-\t\tgoto out;\n-\n-\tnew_carrier = linkup ? \"1\" : \"0\";\n-\tret = write(fd, new_carrier, 1);\n-\tif (ret < 1) {\n-\t\tRTE_LOG(ERR, KNI, \"Failed to write file: %s.\\n\", path);\n-\t\tclose(fd);\n-\t\treturn -1;\n-\t}\n-out:\n-\tclose(fd);\n-\treturn old_linkup;\n+\treturn 0;\n }\n \n void\ndiff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h\nindex b0eaf4610416..c891e0e1f9a5 100644\n--- a/lib/kni/rte_kni.h\n+++ b/lib/kni/rte_kni.h\n@@ -21,6 +21,7 @@\n #include <rte_memory.h>\n #include <rte_mempool.h>\n #include <rte_ether.h>\n+#include <rte_ethdev.h>\n \n #include <rte_kni_common.h>\n \n@@ -244,19 +245,16 @@ int rte_kni_unregister_handlers(struct rte_kni *kni);\n *\n * @param kni\n * pointer to struct rte_kni.\n- * @param linkup\n- * New link state:\n- * 0 for linkdown.\n- * > 0 for linkup.\n+ * @param link\n+ * new link state, speed, duplex, autoneg.\n *\n * @return\n+ * On success: 0\n * On failure: -1\n- * Previous link state == linkdown: 0\n- * Previous link state == linkup: 1\n */\n __rte_experimental\n int\n-rte_kni_update_link(struct rte_kni *kni, unsigned int linkup);\n+rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link);\n \n /**\n * Close KNI device.\ndiff --git a/lib/kni/rte_kni_common.h b/lib/kni/rte_kni_common.h\nindex b547ea550171..e27cb3330b35 100644\n--- a/lib/kni/rte_kni_common.h\n+++ b/lib/kni/rte_kni_common.h\n@@ -130,10 +130,19 @@ struct rte_kni_device_info {\n \tuint8_t iova_mode;\n };\n \n+struct rte_kni_link_info {\n+\tchar name[RTE_KNI_NAMESIZE];\n+\tuint32_t speed;\n+\tuint8_t duplex;\n+\tuint8_t autoneg;\n+\tuint8_t status;\n+};\n+\n #define KNI_DEVICE \"kni\"\n \n #define RTE_KNI_IOCTL_TEST _IOWR(0, 1, int)\n #define RTE_KNI_IOCTL_CREATE _IOWR(0, 2, struct rte_kni_device_info)\n #define RTE_KNI_IOCTL_RELEASE _IOWR(0, 3, struct rte_kni_device_info)\n+#define RTE_KNI_IOCTL_LINK _IOWR(0, 4, struct rte_kni_link_info)\n \n #endif /* _RTE_KNI_COMMON_H_ */\n", "prefixes": [ "v6", "1/3" ] }