Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Daniel Borkmann says:

====================
pull-request: bpf-next 2019-02-07

The following pull-request contains BPF updates for your *net-next* tree.

The main changes are:

1) Add a riscv64 JIT for BPF, from Björn.

2) Implement BTF deduplication algorithm for libbpf which takes BTF type
   information containing duplicate per-compilation unit information and
   reduces it to an equivalent set of BTF types with no duplication and
   without loss of information, from Andrii.

3) Offloaded and native BPF XDP programs can coexist today, enable also
   offloaded and generic ones as well, from Jakub.

4) Expose various BTF related helper functions in libbpf as API which
   are in particular helpful for JITed programs, from Yonghong.

5) Fix the recently added JMP32 code emission in s390x JIT, from Heiko.

6) Fix BPF kselftests' tcp_{server,client}.py to be able to run inside
   a network namespace, also add a fix for libbpf to get libbpf_print()
   working, from Stanislav.

7) Fixes for bpftool documentation, from Prashant.

8) Type cleanup in BPF kselftests' test_maps.c to silence a gcc8 warning,
   from Breno.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 5 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 8c6d5cf8a308..ecbe419e05ab 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -8033,11 +8033,13 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
         enum bpf_netdev_command query;
         struct bpf_prog *prog = NULL;
         bpf_op_t bpf_op, bpf_chk;
+        bool offload;
         int err;
 
         ASSERT_RTNL();
 
-        query = flags & XDP_FLAGS_HW_MODE ? XDP_QUERY_PROG_HW : XDP_QUERY_PROG;
+        offload = flags & XDP_FLAGS_HW_MODE;
+        query = offload ? XDP_QUERY_PROG_HW : XDP_QUERY_PROG;
 
         bpf_op = bpf_chk = ops->ndo_bpf;
         if (!bpf_op && (flags & (XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE))) {
@@ -8050,8 +8052,7 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
                 bpf_chk = generic_xdp_install;
 
         if (fd >= 0) {
-                if (__dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG) ||
-                    __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG_HW)) {
+                if (!offload && __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG)) {
                         NL_SET_ERR_MSG(extack, "native and generic XDP can't be active at the same time");
                         return -EEXIST;
                 }
@@ -8066,8 +8067,7 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
                 if (IS_ERR(prog))
                         return PTR_ERR(prog);
 
-                if (!(flags & XDP_FLAGS_HW_MODE) &&
-                    bpf_prog_is_dev_bound(prog->aux)) {
+                if (!offload && bpf_prog_is_dev_bound(prog->aux)) {
                         NL_SET_ERR_MSG(extack, "using device-bound program without HW_MODE flag is not supported");
                         bpf_prog_put(prog);
                         return -EINVAL;