From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id CDB272BAC; Wed, 25 Jul 2018 14:43:13 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jul 2018 05:43:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,401,1526367600"; d="scan'208";a="248230475" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga005.fm.intel.com with ESMTP; 25 Jul 2018 05:43:12 -0700 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 25 Jul 2018 05:43:12 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 25 Jul 2018 05:43:11 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.100]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.81]) with mapi id 14.03.0319.002; Wed, 25 Jul 2018 20:43:09 +0800 From: "Zhang, Qi Z" To: "Xing, Beilei" CC: "dev@dpdk.org" , "Stillwell Jr, Paul M" , "stable@dpdk.org" Thread-Topic: [PATCH] net/i40e: fix multiple device arguments parsing error Thread-Index: AQHUI+HHpYneYIjiqk2Ef0BMCR0j76Sf4RLA Date: Wed, 25 Jul 2018 12:43:08 +0000 Message-ID: <039ED4275CED7440929022BC67E706115325EC04@SHSMSX103.ccr.corp.intel.com> References: <1532500602-130919-1-git-send-email-beilei.xing@intel.com> In-Reply-To: <1532500602-130919-1-git-send-email-beilei.xing@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZGI1YjY2YjAtNDkyYy00OTUwLWJjYjItMWZhNmNkYmUyYTA0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoibW1PNDZvWG5SVExcL3Ezc2g2VGMrQ29PSFJ6ZE9GR3J5YkZYWmU1Nnphd2t3dWZYd3ZzXC8zajZSMWFzQkxzVmhYIn0= x-ctpclassification: CTP_NT x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] net/i40e: fix multiple device arguments parsing error 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: Wed, 25 Jul 2018 12:43:14 -0000 Hi Beilei > -----Original Message----- > From: Xing, Beilei > Sent: Wednesday, July 25, 2018 2:37 PM > To: Zhang, Qi Z > Cc: dev@dpdk.org; Stillwell Jr, Paul M ; > stable@dpdk.org > Subject: [PATCH] net/i40e: fix multiple device arguments parsing error >=20 > There will be parsing error when using multiple device arguments. This pa= tch > fixes the issue Could you explain more about what is the issue this patch is going to fix. Though I think the patch looks make things better, but I can't figure out w= hat is the issue to fix. Maybe you can add an example of the devargs with problem and the error mess= age=20 Regards Qi >=20 > Fixes: cfdfca493cae ("net/i40e: fix multiple driver support") > Fixes: ee653bd80044 ("net/i40e: determine number of queues per VF at run > time") > Cc: stable@dpdk.org >=20 > Signed-off-by: Beilei Xing > --- > drivers/net/i40e/i40e_ethdev.c | 45 > ++++++++++++++++++++++++++++++------------ > 1 file changed, 32 insertions(+), 13 deletions(-) >=20 > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethde= v.c > index 66431e0..e3063cc 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -42,6 +42,8 @@ >=20 > #define ETH_I40E_FLOATING_VEB_ARG "enable_floating_veb" > #define ETH_I40E_FLOATING_VEB_LIST_ARG "floating_veb_list" > +#define ETH_I40E_SUPPORT_MULTI_DRIVER "support-multi-driver" > +#define ETH_I40E_QUEUE_NUM_PER_VF_ARG "queue-num-per-vf" >=20 > #define I40E_CLEAR_PXE_WAIT_MS 200 >=20 > @@ -401,6 +403,13 @@ static void i40e_notify_all_vfs_link_status(struct > rte_eth_dev *dev); int i40e_logtype_init; int i40e_logtype_driver; >=20 > +static const char *const valid_keys[] =3D { > + ETH_I40E_FLOATING_VEB_ARG, > + ETH_I40E_FLOATING_VEB_LIST_ARG, > + ETH_I40E_SUPPORT_MULTI_DRIVER, > + ETH_I40E_QUEUE_NUM_PER_VF_ARG, > + NULL}; > + > static const struct rte_pci_id pci_id_i40e_map[] =3D { > { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_SFP_XL710) }, > { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_QEMU) }, @@ > -852,7 +861,7 @@ config_vf_floating_veb(struct rte_devargs *devargs, > if (devargs =3D=3D NULL) > return; >=20 > - kvlist =3D rte_kvargs_parse(devargs->args, NULL); > + kvlist =3D rte_kvargs_parse(devargs->args, valid_keys); > if (kvlist =3D=3D NULL) > return; >=20 > @@ -893,7 +902,7 @@ is_floating_veb_supported(struct rte_devargs > *devargs) > if (devargs =3D=3D NULL) > return 0; >=20 > - kvlist =3D rte_kvargs_parse(devargs->args, NULL); > + kvlist =3D rte_kvargs_parse(devargs->args, valid_keys); > if (kvlist =3D=3D NULL) > return 0; >=20 > @@ -1100,8 +1109,6 @@ i40e_init_queue_region_conf(struct rte_eth_dev > *dev) > memset(info, 0, sizeof(struct i40e_queue_regions)); } >=20 > -#define ETH_I40E_SUPPORT_MULTI_DRIVER "support-multi-driver" > - > static int > i40e_parse_multi_drv_handler(__rte_unused const char *key, > const char *value, > @@ -1133,9 +1140,8 @@ static int > i40e_support_multi_driver(struct rte_eth_dev *dev) { > struct i40e_pf *pf =3D I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); > - static const char *const valid_keys[] =3D { > - ETH_I40E_SUPPORT_MULTI_DRIVER, NULL}; > struct rte_kvargs *kvlist; > + int kvargs_count; >=20 > /* Enable global configuration by default */ > pf->support_multi_driver =3D false; > @@ -1147,7 +1153,13 @@ i40e_support_multi_driver(struct rte_eth_dev > *dev) > if (!kvlist) > return -EINVAL; >=20 > - if (rte_kvargs_count(kvlist, ETH_I40E_SUPPORT_MULTI_DRIVER) > 1) > + kvargs_count =3D rte_kvargs_count(kvlist, > ETH_I40E_SUPPORT_MULTI_DRIVER); > + if (!kvargs_count) { > + rte_kvargs_free(kvlist); > + return 0; > + } > + > + if (kvargs_count > 1) > PMD_DRV_LOG(WARNING, "More than one argument \"%s\" and > only " > "the first invalid or last valid one is used !", > ETH_I40E_SUPPORT_MULTI_DRIVER); > @@ -4357,7 +4369,6 @@ i40e_get_cap(struct i40e_hw *hw) } >=20 > #define RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF 4 > -#define QUEUE_NUM_PER_VF_ARG "queue-num-per-vf" >=20 > static int i40e_pf_parse_vf_queue_number_handler(const char *key, > const char *value, > @@ -4391,9 +4402,9 @@ static int > i40e_pf_parse_vf_queue_number_handler(const char *key, >=20 > static int i40e_pf_config_vf_rxq_number(struct rte_eth_dev *dev) { > - static const char * const valid_keys[] =3D {QUEUE_NUM_PER_VF_ARG, > NULL}; > struct i40e_pf *pf =3D I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); > struct rte_kvargs *kvlist; > + int kvargs_count; >=20 > /* set default queue number per VF as 4 */ > pf->vf_nb_qp_max =3D RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF; @@ > -4405,12 +4416,18 @@ static int i40e_pf_config_vf_rxq_number(struct > rte_eth_dev *dev) > if (kvlist =3D=3D NULL) > return -(EINVAL); >=20 > - if (rte_kvargs_count(kvlist, QUEUE_NUM_PER_VF_ARG) > 1) > + kvargs_count =3D rte_kvargs_count(kvlist, > ETH_I40E_QUEUE_NUM_PER_VF_ARG); > + if (!kvargs_count) { > + rte_kvargs_free(kvlist); > + return 0; > + } > + > + if (kvargs_count > 1) > PMD_DRV_LOG(WARNING, "More than one argument \"%s\" and > only " > "the first invalid or last valid one is used !", > - QUEUE_NUM_PER_VF_ARG); > + ETH_I40E_QUEUE_NUM_PER_VF_ARG); >=20 > - rte_kvargs_process(kvlist, QUEUE_NUM_PER_VF_ARG, > + rte_kvargs_process(kvlist, ETH_I40E_QUEUE_NUM_PER_VF_ARG, > i40e_pf_parse_vf_queue_number_handler, pf); >=20 > rte_kvargs_free(kvlist); > @@ -12509,5 +12526,7 @@ i40e_init_log(void) } >=20 > RTE_PMD_REGISTER_PARAM_STRING(net_i40e, > - QUEUE_NUM_PER_VF_ARG "=3D1|2|4|8|16" > + ETH_I40E_FLOATING_VEB_ARG "=3D1" > + ETH_I40E_FLOATING_VEB_LIST_ARG "=3D" > + ETH_I40E_QUEUE_NUM_PER_VF_ARG "=3D1|2|4|8|16" > ETH_I40E_SUPPORT_MULTI_DRIVER "=3D1"); > -- > 2.5.5