Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Keller, Jacob E" <jacob.e.keller@intel.com>
To:     Ivan Vecera <ivecera@redhat.com>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>
CC:     "poros@redhat.com" <poros@redhat.com>,
        "mschmidt@redhat.com" <mschmidt@redhat.com>,
        "Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
        "Nguyen, Anthony L" <anthony.l.nguyen@intel.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        "moderated list:INTEL ETHERNET DRIVERS" 
        <intel-wired-lan@lists.osuosl.org>,
        open list <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH net] ice: Fix MAC address setting
Thread-Topic: [PATCH net] ice: Fix MAC address setting
Thread-Index: AQHYPr4hauPE06ST902GLu0SWnA6xqzNOMNA
Date:   Wed, 23 Mar 2022 17:28:02 +0000
Message-ID: <CO1PR11MB508946CC906E8B851D69D31AD6189@CO1PR11MB5089.namprd11.prod.outlook.com>
References: <20220323135829.4015645-1-ivecera@redhat.com>
In-Reply-To: <20220323135829.4015645-1-ivecera@redhat.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?/ZecxsUj/paJzwHn39B222evKjbCQD6gPKjhNTjYp69DIM3tDmekTBkvmwgn?=
 =?us-ascii?Q?NOH1Gk7rrEUHIyMAw4+NfXHqO5+FM3NWalzs12w5mCJ/Cf2oN7q+JB8d/Lso?=
 =?us-ascii?Q?HpI4mOfzFx2Zzcgp+yyZQU4q+gwJab7ESioIDy4mkDzhMiYyqMXKtrDSGjct?=
 =?us-ascii?Q?qe3ZDUVXFmUrjwmlbcBJQzBqC96llOKsori0BFTyHC1gWQ6IL1Y3LZW38/sW?=
 =?us-ascii?Q?bO3ZXXbMjZBDqWQ6IiY4dManUM00U8uXlrk1uPvq0Mo2IuzsqgEnSFAUxFDn?=
 =?us-ascii?Q?9n0gkY5Y1JckWzirVElyoO3WIFk1jDQHoEpqWsl937EPus1vLPYKg53V2cV7?=
 =?us-ascii?Q?PbEDBbHApOYO24+L/8ACSBxraT7TpclUaS1oz8t8SLodJ6LGOfDKUtBbLSZu?=
 =?us-ascii?Q?bsJM9awYGh+ZCC+GIlpe99IzqYJtm47CF7QbOgKf0bI8h29Z9cqDHhLuvKEM?=
 =?us-ascii?Q?UxL4GvmYLKfvHSlJ7ovPjQGCTraqMmKFOlq1Jd1lUK2KbitkuVfPgHjLKWHU?=
 =?us-ascii?Q?+QiHCsv2T2HnBywISz/DKNoCD9L6S6qCFt7mhuhhQumQ+rSdFzVDVvqtpaOQ?=
 =?us-ascii?Q?HRpm/dEHTa9UaXkZH/r188LXlaDWKGQ7MD8IEwItitLfCzRKnqwa9q5Pa4c7?=
 =?us-ascii?Q?hDZYnVzO38GtU2LD2NK5hSYH0ijphXfQFqPgpR5oVwWIk2J8dVi60+mA/PQv?=
 =?us-ascii?Q?Ck5KJIyB/lJG0JvDHtfIo8R0NUAJbpwvMdJTRHcdc36dIuastcS5OCZL3+bH?=
 =?us-ascii?Q?cCyeGFoUltmjAt4vw82fOitH/hC3ZmnV5oTMGAtZWvsGdNC+1tsZKnmoJrmq?=
 =?us-ascii?Q?XkdTc/wxYP5rHVESF3xhiktksLV9A8zzQFsmLMjr8U+Z567ZoOnu4C5qpcm2?=
 =?us-ascii?Q?de++99OYke5dVkXFW2nv1vUFs4FlkC0lBZ2vp2WkG3lw/F0wv+rr5ryQuK7e?=
 =?us-ascii?Q?EfeZCnJpcfilM0j8ELfA1iPaQDiezMNA2sDdQKQL1RLh8ltqu6/1gisfVFHo?=
 =?us-ascii?Q?lDBUSAfDee0RSOSPVwAYfLNJ+9YkV/sddF6PeyIT80EqqfTeysn/VqTQYMAg?=
 =?us-ascii?Q?ROFPQC/74AwD6vTbiuzKt9amfDVvTGnWjra7kKSQuTfO+wZbym5tif8+iU2A?=
 =?us-ascii?Q?chSt6wT1qxpJ/E3FEWoDCeEGnTOsskrEvyCrgfPgqLHptP4hrmf/dKEmIDox?=
 =?us-ascii?Q?sEfA8nYriGGircVuA9HrbuVcmrsSwLoKPq+EmoulCwFi+3Io7gucmnzxcoco?=
 =?us-ascii?Q?bvxfg6FuHgTCTBPy+fCzuxXzrXoRls49vyCKQ+pFhR43oNOcdCQgAbaXjmzH?=
 =?us-ascii?Q?+ztlHdjR5j5WWhqk6j8SBNyoAupGIjuk0vLnFqWAiFsomggsTSr+3eKfcqeI?=
 =?us-ascii?Q?H6DEthijIqH++14eWiQ15Ry51jBHvJVBScH829yMRO1CzxtM3VRcHOC0qfW/?=
 =?us-ascii?Q?FnN3o/opvUyVFvNaDoLK8bFmg62lxf6O?=
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: CO1PR11MB5089.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1130538c-c040-4f84-390c-08da0cf27c13
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Mar 2022 17:28:02.8974
 (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: 60WuGwmyUUXbrA9ykbUpjwqvJd/86BJm55EBFYqeaQqq4jyicDxnLuPa82len25P55tsTjkf10o5njivxHjbYSSC14qoJVHFdkjxRTJI/Hg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3204
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Ivan Vecera <ivecera@redhat.com>
> Sent: Wednesday, March 23, 2022 6:58 AM
> To: netdev@vger.kernel.org
> Cc: poros@redhat.com; mschmidt@redhat.com; Brandeburg, Jesse
> <jesse.brandeburg@intel.com>; Nguyen, Anthony L
> <anthony.l.nguyen@intel.com>; David S. Miller <davem@davemloft.net>; Jaku=
b
> Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; moderated
> list:INTEL ETHERNET DRIVERS <intel-wired-lan@lists.osuosl.org>; open list=
 <linux-
> kernel@vger.kernel.org>
> Subject: [PATCH net] ice: Fix MAC address setting
>=20
> Commit 2ccc1c1ccc671b ("ice: Remove excess error variables") merged
> the usage of 'status' and 'err' variables into single one in
> function ice_set_mac_address(). Unfortunately this causes
> a regression when call of ice_fltr_add_mac() returns -EEXIST because
> this return value does not indicate an error in this case but
> value of 'err' value remains to be -EEXIST till the end of
> the function and is returned to caller.
>=20
> Prior this commit this does not happen because return value of
> ice_fltr_add_mac() was stored to 'status' variable first and
> if it was -EEXIST then 'err' remains to be zero.
>=20
> The patch fixes the problem by reset 'err' to zero when
> ice_fltr_add_mac() returns -EEXIST.
>=20
> Fixes: 2ccc1c1ccc671b ("ice: Remove excess error variables")
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_main.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>=20
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c
> b/drivers/net/ethernet/intel/ice/ice_main.c
> index 168a41ea37b8..420558d1cd21 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -5474,14 +5474,15 @@ static int ice_set_mac_address(struct net_device
> *netdev, void *pi)
>=20
>  	/* Add filter for new MAC. If filter exists, return success */
>  	err =3D ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);
> -	if (err =3D=3D -EEXIST)
> +	if (err =3D=3D -EEXIST) {
>  		/* Although this MAC filter is already present in hardware it's
>  		 * possible in some cases (e.g. bonding) that dev_addr was
>  		 * modified outside of the driver and needs to be restored back
>  		 * to this value.
>  		 */
>  		netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
> -	else if (err)
> +		err =3D 0;
> +	} else if (err)
>  		/* error if the new filter addition failed */
>  		err =3D -EADDRNOTAVAIL;
>=20

Style wise, don't we typically use {} for all branches if its needed on one=
?

I'm ok takin this fix as-is now and doing the {} fix up afterwards if we wa=
nt to avoid delay.

Thanks,
Jake

> --
> 2.34.1