* [Intel-wired-lan] [next-queue v5 PATCH 0/7] i40e: Add VF Port Representator support for SR-IOV VFs
@ 2017-01-26 0:54 Sridhar Samudrala
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 1/7] i40e: Introduce devlink interface Sridhar Samudrala
` (6 more replies)
0 siblings, 7 replies; 21+ messages in thread
From: Sridhar Samudrala @ 2017-01-26 0:54 UTC (permalink / raw)
To: intel-wired-lan
This patchset is against dev-queue branch of Jeff Kirsher's next-queue git tree.
- Patch 1 introduces devlink interface to get/set the mode of SRIOV switch.
- Patch 2 adds support to create VF port representor(VFPR) netdevs associated
with SR-IOV VFs that can be used to control/configure VFs from PF name space.
- Patch 3 enables syncing link state between VFs and VFPRs.
- Patch 4 adds a new type to metadata_dst to allow passing VF id to lower device.
- Patch 5 adds TX and RX support to VFPR netdevs.
- Patch 6 enables HW and SW VFPR statistics to be exposed via netlink on VFPR
netdevs.
- Patch 7 adds support to get switch id and port number for VFPR netdevs.
v5:
- Fix an issue with the link state sync patch.
v4:
- Make VFPR ndo_get_stats64 a void function to match with recent upstream
change.
v3:
- misc. error handling fixes suggested by Scott Peterson
- introduce switchdev_ops and add support to get switch id and port no.
for VFPR netdevs. Suggested by Or Gerlitz
v2:
- handle i40e_alloc_vfpr_netdev() failures.
- minor comment/commit msg updates.
Jakub Kicinski (1):
net: store port/representator id in metadata_dst
Sridhar Samudrala (6):
i40e: Introduce devlink interface
i40e: Introduce VF Port Representator(VFPR) netdevs
i40e: Sync link state between VFs and VFPRs
i40e: Add TX and RX support in switchdev mode
i40e: Add support for exposing VF port statistics via VFPR netdev on
the host
i40e: Add support to get switch id and port number for VFPR netdevs
drivers/net/ethernet/intel/Kconfig | 1 +
drivers/net/ethernet/intel/i40e/i40e.h | 5 +
drivers/net/ethernet/intel/i40e/i40e_main.c | 131 +++++++-
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 146 ++++++++-
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +
drivers/net/ethernet/intel/i40e/i40e_type.h | 3 +
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 358 ++++++++++++++++++++-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 25 ++
include/net/dst_metadata.h | 41 ++-
net/core/dst.c | 15 +-
net/core/filter.c | 1 +
net/ipv4/ip_tunnel_core.c | 6 +-
net/openvswitch/flow_netlink.c | 4 +-
13 files changed, 703 insertions(+), 35 deletions(-)
--
2.5.5
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 1/7] i40e: Introduce devlink interface
2017-01-26 0:54 [Intel-wired-lan] [next-queue v5 PATCH 0/7] i40e: Add VF Port Representator support for SR-IOV VFs Sridhar Samudrala
@ 2017-01-26 0:54 ` Sridhar Samudrala
2017-01-30 21:33 ` Bowers, AndrewX
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port Representator(VFPR) netdevs Sridhar Samudrala
` (5 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Sridhar Samudrala @ 2017-01-26 0:54 UTC (permalink / raw)
To: intel-wired-lan
Add initial devlink support to get/set the mode of SRIOV switch.
This patch sets the default mode as 'legacy' and enables getting the mode
and and setting it to 'legacy'.
The switch mode can be get/set via following 'devlink' commands.
# devlink dev eswitch show pci/0000:05:00.0
pci/0000:05:00.0: mode legacy
# devlink dev eswitch set pci/0000:05:00.0 mode switchdev
devlink answers: Operation not supported
# devlink dev eswitch set pci/0000:05:00.0 mode legacy
# devlink dev eswitch show pci/0000:05:00.0
pci/0000:05:00.0: mode legacy
Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
---
drivers/net/ethernet/intel/Kconfig | 1 +
drivers/net/ethernet/intel/i40e/i40e.h | 3 ++
drivers/net/ethernet/intel/i40e/i40e_main.c | 80 ++++++++++++++++++++++++++---
3 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 1349b45..0dbb87e 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -215,6 +215,7 @@ config I40E
tristate "Intel(R) Ethernet Controller XL710 Family support"
imply PTP_1588_CLOCK
depends on PCI
+ depends on MAY_USE_DEVLINK
---help---
This driver supports Intel(R) Ethernet Controller XL710 Family of
devices. For more information on how to identify your adapter, go
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index e0668d4..0786f78 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -54,6 +54,8 @@
#include <linux/clocksource.h>
#include <linux/net_tstamp.h>
#include <linux/ptp_clock_kernel.h>
+#include <net/devlink.h>
+
#include "i40e_type.h"
#include "i40e_prototype.h"
#ifdef I40E_FCOE
@@ -479,6 +481,7 @@ struct i40e_pf {
u32 ioremap_len;
u32 fd_inv;
u16 phy_led_val;
+ enum devlink_eswitch_mode eswitch_mode;
};
/**
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 5dfcb73..699ba1e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -11330,6 +11330,57 @@ static void i40e_get_platform_mac_addr(struct pci_dev *pdev, struct i40e_pf *pf)
}
/**
+ * i40e_devlink_eswitch_mode_get
+ *
+ * @devlink: pointer to devlink struct
+ * @mode: sr-iov switch mode pointer
+ *
+ * Returns the switch mode of the associated PF in the @mode pointer.
+ */
+static int i40e_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode)
+{
+ struct i40e_pf *pf = devlink_priv(devlink);
+
+ *mode = pf->eswitch_mode;
+
+ return 0;
+}
+
+/**
+ * i40e_devlink_eswitch_mode_set
+ *
+ * @devlink: pointer to devlink struct
+ * @mode: sr-iov switch mode
+ *
+ * Set the switch mode of the associated PF.
+ * Returns 0 on success and -EOPNOTSUPP on error.
+ */
+static int i40e_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode)
+{
+ struct i40e_pf *pf = devlink_priv(devlink);
+ int err = 0;
+
+ if (mode == pf->eswitch_mode)
+ goto done;
+
+ switch (mode) {
+ case DEVLINK_ESWITCH_MODE_LEGACY:
+ pf->eswitch_mode = mode;
+ break;
+ default:
+ err = -EOPNOTSUPP;
+ break;
+ }
+done:
+ return err;
+}
+
+static const struct devlink_ops i40e_devlink_ops = {
+ .eswitch_mode_get = i40e_devlink_eswitch_mode_get,
+ .eswitch_mode_set = i40e_devlink_eswitch_mode_set,
+};
+
+/**
* i40e_probe - Device initialization routine
* @pdev: PCI device information struct
* @ent: entry in i40e_pci_tbl
@@ -11346,6 +11397,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct i40e_pf *pf;
struct i40e_hw *hw;
static u16 pfs_found;
+ struct devlink *devlink;
u16 wol_nvm_bits;
u16 link_status;
int err;
@@ -11379,20 +11431,28 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_enable_pcie_error_reporting(pdev);
pci_set_master(pdev);
+ devlink = devlink_alloc(&i40e_devlink_ops, sizeof(*pf));
+ if (!devlink) {
+ dev_err(&pdev->dev, "devlink_alloc failed\n");
+ err = -ENOMEM;
+ goto err_devlink_alloc;
+ }
+
/* Now that we have a PCI connection, we need to do the
* low level device setup. This is primarily setting up
* the Admin Queue structures and then querying for the
* device's current profile information.
*/
- pf = kzalloc(sizeof(*pf), GFP_KERNEL);
- if (!pf) {
- err = -ENOMEM;
- goto err_pf_alloc;
- }
+ pf = devlink_priv(devlink);
pf->next_vsi = 0;
pf->pdev = pdev;
set_bit(__I40E_DOWN, &pf->state);
+ pf->eswitch_mode = DEVLINK_ESWITCH_MODE_LEGACY;
+ err = devlink_register(devlink, &pdev->dev);
+ if (err)
+ goto err_devlink_register;
+
hw = &pf->hw;
hw->back = pf;
@@ -11866,8 +11926,10 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_pf_reset:
iounmap(hw->hw_addr);
err_ioremap:
- kfree(pf);
-err_pf_alloc:
+ devlink_unregister(devlink);
+err_devlink_register:
+ devlink_free(devlink);
+err_devlink_alloc:
pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
@@ -11889,6 +11951,7 @@ static void i40e_remove(struct pci_dev *pdev)
{
struct i40e_pf *pf = pci_get_drvdata(pdev);
struct i40e_hw *hw = &pf->hw;
+ struct devlink *devlink = priv_to_devlink(pf);
i40e_status ret_code;
int i;
@@ -11977,7 +12040,8 @@ static void i40e_remove(struct pci_dev *pdev)
kfree(pf->vsi);
iounmap(hw->hw_addr);
- kfree(pf);
+ devlink_unregister(devlink);
+ devlink_free(devlink);
pci_release_mem_regions(pdev);
pci_disable_pcie_error_reporting(pdev);
--
2.5.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port Representator(VFPR) netdevs
2017-01-26 0:54 [Intel-wired-lan] [next-queue v5 PATCH 0/7] i40e: Add VF Port Representator support for SR-IOV VFs Sridhar Samudrala
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 1/7] i40e: Introduce devlink interface Sridhar Samudrala
@ 2017-01-26 0:54 ` Sridhar Samudrala
2017-01-30 21:33 ` Bowers, AndrewX
2017-02-01 1:06 ` Keller, Jacob E
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 3/7] i40e: Sync link state between VFs and VFPRs Sridhar Samudrala
` (4 subsequent siblings)
6 siblings, 2 replies; 21+ messages in thread
From: Sridhar Samudrala @ 2017-01-26 0:54 UTC (permalink / raw)
To: intel-wired-lan
VF Port Representator netdevs are created for each VF if the switch mode
is set to 'switchdev'. These netdevs can be used to control and configure
VFs from PFs namespace. They enable exposing VF statistics, configure and
monitor link state, mtu, filters, fdb/vlan entries etc. of VFs.
Broadcast filters are not enabled in switchdev mode.
VFPR netdevs inherit the mac address from the PF.
Sample script to create VF port representors
# rmmod i40e; modprobe i40e
# devlink dev eswitch set pci/0000:05:00.0 mode switchdev
# echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
# ip l show
297: enp5s0f0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop portid 6805ca2e7268 state DOWN mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
vf 0 MAC 00:00:00:00:00:00, spoof checking on, link-state auto, trust off
vf 1 MAC 00:00:00:00:00:00, spoof checking on, link-state auto, trust off
299: enp5s0f0-vf0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
300: enp5s0f0-vf1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 21 ++-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 153 ++++++++++++++++++++-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 14 ++
3 files changed, 182 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 699ba1e..e62472f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -11358,13 +11358,32 @@ static int i40e_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode)
static int i40e_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode)
{
struct i40e_pf *pf = devlink_priv(devlink);
- int err = 0;
+ struct i40e_vf *vf;
+ int i, j, err = 0;
if (mode == pf->eswitch_mode)
goto done;
switch (mode) {
case DEVLINK_ESWITCH_MODE_LEGACY:
+ for (i = 0; i < pf->num_alloc_vfs; i++) {
+ vf = &pf->vf[i];
+ i40e_free_vfpr_netdev(vf);
+ }
+ pf->eswitch_mode = mode;
+ break;
+ case DEVLINK_ESWITCH_MODE_SWITCHDEV:
+ for (i = 0; i < pf->num_alloc_vfs; i++) {
+ vf = &pf->vf[i];
+ err = i40e_alloc_vfpr_netdev(vf, i);
+ if (err) {
+ for (j = 0; j < i; j++) {
+ vf = &pf->vf[j];
+ i40e_free_vfpr_netdev(vf);
+ }
+ goto done;
+ }
+ }
pf->eswitch_mode = mode;
break;
default:
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 5b08fb9..3d45ef2 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -696,11 +696,15 @@ static int i40e_alloc_vsi_res(struct i40e_vf *vf, enum i40e_vsi_type type)
"Could not add MAC filter %pM for VF %d\n",
vf->default_lan_addr.addr, vf->vf_id);
}
- eth_broadcast_addr(broadcast);
- f = i40e_add_mac_filter(vsi, broadcast);
- if (!f)
- dev_info(&pf->pdev->dev,
- "Could not allocate VF broadcast filter\n");
+
+ /* Add VF broadcast filter only in 'legacy' mode */
+ if (vsi->back->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY) {
+ eth_broadcast_addr(broadcast);
+ f = i40e_add_mac_filter(vsi, broadcast);
+ if (!f)
+ dev_info(&pf->pdev->dev,
+ "Could not allocate VF broadcast filter\n");
+ }
spin_unlock_bh(&vsi->mac_filter_hash_lock);
i40e_write_rx_ctl(&pf->hw, I40E_VFQF_HENA1(0, vf->vf_id),
(u32)hena);
@@ -1018,6 +1022,137 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
}
/**
+ * i40e_vfpr_netdev_open
+ * @dev: network interface device structure
+ *
+ * Called when vfpr netdevice is brought up.
+ **/
+static int i40e_vfpr_netdev_open(struct net_device *dev)
+{
+ return 0;
+}
+
+/**
+ * i40e_vfpr_netdev_stop
+ * @dev: network interface device structure
+ *
+ * Called when vfpr netdevice is brought down.
+ **/
+static int i40e_vfpr_netdev_stop(struct net_device *dev)
+{
+ return 0;
+}
+
+static const struct net_device_ops i40e_vfpr_netdev_ops = {
+ .ndo_open = i40e_vfpr_netdev_open,
+ .ndo_stop = i40e_vfpr_netdev_stop,
+};
+
+/**
+ * i40e_update_vf_broadcast_filter
+ * @vf: pointer to the VF structure
+ * @enable: boolean flag indicating add/delete
+ *
+ * add/delete VFs broadcast filter
+ **/
+void i40e_update_vf_broadcast_filter(struct i40e_vf *vf, bool enable)
+{
+ struct i40e_pf *pf = vf->pf;
+ struct i40e_vsi *vsi = pf->vsi[vf->lan_vsi_idx];
+ u8 broadcast[ETH_ALEN];
+ int err;
+
+ spin_lock_bh(&vsi->mac_filter_hash_lock);
+ eth_broadcast_addr(broadcast);
+ if (enable)
+ i40e_add_mac_filter(vsi, broadcast);
+ else
+ i40e_del_mac_filter(vsi, broadcast);
+ spin_unlock_bh(&vsi->mac_filter_hash_lock);
+
+ /* update broadcast filter */
+ err = i40e_sync_vsi_filters(vsi);
+ if (err)
+ dev_err(&pf->pdev->dev, "Unable to program bcast filter\n");
+}
+
+/**
+ * i40e_alloc_vfpr_netdev
+ * @vf: pointer to the VF structure
+ * @vf_num: VF number
+ *
+ * Create VF Port representor netdev
+ **/
+int i40e_alloc_vfpr_netdev(struct i40e_vf *vf, u16 vf_num)
+{
+ struct net_device *vfpr_netdev;
+ char netdev_name[IFNAMSIZ];
+ struct i40e_vfpr_netdev_priv *priv;
+ struct i40e_pf *pf = vf->pf;
+ struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
+ int err;
+
+ snprintf(netdev_name, IFNAMSIZ, "%s-vf%d", vsi->netdev->name, vf_num);
+ vfpr_netdev = alloc_netdev(sizeof(struct i40e_vfpr_netdev_priv),
+ netdev_name, NET_NAME_UNKNOWN, ether_setup);
+ if (!vfpr_netdev) {
+ dev_err(&pf->pdev->dev, "alloc_netdev failed for vf:%d\n",
+ vf_num);
+ return -ENOMEM;
+ }
+
+ pf->vf[vf_num].vfpr_netdev = vfpr_netdev;
+
+ priv = netdev_priv(vfpr_netdev);
+ priv->vf = &pf->vf[vf_num];
+
+ vfpr_netdev->netdev_ops = &i40e_vfpr_netdev_ops;
+ eth_hw_addr_inherit(vfpr_netdev, vsi->netdev);
+
+ netif_carrier_off(vfpr_netdev);
+ netif_tx_disable(vfpr_netdev);
+
+ err = register_netdev(vfpr_netdev);
+ if (err) {
+ dev_err(&pf->pdev->dev, "register_netdev failed for vf: %s\n",
+ vf->vfpr_netdev->name);
+ free_netdev(vfpr_netdev);
+ return err;
+ }
+
+ dev_info(&pf->pdev->dev, "VF Port representor(%s) created for VF %d\n",
+ vf->vfpr_netdev->name, vf_num);
+
+ /* Delete broadcast filter for VF */
+ i40e_update_vf_broadcast_filter(vf, false);
+
+ return 0;
+}
+
+/**
+ * i40e_free_vfpr_netdev
+ * @vf: pointer to the VF structure
+ *
+ * Free VF Port representor netdev
+ **/
+void i40e_free_vfpr_netdev(struct i40e_vf *vf)
+{
+ struct i40e_pf *pf = vf->pf;
+
+ if (!vf->vfpr_netdev)
+ return;
+
+ dev_info(&pf->pdev->dev, "Freeing VF Port representor(%s)\n",
+ vf->vfpr_netdev->name);
+
+ unregister_netdev(vf->vfpr_netdev);
+ free_netdev(vf->vfpr_netdev);
+
+ /* Add broadcast filter to VF */
+ i40e_update_vf_broadcast_filter(vf, true);
+}
+
+/**
* i40e_free_vfs
* @pf: pointer to the PF structure
*
@@ -1058,6 +1193,9 @@ void i40e_free_vfs(struct i40e_pf *pf)
i40e_free_vf_res(&pf->vf[i]);
/* disable qp mappings */
i40e_disable_vf_mappings(&pf->vf[i]);
+
+ if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_SWITCHDEV)
+ i40e_free_vfpr_netdev(&pf->vf[i]);
}
kfree(pf->vf);
@@ -1125,6 +1263,11 @@ int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs)
/* VF resources get allocated during reset */
i40e_reset_vf(&vfs[i], false);
+ if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_SWITCHDEV) {
+ ret = i40e_alloc_vfpr_netdev(&vfs[i], i);
+ if (ret)
+ goto err_alloc;
+ }
}
pf->num_alloc_vfs = num_alloc_vfs;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index 4012d06..25ce93c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -72,10 +72,21 @@ enum i40e_vf_capabilities {
I40E_VIRTCHNL_VF_CAP_IWARP,
};
+/* VF Port representator netdev private structure */
+struct i40e_vfpr_netdev_priv {
+ struct i40e_vf *vf;
+};
+
/* VF information structure */
struct i40e_vf {
struct i40e_pf *pf;
+ /* VF Port representator netdev that allows control and configuration
+ * of VFs from the host. Enables returning VF stats, configuring link
+ * state, mtu, fdb/vlans etc.
+ */
+ struct net_device *vfpr_netdev;
+
/* VF id in the PF space */
s16 vf_id;
/* all VF vsis connect to the same parent */
@@ -142,4 +153,7 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable);
void i40e_vc_notify_link_state(struct i40e_pf *pf);
void i40e_vc_notify_reset(struct i40e_pf *pf);
+int i40e_alloc_vfpr_netdev(struct i40e_vf *vf, u16 vf_num);
+void i40e_free_vfpr_netdev(struct i40e_vf *vf);
+
#endif /* _I40E_VIRTCHNL_PF_H_ */
--
2.5.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 3/7] i40e: Sync link state between VFs and VFPRs
2017-01-26 0:54 [Intel-wired-lan] [next-queue v5 PATCH 0/7] i40e: Add VF Port Representator support for SR-IOV VFs Sridhar Samudrala
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 1/7] i40e: Introduce devlink interface Sridhar Samudrala
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port Representator(VFPR) netdevs Sridhar Samudrala
@ 2017-01-26 0:54 ` Sridhar Samudrala
2017-01-30 21:34 ` Bowers, AndrewX
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 4/7] net: store port/representator id in metadata_dst Sridhar Samudrala
` (3 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Sridhar Samudrala @ 2017-01-26 0:54 UTC (permalink / raw)
To: intel-wired-lan
This patch enables
- reflecting the link state of VFPR based on VF admin state & link state
of VF based on admin state of VFPR.
- bringing up/down the VFPR sends a notification to update VF link state.
- bringing up/down the VF will cause the link state update of VFPR.
- enable/disable VF link state via ndo_set_vf_link_state will update the
admin state of associated VFPR.
PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1
# rmmod i40e; modprobe i40e
# devlink dev eswitch set pci/0000:05:00.0 mode switchdev
# echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
# ip link set enp5s2 up
# ip link set enp5s0f0-vf0 up
# ip link set enp5s0f0-vf1 up
/* enp5s2 UP -> enp5s0f0-vf0 CARRIER ON */
# ip link show enp5s0f0-vf0
215: enp5s0f0-vf0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel state UP mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
/* enp5s0f0-vf0 UP -> enp5s2 CARRIER ON */
# ip link show enp5s2
218: enp5s2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether ea:4d:60:bc:6f:85 brd ff:ff:ff:ff:ff:ff
/* enp5s2f1 DOWN -> enp5s0f0-vf1 NO-CARRIER */
# ip link show enp5s0f0-vf1
216: enp5s0f0-vf1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc fq_codel state DOWN mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
# ip link set enp5s0f0-vf0 down
# ip link set enp5s2f1 up
/* enp5s0-vf0 DOWN -> enp5s2 NO_CARRIER */
# ip link show enp5s2
218: enp5s2: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq state DOWN mode DEFAULT group default qlen 1000
link/ether ea:4d:60:bc:6f:85 brd ff:ff:ff:ff:ff:ff
# ip -d link show enp5s0f0
213: enp5s0f0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop portid 6805ca27268 state DOWN mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff promiscuity 0 addrgenmode eui64
vf 0 MAC 00:00:00:00:00:00, spoof checking on, link-state disable, trust off
vf 1 MAC 00:00:00:00:00:00, spoof checking on, link-state enable, trust off
Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 44 ++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 3d45ef2..63c9fdf 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1029,6 +1029,13 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
**/
static int i40e_vfpr_netdev_open(struct net_device *dev)
{
+ struct i40e_vfpr_netdev_priv *priv = netdev_priv(dev);
+ struct i40e_vf *vf = priv->vf;
+
+ vf->link_forced = true;
+ vf->link_up = true;
+ i40e_vc_notify_vf_link_state(vf);
+
return 0;
}
@@ -1040,6 +1047,13 @@ static int i40e_vfpr_netdev_open(struct net_device *dev)
**/
static int i40e_vfpr_netdev_stop(struct net_device *dev)
{
+ struct i40e_vfpr_netdev_priv *priv = netdev_priv(dev);
+ struct i40e_vf *vf = priv->vf;
+
+ vf->link_forced = true;
+ vf->link_up = false;
+ i40e_vc_notify_vf_link_state(vf);
+
return 0;
}
@@ -1126,6 +1140,13 @@ int i40e_alloc_vfpr_netdev(struct i40e_vf *vf, u16 vf_num)
/* Delete broadcast filter for VF */
i40e_update_vf_broadcast_filter(vf, false);
+ /* Reset VF link as we are changing the mode to 'switchdev'. VFPR netdev
+ * needs to be brought up to enable VF link.
+ */
+ vf->link_forced = true;
+ vf->link_up = false;
+ i40e_vc_notify_vf_link_state(vf);
+
return 0;
}
@@ -1150,6 +1171,10 @@ void i40e_free_vfpr_netdev(struct i40e_vf *vf)
/* Add broadcast filter to VF */
i40e_update_vf_broadcast_filter(vf, true);
+
+ /* In legacy mode, VF link is not controlled by VFPR */
+ vf->link_forced = false;
+ i40e_vc_notify_vf_link_state(vf);
}
/**
@@ -1909,6 +1934,10 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
if (i40e_vsi_start_rings(pf->vsi[vf->lan_vsi_idx]))
aq_ret = I40E_ERR_TIMEOUT;
+
+ if ((aq_ret == 0) && vf->vfpr_netdev)
+ netif_carrier_on(vf->vfpr_netdev);
+
error_param:
/* send the response to the VF */
return i40e_vc_send_resp_to_vf(vf, I40E_VIRTCHNL_OP_ENABLE_QUEUES,
@@ -1948,6 +1977,9 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
i40e_vsi_stop_rings(pf->vsi[vf->lan_vsi_idx]);
+ if ((aq_ret == 0) && vf->vfpr_netdev)
+ netif_carrier_off(vf->vfpr_netdev);
+
error_param:
/* send the response to the VF */
return i40e_vc_send_resp_to_vf(vf, I40E_VIRTCHNL_OP_DISABLE_QUEUES,
@@ -3183,6 +3215,7 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)
struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_pf *pf = np->vsi->back;
struct i40e_virtchnl_pf_event pfe;
+ struct net_device *vfpr_netdev;
struct i40e_hw *hw = &pf->hw;
struct i40e_vf *vf;
int abs_vf_id;
@@ -3225,6 +3258,17 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)
ret = -EINVAL;
goto error_out;
}
+
+ vfpr_netdev = vf->vfpr_netdev;
+ if (vfpr_netdev) {
+ unsigned int flags = vfpr_netdev->flags;
+
+ if (vf->link_up)
+ dev_change_flags(vfpr_netdev, flags | IFF_UP);
+ else
+ dev_change_flags(vfpr_netdev, flags & ~IFF_UP);
+ }
+
/* Notify the VF of its new link state */
i40e_aq_send_msg_to_vf(hw, abs_vf_id, I40E_VIRTCHNL_OP_EVENT,
0, (u8 *)&pfe, sizeof(pfe), NULL);
--
2.5.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 4/7] net: store port/representator id in metadata_dst
2017-01-26 0:54 [Intel-wired-lan] [next-queue v5 PATCH 0/7] i40e: Add VF Port Representator support for SR-IOV VFs Sridhar Samudrala
` (2 preceding siblings ...)
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 3/7] i40e: Sync link state between VFs and VFPRs Sridhar Samudrala
@ 2017-01-26 0:54 ` Sridhar Samudrala
2017-01-30 21:36 ` Bowers, AndrewX
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode Sridhar Samudrala
` (2 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Sridhar Samudrala @ 2017-01-26 0:54 UTC (permalink / raw)
To: intel-wired-lan
From: Jakub Kicinski <jakub.kicinski@netronome.com>
Switches and modern SR-IOV enabled NICs may multiplex traffic from Port
representators and control messages over single set of hardware queues.
Control messages and muxed traffic may need ordered delivery.
Those requirements make it hard to comfortably use TC infrastructure today
unless we have a way of attaching metadata to skbs at the upper device.
Because single set of queues is used for many netdevs stopping TC/sched queues
of all of them reliably is impossible and lower device has to retreat to
returning NETDEV_TX_BUSY and usually has to take extra locks on the fastpath.
This patch attempts to enable port/representative devs to attach metadata to
skbs which carry port id. This way representatives can be queueless and all
queuing can be performed at the lower netdev in the usual way.
Traffic arriving on the port/representative interfaces will be have metadata
attached and will subsequently be queued to the lower device for transmission.
The lower device should recognize the metadata and translate it to HW specific
format which is most likely either a special header inserted before the network
headers or descriptor/metadata fields.
Metadata is associated with the lower device by storing the netdev pointer along
with port id so that if TC decides to redirect or mirror the new netdev will not
try to interpret it.
This is mostly for SR-IOV devices since switches don't have lower netdevs today.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
---
include/net/dst_metadata.h | 41 ++++++++++++++++++++++++++++++++---------
net/core/dst.c | 15 ++++++++++-----
net/core/filter.c | 1 +
net/ipv4/ip_tunnel_core.c | 6 ++++--
net/openvswitch/flow_netlink.c | 4 +++-
5 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/include/net/dst_metadata.h b/include/net/dst_metadata.h
index 701fc81..a803129 100644
--- a/include/net/dst_metadata.h
+++ b/include/net/dst_metadata.h
@@ -5,10 +5,22 @@
#include <net/ip_tunnels.h>
#include <net/dst.h>
+enum metadata_type {
+ METADATA_IP_TUNNEL,
+ METADATA_HW_PORT_MUX,
+};
+
+struct hw_port_info {
+ struct net_device *lower_dev;
+ u32 port_id;
+};
+
struct metadata_dst {
struct dst_entry dst;
+ enum metadata_type type;
union {
struct ip_tunnel_info tun_info;
+ struct hw_port_info port_info;
} u;
};
@@ -27,7 +39,7 @@ static inline struct ip_tunnel_info *skb_tunnel_info(struct sk_buff *skb)
struct metadata_dst *md_dst = skb_metadata_dst(skb);
struct dst_entry *dst;
- if (md_dst)
+ if (md_dst && md_dst->type == METADATA_IP_TUNNEL)
return &md_dst->u.tun_info;
dst = skb_dst(skb);
@@ -55,22 +67,33 @@ static inline int skb_metadata_dst_cmp(const struct sk_buff *skb_a,
a = (const struct metadata_dst *) skb_dst(skb_a);
b = (const struct metadata_dst *) skb_dst(skb_b);
- if (!a != !b || a->u.tun_info.options_len != b->u.tun_info.options_len)
+ if (!a != !b || a->type != b->type)
return 1;
- return memcmp(&a->u.tun_info, &b->u.tun_info,
- sizeof(a->u.tun_info) + a->u.tun_info.options_len);
+ switch (a->type) {
+ case METADATA_HW_PORT_MUX:
+ return memcmp(&a->u.port_info, &b->u.port_info,
+ sizeof(a->u.port_info));
+ case METADATA_IP_TUNNEL:
+ return memcmp(&a->u.tun_info, &b->u.tun_info,
+ sizeof(a->u.tun_info) +
+ a->u.tun_info.options_len);
+ default:
+ return 1;
+ }
}
void metadata_dst_free(struct metadata_dst *);
-struct metadata_dst *metadata_dst_alloc(u8 optslen, gfp_t flags);
-struct metadata_dst __percpu *metadata_dst_alloc_percpu(u8 optslen, gfp_t flags);
+struct metadata_dst *metadata_dst_alloc(u8 optslen, enum metadata_type type,
+ gfp_t flags);
+struct metadata_dst __percpu *
+metadata_dst_alloc_percpu(u8 optslen, enum metadata_type type, gfp_t flags);
static inline struct metadata_dst *tun_rx_dst(int md_size)
{
struct metadata_dst *tun_dst;
- tun_dst = metadata_dst_alloc(md_size, GFP_ATOMIC);
+ tun_dst = metadata_dst_alloc(md_size, METADATA_IP_TUNNEL, GFP_ATOMIC);
if (!tun_dst)
return NULL;
@@ -85,11 +108,11 @@ static inline struct metadata_dst *tun_dst_unclone(struct sk_buff *skb)
int md_size;
struct metadata_dst *new_md;
- if (!md_dst)
+ if (!md_dst || md_dst->type != METADATA_IP_TUNNEL)
return ERR_PTR(-EINVAL);
md_size = md_dst->u.tun_info.options_len;
- new_md = metadata_dst_alloc(md_size, GFP_ATOMIC);
+ new_md = metadata_dst_alloc(md_size, METADATA_IP_TUNNEL, GFP_ATOMIC);
if (!new_md)
return ERR_PTR(-ENOMEM);
diff --git a/net/core/dst.c b/net/core/dst.c
index b5cbbe0..62dd4e4 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -367,7 +367,9 @@ static int dst_md_discard(struct sk_buff *skb)
return 0;
}
-static void __metadata_dst_init(struct metadata_dst *md_dst, u8 optslen)
+static void __metadata_dst_init(struct metadata_dst *md_dst,
+ enum metadata_type type, u8 optslen)
+
{
struct dst_entry *dst;
@@ -379,9 +381,11 @@ static void __metadata_dst_init(struct metadata_dst *md_dst, u8 optslen)
dst->output = dst_md_discard_out;
memset(dst + 1, 0, sizeof(*md_dst) + optslen - sizeof(*dst));
+ md_dst->type = type;
}
-struct metadata_dst *metadata_dst_alloc(u8 optslen, gfp_t flags)
+struct metadata_dst *metadata_dst_alloc(u8 optslen, enum metadata_type type,
+ gfp_t flags)
{
struct metadata_dst *md_dst;
@@ -389,7 +393,7 @@ struct metadata_dst *metadata_dst_alloc(u8 optslen, gfp_t flags)
if (!md_dst)
return NULL;
- __metadata_dst_init(md_dst, optslen);
+ __metadata_dst_init(md_dst, type, optslen);
return md_dst;
}
@@ -403,7 +407,8 @@ void metadata_dst_free(struct metadata_dst *md_dst)
kfree(md_dst);
}
-struct metadata_dst __percpu *metadata_dst_alloc_percpu(u8 optslen, gfp_t flags)
+struct metadata_dst __percpu *
+metadata_dst_alloc_percpu(u8 optslen, enum metadata_type type, gfp_t flags)
{
int cpu;
struct metadata_dst __percpu *md_dst;
@@ -414,7 +419,7 @@ struct metadata_dst __percpu *metadata_dst_alloc_percpu(u8 optslen, gfp_t flags)
return NULL;
for_each_possible_cpu(cpu)
- __metadata_dst_init(per_cpu_ptr(md_dst, cpu), optslen);
+ __metadata_dst_init(per_cpu_ptr(md_dst, cpu), type, optslen);
return md_dst;
}
diff --git a/net/core/filter.c b/net/core/filter.c
index 1e00737..f05ee74 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2522,6 +2522,7 @@ bpf_get_skb_set_tunnel_proto(enum bpf_func_id which)
* that is holding verifier mutex.
*/
md_dst = metadata_dst_alloc_percpu(IP_TUNNEL_OPTS_MAX,
+ METADATA_IP_TUNNEL,
GFP_KERNEL);
if (!md_dst)
return NULL;
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 5476110..4544b35 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -134,10 +134,12 @@ struct metadata_dst *iptunnel_metadata_reply(struct metadata_dst *md,
struct metadata_dst *res;
struct ip_tunnel_info *dst, *src;
- if (!md || md->u.tun_info.mode & IP_TUNNEL_INFO_TX)
+ if (!md || md->type != METADATA_IP_TUNNEL ||
+ md->u.tun_info.mode & IP_TUNNEL_INFO_TX)
+
return NULL;
- res = metadata_dst_alloc(0, flags);
+ res = metadata_dst_alloc(0, METADATA_IP_TUNNEL, flags);
if (!res)
return NULL;
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index c87d359..164b4f1 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -2105,7 +2105,9 @@ static int validate_and_copy_set_tun(const struct nlattr *attr,
if (start < 0)
return start;
- tun_dst = metadata_dst_alloc(key.tun_opts_len, GFP_KERNEL);
+ tun_dst = metadata_dst_alloc(key.tun_opts_len, METADATA_IP_TUNNEL,
+ GFP_KERNEL);
+
if (!tun_dst)
return -ENOMEM;
--
2.5.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode
2017-01-26 0:54 [Intel-wired-lan] [next-queue v5 PATCH 0/7] i40e: Add VF Port Representator support for SR-IOV VFs Sridhar Samudrala
` (3 preceding siblings ...)
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 4/7] net: store port/representator id in metadata_dst Sridhar Samudrala
@ 2017-01-26 0:54 ` Sridhar Samudrala
2017-01-30 21:34 ` Bowers, AndrewX
2017-02-15 15:59 ` Alexander Duyck
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host Sridhar Samudrala
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 7/7] i40e: Add support to get switch id and port number for VFPR netdevs Sridhar Samudrala
6 siblings, 2 replies; 21+ messages in thread
From: Sridhar Samudrala @ 2017-01-26 0:54 UTC (permalink / raw)
To: intel-wired-lan
In switchdev mode, broadcast filter is not enabled on VFs. The broadcasts
and unknown frames from VFs are received by the PF and passed to
corresponding VF port representator netdev.
A host based switching entity like a linux bridge or OVS redirects these
frames to the right VFs via VFPR netdevs. Any frames sent via VFPR netdevs
are sent as directed transmits to the corresponding VFs. To enable directed
transmit, skb metadata dst is used to pass the VF id and the frame is
requeued to call the PFs transmit routine.
Small script to demonstrate inter VF pings in switchdev mode.
PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1
# rmmod i40e; modprobe i40e
# devlink dev eswitch set pci/0000:05:00.0 mode switchdev
# echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
# ip link set enp5s0f0 vf 0 mac 00:11:22:33:44:55
# ip link set enp5s0f0 vf 1 mac 00:11:22:33:44:56
# rmmod i40evf; modprobe i40evf
/* Create 2 namespaces and move the VFs to the corresponding ns. */
# ip netns add ns0
# ip link set enp5s2 netns ns0
# ip netns exec ns0 ip addr add 192.168.1.10/24 dev enp5s2
# ip netns exec ns0 ip link set enp5s2 up
# ip netns add ns1
# ip link set enp5s2f1 netns ns1
# ip netns exec ns1 ip addr add 192.168.1.11/24 dev enp5s2f1
# ip netns exec ns1 ip link set enp5s2f1 up
/* bring up pf and vfpr netdevs */
# ip link set enp5s0f0 up
# ip link set enp5s0f0-vf0 up
# ip link set enp5s0f0-vf1 up
/* Create a linux bridge and add vfpr netdevs to it. */
# ip link add vfpr-br type bridge
# ip link set enp5s0f0-vf0 master vfpr-br
# ip link set enp5s0f0-vf1 master vfpr-br
# ip addr add 192.168.1.1/24 dev vfpr-br
# ip link set vfpr-br up
# ip netns exec ns0 ping -c3 192.168.1.11
# ip netns exec ns1 ping -c3 192.168.1.10
Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e.h | 1 +
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 106 ++++++++++++++++++++-
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +
drivers/net/ethernet/intel/i40e/i40e_type.h | 3 +
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 17 +++-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 +
7 files changed, 127 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 0786f78..081154a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -55,6 +55,7 @@
#include <linux/net_tstamp.h>
#include <linux/ptp_clock_kernel.h>
#include <net/devlink.h>
+#include <net/dst_metadata.h>
#include "i40e_type.h"
#include "i40e_prototype.h"
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index e62472f..19f373e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -11358,6 +11358,7 @@ static int i40e_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode)
static int i40e_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode)
{
struct i40e_pf *pf = devlink_priv(devlink);
+ struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
struct i40e_vf *vf;
int i, j, err = 0;
@@ -11371,6 +11372,8 @@ static int i40e_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode)
i40e_free_vfpr_netdev(vf);
}
pf->eswitch_mode = mode;
+ vsi->netdev->priv_flags |=
+ (IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM);
break;
case DEVLINK_ESWITCH_MODE_SWITCHDEV:
for (i = 0; i < pf->num_alloc_vfs; i++) {
@@ -11385,6 +11388,7 @@ static int i40e_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode)
}
}
pf->eswitch_mode = mode;
+ netif_keep_dst(vsi->netdev);
break;
default:
err = -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 0291ed4..f43d1df 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1283,16 +1283,39 @@ static bool i40e_alloc_mapped_page(struct i40e_ring *rx_ring,
* @rx_ring: rx ring in play
* @skb: packet to send up
* @vlan_tag: vlan tag for packet
+ * @lpbk: is it a loopback frame?
**/
static void i40e_receive_skb(struct i40e_ring *rx_ring,
- struct sk_buff *skb, u16 vlan_tag)
+ struct sk_buff *skb, u16 vlan_tag, bool lpbk)
{
struct i40e_q_vector *q_vector = rx_ring->q_vector;
+ struct i40e_pf *pf = rx_ring->vsi->back;
+ struct i40e_vf *vf;
+ struct ethhdr *eth;
+ int vf_id;
if ((rx_ring->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
(vlan_tag & VLAN_VID_MASK))
__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
+ if ((pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY) || !lpbk)
+ goto gro_receive;
+
+ /* If a loopback packet is received from a VF in switchdev mode, pass
+ * the frame to the corresponding VFPR netdev based on the source MAC
+ * in the frame.
+ */
+ eth = (struct ethhdr *)skb_mac_header(skb);
+ for (vf_id = 0; vf_id < pf->num_alloc_vfs; vf_id++) {
+ vf = &pf->vf[vf_id];
+ if (ether_addr_equal(eth->h_source,
+ vf->default_lan_addr.addr)) {
+ skb->dev = vf->vfpr_netdev;
+ break;
+ }
+ }
+
+gro_receive:
napi_gro_receive(&q_vector->napi, skb);
}
@@ -1501,6 +1524,7 @@ static inline void i40e_rx_hash(struct i40e_ring *ring,
* @rx_desc: pointer to the EOP Rx descriptor
* @skb: pointer to current skb being populated
* @rx_ptype: the packet type decoded by hardware
+ * @lpbk: is it a loopback frame?
*
* This function checks the ring, descriptor, and packet information in
* order to populate the hash, checksum, VLAN, protocol, and
@@ -1509,7 +1533,7 @@ static inline void i40e_rx_hash(struct i40e_ring *ring,
static inline
void i40e_process_skb_fields(struct i40e_ring *rx_ring,
union i40e_rx_desc *rx_desc, struct sk_buff *skb,
- u8 rx_ptype)
+ u8 rx_ptype, bool *lpbk)
{
u64 qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
u32 rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >>
@@ -1518,6 +1542,9 @@ void i40e_process_skb_fields(struct i40e_ring *rx_ring,
u32 tsyn = (rx_status & I40E_RXD_QW1_STATUS_TSYNINDX_MASK) >>
I40E_RXD_QW1_STATUS_TSYNINDX_SHIFT;
+ *lpbk = !!((rx_status & I40E_RXD_QW1_STATUS_LPBK_MASK) >>
+ I40E_RXD_QW1_STATUS_LPBK_SHIFT);
+
if (unlikely(tsynvalid))
i40e_ptp_rx_hwtstamp(rx_ring->vsi->back, skb, tsyn);
@@ -2045,6 +2072,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
u8 rx_ptype;
u64 qword;
unsigned int xdp_consumed_bytes = 0;
+ bool lpbk;
/* return some buffers to hardware, one at a time is too slow */
if (cleaned_count >= I40E_RX_BUFFER_WRITE) {
@@ -2113,7 +2141,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
I40E_RXD_QW1_PTYPE_SHIFT;
/* populate checksum, VLAN, and protocol */
- i40e_process_skb_fields(rx_ring, rx_desc, skb, rx_ptype);
+ i40e_process_skb_fields(rx_ring, rx_desc, skb, rx_ptype, &lpbk);
#ifdef I40E_FCOE
if (unlikely(
@@ -2127,7 +2155,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
vlan_tag = (qword & BIT(I40E_RX_DESC_STATUS_L2TAG1P_SHIFT)) ?
le16_to_cpu(rx_desc->wb.qword0.lo_dword.l2tag1) : 0;
- i40e_receive_skb(rx_ring, skb, vlan_tag);
+ i40e_receive_skb(rx_ring, skb, vlan_tag, lpbk);
skb = NULL;
/* update budget accounting */
@@ -2692,6 +2720,27 @@ static int i40e_tso(struct i40e_tx_buffer *first, u8 *hdr_len,
}
/**
+ * i40e_tvsi - set up the target vsi in TX context descriptor
+ * @tx_ring: ptr to the target vsi
+ * @cd_type_cmd_tso_mss: Quad Word 1
+ *
+ * Returns 0
+ **/
+static int i40e_tvsi(struct i40e_vsi *tvsi, u64 *cd_type_cmd_tso_mss)
+{
+ u64 cd_cmd, cd_tvsi;
+
+ cd_cmd = I40E_TX_CTX_DESC_SWTCH_VSI;
+ cd_tvsi = tvsi->id;
+ cd_tvsi = (cd_tvsi << I40E_TXD_CTX_QW1_VSI_SHIFT) &
+ I40E_TXD_CTX_QW1_VSI_MASK;
+ *cd_type_cmd_tso_mss |= (cd_cmd << I40E_TXD_CTX_QW1_CMD_SHIFT) |
+ cd_tvsi;
+
+ return 0;
+}
+
+/**
* i40e_tsyn - set up the tsyn context descriptor
* @tx_ring: ptr to the ring to send
* @skb: ptr to the skb we're sending
@@ -3223,8 +3272,12 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
struct i40e_ring *tx_ring)
{
u64 cd_type_cmd_tso_mss = I40E_TX_DESC_DTYPE_CONTEXT;
+ struct metadata_dst *md_dst = skb_metadata_dst(skb);
u32 cd_tunneling = 0, cd_l2tag2 = 0;
struct i40e_tx_buffer *first;
+ struct i40e_vsi *t_vsi = NULL;
+ struct i40e_vf *t_vf;
+ struct i40e_pf *pf;
u32 td_offset = 0;
u32 tx_flags = 0;
__be16 protocol;
@@ -3276,7 +3329,26 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
else if (protocol == htons(ETH_P_IPV6))
tx_flags |= I40E_TX_FLAGS_IPV6;
- tso = i40e_tso(first, &hdr_len, &cd_type_cmd_tso_mss);
+ /* If skb metadata dst points to a VF id, do a directed transmit to
+ * that VSI. TSO is mutually exclusive with this option. So TSO is not
+ * enabled when doing a directed transmit.
+ */
+ if (md_dst && (md_dst->type == METADATA_HW_PORT_MUX)) {
+ pf = tx_ring->vsi->back;
+ if (md_dst->u.port_info.port_id >= pf->num_alloc_vfs) {
+ WARN_ONCE(1, "Unexpected port_id: %d num_vfs:%d\n",
+ md_dst->u.port_info.port_id,
+ pf->num_alloc_vfs);
+ goto out_drop;
+ }
+ t_vf = &pf->vf[md_dst->u.port_info.port_id];
+ t_vsi = pf->vsi[t_vf->lan_vsi_idx];
+ }
+
+ if (t_vsi)
+ tso = i40e_tvsi(t_vsi, &cd_type_cmd_tso_mss);
+ else
+ tso = i40e_tso(first, &hdr_len, &cd_type_cmd_tso_mss);
if (tso < 0)
goto out_drop;
@@ -3340,3 +3412,27 @@ netdev_tx_t i40e_lan_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
return i40e_xmit_frame_ring(skb, tx_ring);
}
+
+/**
+ * i40e_vfpr_netdev_start_xmit
+ * @skb: send buffer
+ * @netdev: network interface device structure
+ *
+ * Sets skb->dev to PF netdev, VF id in the skb->dst and requeues
+ * skb via dev_queue_xmit()
+ **/
+netdev_tx_t i40e_vfpr_netdev_start_xmit(struct sk_buff *skb,
+ struct net_device *netdev)
+{
+ struct i40e_vfpr_netdev_priv *priv = netdev_priv(netdev);
+ struct i40e_vf *vf = priv->vf;
+ struct i40e_pf *pf = vf->pf;
+ struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
+
+ skb_dst_drop(skb);
+ dst_hold(&priv->vfpr_dst->dst);
+ skb_dst_set(skb, &priv->vfpr_dst->dst);
+ skb->dev = vsi->netdev;
+
+ return dev_queue_xmit(skb);
+}
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
index 3250be7..5e24aef 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
@@ -393,6 +393,8 @@ struct i40e_ring_container {
bool i40e_alloc_rx_buffers(struct i40e_ring *rxr, u16 cleaned_count);
netdev_tx_t i40e_lan_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
+netdev_tx_t i40e_vfpr_netdev_start_xmit(struct sk_buff *skb,
+ struct net_device *netdev);
void i40e_clean_tx_ring(struct i40e_ring *tx_ring);
void i40e_clean_rx_ring(struct i40e_ring *rx_ring);
int i40e_setup_tx_descriptors(struct i40e_ring *tx_ring);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 939f9fd..251f57e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -729,6 +729,9 @@ enum i40e_rx_desc_status_bits {
#define I40E_RXD_QW1_STATUS_TSYNVALID_SHIFT I40E_RX_DESC_STATUS_TSYNVALID_SHIFT
#define I40E_RXD_QW1_STATUS_TSYNVALID_MASK \
BIT_ULL(I40E_RXD_QW1_STATUS_TSYNVALID_SHIFT)
+#define I40E_RXD_QW1_STATUS_LPBK_SHIFT I40E_RX_DESC_STATUS_LPBK_SHIFT
+#define I40E_RXD_QW1_STATUS_LPBK_MASK \
+ BIT_ULL(I40E_RXD_QW1_STATUS_LPBK_SHIFT)
enum i40e_rx_desc_fltstat_values {
I40E_RX_DESC_FLTSTAT_NO_DATA = 0,
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 63c9fdf..6c991ae 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1060,6 +1060,7 @@ static int i40e_vfpr_netdev_stop(struct net_device *dev)
static const struct net_device_ops i40e_vfpr_netdev_ops = {
.ndo_open = i40e_vfpr_netdev_open,
.ndo_stop = i40e_vfpr_netdev_stop,
+ .ndo_start_xmit = i40e_vfpr_netdev_start_xmit,
};
/**
@@ -1119,6 +1120,10 @@ int i40e_alloc_vfpr_netdev(struct i40e_vf *vf, u16 vf_num)
priv = netdev_priv(vfpr_netdev);
priv->vf = &pf->vf[vf_num];
+ priv->vfpr_dst = metadata_dst_alloc(0, METADATA_HW_PORT_MUX,
+ GFP_KERNEL);
+ priv->vfpr_dst->u.port_info.lower_dev = vsi->netdev;
+ priv->vfpr_dst->u.port_info.port_id = vf->vf_id;
vfpr_netdev->netdev_ops = &i40e_vfpr_netdev_ops;
eth_hw_addr_inherit(vfpr_netdev, vsi->netdev);
@@ -1130,6 +1135,7 @@ int i40e_alloc_vfpr_netdev(struct i40e_vf *vf, u16 vf_num)
if (err) {
dev_err(&pf->pdev->dev, "register_netdev failed for vf: %s\n",
vf->vfpr_netdev->name);
+ dst_release((struct dst_entry *)priv->vfpr_dst);
free_netdev(vfpr_netdev);
return err;
}
@@ -1158,6 +1164,7 @@ int i40e_alloc_vfpr_netdev(struct i40e_vf *vf, u16 vf_num)
**/
void i40e_free_vfpr_netdev(struct i40e_vf *vf)
{
+ struct i40e_vfpr_netdev_priv *priv;
struct i40e_pf *pf = vf->pf;
if (!vf->vfpr_netdev)
@@ -1166,6 +1173,8 @@ void i40e_free_vfpr_netdev(struct i40e_vf *vf)
dev_info(&pf->pdev->dev, "Freeing VF Port representor(%s)\n",
vf->vfpr_netdev->name);
+ priv = netdev_priv(vf->vfpr_netdev);
+ dst_release((struct dst_entry *)priv->vfpr_dst);
unregister_netdev(vf->vfpr_netdev);
free_netdev(vf->vfpr_netdev);
@@ -1935,8 +1944,10 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
if (i40e_vsi_start_rings(pf->vsi[vf->lan_vsi_idx]))
aq_ret = I40E_ERR_TIMEOUT;
- if ((aq_ret == 0) && vf->vfpr_netdev)
+ if ((aq_ret == 0) && vf->vfpr_netdev) {
+ netif_tx_start_all_queues(vf->vfpr_netdev);
netif_carrier_on(vf->vfpr_netdev);
+ }
error_param:
/* send the response to the VF */
@@ -1977,8 +1988,10 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
i40e_vsi_stop_rings(pf->vsi[vf->lan_vsi_idx]);
- if ((aq_ret == 0) && vf->vfpr_netdev)
+ if ((aq_ret == 0) && vf->vfpr_netdev) {
+ netif_tx_stop_all_queues(vf->vfpr_netdev);
netif_carrier_off(vf->vfpr_netdev);
+ }
error_param:
/* send the response to the VF */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index 25ce93c..3dea207 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -74,6 +74,7 @@ enum i40e_vf_capabilities {
/* VF Port representator netdev private structure */
struct i40e_vfpr_netdev_priv {
+ struct metadata_dst *vfpr_dst;
struct i40e_vf *vf;
};
--
2.5.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host
2017-01-26 0:54 [Intel-wired-lan] [next-queue v5 PATCH 0/7] i40e: Add VF Port Representator support for SR-IOV VFs Sridhar Samudrala
` (4 preceding siblings ...)
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode Sridhar Samudrala
@ 2017-01-26 0:54 ` Sridhar Samudrala
2017-01-30 21:35 ` Bowers, AndrewX
` (2 more replies)
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 7/7] i40e: Add support to get switch id and port number for VFPR netdevs Sridhar Samudrala
6 siblings, 3 replies; 21+ messages in thread
From: Sridhar Samudrala @ 2017-01-26 0:54 UTC (permalink / raw)
To: intel-wired-lan
By default stats counted by HW are returned via the original ndo_get_stats64()
api. Stats counted in SW are returned via ndo_get_offload_stats() api.
Small script to demonstrate vfpr stats in switchdev mode.
PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1
# rmmod i40e; modprobe i40e
# devlink dev eswitch set pci/0000:05:00.0 mode switchdev
# echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
# ip link set enp5s0f0 vf 0 mac 00:11:22:33:44:55
# ip link set enp5s0f0 vf 1 mac 00:11:22:33:44:56
# rmmod i40evf; modprobe i40evf
/* Create 2 namespaces and move the VFs to the corresponding ns */
# ip netns add ns0
# ip link set enp5s2 netns ns0
# ip netns exec ns0 ip addr add 192.168.1.10/24 dev enp5s2
# ip netns exec ns0 ip link set enp5s2 up
# ip netns add ns1
# ip link set enp5s2f1 netns ns1
# ip netns exec ns1 ip addr add 192.168.1.11/24 dev enp5s2f1
# ip netns exec ns1 ip link set enp5s2f1 up
/* bring up pf and vfpr netdevs */
# ip link set enp5s0f0 up
# ip link set enp5s0f0-vf0 up
# ip link set enp5s0f0-vf1 up
/* Create a linux bridge and add vfpr netdevs to it. */
# ip link add vfpr-br type bridge
# ip link set enp5s0f0-vf0 master vfpr-br
# ip link set enp5s0f0-vf1 master vfpr-br
# ip addr add 192.168.1.1/24 dev vfpr-br
# ip link set vfpr-br up
# ip netns exec ns0 ping -c3 192.168.1.11
# ip netns exec ns1 ping -c3 192.168.1.10
# ip netns exec ns0 ip -s l show enp5s2
56: enp5s2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether 00:11:22:33:44:55 brd ff:ff:ff:ff:ff:ff
RX: bytes packets errors dropped overrun mcast
1468 18 0 0 0 0
TX: bytes packets errors dropped carrier collsns
1398 17 0 0 0 0
# ip -s l show enp5s0f0-vf0
52: enp5s0f0-vf0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel master vfpr-br state UP mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
RX: bytes packets errors dropped overrun mcast
1398 17 0 0 0 0
TX: bytes packets errors dropped carrier collsns
1468 18 0 0 0 0
# ip netns exec ns1 ip -s l show enp5s2f1
57: enp5s2f1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether 00:11:22:33:44:56 brd ff:ff:ff:ff:ff:ff
RX: bytes packets errors dropped overrun mcast
1486 18 0 0 0 0
TX: bytes packets errors dropped carrier collsns
1538 19 0 0 0 0
# ip -s l show enp5s0f0-vf1
53: enp5s0f0-vf1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel master vfpr-br state UP mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
RX: bytes packets errors dropped overrun mcast
1538 19 0 0 0 0
TX: bytes packets errors dropped carrier collsns
1486 18 0 0 0 0
Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 44 ++++++++-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 108 +++++++++++++++++++++
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 10 ++
3 files changed, 160 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index f43d1df..d1583ee 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1279,6 +1279,32 @@ static bool i40e_alloc_mapped_page(struct i40e_ring *rx_ring,
}
/**
+ * i40e_vfpr_receive_skb
+ * @vf: pointer to VF
+ * @skb: packet to send up
+ *
+ * Update skb dev to vfpr netdev and rx stats.
+ **/
+static void i40e_vfpr_receive_skb(struct i40e_vf *vf, struct sk_buff *skb)
+{
+ struct i40e_vfpr_netdev_priv *priv;
+ struct vfpr_pcpu_stats *vfpr_stats;
+
+ if (!vf->vfpr_netdev)
+ return;
+
+ skb->dev = vf->vfpr_netdev;
+
+ priv = netdev_priv(vf->vfpr_netdev);
+ vfpr_stats = this_cpu_ptr(priv->vfpr_stats);
+
+ u64_stats_update_begin(&vfpr_stats->syncp);
+ vfpr_stats->rx_packets++;
+ vfpr_stats->rx_bytes += skb->len;
+ u64_stats_update_end(&vfpr_stats->syncp);
+}
+
+/**
* i40e_receive_skb - Send a completed packet up the stack
* @rx_ring: rx ring in play
* @skb: packet to send up
@@ -1310,7 +1336,7 @@ static void i40e_receive_skb(struct i40e_ring *rx_ring,
vf = &pf->vf[vf_id];
if (ether_addr_equal(eth->h_source,
vf->default_lan_addr.addr)) {
- skb->dev = vf->vfpr_netdev;
+ i40e_vfpr_receive_skb(vf, skb);
break;
}
}
@@ -3428,11 +3454,25 @@ netdev_tx_t i40e_vfpr_netdev_start_xmit(struct sk_buff *skb,
struct i40e_vf *vf = priv->vf;
struct i40e_pf *pf = vf->pf;
struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
+ int ret;
skb_dst_drop(skb);
dst_hold(&priv->vfpr_dst->dst);
skb_dst_set(skb, &priv->vfpr_dst->dst);
skb->dev = vsi->netdev;
- return dev_queue_xmit(skb);
+ ret = dev_queue_xmit(skb);
+ if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {
+ struct vfpr_pcpu_stats *vfpr_stats;
+
+ vfpr_stats = this_cpu_ptr(priv->vfpr_stats);
+ u64_stats_update_begin(&vfpr_stats->syncp);
+ vfpr_stats->tx_packets++;
+ vfpr_stats->tx_bytes += skb->len;
+ u64_stats_update_end(&vfpr_stats->syncp);
+ } else {
+ this_cpu_inc(priv->vfpr_stats->tx_drops);
+ }
+
+ return ret;
}
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 6c991ae..98336c4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1057,10 +1057,110 @@ static int i40e_vfpr_netdev_stop(struct net_device *dev)
return 0;
}
+/**
+ * i40e_vfpr_netdev_get_stats64
+ * @dev: network interface device structure
+ * @stats: netlink stats structure
+ *
+ * Fills the hw statistics from the VSI corresponding to the associated VFPR
+ **/
+void
+i40e_vfpr_netdev_get_stats64(struct net_device *netdev,
+ struct rtnl_link_stats64 *stats)
+{
+ struct i40e_vfpr_netdev_priv *priv = netdev_priv(netdev);
+ struct i40e_vf *vf = priv->vf;
+ struct i40e_pf *pf = vf->pf;
+ struct i40e_vsi *vsi;
+ struct i40e_eth_stats *estats;
+
+ vsi = pf->vsi[vf->lan_vsi_idx];
+ i40e_update_stats(vsi);
+
+ estats = &vsi->eth_stats;
+
+ /* TX and RX stats are flipped as we are returning the stats as seen
+ * at the switch port corresponding to the VF.
+ */
+ stats->rx_packets = estats->tx_unicast + estats->tx_multicast +
+ estats->tx_broadcast;
+ stats->tx_packets = estats->rx_unicast + estats->rx_multicast +
+ estats->rx_broadcast;
+ stats->rx_bytes = estats->tx_bytes;
+ stats->tx_bytes = estats->rx_bytes;
+ stats->rx_dropped = estats->tx_discards;
+ stats->tx_dropped = estats->rx_discards;
+}
+
+/**
+ * i40e_vfpr_get_cpu_hit_stats64
+ * @dev: network interface device structure
+ * @stats: netlink stats structure
+ *
+ * stats are filled from the priv structure. correspond to the packets
+ * that are seen by the cpu and sent/received via vfpr netdev.
+ **/
+static int
+i40e_vfpr_get_cpu_hit_stats64(const struct net_device *dev,
+ struct rtnl_link_stats64 *stats)
+{
+ struct i40e_vfpr_netdev_priv *priv = netdev_priv(dev);
+ int i;
+
+ for_each_possible_cpu(i) {
+ struct vfpr_pcpu_stats *vfpr_stats;
+ u64 tbytes, tpkts, tdrops, rbytes, rpkts;
+ unsigned int start;
+
+ vfpr_stats = per_cpu_ptr(priv->vfpr_stats, i);
+ do {
+ start = u64_stats_fetch_begin_irq(&vfpr_stats->syncp);
+ tbytes = vfpr_stats->tx_bytes;
+ tpkts = vfpr_stats->tx_packets;
+ tdrops = vfpr_stats->tx_drops;
+ rbytes = vfpr_stats->rx_bytes;
+ rpkts = vfpr_stats->rx_packets;
+ } while (u64_stats_fetch_retry_irq(&vfpr_stats->syncp, start));
+ stats->tx_bytes += tbytes;
+ stats->tx_packets += tpkts;
+ stats->tx_dropped += tdrops;
+ stats->rx_bytes += rbytes;
+ stats->rx_packets += rpkts;
+ }
+
+ return 0;
+}
+
+static bool
+i40e_vfpr_netdev_has_offload_stats(const struct net_device *dev, int attr_id)
+{
+ switch (attr_id) {
+ case IFLA_OFFLOAD_XSTATS_CPU_HIT:
+ return true;
+ }
+
+ return false;
+}
+
+static int
+i40e_vfpr_netdev_get_offload_stats(int attr_id, const struct net_device *dev,
+ void *sp)
+{
+ switch (attr_id) {
+ case IFLA_OFFLOAD_XSTATS_CPU_HIT:
+ return i40e_vfpr_get_cpu_hit_stats64(dev, sp);
+ }
+
+ return -EINVAL;
+}
+
static const struct net_device_ops i40e_vfpr_netdev_ops = {
.ndo_open = i40e_vfpr_netdev_open,
.ndo_stop = i40e_vfpr_netdev_stop,
.ndo_start_xmit = i40e_vfpr_netdev_start_xmit,
+ .ndo_get_stats64 = i40e_vfpr_netdev_get_stats64,
+ .ndo_has_offload_stats = i40e_vfpr_netdev_has_offload_stats,
+ .ndo_get_offload_stats = i40e_vfpr_netdev_get_offload_stats,
};
/**
@@ -1119,6 +1219,13 @@ int i40e_alloc_vfpr_netdev(struct i40e_vf *vf, u16 vf_num)
pf->vf[vf_num].vfpr_netdev = vfpr_netdev;
priv = netdev_priv(vfpr_netdev);
+ priv->vfpr_stats = netdev_alloc_pcpu_stats(struct vfpr_pcpu_stats);
+ if (!priv->vfpr_stats) {
+ dev_err(&pf->pdev->dev, "alloc_pcpu_stats failed for vf:%d\n",
+ vf_num);
+ free_netdev(vfpr_netdev);
+ return -ENOMEM;
+ }
priv->vf = &pf->vf[vf_num];
priv->vfpr_dst = metadata_dst_alloc(0, METADATA_HW_PORT_MUX,
GFP_KERNEL);
@@ -1175,6 +1282,7 @@ void i40e_free_vfpr_netdev(struct i40e_vf *vf)
priv = netdev_priv(vf->vfpr_netdev);
dst_release((struct dst_entry *)priv->vfpr_dst);
+ free_percpu(priv->vfpr_stats);
unregister_netdev(vf->vfpr_netdev);
free_netdev(vf->vfpr_netdev);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index 3dea207..52ba9d5 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -72,10 +72,20 @@ enum i40e_vf_capabilities {
I40E_VIRTCHNL_VF_CAP_IWARP,
};
+struct vfpr_pcpu_stats {
+ u64 tx_packets;
+ u64 tx_bytes;
+ u64 tx_drops;
+ u64 rx_packets;
+ u64 rx_bytes;
+ struct u64_stats_sync syncp;
+};
+
/* VF Port representator netdev private structure */
struct i40e_vfpr_netdev_priv {
struct metadata_dst *vfpr_dst;
struct i40e_vf *vf;
+ struct vfpr_pcpu_stats *vfpr_stats;
};
/* VF information structure */
--
2.5.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 7/7] i40e: Add support to get switch id and port number for VFPR netdevs
2017-01-26 0:54 [Intel-wired-lan] [next-queue v5 PATCH 0/7] i40e: Add VF Port Representator support for SR-IOV VFs Sridhar Samudrala
` (5 preceding siblings ...)
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host Sridhar Samudrala
@ 2017-01-26 0:54 ` Sridhar Samudrala
2017-01-30 21:35 ` Bowers, AndrewX
6 siblings, 1 reply; 21+ messages in thread
From: Sridhar Samudrala @ 2017-01-26 0:54 UTC (permalink / raw)
To: intel-wired-lan
Introduce switchdev_ops to PF and VFPR netdevs to return the switch id
via SWITCHDEV_ATTR_ID_PORT_PARENT_ID attribute.
Also, ndo_get_phys_port_name() support is added to VFPR netdevs to
return the port number.
PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1
# rmmod i40e; modprobe i40e
# devlink dev eswitch set pci/0000:05:00.0 mode switchdev
# echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
# ip -d l show enp5s0f0
32: enp5s0f0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff promiscuity 0 addrgenmode eui64 numtxqueues 72 numrxqueues 72 gso_max_size 65536 gso_max_segs 65535 portid 6805ca2e7268 switchid 6805ca2e7268
vf 0 MAC 00:00:00:00:00:00, spoof checking on, link-state disable, trust off
vf 1 MAC 00:00:00:00:00:00, spoof checking on, link-state disable, trust off
# ip -d l show enp5s0f0-vf0
34: enp5s0f0-vf0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff promiscuity 0 addrgenmode eui64 numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max_segs 65535 portname 0 switchid 6805ca2e7268
# ip -d l show enp5s0f0-vf1
35: enp5s0f0-vf1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff promiscuity 0 addrgenmode eui64 numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max_segs 65535 portname 1 switchid 6805ca2e7268
Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e.h | 1 +
drivers/net/ethernet/intel/i40e/i40e_main.c | 28 +++++++++++++++
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 40 ++++++++++++++++++++++
3 files changed, 69 insertions(+)
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 081154a..1edd351 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -56,6 +56,7 @@
#include <linux/ptp_clock_kernel.h>
#include <net/devlink.h>
#include <net/dst_metadata.h>
+#include <net/switchdev.h>
#include "i40e_type.h"
#include "i40e_prototype.h"
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 19f373e..8249d50 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -9686,6 +9686,31 @@ static const struct net_device_ops i40e_netdev_ops = {
.ndo_xdp = i40e_xdp,
};
+static int i40e_pf_attr_get(struct net_device *dev, struct switchdev_attr *attr)
+{
+ struct i40e_netdev_priv *np = netdev_priv(dev);
+ struct i40e_vsi *vsi = np->vsi;
+ struct i40e_pf *pf = vsi->back;
+
+ if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY)
+ return -EOPNOTSUPP;
+
+ switch (attr->id) {
+ case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:
+ attr->u.ppid.id_len = ETH_ALEN;
+ ether_addr_copy(attr->u.ppid.id, dev->dev_addr);
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
+
+ return 0;
+}
+
+static const struct switchdev_ops i40e_pf_switchdev_ops = {
+ .switchdev_port_attr_get = i40e_pf_attr_get,
+};
+
/**
* i40e_config_netdev - Setup the netdev flags
* @vsi: the VSI being configured
@@ -9805,6 +9830,9 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
#ifdef I40E_FCOE
i40e_fcoe_config_netdev(netdev, vsi);
#endif
+#ifdef CONFIG_NET_SWITCHDEV
+ netdev->switchdev_ops = &i40e_pf_switchdev_ops;
+#endif
/* MTU range: 68 - 9706 */
netdev->min_mtu = ETH_MIN_MTU;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 98336c4..c531045 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1154,6 +1154,22 @@ i40e_vfpr_netdev_get_offload_stats(int attr_id, const struct net_device *dev,
return -EINVAL;
}
+static int
+i40e_vfpr_netdev_get_phys_port_name(struct net_device *dev, char *buf,
+ size_t len)
+{
+ struct i40e_vfpr_netdev_priv *priv = netdev_priv(dev);
+ struct i40e_vf *vf = priv->vf;
+
+ int ret;
+
+ ret = snprintf(buf, len, "%d", vf->vf_id);
+ if (ret >= len)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
static const struct net_device_ops i40e_vfpr_netdev_ops = {
.ndo_open = i40e_vfpr_netdev_open,
.ndo_stop = i40e_vfpr_netdev_stop,
@@ -1161,6 +1177,26 @@ static const struct net_device_ops i40e_vfpr_netdev_ops = {
.ndo_get_stats64 = i40e_vfpr_netdev_get_stats64,
.ndo_has_offload_stats = i40e_vfpr_netdev_has_offload_stats,
.ndo_get_offload_stats = i40e_vfpr_netdev_get_offload_stats,
+ .ndo_get_phys_port_name = i40e_vfpr_netdev_get_phys_port_name,
+};
+
+static int i40e_vfpr_attr_get(struct net_device *dev,
+ struct switchdev_attr *attr)
+{
+ switch (attr->id) {
+ case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:
+ attr->u.ppid.id_len = ETH_ALEN;
+ ether_addr_copy(attr->u.ppid.id, dev->dev_addr);
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
+
+ return 0;
+}
+
+static const struct switchdev_ops i40e_vfpr_switchdev_ops = {
+ .switchdev_port_attr_get = i40e_vfpr_attr_get,
};
/**
@@ -1235,6 +1271,10 @@ int i40e_alloc_vfpr_netdev(struct i40e_vf *vf, u16 vf_num)
vfpr_netdev->netdev_ops = &i40e_vfpr_netdev_ops;
eth_hw_addr_inherit(vfpr_netdev, vsi->netdev);
+#ifdef CONFIG_NET_SWITCHDEV
+ vfpr_netdev->switchdev_ops = &i40e_vfpr_switchdev_ops;
+#endif
+
netif_carrier_off(vfpr_netdev);
netif_tx_disable(vfpr_netdev);
--
2.5.5
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 1/7] i40e: Introduce devlink interface
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 1/7] i40e: Introduce devlink interface Sridhar Samudrala
@ 2017-01-30 21:33 ` Bowers, AndrewX
0 siblings, 0 replies; 21+ messages in thread
From: Bowers, AndrewX @ 2017-01-30 21:33 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 1/7] i40e: Introduce devlink
> interface
>
> Add initial devlink support to get/set the mode of SRIOV switch.
> This patch sets the default mode as 'legacy' and enables getting the mode
> and and setting it to 'legacy'.
>
> The switch mode can be get/set via following 'devlink' commands.
>
> # devlink dev eswitch show pci/0000:05:00.0
> pci/0000:05:00.0: mode legacy
> # devlink dev eswitch set pci/0000:05:00.0 mode switchdev devlink answers:
> Operation not supported # devlink dev eswitch set pci/0000:05:00.0 mode
> legacy # devlink dev eswitch show pci/0000:05:00.0
> pci/0000:05:00.0: mode legacy
>
> Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
> Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
> ---
> drivers/net/ethernet/intel/Kconfig | 1 +
> drivers/net/ethernet/intel/i40e/i40e.h | 3 ++
> drivers/net/ethernet/intel/i40e/i40e_main.c | 80
> ++++++++++++++++++++++++++---
> 3 files changed, 76 insertions(+), 8 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port Representator(VFPR) netdevs
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port Representator(VFPR) netdevs Sridhar Samudrala
@ 2017-01-30 21:33 ` Bowers, AndrewX
2017-02-01 1:06 ` Keller, Jacob E
1 sibling, 0 replies; 21+ messages in thread
From: Bowers, AndrewX @ 2017-01-30 21:33 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port
> Representator(VFPR) netdevs
>
> VF Port Representator netdevs are created for each VF if the switch mode is
> set to 'switchdev'. These netdevs can be used to control and configure VFs
> from PFs namespace. They enable exposing VF statistics, configure and
> monitor link state, mtu, filters, fdb/vlan entries etc. of VFs.
> Broadcast filters are not enabled in switchdev mode.
> VFPR netdevs inherit the mac address from the PF.
>
> Sample script to create VF port representors # rmmod i40e; modprobe i40e #
> devlink dev eswitch set pci/0000:05:00.0 mode switchdev # echo 2 >
> /sys/class/net/enp5s0f0/device/sriov_numvfs
> # ip l show
> 297: enp5s0f0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop portid
> 6805ca2e7268 state DOWN mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
> vf 0 MAC 00:00:00:00:00:00, spoof checking on, link-state auto, trust off
> vf 1 MAC 00:00:00:00:00:00, spoof checking on, link-state auto, trust off
> 299: enp5s0f0-vf0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state
> DOWN mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
> 300: enp5s0f0-vf1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state
> DOWN mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
>
> Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
> Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 21 ++-
> drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 153
> ++++++++++++++++++++-
> drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 14 ++
> 3 files changed, 182 insertions(+), 6 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 3/7] i40e: Sync link state between VFs and VFPRs
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 3/7] i40e: Sync link state between VFs and VFPRs Sridhar Samudrala
@ 2017-01-30 21:34 ` Bowers, AndrewX
0 siblings, 0 replies; 21+ messages in thread
From: Bowers, AndrewX @ 2017-01-30 21:34 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 3/7] i40e: Sync link state
> between VFs and VFPRs
>
> This patch enables
> - reflecting the link state of VFPR based on VF admin state & link state
> of VF based on admin state of VFPR.
> - bringing up/down the VFPR sends a notification to update VF link state.
> - bringing up/down the VF will cause the link state update of VFPR.
> - enable/disable VF link state via ndo_set_vf_link_state will update the
> admin state of associated VFPR.
>
> PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1 #
> rmmod i40e; modprobe i40e # devlink dev eswitch set pci/0000:05:00.0 mode
> switchdev # echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
>
> # ip link set enp5s2 up
> # ip link set enp5s0f0-vf0 up
> # ip link set enp5s0f0-vf1 up
>
> /* enp5s2 UP -> enp5s0f0-vf0 CARRIER ON */ # ip link show enp5s0f0-vf0
> 215: enp5s0f0-vf0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc
> fq_codel state UP mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
>
> /* enp5s0f0-vf0 UP -> enp5s2 CARRIER ON */ # ip link show enp5s2
> 218: enp5s2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq
> state UP mode DEFAULT group default qlen 1000
> link/ether ea:4d:60:bc:6f:85 brd ff:ff:ff:ff:ff:ff
>
> /* enp5s2f1 DOWN -> enp5s0f0-vf1 NO-CARRIER */ # ip link show enp5s0f0-
> vf1
> 216: enp5s0f0-vf1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500
> qdisc fq_codel state DOWN mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
>
> # ip link set enp5s0f0-vf0 down
> # ip link set enp5s2f1 up
>
> /* enp5s0-vf0 DOWN -> enp5s2 NO_CARRIER */ # ip link show enp5s2
> 218: enp5s2: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq
> state DOWN mode DEFAULT group default qlen 1000
> link/ether ea:4d:60:bc:6f:85 brd ff:ff:ff:ff:ff:ff
>
> # ip -d link show enp5s0f0
> 213: enp5s0f0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop portid
> 6805ca27268 state DOWN mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff promiscuity 0 addrgenmode
> eui64
> vf 0 MAC 00:00:00:00:00:00, spoof checking on, link-state disable, trust off
> vf 1 MAC 00:00:00:00:00:00, spoof checking on, link-state enable, trust off
>
> Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
> Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 44
> ++++++++++++++++++++++
> 1 file changed, 44 insertions(+)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode Sridhar Samudrala
@ 2017-01-30 21:34 ` Bowers, AndrewX
2017-02-15 15:59 ` Alexander Duyck
1 sibling, 0 replies; 21+ messages in thread
From: Bowers, AndrewX @ 2017-01-30 21:34 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX
> support in switchdev mode
>
> In switchdev mode, broadcast filter is not enabled on VFs. The broadcasts
> and unknown frames from VFs are received by the PF and passed to
> corresponding VF port representator netdev.
> A host based switching entity like a linux bridge or OVS redirects these
> frames to the right VFs via VFPR netdevs. Any frames sent via VFPR netdevs
> are sent as directed transmits to the corresponding VFs. To enable directed
> transmit, skb metadata dst is used to pass the VF id and the frame is
> requeued to call the PFs transmit routine.
>
> Small script to demonstrate inter VF pings in switchdev mode.
> PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1
>
> # rmmod i40e; modprobe i40e
> # devlink dev eswitch set pci/0000:05:00.0 mode switchdev # echo 2 >
> /sys/class/net/enp5s0f0/device/sriov_numvfs
> # ip link set enp5s0f0 vf 0 mac 00:11:22:33:44:55 # ip link set enp5s0f0 vf 1 mac
> 00:11:22:33:44:56 # rmmod i40evf; modprobe i40evf
>
> /* Create 2 namespaces and move the VFs to the corresponding ns. */ # ip
> netns add ns0 # ip link set enp5s2 netns ns0 # ip netns exec ns0 ip addr add
> 192.168.1.10/24 dev enp5s2 # ip netns exec ns0 ip link set enp5s2 up # ip
> netns add ns1 # ip link set enp5s2f1 netns ns1 # ip netns exec ns1 ip addr add
> 192.168.1.11/24 dev enp5s2f1 # ip netns exec ns1 ip link set enp5s2f1 up
>
> /* bring up pf and vfpr netdevs */
> # ip link set enp5s0f0 up
> # ip link set enp5s0f0-vf0 up
> # ip link set enp5s0f0-vf1 up
>
> /* Create a linux bridge and add vfpr netdevs to it. */ # ip link add vfpr-br
> type bridge # ip link set enp5s0f0-vf0 master vfpr-br # ip link set enp5s0f0-vf1
> master vfpr-br # ip addr add 192.168.1.1/24 dev vfpr-br # ip link set vfpr-br up
>
> # ip netns exec ns0 ping -c3 192.168.1.11 # ip netns exec ns1 ping -c3
> 192.168.1.10
>
> Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
> Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e.h | 1 +
> drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +
> drivers/net/ethernet/intel/i40e/i40e_txrx.c | 106
> ++++++++++++++++++++-
> drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +
> drivers/net/ethernet/intel/i40e/i40e_type.h | 3 +
> drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 17 +++-
> drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 +
> 7 files changed, 127 insertions(+), 7 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host Sridhar Samudrala
@ 2017-01-30 21:35 ` Bowers, AndrewX
2017-02-01 1:05 ` Keller, Jacob E
2017-02-01 18:21 ` Keller, Jacob E
2 siblings, 0 replies; 21+ messages in thread
From: Bowers, AndrewX @ 2017-01-30 21:35 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for
> exposing VF port statistics via VFPR netdev on the host
>
> By default stats counted by HW are returned via the original
> ndo_get_stats64() api. Stats counted in SW are returned via
> ndo_get_offload_stats() api.
>
> Small script to demonstrate vfpr stats in switchdev mode.
> PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1
>
> # rmmod i40e; modprobe i40e
> # devlink dev eswitch set pci/0000:05:00.0 mode switchdev # echo 2 >
> /sys/class/net/enp5s0f0/device/sriov_numvfs
> # ip link set enp5s0f0 vf 0 mac 00:11:22:33:44:55 # ip link set enp5s0f0 vf 1 mac
> 00:11:22:33:44:56 # rmmod i40evf; modprobe i40evf
>
> /* Create 2 namespaces and move the VFs to the corresponding ns */ # ip
> netns add ns0 # ip link set enp5s2 netns ns0 # ip netns exec ns0 ip addr add
> 192.168.1.10/24 dev enp5s2 # ip netns exec ns0 ip link set enp5s2 up # ip
> netns add ns1 # ip link set enp5s2f1 netns ns1 # ip netns exec ns1 ip addr add
> 192.168.1.11/24 dev enp5s2f1 # ip netns exec ns1 ip link set enp5s2f1 up
>
> /* bring up pf and vfpr netdevs */
> # ip link set enp5s0f0 up
> # ip link set enp5s0f0-vf0 up
> # ip link set enp5s0f0-vf1 up
>
> /* Create a linux bridge and add vfpr netdevs to it. */ # ip link add vfpr-br
> type bridge # ip link set enp5s0f0-vf0 master vfpr-br # ip link set enp5s0f0-vf1
> master vfpr-br # ip addr add 192.168.1.1/24 dev vfpr-br # ip link set vfpr-br up
>
> # ip netns exec ns0 ping -c3 192.168.1.11 # ip netns exec ns1 ping -c3
> 192.168.1.10
>
> # ip netns exec ns0 ip -s l show enp5s2
> 56: enp5s2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq
> state UP mode DEFAULT group default qlen 1000
> link/ether 00:11:22:33:44:55 brd ff:ff:ff:ff:ff:ff
> RX: bytes packets errors dropped overrun mcast
> 1468 18 0 0 0 0
> TX: bytes packets errors dropped carrier collsns
> 1398 17 0 0 0 0
> # ip -s l show enp5s0f0-vf0
> 52: enp5s0f0-vf0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc
> fq_codel master vfpr-br state UP mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
> RX: bytes packets errors dropped overrun mcast
> 1398 17 0 0 0 0
> TX: bytes packets errors dropped carrier collsns
> 1468 18 0 0 0 0
> # ip netns exec ns1 ip -s l show enp5s2f1
> 57: enp5s2f1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq
> state UP mode DEFAULT group default qlen 1000
> link/ether 00:11:22:33:44:56 brd ff:ff:ff:ff:ff:ff
> RX: bytes packets errors dropped overrun mcast
> 1486 18 0 0 0 0
> TX: bytes packets errors dropped carrier collsns
> 1538 19 0 0 0 0
> # ip -s l show enp5s0f0-vf1
> 53: enp5s0f0-vf1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc
> fq_codel master vfpr-br state UP mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff
> RX: bytes packets errors dropped overrun mcast
> 1538 19 0 0 0 0
> TX: bytes packets errors dropped carrier collsns
> 1486 18 0 0 0 0
>
> Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
> Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_txrx.c | 44 ++++++++-
> drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 108
> +++++++++++++++++++++
> drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 10 ++
> 3 files changed, 160 insertions(+), 2 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 7/7] i40e: Add support to get switch id and port number for VFPR netdevs
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 7/7] i40e: Add support to get switch id and port number for VFPR netdevs Sridhar Samudrala
@ 2017-01-30 21:35 ` Bowers, AndrewX
0 siblings, 0 replies; 21+ messages in thread
From: Bowers, AndrewX @ 2017-01-30 21:35 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 7/7] i40e: Add support to
> get switch id and port number for VFPR netdevs
>
> Introduce switchdev_ops to PF and VFPR netdevs to return the switch id via
> SWITCHDEV_ATTR_ID_PORT_PARENT_ID attribute.
> Also, ndo_get_phys_port_name() support is added to VFPR netdevs to
> return the port number.
>
> PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1 #
> rmmod i40e; modprobe i40e # devlink dev eswitch set pci/0000:05:00.0 mode
> switchdev # echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
> # ip -d l show enp5s0f0
> 32: enp5s0f0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN
> mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff promiscuity 0 addrgenmode
> eui64 numtxqueues 72 numrxqueues 72 gso_max_size 65536 gso_max_segs
> 65535 portid 6805ca2e7268 switchid 6805ca2e7268
> vf 0 MAC 00:00:00:00:00:00, spoof checking on, link-state disable, trust off
> vf 1 MAC 00:00:00:00:00:00, spoof checking on, link-state disable, trust off #
> ip -d l show enp5s0f0-vf0
> 34: enp5s0f0-vf0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state
> DOWN mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff promiscuity 0 addrgenmode
> eui64 numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max_segs
> 65535 portname 0 switchid 6805ca2e7268 # ip -d l show enp5s0f0-vf1
> 35: enp5s0f0-vf1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state
> DOWN mode DEFAULT group default qlen 1000
> link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff promiscuity 0 addrgenmode
> eui64 numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max_segs
> 65535 portname 1 switchid 6805ca2e7268
>
> Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
> Signed-off-by: Anjali Singhai <anjali.singhai@intel.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e.h | 1 +
> drivers/net/ethernet/intel/i40e/i40e_main.c | 28 +++++++++++++++
> drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 40
> ++++++++++++++++++++++
> 3 files changed, 69 insertions(+)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 4/7] net: store port/representator id in metadata_dst
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 4/7] net: store port/representator id in metadata_dst Sridhar Samudrala
@ 2017-01-30 21:36 ` Bowers, AndrewX
0 siblings, 0 replies; 21+ messages in thread
From: Bowers, AndrewX @ 2017-01-30 21:36 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 4/7] net: store
> port/representator id in metadata_dst
>
> From: Jakub Kicinski <jakub.kicinski@netronome.com>
>
> Switches and modern SR-IOV enabled NICs may multiplex traffic from Port
> representators and control messages over single set of hardware queues.
> Control messages and muxed traffic may need ordered delivery.
>
> Those requirements make it hard to comfortably use TC infrastructure today
> unless we have a way of attaching metadata to skbs at the upper device.
> Because single set of queues is used for many netdevs stopping TC/sched
> queues of all of them reliably is impossible and lower device has to retreat to
> returning NETDEV_TX_BUSY and usually has to take extra locks on the
> fastpath.
>
> This patch attempts to enable port/representative devs to attach metadata
> to skbs which carry port id. This way representatives can be queueless and
> all queuing can be performed at the lower netdev in the usual way.
>
> Traffic arriving on the port/representative interfaces will be have metadata
> attached and will subsequently be queued to the lower device for
> transmission.
> The lower device should recognize the metadata and translate it to HW
> specific format which is most likely either a special header inserted before
> the network headers or descriptor/metadata fields.
>
> Metadata is associated with the lower device by storing the netdev pointer
> along with port id so that if TC decides to redirect or mirror the new netdev
> will not try to interpret it.
>
> This is mostly for SR-IOV devices since switches don't have lower netdevs
> today.
>
> Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
> Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
> ---
> include/net/dst_metadata.h | 41
> ++++++++++++++++++++++++++++++++---------
> net/core/dst.c | 15 ++++++++++-----
> net/core/filter.c | 1 +
> net/ipv4/ip_tunnel_core.c | 6 ++++--
> net/openvswitch/flow_netlink.c | 4 +++-
> 5 files changed, 50 insertions(+), 17 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Does not break i40e/i40evf
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host Sridhar Samudrala
2017-01-30 21:35 ` Bowers, AndrewX
@ 2017-02-01 1:05 ` Keller, Jacob E
2017-02-01 18:21 ` Keller, Jacob E
2 siblings, 0 replies; 21+ messages in thread
From: Keller, Jacob E @ 2017-02-01 1:05 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for
> exposing VF port statistics via VFPR netdev on the host
>
> +/**
> + * i40e_vfpr_netdev_get_stats64
> + * @dev: network interface device structure
> + * @stats: netlink stats structure
> + *
> + * Fills the hw statistics from the VSI corresponding to the associated VFPR
> + **/
> +void
> +i40e_vfpr_netdev_get_stats64(struct net_device *netdev,
> + struct rtnl_link_stats64 *stats)
> +{
Please make this static.
Thanks,
Jake
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port Representator(VFPR) netdevs
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port Representator(VFPR) netdevs Sridhar Samudrala
2017-01-30 21:33 ` Bowers, AndrewX
@ 2017-02-01 1:06 ` Keller, Jacob E
1 sibling, 0 replies; 21+ messages in thread
From: Keller, Jacob E @ 2017-02-01 1:06 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port
> Representator(VFPR) netdevs
>
Hi,
> +/**
> + * i40e_update_vf_broadcast_filter
> + * @vf: pointer to the VF structure
> + * @enable: boolean flag indicating add/delete
> + *
> + * add/delete VFs broadcast filter
> + **/
> +void i40e_update_vf_broadcast_filter(struct i40e_vf *vf, bool enable)
> +{
Please make this function static, as it is not used anywhere outside this file.
> + struct i40e_pf *pf = vf->pf;
> + struct i40e_vsi *vsi = pf->vsi[vf->lan_vsi_idx];
> + u8 broadcast[ETH_ALEN];
> + int err;
> +
> + spin_lock_bh(&vsi->mac_filter_hash_lock);
> + eth_broadcast_addr(broadcast);
> + if (enable)
> + i40e_add_mac_filter(vsi, broadcast);
> + else
> + i40e_del_mac_filter(vsi, broadcast);
> + spin_unlock_bh(&vsi->mac_filter_hash_lock);
> +
> + /* update broadcast filter */
> + err = i40e_sync_vsi_filters(vsi);
> + if (err)
> + dev_err(&pf->pdev->dev, "Unable to program bcast filter\n");
> +}
> +
>
Thanks,
Jake
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host Sridhar Samudrala
2017-01-30 21:35 ` Bowers, AndrewX
2017-02-01 1:05 ` Keller, Jacob E
@ 2017-02-01 18:21 ` Keller, Jacob E
2 siblings, 0 replies; 21+ messages in thread
From: Keller, Jacob E @ 2017-02-01 18:21 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Sridhar Samudrala
> Sent: Wednesday, January 25, 2017 4:54 PM
> To: intel-wired-lan at lists.osuosl.org
> Subject: [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for
> exposing VF port statistics via VFPR netdev on the host
>
Hi,
I'm not sure which patch in the series causes this, but at least some of the changes cause sparse warnings when run with make C=1:
i40e/i40e_txrx.c:1410:22: error: incorrect type in initializer (different address spaces)
i40e/i40e_txrx.c:1410:22: expected void const [noderef] <asn:3>*__vpp_verify
i40e/i40e_txrx.c:1410:22: got struct vfpr_pcpu_stats *<noident>
i40e/i40e_txrx.c:3579:30: error: incorrect type in initializer (different address spaces)
i40e/i40e_txrx.c:3579:30: expected void const [noderef] <asn:3>*__vpp_verify
i40e/i40e_txrx.c:3579:30: got struct vfpr_pcpu_stats *<noident>
i40e/i40e_txrx.c:3585:17: error: incorrect type in initializer (different address spaces)
i40e/i40e_txrx.c:3585:17: expected void const [noderef] <asn:3>*__vpp_verify
i40e/i40e_txrx.c:3585:17: got unsigned long long *<noident>
Thanks,
Jake
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode Sridhar Samudrala
2017-01-30 21:34 ` Bowers, AndrewX
@ 2017-02-15 15:59 ` Alexander Duyck
2017-02-15 17:37 ` Samudrala, Sridhar
1 sibling, 1 reply; 21+ messages in thread
From: Alexander Duyck @ 2017-02-15 15:59 UTC (permalink / raw)
To: intel-wired-lan
On Wed, Jan 25, 2017 at 4:54 PM, Sridhar Samudrala
<sridhar.samudrala@intel.com> wrote:
> In switchdev mode, broadcast filter is not enabled on VFs. The broadcasts
> and unknown frames from VFs are received by the PF and passed to
> corresponding VF port representator netdev.
> A host based switching entity like a linux bridge or OVS redirects these
> frames to the right VFs via VFPR netdevs. Any frames sent via VFPR netdevs
> are sent as directed transmits to the corresponding VFs. To enable directed
> transmit, skb metadata dst is used to pass the VF id and the frame is
> requeued to call the PFs transmit routine.
>
> Small script to demonstrate inter VF pings in switchdev mode.
> PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1
>
> # rmmod i40e; modprobe i40e
> # devlink dev eswitch set pci/0000:05:00.0 mode switchdev
> # echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
> # ip link set enp5s0f0 vf 0 mac 00:11:22:33:44:55
> # ip link set enp5s0f0 vf 1 mac 00:11:22:33:44:56
> # rmmod i40evf; modprobe i40evf
>
> /* Create 2 namespaces and move the VFs to the corresponding ns. */
> # ip netns add ns0
> # ip link set enp5s2 netns ns0
> # ip netns exec ns0 ip addr add 192.168.1.10/24 dev enp5s2
> # ip netns exec ns0 ip link set enp5s2 up
> # ip netns add ns1
> # ip link set enp5s2f1 netns ns1
> # ip netns exec ns1 ip addr add 192.168.1.11/24 dev enp5s2f1
> # ip netns exec ns1 ip link set enp5s2f1 up
>
> /* bring up pf and vfpr netdevs */
> # ip link set enp5s0f0 up
> # ip link set enp5s0f0-vf0 up
> # ip link set enp5s0f0-vf1 up
>
> /* Create a linux bridge and add vfpr netdevs to it. */
> # ip link add vfpr-br type bridge
> # ip link set enp5s0f0-vf0 master vfpr-br
> # ip link set enp5s0f0-vf1 master vfpr-br
> # ip addr add 192.168.1.1/24 dev vfpr-br
> # ip link set vfpr-br up
>
> # ip netns exec ns0 ping -c3 192.168.1.11
> # ip netns exec ns1 ping -c3 192.168.1.10
So the test case as called out here isn't really valid is it? You
aren't even really using the switchdev. All you are doing is having
one VF ping the other.
I would be interested in seeing the PF brought up and what the
behavior is if the PF attempts to ping one of the VFs. I think we
have a major flaw in the design there as the replies would likely be
returned to the port representors instead of being returned to the PF.
We probably need to look at moving the port representors all onto a
different MAC address and doing a 2 fold test. One to see if the
packet is being routed to the PF (see the tests in eth_type_trans),
and if it is not only then do we take the packet and route it to a
representor.
- Alex
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode
2017-02-15 15:59 ` Alexander Duyck
@ 2017-02-15 17:37 ` Samudrala, Sridhar
2017-02-15 17:51 ` Alexander Duyck
0 siblings, 1 reply; 21+ messages in thread
From: Samudrala, Sridhar @ 2017-02-15 17:37 UTC (permalink / raw)
To: intel-wired-lan
On 2/15/2017 7:59 AM, Alexander Duyck wrote:
> On Wed, Jan 25, 2017 at 4:54 PM, Sridhar Samudrala
> <sridhar.samudrala@intel.com> wrote:
>> In switchdev mode, broadcast filter is not enabled on VFs. The broadcasts
>> and unknown frames from VFs are received by the PF and passed to
>> corresponding VF port representator netdev.
>> A host based switching entity like a linux bridge or OVS redirects these
>> frames to the right VFs via VFPR netdevs. Any frames sent via VFPR netdevs
>> are sent as directed transmits to the corresponding VFs. To enable directed
>> transmit, skb metadata dst is used to pass the VF id and the frame is
>> requeued to call the PFs transmit routine.
>>
>> Small script to demonstrate inter VF pings in switchdev mode.
>> PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1
>>
>> # rmmod i40e; modprobe i40e
>> # devlink dev eswitch set pci/0000:05:00.0 mode switchdev
>> # echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
>> # ip link set enp5s0f0 vf 0 mac 00:11:22:33:44:55
>> # ip link set enp5s0f0 vf 1 mac 00:11:22:33:44:56
>> # rmmod i40evf; modprobe i40evf
>>
>> /* Create 2 namespaces and move the VFs to the corresponding ns. */
>> # ip netns add ns0
>> # ip link set enp5s2 netns ns0
>> # ip netns exec ns0 ip addr add 192.168.1.10/24 dev enp5s2
>> # ip netns exec ns0 ip link set enp5s2 up
>> # ip netns add ns1
>> # ip link set enp5s2f1 netns ns1
>> # ip netns exec ns1 ip addr add 192.168.1.11/24 dev enp5s2f1
>> # ip netns exec ns1 ip link set enp5s2f1 up
>>
>> /* bring up pf and vfpr netdevs */
>> # ip link set enp5s0f0 up
>> # ip link set enp5s0f0-vf0 up
>> # ip link set enp5s0f0-vf1 up
>>
>> /* Create a linux bridge and add vfpr netdevs to it. */
>> # ip link add vfpr-br type bridge
>> # ip link set enp5s0f0-vf0 master vfpr-br
>> # ip link set enp5s0f0-vf1 master vfpr-br
>> # ip addr add 192.168.1.1/24 dev vfpr-br
>> # ip link set vfpr-br up
>>
>> # ip netns exec ns0 ping -c3 192.168.1.11
>> # ip netns exec ns1 ping -c3 192.168.1.10
> So the test case as called out here isn't really valid is it? You
> aren't even really using the switchdev. All you are doing is having
> one VF ping the other.
In switchdev mode, when VF pings other VF, the broadcasts go through
the host PF.
In this example, when i ping from enp5s2 in ns0, the ARP broadcast from
enp5s2
takes this path.
enp5s2(ns0) -> enp5s0f0 -> enp5s0f0-vf0 -> vfpr-br -> enp5s0f0-vf1
-> enp5s0f0 -> enp5s2f1(ns1)
So in switchdev mode, for VF<->VF communications, we need to add all the
VFPR netdevs to a
learning bridge with the current state of implementation. Once we have
the fdb add/del support,
we should be able to program the broadcast filters from the host via
VFPR netdevs.
>
> I would be interested in seeing the PF brought up and what the
> behavior is if the PF attempts to ping one of the VFs. I think we
> have a major flaw in the design there as the replies would likely be
> returned to the port representors instead of being returned to the PF.
> We probably need to look at moving the port representors all onto a
> different MAC address and doing a 2 fold test. One to see if the
> packet is being routed to the PF (see the tests in eth_type_trans),
> and if it is not only then do we take the packet and route it to a
> representor.
Sure. I can add an IP address in the same subnet as VFs to PF and can
ping PF from VF.
That works fine. I haven't tried assigning a separate MAC for all VFPR
netdevs. I think that
will work too, but need to check if there are any issues with that approach.
Thanks
Sridhar
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode
2017-02-15 17:37 ` Samudrala, Sridhar
@ 2017-02-15 17:51 ` Alexander Duyck
0 siblings, 0 replies; 21+ messages in thread
From: Alexander Duyck @ 2017-02-15 17:51 UTC (permalink / raw)
To: intel-wired-lan
On Wed, Feb 15, 2017 at 9:37 AM, Samudrala, Sridhar
<sridhar.samudrala@intel.com> wrote:
> On 2/15/2017 7:59 AM, Alexander Duyck wrote:
>>
>> On Wed, Jan 25, 2017 at 4:54 PM, Sridhar Samudrala
>> <sridhar.samudrala@intel.com> wrote:
>>>
>>> In switchdev mode, broadcast filter is not enabled on VFs. The broadcasts
>>> and unknown frames from VFs are received by the PF and passed to
>>> corresponding VF port representator netdev.
>>> A host based switching entity like a linux bridge or OVS redirects these
>>> frames to the right VFs via VFPR netdevs. Any frames sent via VFPR
>>> netdevs
>>> are sent as directed transmits to the corresponding VFs. To enable
>>> directed
>>> transmit, skb metadata dst is used to pass the VF id and the frame is
>>> requeued to call the PFs transmit routine.
>>>
>>> Small script to demonstrate inter VF pings in switchdev mode.
>>> PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1
>>>
>>> # rmmod i40e; modprobe i40e
>>> # devlink dev eswitch set pci/0000:05:00.0 mode switchdev
>>> # echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs
>>> # ip link set enp5s0f0 vf 0 mac 00:11:22:33:44:55
>>> # ip link set enp5s0f0 vf 1 mac 00:11:22:33:44:56
>>> # rmmod i40evf; modprobe i40evf
>>>
>>> /* Create 2 namespaces and move the VFs to the corresponding ns. */
>>> # ip netns add ns0
>>> # ip link set enp5s2 netns ns0
>>> # ip netns exec ns0 ip addr add 192.168.1.10/24 dev enp5s2
>>> # ip netns exec ns0 ip link set enp5s2 up
>>> # ip netns add ns1
>>> # ip link set enp5s2f1 netns ns1
>>> # ip netns exec ns1 ip addr add 192.168.1.11/24 dev enp5s2f1
>>> # ip netns exec ns1 ip link set enp5s2f1 up
>>>
>>> /* bring up pf and vfpr netdevs */
>>> # ip link set enp5s0f0 up
>>> # ip link set enp5s0f0-vf0 up
>>> # ip link set enp5s0f0-vf1 up
>>>
>>> /* Create a linux bridge and add vfpr netdevs to it. */
>>> # ip link add vfpr-br type bridge
>>> # ip link set enp5s0f0-vf0 master vfpr-br
>>> # ip link set enp5s0f0-vf1 master vfpr-br
>>> # ip addr add 192.168.1.1/24 dev vfpr-br
>>> # ip link set vfpr-br up
>>>
>>> # ip netns exec ns0 ping -c3 192.168.1.11
>>> # ip netns exec ns1 ping -c3 192.168.1.10
>>
>> So the test case as called out here isn't really valid is it? You
>> aren't even really using the switchdev. All you are doing is having
>> one VF ping the other.
>
> In switchdev mode, when VF pings other VF, the broadcasts go through the
> host PF.
> In this example, when i ping from enp5s2 in ns0, the ARP broadcast from
> enp5s2
> takes this path.
> enp5s2(ns0) -> enp5s0f0 -> enp5s0f0-vf0 -> vfpr-br -> enp5s0f0-vf1 ->
> enp5s0f0 -> enp5s2f1(ns1)
>
> So in switchdev mode, for VF<->VF communications, we need to add all the
> VFPR netdevs to a
> learning bridge with the current state of implementation. Once we have the
> fdb add/del support,
> we should be able to program the broadcast filters from the host via VFPR
> netdevs.
We may want to look at pre-programming the filters so that we
basically start with the switchdev preconfigured for what we actually
have enabled. We may want to hold off on submitting this patch set
until we have FDB and possibly TC filter support. Otherwise all we
are doing is adding statistics which are only somewhat useful.
>>
>> I would be interested in seeing the PF brought up and what the
>> behavior is if the PF attempts to ping one of the VFs. I think we
>> have a major flaw in the design there as the replies would likely be
>> returned to the port representors instead of being returned to the PF.
>> We probably need to look at moving the port representors all onto a
>> different MAC address and doing a 2 fold test. One to see if the
>> packet is being routed to the PF (see the tests in eth_type_trans),
>> and if it is not only then do we take the packet and route it to a
>> representor.
>
>
> Sure. I can add an IP address in the same subnet as VFs to PF and can ping
> PF from VF.
> That works fine. I haven't tried assigning a separate MAC for all VFPR
> netdevs. I think that
> will work too, but need to check if there are any issues with that approach.
>
I'm pretty sure the PF will send the ping, but it will be received on
the VFPR for the VF instead of being received on the PF. Ideally the
behavior we should see is that if I ping from the VFPR the reply
should be returned to the VFPR, and if I ping from the PF the reply
should be received on the PF.
Also it occurred to me that we should probably be doing broadcast
replication instead of just sending the broadcast to the VFPR only.
We should see the broadcast on the VFPR and the PF.
My main concern with all of this is that I am not sure this is
"production ready". We need to make sure we can handle sending
traffic across the interfaces and support all of the minimum
requirements to support switchdev and I am not sure we are quite there
yet. We need to be able to have an interface that is registered on
top of us recognize how we are configured and handle the traffic that
is moving across the ports correctly and in order to do that we really
need to work on coming up with a better test matrix than what we have
currently.
- Alex
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2017-02-15 17:51 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-26 0:54 [Intel-wired-lan] [next-queue v5 PATCH 0/7] i40e: Add VF Port Representator support for SR-IOV VFs Sridhar Samudrala
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 1/7] i40e: Introduce devlink interface Sridhar Samudrala
2017-01-30 21:33 ` Bowers, AndrewX
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 2/7] i40e: Introduce VF Port Representator(VFPR) netdevs Sridhar Samudrala
2017-01-30 21:33 ` Bowers, AndrewX
2017-02-01 1:06 ` Keller, Jacob E
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 3/7] i40e: Sync link state between VFs and VFPRs Sridhar Samudrala
2017-01-30 21:34 ` Bowers, AndrewX
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 4/7] net: store port/representator id in metadata_dst Sridhar Samudrala
2017-01-30 21:36 ` Bowers, AndrewX
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 5/7] i40e: Add TX and RX support in switchdev mode Sridhar Samudrala
2017-01-30 21:34 ` Bowers, AndrewX
2017-02-15 15:59 ` Alexander Duyck
2017-02-15 17:37 ` Samudrala, Sridhar
2017-02-15 17:51 ` Alexander Duyck
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 6/7] i40e: Add support for exposing VF port statistics via VFPR netdev on the host Sridhar Samudrala
2017-01-30 21:35 ` Bowers, AndrewX
2017-02-01 1:05 ` Keller, Jacob E
2017-02-01 18:21 ` Keller, Jacob E
2017-01-26 0:54 ` [Intel-wired-lan] [next-queue v5 PATCH 7/7] i40e: Add support to get switch id and port number for VFPR netdevs Sridhar Samudrala
2017-01-30 21:35 ` Bowers, AndrewX
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.