1 files changed, 21 insertions, 82 deletions
diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h
index 1dc420ba213a..7dfed71d76a6 100644
--- a/include/linux/ptp_classify.h
+++ b/include/linux/ptp_classify.h
@@ -23,15 +23,8 @@
 #ifndef _PTP_CLASSIFY_H_
 #define _PTP_CLASSIFY_H_
-#include <linux/if_ether.h>
-#include <linux/if_vlan.h>
 #include <linux/ip.h>
-#include <linux/filter.h>
+#include <linux/skbuff.h>
-#ifdef __KERNEL__
-#include <linux/in.h>
-#else
-#include <netinet/in.h>
-#endif
 #define PTP_CLASS_NONE  0x00 /* not a PTP event message */
 #define PTP_CLASS_V1    0x01 /* protocol version 1 */
@@ -44,7 +37,7 @@
 #define PTP_CLASS_PMASK 0xf0 /* mask for the packet type field */
 #define PTP_CLASS_V1_IPV4 (PTP_CLASS_V1 | PTP_CLASS_IPV4)
-#define PTP_CLASS_V1_IPV6 (PTP_CLASS_V1 | PTP_CLASS_IPV6) /*probably DNE*/
+#define PTP_CLASS_V1_IPV6 (PTP_CLASS_V1 | PTP_CLASS_IPV6) /* probably DNE */
 #define PTP_CLASS_V2_IPV4 (PTP_CLASS_V2 | PTP_CLASS_IPV4)
 #define PTP_CLASS_V2_IPV6 (PTP_CLASS_V2 | PTP_CLASS_IPV6)
 #define PTP_CLASS_V2_L2   (PTP_CLASS_V2 | PTP_CLASS_L2)
@@ -53,88 +46,34 @@
 #define PTP_EV_PORT 319
 #define PTP_GEN_BIT 0x08 /* indicates general message, if set in message type */
-#define OFF_ETYPE       12
-#define OFF_IHL         14
-#define OFF_FRAG        20
-#define OFF_PROTO4      23
-#define OFF_NEXT        6
-#define OFF_UDP_DST     2
 #define OFF_PTP_SOURCE_UUID     22 /* PTPv1 only */
 #define OFF_PTP_SEQUENCE_ID     30
 #define OFF_PTP_CONTROL         32 /* PTPv1 only */
-#define IPV4_HLEN(data) (((struct iphdr *)(data + OFF_IHL))->ihl << 2)
+/* Below defines should actually be removed at some point in time. */
 #define IP6_HLEN        40
 #define UDP_HLEN        8
+#define OFF_IHL         14
-#define RELOFF_DST4     (ETH_HLEN + OFF_UDP_DST)
-#define OFF_DST6        (ETH_HLEN + IP6_HLEN + OFF_UDP_DST)
 #define OFF_PTP6        (ETH_HLEN + IP6_HLEN + UDP_HLEN)
+#define IPV4_HLEN(data) (((struct iphdr *)(data + OFF_IHL))->ihl << 2)
-#define OP_AND  (BPF_ALU | BPF_AND  | BPF_K)
+#if defined(CONFIG_NET_PTP_CLASSIFY)
-#define OP_JEQ  (BPF_JMP | BPF_JEQ  | BPF_K)
+/**
-#define OP_JSET (BPF_JMP | BPF_JSET | BPF_K)
+ * ptp_classify_raw - classify a PTP packet
-#define OP_LDB  (BPF_LD  | BPF_B    | BPF_ABS)
+ * @skb: buffer
-#define OP_LDH  (BPF_LD  | BPF_H    | BPF_ABS)
+ *
-#define OP_LDHI (BPF_LD  | BPF_H    | BPF_IND)
+ * Runs a minimal BPF dissector to classify a network packet to
-#define OP_LDX  (BPF_LDX | BPF_B    | BPF_MSH)
+ * determine the PTP class. In case the skb does not contain any
-#define OP_OR   (BPF_ALU | BPF_OR   | BPF_K)
+ * PTP protocol data, PTP_CLASS_NONE will be returned, otherwise
-#define OP_RETA (BPF_RET | BPF_A)
+ * PTP_CLASS_V1_IPV{4,6}, PTP_CLASS_V2_IPV{4,6} or
-#define OP_RETK (BPF_RET | BPF_K)
+ * PTP_CLASS_V2_{L2,VLAN}, depending on the packet content.
+ */
+unsigned int ptp_classify_raw(const struct sk_buff *skb);
-static inline int ptp_filter_init(struct sock_filter *f, int len)
+void __init ptp_classifier_init(void);
+#else
+static inline void ptp_classifier_init(void)
 {
-        if (OP_LDH == f[0].code)
-                return sk_chk_filter(f, len);
-        else
-                return 0;
 }
