Received-SPF: pass (google.com: domain of linux-kernel+bounces-129446-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: "Romanowski, Rafal" <rafal.romanowski@intel.com>
To: "intel-wired-lan@lists.osuosl.org" <intel-wired-lan@lists.osuosl.org>
CC: "Drewek, Wojciech" <wojciech.drewek@intel.com>, "netdev@vger.kernel.org"
	<netdev@vger.kernel.org>, "kuba@kernel.org" <kuba@kernel.org>,
	"pabeni@redhat.com" <pabeni@redhat.com>, "davem@davemloft.net"
	<davem@davemloft.net>, poros <poros@redhat.com>, Michal Swiatkowski
	<michal.swiatkowski@linux.intel.com>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>, "edumazet@google.com" <edumazet@google.com>,
	"Nguyen, Anthony L" <anthony.l.nguyen@intel.com>, "horms@kernel.org"
	<horms@kernel.org>
Subject: RE: [Intel-wired-lan] [PATCH net] ice: fix enabling RX VLAN filtering
Thread-Topic: [Intel-wired-lan] [PATCH net] ice: fix enabling RX VLAN
 filtering
Thread-Index: AQHafvHNSe78eITRl0ihBVQKRQZoKbFI9mGAgA1iIsA=
Date: Wed, 3 Apr 2024 09:43:44 +0000
Message-ID: <SJ0PR11MB5865AD8922F34A36327CC7248F3D2@SJ0PR11MB5865.namprd11.prod.outlook.com>
References: <20240325201901.39365-1-poros@redhat.com>
 <ZgHqZ5ebaO9VkvYx@mev-dev>
In-Reply-To: <ZgHqZ5ebaO9VkvYx@mev-dev>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?e6fqhJd3RqmHlT/+Jp3yl6ZwjGBXKSA5nD2/XcSI64q/AdpJbef2rEBNe8+4?=
 =?us-ascii?Q?P84OhkoyPO40OVMnLfIjZ8ewV53WGv9/dUPQo7mjmrbdM3KL9Eaogkeq3QdL?=
 =?us-ascii?Q?KfLkt9w4K/9o/w8YKEz84yovxQTREwHCe0ArGRQ6Lr+qlOPqBmXqyTXQVR8T?=
 =?us-ascii?Q?2249/l32rlcJsuil+hA189pa54nWvYOmibgyNenc4TvTxjrZ5OSXDCgO9d+a?=
 =?us-ascii?Q?OQspL2UEyeJrYtk4xD3733K0LoLE87pNx8ByAnY1hBwqiFtfQupg52ax+Bic?=
 =?us-ascii?Q?RGMbGHZaqFxWPDTWg3ODPHwQpIrHLk/5WeSvN+nUSnAlrcwe4EevdC+taeBB?=
 =?us-ascii?Q?YAjtE562r8E4Lu87dy5hKMhlyJfdaWcI2DMGYUFg4VubfIFp+xYOEgkFieDe?=
 =?us-ascii?Q?7fViK/tyl3Tf7r5qvh30jDLLmEL7oluQI+byECtuoYwVTAQ1648G39PDGcj5?=
 =?us-ascii?Q?uiXjODuXEyy7kh8IxubB5m6IFkynh6EoKGVLaExeZCWpFnctKSkVQyvvP0Fr?=
 =?us-ascii?Q?nnSz9wL9n7wbXlNkvaFIS8fp0vm0PSBpHpXy4NFtUmXPuqMpptJHJuKuYe0q?=
 =?us-ascii?Q?BfQ6VZxhegDxPdhIzLHz+gHe1dPl76na/Y9oqgaeCuEZQ5NAcx7GMMq7hQDi?=
 =?us-ascii?Q?hqzZ5SlrpNQwyogP6DYhUDUkCt5hZAdRuKZpZh9dQktxNZwCrXVl3bUfj5vz?=
 =?us-ascii?Q?b8tSOVDZTAZGsLyzavp9L+pttQcJ9k1qQx7a/blUn732YZpBRXQB5Sm6Igzp?=
 =?us-ascii?Q?ozic1m8Q3JLBR7bK4DuWiocKwjCo6mBvNUp6qRgmbcrPpgqCegPufLcu5x6E?=
 =?us-ascii?Q?dV0JJnPRzbgCJ3Z0h0czu3lqTL7qAVBW+7yIgXR+TLJJqvvJn3e4LqLD5fTQ?=
 =?us-ascii?Q?epnrnXAGnxXGumq0cTAG/aebU85eSY5DtDFB7qMXI7yB6NwMyUyKsrcluEfQ?=
 =?us-ascii?Q?1nnk4IYa6h16IX1BaHxUPE9vwosSvl2xcQCmoH+/sti7x2wmHhCGuGS+UEhx?=
 =?us-ascii?Q?FJ9b309BBInqFwWq7dblAu5PK25negK84XYX/J/rFgQx8xSDJYxk28+M6V+6?=
 =?us-ascii?Q?pSdiYAWga0KhzfSE92ZmDbE5gSt4TaaTQ9sFINyYgAdhYzwQ/hOuk8SGyqEf?=
 =?us-ascii?Q?DuCWtR+THEFhcl9mvir7LiKC5xPeBH9DeQzbF1D3zCy0p0mCq4S4kNnskx1e?=
 =?us-ascii?Q?m2YiUqnmCrKtkXO/eWC8r90SWgevroZVFVsFg4koEMwPfDufnRJ8+p64SVd4?=
 =?us-ascii?Q?O5UlFWIu8T4yCl9IkWK9z3uZgeYQiF7lco9iFr+Bgkw8e/VtEkL47cHi6Jsl?=
 =?us-ascii?Q?kEHotVB7pXYxtKgfggy4T5dgfoB8oYRAPulpB0LosRcyYXDQJYEn52WaDQuU?=
 =?us-ascii?Q?z2Xz/YgrHLwhRx99/QnUYSpylqvU/mK+mV4FfaMGhe8dkIC69GKJwPCKPj0F?=
 =?us-ascii?Q?rGdZ2EMZuSX3y0poE0ytVNprIG0EqrgkYtO7co0vMgEZgKeUUyeqKI7eGOqZ?=
 =?us-ascii?Q?syGK8LKIsFfbnBYWXi/wJ3enITbQ4uNihyroXRR3V8qfx2RVHG1zY4jF8H23?=
 =?us-ascii?Q?Gcg5oIMetgA3JGuqn2F0+4nb2Uk4l3u3qrL9pm2t?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5865.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 278fc37a-92ff-4459-0f83-08dc53c28db0
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Apr 2024 09:43:44.5023
 (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: SpBmFaZS60EruRGSBGok+LNXUjM0x4aaiiVbY1baRTIzkWw/Lj9Y+S16iQArtKe1Q0dgLq2y4HIe8mzzNZCHVItfxIbgYPiq+Y3HveS9kJ4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6888
X-OriginatorOrg: intel.com

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of
> Michal Swiatkowski
> Sent: Monday, March 25, 2024 10:20 PM
> To: poros <poros@redhat.com>
> Cc: Drewek, Wojciech <wojciech.drewek@intel.com>;
> netdev@vger.kernel.org; linux-kernel@vger.kernel.org;
> edumazet@google.com; Nguyen, Anthony L <anthony.l.nguyen@intel.com>;
> horms@kernel.org; intel-wired-lan@lists.osuosl.org; kuba@kernel.org;
> pabeni@redhat.com; davem@davemloft.net
> Subject: Re: [Intel-wired-lan] [PATCH net] ice: fix enabling RX VLAN filt=
ering
>=20
> On Mon, Mar 25, 2024 at 09:19:01PM +0100, Petr Oros wrote:
> > ice_port_vlan_on/off() was introduced in commit 2946204b3fa8 ("ice:
> > implement bridge port vlan"). But ice_port_vlan_on() incorrectly
> > assigns ena_rx_filtering to inner_vlan_ops in DVM mode.
> > This causes an error when rx_filtering cannot be enabled in legacy mode=
.
> >
> > Reproducer:
> >  echo 1 > /sys/class/net/$PF/device/sriov_numvfs
> >  ip link set $PF vf 0 spoofchk off trust on vlan 3
> > dmesg:
> >  ice 0000:41:00.0: failed to enable Rx VLAN filtering for VF 0 VSI 9
> > during VF rebuild, error -95
> >
> > Fixes: 2946204b3fa8 ("ice: implement bridge port vlan")
> > Signed-off-by: Petr Oros <poros@redhat.com>
> > ---
> >  .../ethernet/intel/ice/ice_vf_vsi_vlan_ops.c   | 18 ++++++++----------
> >  1 file changed, 8 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c
> > b/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c
> > index 80dc4bcdd3a41c..b3e1bdcb80f84d 100644
> > --- a/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c
> > +++ b/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c
> > @@ -26,24 +26,22 @@ static void ice_port_vlan_on(struct ice_vsi *vsi)
> >  	struct ice_vsi_vlan_ops *vlan_ops;
> >  	struct ice_pf *pf =3D vsi->back;
> >
> > -	if (ice_is_dvm_ena(&pf->hw)) {
> > -		vlan_ops =3D &vsi->outer_vlan_ops;
> > -
> > -		/* setup outer VLAN ops */
> > -		vlan_ops->set_port_vlan =3D ice_vsi_set_outer_port_vlan;
> > -		vlan_ops->clear_port_vlan =3D ice_vsi_clear_outer_port_vlan;
> > +	/* setup inner VLAN ops */
> > +	vlan_ops =3D &vsi->inner_vlan_ops;
> >
> > -		/* setup inner VLAN ops */
> > -		vlan_ops =3D &vsi->inner_vlan_ops;
> > +	if (ice_is_dvm_ena(&pf->hw)) {
> >  		vlan_ops->add_vlan =3D noop_vlan_arg;
> >  		vlan_ops->del_vlan =3D noop_vlan_arg;
> >  		vlan_ops->ena_stripping =3D ice_vsi_ena_inner_stripping;
> >  		vlan_ops->dis_stripping =3D ice_vsi_dis_inner_stripping;
> >  		vlan_ops->ena_insertion =3D ice_vsi_ena_inner_insertion;
> >  		vlan_ops->dis_insertion =3D ice_vsi_dis_inner_insertion;
> > -	} else {
> > -		vlan_ops =3D &vsi->inner_vlan_ops;
> >
> > +		/* setup outer VLAN ops */
> > +		vlan_ops =3D &vsi->outer_vlan_ops;
> > +		vlan_ops->set_port_vlan =3D ice_vsi_set_outer_port_vlan;
> > +		vlan_ops->clear_port_vlan =3D ice_vsi_clear_outer_port_vlan;
> > +	} else {
> >  		vlan_ops->set_port_vlan =3D ice_vsi_set_inner_port_vlan;
> >  		vlan_ops->clear_port_vlan =3D ice_vsi_clear_inner_port_vlan;
> >  	}
>=20
> Thanks for fixing it.
> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
>=20
> > --
> > 2.43.2
> >


Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>