ionic: Use cached VF attributes

Each time a VF attribute is set via iproute a call to get the VF
configuration is also made. This is currently problematic because for
each VF configuration call there are multiple commands sent to the
device. Unfortunately, this doesn't scale well. Fix this by reporting
the cached VF attributes.

The original change to query the device for getting the VF attributes
    f16f5be31009 ("ionic: Query FW when getting VF info via ndo_get_vf_config")
was made to remain consistent with device set VF attributes. However,
after further investigation there is no need to query the device.

Signed-off-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Link: https://lore.kernel.org/r/20231204210936.16587-2-shannon.nelson@amd.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h
index 2453a40f6ee8183abcc3596f3dacf3a78c8500df..9ffef2e0688530449dbacb420a544db55393d4d4 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic.h
@@ -91,6 +91,4 @@ int ionic_port_identify(struct ionic *ionic);
 int ionic_port_init(struct ionic *ionic);
 int ionic_port_reset(struct ionic *ionic);
 
-const char *ionic_vf_attr_to_str(enum ionic_vf_attr attr);
-
 #endif /* _IONIC_H_ */

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_dev.c b/drivers/net/ethernet/pensando/ionic/ionic_dev.c
index c06576f4391614761c52d9dd2bb97f0bd340b985..bb9245d933e40bfd2f925f96f9b0a87e38f0ba4d 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_dev.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_dev.c
@@ -469,46 +469,6 @@ int ionic_set_vf_config(struct ionic *ionic, int vf,
        return err;
 }
 
-int ionic_dev_cmd_vf_getattr(struct ionic *ionic, int vf, u8 attr,
-                            struct ionic_vf_getattr_comp *comp)
-{
-       union ionic_dev_cmd cmd = {
-               .vf_getattr.opcode = IONIC_CMD_VF_GETATTR,
-               .vf_getattr.attr = attr,
-               .vf_getattr.vf_index = cpu_to_le16(vf),
-       };
-       int err;
-
-       if (vf >= ionic->num_vfs)
-               return -EINVAL;
-
-       switch (attr) {
-       case IONIC_VF_ATTR_SPOOFCHK:
-       case IONIC_VF_ATTR_TRUST:
-       case IONIC_VF_ATTR_LINKSTATE:
-       case IONIC_VF_ATTR_MAC:
-       case IONIC_VF_ATTR_VLAN:
-       case IONIC_VF_ATTR_RATE:
-               break;
-       case IONIC_VF_ATTR_STATSADDR:
-       default:
-               return -EINVAL;
-       }
-
-       mutex_lock(&ionic->dev_cmd_lock);
-       ionic_dev_cmd_go(&ionic->idev, &cmd);
-       err = ionic_dev_cmd_wait_nomsg(ionic, DEVCMD_TIMEOUT);
-       memcpy_fromio(comp, &ionic->idev.dev_cmd_regs->comp.vf_getattr,
-                     sizeof(*comp));
-       mutex_unlock(&ionic->dev_cmd_lock);
-
-       if (err && comp->status != IONIC_RC_ENOSUPP)
-               ionic_dev_cmd_dev_err_print(ionic, cmd.vf_getattr.opcode,
-                                           comp->status, err);
-
-       return err;
-}
-
 void ionic_vf_start(struct ionic *ionic)
 {
        union ionic_dev_cmd cmd = {

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_dev.h b/drivers/net/ethernet/pensando/ionic/ionic_dev.h
index 1dbc3cb50b1d905469eb31b24857bf15ca3aa029..19edcb42d9fdea7a027ddfd998573fd2b1dfdcaf 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_dev.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic_dev.h
@@ -341,8 +341,7 @@ void ionic_dev_cmd_port_pause(struct ionic_dev *idev, u8 pause_type);
 
 int ionic_set_vf_config(struct ionic *ionic, int vf,
                        struct ionic_vf_setattr_cmd *vfc);
-int ionic_dev_cmd_vf_getattr(struct ionic *ionic, int vf, u8 attr,
-                            struct ionic_vf_getattr_comp *comp);
+
 void ionic_dev_cmd_queue_identify(struct ionic_dev *idev,
                                  u16 lif_type, u8 qtype, u8 qver);
 void ionic_vf_start(struct ionic *ionic);

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index edc14730ce88b5f7db438d37b4ad2e93da3cb813..afb77e2d04c5888dd49e9a38586682b031f44786 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -2332,82 +2332,11 @@ static int ionic_eth_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd
        }
 }
 
