date:20170415

Re: [PATCH RFC (resend) net-next 5/6] virtio-net: Add support for vlan acceleration vnet header extension.

2017-04-15 Thread Michael S. Tsirkin

On Sat, Apr 15, 2017 at 12:38:17PM -0400, Vladislav Yasevich wrote:
> This extension allows us to pass vlan ID and vlan protocol data to the
> host hypervisor as part of the vnet header and lets us take advantage
> of HW accelerated vlan tagging in the host.  It requires support in the
> host to negotiate the feature.  When the extension is enabled, the
> virtio device will enabled HW accelerated vlan features.
> 
> Signed-off-by: Vladislav Yasevich 

Performance data will be required to justify this.


> ---
>  drivers/net/virtio_net.c| 17 -
>  include/linux/virtio_net.h  | 17 +
>  include/uapi/linux/virtio_net.h |  7 +++
>  3 files changed, 40 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 18eb0dd..696ef4a 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -182,6 +182,7 @@ 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;
> + struct virtio_net_ext_vlan vlan_ext;
>  };
>  
>  static inline u8 padded_vnet_hdr(struct virtnet_info *vi)
> @@ -2276,6 +2277,11 @@ static void virtnet_init_extensions(struct 
> virtio_device *vdev)
>   vi->hdr_len += sizeof(u32);
>   vi->ext_mask |= VIRTIO_NET_EXT_F_IP6FRAG;
>   }
> +
> + if (virtio_has_feature(vdev, VIRTIO_NET_F_VLAN_OFFLOAD)) {
> + vi->hdr_len += sizeof(struct virtio_net_ext_vlan);
> + vi->ext_mask |= VIRTIO_NET_EXT_F_VLAN;
> + }
>  }
>  
>  #define MIN_MTU ETH_MIN_MTU
> @@ -2352,6 +2358,14 @@ static int virtnet_probe(struct virtio_device *vdev)
>   if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_CSUM))
>   dev->features |= NETIF_F_RXCSUM;
>  
> + if (virtio_has_feature(vdev, VIRTIO_NET_F_VLAN_OFFLOAD)) {
> + dev->features |= NETIF_F_HW_VLAN_CTAG_TX |
> +  NETIF_F_HW_VLAN_CTAG_RX |
> +  NETIF_F_HW_VLAN_STAG_TX |
> +  NETIF_F_HW_VLAN_STAG_RX;
> + }
> +
> +
>   dev->vlan_features = dev->features;
>  
>   /* MTU range: 68 - 65535 */
> @@ -2395,7 +2409,8 @@ 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_IP6_FRAGID))
> + if (virtio_has_feature(vdev, VIRTIO_NET_F_IP6_FRAGID) ||
> + virtio_has_feature(vdev, VIRTIO_NET_F_VLAN_OFFLOAD))
>   vi->hdr_ext = true;
>  
>   if (vi->hdr_ext)
> diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
> index 3b259dc..e790191 100644
> --- a/include/linux/virtio_net.h
> +++ b/include/linux/virtio_net.h
> @@ -113,6 +113,14 @@ static inline int virtio_net_ext_to_skb(struct sk_buff 
> *skb,
>   ptr += sizeof(struct virtio_net_ext_ip6frag);
>   }
>  
> + if (ext->flags & VIRTIO_NET_EXT_F_VLAN) {
> + struct virtio_net_ext_vlan *vhdr =
> + (struct virtio_net_ext_vlan *)ptr;
> +
> + __vlan_hwaccel_put_tag(skb, vhdr->vlan_proto, vhdr->vlan_tci);
> + ptr += sizeof(struct virtio_net_ext_vlan);
> + }
> +
>   return 0;
>  }
>  
> @@ -130,6 +138,15 @@ static inline int virtio_net_ext_from_skb(const struct 
> sk_buff *skb,
>   ext->flags |= VIRTIO_NET_EXT_F_IP6FRAG;
>   }
>  
> + if (ext_mask & VIRTIO_NET_EXT_F_VLAN && skb_vlan_tag_present(skb)) {
> + struct virtio_net_ext_vlan *vhdr =
> + (struct virtio_net_ext_vlan *)ptr;
> +
> + vlan_get_tag(skb, >vlan_tci);
> + vhdr->vlan_proto = skb->vlan_proto;
> + ext->flags |= VIRTIO_NET_EXT_F_VLAN;
> + }
> +
>   return 0;
>  }
>  #endif /* _LINUX_VIRTIO_NET_H */
> diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
> index eac8d94..6125de7 100644
> --- a/include/uapi/linux/virtio_net.h
> +++ b/include/uapi/linux/virtio_net.h
> @@ -57,6 +57,7 @@
>* Steering */
>  #define VIRTIO_NET_F_CTRL_MAC_ADDR 23/* Set MAC address */
>  #define VIRTIO_NET_F_IP6_FRAGID24/* Host supports VLAN 
> accleration */
> +#define VIRTIO_NET_F_VLAN_OFFLOAD 25 /* Host supports VLAN accleration */
>  
>  #ifndef VIRTIO_NET_NO_LEGACY
>  #define VIRTIO_NET_F_GSO 6   /* Host handles pkts w/ any GSO type */
> @@ -111,6 +112,7 @@ struct virtio_net_hdr_v1 {
>   */
>  struct virtio_net_ext_hdr {
>  #define VIRTIO_NET_EXT_F_IP6FRAG (1<<0)
> +#define VIRTIO_NET_EXT_F_VLAN(1<<1)
>   __u32 flags;
>   __u8 extensions[];
>  };
> @@ -120,6 +122,11 @@ struct virtio_net_ext_ip6frag {
>   __be32 frag_id;
>  };
>  
> +struct virtio_net_ext_vlan {
> +

[PATCH] ringtest: fix an assert statement

2017-04-15 Thread Dan Carpenter

There is an || vs && typo so the assert can never be triggered.

Signed-off-by: Dan Carpenter 

diff --git a/tools/virtio/ringtest/main.c b/tools/virtio/ringtest/main.c
index 022ae95a06bd..453ca3c21193 100644
--- a/tools/virtio/ringtest/main.c
+++ b/tools/virtio/ringtest/main.c
@@ -87,7 +87,7 @@ void set_affinity(const char *arg)
cpu = strtol(arg, , 0);
assert(!*endptr);
 
-   assert(cpu >= 0 || cpu < CPU_SETSIZE);
+   assert(cpu >= 0 && cpu < CPU_SETSIZE);
 
self = pthread_self();
CPU_ZERO();
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

[PATCH RFC (resend) net-next 5/6] virtio-net: Add support for vlan acceleration vnet header extension.

2017-04-15 Thread Vladislav Yasevich

This extension allows us to pass vlan ID and vlan protocol data to the
host hypervisor as part of the vnet header and lets us take advantage
of HW accelerated vlan tagging in the host.  It requires support in the
host to negotiate the feature.  When the extension is enabled, the
virtio device will enabled HW accelerated vlan features.

Signed-off-by: Vladislav Yasevich 
---
 drivers/net/virtio_net.c| 17 -
 include/linux/virtio_net.h  | 17 +
 include/uapi/linux/virtio_net.h |  7 +++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 18eb0dd..696ef4a 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -182,6 +182,7 @@ 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;
+   struct virtio_net_ext_vlan vlan_ext;
 };
 
 static inline u8 padded_vnet_hdr(struct virtnet_info *vi)
@@ -2276,6 +2277,11 @@ static void virtnet_init_extensions(struct virtio_device 
*vdev)
vi->hdr_len += sizeof(u32);
vi->ext_mask |= VIRTIO_NET_EXT_F_IP6FRAG;
}
+
+   if (virtio_has_feature(vdev, VIRTIO_NET_F_VLAN_OFFLOAD)) {
+   vi->hdr_len += sizeof(struct virtio_net_ext_vlan);
+   vi->ext_mask |= VIRTIO_NET_EXT_F_VLAN;
+   }
 }
 
 #define MIN_MTU ETH_MIN_MTU
