idpf: fix issue with ethtool -n command display

[ Upstream commit 36aae2ea6bd76b8246caa50e34a4f4824f0a3be8 ]

When ethtool -n is executed on an interface to display the flow steering
rules, "rxclass: Unknown flow type" error is generated.

The flow steering list maintained in the driver currently stores only the
location and q_index but other fields of the ethtool_rx_flow_spec are not
stored. This may be enough for the virtchnl command to delete the entry.
However, when the ethtool -n command is used to query the flow steering
rules, the ethtool_rx_flow_spec returned is not complete causing the
error below.

Resolve this by storing the flow spec (fsp) when rules are added and
returning the complete flow spec when rules are queried.

Also, change the return value from EINVAL to ENOENT when flow steering
entry is not found during query by location or when deleting an entry.

Add logic to detect and reject duplicate filter entries at the same
location and change logic to perform upfront validation of all error
conditions before adding flow rules through virtchnl. This avoids the
need for additional virtchnl delete messages when subsequent operations
fail, which was missing in the original upstream code.

Example:
Before the fix:
ethtool -n eth1
2 RX rings available
Total 2 rules

rxclass: Unknown flow type
rxclass: Unknown flow type

After the fix:
ethtool -n eth1
2 RX rings available
Total 2 rules

Filter: 0
        Rule Type: TCP over IPv4
        Src IP addr: 10.0.0.1 mask: 0.0.0.0
        Dest IP addr: 0.0.0.0 mask: 255.255.255.255
        TOS: 0x0 mask: 0xff
        Src port: 0 mask: 0xffff
        Dest port: 0 mask: 0xffff
        Action: Direct to queue 0

Filter: 1
        Rule Type: UDP over IPv4
        Src IP addr: 10.0.0.1 mask: 0.0.0.0
        Dest IP addr: 0.0.0.0 mask: 255.255.255.255
        TOS: 0x0 mask: 0xff
        Src port: 0 mask: 0xffff
        Dest port: 0 mask: 0xffff
        Action: Direct to queue 0

Fixes: ada3e24b84a0 ("idpf: add flow steering support")
Signed-off-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
Co-developed-by: Sreedevi Joshi <sreedevi.joshi@intel.com>
Signed-off-by: Sreedevi Joshi <sreedevi.joshi@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Mina Almasry <almasrymina@google.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/idpf/idpf.h b/drivers/net/ethernet/intel/idpf/idpf.h
index af8deb5fa80f02fb2455539a1198ff1e903dc9c7..df64d252b56423c213d4248f96c42f416b15e302 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf.h
+++ b/drivers/net/ethernet/intel/idpf/idpf.h
@@ -284,8 +284,7 @@ struct idpf_port_stats {
 
 struct idpf_fsteer_fltr {
        struct list_head list;
-       u32 loc;
-       u32 q_index;
+       struct ethtool_rx_flow_spec fs;
 };
 
 /**

diff --git a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c b/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
index 8477e7ba28706346083c7a10bc58afcd18553f4a..8e9a93125b4aa66c218a67b3f6b27f70542b5f35 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
@@ -38,11 +38,15 @@ static int idpf_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
                cmd->data = idpf_fsteer_max_rules(vport);
                break;
        case ETHTOOL_GRXCLSRULE:
-               err = -EINVAL;
+               err = -ENOENT;
                spin_lock_bh(&vport_config->flow_steer_list_lock);
                list_for_each_entry(f, &user_config->flow_steer_list, list)
-                       if (f->loc == cmd->fs.location) {
-                               cmd->fs.ring_cookie = f->q_index;
+                       if (f->fs.location == cmd->fs.location) {
+                               /* Avoid infoleak from padding: zero first,
+                                * then assign fields
+                                */
+                               memset(&cmd->fs, 0, sizeof(cmd->fs));
+                               cmd->fs = f->fs;
                                err = 0;
                                break;
                        }
@@ -56,7 +60,7 @@ static int idpf_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
                                err = -EMSGSIZE;
                                break;
                        }
-                       rule_locs[cnt] = f->loc;
+                       rule_locs[cnt] = f->fs.location;
                        cnt++;
                }
                if (!err)
@@ -158,7 +162,7 @@ static int idpf_add_flow_steer(struct net_device *netdev,
        struct idpf_vport *vport;
        u32 flow_type, q_index;
        u16 num_rxq;
-       int err;
+       int err = 0;
 
        vport = idpf_netdev_to_vport(netdev);
        vport_config = vport->adapter->vport_config[np->vport_idx];
@@ -184,6 +188,29 @@ static int idpf_add_flow_steer(struct net_device *netdev,
        if (!rule)
                return -ENOMEM;
 
+       fltr = kzalloc(sizeof(*fltr), GFP_KERNEL);
+       if (!fltr) {
+               err = -ENOMEM;
+               goto out_free_rule;
+       }
+
+       /* detect duplicate entry and reject before adding rules */
+       spin_lock_bh(&vport_config->flow_steer_list_lock);
+       list_for_each_entry(f, &user_config->flow_steer_list, list) {
+               if (f->fs.location == fsp->location) {
+                       err = -EEXIST;
+                       break;
+               }
+
+               if (f->fs.location > fsp->location)
+                       break;
+               parent = f;
+       }
+       spin_unlock_bh(&vport_config->flow_steer_list_lock);
+
+       if (err)
+               goto out;
+
        rule->vport_id = cpu_to_le32(vport->vport_id);
        rule->count = cpu_to_le32(1);
        info = &rule->rule_info[0];
@@ -222,28 +249,20 @@ static int idpf_add_flow_steer(struct net_device *netdev,
                goto out;
        }
 
-       fltr = kzalloc(sizeof(*fltr), GFP_KERNEL);
-       if (!fltr) {
-               err = -ENOMEM;
-               goto out;
-       }
+       /* Save a copy of the user's flow spec so ethtool can later retrieve it */
+       fltr->fs = *fsp;
 
-       fltr->loc = fsp->location;
-       fltr->q_index = q_index;
        spin_lock_bh(&vport_config->flow_steer_list_lock);
-       list_for_each_entry(f, &user_config->flow_steer_list, list) {
-               if (f->loc >= fltr->loc)
-                       break;
-               parent = f;
-       }
-
        parent ? list_add(&fltr->list, &parent->list) :
                 list_add(&fltr->list, &user_config->flow_steer_list);
 
        user_config->num_fsteer_fltrs++;
        spin_unlock_bh(&vport_config->flow_steer_list_lock);
+       goto out_free_rule;
 
 out:
+       kfree(fltr);
+out_free_rule:
        kfree(rule);
        return err;
 }
@@ -297,14 +316,14 @@ static int idpf_del_flow_steer(struct net_device *netdev,
        spin_lock_bh(&vport_config->flow_steer_list_lock);
        list_for_each_entry_safe(f, iter,
                                 &user_config->flow_steer_list, list) {
-               if (f->loc == fsp->location) {
+               if (f->fs.location == fsp->location) {
                        list_del(&f->list);
                        kfree(f);
                        user_config->num_fsteer_fltrs--;
                        goto out_unlock;
                }
        }
-       err = -EINVAL;
+       err = -ENOENT;
 
 out_unlock:
        spin_unlock_bh(&vport_config->flow_steer_list_lock);