mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 08:28:13 +00:00
b014fab6fc
[ Upstream commit3b22523bca
] After commit710ad98c36
("veth: Do not record rx queue hint in veth_xmit"), veth no longer receives traffic on the same queue as it was sent on. This breaks the bpf_res test for the AF_XDP selftests as the socket tied to queue 1 will not receive traffic anymore. Modify the test so that two sockets are tied to queue id 0 using a shared umem instead. When killing the first socket enter the second socket into the xskmap so that traffic will flow to it. This will still test that the resources are not cleaned up until after the second socket dies, without having to rely on veth supporting rx_queue hints. Reported-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Acked-by: John Fastabend <john.fastabend@gmail.com> Link: https://lore.kernel.org/bpf/20220125082945.26179-1-magnus.karlsson@gmail.com Signed-off-by: Sasha Levin <sashal@kernel.org>
162 lines
3.4 KiB
C
162 lines
3.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0
|
|
* Copyright(c) 2020 Intel Corporation.
|
|
*/
|
|
|
|
#ifndef XDPXCEIVER_H_
|
|
#define XDPXCEIVER_H_
|
|
|
|
#ifndef SOL_XDP
|
|
#define SOL_XDP 283
|
|
#endif
|
|
|
|
#ifndef AF_XDP
|
|
#define AF_XDP 44
|
|
#endif
|
|
|
|
#ifndef PF_XDP
|
|
#define PF_XDP AF_XDP
|
|
#endif
|
|
|
|
#define MAX_INTERFACES 2
|
|
#define MAX_INTERFACE_NAME_CHARS 7
|
|
#define MAX_INTERFACES_NAMESPACE_CHARS 10
|
|
#define MAX_SOCKETS 2
|
|
#define MAX_TEST_NAME_SIZE 32
|
|
#define MAX_TEARDOWN_ITER 10
|
|
#define PKT_HDR_SIZE (sizeof(struct ethhdr) + sizeof(struct iphdr) + \
|
|
sizeof(struct udphdr))
|
|
#define MIN_PKT_SIZE 64
|
|
#define ETH_FCS_SIZE 4
|
|
#define PKT_SIZE (MIN_PKT_SIZE - ETH_FCS_SIZE)
|
|
#define IP_PKT_SIZE (PKT_SIZE - sizeof(struct ethhdr))
|
|
#define IP_PKT_VER 0x4
|
|
#define IP_PKT_TOS 0x9
|
|
#define UDP_PKT_SIZE (IP_PKT_SIZE - sizeof(struct iphdr))
|
|
#define UDP_PKT_DATA_SIZE (UDP_PKT_SIZE - sizeof(struct udphdr))
|
|
#define USLEEP_MAX 10000
|
|
#define SOCK_RECONF_CTR 10
|
|
#define BATCH_SIZE 64
|
|
#define POLL_TMOUT 1000
|
|
#define DEFAULT_PKT_CNT (4 * 1024)
|
|
#define DEFAULT_UMEM_BUFFERS (DEFAULT_PKT_CNT / 4)
|
|
#define UMEM_SIZE (DEFAULT_UMEM_BUFFERS * XSK_UMEM__DEFAULT_FRAME_SIZE)
|
|
#define RX_FULL_RXQSIZE 32
|
|
#define UMEM_HEADROOM_TEST_SIZE 128
|
|
#define XSK_UMEM__INVALID_FRAME_SIZE (XSK_UMEM__DEFAULT_FRAME_SIZE + 1)
|
|
|
|
#define print_verbose(x...) do { if (opt_verbose) ksft_print_msg(x); } while (0)
|
|
|
|
enum test_mode {
|
|
TEST_MODE_SKB,
|
|
TEST_MODE_DRV,
|
|
TEST_MODE_MAX
|
|
};
|
|
|
|
enum test_type {
|
|
TEST_TYPE_RUN_TO_COMPLETION,
|
|
TEST_TYPE_RUN_TO_COMPLETION_2K_FRAME,
|
|
TEST_TYPE_RUN_TO_COMPLETION_SINGLE_PKT,
|
|
TEST_TYPE_POLL,
|
|
TEST_TYPE_UNALIGNED,
|
|
TEST_TYPE_ALIGNED_INV_DESC,
|
|
TEST_TYPE_ALIGNED_INV_DESC_2K_FRAME,
|
|
TEST_TYPE_UNALIGNED_INV_DESC,
|
|
TEST_TYPE_HEADROOM,
|
|
TEST_TYPE_TEARDOWN,
|
|
TEST_TYPE_BIDI,
|
|
TEST_TYPE_STATS,
|
|
TEST_TYPE_BPF_RES,
|
|
TEST_TYPE_MAX
|
|
};
|
|
|
|
enum stat_test_type {
|
|
STAT_TEST_RX_DROPPED,
|
|
STAT_TEST_TX_INVALID,
|
|
STAT_TEST_RX_FULL,
|
|
STAT_TEST_RX_FILL_EMPTY,
|
|
STAT_TEST_TYPE_MAX
|
|
};
|
|
|
|
static bool opt_pkt_dump;
|
|
static int test_type;
|
|
|
|
static bool opt_verbose;
|
|
static int stat_test_type;
|
|
|
|
struct xsk_umem_info {
|
|
struct xsk_ring_prod fq;
|
|
struct xsk_ring_cons cq;
|
|
struct xsk_umem *umem;
|
|
u32 num_frames;
|
|
u32 frame_headroom;
|
|
void *buffer;
|
|
u32 frame_size;
|
|
bool unaligned_mode;
|
|
};
|
|
|
|
struct xsk_socket_info {
|
|
struct xsk_ring_cons rx;
|
|
struct xsk_ring_prod tx;
|
|
struct xsk_umem_info *umem;
|
|
struct xsk_socket *xsk;
|
|
u32 outstanding_tx;
|
|
u32 rxqsize;
|
|
};
|
|
|
|
struct pkt {
|
|
u64 addr;
|
|
u32 len;
|
|
u32 payload;
|
|
bool valid;
|
|
};
|
|
|
|
struct pkt_stream {
|
|
u32 nb_pkts;
|
|
u32 rx_pkt_nb;
|
|
struct pkt *pkts;
|
|
bool use_addr_for_fill;
|
|
};
|
|
|
|
typedef void *(*thread_func_t)(void *arg);
|
|
|
|
struct ifobject {
|
|
char ifname[MAX_INTERFACE_NAME_CHARS];
|
|
char nsname[MAX_INTERFACES_NAMESPACE_CHARS];
|
|
struct xsk_socket_info *xsk;
|
|
struct xsk_socket_info *xsk_arr;
|
|
struct xsk_umem_info *umem;
|
|
thread_func_t func_ptr;
|
|
struct pkt_stream *pkt_stream;
|
|
int ns_fd;
|
|
int xsk_map_fd;
|
|
u32 dst_ip;
|
|
u32 src_ip;
|
|
u32 xdp_flags;
|
|
u32 bind_flags;
|
|
u16 src_port;
|
|
u16 dst_port;
|
|
bool tx_on;
|
|
bool rx_on;
|
|
bool use_poll;
|
|
bool pacing_on;
|
|
u8 dst_mac[ETH_ALEN];
|
|
u8 src_mac[ETH_ALEN];
|
|
};
|
|
|
|
struct test_spec {
|
|
struct ifobject *ifobj_tx;
|
|
struct ifobject *ifobj_rx;
|
|
struct pkt_stream *pkt_stream_default;
|
|
u16 total_steps;
|
|
u16 current_step;
|
|
u16 nb_sockets;
|
|
char name[MAX_TEST_NAME_SIZE];
|
|
};
|
|
|
|
pthread_barrier_t barr;
|
|
pthread_mutex_t pacing_mutex = PTHREAD_MUTEX_INITIALIZER;
|
|
pthread_cond_t pacing_cond = PTHREAD_COND_INITIALIZER;
|
|
|
|
u32 pkts_in_flight;
|
|
|
|
#endif /* XDPXCEIVER_H */
|