Page MenuHomeFreeBSD
Files F132015369

D25132.diff
No OneTemporary
Actions

D25132.diff
View Options

Index: head/sys/dev/virtio/network/if_vtnet.c
===================================================================
--- head/sys/dev/virtio/network/if_vtnet.c
+++ head/sys/dev/virtio/network/if_vtnet.c
@@ -640,10 +640,13 @@
sc->vtnet_flags |= VTNET_FLAG_MAC;
}
- if (virtio_with_feature(dev, VIRTIO_NET_F_MRG_RXBUF)) {
+ if (virtio_with_feature(dev, VIRTIO_NET_F_MRG_RXBUF))
sc->vtnet_flags |= VTNET_FLAG_MRG_RXBUFS;
+
+ if (virtio_with_feature(dev, VIRTIO_NET_F_MRG_RXBUF) ||
+ virtio_with_feature(dev, VIRTIO_F_VERSION_1))
sc->vtnet_hdr_size = sizeof(struct virtio_net_hdr_mrg_rxbuf);
- } else
+ else
sc->vtnet_hdr_size = sizeof(struct virtio_net_hdr);
if (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS)
@@ -1459,9 +1462,10 @@
sglist_reset(sg);
if ((sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS) == 0) {
- MPASS(sc->vtnet_hdr_size == sizeof(struct virtio_net_hdr));
+ MPASS(sc->vtnet_hdr_size == sizeof(rxhdr->vrh_uhdr.hdr) ||
+ sc->vtnet_hdr_size == sizeof(rxhdr->vrh_uhdr.mhdr));
rxhdr = (struct vtnet_rx_header *) mdata;
- sglist_append(sg, &rxhdr->vrh_hdr, sc->vtnet_hdr_size);
+ sglist_append(sg, &rxhdr->vrh_uhdr, sc->vtnet_hdr_size);
offset = sizeof(struct vtnet_rx_header);
} else
offset = 0;
Index: head/sys/dev/virtio/network/if_vtnetvar.h
===================================================================
--- head/sys/dev/virtio/network/if_vtnetvar.h
+++ head/sys/dev/virtio/network/if_vtnetvar.h
@@ -219,15 +219,20 @@
* When mergeable buffers are not negotiated, the vtnet_rx_header structure
* below is placed at the beginning of the mbuf data. Use 4 bytes of pad to
* both keep the VirtIO header and the data non-contiguous and to keep the
- * frame's payload 4 byte aligned.
+ * frame's payload 4 byte aligned. Note that non-legacy drivers still want
+ * room for a full mergeable buffer header.
*
* When mergeable buffers are negotiated, the host puts the VirtIO header in
* the beginning of the first mbuf's data.
*/
#define VTNET_RX_HEADER_PAD 4
struct vtnet_rx_header {
- struct virtio_net_hdr vrh_hdr;
- char vrh_pad[VTNET_RX_HEADER_PAD];
+ union {
+ struct virtio_net_hdr hdr;
+ struct virtio_net_hdr_mrg_rxbuf mhdr;
+ } vrh_uhdr;
+
+ char vrh_pad[VTNET_RX_HEADER_PAD];
} __packed;
/*
@@ -296,7 +301,8 @@
VIRTIO_NET_F_MRG_RXBUF | \
VIRTIO_NET_F_MQ | \
VIRTIO_RING_F_EVENT_IDX | \
- VIRTIO_RING_F_INDIRECT_DESC)
+ VIRTIO_RING_F_INDIRECT_DESC | \
+ VIRTIO_F_VERSION_1)
/*
* The VIRTIO_NET_F_HOST_TSO[46] features permit us to send the host
Index: head/sys/dev/virtio/virtio.c
===================================================================
--- head/sys/dev/virtio/virtio.c
+++ head/sys/dev/virtio/virtio.c
@@ -79,6 +79,7 @@
{ VIRTIO_RING_F_INDIRECT_DESC, "RingIndirect" },
{ VIRTIO_RING_F_EVENT_IDX, "EventIdx" },
{ VIRTIO_F_BAD_FEATURE, "BadFeature" },
+ { VIRTIO_F_VERSION_1, "Version1" },
{ 0, NULL }
};
Index: head/sys/dev/virtio/virtqueue.c
===================================================================
--- head/sys/dev/virtio/virtqueue.c
+++ head/sys/dev/virtio/virtqueue.c
@@ -142,6 +142,7 @@
mask = (1 << VIRTIO_TRANSPORT_F_START) - 1;
mask |= VIRTIO_RING_F_INDIRECT_DESC;
mask |= VIRTIO_RING_F_EVENT_IDX;
+ mask |= VIRTIO_F_VERSION_1;
return (features & mask);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 13, 11:26 PM (18 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23696803
Default Alt Text
D25132.diff (3 KB)

Event Timeline