Re: udp failures traced to e858fae2b0b8

[Mike Rapoport <rppt@linux.vnet.ibm.com>]

On Mon, Jun 13, 2016 at 07:48:39AM -0600, David Ahern wrote:
> On 6/13/16 12:42 AM, Mike Rapoport wrote:
> >Hi David,
> >
> >On Sun, Jun 12, 2016 at 08:47:20PM -0600, David Ahern wrote:
> >>Mike:
> >>
> >>UDP tests in my vrf unit test suite are failing. git bisect points to:
> >
> >Are you testing host or guest kernel?
> 
> Problem is with guest. Guest is running net-next kernel.

Can you please check with the below patch?

> host is running 4.6.
> 

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 9af0a98..9f8be96 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -482,10 +482,6 @@ static void receive_buf(struct virtnet_info *vi, struct receive_queue *rq,
 	if (hdr->hdr.flags & VIRTIO_NET_HDR_F_DATA_VALID)
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-	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);
-
 	if (virtio_net_hdr_to_skb(skb, &hdr->hdr,
 				  virtio_is_little_endian(vi->vdev))) {
 		net_warn_ratelimited("%s: bad gso: type: %u, size: %u\n",
@@ -494,6 +490,10 @@ static void receive_buf(struct virtnet_info *vi, struct receive_queue *rq,
 		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);
+
 	napi_gro_receive(&rq->napi, skb);
 	return;