[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/12] igb: check oversized packets for VMDq
From: |
Jason Wang |
Subject: |
[PULL 09/12] igb: check oversized packets for VMDq |
Date: |
Tue, 28 Mar 2023 13:19:14 +0800 |
From: Sriram Yagnaraman <sriram.yagnaraman@est.tech>
Signed-off-by: Sriram Yagnaraman <sriram.yagnaraman@est.tech>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/igb_core.c | 41 ++++++++++++++++++++++++++++++++++++-----
1 file changed, 36 insertions(+), 5 deletions(-)
diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c
index 753f17b..38aa459 100644
--- a/hw/net/igb_core.c
+++ b/hw/net/igb_core.c
@@ -921,12 +921,26 @@ igb_rx_l4_cso_enabled(IGBCore *core)
return !!(core->mac[RXCSUM] & E1000_RXCSUM_TUOFLD);
}
+static bool
+igb_rx_is_oversized(IGBCore *core, uint16_t qn, size_t size)
+{
+ uint16_t pool = qn % IGB_NUM_VM_POOLS;
+ bool lpe = !!(core->mac[VMOLR0 + pool] & E1000_VMOLR_LPE);
+ int max_ethernet_lpe_size =
+ core->mac[VMOLR0 + pool] & E1000_VMOLR_RLPML_MASK;
+ int max_ethernet_vlan_size = 1522;
+
+ return size > (lpe ? max_ethernet_lpe_size : max_ethernet_vlan_size);
+}
+
static uint16_t igb_receive_assign(IGBCore *core, const struct eth_header
*ehdr,
- E1000E_RSSInfo *rss_info, bool *external_tx)
+ size_t size, E1000E_RSSInfo *rss_info,
+ bool *external_tx)
{
static const int ta_shift[] = { 4, 3, 2, 0 };
uint32_t f, ra[2], *macp, rctl = core->mac[RCTL];
uint16_t queues = 0;
+ uint16_t oversized = 0;
uint16_t vid = lduw_be_p(&PKT_GET_VLAN_HDR(ehdr)->h_tci) & VLAN_VID_MASK;
bool accepted = false;
int i;
@@ -1026,9 +1040,26 @@ static uint16_t igb_receive_assign(IGBCore *core, const
struct eth_header *ehdr,
}
queues &= core->mac[VFRE];
- igb_rss_parse_packet(core, core->rx_pkt, external_tx != NULL,
rss_info);
- if (rss_info->queue & 1) {
- queues <<= 8;
+ if (queues) {
+ for (i = 0; i < IGB_NUM_VM_POOLS; i++) {
+ if ((queues & BIT(i)) && igb_rx_is_oversized(core, i, size)) {
+ oversized |= BIT(i);
+ }
+ }
+ /* 8.19.37 increment ROC if packet is oversized for all queues */
+ if (oversized == queues) {
+ trace_e1000x_rx_oversized(size);
+ e1000x_inc_reg_if_not_full(core->mac, ROC);
+ }
+ queues &= ~oversized;
+ }
+
+ if (queues) {
+ igb_rss_parse_packet(core, core->rx_pkt,
+ external_tx != NULL, rss_info);
+ if (rss_info->queue & 1) {
+ queues <<= 8;
+ }
}
} else {
switch (net_rx_pkt_get_packet_type(core->rx_pkt)) {
@@ -1576,7 +1607,7 @@ igb_receive_internal(IGBCore *core, const struct iovec
*iov, int iovcnt,
e1000x_vlan_enabled(core->mac),
core->mac[VET] & 0xffff);
- queues = igb_receive_assign(core, ehdr, &rss_info, external_tx);
+ queues = igb_receive_assign(core, ehdr, size, &rss_info, external_tx);
if (!queues) {
trace_e1000e_rx_flt_dropped();
return orig_size;
--
2.7.4
- [PULL 00/12] Net patches, Jason Wang, 2023/03/28
- [PULL 01/12] igb: Save more Tx states, Jason Wang, 2023/03/28
- [PULL 05/12] MAINTAINERS: Add Sriram Yagnaraman as a igb reviewer, Jason Wang, 2023/03/28
- [PULL 06/12] igb: handle PF/VF reset properly, Jason Wang, 2023/03/28
- [PULL 07/12] igb: add ICR_RXDW, Jason Wang, 2023/03/28
- [PULL 02/12] igb: Fix DMA requester specification for Tx packet, Jason Wang, 2023/03/28
- [PULL 04/12] hw/net/net_tx_pkt: Align l3_hdr, Jason Wang, 2023/03/28
- [PULL 03/12] hw/net/net_tx_pkt: Ignore ECN bit, Jason Wang, 2023/03/28
- [PULL 08/12] igb: implement VFRE and VFTE registers, Jason Wang, 2023/03/28
- [PULL 09/12] igb: check oversized packets for VMDq,
Jason Wang <=
- [PULL 10/12] igb: respect E1000_VMOLR_RSSE, Jason Wang, 2023/03/28
- [PULL 11/12] igb: implement VF Tx and Rx stats, Jason Wang, 2023/03/28
- [PULL 12/12] igb: respect VMVIR and VMOLR for VLAN, Jason Wang, 2023/03/28
- Re: [PULL 00/12] Net patches, Peter Maydell, 2023/03/28