[3/3,Yakkety,SRU] virtio-net: restore VIRTIO_HDR_F_DATA_VALID on receiving

Message ID 1492645307-30743-4-git-send-email-jay.vosburgh@canonical.com
State New
Headers show

Commit Message

Jay Vosburgh April 19, 2017, 11:41 p.m.
From: Jason Wang <jasowang@redhat.com>

BugLink: https://bugs.launchpad.net/bugs/1683947

Commit 501db511397f ("virtio: don't set VIRTIO_NET_HDR_F_DATA_VALID on
xmit") in fact disables VIRTIO_HDR_F_DATA_VALID on receiving path too,
fixing this by adding a hint (has_data_valid) and set it only on the
receiving path.

Cc: Rolf Neugebauer <rolf.neugebauer@docker.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(backported from 6391a4481ba0796805d6581e42f9f0418c099e34)
Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
---
 drivers/net/macvtap.c      | 2 +-
 drivers/net/tun.c          | 2 +-
 drivers/net/virtio_net.c   | 2 +-
 include/linux/virtio_net.h | 6 +++++-
 net/packet/af_packet.c     | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

Comments

Colin King April 20, 2017, 7:55 a.m. | #1
On 20/04/17 00:41, Jay Vosburgh wrote:
> From: Jason Wang <jasowang@redhat.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1683947
> 
> Commit 501db511397f ("virtio: don't set VIRTIO_NET_HDR_F_DATA_VALID on
> xmit") in fact disables VIRTIO_HDR_F_DATA_VALID on receiving path too,
> fixing this by adding a hint (has_data_valid) and set it only on the
> receiving path.
> 
> Cc: Rolf Neugebauer <rolf.neugebauer@docker.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> Acked-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (backported from 6391a4481ba0796805d6581e42f9f0418c099e34)
> Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
> ---
>  drivers/net/macvtap.c      | 2 +-
>  drivers/net/tun.c          | 2 +-
>  drivers/net/virtio_net.c   | 2 +-
>  include/linux/virtio_net.h | 6 +++++-
>  net/packet/af_packet.c     | 2 +-
>  5 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
> index 5da9861ad79c..72142a0140e9 100644
> --- a/drivers/net/macvtap.c
> +++ b/drivers/net/macvtap.c
> @@ -822,7 +822,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
>  			return -EINVAL;
>  
>  		if (virtio_net_hdr_from_skb(skb, &vnet_hdr,
> -					    macvtap_is_little_endian(q)))
> +					    macvtap_is_little_endian(q), true))
>  			BUG();
>  
>  		if (copy_to_iter(&vnet_hdr, sizeof(vnet_hdr), iter) !=
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index 57f9e0ffa6ff..69de9dde4e28 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -1381,7 +1381,7 @@ static ssize_t tun_put_user(struct tun_struct *tun,
>  			return -EINVAL;
>  
>  		if (virtio_net_hdr_from_skb(skb, &gso,
> -					    tun_is_little_endian(tun))) {
> +					    tun_is_little_endian(tun), true)) {
>  			struct skb_shared_info *sinfo = skb_shinfo(skb);
>  			pr_err("unexpected GSO type: "
>  			       "0x%x, gso_size %d, hdr_len %d\n",
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index d8072092e5f0..d540f0d714af 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -839,7 +839,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
>  		hdr = skb_vnet_hdr(skb);
>  
>  	if (virtio_net_hdr_from_skb(skb, &hdr->hdr,
> -				    virtio_is_little_endian(vi->vdev)))
> +				    virtio_is_little_endian(vi->vdev), false))
>  		BUG();
>  
>  	if (vi->mergeable_rx_bufs)
> diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
> index 40914bb396e7..f211c348e592 100644
> --- a/include/linux/virtio_net.h
> +++ b/include/linux/virtio_net.h
> @@ -56,7 +56,8 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
>  
>  static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb,
>  					  struct virtio_net_hdr *hdr,
> -					  bool little_endian)
> +					  bool little_endian,
> +					  bool has_data_valid)
>  {
>  	memset(hdr, 0, sizeof(*hdr));
>  
> @@ -91,6 +92,9 @@ static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb,
>  				skb_checksum_start_offset(skb));
>  		hdr->csum_offset = __cpu_to_virtio16(little_endian,
>  				skb->csum_offset);
> +	} else if (has_data_valid &&
> +		   skb->ip_summed == CHECKSUM_UNNECESSARY) {
> +		hdr->flags = VIRTIO_NET_HDR_F_DATA_VALID;
>  	} /* else everything is zero */
>  
>  	return 0;
> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
> index e518c29e547b..d9f28d320b40 100644
> --- a/net/packet/af_packet.c
> +++ b/net/packet/af_packet.c
> @@ -1972,7 +1972,7 @@ static int __packet_rcv_vnet(const struct sk_buff *skb,
>  {
>  	*vnet_hdr = (const struct virtio_net_hdr) { 0 };
>  
> -	if (virtio_net_hdr_from_skb(skb, vnet_hdr, vio_le()))
> +	if (virtio_net_hdr_from_skb(skb, vnet_hdr, vio_le(), true))
>  		BUG();
>  
>  	return 0;
> 

Backport looks good. With all the 3 patches the fix has a good set of
tests that give positive results, the fixes are upstream, so if the sha
of patch 2 can be fixed up, I'm OK with these.

Acked-by: Colin Ian King <colin.king@canonical.com>

Patch

diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 5da9861ad79c..72142a0140e9 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -822,7 +822,7 @@  static ssize_t macvtap_put_user(struct macvtap_queue *q,
 			return -EINVAL;
 
 		if (virtio_net_hdr_from_skb(skb, &vnet_hdr,
-					    macvtap_is_little_endian(q)))
+					    macvtap_is_little_endian(q), true))
 			BUG();
 
 		if (copy_to_iter(&vnet_hdr, sizeof(vnet_hdr), iter) !=
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 57f9e0ffa6ff..69de9dde4e28 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1381,7 +1381,7 @@  static ssize_t tun_put_user(struct tun_struct *tun,
 			return -EINVAL;
 
 		if (virtio_net_hdr_from_skb(skb, &gso,
-					    tun_is_little_endian(tun))) {
+					    tun_is_little_endian(tun), true)) {
 			struct skb_shared_info *sinfo = skb_shinfo(skb);
 			pr_err("unexpected GSO type: "
 			       "0x%x, gso_size %d, hdr_len %d\n",
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index d8072092e5f0..d540f0d714af 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -839,7 +839,7 @@  static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
 		hdr = skb_vnet_hdr(skb);
 
 	if (virtio_net_hdr_from_skb(skb, &hdr->hdr,
-				    virtio_is_little_endian(vi->vdev)))
+				    virtio_is_little_endian(vi->vdev), false))
 		BUG();
 
 	if (vi->mergeable_rx_bufs)
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 40914bb396e7..f211c348e592 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -56,7 +56,8 @@  static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
 
 static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb,
 					  struct virtio_net_hdr *hdr,
-					  bool little_endian)
+					  bool little_endian,
+					  bool has_data_valid)
 {
 	memset(hdr, 0, sizeof(*hdr));
 
@@ -91,6 +92,9 @@  static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb,
 				skb_checksum_start_offset(skb));
 		hdr->csum_offset = __cpu_to_virtio16(little_endian,
 				skb->csum_offset);
+	} else if (has_data_valid &&
+		   skb->ip_summed == CHECKSUM_UNNECESSARY) {
+		hdr->flags = VIRTIO_NET_HDR_F_DATA_VALID;
 	} /* else everything is zero */
 
 	return 0;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index e518c29e547b..d9f28d320b40 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1972,7 +1972,7 @@  static int __packet_rcv_vnet(const struct sk_buff *skb,
 {
 	*vnet_hdr = (const struct virtio_net_hdr) { 0 };
 
-	if (virtio_net_hdr_from_skb(skb, vnet_hdr, vio_le()))
+	if (virtio_net_hdr_from_skb(skb, vnet_hdr, vio_le(), true))
 		BUG();
 
 	return 0;