-#define PTP_FILTER \
-        {OP_LDH,        0,   0, OFF_ETYPE               }, /*              */ \
-        {OP_JEQ,        0,  12, ETH_P_IP                }, /* f goto L20   */ \
-        {OP_LDB,        0,   0, OFF_PROTO4              }, /*              */ \
-        {OP_JEQ,        0,   9, IPPROTO_UDP             }, /* f goto L10   */ \
-        {OP_LDH,        0,   0, OFF_FRAG                }, /*              */ \
-        {OP_JSET,       7,   0, 0x1fff                  }, /* t goto L11   */ \
-        {OP_LDX,        0,   0, OFF_IHL                 }, /*              */ \
-        {OP_LDHI,       0,   0, RELOFF_DST4             }, /*              */ \
-        {OP_JEQ,        0,   4, PTP_EV_PORT             }, /* f goto L12   */ \
-        {OP_LDHI,       0,   0, ETH_HLEN + UDP_HLEN     }, /*              */ \
-        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
-        {OP_OR,         0,   0, PTP_CLASS_IPV4          }, /*              */ \
-        {OP_RETA,       0,   0, 0                       }, /*              */ \
-/*L1x*/ {OP_RETK,       0,   0, PTP_CLASS_NONE          }, /*              */ \
-/*L20*/ {OP_JEQ,        0,   9, ETH_P_IPV6              }, /* f goto L40   */ \
-        {OP_LDB,        0,   0, ETH_HLEN + OFF_NEXT     }, /*              */ \
-        {OP_JEQ,        0,   6, IPPROTO_UDP             }, /* f goto L30   */ \
-        {OP_LDH,        0,   0, OFF_DST6                }, /*              */ \
-        {OP_JEQ,        0,   4, PTP_EV_PORT             }, /* f goto L31   */ \
-        {OP_LDH,        0,   0, OFF_PTP6                }, /*              */ \
-        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
-        {OP_OR,         0,   0, PTP_CLASS_IPV6          }, /*              */ \
-        {OP_RETA,       0,   0, 0                       }, /*              */ \
-/*L3x*/ {OP_RETK,       0,   0, PTP_CLASS_NONE          }, /*              */ \
-/*L40*/ {OP_JEQ,        0,   9, ETH_P_8021Q             }, /* f goto L50   */ \
-        {OP_LDH,        0,   0, OFF_ETYPE + 4           }, /*              */ \
-        {OP_JEQ,        0,  15, ETH_P_1588              }, /* f goto L60   */ \
-        {OP_LDB,        0,   0, ETH_HLEN + VLAN_HLEN    }, /*              */ \
-        {OP_AND,        0,   0, PTP_GEN_BIT             }, /*              */ \
-        {OP_JEQ,        0,  12, 0                       }, /* f goto L6x   */ \
-        {OP_LDH,        0,   0, ETH_HLEN + VLAN_HLEN    }, /*              */ \
-        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
-        {OP_OR,         0,   0, PTP_CLASS_VLAN          }, /*              */ \
-        {OP_RETA,       0,   0, 0                       }, /*              */ \
-/*L50*/ {OP_JEQ,        0,   7, ETH_P_1588              }, /* f goto L61   */ \
-        {OP_LDB,        0,   0, ETH_HLEN                }, /*              */ \
-        {OP_AND,        0,   0, PTP_GEN_BIT             }, /*              */ \
-        {OP_JEQ,        0,   4, 0                       }, /* f goto L6x   */ \
-        {OP_LDH,        0,   0, ETH_HLEN                }, /*              */ \
-        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
-        {OP_OR,         0,   0, PTP_CLASS_L2            }, /*              */ \
-        {OP_RETA,       0,   0, 0                       }, /*              */ \
-/*L6x*/ {OP_RETK,       0,   0, PTP_CLASS_NONE          },
 #endif
+#endif /* _PTP_CLASSIFY_H_ */

diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h index 1dc420ba213a..7dfed71d76a6 100644 --- a/include/linux/ptp_classify.h +++ b/include/linux/ptp_classify.h
@@ -23,15 +23,8 @@
23	#ifndef _PTP_CLASSIFY_H_	23	#ifndef _PTP_CLASSIFY_H_
24	#define _PTP_CLASSIFY_H_	24	#define _PTP_CLASSIFY_H_
25		25
26	#include <linux/if_ether.h>
27	#include <linux/if_vlan.h>
28	#include <linux/ip.h>	26	#include <linux/ip.h>
29	#include <linux/filter.h>	27	#include <linux/skbuff.h>
30	#ifdef __KERNEL__
31	#include <linux/in.h>
32	#else
33	#include <netinet/in.h>
34	#endif
35		28
36	#define PTP_CLASS_NONE 0x00 /* not a PTP event message */	29	#define PTP_CLASS_NONE 0x00 /* not a PTP event message */
37	#define PTP_CLASS_V1 0x01 /* protocol version 1 */	30	#define PTP_CLASS_V1 0x01 /* protocol version 1 */
@@ -44,7 +37,7 @@
44	#define PTP_CLASS_PMASK 0xf0 /* mask for the packet type field */	37	#define PTP_CLASS_PMASK 0xf0 /* mask for the packet type field */
45		38
46	#define PTP_CLASS_V1_IPV4 (PTP_CLASS_V1 \| PTP_CLASS_IPV4)	39	#define PTP_CLASS_V1_IPV4 (PTP_CLASS_V1 \| PTP_CLASS_IPV4)
47	#define PTP_CLASS_V1_IPV6 (PTP_CLASS_V1 \| PTP_CLASS_IPV6) /probably DNE/	40	#define PTP_CLASS_V1_IPV6 (PTP_CLASS_V1 \| PTP_CLASS_IPV6) /* probably DNE */
48	#define PTP_CLASS_V2_IPV4 (PTP_CLASS_V2 \| PTP_CLASS_IPV4)	41	#define PTP_CLASS_V2_IPV4 (PTP_CLASS_V2 \| PTP_CLASS_IPV4)
49	#define PTP_CLASS_V2_IPV6 (PTP_CLASS_V2 \| PTP_CLASS_IPV6)	42	#define PTP_CLASS_V2_IPV6 (PTP_CLASS_V2 \| PTP_CLASS_IPV6)
50	#define PTP_CLASS_V2_L2 (PTP_CLASS_V2 \| PTP_CLASS_L2)	43	#define PTP_CLASS_V2_L2 (PTP_CLASS_V2 \| PTP_CLASS_L2)
@@ -53,88 +46,34 @@
53	#define PTP_EV_PORT 319	46	#define PTP_EV_PORT 319
54	#define PTP_GEN_BIT 0x08 /* indicates general message, if set in message type */	47	#define PTP_GEN_BIT 0x08 /* indicates general message, if set in message type */
55		48
56	#define OFF_ETYPE 12
57	#define OFF_IHL 14
58	#define OFF_FRAG 20
59	#define OFF_PROTO4 23
60	#define OFF_NEXT 6
61	#define OFF_UDP_DST 2
62
63	#define OFF_PTP_SOURCE_UUID 22 /* PTPv1 only */	49	#define OFF_PTP_SOURCE_UUID 22 /* PTPv1 only */
64	#define OFF_PTP_SEQUENCE_ID 30	50	#define OFF_PTP_SEQUENCE_ID 30
65	#define OFF_PTP_CONTROL 32 /* PTPv1 only */	51	#define OFF_PTP_CONTROL 32 /* PTPv1 only */
66		52
67	#define IPV4_HLEN(data) (((struct iphdr *)(data + OFF_IHL))->ihl << 2)	53	/* Below defines should actually be removed at some point in time. */
68
69	#define IP6_HLEN 40	54	#define IP6_HLEN 40
70	#define UDP_HLEN 8	55	#define UDP_HLEN 8
71		56	#define OFF_IHL 14
72	#define RELOFF_DST4 (ETH_HLEN + OFF_UDP_DST)
73	#define OFF_DST6 (ETH_HLEN + IP6_HLEN + OFF_UDP_DST)
74	#define OFF_PTP6 (ETH_HLEN + IP6_HLEN + UDP_HLEN)	57	#define OFF_PTP6 (ETH_HLEN + IP6_HLEN + UDP_HLEN)
		58	#define IPV4_HLEN(data) (((struct iphdr *)(data + OFF_IHL))->ihl << 2)
75		59
76	#define OP_AND (BPF_ALU \| BPF_AND \| BPF_K)	60	#if defined(CONFIG_NET_PTP_CLASSIFY)
77	#define OP_JEQ (BPF_JMP \| BPF_JEQ \| BPF_K)	61	/**
78	#define OP_JSET (BPF_JMP \| BPF_JSET \| BPF_K)	62	* ptp_classify_raw - classify a PTP packet
79	#define OP_LDB (BPF_LD \| BPF_B \| BPF_ABS)	63	* @skb: buffer
80	#define OP_LDH (BPF_LD \| BPF_H \| BPF_ABS)	64	*
81	#define OP_LDHI (BPF_LD \| BPF_H \| BPF_IND)	65	* Runs a minimal BPF dissector to classify a network packet to
82	#define OP_LDX (BPF_LDX \| BPF_B \| BPF_MSH)	66	* determine the PTP class. In case the skb does not contain any
83	#define OP_OR (BPF_ALU \| BPF_OR \| BPF_K)	67	* PTP protocol data, PTP_CLASS_NONE will be returned, otherwise
84	#define OP_RETA (BPF_RET \| BPF_A)	68	* PTP_CLASS_V1_IPV{4,6}, PTP_CLASS_V2_IPV{4,6} or
85	#define OP_RETK (BPF_RET \| BPF_K)	69	* PTP_CLASS_V2_{L2,VLAN}, depending on the packet content.
		70	*/
		71	unsigned int ptp_classify_raw(const struct sk_buff *skb);
