mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
selftests/bpf: cover AF_XDP multi-buffer TX software checksum
Extend test_xdp_metadata to send the same UDP packet using every descriptor count from 1 through MAX_TX_DESCS (MAX_SKB_FRAGS + 1), and to run the existing metadata and checksum verification for each case. Build the packet once and write it into the TX descriptors in a loop instead of using a flat two-descriptor layout. Keep the first descriptor large enough to cover the checksum offset; the remaining payload is split across the continuation descriptors, with the last descriptor taking the remaining length. Reuse the existing AF_XDP setup, packet generation, completion, and receive helpers in xdp_metadata.c instead of adding a separate test harness. Reviewed-by: Maciej Fijalkowski <[email protected]> Acked-by: Stanislav Fomichev <[email protected]> Signed-off-by: Rongzheng Wang <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
This commit is contained in:
committed by
Paolo Abeni
parent
f2eddafbfc
commit
c112921763
@@ -18,12 +18,15 @@
|
||||
#define TX_NAME "veTX"
|
||||
#define RX_NAME "veRX"
|
||||
|
||||
#define UDP_PAYLOAD_BYTES 4
|
||||
#define UDP_PAYLOAD_BYTES 32
|
||||
|
||||
#define MAX_SKB_FRAGS 17 /* minimum CONFIG_MAX_SKB_FRAGS */
|
||||
#define MAX_TX_DESCS (MAX_SKB_FRAGS + 1)
|
||||
|
||||
#define UDP_SOURCE_PORT 1234
|
||||
#define AF_XDP_CONSUMER_PORT 8080
|
||||
|
||||
#define UMEM_NUM 16
|
||||
#define UMEM_NUM 64
|
||||
#define UMEM_FRAME_SIZE XSK_UMEM__DEFAULT_FRAME_SIZE
|
||||
#define UMEM_SIZE (UMEM_FRAME_SIZE * UMEM_NUM)
|
||||
#define XDP_FLAGS XDP_FLAGS_DRV_MODE
|
||||
@@ -56,13 +59,13 @@ struct xsk {
|
||||
struct xsk_socket *socket;
|
||||
};
|
||||
|
||||
static int open_xsk(int ifindex, struct xsk *xsk)
|
||||
static int open_xsk(int ifindex, struct xsk *xsk, __u32 bind_flags)
|
||||
{
|
||||
int mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE;
|
||||
const struct xsk_socket_config socket_config = {
|
||||
.rx_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,
|
||||
.tx_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,
|
||||
.bind_flags = XDP_COPY,
|
||||
.bind_flags = bind_flags,
|
||||
};
|
||||
const struct xsk_umem_config umem_config = {
|
||||
.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,
|
||||
@@ -133,31 +136,35 @@ static void close_xsk(struct xsk *xsk)
|
||||
munmap(xsk->umem_area, UMEM_SIZE);
|
||||
}
|
||||
|
||||
static int generate_packet(struct xsk *xsk, __u16 dst_port)
|
||||
static int generate_packet(struct xsk *xsk, __u16 dst_port, u32 num)
|
||||
{
|
||||
struct xsk_tx_metadata *meta;
|
||||
struct xdp_desc *tx_desc;
|
||||
struct udphdr *udph;
|
||||
struct ethhdr *eth;
|
||||
struct iphdr *iph;
|
||||
u16 first_len;
|
||||
u16 pkt_len;
|
||||
u8 pkt[256];
|
||||
u32 offset;
|
||||
void *data;
|
||||
__u32 idx;
|
||||
u32 addr;
|
||||
int ret;
|
||||
u32 i;
|
||||
|
||||
ret = xsk_ring_prod__reserve(&xsk->tx, 1, &idx);
|
||||
if (!ASSERT_EQ(ret, 1, "xsk_ring_prod__reserve"))
|
||||
pkt_len = sizeof(*eth) + sizeof(*iph) + sizeof(*udph) + UDP_PAYLOAD_BYTES;
|
||||
first_len = sizeof(*eth) + sizeof(*iph) + sizeof(*udph);
|
||||
if (!num || num > MAX_TX_DESCS ||
|
||||
(num > 1 && pkt_len - first_len < num - 1))
|
||||
return -1;
|
||||
|
||||
tx_desc = xsk_ring_prod__tx_desc(&xsk->tx, idx);
|
||||
tx_desc->addr = idx % (UMEM_NUM / 2) * UMEM_FRAME_SIZE + sizeof(struct xsk_tx_metadata);
|
||||
printf("%p: tx_desc[%u]->addr=%llx\n", xsk, idx, tx_desc->addr);
|
||||
data = xsk_umem__get_data(xsk->umem_area, tx_desc->addr);
|
||||
ret = xsk_ring_prod__reserve(&xsk->tx, num, &idx);
|
||||
if (!ASSERT_EQ(ret, num, "xsk_ring_prod__reserve"))
|
||||
return -1;
|
||||
|
||||
meta = data - sizeof(struct xsk_tx_metadata);
|
||||
memset(meta, 0, sizeof(*meta));
|
||||
meta->flags = XDP_TXMD_FLAGS_TIMESTAMP;
|
||||
|
||||
eth = data;
|
||||
memset(pkt, 0, sizeof(pkt));
|
||||
eth = (void *)pkt;
|
||||
iph = (void *)(eth + 1);
|
||||
udph = (void *)(iph + 1);
|
||||
|
||||
@@ -180,18 +187,43 @@ static int generate_packet(struct xsk *xsk, __u16 dst_port)
|
||||
udph->source = htons(UDP_SOURCE_PORT);
|
||||
udph->dest = htons(dst_port);
|
||||
udph->len = htons(sizeof(*udph) + UDP_PAYLOAD_BYTES);
|
||||
memset(udph + 1, 0xAA, UDP_PAYLOAD_BYTES);
|
||||
udph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
|
||||
ntohs(udph->len), IPPROTO_UDP, 0);
|
||||
|
||||
memset(udph + 1, 0xAA, UDP_PAYLOAD_BYTES);
|
||||
for (i = 0, offset = 0; i < num; i++) {
|
||||
u32 len;
|
||||
|
||||
meta->flags |= XDP_TXMD_FLAGS_CHECKSUM;
|
||||
meta->request.csum_start = sizeof(*eth) + sizeof(*iph);
|
||||
meta->request.csum_offset = offsetof(struct udphdr, check);
|
||||
if (num == 1)
|
||||
len = pkt_len;
|
||||
else if (!i)
|
||||
len = first_len;
|
||||
else if (i == num - 1)
|
||||
len = pkt_len - offset;
|
||||
else
|
||||
len = (pkt_len - first_len) / (num - 1);
|
||||
|
||||
tx_desc->len = sizeof(*eth) + sizeof(*iph) + sizeof(*udph) + UDP_PAYLOAD_BYTES;
|
||||
tx_desc->options |= XDP_TX_METADATA;
|
||||
xsk_ring_prod__submit(&xsk->tx, 1);
|
||||
addr = (idx + i) % (UMEM_NUM / 2) * UMEM_FRAME_SIZE;
|
||||
tx_desc = xsk_ring_prod__tx_desc(&xsk->tx, idx + i);
|
||||
tx_desc->addr = addr + sizeof(*meta);
|
||||
tx_desc->len = len;
|
||||
tx_desc->options = i ? 0 : XDP_TX_METADATA;
|
||||
if (i + 1 < num)
|
||||
tx_desc->options |= XDP_PKT_CONTD;
|
||||
printf("%p: tx_desc[%u]->addr=%llx\n", xsk, idx + i, tx_desc->addr);
|
||||
data = xsk_umem__get_data(xsk->umem_area, tx_desc->addr);
|
||||
if (!i) {
|
||||
meta = data - sizeof(*meta);
|
||||
memset(meta, 0, sizeof(*meta));
|
||||
meta->flags = XDP_TXMD_FLAGS_TIMESTAMP | XDP_TXMD_FLAGS_CHECKSUM;
|
||||
meta->request.csum_start = sizeof(*eth) + sizeof(*iph);
|
||||
meta->request.csum_offset = offsetof(struct udphdr, check);
|
||||
}
|
||||
memcpy(data, pkt + offset, len);
|
||||
offset += len;
|
||||
}
|
||||
|
||||
xsk_ring_prod__submit(&xsk->tx, num);
|
||||
|
||||
ret = sendto(xsk_socket__fd(xsk->socket), NULL, 0, MSG_DONTWAIT, NULL, 0);
|
||||
if (!ASSERT_GE(ret, 0, "sendto"))
|
||||
@@ -224,24 +256,27 @@ static int generate_packet_inet(void)
|
||||
return err;
|
||||
}
|
||||
|
||||
static void complete_tx(struct xsk *xsk)
|
||||
static void complete_tx(struct xsk *xsk, u32 num)
|
||||
{
|
||||
struct xsk_tx_metadata *meta;
|
||||
__u64 addr;
|
||||
void *data;
|
||||
__u32 idx;
|
||||
__u32 i;
|
||||
|
||||
if (ASSERT_EQ(xsk_ring_cons__peek(&xsk->comp, 1, &idx), 1, "xsk_ring_cons__peek")) {
|
||||
addr = *xsk_ring_cons__comp_addr(&xsk->comp, idx);
|
||||
if (ASSERT_EQ(xsk_ring_cons__peek(&xsk->comp, num, &idx), num,
|
||||
"xsk_ring_cons__peek")) {
|
||||
for (i = 0; i < num; i++) {
|
||||
addr = *xsk_ring_cons__comp_addr(&xsk->comp, idx + i);
|
||||
printf("%p: complete tx idx=%u addr=%llx\n", xsk, idx + i, addr);
|
||||
|
||||
printf("%p: complete tx idx=%u addr=%llx\n", xsk, idx, addr);
|
||||
|
||||
data = xsk_umem__get_data(xsk->umem_area, addr);
|
||||
meta = data - sizeof(struct xsk_tx_metadata);
|
||||
|
||||
ASSERT_NEQ(meta->completion.tx_timestamp, 0, "tx_timestamp");
|
||||
|
||||
xsk_ring_cons__release(&xsk->comp, 1);
|
||||
if (i == 0) {
|
||||
data = xsk_umem__get_data(xsk->umem_area, addr);
|
||||
meta = data - sizeof(*meta);
|
||||
ASSERT_NEQ(meta->completion.tx_timestamp, 0, "tx_timestamp");
|
||||
}
|
||||
}
|
||||
xsk_ring_cons__release(&xsk->comp, num);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -325,7 +360,7 @@ static int verify_xsk_metadata(struct xsk *xsk, bool sent_from_af_xdp)
|
||||
ASSERT_EQ(meta->rx_hash_type, 0, "rx_hash_type");
|
||||
|
||||
/* checksum offload */
|
||||
ASSERT_EQ(udph->check, htons(0x721c), "csum");
|
||||
ASSERT_EQ(udph->check, htons(0x1c8f), "csum");
|
||||
|
||||
done:
|
||||
xsk_ring_cons__release(&xsk->rx, 1);
|
||||
@@ -361,6 +396,7 @@ void test_xdp_metadata(void)
|
||||
int retries = 10;
|
||||
int rx_ifindex;
|
||||
int tx_ifindex;
|
||||
unsigned int i;
|
||||
int sock_fd;
|
||||
int ret;
|
||||
|
||||
@@ -398,7 +434,7 @@ void test_xdp_metadata(void)
|
||||
|
||||
/* Setup separate AF_XDP for RX interface. */
|
||||
|
||||
ret = open_xsk(rx_ifindex, &rx_xsk);
|
||||
ret = open_xsk(rx_ifindex, &rx_xsk, XDP_COPY);
|
||||
if (!ASSERT_OK(ret, "open_xsk(RX_NAME)"))
|
||||
goto out;
|
||||
|
||||
@@ -462,27 +498,28 @@ void test_xdp_metadata(void)
|
||||
|
||||
/* Setup separate AF_XDP for TX interface nad send packet to the RX socket. */
|
||||
tx_ifindex = if_nametoindex(TX_NAME);
|
||||
ret = open_xsk(tx_ifindex, &tx_xsk);
|
||||
ret = open_xsk(tx_ifindex, &tx_xsk, XDP_COPY | XDP_USE_SG);
|
||||
if (!ASSERT_OK(ret, "open_xsk(TX_NAME)"))
|
||||
goto out;
|
||||
|
||||
if (!ASSERT_GE(generate_packet(&tx_xsk, AF_XDP_CONSUMER_PORT), 0,
|
||||
"generate AF_XDP_CONSUMER_PORT"))
|
||||
goto out;
|
||||
for (i = 1; i <= MAX_TX_DESCS; i++) {
|
||||
if (!ASSERT_GE(generate_packet(&tx_xsk, AF_XDP_CONSUMER_PORT, i), 0,
|
||||
"generate AF_XDP packet"))
|
||||
goto out;
|
||||
|
||||
switch_ns_to_rx(&tok);
|
||||
if (!ASSERT_OK_PTR(tok, "setns rx"))
|
||||
goto out;
|
||||
switch_ns_to_rx(&tok);
|
||||
if (!ASSERT_OK_PTR(tok, "setns rx"))
|
||||
goto out;
|
||||
|
||||
/* Verify packet sent from AF_XDP has proper metadata. */
|
||||
if (!ASSERT_GE(verify_xsk_metadata(&rx_xsk, true), 0,
|
||||
"verify_xsk_metadata"))
|
||||
goto out;
|
||||
if (!ASSERT_GE(verify_xsk_metadata(&rx_xsk, true), 0,
|
||||
"verify xsk metadata"))
|
||||
goto out;
|
||||
|
||||
switch_ns_to_tx(&tok);
|
||||
if (!ASSERT_OK_PTR(tok, "setns tx"))
|
||||
goto out;
|
||||
complete_tx(&tx_xsk);
|
||||
switch_ns_to_tx(&tok);
|
||||
if (!ASSERT_OK_PTR(tok, "setns tx"))
|
||||
goto out;
|
||||
complete_tx(&tx_xsk, i);
|
||||
}
|
||||
|
||||
/* Now check metadata of packet, generated with network stack */
|
||||
if (!ASSERT_GE(generate_packet_inet(), 0, "generate UDP packet"))
|
||||
@@ -518,7 +555,7 @@ void test_xdp_metadata(void)
|
||||
goto out;
|
||||
|
||||
/* Send packet to trigger . */
|
||||
if (!ASSERT_GE(generate_packet(&tx_xsk, AF_XDP_CONSUMER_PORT), 0,
|
||||
if (!ASSERT_GE(generate_packet(&tx_xsk, AF_XDP_CONSUMER_PORT, 1), 0,
|
||||
"generate freplace packet"))
|
||||
goto out;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user