Commit 3430223d authored by David S. Miller's avatar David S. Miller
Browse files

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



Alexei Starovoitov says:

====================
pull-request: bpf-next 2020-05-15

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

We've added 37 non-merge commits during the last 1 day(s) which contain
a total of 67 files changed, 741 insertions(+), 252 deletions(-).

The main changes are:

1) bpf_xdp_adjust_tail() now allows to grow the tail as well, from Jesper.

2) bpftool can probe CONFIG_HZ, from Daniel.

3) CAP_BPF is introduced to isolate user processes that use BPF infra and
   to secure BPF networking services by dropping CAP_SYS_ADMIN requirement
   in certain cases, from Alexei.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0141792f ed24a7a8

drivers/media/rc/bpf-lirc.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ lirc_mode2_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
	case BPF_FUNC_get_prandom_u32:

		return &bpf_get_prandom_u32_proto;

	case BPF_FUNC_trace_printk:

		if (capable(CAP_SYS_ADMIN))

		if (perfmon_capable())

			return bpf_get_trace_printk_proto();

		/* fall through */

	default:

drivers/net/ethernet/amazon/ena/ena_netdev.c

+1 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,7 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, 
		  "%s qid %d\n", __func__, rx_ring->qid);

	res_budget = budget;

	xdp.rxq = &rx_ring->xdp_rxq;

	xdp.frame_sz = ENA_PAGE_SIZE;



	do {

		xdp_verdict = XDP_PASS;

drivers/net/ethernet/amazon/ena/ena_netdev.h

+3 −2
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ 
 */



#define ENA_XDP_MAX_MTU (ENA_PAGE_SIZE - ETH_HLEN - ETH_FCS_LEN -	\

				VLAN_HLEN - XDP_PACKET_HEADROOM)

			 VLAN_HLEN - XDP_PACKET_HEADROOM -		\

			 SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))



#define ENA_IS_XDP_INDEX(adapter, index) (((index) >= (adapter)->xdp_first_ring) && \

	((index) < (adapter)->xdp_first_ring + (adapter)->xdp_num_queues))

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons, 
	xdp_set_data_meta_invalid(&xdp);

	xdp.data_end = *data_ptr + *len;

	xdp.rxq = &rxr->xdp_rxq;

	xdp.frame_sz = PAGE_SIZE; /* BNXT_RX_PAGE_MODE(bp) when XDP enabled */

	orig_data = xdp.data;



	rcu_read_lock();

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, 
	xdp_set_data_meta_invalid(&xdp);

	xdp.data_end = xdp.data + len;

	xdp.rxq = &rq->xdp_rxq;

	xdp.frame_sz = RCV_FRAG_LEN + XDP_PACKET_HEADROOM;

	orig_data = xdp.data;



	rcu_read_lock();

CRA Git | Maintained and supported by SUSTech CRA and CCSE