Commit 8caf8a91 authored by David S. Miller's avatar David S. Miller
Browse files

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



Alexei Starovoitov says:

====================
pull-request: bpf 2019-10-12

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

The main changes are:

1) a bunch of small fixes. Nothing critical.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f0308fb0 106c35dd

net/xdp/xsk.c

+27 −15
Original line number Diff line number Diff line
@@ -305,9 +305,8 @@ out: 
}

EXPORT_SYMBOL(xsk_umem_consume_tx);



static int xsk_zc_xmit(struct sock *sk)

static int xsk_zc_xmit(struct xdp_sock *xs)

{

	struct xdp_sock *xs = xdp_sk(sk);

	struct net_device *dev = xs->dev;



	return dev->netdev_ops->ndo_xsk_wakeup(dev, xs->queue_id,
@@ -327,11 +326,10 @@ static void xsk_destruct_skb(struct sk_buff *skb) 
	sock_wfree(skb);

}



static int xsk_generic_xmit(struct sock *sk, struct msghdr *m,

			    size_t total_len)

static int xsk_generic_xmit(struct sock *sk)

{

	u32 max_batch = TX_BATCH_SIZE;

	struct xdp_sock *xs = xdp_sk(sk);

	u32 max_batch = TX_BATCH_SIZE;

	bool sent_frame = false;

	struct xdp_desc desc;

	struct sk_buff *skb;
@@ -394,6 +392,18 @@ out: 
	return err;

}



static int __xsk_sendmsg(struct sock *sk)

{

	struct xdp_sock *xs = xdp_sk(sk);



	if (unlikely(!(xs->dev->flags & IFF_UP)))

		return -ENETDOWN;

	if (unlikely(!xs->tx))

		return -ENOBUFS;



	return xs->zc ? xsk_zc_xmit(xs) : xsk_generic_xmit(sk);

}



static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)

{

	bool need_wait = !(m->msg_flags & MSG_DONTWAIT);
@@ -402,21 +412,18 @@ static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) 


	if (unlikely(!xsk_is_bound(xs)))

		return -ENXIO;

	if (unlikely(!(xs->dev->flags & IFF_UP)))

		return -ENETDOWN;

	if (unlikely(!xs->tx))

		return -ENOBUFS;

	if (need_wait)

	if (unlikely(need_wait))

		return -EOPNOTSUPP;



	return (xs->zc) ? xsk_zc_xmit(sk) : xsk_generic_xmit(sk, m, total_len);

	return __xsk_sendmsg(sk);

}



static unsigned int xsk_poll(struct file *file, struct socket *sock,

			     struct poll_table_struct *wait)

{

	unsigned int mask = datagram_poll(file, sock, wait);

	struct xdp_sock *xs = xdp_sk(sock->sk);

	struct sock *sk = sock->sk;

	struct xdp_sock *xs = xdp_sk(sk);

	struct net_device *dev;

