Commit 43d00e10 authored by Marcin Szycik's avatar Marcin Szycik Committed by Jakub Kicinski
Browse files

ice: Block switchdev mode when ADQ is active and vice versa 



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: fbc7b27a ("ice: enable ndo_setup_tc support for mqprio_qdisc")
Signed-off-by: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: default avatarSujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20230816193405.1307580-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2eb9625a

drivers/net/ethernet/intel/ice/ice_eswitch.c

+6 −0
Original line number Diff line number Diff line
@@ -538,6 +538,12 @@ 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), "Couldn't change eswitch mode to switchdev - ADQ is active. Delete ADQ configs and try again, e.g. tc qdisc del dev $PF root");

			NL_SET_ERR_MSG_MOD(extack, "Couldn't change eswitch mode to switchdev - ADQ is active. Delete ADQ configs and try again, e.g. tc qdisc del dev $PF root");

			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");

drivers/net/ethernet/intel/ice/ice_main.c

+5 −0
Original line number Diff line number Diff line
@@ -8823,6 +8823,11 @@ ice_setup_tc(struct net_device *netdev, enum tc_setup_type type, 
						  ice_setup_tc_block_cb,

						  np, np, true);

	case TC_SETUP_QDISC_MQPRIO:

		if (ice_is_eswitch_mode_switchdev(pf)) {

			netdev_err(netdev, "TC MQPRIO offload not supported, switchdev is enabled\n");

			return -EOPNOTSUPP;

		}



		if (pf->adev) {

			mutex_lock(&pf->adev_mutex);

			device_lock(&pf->adev->dev);