| Message ID | 20230131094232.28863-10-sriram.yagnaraman@est.tech (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | igb: merge changes from <20221229190817.25500-1-sriram.yagnaraman@est.tech> | expand |
On 2023/01/31 18:42, Sriram Yagnaraman wrote: > Add support for stripping/inserting VLAN for VFs. > > Signed-off-by: Sriram Yagnaraman <sriram.yagnaraman@est.tech> > --- > hw/net/igb_core.c | 51 ++++++++++++++++++++++++++++++++++++++--------- > 1 file changed, 42 insertions(+), 9 deletions(-) > > diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c > index 8115be2d76..a697fcf56a 100644 > --- a/hw/net/igb_core.c > +++ b/hw/net/igb_core.c > @@ -386,6 +386,25 @@ igb_rss_parse_packet(IGBCore *core, struct NetRxPkt *pkt, bool tx, > info->queue = E1000_RSS_QUEUE(&core->mac[RETA], info->hash); > } > > +static inline bool > +igb_tx_insert_vlan(IGBCore *core, uint16_t qn, > + struct igb_tx *tx, bool desc_vle) > +{ > + if (core->mac[MRQC] & 1) { > + uint16_t pool = qn % IGB_NUM_VM_POOLS; > + > + if (core->mac[VMVIR0 + pool] & E1000_VMVIR_VLANA_DEFAULT) { > + /* always insert default VLAN */ > + desc_vle = true; > + tx->vlan = core->mac[VMVIR0 + pool] & 0xffff; > + } else if (core->mac[VMVIR0 + pool] & E1000_VMVIR_VLANA_NEVER) { > + return false; > + } > + } > + > + return desc_vle && e1000x_vlan_enabled(core->mac); > +} > + > static bool > igb_setup_tx_offloads(IGBCore *core, struct igb_tx *tx) > { > @@ -581,7 +600,8 @@ igb_process_tx_desc(IGBCore *core, > > if (cmd_type_len & E1000_TXD_CMD_EOP) { > if (!tx->skip_cp && net_tx_pkt_parse(tx->tx_pkt)) { > - if (cmd_type_len & E1000_TXD_CMD_VLE) { > + if (igb_tx_insert_vlan(core, queue_index, tx, > + !!(cmd_type_len & E1000_TXD_CMD_VLE))) { > net_tx_pkt_setup_vlan_header_ex(tx->tx_pkt, tx->vlan, > core->mac[VET] & 0xffff); > } > @@ -1543,6 +1563,20 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRxPkt *pkt, > igb_update_rx_stats(core, rxi, size, total_size); > } > > +static bool > +igb_rx_strip_vlan(IGBCore *core, const E1000E_RingInfo *rxi) > +{ > + if (core->mac[MRQC] & 1) { > + uint16_t pool = rxi->idx % IGB_NUM_VM_POOLS; > + /* Sec 7.10.3.8: CTRL.VME is ignored, only VMOLR/RPLOLR is used */ > + return (net_rx_pkt_get_packet_type(core->rx_pkt) == ETH_PKT_MCAST) ? > + core->mac[RPLOLR] & E1000_RPLOLR_STRVLAN : > + core->mac[VMOLR0 + pool] & E1000_VMOLR_STRVLAN; > + } > + > + return e1000x_vlan_enabled(core->mac); > +} > + > static inline void > igb_rx_fix_l4_csum(IGBCore *core, struct NetRxPkt *pkt) > { > @@ -1624,10 +1658,7 @@ igb_receive_internal(IGBCore *core, const struct iovec *iov, int iovcnt, > > ehdr = PKT_GET_ETH_HDR(filter_buf); > net_rx_pkt_set_packet_type(core->rx_pkt, get_eth_packet_type(ehdr)); > - > - net_rx_pkt_attach_iovec_ex(core->rx_pkt, iov, iovcnt, iov_ofs, > - e1000x_vlan_enabled(core->mac), > - core->mac[VET] & 0xffff); > + net_rx_pkt_set_protocols(core->rx_pkt, filter_buf, size); > > queues = igb_receive_assign(core, ehdr, size, &rss_info, external_tx); > if (!queues) { > @@ -1635,11 +1666,8 @@ igb_receive_internal(IGBCore *core, const struct iovec *iov, int iovcnt, > return orig_size; > } > > - total_size = net_rx_pkt_get_total_len(core->rx_pkt) + > - e1000x_fcs_len(core->mac); > - > retval = orig_size; > - igb_rx_fix_l4_csum(core, core->rx_pkt); > + total_size = size + e1000x_fcs_len(core->mac); This change to total_size should be reverted; total_size will be different from size if VLAN stripping is enabled. There is also no reason to reorder the statements. > > for (i = 0; i < IGB_NUM_QUEUES; i++) { > if (!(queues & BIT(i)) || > @@ -1648,6 +1676,11 @@ igb_receive_internal(IGBCore *core, const struct iovec *iov, int iovcnt, > } > > igb_rx_ring_init(core, &rxr, i); > + net_rx_pkt_attach_iovec_ex(core->rx_pkt, iov, iovcnt, iov_ofs, > + igb_rx_strip_vlan(core, rxr.i), > + core->mac[VET] & 0xffff); > + igb_rx_fix_l4_csum(core, core->rx_pkt); > + > if (!igb_has_rxbufs(core, rxr.i, total_size)) { > icr_bits |= E1000_ICS_RXO; > continue;
diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 8115be2d76..a697fcf56a 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -386,6 +386,25 @@ igb_rss_parse_packet(IGBCore *core, struct NetRxPkt *pkt, bool tx, info->queue = E1000_RSS_QUEUE(&core->mac[RETA], info->hash); } +static inline bool +igb_tx_insert_vlan(IGBCore *core, uint16_t qn, + struct igb_tx *tx, bool desc_vle) +{ + if (core->mac[MRQC] & 1) { + uint16_t pool = qn % IGB_NUM_VM_POOLS; + + if (core->mac[VMVIR0 + pool] & E1000_VMVIR_VLANA_DEFAULT) { + /* always insert default VLAN */ + desc_vle = true; + tx->vlan = core->mac[VMVIR0 + pool] & 0xffff; + } else if (core->mac[VMVIR0 + pool] & E1000_VMVIR_VLANA_NEVER) { + return false; + } + } + + return desc_vle && e1000x_vlan_enabled(core->mac); +} + static bool igb_setup_tx_offloads(IGBCore *core, struct igb_tx *tx) { @@ -581,7 +600,8 @@ igb_process_tx_desc(IGBCore *core, if (cmd_type_len & E1000_TXD_CMD_EOP) { if (!tx->skip_cp && net_tx_pkt_parse(tx->tx_pkt)) { - if (cmd_type_len & E1000_TXD_CMD_VLE) { + if (igb_tx_insert_vlan(core, queue_index, tx, + !!(cmd_type_len & E1000_TXD_CMD_VLE))) { net_tx_pkt_setup_vlan_header_ex(tx->tx_pkt, tx->vlan, core->mac[VET] & 0xffff); } @@ -1543,6 +1563,20 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRxPkt *pkt, igb_update_rx_stats(core, rxi, size, total_size); } +static bool +igb_rx_strip_vlan(IGBCore *core, const E1000E_RingInfo *rxi) +{ + if (core->mac[MRQC] & 1) { + uint16_t pool = rxi->idx % IGB_NUM_VM_POOLS; + /* Sec 7.10.3.8: CTRL.VME is ignored, only VMOLR/RPLOLR is used */ + return (net_rx_pkt_get_packet_type(core->rx_pkt) == ETH_PKT_MCAST) ? + core->mac[RPLOLR] & E1000_RPLOLR_STRVLAN : + core->mac[VMOLR0 + pool] & E1000_VMOLR_STRVLAN; + } + + return e1000x_vlan_enabled(core->mac); +} + static inline void igb_rx_fix_l4_csum(IGBCore *core, struct NetRxPkt *pkt) { @@ -1624,10 +1658,7 @@ igb_receive_internal(IGBCore *core, const struct iovec *iov, int iovcnt, ehdr = PKT_GET_ETH_HDR(filter_buf); net_rx_pkt_set_packet_type(core->rx_pkt, get_eth_packet_type(ehdr)); - - net_rx_pkt_attach_iovec_ex(core->rx_pkt, iov, iovcnt, iov_ofs, - e1000x_vlan_enabled(core->mac), - core->mac[VET] & 0xffff); + net_rx_pkt_set_protocols(core->rx_pkt, filter_buf, size); queues = igb_receive_assign(core, ehdr, size, &rss_info, external_tx); if (!queues) { @@ -1635,11 +1666,8 @@ igb_receive_internal(IGBCore *core, const struct iovec *iov, int iovcnt, return orig_size; } - total_size = net_rx_pkt_get_total_len(core->rx_pkt) + - e1000x_fcs_len(core->mac); - retval = orig_size; - igb_rx_fix_l4_csum(core, core->rx_pkt); + total_size = size + e1000x_fcs_len(core->mac); for (i = 0; i < IGB_NUM_QUEUES; i++) { if (!(queues & BIT(i)) || @@ -1648,6 +1676,11 @@ igb_receive_internal(IGBCore *core, const struct iovec *iov, int iovcnt, } igb_rx_ring_init(core, &rxr, i); + net_rx_pkt_attach_iovec_ex(core->rx_pkt, iov, iovcnt, iov_ofs, + igb_rx_strip_vlan(core, rxr.i), + core->mac[VET] & 0xffff); + igb_rx_fix_l4_csum(core, core->rx_pkt); + if (!igb_has_rxbufs(core, rxr.i, total_size)) { icr_bits |= E1000_ICS_RXO; continue;
Add support for stripping/inserting VLAN for VFs. Signed-off-by: Sriram Yagnaraman <sriram.yagnaraman@est.tech> --- hw/net/igb_core.c | 51 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 9 deletions(-)