Commit 1b4ae19e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Daniel Borkmann says:

====================
pull-request: bpf 2023-03-23

We've added 8 non-merge commits during the last 13 day(s) which contain
a total of 21 files changed, 238 insertions(+), 161 deletions(-).

The main changes are:

1) Fix verification issues in some BPF programs due to their stack usage
   patterns, from Eduard Zingerman.

2) Fix to add missing overflow checks in xdp_umem_reg and return an error
   in such case, from Kal Conley.

3) Fix and undo poisoning of strlcpy in libbpf given it broke builds for
   libcs which provided the former like uClibc-ng, from Jesus Sanchez-Palencia.

4) Fix insufficient bpf_jit_limit default to avoid users running into hard
   to debug seccomp BPF errors, from Daniel Borkmann.

5) Fix driver return code when they don't support a bpf_xdp_metadata kfunc
   to make it unambiguous from other errors, from Jesper Dangaard Brouer.

6) Two BPF selftest fixes to address compilation errors from recent changes
   in kernel structures, from Alexei Starovoitov.

* tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  xdp: bpf_xdp_metadata use EOPNOTSUPP for no driver support
  bpf: Adjust insufficient default bpf_jit_limit
  xsk: Add missing overflow check in xdp_umem_reg
  selftests/bpf: Fix progs/test_deny_namespace.c issues.
  selftests/bpf: Fix progs/find_vma_fail1.c build error.
  libbpf: Revert poisoning of strlcpy
  selftests/bpf: Tests for uninitialized stack reads
  bpf: Allow reads from uninit stack
====================

Link: https://lore.kernel.org/r/20230323225221.6082-1-daniel@iogearbox.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2e63a2df 915efd8a

Documentation/networking/xdp-rx-metadata.rst

+5 −2
Original line number Diff line number Diff line
@@ -23,10 +23,13 @@ metadata is supported, this set will grow: 
An XDP program can use these kfuncs to read the metadata into stack

variables for its own consumption. Or, to pass the metadata on to other

consumers, an XDP program can store it into the metadata area carried

ahead of the packet.

ahead of the packet. Not all packets will necessary have the requested

metadata available in which case the driver returns ``-ENODATA``.



Not all kfuncs have to be implemented by the device driver; when not

implemented, the default ones that return ``-EOPNOTSUPP`` will be used.

implemented, the default ones that return ``-EOPNOTSUPP`` will be used

to indicate the device driver have not implemented this kfunc.





Within an XDP frame, the metadata layout (accessed via ``xdp_buff``) is

as follows::

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+2 −2
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ int mlx4_en_xdp_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp) 
	struct mlx4_en_xdp_buff *_ctx = (void *)ctx;



	if (unlikely(_ctx->ring->hwtstamp_rx_filter != HWTSTAMP_FILTER_ALL))

		return -EOPNOTSUPP;

		return -ENODATA;



	*timestamp = mlx4_en_get_hwtstamp(_ctx->mdev,

					  mlx4_en_get_cqe_ts(_ctx->cqe));
@@ -686,7 +686,7 @@ int mlx4_en_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash) 
	struct mlx4_en_xdp_buff *_ctx = (void *)ctx;



	if (unlikely(!(_ctx->dev->features & NETIF_F_RXHASH)))

		return -EOPNOTSUPP;

		return -ENODATA;



	*hash = be32_to_cpu(_ctx->cqe->immed_rss_invalid);

	return 0;

drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int mlx5e_xdp_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp) 
	const struct mlx5e_xdp_buff *_ctx = (void *)ctx;



	if (unlikely(!mlx5e_rx_hw_stamp(_ctx->rq->tstamp)))

		return -EOPNOTSUPP;

		return -ENODATA;



	*timestamp =  mlx5e_cqe_ts_to_ns(_ctx->rq->ptp_cyc2time,

					 _ctx->rq->clock, get_cqe_ts(_ctx->cqe));
@@ -174,7 +174,7 @@ static int mlx5e_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash) 
	const struct mlx5e_xdp_buff *_ctx = (void *)ctx;



	if (unlikely(!(_ctx->xdp.rxq->dev->features & NETIF_F_RXHASH)))

		return -EOPNOTSUPP;

		return -ENODATA;



	*hash = be32_to_cpu(_ctx->cqe->rss_hash_result);

	return 0;

drivers/net/veth.c

+2 −2
Original line number Diff line number Diff line
@@ -1642,7 +1642,7 @@ static int veth_xdp_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp) 
	struct veth_xdp_buff *_ctx = (void *)ctx;



	if (!_ctx->skb)

		return -EOPNOTSUPP;

		return -ENODATA;



	*timestamp = skb_hwtstamps(_ctx->skb)->hwtstamp;

	return 0;
@@ -1653,7 +1653,7 @@ static int veth_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash) 
	struct veth_xdp_buff *_ctx = (void *)ctx;



	if (!_ctx->skb)

		return -EOPNOTSUPP;

		return -ENODATA;



	*hash = skb_get_hash(_ctx->skb);

	return 0;

kernel/bpf/core.c

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ static int __init bpf_jit_charge_init(void) 
{

	/* Only used as heuristic here to derive limit. */

	bpf_jit_limit_max = bpf_jit_alloc_exec_limit();

	bpf_jit_limit = min_t(u64, round_up(bpf_jit_limit_max >> 2,

	bpf_jit_limit = min_t(u64, round_up(bpf_jit_limit_max >> 1,

					    PAGE_SIZE), LONG_MAX);

	return 0;

}