From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by mail.toke.dk (Postfix) with ESMTPS id BF009A1B311 for ; Fri, 21 Jul 2023 00:05:20 +0200 (CEST) Authentication-Results: mail.toke.dk; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20221208 header.b=OGBQEL/w Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d00afc8c0efso468228276.3 for ; Thu, 20 Jul 2023 15:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689890719; x=1690495519; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=fgyCl8eiuagKKsgIJIYdD1tZ2ojE+8oEtTHW86qufC0=; b=OGBQEL/wJkNZcWE9n3EyasZrIQj2IMI8DjhaSaXjDSbTBfMJ2gsyu7aUYhh/GPnVe0 6EXfhEbsXu4UR8/iKJqmQNg2L1eRrBQ/EdzKHPfsrBLF/BYi8HmgttxIOdrbzJhbnnha zwM8YqqkQkA5VsCbxUzCgMYNyokPbDPRrHJkXgc3dCGgaRJW91YHdrre4N9wzVYGBuCH x1VbBk6F+s2/5t9m7pFgv6+GHSUl269GOFacmHOdAj5d3pX1a4r3oMXWyQWvg7Am2Pou QjGVEv12oKmHSYbv6jDfakYrPK939DFNfKKNJFd1/U1uwZUJkW9idglawJPsK9Nw6QPk KqHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689890719; x=1690495519; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fgyCl8eiuagKKsgIJIYdD1tZ2ojE+8oEtTHW86qufC0=; b=AwpWSyUDIhtm1+YVSVB/g17i1qbeAggVtIAar+Ui3/T/bUPixkmNNx1+VXuzq8jutt rjsTeuQJS2IAiZSBgOPtoJc+cvcbbm2bRCIFpzV2foitkIp+OsxLoMijDz6aV32IeXbs M1/p9t8cUO1GAd483Xu20rW75FXdeFBMMxzZ7Rk8DCEoU/VV+BEBVHNqRyXIwO1eT9c4 gLWnN9a0kQWJ4tEEa0QqCDBhz9FZKrzi0NJLZ4zmh7g9tn1gWZM1gSKvRYN4XMVJnn/t 5cIqlGNJoSmXYBnv7NSam56POEJDaJ2LwDRsUgBj6aUQvL3mQid48oDM+H166ioB+z9F /dcw== X-Gm-Message-State: ABy/qLYwRIhLBKrZG9cf83Rxv5xaHQyYv0H6ftTne0wcw6JgA1EmBosJ sgu7nTU25ou5GtJM4rWrstpvvr0= X-Google-Smtp-Source: APBJJlF/yYnM5kw5X4bkSEnstrKs3V9CpxTX0/PKpgx8JE5Mq3279gt7BFtiyt2fSft07cy1vtKgO0A= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a25:ab08:0:b0:cb6:5a0b:c86d with SMTP id u8-20020a25ab08000000b00cb65a0bc86dmr1313ybi.12.1689890718892; Thu, 20 Jul 2023 15:05:18 -0700 (PDT) Date: Thu, 20 Jul 2023 15:05:17 -0700 In-Reply-To: <20230719183734.21681-20-larysa.zaremba@intel.com> Mime-Version: 1.0 References: <20230719183734.21681-1-larysa.zaremba@intel.com> <20230719183734.21681-20-larysa.zaremba@intel.com> Message-ID: From: Stanislav Fomichev To: Larysa Zaremba Content-Type: text/plain; charset="utf-8" Message-ID-Hash: CQ34XIC6WXXOOWCYYYS4Q6HUZTHZEPBX X-Message-ID-Hash: CQ34XIC6WXXOOWCYYYS4Q6HUZTHZEPBX X-MailFrom: 3nq-5ZAMKCRE9uwx55x2v.t53Eu6-yz4A9Eu6-6850vtA.4vA@flex--sdf.bounces.google.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, haoluo@google.com, jolsa@kernel.org, David Ahern , Jakub Kicinski , Willem de Bruijn , Jesper Dangaard Brouer , Anatoly Burakov , Alexander Lobakin , Magnus Karlsson , Maryam Tahhan , xdp-hints@xdp-project.net, netdev@vger.kernel.org X-Mailman-Version: 3.3.8 Precedence: list Subject: [xdp-hints] Re: [PATCH bpf-next v3 19/21] selftests/bpf: Use AF_INET for TX in xdp_metadata List-Id: XDP hardware hints design discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 07/19, Larysa Zaremba wrote: > The easiest way to simulate stripped VLAN tag in veth is to send a packet > from VLAN interface, attached to veth. Unfortunately, this approach is > incompatible with AF_XDP on TX side, because VLAN interfaces do not have > such feature. > > Replace AF_XDP packet generation with sending the same datagram via > AF_INET socket. > > This does not change the packet contents or hints values with one notable > exception: rx_hash_type, which previously was expected to be 0, now is > expected be at least XDP_RSS_TYPE_L4. > > Signed-off-by: Larysa Zaremba Acked-by: Stanislav Fomichev > --- > .../selftests/bpf/prog_tests/xdp_metadata.c | 167 +++++++----------- > 1 file changed, 59 insertions(+), 108 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c > index 626c461fa34d..1877e5c6d6c7 100644 > --- a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c > +++ b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c > @@ -20,7 +20,7 @@ > > #define UDP_PAYLOAD_BYTES 4 > > -#define AF_XDP_SOURCE_PORT 1234 > +#define UDP_SOURCE_PORT 1234 > #define AF_XDP_CONSUMER_PORT 8080 > > #define UMEM_NUM 16 > @@ -33,6 +33,12 @@ > #define RX_ADDR "10.0.0.2" > #define PREFIX_LEN "8" > #define FAMILY AF_INET > +#define TX_NETNS_NAME "xdp_metadata_tx" > +#define RX_NETNS_NAME "xdp_metadata_rx" > +#define TX_MAC "00:00:00:00:00:01" > +#define RX_MAC "00:00:00:00:00:02" > + > +#define XDP_RSS_TYPE_L4 BIT(3) > > struct xsk { > void *umem_area; > @@ -119,90 +125,28 @@ static void close_xsk(struct xsk *xsk) > munmap(xsk->umem_area, UMEM_SIZE); > } > > -static void ip_csum(struct iphdr *iph) > +static int generate_packet_udp(void) > { > - __u32 sum = 0; > - __u16 *p; > - int i; > - > - iph->check = 0; > - p = (void *)iph; > - for (i = 0; i < sizeof(*iph) / sizeof(*p); i++) > - sum += p[i]; > - > - while (sum >> 16) > - sum = (sum & 0xffff) + (sum >> 16); > - > - iph->check = ~sum; > -} > - > -static int generate_packet(struct xsk *xsk, __u16 dst_port) > -{ > - struct xdp_desc *tx_desc; > - struct udphdr *udph; > - struct ethhdr *eth; > - struct iphdr *iph; > - void *data; > - __u32 idx; > - int ret; > - > - ret = xsk_ring_prod__reserve(&xsk->tx, 1, &idx); > - if (!ASSERT_EQ(ret, 1, "xsk_ring_prod__reserve")) > - return -1; > - > - tx_desc = xsk_ring_prod__tx_desc(&xsk->tx, idx); > - tx_desc->addr = idx % (UMEM_NUM / 2) * UMEM_FRAME_SIZE; > - printf("%p: tx_desc[%u]->addr=%llx\n", xsk, idx, tx_desc->addr); > - data = xsk_umem__get_data(xsk->umem_area, tx_desc->addr); > - > - eth = data; > - iph = (void *)(eth + 1); > - udph = (void *)(iph + 1); > - > - memcpy(eth->h_dest, "\x00\x00\x00\x00\x00\x02", ETH_ALEN); > - memcpy(eth->h_source, "\x00\x00\x00\x00\x00\x01", ETH_ALEN); > - eth->h_proto = htons(ETH_P_IP); > - > - iph->version = 0x4; > - iph->ihl = 0x5; > - iph->tos = 0x9; > - iph->tot_len = htons(sizeof(*iph) + sizeof(*udph) + UDP_PAYLOAD_BYTES); > - iph->id = 0; > - iph->frag_off = 0; > - iph->ttl = 0; > - iph->protocol = IPPROTO_UDP; > - ASSERT_EQ(inet_pton(FAMILY, TX_ADDR, &iph->saddr), 1, "inet_pton(TX_ADDR)"); > - ASSERT_EQ(inet_pton(FAMILY, RX_ADDR, &iph->daddr), 1, "inet_pton(RX_ADDR)"); > - ip_csum(iph); > - > - udph->source = htons(AF_XDP_SOURCE_PORT); > - udph->dest = htons(dst_port); > - udph->len = htons(sizeof(*udph) + UDP_PAYLOAD_BYTES); > - udph->check = 0; > - > - memset(udph + 1, 0xAA, UDP_PAYLOAD_BYTES); > - > - tx_desc->len = sizeof(*eth) + sizeof(*iph) + sizeof(*udph) + UDP_PAYLOAD_BYTES; > - xsk_ring_prod__submit(&xsk->tx, 1); > - > - ret = sendto(xsk_socket__fd(xsk->socket), NULL, 0, MSG_DONTWAIT, NULL, 0); > - if (!ASSERT_GE(ret, 0, "sendto")) > - return ret; > - > - return 0; > -} > - > -static void complete_tx(struct xsk *xsk) > -{ > - __u32 idx; > - __u64 addr; > - > - 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); > - > - printf("%p: complete tx idx=%u addr=%llx\n", xsk, idx, addr); > - xsk_ring_cons__release(&xsk->comp, 1); > - } > + char udp_payload[UDP_PAYLOAD_BYTES]; > + struct sockaddr_in rx_addr; > + int sock_fd, err = 0; > + > + /* Build a packet */ > + memset(udp_payload, 0xAA, UDP_PAYLOAD_BYTES); > + rx_addr.sin_addr.s_addr = inet_addr(RX_ADDR); > + rx_addr.sin_family = AF_INET; > + rx_addr.sin_port = htons(UDP_SOURCE_PORT); > + > + sock_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); > + if (!ASSERT_GE(sock_fd, 0, "socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)")) > + return sock_fd; > + > + err = sendto(sock_fd, udp_payload, UDP_PAYLOAD_BYTES, MSG_DONTWAIT, > + (void *)&rx_addr, sizeof(rx_addr)); > + ASSERT_GE(err, 0, "sendto"); > + > + close(sock_fd); > + return err; > } > > static void refill_rx(struct xsk *xsk, __u64 addr) > @@ -268,7 +212,8 @@ static int verify_xsk_metadata(struct xsk *xsk) > if (!ASSERT_NEQ(meta->rx_hash, 0, "rx_hash")) > return -1; > > - ASSERT_EQ(meta->rx_hash_type, 0, "rx_hash_type"); > + if (!ASSERT_NEQ(meta->rx_hash_type & XDP_RSS_TYPE_L4, 0, "rx_hash_type")) > + return -1; > > xsk_ring_cons__release(&xsk->rx, 1); > refill_rx(xsk, comp_addr); > @@ -284,36 +229,38 @@ void test_xdp_metadata(void) > struct nstoken *tok = NULL; > __u32 queue_id = QUEUE_ID; > struct bpf_map *prog_arr; > - struct xsk tx_xsk = {}; > struct xsk rx_xsk = {}; > __u32 val, key = 0; > int retries = 10; > int rx_ifindex; > - int tx_ifindex; > int sock_fd; > int ret; > > - /* Setup new networking namespace, with a veth pair. */ > + /* Setup new networking namespaces, with a veth pair. */ > > - SYS(out, "ip netns add xdp_metadata"); > - tok = open_netns("xdp_metadata"); > + SYS(out, "ip netns add " TX_NETNS_NAME); > + SYS(out, "ip netns add " RX_NETNS_NAME); > + > + tok = open_netns(TX_NETNS_NAME); > SYS(out, "ip link add numtxqueues 1 numrxqueues 1 " TX_NAME > " type veth peer " RX_NAME " numtxqueues 1 numrxqueues 1"); > - SYS(out, "ip link set dev " TX_NAME " address 00:00:00:00:00:01"); > - SYS(out, "ip link set dev " RX_NAME " address 00:00:00:00:00:02"); > + SYS(out, "ip link set " RX_NAME " netns " RX_NETNS_NAME); > + > + SYS(out, "ip link set dev " TX_NAME " address " TX_MAC); > SYS(out, "ip link set dev " TX_NAME " up"); > - SYS(out, "ip link set dev " RX_NAME " up"); > SYS(out, "ip addr add " TX_ADDR "/" PREFIX_LEN " dev " TX_NAME); > - SYS(out, "ip addr add " RX_ADDR "/" PREFIX_LEN " dev " RX_NAME); > > - rx_ifindex = if_nametoindex(RX_NAME); > - tx_ifindex = if_nametoindex(TX_NAME); > + /* Avoid ARP calls */ > + SYS(out, "ip -4 neigh add " RX_ADDR " lladdr " RX_MAC " dev " TX_NAME); > + close_netns(tok); > > - /* Setup separate AF_XDP for TX and RX interfaces. */ > + tok = open_netns(RX_NETNS_NAME); > + SYS(out, "ip link set dev " RX_NAME " address " RX_MAC); > + SYS(out, "ip link set dev " RX_NAME " up"); > + SYS(out, "ip addr add " RX_ADDR "/" PREFIX_LEN " dev " RX_NAME); > + rx_ifindex = if_nametoindex(RX_NAME); > > - ret = open_xsk(tx_ifindex, &tx_xsk); > - if (!ASSERT_OK(ret, "open_xsk(TX_NAME)")) > - goto out; > + /* Setup AF_XDP for RX interface. */ > > ret = open_xsk(rx_ifindex, &rx_xsk); > if (!ASSERT_OK(ret, "open_xsk(RX_NAME)")) > @@ -353,19 +300,20 @@ void test_xdp_metadata(void) > ret = bpf_map_update_elem(bpf_map__fd(bpf_obj->maps.xsk), &queue_id, &sock_fd, 0); > if (!ASSERT_GE(ret, 0, "bpf_map_update_elem")) > goto out; > + close_netns(tok); > > /* Send packet destined to RX AF_XDP socket. */ > - if (!ASSERT_GE(generate_packet(&tx_xsk, AF_XDP_CONSUMER_PORT), 0, > - "generate AF_XDP_CONSUMER_PORT")) > + tok = open_netns(TX_NETNS_NAME); > + if (!ASSERT_GE(generate_packet_udp(), 0, "generate UDP packet")) > goto out; > + close_netns(tok); > > /* Verify AF_XDP RX packet has proper metadata. */ > + tok = open_netns(RX_NETNS_NAME); > if (!ASSERT_GE(verify_xsk_metadata(&rx_xsk), 0, > "verify_xsk_metadata")) > goto out; > > - complete_tx(&tx_xsk); > - > /* Make sure freplace correctly picks up original bound device > * and doesn't crash. > */ > @@ -382,12 +330,15 @@ void test_xdp_metadata(void) > > if (!ASSERT_OK(xdp_metadata2__attach(bpf_obj2), "attach freplace")) > goto out; > + close_netns(tok); > > /* Send packet to trigger . */ > - if (!ASSERT_GE(generate_packet(&tx_xsk, AF_XDP_CONSUMER_PORT), 0, > - "generate freplace packet")) > + tok = open_netns(TX_NETNS_NAME); > + if (!ASSERT_GE(generate_packet_udp(), 0, "generate freplace packet")) > goto out; > + close_netns(tok); > > + tok = open_netns(RX_NETNS_NAME); > while (!retries--) { > if (bpf_obj2->bss->called) > break; > @@ -397,10 +348,10 @@ void test_xdp_metadata(void) > > out: > close_xsk(&rx_xsk); > - close_xsk(&tx_xsk); > xdp_metadata2__destroy(bpf_obj2); > xdp_metadata__destroy(bpf_obj); > if (tok) > close_netns(tok); > - SYS_NOFAIL("ip netns del xdp_metadata"); > + SYS_NOFAIL("ip netns del " RX_NETNS_NAME); > + SYS_NOFAIL("ip netns del " TX_NETNS_NAME); > } > -- > 2.41.0 >