From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 6B4D11B3D2 for ; Tue, 26 Mar 2019 17:29:14 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2QGPoYi028782; Tue, 26 Mar 2019 09:29:13 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=cOcbiAVUsV6iT1bjyq2c/Y1Yj9CrRrjuNvjZOnQYhRY=; b=GaE2P0WAfkSaovrIwbriumD551Ef4UK4hlp6XVBr8pcBcmoWI3rmyFNXUEl4aghh871J ODSSZ2Fu9v5QHMYA5MTdcYmeW9+jxZkEYvlkQ557KGE75wX7yvf2hQjYAQ8cIMNQF3Nn /E1ssv6o4IuRS6LIaAuXy/T99JDRV/7xvZq8P9VH0dHoDSMO3xNRi/aRBLznxPCQ8Wtd JpXRLoNd8VGnbBZUa0KtYyJXsGPGfgdtwLtJT4kR5yRDBtfKUVJ/5rbRMLQXck6tWtVY KIMJsEs3PFDEINMjt/I3I+Rla1fqgBVw7+C1NR1k+xw0mRujiVYD41PrYuJ/RpIdakNE eQ== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 2rfjtbrvmc-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 26 Mar 2019 09:29:13 -0700 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 26 Mar 2019 09:29:11 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Tue, 26 Mar 2019 09:29:11 -0700 Received: from pt-lxl0023.marvell.com (unknown [10.5.213.12]) by maili.marvell.com (Postfix) with ESMTP id 6FE813F7041; Tue, 26 Mar 2019 09:29:10 -0700 (PDT) From: To: CC: , , Liron Himi Date: Tue, 26 Mar 2019 20:40:10 +0200 Message-ID: <1553625610-18172-1-git-send-email-lironh@marvell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553546882-22702-1-git-send-email-lironh@marvell.com> References: <1553546882-22702-1-git-send-email-lironh@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-03-26_11:, , signatures=0 Subject: [dpdk-dev] [PATCH v6] net/kni: calc mbuf&mtu according to given mb_pool 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, 26 Mar 2019 16:29:14 -0000 From: Liron Himi - mbuf_size and mtu are now being calculated according to the given mb-pool. - max_mtu is now being set according to the given mtu the above two changes provide the ability to work with jumbo frames Signed-off-by: Liron Himi --- doc/guides/nics/kni.rst | 3 ++- doc/guides/prog_guide/kernel_nic_interface.rst | 2 ++ doc/guides/rel_notes/release_19_05.rst | 9 +++++++++ drivers/net/kni/rte_eth_kni.c | 10 +++++++--- kernel/linux/kni/compat.h | 4 ++++ kernel/linux/kni/kni_misc.c | 3 +++ 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst index 204fbd5..a66c595 100644 --- a/doc/guides/nics/kni.rst +++ b/doc/guides/nics/kni.rst @@ -55,7 +55,8 @@ configuration: Interface name: kni# force bind kernel thread to a core : NO - mbuf size: MAX_PACKET_SZ + mbuf size: (rte_pktmbuf_data_room_size(pktmbuf_pool) - RTE_PKTMBUF_HEADROOM) + mtu: (conf.mbuf_size - ETHER_HDR_LEN) KNI control path is not supported with the PMD, since there is no physical backend device by default. diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst index 33ea980..c274b25 100644 --- a/doc/guides/prog_guide/kernel_nic_interface.rst +++ b/doc/guides/prog_guide/kernel_nic_interface.rst @@ -187,6 +187,8 @@ The ``struct rte_kni_conf`` structure contains fields which allow the user to specify the interface name, set the MTU size, set an explicit or random MAC address and control the affinity of the kernel Rx thread(s) (both single and multi-threaded modes). +By default the KNI sample example gets the MTU from the matching device, +and in case of KNI PMD it is derived from mbuf buffer length The ``struct rte_kni_ops`` structure contains pointers to functions to handle requests from the ``rte_kni`` kernel module. These functions diff --git a/doc/guides/rel_notes/release_19_05.rst b/doc/guides/rel_notes/release_19_05.rst index 61a2c73..dceca50 100644 --- a/doc/guides/rel_notes/release_19_05.rst +++ b/doc/guides/rel_notes/release_19_05.rst @@ -54,6 +54,15 @@ New Features Also, make sure to start the actual text at the margin. ========================================================= +* **Updated KNI kernel module, KNI PMD driver.** + + Updated the KNI kernel module to set the max_mtu according to the given + initial mtu size. Without it, the maximum mtu was 1500. + + Updated the KNI PMD driver to set the mbuf_size and mtu based on + the given mb-pool. This provide the ability to pass jumbo frames + if the mb-pool contains suitable buffers' size. + * **Updated Solarflare network PMD.** Updated the sfc_efx driver including the following changes: diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c index a1e9970..5e02224 100644 --- a/drivers/net/kni/rte_eth_kni.c +++ b/drivers/net/kni/rte_eth_kni.c @@ -16,9 +16,11 @@ /* Only single queue supported */ #define KNI_MAX_QUEUE_PER_PORT 1 -#define MAX_PACKET_SZ 2048 #define MAX_KNI_PORTS 8 +#define KNI_ETHER_MTU(mbuf_size) \ + ((mbuf_size) - ETHER_HDR_LEN) /**< Ethernet MTU. */ + #define ETH_KNI_NO_REQUEST_THREAD_ARG "no_request_thread" static const char * const valid_arguments[] = { ETH_KNI_NO_REQUEST_THREAD_ARG, @@ -123,11 +125,13 @@ eth_kni_start(struct rte_eth_dev *dev) struct rte_kni_conf conf; const char *name = dev->device->name + 4; /* remove net_ */ + mb_pool = internals->rx_queues[0].mb_pool; snprintf(conf.name, RTE_KNI_NAMESIZE, "%s", name); conf.force_bind = 0; conf.group_id = port_id; - conf.mbuf_size = MAX_PACKET_SZ; - mb_pool = internals->rx_queues[0].mb_pool; + conf.mbuf_size = + rte_pktmbuf_data_room_size(mb_pool) - RTE_PKTMBUF_HEADROOM; + conf.mtu = KNI_ETHER_MTU(conf.mbuf_size); internals->kni = rte_kni_alloc(mb_pool, &conf, NULL); if (internals->kni == NULL) { diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 3c575c7..562d8bf 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -114,6 +114,10 @@ #define ndo_change_mtu ndo_change_mtu_rh74 #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) +#define HAVE_MAX_MTU_PARAM +#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) #define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER #endif diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c index 522ae23..04c78eb 100644 --- a/kernel/linux/kni/kni_misc.c +++ b/kernel/linux/kni/kni_misc.c @@ -459,6 +459,9 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, if (dev_info.mtu) net_dev->mtu = dev_info.mtu; +#ifdef HAVE_MAX_MTU_PARAM + net_dev->max_mtu = net_dev->mtu; +#endif ret = register_netdev(net_dev); if (ret) { -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 054D0A05D3 for ; Tue, 26 Mar 2019 17:29:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BE4011B3E0; Tue, 26 Mar 2019 17:29:15 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 6B4D11B3D2 for ; Tue, 26 Mar 2019 17:29:14 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2QGPoYi028782; Tue, 26 Mar 2019 09:29:13 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=cOcbiAVUsV6iT1bjyq2c/Y1Yj9CrRrjuNvjZOnQYhRY=; b=GaE2P0WAfkSaovrIwbriumD551Ef4UK4hlp6XVBr8pcBcmoWI3rmyFNXUEl4aghh871J ODSSZ2Fu9v5QHMYA5MTdcYmeW9+jxZkEYvlkQ557KGE75wX7yvf2hQjYAQ8cIMNQF3Nn /E1ssv6o4IuRS6LIaAuXy/T99JDRV/7xvZq8P9VH0dHoDSMO3xNRi/aRBLznxPCQ8Wtd JpXRLoNd8VGnbBZUa0KtYyJXsGPGfgdtwLtJT4kR5yRDBtfKUVJ/5rbRMLQXck6tWtVY KIMJsEs3PFDEINMjt/I3I+Rla1fqgBVw7+C1NR1k+xw0mRujiVYD41PrYuJ/RpIdakNE eQ== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 2rfjtbrvmc-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 26 Mar 2019 09:29:13 -0700 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 26 Mar 2019 09:29:11 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Tue, 26 Mar 2019 09:29:11 -0700 Received: from pt-lxl0023.marvell.com (unknown [10.5.213.12]) by maili.marvell.com (Postfix) with ESMTP id 6FE813F7041; Tue, 26 Mar 2019 09:29:10 -0700 (PDT) From: To: CC: , , Liron Himi Date: Tue, 26 Mar 2019 20:40:10 +0200 Message-ID: <1553625610-18172-1-git-send-email-lironh@marvell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553546882-22702-1-git-send-email-lironh@marvell.com> References: <1553546882-22702-1-git-send-email-lironh@marvell.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-03-26_11:, , signatures=0 Subject: [dpdk-dev] [PATCH v6] net/kni: calc mbuf&mtu according to given mb_pool 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Message-ID: <20190326184010.WlHwhQ1L2ZTU5a7llhFq47oEidbvtLH3wn4tNN3U7Us@z> From: Liron Himi - mbuf_size and mtu are now being calculated according to the given mb-pool. - max_mtu is now being set according to the given mtu the above two changes provide the ability to work with jumbo frames Signed-off-by: Liron Himi --- doc/guides/nics/kni.rst | 3 ++- doc/guides/prog_guide/kernel_nic_interface.rst | 2 ++ doc/guides/rel_notes/release_19_05.rst | 9 +++++++++ drivers/net/kni/rte_eth_kni.c | 10 +++++++--- kernel/linux/kni/compat.h | 4 ++++ kernel/linux/kni/kni_misc.c | 3 +++ 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst index 204fbd5..a66c595 100644 --- a/doc/guides/nics/kni.rst +++ b/doc/guides/nics/kni.rst @@ -55,7 +55,8 @@ configuration: Interface name: kni# force bind kernel thread to a core : NO - mbuf size: MAX_PACKET_SZ + mbuf size: (rte_pktmbuf_data_room_size(pktmbuf_pool) - RTE_PKTMBUF_HEADROOM) + mtu: (conf.mbuf_size - ETHER_HDR_LEN) KNI control path is not supported with the PMD, since there is no physical backend device by default. diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst index 33ea980..c274b25 100644 --- a/doc/guides/prog_guide/kernel_nic_interface.rst +++ b/doc/guides/prog_guide/kernel_nic_interface.rst @@ -187,6 +187,8 @@ The ``struct rte_kni_conf`` structure contains fields which allow the user to specify the interface name, set the MTU size, set an explicit or random MAC address and control the affinity of the kernel Rx thread(s) (both single and multi-threaded modes). +By default the KNI sample example gets the MTU from the matching device, +and in case of KNI PMD it is derived from mbuf buffer length The ``struct rte_kni_ops`` structure contains pointers to functions to handle requests from the ``rte_kni`` kernel module. These functions diff --git a/doc/guides/rel_notes/release_19_05.rst b/doc/guides/rel_notes/release_19_05.rst index 61a2c73..dceca50 100644 --- a/doc/guides/rel_notes/release_19_05.rst +++ b/doc/guides/rel_notes/release_19_05.rst @@ -54,6 +54,15 @@ New Features Also, make sure to start the actual text at the margin. ========================================================= +* **Updated KNI kernel module, KNI PMD driver.** + + Updated the KNI kernel module to set the max_mtu according to the given + initial mtu size. Without it, the maximum mtu was 1500. + + Updated the KNI PMD driver to set the mbuf_size and mtu based on + the given mb-pool. This provide the ability to pass jumbo frames + if the mb-pool contains suitable buffers' size. + * **Updated Solarflare network PMD.** Updated the sfc_efx driver including the following changes: diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c index a1e9970..5e02224 100644 --- a/drivers/net/kni/rte_eth_kni.c +++ b/drivers/net/kni/rte_eth_kni.c @@ -16,9 +16,11 @@ /* Only single queue supported */ #define KNI_MAX_QUEUE_PER_PORT 1 -#define MAX_PACKET_SZ 2048 #define MAX_KNI_PORTS 8 +#define KNI_ETHER_MTU(mbuf_size) \ + ((mbuf_size) - ETHER_HDR_LEN) /**< Ethernet MTU. */ + #define ETH_KNI_NO_REQUEST_THREAD_ARG "no_request_thread" static const char * const valid_arguments[] = { ETH_KNI_NO_REQUEST_THREAD_ARG, @@ -123,11 +125,13 @@ eth_kni_start(struct rte_eth_dev *dev) struct rte_kni_conf conf; const char *name = dev->device->name + 4; /* remove net_ */ + mb_pool = internals->rx_queues[0].mb_pool; snprintf(conf.name, RTE_KNI_NAMESIZE, "%s", name); conf.force_bind = 0; conf.group_id = port_id; - conf.mbuf_size = MAX_PACKET_SZ; - mb_pool = internals->rx_queues[0].mb_pool; + conf.mbuf_size = + rte_pktmbuf_data_room_size(mb_pool) - RTE_PKTMBUF_HEADROOM; + conf.mtu = KNI_ETHER_MTU(conf.mbuf_size); internals->kni = rte_kni_alloc(mb_pool, &conf, NULL); if (internals->kni == NULL) { diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 3c575c7..562d8bf 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -114,6 +114,10 @@ #define ndo_change_mtu ndo_change_mtu_rh74 #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) +#define HAVE_MAX_MTU_PARAM +#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) #define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER #endif diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c index 522ae23..04c78eb 100644 --- a/kernel/linux/kni/kni_misc.c +++ b/kernel/linux/kni/kni_misc.c @@ -459,6 +459,9 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, if (dev_info.mtu) net_dev->mtu = dev_info.mtu; +#ifdef HAVE_MAX_MTU_PARAM + net_dev->max_mtu = net_dev->mtu; +#endif ret = register_netdev(net_dev); if (ret) { -- 2.7.4