From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FCF1371893 for ; Thu, 11 Jun 2026 08:09:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781165365; cv=none; b=Q36boXss77dtmNi9W59Bb96s90+QyXZB+Ix2RYKTftajDu95Y4XzMPWpjdje2be0l8IaENrRiBQdNUsdUD4CN899trdcWKMrFAWZ7oUvpbr7WT7Wu/V2XDpv5rr3aySbF+64vwMYg/O7PzvhrahF/Pv/xSWGMteo1y5YvrkKu+Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781165365; c=relaxed/simple; bh=fLiLl3V0CgYI1k2r0nXl+Hv1z/JdJstVhTKAWntg5NE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P6M4ARuxymfNMU0M+Cvsvoj6xhUwJbd5KXiSBpnjSfYq0xKKq6KCInHsTnzYx0MhE3XKPAjnMB5oxw4m+hhQ/51lgC7LOG+PzGwpG+dBRVGjZAVbnGoySglTF5U+2USbpWHAZ5yUt3MEMpUDfpgBraRKnBdwYiqO6R8jO+Op8P4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WqHPd6bz; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WqHPd6bz" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2c0c20f0c0aso59469945ad.0 for ; Thu, 11 Jun 2026 01:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781165362; x=1781770162; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fSWHG/fZwGNdDcsSNE8Dmg90eYdiDIo5tjPEs/CIw8s=; b=WqHPd6bza4PNBcUQKM4KGJvPh1Q/Lvce0KCR+I0jBnuF7RAX9NQZH4zCTsqvxg0jY/ fEIy1fcdaeOH9w2iuC4phUO+ddSBO7f+i3LI9qDbL1gWqRkiDjuHJ5n5tG7gb/Yzn2eN FnuEmHNeXBWr+AEkRd6wNj2PdI1Ki7Kk7lfRrdAJtgXQYa+aZ8uOeIwBPesG/OJseYf8 069OA9kOjMVWXOCgY1ZpVwsA5pSxVnxF1U4vmA5JXRc+HiGcBYLR96T9KWJZWJwOd4Vm rhiXNJ30eY+IrcNq5nXhXppGcqLEEnpdmmOleGVDPLhT85aS0UeV3VOA2UCmZ2higr/0 xNKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781165362; x=1781770162; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fSWHG/fZwGNdDcsSNE8Dmg90eYdiDIo5tjPEs/CIw8s=; b=eLU7EZK3cYq5/1NZAAPliwq1ZFBNRnNMyj6WBW+IrwYFeP3vy/u5KINsQxCqqYYtN0 SLYm5juO26Hmd3wU9QWSSl99GfTQHvD+IM5qj0H9fxurjME21BA3WIh5qHI9nGwfS9Ia 33cDpzVvZCWmzvzvALaka3vsu3izc5jTJ9w0ze8iFI1hz7YZyTHbCbQHvqO/Plxyg61E DsZJTmH2mVrqmY9e6t48ic5FUxyDz4erHS4d1FbUOAkz2wFA1a+GwZ3iCNV6eLlRyq7c ZiediF609NvixANISdXvm4UXxxBeK4mByvOOi9EXThvX0s7NjkTl24F8a+YnykxdUvoF FZmg== X-Forwarded-Encrypted: i=1; AFNElJ9e2ityLqg8YGdg+tZGjGToIUPhG3vmFHpt7lrHLV7EB6ZDvM9rUHLMKVZl7ktUGaKkv8pwUqRZkRp7cEk=@vger.kernel.org X-Gm-Message-State: AOJu0YxRjF67NGP6892WI6N9hXlmcfZ/cMn4B480/Xj/rT+V6CBDabCV Mfj/54TsOspIQYJD//WI/JUFbs/aEYDvy82qqwMa4tK4jWkmqbtgWg/G X-Gm-Gg: Acq92OFgLW/QS1CfxhDir+rI0grRPHoT7QLRZCp1nAOy2stRodlnoDR9PZNDWA9qd3F AuFteruHCg0ata864/oius61NL1RWz4A26+bBpjwucikinYKbwjfNdumNQqOSFkcmAIIIDZlBWB U2ePf605cv69bPlMg9/5poXX93383SjIK3sPYGU3FqKDLMluP623i9yfmuO771iLGnhz03bUHHm 1Jisuh8i2Vw3awC8NLfXnNYcsGEolluoUMmmhC/Xe5sCF1GCWIaUH7vutoW8/6H3nYou+7F0FmO srZ++cRow4R9CVZxzP0mpSoqwfBO55RMjDz72H1vvLr5uBm5RAPKZk9UtqCvxhXYiqnG6y/WnW/ hfn5Pr+U3PC/7xX1jajYRLoKTQu0F3wtau9rP7LqdJ4oc4FqYF+qYnkCFDkwncqubmN/gm299uT 1XqN+RmnuyiOZTBIksvNS+qNg7VDLsbtWifSnvRALy/HfCR99ZdP/LJ03dJCiKMiTJd5SB1Ykm3 A0AplTN5HqSE9utavmHlVMs6yc9 X-Received: by 2002:a17:903:2408:b0:2ba:7881:948d with SMTP id d9443c01a7336-2c2f18e2accmr20789065ad.1.1781165362432; Thu, 11 Jun 2026 01:09:22 -0700 (PDT) Received: from u2404-VMware-Virtual-Platform.localdomain ([2a12:a304:100::109f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c1664ad138sm277591035ad.82.2026.06.11.01.09.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 01:09:22 -0700 (PDT) From: Sun Jian To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, davem@davemloft.net, kuba@kernel.org, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, shuah@kernel.org, jiayuan.chen@linux.dev, toke@redhat.com, menglong.dong@linux.dev, emil@etsalapatis.com, Sun Jian Subject: [PATCH bpf v4 2/2] selftests/bpf: Cover generic devmap egress last-dst rewrite Date: Thu, 11 Jun 2026 16:08:49 +0800 Message-ID: <20260611080850.536996-3-sun.jian.kdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260611080850.536996-1-sun.jian.kdev@gmail.com> References: <20260611080850.536996-1-sun.jian.kdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Strengthen xdp_veth_egress to check that each destination observes the MAC selected for its own egress ifindex, instead of only checking that the observed MAC differs from a single magic value. Add a generic XDP last-destination test where earlier destinations do not have a devmap egress program while the final destination does. This covers the case where the final destination runs on the original skb and could otherwise rewrite packet data still shared with earlier cloned skbs. Use deterministic DEVMAP_HASH keys for the egress map so the intended last destination is stable. Suggested-by: Jiayuan Chen Signed-off-by: Sun Jian --- .../selftests/bpf/prog_tests/test_xdp_veth.c | 152 +++++++++++++++++- 1 file changed, 149 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c b/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c index 3e98a1665936..0fa2cf835c62 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c +++ b/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c @@ -456,7 +456,11 @@ static void xdp_veth_egress(u32 flags) .remote_flags = flags, } }; - const char magic_mac[6] = { 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF}; + const unsigned char egress_macs[VETH_PAIRS_COUNT][ETH_ALEN] = { + { 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0x01 }, + { 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0x02 }, + { 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0x03 }, + }; struct xdp_redirect_multi_kern *xdp_redirect_multi_kern; struct bpf_object *bpf_objs[VETH_EGRESS_SKEL_NB]; struct xdp_redirect_map *xdp_redirect_map; @@ -512,7 +516,7 @@ static void xdp_veth_egress(u32 flags) &net_config, prog_cfg, i)) goto destroy_xdp_redirect_map; - err = bpf_map_update_elem(mac_map, &ifindex, magic_mac, 0); + err = bpf_map_update_elem(mac_map, &ifindex, egress_macs[i], 0); if (!ASSERT_OK(err, "bpf_map_update_elem")) goto destroy_xdp_redirect_map; @@ -530,16 +534,155 @@ static void xdp_veth_egress(u32 flags) goto destroy_xdp_redirect_map; for (i = 0; i < 2; i++) { + u32 key = i; + __be64 expected = 0; + u64 res; + + err = bpf_map_lookup_elem(res_map, &key, &res); + if (!ASSERT_OK(err, "get MAC res")) + goto destroy_xdp_redirect_map; + + /* store_mac_1/2 run on the second/third remote veths. */ + memcpy(&expected, egress_macs[i + 1], ETH_ALEN); + ASSERT_EQ(res, expected, "compare mac"); + } + +destroy_xdp_redirect_map: + close_netns(nstoken); + xdp_redirect_map__destroy(xdp_redirect_map); +destroy_xdp_redirect_multi_kern: + xdp_redirect_multi_kern__destroy(xdp_redirect_multi_kern); +destroy_xdp_dummy: + xdp_dummy__destroy(xdp_dummy); + + cleanup_network(&net_config); +} + +static void xdp_veth_egress_last_dst(u32 flags) +{ + struct prog_configuration prog_cfg[VETH_PAIRS_COUNT] = { + { + .local_name = "xdp_redirect_map_all_prog", + .remote_name = "store_mac_1", + .local_flags = flags, + .remote_flags = flags, + }, + { + .local_name = "xdp_redirect_map_all_prog", + .remote_name = "store_mac_2", + .local_flags = flags, + .remote_flags = flags, + }, + { + .local_name = "xdp_redirect_map_all_prog", + .remote_name = "xdp_dummy_prog", + .local_flags = flags, + .remote_flags = flags, + } + }; + const unsigned char egress_macs[VETH_PAIRS_COUNT][ETH_ALEN] = { + { 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0x01 }, + { 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0x02 }, + { 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0x03 }, + }; + struct xdp_redirect_multi_kern *xdp_redirect_multi_kern; + struct bpf_object *bpf_objs[VETH_EGRESS_SKEL_NB]; + struct xdp_redirect_map *xdp_redirect_map; + struct net_configuration net_config = {}; + int mac_map, egress_map, res_map; + struct nstoken *nstoken = NULL; + struct xdp_dummy *xdp_dummy; + __be64 last_mac = 0; + bool found = false; + int err; + int i; + + xdp_dummy = xdp_dummy__open_and_load(); + if (!ASSERT_OK_PTR(xdp_dummy, "xdp_dummy__open_and_load")) + return; + + xdp_redirect_multi_kern = xdp_redirect_multi_kern__open_and_load(); + if (!ASSERT_OK_PTR(xdp_redirect_multi_kern, "xdp_redirect_multi_kern__open_and_load")) + goto destroy_xdp_dummy; + + xdp_redirect_map = xdp_redirect_map__open_and_load(); + if (!ASSERT_OK_PTR(xdp_redirect_map, "xdp_redirect_map__open_and_load")) + goto destroy_xdp_redirect_multi_kern; + + if (!ASSERT_OK(create_network(&net_config), "create network")) + goto destroy_xdp_redirect_map; + + mac_map = bpf_map__fd(xdp_redirect_multi_kern->maps.mac_map); + if (!ASSERT_OK_FD(mac_map, "open mac_map")) + goto destroy_xdp_redirect_map; + + egress_map = bpf_map__fd(xdp_redirect_multi_kern->maps.map_egress); + if (!ASSERT_OK_FD(egress_map, "open map_egress")) + goto destroy_xdp_redirect_map; + + bpf_objs[0] = xdp_dummy->obj; + bpf_objs[1] = xdp_redirect_multi_kern->obj; + bpf_objs[2] = xdp_redirect_map->obj; + + nstoken = open_netns(net_config.ns0_name); + if (!ASSERT_OK_PTR(nstoken, "open NS0")) + goto destroy_xdp_redirect_map; + + for (i = 0; i < VETH_PAIRS_COUNT; i++) { + struct bpf_devmap_val devmap_val = {}; + int ifindex = if_nametoindex(net_config.veth_cfg[i].local_veth); + u32 key = i; + + SYS(destroy_xdp_redirect_map, + "ip -n %s neigh add %s lladdr 00:00:00:00:00:01 dev %s", + net_config.veth_cfg[i].namespace, IP_NEIGH, + net_config.veth_cfg[i].remote_veth); + + if (attach_programs_to_veth_pair(bpf_objs, VETH_EGRESS_SKEL_NB, + &net_config, prog_cfg, i)) + goto destroy_xdp_redirect_map; + + err = bpf_map_update_elem(mac_map, &ifindex, egress_macs[i], 0); + if (!ASSERT_OK(err, "bpf_map_update_elem")) + goto destroy_xdp_redirect_map; + + devmap_val.ifindex = ifindex; + devmap_val.bpf_prog.fd = -1; + + if (i == VETH_PAIRS_COUNT - 1) + devmap_val.bpf_prog.fd = + bpf_program__fd(xdp_redirect_multi_kern->progs.xdp_devmap_prog); + + err = bpf_map_update_elem(egress_map, &key, &devmap_val, 0); + if (!ASSERT_OK(err, "bpf_map_update_elem")) + goto destroy_xdp_redirect_map; + } + + SYS_NOFAIL("ip netns exec %s ping %s -i 0.1 -c 4 -W1 > /dev/null ", + net_config.veth_cfg[0].namespace, IP_NEIGH); + + res_map = bpf_map__fd(xdp_redirect_map->maps.rx_mac); + if (!ASSERT_OK_FD(res_map, "open rx_map")) + goto destroy_xdp_redirect_map; + + memcpy(&last_mac, egress_macs[VETH_PAIRS_COUNT - 1], ETH_ALEN); + + for (i = 0; i < VETH_PAIRS_COUNT - 1; i++) { u32 key = i; u64 res; err = bpf_map_lookup_elem(res_map, &key, &res); + if (err == -ENOENT) + continue; if (!ASSERT_OK(err, "get MAC res")) goto destroy_xdp_redirect_map; - ASSERT_STRNEQ((const char *)&res, magic_mac, ETH_ALEN, "compare mac"); + found = true; + ASSERT_NEQ(res, last_mac, "compare last dst mac"); } + ASSERT_TRUE(found, "found earlier dst mac"); + destroy_xdp_redirect_map: close_netns(nstoken); xdp_redirect_map__destroy(xdp_redirect_map); @@ -596,4 +739,7 @@ void test_xdp_veth_egress(void) if (test__start_subtest("SKB_MODE/egress")) xdp_veth_egress(XDP_FLAGS_SKB_MODE); + + if (test__start_subtest("SKB_MODE/egress_last_dst")) + xdp_veth_egress_last_dst(XDP_FLAGS_SKB_MODE); } -- 2.43.0