From: Dan Gora <dg@adax.com>
To: dev@dpdk.org
Cc: Igor Ryzhov <iryzhov@nfware.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Dan Gora <dg@adax.com>, Ferruh Yigit <ferruh.yigit@intel.com>
Subject: [dpdk-dev] [PATCH v2 1/5] kni: add API to set link status on kernel interface
Date: Wed, 19 Sep 2018 16:55:45 -0300 [thread overview]
Message-ID: <20180919195549.5585-2-dg@adax.com> (raw)
In-Reply-To: <20180919195549.5585-1-dg@adax.com>
Add a new API function to KNI, rte_kni_update_link() to allow DPDK
applications to update the link status for KNI network interfaces in
the linux kernel.
Signed-off-by: Dan Gora <dg@adax.com>
---
lib/librte_kni/rte_kni.c | 57 ++++++++++++++++
lib/librte_kni/rte_kni.h | 18 ++++++
lib/librte_kni/rte_kni_version.map | 6 ++
test/test/test_kni.c | 100 ++++++++++++++++++++++++++++-
4 files changed, 180 insertions(+), 1 deletion(-)
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 65f6a2b03..0c3e17dbb 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -790,6 +790,63 @@ rte_kni_unregister_handlers(struct rte_kni *kni)
return 0;
}
+
+int __rte_experimental
+rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link)
+{
+ char path[64];
+ char carrier[2];
+ const char *new_carrier;
+ int fd, ret;
+
+ if (kni == NULL || link == NULL)
+ return -1;
+
+ snprintf(path, sizeof(path), "/sys/devices/virtual/net/%s/carrier",
+ kni->name);
+
+ fd = open(path, O_RDWR);
+ if (fd == -1) {
+ RTE_LOG(ERR, KNI, "Failed to open file: %s.\n", path);
+ return -1;
+ }
+
+ ret = read(fd, carrier, 2);
+ if (ret < 1) {
+ /* Cannot read carrier until interface is marked
+ * 'up', so don't log an error.
+ */
+ close(fd);
+ return -1;
+ }
+
+ new_carrier = (link->link_status == ETH_LINK_UP) ? "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;
+ }
+
+ if (strncmp(carrier, new_carrier, 1)) {
+ if (link->link_status == ETH_LINK_UP) {
+ RTE_LOG(INFO, KNI, "%s NIC Link is Up %d Mbps %s %s.\n",
+ kni->name,
+ link->link_speed,
+ link->link_autoneg ? "(AutoNeg)" : "(Fixed)",
+ link->link_duplex ?
+ "Full Duplex" : "Half Duplex");
+ } else {
+ RTE_LOG(INFO, KNI, "%s NIC Link is Down.\n",
+ kni->name);
+ }
+ }
+
+ close(fd);
+
+ return 0;
+}
+
void
rte_kni_close(void)
{
diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index 99055e2c2..4118ae97a 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -21,6 +21,7 @@
#include <rte_memory.h>
#include <rte_mempool.h>
#include <rte_ether.h>
+#include <rte_ethdev.h>
#include <exec-env/rte_kni_common.h>
@@ -228,6 +229,23 @@ int rte_kni_register_handlers(struct rte_kni *kni, struct rte_kni_ops *ops);
*/
int rte_kni_unregister_handlers(struct rte_kni *kni);
+/**
+ * Update link status info for KNI port.
+ *
+ * Update the linkup/linkdown status of a KNI interface in the kernel.
+ *
+ * @param kni
+ * pointer to struct rte_kni.
+ * @param link
+ * pointer to struct rte_eth_link containing new interface status.
+ *
+ * @return
+ * On success: 0
+ * On failure: -1
+ */
+int __rte_experimental
+rte_kni_update_link(struct rte_kni *kni, struct rte_eth_link *link);
+
/**
* Close KNI device.
*/
diff --git a/lib/librte_kni/rte_kni_version.map b/lib/librte_kni/rte_kni_version.map
index acd515eb0..c877dc6aa 100644
--- a/lib/librte_kni/rte_kni_version.map
+++ b/lib/librte_kni/rte_kni_version.map
@@ -15,3 +15,9 @@ DPDK_2.0 {
local: *;
};
+
+EXPERIMENTAL {
+ global:
+
+ rte_kni_update_link;
+};
diff --git a/test/test/test_kni.c b/test/test/test_kni.c
index 3dcadcebd..d450cc342 100644
--- a/test/test/test_kni.c
+++ b/test/test/test_kni.c
@@ -118,6 +118,97 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
port_id, kni_pkt_mtu);
return 0;
}
+
+static int
+kni_change_link(void)
+{
+ struct rte_eth_link link;
+ int ret;
+
+ link.link_speed = 10;
+ link.link_status = ETH_LINK_UP;
+ link.link_autoneg = ETH_LINK_AUTONEG;
+ link.link_duplex = ETH_LINK_FULL_DUPLEX;
+ ret = rte_kni_update_link(test_kni_ctx, &link);
+ if (ret != 0) {
+ printf("Failed to change link state to "
+ "Up/10Mbps/AutoNeg/Full ret=%d.\n", ret);
+ return -1;
+ }
+ rte_delay_ms(1000);
+
+ link.link_speed = 0;
+ link.link_status = ETH_LINK_DOWN;
+ link.link_autoneg = ETH_LINK_FIXED;
+ link.link_duplex = ETH_LINK_FULL_DUPLEX;
+ ret = rte_kni_update_link(test_kni_ctx, &link);
+ if (ret != 0) {
+ printf("Failed to change link state to Down ret=%d.\n", ret);
+ return -1;
+ }
+ rte_delay_ms(1000);
+
+ link.link_speed = 1000;
+ link.link_status = ETH_LINK_UP;
+ link.link_autoneg = ETH_LINK_AUTONEG;
+ link.link_duplex = ETH_LINK_HALF_DUPLEX;
+ ret = rte_kni_update_link(test_kni_ctx, &link);
+ if (ret != 0) {
+ printf("Failed to change link state to "
+ "Up/1Gbps/AutoNeg/Half ret=%d.\n", ret);
+ return -1;
+ }
+ rte_delay_ms(1000);
+
+ link.link_speed = 0;
+ link.link_status = ETH_LINK_DOWN;
+ link.link_autoneg = ETH_LINK_FIXED;
+ link.link_duplex = ETH_LINK_FULL_DUPLEX;
+ ret = rte_kni_update_link(test_kni_ctx, &link);
+ if (ret != 0) {
+ printf("Failed to change link state to Down ret=%d.\n", ret);
+ return -1;
+ }
+ rte_delay_ms(1000);
+
+ link.link_speed = 40000;
+ link.link_status = ETH_LINK_UP;
+ link.link_autoneg = ETH_LINK_FIXED;
+ link.link_duplex = ETH_LINK_FULL_DUPLEX;
+ ret = rte_kni_update_link(test_kni_ctx, &link);
+ if (ret != 0) {
+ printf("Failed to change link state to "
+ "Up/40Gbps/Fixed/Full ret=%d.\n", ret);
+ return -1;
+ }
+ rte_delay_ms(1000);
+
+ link.link_speed = 0;
+ link.link_status = ETH_LINK_DOWN;
+ link.link_autoneg = ETH_LINK_FIXED;
+ link.link_duplex = ETH_LINK_FULL_DUPLEX;
+ ret = rte_kni_update_link(test_kni_ctx, &link);
+ if (ret != 0) {
+ printf("Failed to change link state to Down ret=%d.\n", ret);
+ return -1;
+ }
+ rte_delay_ms(1000);
+
+ link.link_speed = 100000;
+ link.link_status = ETH_LINK_UP;
+ link.link_autoneg = ETH_LINK_FIXED;
+ link.link_duplex = ETH_LINK_FULL_DUPLEX;
+ ret = rte_kni_update_link(test_kni_ctx, &link);
+ if (ret != 0) {
+ printf("Failed to change link state to "
+ "Up/100Gbps/Fixed/Full ret=%d.\n", ret);
+ return -1;
+ }
+ rte_delay_ms(1000);
+
+ return 0;
+}
+
/**
* This loop fully tests the basic functions of KNI. e.g. transmitting,
* receiving to, from kernel space, and kernel requests.
@@ -148,9 +239,16 @@ test_kni_loop(__rte_unused void *arg)
ret = -1;
if (system(IFCONFIG TEST_KNI_PORT" mtu 1400") == -1)
ret = -1;
+
+ ret = kni_change_link();
+ if (ret != 0) {
+ test_kni_processing_flag = 1;
+ return ret;
+ }
+ rte_delay_ms(KNI_TIMEOUT_MS);
if (system(IFCONFIG TEST_KNI_PORT" down") == -1)
ret = -1;
- rte_delay_ms(KNI_TIMEOUT_MS);
+ rte_delay_ms(1000);
test_kni_processing_flag = 1;
} else if (lcore_id == lcore_ingress) {
struct rte_mempool *mp = test_kni_lookup_mempool();
--
2.19.0
next prev parent reply other threads:[~2018-09-19 19:56 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 23:29 [dpdk-dev] [PATCH 0/2] " Dan Gora
2018-09-11 23:29 ` [dpdk-dev] [PATCH 1/2] " Dan Gora
2018-09-18 16:54 ` Ferruh Yigit
2018-09-18 17:41 ` Dan Gora
2018-09-11 23:29 ` [dpdk-dev] [PATCH 2/2] kni: set default carrier state to 'off' Dan Gora
2018-09-18 16:15 ` Ferruh Yigit
2018-09-18 16:48 ` Ferruh Yigit
2018-09-18 18:34 ` Dan Gora
2018-09-19 19:55 ` [dpdk-dev] [PATCH v2 0/5] kni: add API to set link status on kernel interface Dan Gora
2018-09-19 19:55 ` Dan Gora [this message]
2018-09-26 13:59 ` [dpdk-dev] [PATCH v2 1/5] " Ferruh Yigit
2018-09-26 14:55 ` Dan Gora
2018-09-26 16:42 ` Ferruh Yigit
2018-09-26 18:56 ` Dan Gora
2018-09-27 11:35 ` Ferruh Yigit
2018-09-27 15:40 ` Dan Gora
2018-09-27 21:49 ` Ferruh Yigit
2018-09-27 23:05 ` Dan Gora
2018-09-27 23:44 ` Ferruh Yigit
2018-09-27 23:51 ` Dan Gora
2018-09-28 8:02 ` Igor Ryzhov
2018-09-28 8:03 ` Ferruh Yigit
2018-10-03 19:07 ` Dan Gora
2018-10-10 14:09 ` Ferruh Yigit
2018-10-10 14:57 ` Dan Gora
2018-09-19 19:55 ` [dpdk-dev] [PATCH v2 2/5] kni: set default carrier state to 'off' Dan Gora
2018-09-26 13:59 ` Ferruh Yigit
2018-09-19 19:55 ` [dpdk-dev] [PATCH v2 3/5] examples/kni: monitor and update link status continually Dan Gora
2018-09-26 14:00 ` Ferruh Yigit
2018-09-26 19:16 ` Dan Gora
2018-09-27 11:54 ` Ferruh Yigit
2018-09-19 19:55 ` [dpdk-dev] [PATCH v2 4/5] examples/kni: add log msgs to show and clear stats Dan Gora
2018-09-26 14:00 ` Ferruh Yigit
2018-09-19 19:55 ` [dpdk-dev] [PATCH v2 5/5] examples/kni: improve zeroing statistics Dan Gora
2018-09-26 14:01 ` Ferruh Yigit
2018-09-26 14:48 ` Dan Gora
2018-09-27 11:40 ` Ferruh Yigit
2018-09-27 15:53 ` Dan Gora
2018-09-27 22:04 ` Ferruh Yigit
2018-09-27 22:40 ` Dan Gora
2018-09-27 0:32 ` [dpdk-dev] [PATCH v3 0/6] kni: add API to set link status on kernel interface Dan Gora
2018-09-27 0:32 ` [dpdk-dev] [PATCH v3 1/6] " Dan Gora
2018-09-27 0:32 ` [dpdk-dev] [PATCH v3 2/6] kni: add link status test Dan Gora
2018-09-27 0:32 ` [dpdk-dev] [PATCH v3 3/6] kni: set default carrier state to 'off' Dan Gora
2018-09-27 0:32 ` [dpdk-dev] [PATCH v3 4/6] examples/kni: monitor and update link status continually Dan Gora
2018-09-27 0:32 ` [dpdk-dev] [PATCH v3 5/6] examples/kni: add log msgs to show and clear stats Dan Gora
2018-09-27 0:32 ` [dpdk-dev] [PATCH v3 6/6] examples/kni: improve zeroing statistics Dan Gora
2018-10-10 14:16 ` [dpdk-dev] [PATCH v3 0/6] kni: add API to set link status on kernel interface Ferruh Yigit
2018-10-10 15:01 ` Dan Gora
2018-10-10 23:00 ` Ferruh Yigit
2018-10-10 23:36 ` Dan Gora
2018-10-17 1:04 ` [dpdk-dev] [PATCH v4 " Dan Gora
2018-10-17 15:29 ` Ferruh Yigit
2018-10-17 1:04 ` [dpdk-dev] [PATCH v4 1/6] " Dan Gora
2018-10-18 13:44 ` Ferruh Yigit
2018-10-18 19:00 ` Dan Gora
2018-10-17 1:04 ` [dpdk-dev] [PATCH v4 2/6] kni: add link status test Dan Gora
2018-10-17 1:04 ` [dpdk-dev] [PATCH v4 3/6] kni: set default carrier state of interface Dan Gora
2018-10-17 15:20 ` Ferruh Yigit
2018-10-17 1:04 ` [dpdk-dev] [PATCH v4 4/6] examples/kni: monitor and update link status continually Dan Gora
2018-10-17 1:04 ` [dpdk-dev] [PATCH v4 5/6] examples/kni: add log msgs to show and clear stats Dan Gora
2018-10-17 1:04 ` [dpdk-dev] [PATCH v4 6/6] examples/kni: improve zeroing statistics Dan Gora
2018-10-19 0:23 ` [dpdk-dev] [PATCH v5 0/5] kni: add API to set link status on kernel interface Dan Gora
2018-10-19 0:23 ` [dpdk-dev] [PATCH v5 1/5] " Dan Gora
2018-10-19 0:23 ` [dpdk-dev] [PATCH v5 2/5] kni: set default carrier state of interface Dan Gora
2018-10-19 0:23 ` [dpdk-dev] [PATCH v5 3/5] examples/kni: monitor and update link status continually Dan Gora
2018-10-22 12:51 ` Ferruh Yigit
2018-10-22 20:04 ` Dan Gora
2018-10-19 0:23 ` [dpdk-dev] [PATCH v5 4/5] examples/kni: add log msgs to show and clear stats Dan Gora
2018-10-19 0:23 ` [dpdk-dev] [PATCH v5 5/5] examples/kni: improve zeroing statistics Dan Gora
2018-10-22 13:03 ` [dpdk-dev] [PATCH v5 0/5] kni: add API to set link status on kernel interface Ferruh Yigit
2018-10-22 13:08 ` Thomas Monjalon
2018-10-22 13:14 ` Ferruh Yigit
2018-10-22 13:18 ` Thomas Monjalon
2018-10-24 20:27 ` [dpdk-dev] [PATCH v6 " Dan Gora
2018-10-24 20:27 ` [dpdk-dev] [PATCH v6 1/5] " Dan Gora
2018-10-24 20:27 ` [dpdk-dev] [PATCH v6 2/5] kni: set default carrier state of interface Dan Gora
2018-10-24 20:27 ` [dpdk-dev] [PATCH v6 3/5] examples/kni: monitor and update link status continually Dan Gora
2018-10-24 20:27 ` [dpdk-dev] [PATCH v6 4/5] examples/kni: add log msgs to show and clear stats Dan Gora
2018-10-24 20:46 ` Stephen Hemminger
2018-10-24 20:56 ` Dan Gora
2018-10-24 21:17 ` Stephen Hemminger
2018-10-24 21:45 ` Dan Gora
2018-10-24 20:27 ` [dpdk-dev] [PATCH v6 5/5] examples/kni: improve zeroing statistics Dan Gora
2018-10-24 22:26 ` [dpdk-dev] [PATCH v7 0/5] kni: add API to set link status on kernel interface Dan Gora
2018-10-24 22:26 ` [dpdk-dev] [PATCH v7 1/5] " Dan Gora
2018-10-24 22:26 ` [dpdk-dev] [PATCH v7 2/5] kni: set default carrier state of interface Dan Gora
2018-10-24 22:26 ` [dpdk-dev] [PATCH v7 3/5] examples/kni: monitor and update link status continually Dan Gora
2018-10-24 22:26 ` [dpdk-dev] [PATCH v7 4/5] examples/kni: add log msgs to show and clear stats Dan Gora
2018-10-24 22:26 ` [dpdk-dev] [PATCH v7 5/5] examples/kni: improve zeroing statistics Dan Gora
2018-10-25 12:30 ` [dpdk-dev] [PATCH v7 0/5] kni: add API to set link status on kernel interface Ferruh Yigit
2018-10-26 17:43 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180919195549.5585-2-dg@adax.com \
--to=dg@adax.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=iryzhov@nfware.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).