diff options
Diffstat (limited to 'queue-6.8/ice-fix-checking-for-unsupported-keys-on-non-tunnel-.patch')
| -rw-r--r-- | queue-6.8/ice-fix-checking-for-unsupported-keys-on-non-tunnel-.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/queue-6.8/ice-fix-checking-for-unsupported-keys-on-non-tunnel-.patch b/queue-6.8/ice-fix-checking-for-unsupported-keys-on-non-tunnel-.patch new file mode 100644 index 0000000000..360d1a0ca7 --- /dev/null +++ b/queue-6.8/ice-fix-checking-for-unsupported-keys-on-non-tunnel-.patch @@ -0,0 +1,51 @@ +From c12a75fbfb7d0fd445a9f184756ad0d0eeebbaf4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin <sashal@kernel.org> +Date: Tue, 9 Apr 2024 17:45:44 +0200 +Subject: ice: Fix checking for unsupported keys on non-tunnel device + +From: Marcin Szycik <marcin.szycik@linux.intel.com> + +[ Upstream commit 2cca35f5dd78b9f8297c879c5db5ab137c5d86c3 ] + +Add missing FLOW_DISSECTOR_KEY_ENC_* checks to TC flower filter parsing. +Without these checks, it would be possible to add filters with tunnel +options on non-tunnel devices. enc_* options are only valid for tunnel +devices. + +Example: + devlink dev eswitch set $PF1_PCI mode switchdev + echo 1 > /sys/class/net/$PF1/device/sriov_numvfs + tc qdisc add dev $VF1_PR ingress + ethtool -K $PF1 hw-tc-offload on + tc filter add dev $VF1_PR ingress flower enc_ttl 12 skip_sw action drop + +Fixes: 9e300987d4a8 ("ice: VXLAN and Geneve TC support") +Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> +Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com> +Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> +Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com> +Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> +Signed-off-by: Sasha Levin <sashal@kernel.org> +--- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c +index bcbcfc67e5606..688ccb0615ab9 100644 +--- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c ++++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c +@@ -1489,7 +1489,10 @@ ice_parse_cls_flower(struct net_device *filter_dev, struct ice_vsi *vsi, + (BIT_ULL(FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS) | + BIT_ULL(FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS) | + BIT_ULL(FLOW_DISSECTOR_KEY_ENC_KEYID) | +- BIT_ULL(FLOW_DISSECTOR_KEY_ENC_PORTS))) { ++ BIT_ULL(FLOW_DISSECTOR_KEY_ENC_PORTS) | ++ BIT_ULL(FLOW_DISSECTOR_KEY_ENC_IP) | ++ BIT_ULL(FLOW_DISSECTOR_KEY_ENC_OPTS) | ++ BIT_ULL(FLOW_DISSECTOR_KEY_ENC_CONTROL))) { + NL_SET_ERR_MSG_MOD(fltr->extack, "Tunnel key used, but device isn't a tunnel"); + return -EOPNOTSUPP; + } else { +-- +2.43.0 + |