@@ -2352,6 +2358,14 @@ static int virtnet_probe(struct virtio_device *vdev)
if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_CSUM))
dev->features |= NETIF_F_RXCSUM;
 
+   if (virtio_has_feature(vdev, VIRTIO_NET_F_VLAN_OFFLOAD)) {
+   dev->features |= NETIF_F_HW_VLAN_CTAG_TX |
+NETIF_F_HW_VLAN_CTAG_RX |
+NETIF_F_HW_VLAN_STAG_TX |
+NETIF_F_HW_VLAN_STAG_RX;
+   }
+
+
dev->vlan_features = dev->features;
 
/* MTU range: 68 - 65535 */
@@ -2395,7 +2409,8 @@ 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_IP6_FRAGID))
+   if (virtio_has_feature(vdev, VIRTIO_NET_F_IP6_FRAGID) ||
+   virtio_has_feature(vdev, VIRTIO_NET_F_VLAN_OFFLOAD))
vi->hdr_ext = true;
 
if (vi->hdr_ext)
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 3b259dc..e790191 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -113,6 +113,14 @@ static inline int virtio_net_ext_to_skb(struct sk_buff 
*skb,
ptr += sizeof(struct virtio_net_ext_ip6frag);
}
 
+   if (ext->flags & VIRTIO_NET_EXT_F_VLAN) {
+   struct virtio_net_ext_vlan *vhdr =
+   (struct virtio_net_ext_vlan *)ptr;
+
+   __vlan_hwaccel_put_tag(skb, vhdr->vlan_proto, vhdr->vlan_tci);
+   ptr += sizeof(struct virtio_net_ext_vlan);
+   }
+
return 0;
 }
 
