Skip to contentSkip to conversation

Dissect PTP L2 packet header

PATCH Superseded Eran Ben Elisha 2 participants 5 messages Jan 11, 2021 – Jan 12, 2021

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover Dissect PTP L2 packet header

Hi Jakub, Dave,

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.

Changelog:
v2, v3:
- Add more people to the CC list.

Eran Ben Elisha (2):
net: vlan: Add parse protocol header ops
net: flow_dissector: Parse PTP L2 packet header

 net/8021q/vlan_dev.c      |  9 +++++++++
 net/core/flow_dissector.c | 16 ++++++++++++++++
 2 files changed, 25 insertions(+)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/2 net: vlan: Add parse protocol header ops

Add parse protocol header ops for vlan device. Before this patch, vlan tagged packet transmitted by af_packet had skb->protocol unset. Some kernel methods (like __skb_flow_dissect()) rely on this missing information for its packet processing.

---
 net/8021q/vlan_dev.c | 9 +++++++++
 1 file changed, 9 insertions(+)
net/8021q/vlan_dev.c +9 -0
index ec8408d1638f..dc1a197792e6 100644
@@ -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 = {
Signature · 1 line
2.17.1
#2 lore raw

PATCH v3 2/2 net: flow_dissector: Parse PTP L2 packet header

In reply to Eran Ben Elisha

Add support for parsing PTP L2 packet header. Such packet consists of an L2 header (with ethertype of ETH_P_1588), PTP header, body and an optional suffix.

---
 net/core/flow_dissector.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
net/core/flow_dissector.c +16 -0
index 6f1adba6695f..fcaa223c7cdc 100644
@@ -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 || (hlen - nhoff) < sizeof(_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;
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH net-next v3 2/2] net: flow_dissector: Parse PTP L2 packet header

Quoted 23 lines · Eran Ben Elisha

Add support for parsing PTP L2 packet header. Such packet consists of an L2 header (with ethertype of ETH_P_1588), PTP header, body and an optional suffix.

---
 net/core/flow_dissector.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
net/core/flow_dissector.c +1 -0
index 6f1adba6695f..fcaa223c7cdc 100644
@@ -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>

net/core/flow_dissector.c bool __skb_flow_dissect(const struct net *net, · line 1260

Quoted 9 lines
net/core/flow_dissector.c +6 -0
@@ -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 || (hlen - nhoff) < sizeof(_hdr)) {

I'm not really familiar with the flow dissector, but why check (hlen - nhoff) here? None of the other cases do that. Doesn't skb_copy_bits() in __skb_header_pointer() already handle that?

Thanks,
Richard

Quoted 15 lines
net/core/flow_dissector.c +9 -0
+			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;
Signature · 1 line
2.17.1
#4 lore raw

Re: [PATCH net-next v3 2/2] net: flow_dissector: Parse PTP L2 packet header

Quoted 27 lines · Richard Cochran
Quoted 26 lines · Eran Ben Elisha

Add support for parsing PTP L2 packet header. Such packet consists of an L2 header (with ethertype of ETH_P_1588), PTP header, body and an optional suffix.

---
  net/core/flow_dissector.c | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
net/core/flow_dissector.c +1 -0
index 6f1adba6695f..fcaa223c7cdc 100644
@@ -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;
 
Quoted 10 lines

net/core/flow_dissector.c bool __skb_flow_dissect(const struct net *net, · line 1260

Quoted 6 lines
net/core/flow_dissector.c +6 -0
+	case htons(ETH_P_1588): {
+		struct ptp_header *hdr, _hdr;
+
+		hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data,
+					   hlen, &_hdr);
+		if (!hdr || (hlen - nhoff) < sizeof(_hdr)) {

I'm not really familiar with the flow dissector, but why check (hlen - nhoff) here? None of the other cases do that. Doesn't skb_copy_bits() in __skb_header_pointer() already handle that?

You are right. I saw similar len validation at ETH_P_FCOE case. But now I see it does not go through __skb_header_pointer() flow.

Thanks.

Quoted 20 lines

Thanks,
Richard

Quoted 15 lines
net/core/flow_dissector.c +9 -0
+			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;
Signature · 1 line
2.17.1