From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AFDE2A04DB; Thu, 15 Oct 2020 07:57:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 33E3B1DC57; Thu, 15 Oct 2020 07:57:33 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id A0DFA1DC4B for ; Thu, 15 Oct 2020 07:57:29 +0200 (CEST) IronPort-SDR: lOr3qUwL6GGeZ6vpIGPFcsvzqirzLpSQGAtu+b7DFL8F4Gm5kUBKFQ8nFH03lrxpi67Dji7oPp p5Zqx8R3wfhw== X-IronPort-AV: E=McAfee;i="6000,8403,9774"; a="163637534" X-IronPort-AV: E=Sophos;i="5.77,377,1596524400"; d="scan'208";a="163637534" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 22:57:28 -0700 IronPort-SDR: OxhC5Wr36+Pogj5eSFVn6PdkAJp2VjXGAQ7JTenfnC9nvaJ/xkff9Lmq2NgDFSVTpPsOiJXbFp WoTnDdgSkt3w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,377,1596524400"; d="scan'208";a="390873474" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by orsmga001.jf.intel.com with ESMTP; 14 Oct 2020 22:57:28 -0700 Received: from shsmsx606.ccr.corp.intel.com (10.109.6.216) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 14 Oct 2020 22:57:27 -0700 Received: from shsmsx602.ccr.corp.intel.com (10.109.6.142) by SHSMSX606.ccr.corp.intel.com (10.109.6.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 15 Oct 2020 13:57:25 +0800 Received: from shsmsx602.ccr.corp.intel.com ([10.109.6.142]) by SHSMSX602.ccr.corp.intel.com ([10.109.6.142]) with mapi id 15.01.1713.004; Thu, 15 Oct 2020 13:57:25 +0800 From: "Sun, GuinanX" To: "Xing, Beilei" , "Peng, Yuan" , "dev@dpdk.org" CC: "Wu, Jingjing" , "Zhang, Qi Z" Thread-Topic: [dpdk-dev] [PATCH] net/iavf: fix adding multicast MAC address Thread-Index: AQHWopzpJxslE9kJr0mp4oRfiq36cKmXmIKAgAAGrYCAAIZI0A== Date: Thu, 15 Oct 2020 05:57:25 +0000 Message-ID: References: <20201015020204.12658-1-guinanx.sun@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] net/iavf: fix adding multicast MAC address 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" Hi beilei > -----Original Message----- > From: Xing, Beilei > Sent: Thursday, October 15, 2020 1:37 PM > To: Peng, Yuan ; Sun, GuinanX > ; dev@dpdk.org > Cc: Wu, Jingjing ; Zhang, Qi Z ; > Sun, GuinanX > Subject: RE: [dpdk-dev] [PATCH] net/iavf: fix adding multicast MAC addres= s >=20 >=20 >=20 > > -----Original Message----- > > From: Peng, Yuan > > Sent: Thursday, October 15, 2020 1:14 PM > > To: Sun, GuinanX ; dev@dpdk.org > > Cc: Xing, Beilei ; Wu, Jingjing > > ; Zhang, Qi Z ; Sun, > > GuinanX > > Subject: RE: [dpdk-dev] [PATCH] net/iavf: fix adding multicast MAC > > address > > > > Test-by Peng, Yuan > > > > > > -----Original Message----- > > From: dev On Behalf Of Guinan Sun > > Sent: Thursday, October 15, 2020 10:02 AM > > To: dev@dpdk.org > > Cc: Xing, Beilei ; Wu, Jingjing > > ; Zhang, Qi Z ; Sun, > > GuinanX > > Subject: [dpdk-dev] [PATCH] net/iavf: fix adding multicast MAC address > > > > When the multicast address is added, it will flush previous addresses > > first, and then add new ones. > > So when adding an address that exceeds the upper limit causes a > > failure, you need to add the previous address list back. This patch fix= es the > issue. > > > > Fixes: 05e4c3aff35f ("net/iavf: support multicast configuration") > > > > Signed-off-by: Guinan Sun > > --- > > drivers/net/iavf/iavf_ethdev.c | 30 ++++++++++++++++++++++-------- > > drivers/net/iavf/iavf_vchnl.c | 3 --- > > 2 files changed, 22 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/net/iavf/iavf_ethdev.c > > b/drivers/net/iavf/iavf_ethdev.c index e68e3bc71..042edadd9 100644 > > --- a/drivers/net/iavf/iavf_ethdev.c > > +++ b/drivers/net/iavf/iavf_ethdev.c > > @@ -164,7 +164,14 @@ iavf_set_mc_addr_list(struct rte_eth_dev *dev, > > struct iavf_info *vf =3D IAVF_DEV_PRIVATE_TO_VF(dev->data- > > >dev_private); > > struct iavf_adapter *adapter =3D > > IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); > > -int err; > > +int err, temp_err; > > + > > +if (mc_addrs_num > IAVF_NUM_MACADDR_MAX) { PMD_DRV_LOG(ERR, > > + "can't add more than a limited number (%u) of > > addresses.", > > + (uint32_t)IAVF_NUM_MACADDR_MAX); > > +return -EINVAL; > > +} > > > > /* flush previous addresses */ > > err =3D iavf_add_del_mc_addr_list(adapter, vf->mc_addrs, vf- > > >mc_addrs_num, @@ -172,17 +179,24 @@ iavf_set_mc_addr_list(struct > > rte_eth_dev *dev, > > if (err) > > return err; > > > > -vf->mc_addrs_num =3D 0; > > - > > /* add new ones */ > > err =3D iavf_add_del_mc_addr_list(adapter, mc_addrs, mc_addrs_num, > > true); -if (err) -return err; > > > > -vf->mc_addrs_num =3D mc_addrs_num; > > -memcpy(vf->mc_addrs, mc_addrs, mc_addrs_num * sizeof(*mc_addrs)); > > +if (err) { > > +/* When adding new addresses fail, need to add the > > + * previous addresses back. > > + */ > > +temp_err =3D iavf_add_del_mc_addr_list(adapter, vf->mc_addrs, > > + vf->mc_addrs_num, true); >=20 > Can we reuse err here? This err cannot be reused. When performing mac address addition, the testpmd side will first add the m= ac address to mac_pool. When the driver layer returns that it failed to add an address, the tespmd = layer will delete the failed address from mac_pool. If err is reused, the successful result of executing the add back address w= ill overwrite the previous err, causing problems with the address stored in= mac_pool on the testpmd side. >=20 > > +if (temp_err) > > +return temp_err; > > +} else { > > +vf->mc_addrs_num =3D mc_addrs_num; > > +memcpy(vf->mc_addrs, > > + mc_addrs, mc_addrs_num * sizeof(*mc_addrs)); } > > > > -return 0; > > +return err; > > } > > > > static int > > diff --git a/drivers/net/iavf/iavf_vchnl.c > > b/drivers/net/iavf/iavf_vchnl.c index > > db0b76876..a2295f879 100644 > > --- a/drivers/net/iavf/iavf_vchnl.c > > +++ b/drivers/net/iavf/iavf_vchnl.c > > @@ -1107,9 +1107,6 @@ iavf_add_del_mc_addr_list(struct iavf_adapter > > *adapter, if (mc_addrs =3D=3D NULL || mc_addrs_num =3D=3D 0) return 0= ; > > > > -if (mc_addrs_num > IAVF_NUM_MACADDR_MAX) -return -EINVAL; > > - > > list =3D (struct virtchnl_ether_addr_list *)cmd_buffer; list->vsi_id = =3D > > vf->vsi_res->vsi_id; list->num_elements =3D mc_addrs_num; > > -- > > 2.13.6 >=20