Commit 9d2f67e4 authored by Jianfeng Tan's avatar Jianfeng Tan Committed by David S. Miller
Browse files

net/packet: fix packet drop as of virtio gso 



When we use raw socket as the vhost backend, a packet from virito with
gso offloading information, cannot be sent out in later validaton at
xmit path, as we did not set correct skb->protocol which is further used
for looking up the gso function.

To fix this, we set this field according to virito hdr information.

Fixes: e858fae2 ("virtio_net: use common code for virtio_net_hdr and skb GSO conversion")
Signed-off-by: default avatarJianfeng Tan <jianfeng.tan@linux.alibaba.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca893194

include/linux/virtio_net.h

+18 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,24 @@ 
#include <linux/if_vlan.h>

#include <linux/if_vlan.h>

#include <uapi/linux/virtio_net.h>

#include <uapi/linux/virtio_net.h>





static inline int virtio_net_hdr_set_proto(struct sk_buff *skb,

					   const struct virtio_net_hdr *hdr)

{

	switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) {

	case VIRTIO_NET_HDR_GSO_TCPV4:

	case VIRTIO_NET_HDR_GSO_UDP:

		skb->protocol = cpu_to_be16(ETH_P_IP);

		break;

	case VIRTIO_NET_HDR_GSO_TCPV6:

		skb->protocol = cpu_to_be16(ETH_P_IPV6);

		break;

	default:

		return -EINVAL;

	}



	return 0;

}



static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,

static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,

					const struct virtio_net_hdr *hdr,

					const struct virtio_net_hdr *hdr,

					bool little_endian)

					bool little_endian)

net/packet/af_packet.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -2715,11 +2715,13 @@ tpacket_error: 
			}

			}

		}

		}





		if (po->has_vnet_hdr && virtio_net_hdr_to_skb(skb, vnet_hdr,

		if (po->has_vnet_hdr) {

							      vio_le())) {

			if (virtio_net_hdr_to_skb(skb, vnet_hdr, vio_le())) {

				tp_len = -EINVAL;

				tp_len = -EINVAL;

				goto tpacket_error;

				goto tpacket_error;

			}

			}

			virtio_net_hdr_set_proto(skb, vnet_hdr);

		}





		skb->destructor = tpacket_destruct_skb;

		skb->destructor = tpacket_destruct_skb;

		__packet_set_status(po, ph, TP_STATUS_SENDING);

		__packet_set_status(po, ph, TP_STATUS_SENDING);
@@ -2915,6 +2917,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) 
		if (err)

		if (err)

			goto out_free;

			goto out_free;

		len += sizeof(vnet_hdr);

		len += sizeof(vnet_hdr);

		virtio_net_hdr_set_proto(skb, &vnet_hdr);

	}

	}





	skb_probe_transport_header(skb, reserve);

	skb_probe_transport_header(skb, reserve);

CRA Git | Maintained and supported by SUSTech CRA and CCSE