[linux-yocto] [PATCH 1/2] net: ptp: use sk_unattached_filter_create() for BPF

[Darren Hart]

I accidentally included the original CC'd people, please do not reply to
this with them on Cc. Use this message to reply-all. Apologies. Git
sendmail screw up.

On 9/26/14, 10:07, "Darren Hart" <dvhart at linux.intel.com> wrote:

>From: Daniel Borkmann <dborkman at redhat.com>
>
>This patch migrates an open-coded sk_run_filter() implementation with
>proper use of the BPF API, that is, sk_unattached_filter_create(). This
>migration is needed, as we will be internally transforming the filter
>to a different representation, and therefore needs to be decoupled.
>
>It is okay to do so as skb_timestamping_init() is called during
>initialization of the network stack in core initcall via sock_init().
>This would effectively also allow for PTP filters to be jit compiled if
>bpf_jit_enable is set.
>
>For better readability, there are also some newlines introduced, also
>ptp_classify.h is only in kernel space.
>
>Joint work with Alexei Starovoitov.
>
>Signed-off-by: Daniel Borkmann <dborkman at redhat.com>
>Signed-off-by: Alexei Starovoitov <ast at plumgrid.com>
>Cc: Richard Cochran <richard.cochran at omicron.at>
>Cc: Jiri Benc <jbenc at redhat.com>
>Signed-off-by: David S. Miller <davem at davemloft.net>
>(cherry picked from commit e62d2df084e2849edffb206559725fa81bb569a8)
>---
> include/linux/ptp_classify.h |  4 ----
> net/core/timestamping.c      | 21 ++++++++++++++-------
> 2 files changed, 14 insertions(+), 11 deletions(-)
>
>diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h
>index 1dc420b..3decfa4 100644
>--- a/include/linux/ptp_classify.h
>+++ b/include/linux/ptp_classify.h
>@@ -27,11 +27,7 @@
> #include <linux/if_vlan.h>
> #include <linux/ip.h>
> #include <linux/filter.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 */
>diff --git a/net/core/timestamping.c b/net/core/timestamping.c
>index 661b5a4..e43d56a 100644
>--- a/net/core/timestamping.c
>+++ b/net/core/timestamping.c
>@@ -23,16 +23,13 @@
> #include <linux/skbuff.h>
> #include <linux/export.h>
> 
>-static struct sock_filter ptp_filter[] = {
>-	PTP_FILTER
>-};
>+static struct sk_filter *ptp_insns __read_mostly;
> 
> static unsigned int classify(const struct sk_buff *skb)
> {
>-	if (likely(skb->dev &&
>-		   skb->dev->phydev &&
>+	if (likely(skb->dev && skb->dev->phydev &&
> 		   skb->dev->phydev->drv))
>-		return sk_run_filter(skb, ptp_filter);
>+		return SK_RUN_FILTER(ptp_insns, skb);
> 	else
> 		return PTP_CLASS_NONE;
> }
>@@ -60,11 +57,13 @@ void skb_clone_tx_timestamp(struct sk_buff *skb)
> 		if (likely(phydev->drv->txtstamp)) {
> 			if (!atomic_inc_not_zero(&sk->sk_refcnt))
> 				return;
>+
> 			clone = skb_clone(skb, GFP_ATOMIC);
> 			if (!clone) {
> 				sock_put(sk);
> 				return;
> 			}
>+
> 			clone->sk = sk;
> 			phydev->drv->txtstamp(phydev, clone, type);
> 		}
>@@ -89,12 +88,15 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
> 	}
> 
> 	*skb_hwtstamps(skb) = *hwtstamps;
>+
> 	serr = SKB_EXT_ERR(skb);
> 	memset(serr, 0, sizeof(*serr));
> 	serr->ee.ee_errno = ENOMSG;
> 	serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
> 	skb->sk = NULL;
>+
> 	err = sock_queue_err_skb(sk, skb);
>+
> 	sock_put(sk);
> 	if (err)
> 		kfree_skb(skb);
>@@ -135,5 +137,10 @@ EXPORT_SYMBOL_GPL(skb_defer_rx_timestamp);
> 
> void __init skb_timestamping_init(void)
> {
>-	BUG_ON(sk_chk_filter(ptp_filter, ARRAY_SIZE(ptp_filter)));
>+	static struct sock_filter ptp_filter[] = { PTP_FILTER };
>+	struct sock_fprog ptp_prog = {
>+		.len = ARRAY_SIZE(ptp_filter), .filter = ptp_filter,
>+	};
>+
>+	BUG_ON(sk_unattached_filter_create(&ptp_insns, &ptp_prog));
> }
>-- 
>2.1.0
>
>-- 
>_______________________________________________
>linux-yocto mailing list
>linux-yocto at yoctoproject.org
>https://lists.yoctoproject.org/listinfo/linux-yocto
>


-- 
Darren Hart					Open Source Technology Center
darren.hart at intel.com				            Intel Corporation