* [PATCH net-next 0/2] Dissect PTP L2 packet header
@ 2021-01-07 12:38 Eran Ben Elisha
2021-01-07 12:38 ` [PATCH net-next 1/2] net: vlan: Add parse protocol header ops Eran Ben Elisha
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Eran Ben Elisha @ 2021-01-07 12:38 UTC (permalink / raw)
To: netdev, David S. Miller, Jakub Kicinski; +Cc: Tariq Toukan, Eran Ben Elisha
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.
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(+)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 1/2] net: vlan: Add parse protocol header ops
2021-01-07 12:38 [PATCH net-next 0/2] Dissect PTP L2 packet header Eran Ben Elisha
@ 2021-01-07 12:38 ` Eran Ben Elisha
2021-01-07 12:39 ` [PATCH net-next 2/2] net: flow_dissector: Parse PTP L2 packet header Eran Ben Elisha
2021-01-07 19:33 ` [PATCH net-next 0/2] Dissect " Jakub Kicinski
2 siblings, 0 replies; 4+ messages in thread
From: Eran Ben Elisha @ 2021-01-07 12:38 UTC (permalink / raw)
To: netdev, David S. Miller, Jakub Kicinski; +Cc: Tariq Toukan, Eran Ben Elisha
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.
Signed-off-by: Eran Ben Elisha <eranbe@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
---
net/8021q/vlan_dev.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index ec8408d1638f..dc1a197792e6 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -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 = {
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] net: flow_dissector: Parse PTP L2 packet header
2021-01-07 12:38 [PATCH net-next 0/2] Dissect PTP L2 packet header Eran Ben Elisha
2021-01-07 12:38 ` [PATCH net-next 1/2] net: vlan: Add parse protocol header ops Eran Ben Elisha
@ 2021-01-07 12:39 ` Eran Ben Elisha
2021-01-07 19:33 ` [PATCH net-next 0/2] Dissect " Jakub Kicinski
2 siblings, 0 replies; 4+ messages in thread
From: Eran Ben Elisha @ 2021-01-07 12:39 UTC (permalink / raw)
To: netdev, David S. Miller, Jakub Kicinski; +Cc: Tariq Toukan, 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.
Signed-off-by: Eran Ben Elisha <eranbe@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
---
net/core/flow_dissector.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 6f1adba6695f..fcaa223c7cdc 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -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;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 0/2] Dissect PTP L2 packet header
2021-01-07 12:38 [PATCH net-next 0/2] Dissect PTP L2 packet header Eran Ben Elisha
2021-01-07 12:38 ` [PATCH net-next 1/2] net: vlan: Add parse protocol header ops Eran Ben Elisha
2021-01-07 12:39 ` [PATCH net-next 2/2] net: flow_dissector: Parse PTP L2 packet header Eran Ben Elisha
@ 2021-01-07 19:33 ` Jakub Kicinski
2 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2021-01-07 19:33 UTC (permalink / raw)
To: Eran Ben Elisha; +Cc: netdev, David S. Miller, Tariq Toukan
On Thu, 7 Jan 2021 14:38:58 +0200 Eran Ben Elisha wrote:
> 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.
Please make an effort to add people who can give you reviews on CC
and repost.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-07 19:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-07 12:38 [PATCH net-next 0/2] Dissect PTP L2 packet header Eran Ben Elisha
2021-01-07 12:38 ` [PATCH net-next 1/2] net: vlan: Add parse protocol header ops Eran Ben Elisha
2021-01-07 12:39 ` [PATCH net-next 2/2] net: flow_dissector: Parse PTP L2 packet header Eran Ben Elisha
2021-01-07 19:33 ` [PATCH net-next 0/2] Dissect " Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.