-static int ionic_get_fw_vf_config(struct ionic *ionic, int vf, struct ionic_vf *vfdata)
-{
-       struct ionic_vf_getattr_comp comp = { 0 };
-       int err;
-       u8 attr;
-
-       attr = IONIC_VF_ATTR_VLAN;
-       err = ionic_dev_cmd_vf_getattr(ionic, vf, attr, &comp);
-       if (err && comp.status != IONIC_RC_ENOSUPP)
-               goto err_out;
-       if (!err)
-               vfdata->vlanid = comp.vlanid;
-
-       attr = IONIC_VF_ATTR_SPOOFCHK;
-       err = ionic_dev_cmd_vf_getattr(ionic, vf, attr, &comp);
-       if (err && comp.status != IONIC_RC_ENOSUPP)
-               goto err_out;
-       if (!err)
-               vfdata->spoofchk = comp.spoofchk;
-
-       attr = IONIC_VF_ATTR_LINKSTATE;
-       err = ionic_dev_cmd_vf_getattr(ionic, vf, attr, &comp);
-       if (err && comp.status != IONIC_RC_ENOSUPP)
-               goto err_out;
-       if (!err) {
-               switch (comp.linkstate) {
-               case IONIC_VF_LINK_STATUS_UP:
-                       vfdata->linkstate = IFLA_VF_LINK_STATE_ENABLE;
-                       break;
-               case IONIC_VF_LINK_STATUS_DOWN:
-                       vfdata->linkstate = IFLA_VF_LINK_STATE_DISABLE;
-                       break;
-               case IONIC_VF_LINK_STATUS_AUTO:
-                       vfdata->linkstate = IFLA_VF_LINK_STATE_AUTO;
-                       break;
-               default:
-                       dev_warn(ionic->dev, "Unexpected link state %u\n", comp.linkstate);
-                       break;
-               }
-       }
-
-       attr = IONIC_VF_ATTR_RATE;
-       err = ionic_dev_cmd_vf_getattr(ionic, vf, attr, &comp);
-       if (err && comp.status != IONIC_RC_ENOSUPP)
-               goto err_out;
-       if (!err)
-               vfdata->maxrate = comp.maxrate;
-
-       attr = IONIC_VF_ATTR_TRUST;
-       err = ionic_dev_cmd_vf_getattr(ionic, vf, attr, &comp);
-       if (err && comp.status != IONIC_RC_ENOSUPP)
-               goto err_out;
-       if (!err)
-               vfdata->trusted = comp.trust;
-
-       attr = IONIC_VF_ATTR_MAC;
-       err = ionic_dev_cmd_vf_getattr(ionic, vf, attr, &comp);
-       if (err && comp.status != IONIC_RC_ENOSUPP)
-               goto err_out;
-       if (!err)
-               ether_addr_copy(vfdata->macaddr, comp.macaddr);
-
-err_out:
-       if (err)
-               dev_err(ionic->dev, "Failed to get %s for VF %d\n",
-                       ionic_vf_attr_to_str(attr), vf);
-
-       return err;
-}
-
 static int ionic_get_vf_config(struct net_device *netdev,
                               int vf, struct ifla_vf_info *ivf)
 {
        struct ionic_lif *lif = netdev_priv(netdev);
        struct ionic *ionic = lif->ionic;
-       struct ionic_vf vfdata = { 0 };
        int ret = 0;
 
        if (!netif_device_present(netdev))
@@ -2418,18 +2347,16 @@ static int ionic_get_vf_config(struct net_device *netdev,
        if (vf >= pci_num_vf(ionic->pdev) || !ionic->vfs) {
                ret = -EINVAL;
        } else {
-               ivf->vf = vf;
-               ivf->qos = 0;
-
-               ret = ionic_get_fw_vf_config(ionic, vf, &vfdata);
-               if (!ret) {
-                       ivf->vlan         = le16_to_cpu(vfdata.vlanid);
-                       ivf->spoofchk     = vfdata.spoofchk;
-                       ivf->linkstate    = vfdata.linkstate;
-                       ivf->max_tx_rate  = le32_to_cpu(vfdata.maxrate);
-                       ivf->trusted      = vfdata.trusted;
-                       ether_addr_copy(ivf->mac, vfdata.macaddr);
-               }
+               struct ionic_vf *vfdata = &ionic->vfs[vf];
+
+               ivf->vf           = vf;
+               ivf->qos          = 0;
+               ivf->vlan         = le16_to_cpu(vfdata->vlanid);
+               ivf->spoofchk     = vfdata->spoofchk;
+               ivf->linkstate    = vfdata->linkstate;
+               ivf->max_tx_rate  = le32_to_cpu(vfdata->maxrate);
+               ivf->trusted      = vfdata->trusted;
+               ether_addr_copy(ivf->mac, vfdata->macaddr);
        }
 
        up_read(&ionic->vf_op_lock);

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
index 835577392178913d9aa9eb8d5a9ea055f9103102..8d15f9203bd5d4ec3bd3d1fcd2d8314e22a327c2 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
@@ -188,28 +188,6 @@ static const char *ionic_opcode_to_str(enum ionic_cmd_opcode opcode)
        }
 }
 
-const char *ionic_vf_attr_to_str(enum ionic_vf_attr attr)
-{
-       switch (attr) {
-       case IONIC_VF_ATTR_SPOOFCHK:
-               return "IONIC_VF_ATTR_SPOOFCHK";
-       case IONIC_VF_ATTR_TRUST:
-               return "IONIC_VF_ATTR_TRUST";
-       case IONIC_VF_ATTR_LINKSTATE:
-               return "IONIC_VF_ATTR_LINKSTATE";
-       case IONIC_VF_ATTR_MAC:
-               return "IONIC_VF_ATTR_MAC";
-       case IONIC_VF_ATTR_VLAN:
-               return "IONIC_VF_ATTR_VLAN";
-       case IONIC_VF_ATTR_RATE:
-               return "IONIC_VF_ATTR_RATE";
-       case IONIC_VF_ATTR_STATSADDR:
-               return "IONIC_VF_ATTR_STATSADDR";
-       default:
-               return "IONIC_VF_ATTR_UNKNOWN";
-       }
-}
-
 static void ionic_adminq_flush(struct ionic_lif *lif)
 {
        struct ionic_desc_info *desc_info;