Patch "ice: tc: allow zero flags in parsing tc flower" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ice: tc: allow zero flags in parsing tc flower

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     ice-tc-allow-zero-flags-in-parsing-tc-flower.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 36fbe5e4463909341c634ca6f81c0559c84dafd8
Author: Michal Swiatkowski <michal.swiatkowski@xxxxxxxxxxxxxxx>
Date:   Fri Mar 15 12:08:21 2024 +0100

    ice: tc: allow zero flags in parsing tc flower
    
    [ Upstream commit 73278715725a8347032acf233082ca4eb31e6a56 ]
    
    The check for flags is done to not pass empty lookups to adding switch
    rule functions. Since metadata is always added to lookups there is no
    need to check against the flag.
    
    It is also fixing the problem with such rule:
    $ tc filter add dev gtp_dev ingress protocol ip prio 0 flower \
            enc_dst_port 2123 action drop
    Switch block in case of GTP can't parse the destination port, because it
    should always be set to GTP specific value. The same with ethertype. The
    result is that there is no other matching criteria than GTP tunnel. In
    this case flags is 0, rule can't be added only because of defensive
    check against flags.
    
    Fixes: 9a225f81f540 ("ice: Support GTP-U and GTP-C offload in switchdev")
    Reviewed-by: Wojciech Drewek <wojciech.drewek@xxxxxxxxx>
    Signed-off-by: Michal Swiatkowski <michal.swiatkowski@xxxxxxxxxxxxxxx>
    Reviewed-by: Simon Horman <horms@xxxxxxxxxx>
    Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@xxxxxxxxx>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
index 652ef09eeb305..ec6628aacc13b 100644
--- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
@@ -663,7 +663,7 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr)
 	int ret;
 	int i;
 
-	if (!flags || (flags & ICE_TC_FLWR_FIELD_ENC_SRC_L4_PORT)) {
+	if (flags & ICE_TC_FLWR_FIELD_ENC_SRC_L4_PORT) {
 		NL_SET_ERR_MSG_MOD(fltr->extack, "Unsupported encap field(s)");
 		return -EOPNOTSUPP;
 	}