netdev - [PATCH v2 net-next] net: ptp: oki-semi: fix build dependency

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 31 Mar 2014 11:02:21 -0700
From:	Alexei Starovoitov <ast@...mgrid.com>
To:	"David S. Miller" <davem@...emloft.net>
Cc:	Daniel Borkmann <dborkman@...hat.com>,
	Richard Cochran <richardcochran@...il.com>,
	netdev@...r.kernel.org
Subject: [PATCH v2 net-next] net: ptp: oki-semi: fix build dependency

fix kbuild test error:
ERROR: "ptp_classify_raw" [drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.ko] undefined!

move ptp_classify_raw() out of timestamping into ptp driver

Fixes: 164d8c666521 ("net: ptp: do not reimplement PTP/BPF classifier")
Cc: Paul Mackerras <paulus@...ba.org>
Cc: linux-ppp@...r.kernel.org
Cc: Daniel Borkmann <dborkman@...hat.com>
Cc: Richard Cochran <richardcochran@...il.com>
Signed-off-by: Alexei Starovoitov <ast@...mgrid.com>
---

Richard,
thank you for suggestion.
oki-semi depends on ptp, so it's cleaner to move ptp_classify_raw there,
instead of making it unconditionally available in net/core

Daniel,
timestamping has its own copy of PTP_FILTER, since timestamping
doesn't depend on ptp and I didn't want to add circular dependency,
since some of ptp pieces depend on timestamping, but not the others

 drivers/ptp/ptp_clock.c |   16 ++++++++++++++++
 net/core/timestamping.c |    8 +-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index e25d2bc898e5..8e4027489de6 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
+#include <linux/ptp_classify.h>
 
 #include "ptp_private.h"
 
@@ -328,10 +329,19 @@ int ptp_find_pin(struct ptp_clock *ptp,
 }
 EXPORT_SYMBOL(ptp_find_pin);
 
+static struct sk_filter *ptp_insns __read_mostly;
+
+unsigned int ptp_classify_raw(const struct sk_buff *skb)
+{
+	return SK_RUN_FILTER(ptp_insns, skb);
+}
+EXPORT_SYMBOL_GPL(ptp_classify_raw);
+
 /* module operations */
 
 static void __exit ptp_exit(void)
 {
+	sk_unattached_filter_destroy(ptp_insns);
 	class_destroy(ptp_class);
 	unregister_chrdev_region(ptp_devt, MINORMASK + 1);
 	ida_destroy(&ptp_clocks_map);
@@ -339,6 +349,10 @@ static void __exit ptp_exit(void)
 
 static int __init ptp_init(void)
 {
+	static struct sock_filter ptp_filter[] = { PTP_FILTER };
+	struct sock_fprog ptp_prog = {
+		.len = ARRAY_SIZE(ptp_filter), .filter = ptp_filter,
+	};
 	int err;
 
 	ptp_class = class_create(THIS_MODULE, "ptp");
@@ -353,6 +367,8 @@ static int __init ptp_init(void)
 		goto no_region;
 	}
 
+	BUG_ON(sk_unattached_filter_create(&ptp_insns, &ptp_prog));
+
 	ptp_class->dev_groups = ptp_groups;
 	pr_info("PTP clock support registered\n");
 	return 0;
diff --git a/net/core/timestamping.c b/net/core/timestamping.c
index 9ff26b3cc021..e43d56acf803 100644
--- a/net/core/timestamping.c
+++ b/net/core/timestamping.c
@@ -25,17 +25,11 @@
 
 static struct sk_filter *ptp_insns __read_mostly;
 
-unsigned int ptp_classify_raw(const struct sk_buff *skb)
-{
-	return SK_RUN_FILTER(ptp_insns, skb);
-}
-EXPORT_SYMBOL_GPL(ptp_classify_raw);
-
 static unsigned int classify(const struct sk_buff *skb)
 {
 	if (likely(skb->dev && skb->dev->phydev &&
 		   skb->dev->phydev->drv))
-		return ptp_classify_raw(skb);
+		return SK_RUN_FILTER(ptp_insns, skb);
 	else
 		return PTP_CLASS_NONE;
 }
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html