@@ -130,6 +138,15 @@ static inline int virtio_net_ext_from_skb(const struct 
sk_buff *skb,
ext->flags |= VIRTIO_NET_EXT_F_IP6FRAG;
}
 
+   if (ext_mask & VIRTIO_NET_EXT_F_VLAN && skb_vlan_tag_present(skb)) {
+   struct virtio_net_ext_vlan *vhdr =
+   (struct virtio_net_ext_vlan *)ptr;
+
+   vlan_get_tag(skb, >vlan_tci);
+   vhdr->vlan_proto = skb->vlan_proto;
+   ext->flags |= VIRTIO_NET_EXT_F_VLAN;
+   }
+
return 0;
 }
 #endif /* _LINUX_VIRTIO_NET_H */
diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index eac8d94..6125de7 100644
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
@@ -57,6 +57,7 @@
 * Steering */
 #define VIRTIO_NET_F_CTRL_MAC_ADDR 23  /* Set MAC address */
 #define VIRTIO_NET_F_IP6_FRAGID24  /* Host supports VLAN accleration */
+#define VIRTIO_NET_F_VLAN_OFFLOAD 25   /* Host supports VLAN accleration */
 
 #ifndef VIRTIO_NET_NO_LEGACY
 #define VIRTIO_NET_F_GSO   6   /* Host handles pkts w/ any GSO type */
@@ -111,6 +112,7 @@ struct virtio_net_hdr_v1 {
  */
 struct virtio_net_ext_hdr {
 #define VIRTIO_NET_EXT_F_IP6FRAG   (1<<0)
+#define VIRTIO_NET_EXT_F_VLAN  (1<<1)
__u32 flags;
__u8 extensions[];
 };
@@ -120,6 +122,11 @@ struct virtio_net_ext_ip6frag {
__be32 frag_id;
 };
 
+struct virtio_net_ext_vlan {
+   __be16 vlan_tci;
+   __be16 vlan_proto;
+};
+
 #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
-- 
2.7.4

___
Virtualization

[PATCH RFC (resend) net-next 4/6] virtio-net: Add support for IPv6 fragment id vnet header extension.

2017-04-15 Thread Vladislav Yasevich

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 
---
 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(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 08e2709..18eb0dd 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -181,6 +181,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)
@@ -2260,6 +2261,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
 
@@ -2377,8 +2395,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);
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index eaa524f..3b259dc 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -103,6 +103,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;
 }
 
@@ -110,6 +120,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 */
diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index 0039b72..eac8d94 100644
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
@@ -56,6 +56,7 @@
 #define VIRTIO_NET_F_MQ22  /* Device supports Receive Flow
 * Steering */
 #define VIRTIO_NET_F_CTRL_MAC_ADDR 23  /* Set MAC address */
+#define VIRTIO_NET_F_IP6_FRAGID24  /* 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

[PATCH RFC (resend) net-next 2/6] virtio-net: make header length handling uniform

2017-04-15 Thread Vladislav Yasevich

Consistently use hdr_len stored in virtnet_info
structure instead of direclty using specific sizes.
This will be required as the size of the virtio net
header grows due to future extensions.

Signed-off-by: Vladislav Yasevich 
---
 drivers/net/virtio_net.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 2937a98..5ad6ee6 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -855,9 +855,9 @@ static int add_recvbuf_big(struct virtnet_info *vi, struct 
receive_queue *rq,
return err;
 }
 
