diff mbox

[dpdk-dev,v1] net/tap: use local eBPF definitions

Message ID 1516744449-16158-1-git-send-email-ophirmu@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Ophir Munk Jan. 23, 2018, 9:54 p.m. UTC 
  eBPF has a graceful approach: it must successfully compile on all Linux
distributions. If a specific kernel cannot support eBPF it will gracefully
refuse the eBPF netlink message sent to it.
The kernel header file linux/bpf.h (if present) on different Linux
distributions may not include all definitions required for TAP
compilation.
In order to guarantee a successful eBPF compilation everywhere all the
required definitions for TAP have been locally added instead of including
file <linux/bpf.h>

Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
---
 drivers/net/tap/Makefile  | 5 -----
 drivers/net/tap/tap_bpf.h | 9 +++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

Comments

Van Haaren, Harry Jan. 24, 2018, 11:05 a.m. UTC | #1 
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Ophir Munk
> Sent: Tuesday, January 23, 2018 9:54 PM
> To: dev@dpdk.org; Pascal Mazon <pascal.mazon@6wind.com>
> Cc: Thomas Monjalon <thomas@monjalon.net>; Olga Shern <olgas@mellanox.com>;
> Ophir Munk <ophirmu@mellanox.com>
> Subject: [dpdk-dev] [PATCH v1] net/tap: use local eBPF definitions
> 
> eBPF has a graceful approach: it must successfully compile on all Linux
> distributions. If a specific kernel cannot support eBPF it will gracefully
> refuse the eBPF netlink message sent to it.
> The kernel header file linux/bpf.h (if present) on different Linux
> distributions may not include all definitions required for TAP
> compilation.
> In order to guarantee a successful eBPF compilation everywhere all the
> required definitions for TAP have been locally added instead of including
> file <linux/bpf.h>
> 
> Signed-off-by: Ophir Munk <ophirmu@mellanox.com>

Tested on a Fedora 20 vm, uname -r = 3.15.6-200.fc20.x86_64

Confirmed before patch was failing, with patch build is fixed.

Tested-by: Harry van Haaren <harry.van.haaren@intel.com>
Thomas Monjalon Jan. 24, 2018, 6:03 p.m. UTC | #2 
24/01/2018 12:05, Van Haaren, Harry:
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Ophir Munk
> > Sent: Tuesday, January 23, 2018 9:54 PM
> > To: dev@dpdk.org; Pascal Mazon <pascal.mazon@6wind.com>
> > Cc: Thomas Monjalon <thomas@monjalon.net>; Olga Shern <olgas@mellanox.com>;
> > Ophir Munk <ophirmu@mellanox.com>
> > Subject: [dpdk-dev] [PATCH v1] net/tap: use local eBPF definitions
> > 
> > eBPF has a graceful approach: it must successfully compile on all Linux
> > distributions. If a specific kernel cannot support eBPF it will gracefully
> > refuse the eBPF netlink message sent to it.
> > The kernel header file linux/bpf.h (if present) on different Linux
> > distributions may not include all definitions required for TAP
> > compilation.
> > In order to guarantee a successful eBPF compilation everywhere all the
> > required definitions for TAP have been locally added instead of including
> > file <linux/bpf.h>
> > 
> > Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
> 
> Tested on a Fedora 20 vm, uname -r = 3.15.6-200.fc20.x86_64
> 
> Confirmed before patch was failing, with patch build is fixed.
> 
> Tested-by: Harry van Haaren <harry.van.haaren@intel.com>

Applied, thanks
diff mbox

Patch

diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile
index e23c3a2..315c6bd 100644
--- a/drivers/net/tap/Makefile
+++ b/drivers/net/tap/Makefile
@@ -82,11 +82,6 @@  tap_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
 		linux/tc_act/tc_bpf.h \
 		enum TCA_ACT_BPF_FD \
 		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_BPF_PROG_LOAD \
-		linux/bpf.h \
-		enum BPF_PROG_LOAD \
-		$(AUTOCONF_OUTPUT)
 
 # Create tap_autoconf.h or update it in case it differs from the new one.
 
diff --git a/drivers/net/tap/tap_bpf.h b/drivers/net/tap/tap_bpf.h
index 30eefb3..8d6f9a2 100644
--- a/drivers/net/tap/tap_bpf.h
+++ b/drivers/net/tap/tap_bpf.h
@@ -7,9 +7,11 @@ 
 
 #include <tap_autoconf.h>
 
-#ifdef HAVE_BPF_PROG_LOAD
-#include <linux/bpf.h>
-#else
+/* Do not #include <linux/bpf.h> since eBPF must compile on different
+ * distros which may include partial definitions for eBPF (while the
+ * kernel itself may support eBPF). Instead define here all that is needed
+ */
+
 /* BPF_MAP_UPDATE_ELEM command flags */
 #define	BPF_ANY	0 /* create a new element or update an existing */
 
@@ -83,7 +85,6 @@  union bpf_attr {
 		__u32		prog_flags;
 	};
 } __attribute__((aligned(8)));
-#endif
 
 #ifndef __NR_bpf
 # if defined(__i386__)