86		72
87	static inline int ptp_filter_init(struct sock_filter *f, int len)	73	void __init ptp_classifier_init(void);
		74	#else
		75	static inline void ptp_classifier_init(void)
88	{	76	{
89	if (OP_LDH == f[0].code)
90	return sk_chk_filter(f, len);
91	else
92	return 0;
93	}	77	}
94
95	#define PTP_FILTER \
96	{OP_LDH, 0, 0, OFF_ETYPE }, /* */ \
97	{OP_JEQ, 0, 12, ETH_P_IP }, /* f goto L20 */ \
98	{OP_LDB, 0, 0, OFF_PROTO4 }, /* */ \
99	{OP_JEQ, 0, 9, IPPROTO_UDP }, /* f goto L10 */ \
100	{OP_LDH, 0, 0, OFF_FRAG }, /* */ \
101	{OP_JSET, 7, 0, 0x1fff }, /* t goto L11 */ \
102	{OP_LDX, 0, 0, OFF_IHL }, /* */ \
103	{OP_LDHI, 0, 0, RELOFF_DST4 }, /* */ \
104	{OP_JEQ, 0, 4, PTP_EV_PORT }, /* f goto L12 */ \
105	{OP_LDHI, 0, 0, ETH_HLEN + UDP_HLEN }, /* */ \
106	{OP_AND, 0, 0, PTP_CLASS_VMASK }, /* */ \
107	{OP_OR, 0, 0, PTP_CLASS_IPV4 }, /* */ \
108	{OP_RETA, 0, 0, 0 }, /* */ \
109	/L1x/ {OP_RETK, 0, 0, PTP_CLASS_NONE }, /* */ \
110	/L20/ {OP_JEQ, 0, 9, ETH_P_IPV6 }, /* f goto L40 */ \
111	{OP_LDB, 0, 0, ETH_HLEN + OFF_NEXT }, /* */ \
112	{OP_JEQ, 0, 6, IPPROTO_UDP }, /* f goto L30 */ \
113	{OP_LDH, 0, 0, OFF_DST6 }, /* */ \
114	{OP_JEQ, 0, 4, PTP_EV_PORT }, /* f goto L31 */ \
115	{OP_LDH, 0, 0, OFF_PTP6 }, /* */ \
116	{OP_AND, 0, 0, PTP_CLASS_VMASK }, /* */ \
117	{OP_OR, 0, 0, PTP_CLASS_IPV6 }, /* */ \
118	{OP_RETA, 0, 0, 0 }, /* */ \
119	/L3x/ {OP_RETK, 0, 0, PTP_CLASS_NONE }, /* */ \
120	/L40/ {OP_JEQ, 0, 9, ETH_P_8021Q }, /* f goto L50 */ \
121	{OP_LDH, 0, 0, OFF_ETYPE + 4 }, /* */ \
122	{OP_JEQ, 0, 15, ETH_P_1588 }, /* f goto L60 */ \
123	{OP_LDB, 0, 0, ETH_HLEN + VLAN_HLEN }, /* */ \
124	{OP_AND, 0, 0, PTP_GEN_BIT }, /* */ \
125	{OP_JEQ, 0, 12, 0 }, /* f goto L6x */ \
126	{OP_LDH, 0, 0, ETH_HLEN + VLAN_HLEN }, /* */ \
127	{OP_AND, 0, 0, PTP_CLASS_VMASK }, /* */ \
128	{OP_OR, 0, 0, PTP_CLASS_VLAN }, /* */ \
129	{OP_RETA, 0, 0, 0 }, /* */ \
130	/L50/ {OP_JEQ, 0, 7, ETH_P_1588 }, /* f goto L61 */ \
131	{OP_LDB, 0, 0, ETH_HLEN }, /* */ \
132	{OP_AND, 0, 0, PTP_GEN_BIT }, /* */ \
133	{OP_JEQ, 0, 4, 0 }, /* f goto L6x */ \
134	{OP_LDH, 0, 0, ETH_HLEN }, /* */ \
135	{OP_AND, 0, 0, PTP_CLASS_VMASK }, /* */ \
136	{OP_OR, 0, 0, PTP_CLASS_L2 }, /* */ \
137	{OP_RETA, 0, 0, 0 }, /* */ \
138	/L6x/ {OP_RETK, 0, 0, PTP_CLASS_NONE },
139
140	#endif	78	#endif
		79	#endif /* _PTP_CLASSIFY_H_ */