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 C02BAA04DB; Thu, 15 Oct 2020 08:44:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 11DC51DC9F; Thu, 15 Oct 2020 08:44:06 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id C95251DC98 for ; Thu, 15 Oct 2020 08:44:04 +0200 (CEST) IronPort-SDR: dTHDvDBTbeCj+/rg8Qrw39ONzQ7w0muDkp7fd5NQKaD5Ks2HdfWPaheYzRnAFsGS0dRn2KaKJ1 LaY8EU/ItmxQ== X-IronPort-AV: E=McAfee;i="6000,8403,9774"; a="154104710" X-IronPort-AV: E=Sophos;i="5.77,378,1596524400"; d="scan'208";a="154104710" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 23:44:00 -0700 IronPort-SDR: BHHC6AGhsYNT4yIrQEDH0Li/mtyeHJi06cti86Kko7HGWafytZQxz7jkS7s5/ppMD1AxlrdzM5 FLOh7SWKr0Mg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,378,1596524400"; d="scan'208";a="345967151" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by fmsmga004.fm.intel.com with ESMTP; 14 Oct 2020 23:44:00 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX606.amr.corp.intel.com (10.22.229.19) 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 23:43:59 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 14 Oct 2020 23:43:59 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.43) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Wed, 14 Oct 2020 23:43:59 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ilq11lqi+eyH7IK8e7IRhCYoQuXPdByuM39TBaIFmoMVpw+vrW5mjdPjZlbgsRlEK5vJuAiQxC3k0xf/WNm8sE5uZiA1gAeAXUi4Fwjoxe3Js7ih0+gBeGvPUjzN088LhCm54C6UuLllJqPwd9+a9gdUHbLNGLPJYSa5Aj4R8XpTJHN3P9JyewfSRIKniJESIKVJ8Y9TZOdC6RR6xYBo+zXAnsvjw+77wkpQ8TIw4jZiRPyTQ6Ev/dl4D8SZnD7vuLv7GhP1ZcHUxxJDGTCz35izTBQ+S5fKHyUinuixVakQGhq9gH0tbROt4O0kmaU1iyhoIxpv4hbYnuYQtrJ0vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iZTLi3nKdE1RaT/Z71fUvIV4FAov0t7OUXD7UVvex7A=; b=Y2eJx6j8FG9+T3TnVyhYfhQH0CT6K+1urlSZArhOwBEJGZMdmvJ7rxyvQODXNA9rDZyzCtA3yUXPWwJezY6dOpUSyoBk2S8FlSaqb731KJk1mtdmXtALIQiIAEO62DE/sUU84hF1JFKzKS/nbmpNJTC3L2NZfh/eYjWMustGVHTZi5WF+lxQVETNOIUjIDykU5Q67EnMek06uiP3hzjLdkyS1BRCA9DX9oYv/SYLYye+4xEYZfxrZQu64Fw3t+4RYbofCpkWt72PQjgVvr03Ih0TC2D+riq2mBfKlLXa2EGYprhkumf0DhIVfZoAjRUQrbtDr2bMG8894r02qNEN3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iZTLi3nKdE1RaT/Z71fUvIV4FAov0t7OUXD7UVvex7A=; b=cACHrvi3u+Wl6NIiwMDWdndp5hNDYT+hKQbRQBqwTOQ0UPvuggyLP6I9Mz5NFLVpUtA722sfIPkdHB7pt4wabPSRzhjIGSlzoJoW/MxY3ac7U0z/dCQiW/F76uR7HogJBfMTlnpkhmmqAJat4RVM73G+6PPK5KT/rbU/Nk1/E+Q= Received: from MN2PR11MB3807.namprd11.prod.outlook.com (2603:10b6:208:f0::24) by MN2PR11MB3904.namprd11.prod.outlook.com (2603:10b6:208:13c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21; Thu, 15 Oct 2020 06:43:57 +0000 Received: from MN2PR11MB3807.namprd11.prod.outlook.com ([fe80::4dc9:358a:cd2e:45d6]) by MN2PR11MB3807.namprd11.prod.outlook.com ([fe80::4dc9:358a:cd2e:45d6%6]) with mapi id 15.20.3477.020; Thu, 15 Oct 2020 06:43:57 +0000 From: "Xing, Beilei" To: "Sun, GuinanX" , "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: AQHWopztlXnHVJQEUkahlZt/JfyhoKmYHp6AgAAGfZCAAAXHgIAAC8kQ Date: Thu, 15 Oct 2020 06:43:57 +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: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f09a9193-ad51-4963-551e-08d870d5b114 x-ms-traffictypediagnostic: MN2PR11MB3904: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3383; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hogl7WEGvZxLTFaE3uc4sMR77q7EcUUTdV5uqYU7CEJ/6gz+jK5ULI+2aFHDVNyKctMUioRlqxReGZRcnrSX0sK8gxFOFrSa5hifqLlJZeSUnuzdXfpyzhaEiDq4Ax1Zf8DuugFhyH7zGEWR5n3NgoDexi/hdai87G6SXs5As5Z7N1KfgCFOOvz4z6Ib57rhV27M9MsidLTcjCZeoSH0j7KF9Rbm2Vg9hwiowrzvR2WHFeyNGtN1f0H8FDPcV6ByKBrLFc0JpHTrhC9sUnxPi3GM60MLnx8dDTGaWhxB1g4PEjyPI2qVgPJ7tz7vXVlIX+sw+YEBgRVqjyLZb82OOQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR11MB3807.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(396003)(366004)(376002)(346002)(136003)(53546011)(83380400001)(86362001)(7696005)(66946007)(33656002)(2906002)(71200400001)(64756008)(5660300002)(66476007)(107886003)(26005)(66556008)(52536014)(76116006)(66446008)(9686003)(4326008)(54906003)(6506007)(316002)(110136005)(8676002)(186003)(478600001)(8936002)(55016002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: h1vryP9D3PAqKwIcgnqwwbPBZqOPj46L3I675wGki3jaRdNi2iZDl/3T4liuIMFp/EB8n6dyUEfhmjvMslYoQVT50MX5P5E2HBebPZ0oqlMnDgLBtT4ipU78LXgx494Z88Vkew8qlvgmUPUKcXJUht/nu2l/IZDVJjWGPxH2N8shixg1xDWP4F3qAvqvx3cW9wTbpEKTBQgb3ld0Yc43krTzJJ8GNH1l2XTXr+HbG5O57t6z4dxC3s0GSd6K1Ml4ksTP3tv/3d1+6nlPhFry7tqEmbG8ubFXBZwND4gY2c+iwbl8FZQKRgGtHcWv/5doi0B9GBow+cEQPYQ/FZjUyYn/JzEKfsoiRE2RnIOw3MzFsAq4QpIUh5I2GyQrRUCx3FBJxRpHno5Z9ARLiDo5a+VQTBarYW8HyL/rszhLiipjbj4xv7rLY9lz+b+2uLkwpLY94FUKo6IzYbK5cYBrU0f+rMrcaTLHDBXovtmK6ADLWuY5Vxf5mgfzX/9Gen3QHLY4+UHChfmkYdfj06GfMNGdDEvE0qV5CzB7GT2PMRq4bwNFSWn9PniUL1Mz2P4WXXFK/cPEM6si7TMfbzqTwS0m6BfcEMGYVzu3uge5uSMcla2ABic4vzuapFqJwI1ZEAv4hNcGeNgCTES0t96vTQ== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR11MB3807.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f09a9193-ad51-4963-551e-08d870d5b114 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Oct 2020 06:43:57.1601 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: cKszlJHIgJBXHeccFVjv6353as8CCSBFpkWfLyTqQA4tW0BikYPeLORcbdlEHl44ESUesDx5wS58FI7J8D4EhQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3904 X-OriginatorOrg: intel.com 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" > -----Original Message----- > From: Sun, GuinanX > Sent: Thursday, October 15, 2020 1:57 PM > To: Xing, Beilei ; Peng, Yuan ; > dev@dpdk.org > Cc: Wu, Jingjing ; Zhang, Qi Z > Subject: RE: [dpdk-dev] [PATCH] net/iavf: fix adding multicast MAC addres= s >=20 > Hi beilei >=20 > > -----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 > > address > > > > > > > > > -----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 > > > fixes 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); > > > > Can we reuse err here? >=20 > This err cannot be reused. >=20 > When performing mac address addition, the testpmd side will first add the > mac address to mac_pool. > When the driver layer returns that it failed to add an address, the tespm= d layer > will delete the failed address from mac_pool. >=20 > If err is reused, the successful result of executing the add back address= will > overwrite the previous err, causing problems with the address stored in > mac_pool on the testpmd side. >=20 Yes, I missed return err in the end of the function. Little comments, can we use 'ret' which is more common to indicate return v= alue? > > > > > +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_i= d > > > =3D > > > vf->vsi_res->vsi_id; list->num_elements =3D mc_addrs_num; > > > -- > > > 2.13.6 > > >=20