Page MenuHomeFreeBSD
Files F107006464

D43161.diff
No OneTemporary
Actions

D43161.diff
View Options

diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
--- a/sys/dev/virtio/network/if_vtnet.c
+++ b/sys/dev/virtio/network/if_vtnet.c
@@ -1532,8 +1532,8 @@
m_freem(m_head);
return (NULL);
}
+
m->m_len = size;
- m_adj(m, ETHER_ALIGN);
if (m_head != NULL) {
m_tail->m_next = m;
m_tail = m;
@@ -1587,6 +1587,15 @@
("%s: mbuf size %d not expected cluster size %d", __func__,
m->m_len, clustersz));
+#ifdef __NO_STRICT_ALIGNMENT
+ /*
+ * Need to offset the first mbuf in this chain to align the IP
+ * structure because this host requires strict alignment.
+ */
+ if (m_prev == NULL) {
+ m_adj(m, ETHER_ALIGN);
+ }
+#endif
m->m_len = MIN(m->m_len, len);
len -= m->m_len;
@@ -1655,6 +1664,13 @@
if (m_new == NULL)
return (ENOBUFS);
+#ifdef __NO_STRICT_ALIGNMENT
+ /*
+ * Need to offset the first mbuf in this chain to align the IP
+ * structure because this host requires strict alignment.
+ */
+ m_adj(m_new, ETHER_ALIGN);
+#endif
error = vtnet_rxq_enqueue_buf(rxq, m_new);
if (error) {
sc->vtnet_stats.rx_enq_replacement_failed++;
@@ -1722,6 +1738,13 @@
if (m == NULL)
return (ENOBUFS);
+#ifdef __NO_STRICT_ALIGNMENT
+ /*
+ * Need to offset the first mbuf in this chain to align the IP
+ * structure because this host requires strict alignment.
+ */
+ m_adj(m, ETHER_ALIGN);
+#endif
error = vtnet_rxq_enqueue_buf(rxq, m);
if (error)
m_freem(m);
@@ -1907,8 +1930,10 @@
int error __diagused;
/*
- * Requeue the discarded mbuf. This should always be successful
- * since it was just dequeued.
+ * Requeue the discarded mbuf. This should always be successful since it
+ * was just dequeued. There's no need to adjust for ethernet alignment
+ * here on strict alignment hosts because we're requeueing a packet
+ * already adjusted.
*/
error = vtnet_rxq_enqueue_buf(rxq, m);
KASSERT(error == 0,

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 9, 9:03 PM (9 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15735883
Default Alt Text
D43161.diff (1 KB)

Event Timeline