	struct xdp_umem *umem;
@@ -426,9 +433,14 @@ static unsigned int xsk_poll(struct file *file, struct socket *sock, 
	dev = xs->dev;

	umem = xs->umem;



	if (umem->need_wakeup)

	if (umem->need_wakeup) {

		if (dev->netdev_ops->ndo_xsk_wakeup)

			dev->netdev_ops->ndo_xsk_wakeup(dev, xs->queue_id,

							umem->need_wakeup);

		else

			/* Poll needs to drive Tx also in copy mode */

			__xsk_sendmsg(sk);

	}



	if (xs->rx && !xskq_empty_desc(xs->rx))

		mask |= POLLIN | POLLRDNORM;

samples/bpf/asm_goto_workaround.h

+12 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
#ifndef __ASM_GOTO_WORKAROUND_H

#define __ASM_GOTO_WORKAROUND_H



/* this will bring in asm_volatile_goto macro definition

/*

 * This will bring in asm_volatile_goto and asm_inline macro definitions

 * if enabled by compiler and config options.

 */

#include <linux/types.h>
@@ -13,5 +14,15 @@ 
#define asm_volatile_goto(x...) asm volatile("invalid use of asm_volatile_goto")

#endif



/*

 * asm_inline is defined as asm __inline in "include/linux/compiler_types.h"

 * if supported by the kernel's CC (i.e CONFIG_CC_HAS_ASM_INLINE) which is not

 * supported by CLANG.

 */

#ifdef asm_inline

#undef asm_inline

#define asm_inline asm

#endif



#define volatile(x...) volatile("")

#endif

samples/bpf/task_fd_query_user.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <sys/resource.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <linux/perf_event.h>



#include "libbpf.h"

#include "bpf_load.h"

tools/bpf/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -12,7 +12,11 @@ INSTALL ?= install 
CFLAGS += -Wall -O2

CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/include/uapi -I$(srctree)/include



ifeq ($(srctree),)

# This will work when bpf is built in tools env. where srctree

# isn't set and when invoked from selftests build, where srctree

# is set to ".". building_out_of_srctree is undefined for in srctree

# builds

ifndef building_out_of_srctree

srctree := $(patsubst %/,%,$(dir $(CURDIR)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

endif

tools/lib/bpf/Makefile

+23 −10
Original line number Diff line number Diff line
@@ -8,7 +8,11 @@ LIBBPF_MAJOR_VERSION := $(firstword $(subst ., ,$(LIBBPF_VERSION))) 


MAKEFLAGS += --no-print-directory



ifeq ($(srctree),)

# This will work when bpf is built in tools env. where srctree

# isn't set and when invoked from selftests build, where srctree

# is a ".". building_out_of_srctree is undefined for in srctree

# builds

ifndef building_out_of_srctree

srctree := $(patsubst %/,%,$(dir $(CURDIR)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

srctree := $(patsubst %/,%,$(dir $(srctree)))
@@ -110,6 +114,9 @@ override CFLAGS += $(INCLUDES) 
override CFLAGS += -fvisibility=hidden

override CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64



# flags specific for shared library

SHLIB_FLAGS := -DSHARED



ifeq ($(VERBOSE),1)

  Q =

else
@@ -126,14 +133,17 @@ all: 
export srctree OUTPUT CC LD CFLAGS V

include $(srctree)/tools/build/Makefile.include



BPF_IN		:= $(OUTPUT)libbpf-in.o

SHARED_OBJDIR	:= $(OUTPUT)sharedobjs/

STATIC_OBJDIR	:= $(OUTPUT)staticobjs/

BPF_IN_SHARED	:= $(SHARED_OBJDIR)libbpf-in.o

BPF_IN_STATIC	:= $(STATIC_OBJDIR)libbpf-in.o

VERSION_SCRIPT	:= libbpf.map



LIB_TARGET	:= $(addprefix $(OUTPUT),$(LIB_TARGET))

LIB_FILE	:= $(addprefix $(OUTPUT),$(LIB_FILE))

PC_FILE		:= $(addprefix $(OUTPUT),$(PC_FILE))



GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN) | \

GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \

			   cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \

			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \

			   sort -u | wc -l)
@@ -155,7 +165,7 @@ all: fixdep 


all_cmd: $(CMD_TARGETS) check



$(BPF_IN): force elfdep bpfdep

$(BPF_IN_SHARED): force elfdep bpfdep

	@(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \

	(diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \

	echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true
@@ -171,17 +181,20 @@ $(BPF_IN): force elfdep bpfdep 
	@(test -f ../../include/uapi/linux/if_xdp.h -a -f ../../../include/uapi/linux/if_xdp.h && ( \

	(diff -B ../../include/uapi/linux/if_xdp.h ../../../include/uapi/linux/if_xdp.h >/dev/null) || \

	echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' differs from latest version at 'include/uapi/linux/if_xdp.h'" >&2 )) || true

	$(Q)$(MAKE) $(build)=libbpf

	$(Q)$(MAKE) $(build)=libbpf OUTPUT=$(SHARED_OBJDIR) CFLAGS="$(CFLAGS) $(SHLIB_FLAGS)"



$(BPF_IN_STATIC): force elfdep bpfdep

	$(Q)$(MAKE) $(build)=libbpf OUTPUT=$(STATIC_OBJDIR)



$(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION)



$(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN)

$(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN_SHARED)

	$(QUIET_LINK)$(CC) --shared -Wl,-soname,libbpf.so.$(LIBBPF_MAJOR_VERSION) \

				    -Wl,--version-script=$(VERSION_SCRIPT) $^ -lelf -o $@

	@ln -sf $(@F) $(OUTPUT)libbpf.so

	@ln -sf $(@F) $(OUTPUT)libbpf.so.$(LIBBPF_MAJOR_VERSION)



$(OUTPUT)libbpf.a: $(BPF_IN)

$(OUTPUT)libbpf.a: $(BPF_IN_STATIC)

	$(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^



$(OUTPUT)test_libbpf: test_libbpf.cpp $(OUTPUT)libbpf.a
@@ -197,7 +210,7 @@ check: check_abi 


check_abi: $(OUTPUT)libbpf.so

	@if [ "$(GLOBAL_SYM_COUNT)" != "$(VERSIONED_SYM_COUNT)" ]; then	 \

		echo "Warning: Num of global symbols in $(BPF_IN)"	 \

		echo "Warning: Num of global symbols in $(BPF_IN_SHARED)"	 \

		     "($(GLOBAL_SYM_COUNT)) does NOT match with num of"	 \

		     "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \

		     "Please make sure all LIBBPF_API symbols are"	 \
@@ -255,9 +268,9 @@ config-clean: 
	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null



clean:

	$(call QUIET_CLEAN, libbpf) $(RM) $(TARGETS) $(CXX_TEST_TARGET) \

	$(call QUIET_CLEAN, libbpf) $(RM) -rf $(TARGETS) $(CXX_TEST_TARGET) \

		*.o *~ *.a *.so *.so.$(LIBBPF_MAJOR_VERSION) .*.d .*.cmd \

		*.pc LIBBPF-CFLAGS

		*.pc LIBBPF-CFLAGS $(SHARED_OBJDIR) $(STATIC_OBJDIR)

	$(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf

CRA Git | Maintained and supported by SUSTech CRA and CCSE