Commit e1302542 authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by Alexei Starovoitov
Browse files

xdp: unlikely instrumentation for xdp map redirect 



Notice the compiler generated ASM code layout was suboptimal.  It
assumed map enqueue errors as the likely case, which is shouldn't.
It assumed that xdp_do_flush_map() was a likely case, due to maps
changing between packets, which should be very unlikely.

Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent a9c676bc

net/core/filter.c

+3 −3
Original line number Diff line number Diff line
@@ -3187,7 +3187,7 @@ static int __bpf_tx_xdp_map(struct net_device *dev_rx, void *fwd, 
		struct bpf_dtab_netdev *dst = fwd;



		err = dev_map_enqueue(dst, xdp, dev_rx);

		if (err)

		if (unlikely(err))

			return err;

		__dev_map_insert_ctx(map, index);

		break;
@@ -3196,7 +3196,7 @@ static int __bpf_tx_xdp_map(struct net_device *dev_rx, void *fwd, 
		struct bpf_cpu_map_entry *rcpu = fwd;



		err = cpu_map_enqueue(rcpu, xdp, dev_rx);

		if (err)

		if (unlikely(err))

			return err;

		__cpu_map_insert_ctx(map, index);

		break;
@@ -3284,7 +3284,7 @@ static int xdp_do_redirect_map(struct net_device *dev, struct xdp_buff *xdp, 
		err = -EINVAL;

		goto err;

	}

	if (ri->map_to_flush && ri->map_to_flush != map)

	if (ri->map_to_flush && unlikely(ri->map_to_flush != map))

		xdp_do_flush_map();



	err = __bpf_tx_xdp_map(dev, fwd, map, xdp, index);