[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/40] e1000e: Always copy ethernet header
From: |
Akihiko Odaki |
Subject: |
[PATCH 07/40] e1000e: Always copy ethernet header |
Date: |
Fri, 14 Apr 2023 20:37:04 +0900 |
e1000e_receive_internal() used to check the iov length to determine
copy the iovs to a contiguous buffer, but the check is flawed in two
ways:
- It does not ensure that iovcnt > 0.
- It does not take virtio-net header into consideration.
The size of this copy is just 18 octets, which can be even less than
the code size required for checks. This (wrong) optimization is probably
not worth so just remove it.
Fixes: 6f3fbe4ed0 ("net: Introduce e1000e device emulation")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
hw/net/e1000e_core.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index c2d864a504..f3335194d8 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -1686,12 +1686,9 @@ static ssize_t
e1000e_receive_internal(E1000ECore *core, const struct iovec *iov, int iovcnt,
bool has_vnet)
{
- static const int maximum_ethernet_hdr_len = (ETH_HLEN + 4);
-
uint32_t n = 0;
uint8_t min_buf[ETH_ZLEN];
struct iovec min_iov;
- uint8_t *filter_buf;
size_t size, orig_size;
size_t iov_ofs = 0;
E1000E_RxRing rxr;
@@ -1714,7 +1711,6 @@ e1000e_receive_internal(E1000ECore *core, const struct
iovec *iov, int iovcnt,
net_rx_pkt_unset_vhdr(core->rx_pkt);
}
- filter_buf = iov->iov_base + iov_ofs;
orig_size = iov_size(iov, iovcnt);
size = orig_size - iov_ofs;
@@ -1723,15 +1719,13 @@ e1000e_receive_internal(E1000ECore *core, const struct
iovec *iov, int iovcnt,
iov_to_buf(iov, iovcnt, iov_ofs, min_buf, size);
memset(&min_buf[size], 0, sizeof(min_buf) - size);
e1000x_inc_reg_if_not_full(core->mac, RUC);
- min_iov.iov_base = filter_buf = min_buf;
+ min_iov.iov_base = min_buf;
min_iov.iov_len = size = sizeof(min_buf);
iovcnt = 1;
iov = &min_iov;
iov_ofs = 0;
- } else if (iov->iov_len < maximum_ethernet_hdr_len) {
- /* This is very unlikely, but may happen. */
- iov_to_buf(iov, iovcnt, iov_ofs, min_buf, maximum_ethernet_hdr_len);
- filter_buf = min_buf;
+ } else {
+ iov_to_buf(iov, iovcnt, iov_ofs, min_buf, ETH_HLEN + 4);
}
/* Discard oversized packets if !LPE and !SBP. */
@@ -1740,9 +1734,9 @@ e1000e_receive_internal(E1000ECore *core, const struct
iovec *iov, int iovcnt,
}
net_rx_pkt_set_packet_type(core->rx_pkt,
- get_eth_packet_type(PKT_GET_ETH_HDR(filter_buf)));
+ get_eth_packet_type(PKT_GET_ETH_HDR(min_buf)));
- if (!e1000e_receive_filter(core, filter_buf, size)) {
+ if (!e1000e_receive_filter(core, min_buf, size)) {
trace_e1000e_rx_flt_dropped();
return orig_size;
}
--
2.40.0
- [PATCH 04/40] igb: Include the second VLAN tag in the buffer, (continued)
- [PATCH 03/40] igb: Fix Rx packet type encoding, Akihiko Odaki, 2023/04/14
- [PATCH 05/40] igb: Do not require CTRL.VME for tx VLAN tagging, Akihiko Odaki, 2023/04/14
- [PATCH 06/40] net/net_rx_pkt: Use iovec for net_rx_pkt_set_protocols(), Akihiko Odaki, 2023/04/14
- [PATCH 07/40] e1000e: Always copy ethernet header,
Akihiko Odaki <=
- [PATCH 08/40] igb: Always copy ethernet header, Akihiko Odaki, 2023/04/14
- [PATCH 09/40] Fix references to igb Avocado test, Akihiko Odaki, 2023/04/14
- [PATCH 11/40] tests/avocado: Remove test_igb_nomsi_kvm, Akihiko Odaki, 2023/04/14
- [PATCH 10/40] tests/avocado: Remove unused imports, Akihiko Odaki, 2023/04/14
- [PATCH 12/40] hw/net/net_tx_pkt: Remove net_rx_pkt_get_l4_info, Akihiko Odaki, 2023/04/14
- [PATCH 13/40] net/eth: Rename eth_setup_vlan_headers_ex, Akihiko Odaki, 2023/04/14
- [PATCH 14/40] e1000x: Share more Rx filtering logic, Akihiko Odaki, 2023/04/14