Commit e4abfd88 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'dissect-ptp-l2-packet-header' 

Eran Ben Elisha says:

====================
Dissect PTP L2 packet header

This series adds support for dissecting PTP L2 packet
header (EtherType 0x88F7).

For packet header dissecting, skb->protocol is needed. Add protocol
parsing operation to vlan ops, to guarantee skb->protocol is set,
as EtherType 0x88F7 occasionally follows a vlan header.
====================

Link: https://lore.kernel.org/r/1610478433-7606-1-git-send-email-eranbe@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e3a76707 4f1cc51f

net/8021q/vlan_dev.c

+9 −0
Original line number Diff line number Diff line
@@ -510,9 +510,17 @@ static void vlan_dev_set_lockdep_class(struct net_device *dev) 
	netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, NULL);

}



static __be16 vlan_parse_protocol(const struct sk_buff *skb)

{

	struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);



	return __vlan_get_protocol(skb, veth->h_vlan_proto, NULL);

}



static const struct header_ops vlan_header_ops = {

	.create	 = vlan_dev_hard_header,

	.parse	 = eth_header_parse,

	.parse_protocol = vlan_parse_protocol,

};



static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev,
@@ -532,6 +540,7 @@ static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev 
static const struct header_ops vlan_passthru_header_ops = {

	.create	 = vlan_passthru_hard_header,

	.parse	 = eth_header_parse,

	.parse_protocol = vlan_parse_protocol,

};



static struct device_type vlan_type = {

net/core/flow_dissector.c

+16 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/if_ether.h>

#include <linux/mpls.h>

#include <linux/tcp.h>

#include <linux/ptp_classify.h>

#include <net/flow_dissector.h>

#include <scsi/fc/fc_fcoe.h>

#include <uapi/linux/batadv_packet.h>
@@ -1251,6 +1252,21 @@ bool __skb_flow_dissect(const struct net *net, 
						  &proto, &nhoff, hlen, flags);

		break;



	case htons(ETH_P_1588): {

		struct ptp_header *hdr, _hdr;



		hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data,

					   hlen, &_hdr);

		if (!hdr) {

			fdret = FLOW_DISSECT_RET_OUT_BAD;

			break;

		}



		nhoff += ntohs(hdr->message_length);

		fdret = FLOW_DISSECT_RET_OUT_GOOD;

		break;

	}



	default:

		fdret = FLOW_DISSECT_RET_OUT_BAD;

		break;