[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230803131126.GD53714@unreal>
Date: Thu, 3 Aug 2023 16:11:26 +0300
From: Leon Romanovsky <leon@...nel.org>
To: Marcin Szycik <marcin.szycik@...ux.intel.com>
Cc: intel-wired-lan@...ts.osuosl.org, netdev@...r.kernel.org
Subject: Re: [PATCH iwl-net] ice: Block switchdev mode when ADQ is acvite and
vice versa
On Tue, Aug 01, 2023 at 01:52:35PM +0200, Marcin Szycik wrote:
> ADQ and switchdev are not supported simultaneously. Enabling both at the
> same time can result in nullptr dereference.
>
> To prevent this, check if ADQ is active when changing devlink mode to
> switchdev mode, and check if switchdev is active when enabling ADQ.
>
> Fixes: fbc7b27af0f9 ("ice: enable ndo_setup_tc support for mqprio_qdisc")
> Signed-off-by: Marcin Szycik <marcin.szycik@...ux.intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_eswitch.c | 5 +++++
> drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.c b/drivers/net/ethernet/intel/ice/ice_eswitch.c
> index ad0a007b7398..2ea5aaceee11 100644
> --- a/drivers/net/ethernet/intel/ice/ice_eswitch.c
> +++ b/drivers/net/ethernet/intel/ice/ice_eswitch.c
> @@ -538,6 +538,11 @@ ice_eswitch_mode_set(struct devlink *devlink, u16 mode,
> break;
> case DEVLINK_ESWITCH_MODE_SWITCHDEV:
> {
> + if (ice_is_adq_active(pf)) {
> + dev_err(ice_pf_to_dev(pf), "switchdev cannot be configured - ADQ is active. Delete ADQ configs using TC and try again\n");
It needs to be reported through netlink extack.
> + return -EOPNOTSUPP;
> + }
> +
> dev_info(ice_pf_to_dev(pf), "PF %d changed eswitch mode to switchdev",
> pf->hw.pf_id);
> NL_SET_ERR_MSG_MOD(extack, "Changed eswitch mode to switchdev");
Thanks
Powered by blists - more mailing lists