net: sched: use newly added classid identity helpers

Instead of checking handle, which does not have the inner class
information and drivers wrongly assume clsact->egress as ingress, use
the newly introduced classid identification helpers.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index d80b20d695e06b751819760efd567b7a3ce1616c..afa6fd688facf9dfb892dd0f15d55551458bb3cb 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2892,7 +2892,7 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate)
 static int cxgb_setup_tc_cls_u32(struct net_device *dev,
                                 struct tc_cls_u32_offload *cls_u32)
 {
-       if (TC_H_MAJ(cls_u32->common.handle) != TC_H_MAJ(TC_H_INGRESS) ||
+       if (is_classid_clsact_ingress(cls_u32->common.classid) ||
            cls_u32->common.chain_index)
                return -EOPNOTSUPP;
 

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index c6b132476de4ff1e2a9398d0f8eafbfea6115d54..f9fd8d8f1bef5dbd4fffe5b064cc0afeda590913 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -9230,7 +9230,7 @@ static int ixgbe_setup_tc_cls_u32(struct net_device *dev,
 {
        struct ixgbe_adapter *adapter = netdev_priv(dev);
 
-       if (TC_H_MAJ(cls_u32->common.handle) != TC_H_MAJ(TC_H_INGRESS) ||
+       if (is_classid_clsact_ingress(cls_u32->common.classid) ||
            cls_u32->common.chain_index)
                return -EOPNOTSUPP;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 981f8415b546633cc669c10d04c11f5215a44d38..8633ca5af6ed44466bdb24fb4f66d69d34a7cf33 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3031,7 +3031,7 @@ static int mlx5e_setup_tc_cls_flower(struct net_device *dev,
 {
        struct mlx5e_priv *priv = netdev_priv(dev);
 
-       if (TC_H_MAJ(cls_flower->common.handle) != TC_H_MAJ(TC_H_INGRESS) ||
+       if (is_classid_clsact_ingress(cls_flower->common.classid) ||
            cls_flower->common.chain_index)
                return -EOPNOTSUPP;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index f3c494a4ecdfa72b66205a55bb5a3447341d485d..f34c00fbf78c31b8bfd6f42388e87882b54f1cab 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -657,7 +657,7 @@ mlx5e_rep_setup_tc_cls_flower(struct net_device *dev,
 {
        struct mlx5e_priv *priv = netdev_priv(dev);
 
-       if (TC_H_MAJ(cls_flower->common.handle) != TC_H_MAJ(TC_H_INGRESS) ||
+       if (is_classid_clsact_ingress(cls_flower->common.classid) ||
            cls_flower->common.chain_index)
                return -EOPNOTSUPP;
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index eb7c4549f4640d407358957e37ed19918f88eebf..a99600333a49940cfbf316a9fddefc61513f6f3c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1696,7 +1696,14 @@ static void mlxsw_sp_port_del_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
 static int mlxsw_sp_setup_tc_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
                                          struct tc_cls_matchall_offload *f)
 {
-       bool ingress = TC_H_MAJ(f->common.handle) == TC_H_MAJ(TC_H_INGRESS);
+       bool ingress;
+
+       if (is_classid_clsact_ingress(f->common.classid))
+               ingress = true;
+       else if (is_classid_clsact_egress(f->common.classid))
+               ingress = false;
+       else
+               return -EOPNOTSUPP;
 
        if (f->common.chain_index)
                return -EOPNOTSUPP;
@@ -1717,7 +1724,14 @@ static int
 mlxsw_sp_setup_tc_cls_flower(struct mlxsw_sp_port *mlxsw_sp_port,
                             struct tc_cls_flower_offload *f)
 {
-       bool ingress = TC_H_MAJ(f->common.handle) == TC_H_MAJ(TC_H_INGRESS);
+       bool ingress;
+
+       if (is_classid_clsact_ingress(f->common.classid))
+               ingress = true;
+       else if (is_classid_clsact_egress(f->common.classid))
+               ingress = false;
+       else
+               return -EOPNOTSUPP;
 
        if (f->common.chain_index)
                return -EOPNOTSUPP;

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c
index f981f60ec306ef54159bd0067cc3dfe924604ef8..0e6864922d5cc30ecdbbfa888eb390240262b0c2 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c
@@ -127,7 +127,7 @@ static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev,
        struct nfp_net *nn = netdev_priv(netdev);
 
        if (type != TC_SETUP_CLSBPF || !nfp_net_ebpf_capable(nn) ||
-           TC_H_MAJ(cls_bpf->common.handle) != TC_H_MAJ(TC_H_INGRESS) ||
+           is_classid_clsact_ingress(cls_bpf->common.classid) ||
            cls_bpf->common.protocol != htons(ETH_P_ALL) ||
            cls_bpf->common.chain_index)
                return -EOPNOTSUPP;

diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index 01767c7376d561c5a0846b20f87ac6b10cd28eac..3ad5aaa210a473ffe4b3a44b8a7e0dc570c33fa2 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -390,7 +390,7 @@ int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev,
        struct tc_cls_flower_offload *cls_flower = type_data;
 
        if (type != TC_SETUP_CLSFLOWER ||
-           TC_H_MAJ(cls_flower->common.handle) != TC_H_MAJ(TC_H_INGRESS) ||
+           is_classid_clsact_ingress(cls_flower->common.classid) ||
            !eth_proto_is_802_3(cls_flower->common.protocol) ||
            cls_flower->common.chain_index)
                return -EOPNOTSUPP;

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 8c79011c5a83498be2885e62cfca32b81fed9057..78e78a6e6833a3b0260cfaee79117036a9f5d121 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -914,7 +914,14 @@ static void dsa_slave_del_cls_matchall(struct net_device *dev,
 static int dsa_slave_setup_tc_cls_matchall(struct net_device *dev,
                                           struct tc_cls_matchall_offload *cls)
 {
-       bool ingress = TC_H_MAJ(cls->common.handle) == TC_H_MAJ(TC_H_INGRESS);
+       bool ingress;
+
+       if (is_classid_clsact_ingress(cls->common.classid))
+               ingress = true;
+       else if (is_classid_clsact_egress(cls->common.classid))
+               ingress = false;
+       else
+               return -EOPNOTSUPP;
 
        if (cls->common.chain_index)
                return -EOPNOTSUPP;