@@ -168,6 +168,7 @@ struct virtnet_info {
struct virtio_net_hdr_max {
struct virtio_net_hdr_mrg_rxbuf hdr;
struct virtio_net_ext_hdr ext_hdr;
+ struct virtio_net_ext_ip6frag ip6f_ext;
};
static inline u8 padded_vnet_hdr(struct virtnet_info *vi)
@@ -2155,6 +2156,23 @@ static bool virtnet_validate_features(struct virtio_device *vdev)
return true;
}
+static void virtnet_init_extensions(struct virtio_device *vdev)
+{
+ struct virtnet_info *vi = vdev->priv;
+
+ /* Start with V1 header size plus the extension header */
+ vi->hdr_len = sizeof(struct virtio_net_hdr_v1) +
+ sizeof(struct virtio_net_ext_hdr);
+
+ /* now check all the negotiated extensions and add up
+ * the sizes
+ */
+ if (virtio_has_feature(vdev, VIRTIO_NET_F_IP6_FRAGID)) {
+ vi->hdr_len += sizeof(u32);
+ vi->ext_mask |= VIRTIO_NET_EXT_F_IP6FRAG;
+ }
+}
+
#define MIN_MTU ETH_MIN_MTU
#define MAX_MTU ETH_MAX_MTU
@@ -2272,8 +2290,13 @@ static int virtnet_probe(struct virtio_device *vdev)
if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
vi->mergeable_rx_bufs = true;
- if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF) ||
- virtio_has_feature(vdev, VIRTIO_F_VERSION_1))
+ if (virtio_has_feature(vdev, VIRTIO_NET_F_IP6_FRAGID))
+ vi->hdr_ext = true;
+
+ if (vi->hdr_ext)
+ virtnet_init_extensions(vdev);
+ else if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF) ||
+ virtio_has_feature(vdev, VIRTIO_F_VERSION_1))
vi->hdr_len = sizeof(struct virtio_net_hdr_mrg_rxbuf);
else
vi->hdr_len = sizeof(struct virtio_net_hdr);
@@ -99,6 +99,16 @@ static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb,
static inline int virtio_net_ext_to_skb(struct sk_buff *skb,
struct virtio_net_ext_hdr *ext)
{
+ __u8 *ptr = ext->extensions;
+
+ if (ext->flags & VIRTIO_NET_EXT_F_IP6FRAG) {
+ struct virtio_net_ext_ip6frag *fhdr =
+ (struct virtio_net_ext_ip6frag *)ptr;
+
+ skb_shinfo(skb)->ip6_frag_id = fhdr->frag_id;
+ ptr += sizeof(struct virtio_net_ext_ip6frag);
+ }
+
return 0;
}
@@ -106,6 +116,16 @@ static inline int virtio_net_ext_from_skb(const struct sk_buff *skb,
struct virtio_net_ext_hdr *ext,
__u32 ext_mask)
{
+ __u8 *ptr = ext->extensions;
+
+ if ((ext_mask & VIRTIO_NET_EXT_F_IP6FRAG) &&
+ skb_shinfo(skb)->ip6_frag_id) {
+ struct virtio_net_ext_ip6frag *fhdr =
+ (struct virtio_net_ext_ip6frag *)ptr;
+ fhdr->frag_id = skb_shinfo(skb)->ip6_frag_id;
+ ext->flags |= VIRTIO_NET_EXT_F_IP6FRAG;
+ }
+
return 0;
}
#endif /* _LINUX_VIRTIO_NET_H */
@@ -56,6 +56,7 @@
#define VIRTIO_NET_F_MQ 22 /* Device supports Receive Flow
* Steering */
#define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */
+#define VIRTIO_NET_F_IP6_FRAGID 24 /* Host supports VLAN accleration */
#ifndef VIRTIO_NET_NO_LEGACY
#define VIRTIO_NET_F_GSO 6 /* Host handles pkts w/ any GSO type */
@@ -109,10 +110,16 @@ struct virtio_net_hdr_v1 {
* this header.
*/
struct virtio_net_ext_hdr {
+#define VIRTIO_NET_EXT_F_IP6FRAG (1<<0)
__u32 flags;
__u8 extensions[];
};
+/* Same as vlan_hdr */
+struct virtio_net_ext_ip6frag {
+ __be32 frag_id;
+};
+
#ifndef VIRTIO_NET_NO_LEGACY
/* This header comes first in the scatter-gather list.
* For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, it must
This adds the ability to pass a guest generated IPv6 fragment id to the host hypervisor. The id is passed as big endian to eliminate unnecessary conversions. The host will be able to directly use this id instead of attempting to generate its own. This makes the IPv6 framgnet id sligtly harder to predict. Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com> --- drivers/net/virtio_net.c | 27 +++++++++++++++++++++++++-- include/linux/virtio_net.h | 20 ++++++++++++++++++++ include/uapi/linux/virtio_net.h | 7 +++++++ 3 files changed, 52 insertions(+), 2 deletions(-)