hv_netvsc: Allocate rx indirection table size dynamically
PATCH v5 1/1 hv_netvsc: Allocate rx indirection table size dynamically
Allocate the size of rx indirection table dynamically in netvsc from the value of size provided by OID_GEN_RECEIVE_SCALE_CAPABILITIES query instead of using a constant value of ITAB_NUM.
Tested-on: Ubuntu22 (azure VM, SKU size: Standard_F72s_v2) Testcases:
1. ethtool -x eth0 output
2. LISA testcase:PERF-NETWORK-TCP-THROUGHPUT-MULTICONNECTION-NTTTCP-Synthetic
3. LISA testcase:PERF-NETWORK-TCP-THROUGHPUT-MULTICONNECTION-NTTTCP-SRIOV
---
Changes in v5:
* Follwoed the RCT format for varible declarations in rndix_filter.c
--- drivers/net/hyperv/hyperv_net.h | 5 ++++- drivers/net/hyperv/netvsc_drv.c | 10 ++++++---- drivers/net/hyperv/rndis_filter.c | 27 +++++++++++++++++++++++---- 3 files changed, 33 insertions(+), 9 deletions(-)
drivers/net/hyperv/hyperv_net.h +4 -1
@@ -74,6 +74,7 @@ struct ndis_recv_scale_cap { /* NDIS_RECEIVE_SCALE_CAPABILITIES */#define NDIS_RSS_HASH_SECRET_KEY_MAX_SIZE_REVISION_2 40#define ITAB_NUM 128 +#define ITAB_NUM_MAX 256struct ndis_recv_scale_param {/* NDIS_RECEIVE_SCALE_PARAMETERS */ struct ndis_obj_header hdr;
@@ -1034,7 +1035,9 @@ struct net_device_context {u32 tx_table[VRSS_SEND_TAB_SIZE ]; -u16 rx_table[ITAB_NUM ]; +u16 *rx_table; + +u32 rx_table_sz;/* Ethtool settings */ u8 duplex;
drivers/net/hyperv/netvsc_drv.c +6 -4
@@ -1747,7 +1747,9 @@ static u32 netvsc_get_rxfh_key_size(struct net_device *dev)static u32 netvsc_rss_indir_size (struct net_device *dev) { -return ITAB_NUM ; +struct net_device_context *ndc =netdev_priv (dev); + +return ndc->rx_table_sz; } static int netvsc_get_rxfh(struct net_device *dev, u32 *indir, u8 *key,
@@ -1766,7 +1768,7 @@ static int netvsc_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, rndis_dev = ndev->extension;if (indir) { -for (i =0 ; i <ITAB_NUM ; i++) +for (i =0 ; i < ndc->rx_table_sz; i++) indir[i] = ndc->rx_table[i]; }
@@ -1792,11 +1794,11 @@ static int netvsc_set_rxfh(struct net_device *dev, const u32 *indir, rndis_dev = ndev->extension;if (indir) { -for (i =0 ; i <ITAB_NUM ; i++) +for (i =0 ; i < ndc->rx_table_sz; i++)if (indir[i] >= ndev->num_chn)return -EINVAL ; -for (i =0 ; i <ITAB_NUM ; i++) +for (i =0 ; i < ndc->rx_table_sz; i++) ndc->rx_table[i] = indir[i]; }
drivers/net/hyperv/rndis_filter.c +23 -4
@@ -21,6 +21,7 @@#include <linux/rtnetlink.h> #include <linux/ucs2_string.h> #include <linux/string.h> +#include <linux/slab.h> #include "hyperv_net.h" #include "netvsc_trace.h"
@@ -927,7 +928,7 @@ static int rndis_set_rss_param_msg(struct rndis_device *rdev,struct rndis_set_request *set;struct rndis_set_complete *set_complete;u32 extlen =sizeof (struct ndis_recv_scale_param ) + -4 *ITAB_NUM +NETVSC_HASH_KEYLEN ; +4 * ndc->rx_table_sz +NETVSC_HASH_KEYLEN ;struct ndis_recv_scale_param *rssp;u32 *itab;u8 *keyp;
@@ -953,7 +954,7 @@ static int rndis_set_rss_param_msg(struct rndis_device *rdev, rssp->hashinfo =NDIS_HASH_FUNC_TOEPLITZ |NDIS_HASH_IPV4 |NDIS_HASH_TCP_IPV4 |NDIS_HASH_IPV6 |NDIS_HASH_TCP_IPV6 ; - rssp->indirect_tabsize =4 *ITAB_NUM ; + rssp->indirect_tabsize =4 * ndc->rx_table_sz; rssp->indirect_taboffset =sizeof (struct ndis_recv_scale_param ); rssp->hashkey_size =NETVSC_HASH_KEYLEN ; rssp->hashkey_offset = rssp->indirect_taboffset +
@@ -961,7 +962,7 @@ static int rndis_set_rss_param_msg(struct rndis_device *rdev,/* Set indirection table entries */ itab = (u32 *)(rssp +1 ); -for (i =0 ; i <ITAB_NUM ; i++) +for (i =0 ; i < ndc->rx_table_sz; i++) itab[i] = ndc->rx_table[i];/* Set hask key values */
@@ -1548,6 +1549,18 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,if (ret || rsscap.num_recv_que <2 ) goto out; +if (rsscap.num_indirect_tabent && + rsscap.num_indirect_tabent <=ITAB_NUM_MAX ) + ndc->rx_table_sz = rsscap.num_indirect_tabent; +else + ndc->rx_table_sz =ITAB_NUM ; + + ndc->rx_table =kcalloc (ndc->rx_table_sz,sizeof (u16),GFP_KERNEL ); +if (!ndc->rx_table) { + ret = -ENOMEM ; + goto err_dev_remv; + } +/* This guarantees that num_possible_rss_qs <= num_online_cpus */ num_possible_rss_qs =min_t (u32,num_online_cpus (), rsscap.num_recv_que);
@@ -1558,7 +1571,7 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev, net_device->num_chn =min (net_device->max_chn, device_info->num_chn);if (!netif_is_rxfh_configured (net)) { -for (i =0 ; i <ITAB_NUM ; i++) +for (i =0 ; i < ndc->rx_table_sz; i++) ndc->rx_table[i] =ethtool_rxfh_indir_default ( i, net_device->num_chn); }
@@ -1596,11 +1609,17 @@ void rndis_filter_device_remove(struct hv_device *dev, struct netvsc_device *net_dev) {struct rndis_device *rndis_dev = net_dev->extension; +struct net_device_context *ndc =netdev_priv (net); +struct net_device *net =hv_get_drvdata (dev);/* Halt and release the rndis device */ rndis_filter_halt_device (net_dev, rndis_dev);netvsc_device_remove (dev); + + ndc->rx_table_sz =0 ; +kfree (ndc->rx_table); + ndc->rx_table =NULL ; }int rndis_filter_open (struct netvsc_device *nvdev)
Signature · 1 line
2.34.1
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Shradha,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linus/master]
[also build test WARNING on horms-ipvs/master v6.4-rc5 next-20230605] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Shradha-Gupta/hv_netvsc-Allocate-rx-indirection-table-size-dynamically/20230605-151438 base: linus/master patch link: https://lore.kernel.org/r/1685949196-16175-1-git-send-email-shradhagupta%40linux.microsoft.com patch subject: [PATCH v5] hv_netvsc: Allocate rx indirection table size dynamically config: x86_64-rhel-8.3 (https://download.01.org/0day-ci/archive/20230605/[email protected]/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/cd4dda15951edad50a4ffd51e084863ef2f50bd3
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Shradha-Gupta/hv_netvsc-Allocate-rx-indirection-table-size-dynamically/20230605-151438 git checkout cd4dda15951edad50a4ffd51e084863ef2f50bd3
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 olddefconfig
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/net/hyperv/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
drivers/net/hyperv/rndis_filter.c: In function 'rndis_filter_device_remove':
drivers/net/hyperv/rndis_filter.c:1612:54: error: 'net' undeclared (first use in this function)
1612 | struct net_device_context *ndc = netdev_priv(net);
| ^~~
drivers/net/hyperv/rndis_filter.c:1612:54: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/net/hyperv/rndis_filter.c:1613:28: warning: unused variable 'net' [-Wunused-variable]
1613 | struct net_device *net = hv_get_drvdata(dev);
| ^~~vim +/net +1613 drivers/net/hyperv/rndis_filter.c
1607
1608 void rndis_filter_device_remove(struct hv_device *dev,
1609 struct netvsc_device *net_dev)
1610 {
1611 struct rndis_device *rndis_dev = net_dev->extension;
1612 struct net_device_context *ndc = netdev_priv(net);
> 1613 struct net_device *net = hv_get_drvdata(dev);
1614
1615 /* Halt and release the rndis device */
1616 rndis_filter_halt_device(net_dev, rndis_dev);
1617
1618 netvsc_device_remove(dev);
1619
1620 ndc->rx_table_sz = 0;
1621 kfree(ndc->rx_table);
1622 ndc->rx_table = NULL;
1623 }
1624
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Shradha,
kernel test robot noticed the following build errors:
[auto build test ERROR on linus/master]
[also build test ERROR on horms-ipvs/master v6.4-rc5 next-20230605] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Shradha-Gupta/hv_netvsc-Allocate-rx-indirection-table-size-dynamically/20230605-151438 base: linus/master patch link: https://lore.kernel.org/r/1685949196-16175-1-git-send-email-shradhagupta%40linux.microsoft.com patch subject: [PATCH v5] hv_netvsc: Allocate rx indirection table size dynamically config: i386-randconfig-r002-20230605 (https://download.01.org/0day-ci/archive/20230605/[email protected]/config) compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)
reproduce (this is a W=1 build):
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/cd4dda15951edad50a4ffd51e084863ef2f50bd3
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Shradha-Gupta/hv_netvsc-Allocate-rx-indirection-table-size-dynamically/20230605-151438 git checkout cd4dda15951edad50a4ffd51e084863ef2f50bd3
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=i386 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/net/hyperv/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> drivers/net/hyperv/rndis_filter.c:1612:47: error: use of undeclared identifier 'net'
struct net_device_context *ndc = netdev_priv(net);
^1 error generated.
vim +/net +1612 drivers/net/hyperv/rndis_filter.c
1607
1608 void rndis_filter_device_remove(struct hv_device *dev,
1609 struct netvsc_device *net_dev)
1610 {
1611 struct rndis_device *rndis_dev = net_dev->extension;
> 1612 struct net_device_context *ndc = netdev_priv(net);
1613 struct net_device *net = hv_get_drvdata(dev);
1614
1615 /* Halt and release the rndis device */
1616 rndis_filter_halt_device(net_dev, rndis_dev);
1617
1618 netvsc_device_remove(dev);
1619
1620 ndc->rx_table_sz = 0;
1621 kfree(ndc->rx_table);
1622 ndc->rx_table = NULL;
1623 }
1624
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki