From nobody Sun Dec 14 12:37:54 2025 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 C9EDE8BE8 for ; Thu, 24 Apr 2025 00:28:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745454496; cv=none; b=EYmZOrC8L+y4PBkGImAL3zmgcndlnlG+t2AcUmGgCIY1WqWzbQzn9vPsM+aDQTxOuAeE3Y5d930pdmeGjGSD/fOivGulvtrOztC0TxGq8iCwftc/89CF156Y3Cyp3BYLoWtP4MR7A+aWHVw2OCMTZ0SIPpV3t7Txok4WiT2R/EE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745454496; c=relaxed/simple; bh=peXZjv91qcnXAES8N8mnCKfga6OZjhML/WpesH4NfKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lJ3uJWY6Msi8fNnvPvkPsu2INxLMUXjwds1v6ild6bkpGrjYrH1usGpigck2j3YwIO8yBHbEgkzg3ymBTyf3bg1coV9rSAo9JHhjMzKYf6l3rPmQUjj98L3dSTYDvM8h8yi5NRjKHVUjjYAgWXI0J2NfhbnjPsiRaRxnx3e7TT8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=xQgtT0G3; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="xQgtT0G3" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-736dd9c4b40so1409802b3a.0 for ; Wed, 23 Apr 2025 17:28:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1745454494; x=1746059294; 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=h6JaAma8wr++LnPs79mPGowXaCOiBb9Nd8NFNngwV7o=; b=xQgtT0G3NgMoiY22v5qnfKORQEPyZFI0xQvj1+Yb0/4GrQeC8E6hWf9J6Uy7ItYp+B RIf3ooMxiJd5DxsBQjexhd+nNJBCbYD0olRn4PRQKPizkzTe68G8YgTVIrxEVa2TuPZK wANm0tfGrxEFZGCi/9SoVDZcaN+pGJA4GBs2M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745454494; x=1746059294; 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=h6JaAma8wr++LnPs79mPGowXaCOiBb9Nd8NFNngwV7o=; b=lfT/L8+u0NGF8zv0tyYnhw1DrYjn/rrecSdmU5bw+/pqzllHiw0E89+gCjOzy20Z77 LW3dzYbIE3YXMrOF0VZe+VLi/EWCXK6jTR+t4JUbuDpbW4X82vOKZsIeJJrN/rT/jD3Y 9rUeZKJB57ZVzhJGmH7+lP8qKpJK9J009ssGhXRhnFw96E3TEGyFf26tpdqFhWGYmNfz IjZGkWBgy7NfflDqQqYyNzcWdG+JJ+dEb1WDmYurpnENkPlWWYqnbe1F7Bic1GzMxoWo 9dqyKYLVYRxnCZK6QkCKCCEYNg/v0zsJ2aQ39CXskYqiJzqhkvisKHlEZVwJeosU+Exk lfDg== X-Forwarded-Encrypted: i=1; AJvYcCWoiUnvki5D/esUJBOqgdIO93jmAXRAdsDWRl0j7ZfPbYR1HcpwUUoRLcgDP5zshLVLQADpztkSyUGa+fk=@vger.kernel.org X-Gm-Message-State: AOJu0YzpMEVEhiDQwOOY/FEH4yQ/BAEBu8FyYpftkFIcIisug8mDWqq1 8fZe9Yv06KTrt2L7tFRUUQUmaf2lvUxXQ6bg0EU4d1ggPZF8ABp3SCX1UEn+4+U= X-Gm-Gg: ASbGncsbMnDw7EsjS10kFl1zmPKx8qEh4RY7PvFqy+LkHXD/IbT0M/GhYW5uGU3/lu0 cLhENTygoifVnUvHn2MS6RYJQQG2CXF+50QxRYwmiASXDX6UZ225JHN7nnhYkC8pmUMZ+K6TK6s f1lqPNMPiK98tLcpmVauEQrH0jmBBopKqS+h4fsm3cCWt7It/Xh+u1zzwMXFVnmCfpOhxQBea02 eExY/V5Amao5sNUFuz78U3M/mgHZD6mPQlxPY5yK0zHCLYVLhpa50GPs7/WF141O7MlZvcpbcqQ DzPEiqujs6ZmdxVBIse20st0SL9ZYH/EXJbKTGw+cs6RVh6Y X-Google-Smtp-Source: AGHT+IFKCZWDrLDyEBVkIjzd2enJ/SHv5mfApzf31oQfNyqhNgFukwVTxCJOUx6z4xW3g53RKeEzNQ== X-Received: by 2002:a17:90a:d603:b0:2fb:fe21:4841 with SMTP id 98e67ed59e1d1-309ee37cae3mr551102a91.8.1745454494054; Wed, 23 Apr 2025 17:28:14 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-309ee7c4054sm83013a91.23.2025.04.23.17.28.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:28:13 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, shaw.leon@gmail.com, pabeni@redhat.com, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v4 1/3] netdevsim: Mark NAPI ID on skb in nsim_rcv Date: Thu, 24 Apr 2025 00:27:31 +0000 Message-ID: <20250424002746.16891-2-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424002746.16891-1-jdamato@fastly.com> References: <20250424002746.16891-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Previously, nsim_rcv was not marking the NAPI ID on the skb, leading to applications seeing a napi ID of 0 when using SO_INCOMING_NAPI_ID. To add to the userland confusion, netlink appears to correctly report the NAPI IDs for netdevsim queues but the resulting file descriptor from a call to accept() was reporting a NAPI ID of 0. Signed-off-by: Joe Damato --- drivers/net/netdevsim/netdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 0e0321a7ddd7..2aa999345fe1 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -29,6 +29,7 @@ #include #include #include +#include =20 #include "netdevsim.h" =20 @@ -357,6 +358,7 @@ static int nsim_rcv(struct nsim_rq *rq, int budget) break; =20 skb =3D skb_dequeue(&rq->skb_queue); + skb_mark_napi_id(skb, &rq->napi); netif_receive_skb(skb); } =20 --=20 2.43.0 From nobody Sun Dec 14 12:37:54 2025 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 02AA874C14 for ; Thu, 24 Apr 2025 00:28:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745454499; cv=none; b=UiXb6Fxt2+TxqojyluBupw2VzlPsnjTVX4Cg9XjZWCe7w19JwZspob8cVyVRoka62XfluC5RncwZAHtsFeRsZ+gbi8de0gUEp8gkhu4Nsd8sM831G0D60WCJGEiLsUuTl9zGmaaJCCNRvZLNxVS/6NcHym2RX0gl34/Qsjwdcqg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745454499; c=relaxed/simple; bh=CC5P9PlTFOFYmpGkh+AgeMpeAfxK9NmmEpB4vEaUjMk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KRbjkHIBEiWCYiTxL5P8P/5oTyW7lPRWQfJnRV9a4mGozS6ZPuf+ACUSQ+qSuETqJ/4WLlDgJKR9QgE3VGn8yh7kPq5Yj/VRYu56JxynLm29SPJtBcStqxkpMLIeT+ZDyLY1duqhSOOfRbsEMtnDXQYYJlJ67XakoMnxt/368zY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=gi9Jco+a; arc=none smtp.client-ip=209.85.216.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="gi9Jco+a" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-301302a328bso578722a91.2 for ; Wed, 23 Apr 2025 17:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1745454497; x=1746059297; 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=K0pZyEyvgBt8oFD4ZrZQFJhXNyLvOB+O0xQ+Wcll9kk=; b=gi9Jco+aEqNtbuyDmscJmg9o5IK/DK1zy6puezcbPjsbBSPJKI+Meuy8cuotwPLx5Y UIPLcYZuj5PdAU25UiZdjQ1pKX6lzWIHfjAbLI6W8esUbXsxGM6o32Mh1dH9yWRhSZmZ aQZSpBl49lHIJz+HRB3PB3KFttNvWiZCkfEpw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745454497; x=1746059297; 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=K0pZyEyvgBt8oFD4ZrZQFJhXNyLvOB+O0xQ+Wcll9kk=; b=qgZEe5jm1Cj5XwhdwIyE4vEipgc6DECMZJdsVAQYY0IgYn7qnCh1bm1cQSn9kUxpUy bltT14Ut56VN6LeVAVfD3Ru7E9osyyCaNuNwralNecbYDVKtEClGBcH0PFKvB+gFVlTL ImUZ8lz1pni6lzGQL2qZkElzJho1MUeglzAUgTpB13IcwcWjaRM2n0FJS7IQH5jM4zz2 3fHS5FDbZP9EwB5t52/8tRBlVo9nkNO6NOPiKjIvoNolrHM4uPbWX6gqZREypWVHgp1b 452Z08DIUuFeJKsmpNevbAo/rNTr9+FL3cqtVmd4CPU0PtlaV4QKbfPzHMMYw+2OGBld xUSw== X-Forwarded-Encrypted: i=1; AJvYcCW9cba5zaA8AQ5hbW4Ne8AnKJdqVHSmp9WDd1m2X88A3aD2im+jL14ezfXH+4j8MZNsrTlymJbTKoE33I4=@vger.kernel.org X-Gm-Message-State: AOJu0YwAjvQoq9RJILKVzYv0u9TiGW6xKgQef+LA4xWlxHrmoxHqT/cw b1J0fnvg4evWLa1jMb5NKGCf6VqvYvTn+PSX6hQijcOZyOFepZp8t6xWYKQG58E= X-Gm-Gg: ASbGnctL1WEhR7CL1/WJIHy5Ae0uni0WnlyX+YIG9ihlmtWUnHjXjsX9rPzHIfD6hhX OFZ/2ElTVwELGYebxhY+5wHuO5EMbUeV++T2hm/Ukw4P8K+KGFb+D3FVOyZmTKngCEc702PaNfk qQDWCqxKnU9+wr8Ol6BLgWgLa1wKf65iNOIxD8lPNy2APq5FM06vbshdvVaNNHPx0YLKxgvowA8 5Egs0aDqRaz6vBtE3N30Zr3pVqHdnwsseKjgCpEbq7gpm/8medGHQWNe68Dc1V9E7n1yarDg1zt A6GEQCk3kLS/A9j9EQX8JE3sl+CiWL3NXTRQQEPEE0vKNcq8 X-Google-Smtp-Source: AGHT+IEAmg0XR+f+4dbbuaII7I/1Nj1o8g+oD7f7K+/8qFPWxrVWr1FeBq7fThzkgJQPYmfowLY1oQ== X-Received: by 2002:a17:90a:f945:b0:2f6:be57:49d2 with SMTP id 98e67ed59e1d1-309ed29c8d8mr1097904a91.17.1745454497172; Wed, 23 Apr 2025 17:28:17 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-309ee7c4054sm83013a91.23.2025.04.23.17.28.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:28:16 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, shaw.leon@gmail.com, pabeni@redhat.com, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , Shuah Khan , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , linux-kernel@vger.kernel.org (open list), linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK), bpf@vger.kernel.org (open list:XDP (eXpress Data Path):Keyword:(?:\b|_)xdp(?:\b|_)) Subject: [PATCH net-next v4 2/3] selftests: drv-net: Factor out ksft C helpers Date: Thu, 24 Apr 2025 00:27:32 +0000 Message-ID: <20250424002746.16891-3-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424002746.16891-1-jdamato@fastly.com> References: <20250424002746.16891-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Factor ksft C helpers to a header so they can be used by other C-based tests. Signed-off-by: Joe Damato --- tools/testing/selftests/drivers/net/ksft.h | 56 +++++++++++++++++++ .../selftests/drivers/net/xdp_helper.c | 49 +--------------- 2 files changed, 58 insertions(+), 47 deletions(-) create mode 100644 tools/testing/selftests/drivers/net/ksft.h diff --git a/tools/testing/selftests/drivers/net/ksft.h b/tools/testing/sel= ftests/drivers/net/ksft.h new file mode 100644 index 000000000000..c30a02da903f --- /dev/null +++ b/tools/testing/selftests/drivers/net/ksft.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#if !defined(__NET_KSFT_H__) +#define __NET_KSFT_H__ + +#include +#include +#include + +static void ksft_ready(void) +{ + const char msg[7] =3D "ready\n"; + char *env_str; + int fd; + + env_str =3D getenv("KSFT_READY_FD"); + if (env_str) { + fd =3D atoi(env_str); + if (!fd) { + fprintf(stderr, "invalid KSFT_READY_FD =3D '%s'\n", + env_str); + return; + } + } else { + fd =3D STDOUT_FILENO; + } + + write(fd, msg, sizeof(msg)); + if (fd !=3D STDOUT_FILENO) + close(fd); +} + +static void ksft_wait(void) +{ + char *env_str; + char byte; + int fd; + + env_str =3D getenv("KSFT_WAIT_FD"); + if (env_str) { + fd =3D atoi(env_str); + if (!fd) { + fprintf(stderr, "invalid KSFT_WAIT_FD =3D '%s'\n", + env_str); + return; + } + } else { + /* Not running in KSFT env, wait for input from STDIN instead */ + fd =3D STDIN_FILENO; + } + + read(fd, &byte, sizeof(byte)); + if (fd !=3D STDIN_FILENO) + close(fd); +} + +#endif diff --git a/tools/testing/selftests/drivers/net/xdp_helper.c b/tools/testi= ng/selftests/drivers/net/xdp_helper.c index aeed25914104..d5bb8ac33efa 100644 --- a/tools/testing/selftests/drivers/net/xdp_helper.c +++ b/tools/testing/selftests/drivers/net/xdp_helper.c @@ -11,56 +11,11 @@ #include #include =20 +#include "ksft.h" + #define UMEM_SZ (1U << 16) #define NUM_DESC (UMEM_SZ / 2048) =20 -/* Move this to a common header when reused! */ -static void ksft_ready(void) -{ - const char msg[7] =3D "ready\n"; - char *env_str; - int fd; - - env_str =3D getenv("KSFT_READY_FD"); - if (env_str) { - fd =3D atoi(env_str); - if (!fd) { - fprintf(stderr, "invalid KSFT_READY_FD =3D '%s'\n", - env_str); - return; - } - } else { - fd =3D STDOUT_FILENO; - } - - write(fd, msg, sizeof(msg)); - if (fd !=3D STDOUT_FILENO) - close(fd); -} - -static void ksft_wait(void) -{ - char *env_str; - char byte; - int fd; - - env_str =3D getenv("KSFT_WAIT_FD"); - if (env_str) { - fd =3D atoi(env_str); - if (!fd) { - fprintf(stderr, "invalid KSFT_WAIT_FD =3D '%s'\n", - env_str); - return; - } - } else { - /* Not running in KSFT env, wait for input from STDIN instead */ - fd =3D STDIN_FILENO; - } - - read(fd, &byte, sizeof(byte)); - if (fd !=3D STDIN_FILENO) - close(fd); -} =20 /* this is a simple helper program that creates an XDP socket and does the * minimum necessary to get bind() to succeed. --=20 2.43.0 From nobody Sun Dec 14 12:37:54 2025 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 32648145A18 for ; Thu, 24 Apr 2025 00:28:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745454503; cv=none; b=q5bO7PvOrsLTwNsGQp2EaFI79PMMFtzTLHO1pgprg75iOkYE7QQ/byzzrfk7B/lpUZwckIx66Vc9GhggEIpfqfpW9ck0CORckUxArgoG9ZLA99NuO0pJPl/xhsillvtKzu4wzKXXToqzv8Et7DmeFQ2Ut1aKdWYX4VnNRPGYKlo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745454503; c=relaxed/simple; bh=XfejFVfUeNjlcemQvV2FfBGjQHl1uJWERTzwSMmvtPw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U3/YuHfrf9KAbrQL+sdEtzi9jMjZuwzuuCPqfM2oAK7grhqEt/Ci73A2OMoLyMJRxfGwsZ235B1ZCoOgreVZ46t/C0A57ox6tCJcsr9fBNncK0cefYq1tUIKiMeXy9BRbgt4tJ32wlYGuhSL08EulCugc341h97iAGsTQJ8Qxh8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=CZVwc8F1; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="CZVwc8F1" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-306b6ae4fb2so432559a91.3 for ; Wed, 23 Apr 2025 17:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1745454500; x=1746059300; 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=fONRRd0VBHmSB/DlTOXXKEWrq2Lhm3txVCS1ybmwFg0=; b=CZVwc8F11k7fY5c1ugrngaTYmJym5j4Dcu5OdVucrMo2750HaMBRAzJlzaahoxeF24 qObiytR+EFDvHzQ/mQn4YBNW1HiPo8u7X12p786Mk9RDWGUriQroOaViSmEGQVAL6itK WMNcX5ycXz4pS2dZ+crZncqfLudYrE8R5n55A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745454500; x=1746059300; 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=fONRRd0VBHmSB/DlTOXXKEWrq2Lhm3txVCS1ybmwFg0=; b=gISzmGv8w8Xz/1KOFnpVtDLOH7RMqGjp0xuJRiIxWgmyx65VCUJeJoCZf7NEZAiHFS pCHcDuFjHaseTHc2wEXGk+gmL2A12rxIB8Eh4j/lAXci44GlJ++ZqleBSF+jTRx2xY6T S1LHuCBHlHWO9LJUAJFBjREBvZQ+5uaf1M9rqMvvm2emeUfv2O0QIeREelGXBewX/Sqs tqcp0lQCYUA6veBuhiScCNu9ApOxthiQulpN1h5OT5joMz0SxSaO1msOprVEZmRmQP6t vL26hi30tcjR9btJsuF7UrenYjqJjtR+5Uj+/GZ0hpqMHtCQL4aJ0CR56dZFUZFnyfOF hdXA== X-Forwarded-Encrypted: i=1; AJvYcCX3qU6RG7aPccVH9Uh24kG7VuvD843+AhfgK4Ykbyx0mr5FFTqN4cFkmFLb/3RlMrWKshXGbfajcq+/gaQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwZ/O9p/JZ89Igpl6T8OHZaWvzm2690b36KuVuOYg+RBlqO0chI BLvy7VnrNYF+4fgKiuwsG8kRDonzixDPkQNZZTi2LBAVJjbN7EXcTG1uovMqxPc= X-Gm-Gg: ASbGncsJJShA8pwgWAg8SDTLiGDBtqI4nVmv7VPEuERzYA0nUAN/8ZclioTzeRUH6Wg UUDp2ySdpSfx70I0cZK4SuOpacU1YivPNvMavAZ63IiaoUj1d/JW0fFaMR3NqeWIJsts03w5LjS QFis8t+Cgcxd42NLGjO/NjCs0/dN614y1Ac+qVDtWchm+ZEsmwWlGUtsLVGghkLIx+QiZoEpPne W6NHcNP8sA0BxVsnSInAPAQqy/Z7o5QBdIuDbhK2xAWrCYmwk2ceA4IzO/76ZJpESr4rdUR6HBg HFY90J8LQvb083UxU43OTuwYxssFdfrJ5ad9H2ZQRKs44wTQ X-Google-Smtp-Source: AGHT+IHQIolOk+n262eCIIoMGQ54RpktEuMS5r9p2G6tZQeOFE8Ai42mQoK9PW7YbvD0WD0iY5WqEA== X-Received: by 2002:a17:90b:2752:b0:305:2d9d:81c9 with SMTP id 98e67ed59e1d1-309ed2805d0mr1116420a91.16.1745454500436; Wed, 23 Apr 2025 17:28:20 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-309ee7c4054sm83013a91.23.2025.04.23.17.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:28:20 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, shaw.leon@gmail.com, pabeni@redhat.com, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , Shuah Khan , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , linux-kernel@vger.kernel.org (open list), linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK), bpf@vger.kernel.org (open list:XDP (eXpress Data Path):Keyword:(?:\b|_)xdp(?:\b|_)) Subject: [PATCH net-next v4 3/3] selftests: drv-net: Test that NAPI ID is non-zero Date: Thu, 24 Apr 2025 00:27:33 +0000 Message-ID: <20250424002746.16891-4-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424002746.16891-1-jdamato@fastly.com> References: <20250424002746.16891-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Test that the SO_INCOMING_NAPI_ID of a network file descriptor is non-zero. This ensures that either the core networking stack or, in some cases like netdevsim, the driver correctly sets the NAPI ID. Signed-off-by: Joe Damato --- .../testing/selftests/drivers/net/.gitignore | 1 + tools/testing/selftests/drivers/net/Makefile | 6 +- .../testing/selftests/drivers/net/napi_id.py | 23 +++++ .../selftests/drivers/net/napi_id_helper.c | 83 +++++++++++++++++++ 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/drivers/net/napi_id.py create mode 100644 tools/testing/selftests/drivers/net/napi_id_helper.c diff --git a/tools/testing/selftests/drivers/net/.gitignore b/tools/testing= /selftests/drivers/net/.gitignore index ec746f374e85..72d2124fd513 100644 --- a/tools/testing/selftests/drivers/net/.gitignore +++ b/tools/testing/selftests/drivers/net/.gitignore @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only +napi_id_helper xdp_helper diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/s= elftests/drivers/net/Makefile index 0c95bd944d56..47247c2ef948 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -6,9 +6,13 @@ TEST_INCLUDES :=3D $(wildcard lib/py/*.py) \ ../../net/net_helper.sh \ ../../net/lib.sh \ =20 -TEST_GEN_FILES :=3D xdp_helper +TEST_GEN_FILES :=3D \ + napi_id_helper \ + xdp_helper \ +# end of TEST_GEN_FILES =20 TEST_PROGS :=3D \ + napi_id.py \ netcons_basic.sh \ netcons_fragmented_msg.sh \ netcons_overflow.sh \ diff --git a/tools/testing/selftests/drivers/net/napi_id.py b/tools/testing= /selftests/drivers/net/napi_id.py new file mode 100755 index 000000000000..356bac46ba04 --- /dev/null +++ b/tools/testing/selftests/drivers/net/napi_id.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +from lib.py import ksft_run, ksft_exit +from lib.py import ksft_eq, NetDrvEpEnv +from lib.py import bkg, cmd, rand_port, NetNSEnter + +def test_napi_id(cfg) -> None: + port =3D rand_port() + listen_cmd =3D f"{cfg.test_dir}/napi_id_helper {cfg.addr_v['4']} {port= }" + + with bkg(listen_cmd, ksft_wait=3D3) as server: + cmd(f"echo a | socat - TCP:{cfg.addr_v['4']}:{port}", host=3Dcfg.r= emote, shell=3DTrue) + + ksft_eq(0, server.ret) + +def main() -> None: + with NetDrvEpEnv(__file__) as cfg: + ksft_run([test_napi_id], args=3D(cfg,)) + ksft_exit() + +if __name__ =3D=3D "__main__": + main() diff --git a/tools/testing/selftests/drivers/net/napi_id_helper.c b/tools/t= esting/selftests/drivers/net/napi_id_helper.c new file mode 100644 index 000000000000..7e8e7d373b61 --- /dev/null +++ b/tools/testing/selftests/drivers/net/napi_id_helper.c @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include +#include +#include + +#include "ksft.h" + +int main(int argc, char *argv[]) +{ + struct sockaddr_in address; + unsigned int napi_id; + unsigned int port; + socklen_t optlen; + char buf[1024]; + int opt =3D 1; + int server; + int client; + int ret; + + server =3D socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (server < 0) { + perror("socket creation failed"); + if (errno =3D=3D EAFNOSUPPORT) + return -1; + return 1; + } + + port =3D atoi(argv[2]); + + if (setsockopt(server, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) { + perror("setsockopt"); + return 1; + } + + address.sin_family =3D AF_INET; + inet_pton(AF_INET, argv[1], &address.sin_addr); + address.sin_port =3D htons(port); + + if (bind(server, (struct sockaddr *)&address, sizeof(address)) < 0) { + perror("bind failed"); + return 1; + } + + if (listen(server, 1) < 0) { + perror("listen"); + return 1; + } + + ksft_ready(); + + client =3D accept(server, NULL, 0); + if (client < 0) { + perror("accept"); + return 1; + } + + optlen =3D sizeof(napi_id); + ret =3D getsockopt(client, SOL_SOCKET, SO_INCOMING_NAPI_ID, &napi_id, + &optlen); + if (ret !=3D 0) { + perror("getsockopt"); + return 1; + } + + read(client, buf, 1024); + + ksft_wait(); + + if (napi_id =3D=3D 0) { + fprintf(stderr, "napi ID is 0\n"); + return 1; + } + + close(client); + close(server); + + return 0; +} --=20 2.43.0