| Message ID | 1485392057-3261-6-git-send-email-sridhar.samudrala@intel.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Jeff Kirsher |
| Headers | show |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On > Behalf Of Sridhar Samudrala > Sent: Wednesday, January 25, 2017 4:54 PM > To: intel-wired-lan@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>
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
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
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
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; };