nfp: VF rate limit support

Add VF rate limit feature

This patch enhances the NFP driver to supports assignment of
both max_tx_rate and min_tx_rate to VFs

The template of configurations below is all supported.
e.g.
 # ip link set $DEV vf $VF_NUM max_tx_rate $RATE_VALUE
 # ip link set $DEV vf $VF_NUM min_tx_rate $RATE_VALUE
 # ip link set $DEV vf $VF_NUM max_tx_rate $RATE_VALUE \
			       min_tx_rate $RATE_VALUE
 # ip link set $DEV vf $VF_NUM min_tx_rate $RATE_VALUE \
			       max_tx_rate $RATE_VALUE

The max RATE_VALUE is limited to 0xFFFF which is about
63Gbps (using 1024 for 1G)

Signed-off-by: Bin Chen <bin.chen@corigine.com>
Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index e3594a5c2a855a62b1d7e419b27e59d488baef32..4e56a99087fab64efa2c2c29bad3929746dd5561 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -1903,6 +1903,7 @@ const struct net_device_ops nfp_nfd3_netdev_ops = {
        .ndo_vlan_rx_kill_vid   = nfp_net_vlan_rx_kill_vid,
        .ndo_set_vf_mac         = nfp_app_set_vf_mac,
        .ndo_set_vf_vlan        = nfp_app_set_vf_vlan,
+       .ndo_set_vf_rate        = nfp_app_set_vf_rate,
        .ndo_set_vf_spoofchk    = nfp_app_set_vf_spoofchk,
        .ndo_set_vf_trust       = nfp_app_set_vf_trust,
        .ndo_get_vf_config      = nfp_app_get_vf_config,

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c b/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c
index 4627715a5e323b62a085f99b666c94f58072dda3..54af309613510aa8a59696d8ff1b69bfcc322d2e 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c
@@ -142,6 +142,37 @@ int nfp_app_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos,
        return nfp_net_sriov_update(app, vf, update, "vlan");
 }
 