-static unsigned int get_mergeable_buf_len(struct ewma_pkt_len *avg_pkt_len)
+static unsigned int get_mergeable_buf_len(struct ewma_pkt_len *avg_pkt_len,
+ u8 hdr_len)
 {
-   const size_t hdr_len = sizeof(struct virtio_net_hdr_mrg_rxbuf);
unsigned int len;
 
len = hdr_len + clamp_t(unsigned int, ewma_pkt_len_read(avg_pkt_len),
@@ -875,7 +875,7 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi,
int err;
unsigned int len, hole;
 
-   len = get_mergeable_buf_len(>mrg_avg_pkt_len);
+   len = get_mergeable_buf_len(>mrg_avg_pkt_len, vi->hdr_len);
if (unlikely(!skb_page_frag_refill(len + headroom, alloc_frag, gfp)))
return -ENOMEM;
 
@@ -2188,7 +2188,7 @@ static ssize_t mergeable_rx_buffer_size_show(struct 
netdev_rx_queue *queue,
 
BUG_ON(queue_index >= vi->max_queue_pairs);
avg = >rq[queue_index].mrg_avg_pkt_len;
-   return sprintf(buf, "%u\n", get_mergeable_buf_len(avg));
+   return sprintf(buf, "%u\n", get_mergeable_buf_len(avg, vi->hdr_len));
 }
 
 static struct rx_queue_attribute mergeable_rx_buffer_size_attribute =
-- 
2.7.4

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

[PATCH RFC (resend) net-next 3/6] virtio_net: Add basic skeleton for handling vnet header extensions.

2017-04-15 Thread Vladislav Yasevich

This is the basic sceleton which will be fleshed out by individiual
extensions.

Signed-off-by: Vladislav Yasevich 
---
 drivers/net/virtio_net.c| 21 +
 include/linux/virtio_net.h  | 12 
 include/uapi/linux/virtio_net.h | 11 +++
 3 files changed, 44 insertions(+)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 5ad6ee6..08e2709 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -145,6 +145,10 @@ struct virtnet_info {
/* Packet virtio header size */
u8 hdr_len;
 
+   /* Header extensions were negotiated */
+   bool hdr_ext;
+   u32 ext_mask;
+
/* Active statistics */
struct virtnet_stats __percpu *stats;
 
@@ -174,6 +178,11 @@ struct virtnet_info {
u32 speed;
 };
 
+struct virtio_net_hdr_max {
+   struct virtio_net_hdr_mrg_rxbuf hdr;
+   struct virtio_net_ext_hdr ext_hdr;
+};
+
 static inline u8 padded_vnet_hdr(struct virtnet_info *vi)
 {
u8 hdr_len = vi->hdr_len;
@@ -214,6 +223,7 @@ static int rxq2vq(int rxq)
 
 static inline struct virtio_net_hdr_mrg_rxbuf *skb_vnet_hdr(struct sk_buff 
*skb)
 {
+   BUILD_BUG_ON(sizeof(struct virtio_net_hdr_max) > sizeof(skb->cb));
return (struct virtio_net_hdr_mrg_rxbuf *)skb->cb;
 }
 
@@ -767,6 +777,12 @@ static int receive_buf(struct virtnet_info *vi, struct 
receive_queue *rq,
goto frame_err;
}
 
+   if (vi->hdr_ext &&
+   virtio_net_ext_to_skb(skb,
+ (struct virtio_net_ext_hdr *)(hdr + 1))) {
+   goto frame_err;
+   }
+
skb->protocol = eth_type_trans(skb, dev);
pr_debug("Receiving skb proto 0x%04x len %i type %i\n",
 ntohs(skb->protocol), skb->len, skb->pkt_type);
@@ -1106,6 +1122,11 @@ static int xmit_skb(struct send_queue *sq, struct 
sk_buff *skb)
if (vi->mergeable_rx_bufs)
hdr->num_buffers = 0;
 
+   if (vi->hdr_ext &&
+   virtio_net_ext_from_skb(skb, (struct virtio_net_ext_hdr *)(hdr + 1),
+   vi->ext_mask))
+   BUG();
+
sg_init_table(sq->sg, skb_shinfo(skb)->nr_frags + (can_push ? 1 : 2));
if (can_push) {
__skb_push(skb, hdr_len);
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 5209b5e..eaa524f 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -100,4 +100,16 @@ static inline int virtio_net_hdr_from_skb(const struct 
sk_buff *skb,
return 0;
 }
 
+static inline int virtio_net_ext_to_skb(struct sk_buff *skb,
+   struct virtio_net_ext_hdr *ext)
+{
+   return 0;
+}
+
+static inline int virtio_net_ext_from_skb(const struct sk_buff *skb,
+ struct virtio_net_ext_hdr *ext,
+ __u32 ext_mask)
+{
+   return 0;
+}
 #endif /* _LINUX_VIRTIO_NET_H */
diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index fc353b5..0039b72 100644
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
@@ -88,6 +88,7 @@ struct virtio_net_config {
 struct virtio_net_hdr_v1 {
 #define VIRTIO_NET_HDR_F_NEEDS_CSUM1   /* Use csum_start, csum_offset 
*/
 #define VIRTIO_NET_HDR_F_DATA_VALID2   /* Csum is valid */
+#define VIRTIO_NET_HDR_F_VNET_EXT  4   /* Vnet extensions present */
__u8 flags;
 #define VIRTIO_NET_HDR_GSO_NONE0   /* Not a GSO frame */
 #define VIRTIO_NET_HDR_GSO_TCPV4   1   /* GSO frame, IPv4 TCP (TSO) */
@@ -102,6 +103,16 @@ struct virtio_net_hdr_v1 {
__virtio16 num_buffers; /* Number of merged rx buffers */
 };
 
+/* If IRTIO_NET_HDR_F_VNET_EXT flags is set, this header immediately
+ * follows the virtio_net_hdr.  The flags in this header will indicate
+ * which extension will follow.  The extnsion data will immidiately follow
+ * this header.
+ */
+struct virtio_net_ext_hdr {
+   __u32 flags;
+   __u8 extensions[];
+};
+
 #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
-- 
2.7.4

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

[PATCH RFC (resend) net-next 1/6] virtio-net: Remove the use the padded vnet_header structure

2017-04-15 Thread Vladislav Yasevich

We can replace the structure with a properly aligned size instead.
The current structure attempts to align on a 16 byte boundary, so
preserve it.

Signed-off-by: Vlad Yaseivch 
---
 drivers/net/virtio_net.c | 22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index b0d241d..2937a98 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -174,15 +174,20 @@ struct virtnet_info {
u32 speed;
 };
 
-struct padded_vnet_hdr {
-   struct virtio_net_hdr_mrg_rxbuf hdr;
+static inline u8 padded_vnet_hdr(struct virtnet_info *vi)
+{
+   u8 hdr_len = vi->hdr_len;
+
/*
 * hdr is in a separate sg buffer, and data sg buffer shares same page
 * with this header sg. This padding makes next sg 16 byte aligned
 * after the header.
 */
-   char padding[4];
-};
+   if (!vi->mergeable_rx_bufs)
+   hdr_len = __ALIGN_KERNEL_MASK(hdr_len, 15);
+
+   return hdr_len;
+}
 
 /* Converting between virtqueue no. and kernel tx/rx queue no.
  * 0:rx0 1:tx0 2:rx1 3:tx1 ... 2N:rxN 2N+1:txN 2N+2:cvq
@@ -289,10 +294,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
hdr = skb_vnet_hdr(skb);
 
hdr_len = vi->hdr_len;
-   if (vi->mergeable_rx_bufs)
-   hdr_padded_len = sizeof *hdr;
-   else
-   hdr_padded_len = sizeof(struct padded_vnet_hdr);
+   hdr_padded_len = padded_vnet_hdr(vi);
 
memcpy(hdr, p, hdr_len);
 
@@ -840,7 +842,7 @@ static int add_recvbuf_big(struct virtnet_info *vi, struct 
receive_queue *rq,
sg_set_buf(>sg[0], p, vi->hdr_len);
 
/* rq->sg[1] for data packet, from offset */
-   offset = sizeof(struct padded_vnet_hdr);
+   offset = padded_vnet_hdr(vi);
sg_set_buf(>sg[1], p + offset, PAGE_SIZE - offset);
 
/* chain first in list head */
@@ -1790,8 +1792,8 @@ static int virtnet_reset(struct virtnet_info *vi, int 
curr_qp, int xdp_qp)
 
 static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog)
 {
-   unsigned long int max_sz = PAGE_SIZE - sizeof(struct padded_vnet_hdr);
struct virtnet_info *vi = netdev_priv(dev);
+   unsigned long int max_sz = PAGE_SIZE - padded_vnet_hdr(vi);
struct bpf_prog *old_prog;
u16 xdp_qp = 0, curr_qp;
int i, err;
-- 
2.7.4

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

[PATCH RFC (resend) net-next 0/6] virtio-net: Add support for virtio-net header extensions

2017-04-15 Thread Vladislav Yasevich

Curreclty virtion net header is fixed size and adding things to it is rather
difficult to do.  This series attempt to add the infrastructure as well as some
extensions that try to resolve some deficiencies we currently have.

First, vnet header only has space for 16 flags.  This may not be enough
in the future.  The extensions will provide space for 32 possbile extension
flags and 32 possible extensions.   These flags will be carried in the
first pseudo extension header, the presense of which will be determined by
the flag in the virtio net header.

The extensions themselves will immidiately follow the extension header itself.
They will be added to the packet in the same order as they appear in the
extension flags.  No padding is placed between the extensions and any
extensions negotiated, but not used need by a given packet will convert to
trailing padding.

For example:
 | vnet mrg hdr | ext hdr | ext 1 | ext 2 | ext 5 | .. pad .. | packet data |

Extensions proposed in this series are:
 - IPv6 fragment id extension
   * Currently, the guest generated fragment id is discarded and the host
 generates an IPv6 fragment id if the packet has to be fragmented.  The
 code attempts to add time based perturbation to id generation to make
 it harder to guess the next fragment id to be used.  However, doing this
 on the host may result is less perturbation (due to differnet timing)
 and might make id guessing easier.  Ideally, the ids generated by the
 guest should be used.  One could also argue that we a "violating" the
 IPv6 protocol in the if the _strict_ interpretation of the spec.

 - VLAN header acceleration
   * Currently virtio doesn't not do vlan header acceleration and instead
 uses software tagging.  One of the first things that the host will do is
 strip the vlan header out.  When passing the packet the a guest the
 vlan header is re-inserted in to the packet.  We can skip all that work
 if we can pass the vlan data in accelearted format.  Then the host will
 not do any extra work.  However, so far, this yeilded a very small
 perf bump (only ~1%).  I am still looking into this.

 - UDP tunnel offload
   * Similar to vlan acceleration, with this extension we can pass additional
 data to host for support GSO with udp tunnel and possible other
 encapsulations.  This yeilds a significant perfromance improvement
(still testing remote checksum code).

An addition extension that is unfinished (due to still testing for any
side-effects) is checksum passthrough to support drivers that set
CHECKSUM_COMPLETE.  This would eliminate the need for guests to compute
the software checksum.

This series only takes care of virtio net.  I have addition patches for the
host side (vhost and tap/macvtap as well as qemu), but wanted to get feedback
on the general approach first.

Vladislav Yasevich (6):
  virtio-net: Remove the use the padded vnet_header structure
  virtio-net: make header length handling uniform
  virtio_net: Add basic skeleton for handling vnet header extensions.
  virtio-net: Add support for IPv6 fragment id vnet header extension.
  virtio-net: Add support for vlan acceleration vnet header extension.
  virtio-net: Add support for UDP tunnel offload and extension.

 drivers/net/virtio_net.c| 132 +---
 include/linux/skbuff.h  |   5 ++
 include/linux/virtio_net.h  |  91 ++-
 include/uapi/linux/virtio_net.h |  38 
 4 files changed, 242 insertions(+), 24 deletions(-)

-- 
2.7.4



Vladislav Yasevich (6):
  virtio-net: Remove the use the padded vnet_header structure
  virtio-net: make header length handling uniform
  virtio_net: Add basic skeleton for handling vnet header extensions.
  virtio-net: Add support for IPv6 fragment id vnet header extension.
  virtio-net: Add support for vlan acceleration vnet header extension.
  virtio: Add support for UDP tunnel offload and extension.

 drivers/net/virtio_net.c| 121 ++--
 include/linux/skbuff.h  |   5 ++
 include/linux/virtio_net.h  |  91 +-
 include/uapi/linux/virtio_net.h |  38 +
 4 files changed, 236 insertions(+), 19 deletions(-)

-- 
2.7.4

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Re: [PATCH RFC (resend) net-next 5/6] virtio-net: Add support for vlan acceleration vnet header extension.

[PATCH] ringtest: fix an assert statement

[PATCH RFC (resend) net-next 5/6] virtio-net: Add support for vlan acceleration vnet header extension.

[PATCH RFC (resend) net-next 4/6] virtio-net: Add support for IPv6 fragment id vnet header extension.

[PATCH RFC (resend) net-next 2/6] virtio-net: make header length handling uniform

[PATCH RFC (resend) net-next 3/6] virtio_net: Add basic skeleton for handling vnet header extensions.

[PATCH RFC (resend) net-next 1/6] virtio-net: Remove the use the padded vnet_header structure

[PATCH RFC (resend) net-next 0/6] virtio-net: Add support for virtio-net header extensions

8 matches

Site Navigation

Mail list logo

Footer information