From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 5EA563128A5 for ; Wed, 17 Sep 2025 22:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758149722; cv=none; b=fBlJX9KJKVwTprqXykOfeMkDVNekiQwsRlOVP/tz6fQ0k6DkiuuX+DxusHhZS0F24C5nbDNQbc2cFWYJv6FA1LKeElTdwgKjTRDnrHg0kUlYj93Oh/ScGjSNm2uv+78fO4GtJNjL9rtmVBPKfwvLbw3E4FAORN0m/ueus5hV7Hw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758149722; c=relaxed/simple; bh=nDmjbXMAaaARovoem/jblg2PIL/t10TLTSxc9dzhj3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sHB6taeuHvbs3HVTE59vWcWmwjcHZHh+TEKVR+sJjbgjFi3JEof+HQrLZKOUFejcVkJgyP+okZrGhYFysD4tGUAKqIORR7RmgHxuA+9sP/fCo0rxqw97nXLpTCapv2lcBQ9dZsO3cPJokix3mVLM+s+QVKXmrpx5iWKNJBCTB08= 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=Wcm29txn; arc=none smtp.client-ip=209.85.210.178 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="Wcm29txn" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-77251d7cca6so388616b3a.3 for ; Wed, 17 Sep 2025 15:55:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758149721; x=1758754521; 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=OETsLPmcZGNpLSshaaiLeOj8LUgrE6er4wP4vFEBZK0=; b=Wcm29txnjyVorSHkwZbnTaZYJzRa3FLlubyV01e/GG1cNwKpp3VPLfVJfnJjxMi1G5 vaBTDQil4pTStp5XAG9JwZpS9flNVuV/RRk613F7+Y6jxIWePxi6SosWF4tuqQ9Mfrfg lfHKD6xnozw/t6ZHcVzyj89NP2Xx5aPjh3sqQT2Z/bGGYcrRxlKown/8aCCVonJ7Zn5s xtUBwek/TaR4TjL5mJLUrQkPFO9c+iwpB3IVTw07ZgWsRVxje6Ytzyx19VzLop8FqyZr q4g9YBHYjMNsZK/WAQoJzc7uOBGU6+/P/UB2epRo9qySyy7OGX4UeEVwb9EkzD0Bc35G Dppw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758149721; x=1758754521; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OETsLPmcZGNpLSshaaiLeOj8LUgrE6er4wP4vFEBZK0=; b=CVhPB3Omt4olGlt49NOsGLX/+AcGu3CF547hVcRg9d9Nxk9r2eXuG/B+mug1gybUZL ln/DFM49BfFGVwRtF2UMMty1+taYqMF6LEtGxORRYhVHrfT/TppS620Q9ll45XxoJXuf BGq6M+SMzzW5JuwKmIEk+EcyEzp20Cr6/174/9qbJQe61rFzbWpP7+hpubcx5+1CexJI W2Jd7cLas2dEd9Szrad1hHFOgHVEW2ZN9kujcVYueSM9NV3ssO3KtoM157P+VL4OMobu 9UMh0DFZaySpCGBZY7+11NjaLPPHE7cR6m5jq+lYtL82v+0O1/6SzQTuyyyyjprtuYAv ka6Q== X-Gm-Message-State: AOJu0Yw8uNKlLU34HzcWHS/aGm7rrgnx3ol3p4E45Be71IbbcW1zPD1r FkPWXIwGVzBELbJuB5u7loVQSnCn4ujUJeRU58K/Ku5aVmD7aqb1hzMH X-Gm-Gg: ASbGncvX9xlAAawO1Q+xdc1Bwv9mBQ1qvM+eF86hxYX84+SRXtW+y6pLgalywzPKrvw qpc8ojYXQH47cTZWNvhC9yGAI9qtMmL9goIDU8g/tL83fz7RgXnc2hdstSrc1VLOc7rg6yy//cZ P8XCuehN7gw7/9pRh4AZCvnHilidFszbQ6knR8wsGOEOkA8MgVXTnQ944KFsGJQXp0Jf4AgQ97n GDcVaVYtZRx0TXjuU3CzsWBUhDPMAJ9QJgMr4d1W4/NI6pFw+Fk28EujkY5eJBq3Q83MgtHf5T8 9X8alj3rtQYiVNSy0pnZvPIMtXFCKhBu7aG6XbCu/0fjmudOmPKUD4isvUkdpFheaGXBCHDmhg4 +k5BJBRnUM6dadU0Jv2pqznJilfyx8Eg= X-Google-Smtp-Source: AGHT+IF1zrNoixTvs/C1WaUcnMEKlIKBQMV+ZH/VhsbHfBv7/cSmvVUFPi/g5VwLcrWqz5jQFdrfsA== X-Received: by 2002:a17:902:e54a:b0:269:6e73:b90a with SMTP id d9443c01a7336-2696e82fe56mr26439655ad.15.1758149720630; Wed, 17 Sep 2025 15:55:20 -0700 (PDT) Received: from localhost ([2a03:2880:ff:a::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-269802debfcsm6053555ad.86.2025.09.17.15.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Sep 2025 15:55:20 -0700 (PDT) From: Amery Hung To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, alexei.starovoitov@gmail.com, andrii@kernel.org, daniel@iogearbox.net, paul.chaignon@gmail.com, kuba@kernel.org, stfomichev@gmail.com, martin.lau@kernel.org, mohsin.bashr@gmail.com, noren@nvidia.com, dtatulea@nvidia.com, saeedm@nvidia.com, tariqt@nvidia.com, mbloch@nvidia.com, maciej.fijalkowski@intel.com, kernel-team@meta.com Subject: [PATCH bpf-next v4 6/6] selftests: drv-net: Pull data before parsing headers Date: Wed, 17 Sep 2025 15:55:13 -0700 Message-ID: <20250917225513.3388199-7-ameryhung@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250917225513.3388199-1-ameryhung@gmail.com> References: <20250917225513.3388199-1-ameryhung@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit It is possible for drivers to generate xdp packets with data residing entirely in fragments. To keep parsing headers using direcy packet access, call bpf_xdp_pull_data() to pull headers into the linear data area. Signed-off-by: Amery Hung --- .../selftests/net/lib/xdp_native.bpf.c | 89 +++++++++++++++---- 1 file changed, 74 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/net/lib/xdp_native.bpf.c b/tools/testing/selftests/net/lib/xdp_native.bpf.c index 521ba38f2ddd..df4eea5c192b 100644 --- a/tools/testing/selftests/net/lib/xdp_native.bpf.c +++ b/tools/testing/selftests/net/lib/xdp_native.bpf.c @@ -14,6 +14,8 @@ #define MAX_PAYLOAD_LEN 5000 #define MAX_HDR_LEN 64 +extern int bpf_xdp_pull_data(struct xdp_md *xdp, __u32 len) __ksym __weak; + enum { XDP_MODE = 0, XDP_PORT = 1, @@ -68,30 +70,57 @@ static void record_stats(struct xdp_md *ctx, __u32 stat_type) static struct udphdr *filter_udphdr(struct xdp_md *ctx, __u16 port) { - void *data_end = (void *)(long)ctx->data_end; - void *data = (void *)(long)ctx->data; struct udphdr *udph = NULL; - struct ethhdr *eth = data; + void *data, *data_end; + struct ethhdr *eth; + int err; + + err = bpf_xdp_pull_data(ctx, sizeof(*eth)); + if (err) + return NULL; + + data_end = (void *)(long)ctx->data_end; + data = eth = (void *)(long)ctx->data; if (data + sizeof(*eth) > data_end) return NULL; if (eth->h_proto == bpf_htons(ETH_P_IP)) { - struct iphdr *iph = data + sizeof(*eth); + struct iphdr *iph; + + err = bpf_xdp_pull_data(ctx, sizeof(*eth) + sizeof(*iph) + + sizeof(*udph)); + if (err) + return NULL; + + data_end = (void *)(long)ctx->data_end; + data = (void *)(long)ctx->data; + + iph = data + sizeof(*eth); if (iph + 1 > (struct iphdr *)data_end || iph->protocol != IPPROTO_UDP) return NULL; - udph = (void *)eth + sizeof(*iph) + sizeof(*eth); - } else if (eth->h_proto == bpf_htons(ETH_P_IPV6)) { - struct ipv6hdr *ipv6h = data + sizeof(*eth); + udph = data + sizeof(*iph) + sizeof(*eth); + } else if (eth->h_proto == bpf_htons(ETH_P_IPV6)) { + struct ipv6hdr *ipv6h; + + err = bpf_xdp_pull_data(ctx, sizeof(*eth) + sizeof(*ipv6h) + + sizeof(*udph)); + if (err) + return NULL; + + data_end = (void *)(long)ctx->data_end; + data = (void *)(long)ctx->data; + + ipv6h = data + sizeof(*eth); if (ipv6h + 1 > (struct ipv6hdr *)data_end || ipv6h->nexthdr != IPPROTO_UDP) return NULL; - udph = (void *)eth + sizeof(*ipv6h) + sizeof(*eth); + udph = data + sizeof(*ipv6h) + sizeof(*eth); } else { return NULL; } @@ -145,17 +174,34 @@ static void swap_machdr(void *data) static int xdp_mode_tx_handler(struct xdp_md *ctx, __u16 port) { - void *data_end = (void *)(long)ctx->data_end; - void *data = (void *)(long)ctx->data; struct udphdr *udph = NULL; - struct ethhdr *eth = data; + void *data, *data_end; + struct ethhdr *eth; + int err; + + err = bpf_xdp_pull_data(ctx, sizeof(*eth)); + if (err) + return XDP_PASS; + + data_end = (void *)(long)ctx->data_end; + data = eth = (void *)(long)ctx->data; if (data + sizeof(*eth) > data_end) return XDP_PASS; if (eth->h_proto == bpf_htons(ETH_P_IP)) { - struct iphdr *iph = data + sizeof(*eth); - __be32 tmp_ip = iph->saddr; + struct iphdr *iph; + __be32 tmp_ip; + + err = bpf_xdp_pull_data(ctx, sizeof(*eth) + sizeof(*iph) + + sizeof(*udph)); + if (err) + return XDP_PASS; + + data_end = (void *)(long)ctx->data_end; + data = (void *)(long)ctx->data; + + iph = data + sizeof(*eth); if (iph + 1 > (struct iphdr *)data_end || iph->protocol != IPPROTO_UDP) @@ -169,8 +215,10 @@ static int xdp_mode_tx_handler(struct xdp_md *ctx, __u16 port) return XDP_PASS; record_stats(ctx, STATS_RX); + eth = data; swap_machdr((void *)eth); + tmp_ip = iph->saddr; iph->saddr = iph->daddr; iph->daddr = tmp_ip; @@ -178,9 +226,19 @@ static int xdp_mode_tx_handler(struct xdp_md *ctx, __u16 port) return XDP_TX; - } else if (eth->h_proto == bpf_htons(ETH_P_IPV6)) { - struct ipv6hdr *ipv6h = data + sizeof(*eth); + } else if (eth->h_proto == bpf_htons(ETH_P_IPV6)) { struct in6_addr tmp_ipv6; + struct ipv6hdr *ipv6h; + + err = bpf_xdp_pull_data(ctx, sizeof(*eth) + sizeof(*ipv6h) + + sizeof(*udph)); + if (err) + return XDP_PASS; + + data_end = (void *)(long)ctx->data_end; + data = (void *)(long)ctx->data; + + ipv6h = data + sizeof(*eth); if (ipv6h + 1 > (struct ipv6hdr *)data_end || ipv6h->nexthdr != IPPROTO_UDP) @@ -194,6 +252,7 @@ static int xdp_mode_tx_handler(struct xdp_md *ctx, __u16 port) return XDP_PASS; record_stats(ctx, STATS_RX); + eth = data; swap_machdr((void *)eth); __builtin_memcpy(&tmp_ipv6, &ipv6h->saddr, sizeof(tmp_ipv6)); -- 2.47.3