+int nfp_app_set_vf_rate(struct net_device *netdev, int vf,
+                       int min_tx_rate, int max_tx_rate)
+{
+       struct nfp_app *app = nfp_app_from_netdev(netdev);
+       u32 vf_offset, ratevalue;
+       int err;
+
+       err = nfp_net_sriov_check(app, vf, NFP_NET_VF_CFG_MB_CAP_RATE, "rate");
+       if (err)
+               return err;
+
+       if (max_tx_rate >= NFP_NET_VF_RATE_MAX ||
+           min_tx_rate >= NFP_NET_VF_RATE_MAX) {
+               nfp_warn(app->cpp, "tx-rate exceeds %d.\n",
+                        NFP_NET_VF_RATE_MAX);
+               return -EINVAL;
+       }
+
+       vf_offset = NFP_NET_VF_CFG_MB_SZ + vf * NFP_NET_VF_CFG_SZ;
+       ratevalue = FIELD_PREP(NFP_NET_VF_CFG_MAX_RATE,
+                              max_tx_rate ? max_tx_rate :
+                              NFP_NET_VF_RATE_MAX) |
+                   FIELD_PREP(NFP_NET_VF_CFG_MIN_RATE, min_tx_rate);
+
+       writel(ratevalue,
+              app->pf->vfcfg_tbl2 + vf_offset + NFP_NET_VF_CFG_RATE);
+
+       return nfp_net_sriov_update(app, vf, NFP_NET_VF_CFG_MB_UPD_RATE,
+                                   "rate");
+}
+
 int nfp_app_set_vf_spoofchk(struct net_device *netdev, int vf, bool enable)
 {
        struct nfp_app *app = nfp_app_from_netdev(netdev);
@@ -228,9 +259,8 @@ int nfp_app_get_vf_config(struct net_device *netdev, int vf,
                          struct ifla_vf_info *ivi)
 {
        struct nfp_app *app = nfp_app_from_netdev(netdev);
-       unsigned int vf_offset;
+       u32 vf_offset, mac_hi, rate;
        u32 vlan_tag;
-       u32 mac_hi;
        u16 mac_lo;
        u8 flags;
        int err;
@@ -261,5 +291,19 @@ int nfp_app_get_vf_config(struct net_device *netdev, int vf,
        ivi->trusted = FIELD_GET(NFP_NET_VF_CFG_CTRL_TRUST, flags);
        ivi->linkstate = FIELD_GET(NFP_NET_VF_CFG_CTRL_LINK_STATE, flags);
 
+       err = nfp_net_sriov_check(app, vf, NFP_NET_VF_CFG_MB_CAP_RATE, "rate");
+       if (!err) {
+               rate = readl(app->pf->vfcfg_tbl2 + vf_offset +
+                            NFP_NET_VF_CFG_RATE);
+
+               ivi->max_tx_rate = FIELD_GET(NFP_NET_VF_CFG_MAX_RATE, rate);
+               ivi->min_tx_rate = FIELD_GET(NFP_NET_VF_CFG_MIN_RATE, rate);
+
+               if (ivi->max_tx_rate == NFP_NET_VF_RATE_MAX)
+                       ivi->max_tx_rate = 0;
+               if (ivi->min_tx_rate == NFP_NET_VF_RATE_MAX)
+                       ivi->min_tx_rate = 0;
+       }
+
        return 0;
 }

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h b/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h
index 7b72cc0834765a7c296be50522ae2515c342596f..2d445fa199dc8884d94f8f8f9d3d7dab2dfe2c1b 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h
@@ -20,6 +20,7 @@
 #define   NFP_NET_VF_CFG_MB_CAP_LINK_STATE               (0x1 << 3)
 #define   NFP_NET_VF_CFG_MB_CAP_TRUST                    (0x1 << 4)
 #define   NFP_NET_VF_CFG_MB_CAP_VLAN_PROTO               (0x1 << 5)
+#define   NFP_NET_VF_CFG_MB_CAP_RATE                     (0x1 << 6)
 #define NFP_NET_VF_CFG_MB_RET                          0x2
 #define NFP_NET_VF_CFG_MB_UPD                          0x4
 #define   NFP_NET_VF_CFG_MB_UPD_MAC                      (0x1 << 0)
@@ -28,6 +29,7 @@
 #define   NFP_NET_VF_CFG_MB_UPD_LINK_STATE               (0x1 << 3)
 #define   NFP_NET_VF_CFG_MB_UPD_TRUST                    (0x1 << 4)
 #define   NFP_NET_VF_CFG_MB_UPD_VLAN_PROTO               (0x1 << 5)
+#define   NFP_NET_VF_CFG_MB_UPD_RATE                     (0x1 << 6)
 #define NFP_NET_VF_CFG_MB_VF_NUM                       0x7
 
 /* VF config entry
@@ -48,10 +50,17 @@
 #define   NFP_NET_VF_CFG_VLAN_PROT                       0xffff0000
 #define   NFP_NET_VF_CFG_VLAN_QOS                        0xe000
 #define   NFP_NET_VF_CFG_VLAN_VID                        0x0fff
+#define NFP_NET_VF_CFG_RATE                            0xc
+#define   NFP_NET_VF_CFG_MIN_RATE                      0x0000ffff
+#define   NFP_NET_VF_CFG_MAX_RATE                      0xffff0000
+
+#define NFP_NET_VF_RATE_MAX                    0xffff
 
 int nfp_app_set_vf_mac(struct net_device *netdev, int vf, u8 *mac);
 int nfp_app_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos,
                        __be16 vlan_proto);
+int nfp_app_set_vf_rate(struct net_device *netdev, int vf, int min_tx_rate,
+                       int max_tx_rate);
 int nfp_app_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting);
 int nfp_app_set_vf_trust(struct net_device *netdev, int vf, bool setting);
 int nfp_app_set_vf_link_state(struct net_device *netdev, int vf,