From nobody Sun Dec 14 12:14:38 2025 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 68D2D1D86F2 for ; Fri, 18 Apr 2025 01:37:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744940265; cv=none; b=V7oCe66AP2U1W4PlYN93wCTaCLE57RoduOL9sKvuS/LOUHA4TAt6ywMYHpgYUmbsXlrONOXl6vRWzlR+LTgsKgjYeIQxUtOXpgkWgPmOXvHehJy9KAqtNX+k9ekBJpueH4BB/f6rk+IgXxDmWjyQFFuyiS3K0eiw6j7HS61z85k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744940265; c=relaxed/simple; bh=peXZjv91qcnXAES8N8mnCKfga6OZjhML/WpesH4NfKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u8JeH9U9lY2BEmdgaKTDveYxQnlJT39Pjq8fju/PhMRM2rAjzRUoXrDUxXjZcPvPOwaD0v39+KwXEd8KaBr/RCCtieXwaKxzIaVfthKdTZq+wxo5HBByyp7gj5K7W8tVVxx6t96SSXShjC2OW1jiRF3sEr67EgjlDECq3DTQgtM= 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=j7x+faJB; arc=none smtp.client-ip=209.85.216.51 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="j7x+faJB" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-306b6ae4fb3so1411430a91.1 for ; Thu, 17 Apr 2025 18:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1744940263; x=1745545063; 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=j7x+faJB7PauCqeDJBAGYtCJleYyaGfhxRPU7+OzMNTqmnda2g3lGLmqMcM2YdEcbE iFcrG/0bDBa/SKptriRXV+hFA3ahBTkywmMfTTFvpBhUvy6jUEBzKZNLqU1mBkar53tD 4gDS/cVjfyFKEnxY3UgTX0c0PqaxTN04/WPnc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744940263; x=1745545063; 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=MuRiSvSplsUDMQzrku6vg7DZF0jNbj0gd5DMwBAfMb3LVQlTi7gWbFPRz8TArhKETh SIStvFMJ6XPjZ3mvu4WdEQXrHJlO+3o4v2XAXpFEA+GTFviDo/X/AmO0n3ex6A9VRxBK AdiacvyKOxvludkSnsYKiJHrH6KrG6aLrC4MzsadXLP8lDlOU9wXCQxwXXPqtyr/TgBK tLoznyB3tcieOH9NBgpQjsz1toc6swDzASYQXYomtHQ6eO8PRbQ/QX/Oq9E1Cb2AftvD LD8TmGeNcSlAhcYpJDVI0B+h26L46aq0DplIJB4k3zO1XCbbO8UnFaMeI114oHoc+fa8 g3fw== X-Forwarded-Encrypted: i=1; AJvYcCUiVsEk172zqw6UMcb3aJ1/rTA/aVyvaD3QqtVIW+yoxtlQ2IhpeLbKNrMB7PgJb5eT5MHXYAPQWS8bz20=@vger.kernel.org X-Gm-Message-State: AOJu0YzXc+ui4qlToLEPJYN1E14MVOoqTmX8jDSKNpBvw33web7oz7Vp 9TskjnA0JouWNXa7oU9ne8Jzff9sSpV5KRwncah7TZbfdamk2cURMYsQZ16hoxI= X-Gm-Gg: ASbGnctJfnUgoxil3Psre93j3jFtFbxGY8qeiWnSet/OwvLoue/bkDH4mH0VPtXzB00 y1HtYJn9yjJvYy5g1rVa02KP686gsdXpfJKM+ov7s8p7opGYyks7GHtbsTnAteYs7Od8R/iA3i8 gMFMMBdbxrpKnPPhL9Z4NLnvH6GwUt3SeTZOisk0IHEjpk4vlmA7GFCXCjpmaDXjEvrDwuNiwP5 3D1PeUA+ZcFMU86U8twcCuT13Ut3RpFNopJioLEr7LX4A+78pT96fYAU/wTi2Sj8rOUEXse6wsN zXeVMhv4oMxNk2J7EhnAwx/bcGT0sFkD6P1dDSatAyyEoEY7 X-Google-Smtp-Source: AGHT+IGoyjXwixKtaT9nwokLFm7CjWprehonQ2SRJ8/gfnreftjHTIyWeFkj8zCAWIIkh7aMFJzOlg== X-Received: by 2002:a17:90b:2744:b0:2ff:53a4:74f0 with SMTP id 98e67ed59e1d1-3087bbc925dmr1451743a91.29.1744940263562; Thu, 17 Apr 2025 18:37:43 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3087df21278sm131772a91.29.2025.04.17.18.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 18:37:42 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, pabeni@redhat.com, shaw.leon@gmail.com, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v3 1/3] netdevsim: Mark NAPI ID on skb in nsim_rcv Date: Fri, 18 Apr 2025 01:37:03 +0000 Message-ID: <20250418013719.12094-2-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250418013719.12094-1-jdamato@fastly.com> References: <20250418013719.12094-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:14:38 2025 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 78C181E0DE3 for ; Fri, 18 Apr 2025 01:37:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744940269; cv=none; b=AFf3/OBytvVr7sNj1sk6xdVOadB/BXTuPYiqbJr+eXU0Io7gEg83PpQ6oOH6RWGPmId8rEGcXuywaKoSbnq4xFc8rDiNzPgeWppy7Jo7fP/DakuuD5GLD7FH741tbZGFZNfkYg1/dSrBaK2/8AYrrsOeQB7bEbAxkdx2+CTGy34= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744940269; c=relaxed/simple; bh=iC38gdoHa0iB1zJg2rOXQF/27QGDkW0uzWiTqqa4j3U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dr+eB85eS3P00T7KgVvDp57SK/2kxWItibMxknIvdb0gApvNcYbtnCaGkxduRpY4GriaIuyj/btvy/chvYwIl4wFLBDxcP3M9UArufuE32ZSJJK0LpiWjRmMR22U+7Dg7/ddcarJHzJnGOpRSjnPqwjCl4MdcK8WKuMzHxrqObk= 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=opMN1Kwh; arc=none smtp.client-ip=209.85.216.49 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="opMN1Kwh" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-30549dacd53so1182322a91.1 for ; Thu, 17 Apr 2025 18:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1744940267; x=1745545067; 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=qZCFxUxzlk1WaRej7yGOb8bWsdrrxKB0c/PerPrAolw=; b=opMN1KwhIaWU1GzcTYmUXxoJC8rurkK8X1R8q6eooMpfwoLVFyw03dFeMNtCsXcYi9 8r7yryOtdkhKYWSjkPz5cpO7g2btCfruXOouGJ7whu62zbyfN4+slOyUoupLxPDRBFOx kQp7N5QdK5g8M4KatnHgsRxMqqNNrM6Mgcoyg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744940267; x=1745545067; 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=qZCFxUxzlk1WaRej7yGOb8bWsdrrxKB0c/PerPrAolw=; b=XQa8t3vDZkws3EHEZwMovD4nTg4FliJdtYZ0Pvt1KtLTIAvMv/ISnPD1lTvTy2n6Ex zbyrduFduvOVj8bBC4yDJC+yTZspl+emGr8Shpa6XGpI+TrQ/0iCnz2jDni0e8+8qENT u+A3ie7kvgB9xDEHwAtbHBGS3atbMfhxB1qWPNWfmIxtLsp4r9+WQ4jGfDZfj2QMQSwO S5e5TKyEONjvQRR6iMrpCaDmAQ/UbH73Fqchww/oEjNw0o5Vs4WeMZ6nBwEd+EulpUl1 VESwQsd1Nlp6rf/HbOl+XL+7duQmqdp4XYnKzX/eM8YkN3kWJ/454bV3o+Ryiv0uQ9/9 pEgQ== X-Forwarded-Encrypted: i=1; AJvYcCX4xEOFlCuchVVXJLPoSHi8JRzDKZM0T4G/A8xKogaHkF4QwyvAmuO4lQoVbR/Ocqmrnp/1GGaLG6BCo2A=@vger.kernel.org X-Gm-Message-State: AOJu0YwLf4QJwB9SfYK9Ia6nyhX/B5vhrqqyuH3hNUoE98PuKin06GtE UduCVjaP+uGAo82S4ufZguwEWyg6ZLLlLD6fi+qxnF4K7H7H6cSwbTZ6/wBQvAo= X-Gm-Gg: ASbGnctJ5Oy8BxHvr7IE4uofms7zWmcNqO8PzA4hpFTCtvdAia1fhY685ZESLY4W0Eg D1PDLsrNWO3uaQHZb9UcsCwDRWUD+RVi5lZvw0I3kqTtY3WnLzovMKxzEFP7aFCbDq8RQLhbrG0 WwCCq0/dr0pK95T9T5qZr6veDZzeFcstyF2YtvdzfUMpEolPuNTxYgtBAqm6gM1VhC989fOBdia wDInnJF9ZRT3QJ9lR6AT5OVF7sTBFiCbY0l37MPVVsYo1SPXa3vYFecp+hPfdbDSlVwcDluw+0f CexvvjRfqEyLdJx2F6+UebRNwa3ACu6XIifIA2SnunH9m+e3kqUCB7NqUVI= X-Google-Smtp-Source: AGHT+IHIkIzzR3zj4vrpbAECLpfActXjD6z6qbXH+bYM/RSwRzcQMcmuncyRDhW0LSmFSuyKKHckLA== X-Received: by 2002:a17:90b:58c8:b0:2fa:21d3:4332 with SMTP id 98e67ed59e1d1-30879c02c19mr2566560a91.12.1744940266767; Thu, 17 Apr 2025 18:37:46 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3087df21278sm131772a91.29.2025.04.17.18.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 18:37:46 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, pabeni@redhat.com, shaw.leon@gmail.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 v3 2/3] selftests: drv-net: Factor out ksft C helpers Date: Fri, 18 Apr 2025 01:37:04 +0000 Message-ID: <20250418013719.12094-3-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250418013719.12094-1-jdamato@fastly.com> References: <20250418013719.12094-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..3fd084006a16 --- /dev/null +++ b/tools/testing/selftests/drivers/net/ksft.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#if !defined(__KSFT_H__) +#define __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:14:38 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 C63DE1E51F3 for ; Fri, 18 Apr 2025 01:37:50 +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=1744940272; cv=none; b=qpNd6Ox70UARANIarmigeoQZcoerVziVvaPziOYlfxkdce7in4+ZhGFtI6kywS/Q5PCbb5argsgw89U5uvswUIzB9VTaQqagLxSxvtMW78a5i5H8izF55fd1eK+emMZNRlLk7cNwZyL9RM8tz3DtLL2nNWqCDytyNAb2gBxVh8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744940272; c=relaxed/simple; bh=5isKImih2WAb/F2yZrBoG1nc7SxgJF4zQ9WtVoGOqQU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eu29JzL5U9NbBUjtJmbhf08/BQZcnoJVenXjSlCu/HaPWcAePumCQe0/46cHqG4CpRW+69ijWUjWq8wTSFYoYEYeXtgYMpg5s6clnj0/CNO9N4ISlDX0jUSLYb/U2bp6oxjSV5lDTfKoKjpmRuQ+Ag48iFmrCrKtM7AUKx+sKIM= 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=CK2rtsJw; 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="CK2rtsJw" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-303a66af07eso1130448a91.2 for ; Thu, 17 Apr 2025 18:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1744940270; x=1745545070; 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=qsW2tptfFjso20mcti4Mqp8BKgow+rWkfzTJM2yOxR4=; b=CK2rtsJwSQOW3WZE+jQPK5kxSCjeRb2OZeXEEh0r4xSzkyxRSe8BUdxMq/IGiTxTFO nJvWprk2b9Rxh5fayTx0liCUk7zfBLCsXAV5ozgpyb+f7ho68P0iEaewUVvIq9Kbk/Ad cjdQKseWY2NWldC0RueXcMrydXgvO8P95ZBew= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744940270; x=1745545070; 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=qsW2tptfFjso20mcti4Mqp8BKgow+rWkfzTJM2yOxR4=; b=MskCtrEymEhnLYj9ztQRjn3QyxsVUYWYoSq65l1hRiO30+XLrtgr5YXNn2ZvSrYsV6 WNSjpOiG7uaRKshOyJ2IFZp6fzSR79ONaQDG7aE5ko1Orf7KF2wefuc4tVG4IZoYsscA k1zigW/vD58WHKBZNhOkT2ssCbRj+Y50zDWbmwjK2yDSU7+8ztT8FZe6NEvkpTNctxtY +FJ6KuqdXhn6DwDGxB8TSZ5RiGwDTZ7GsqRYQ0RzB4kDxdw2teO4FXf13qo4HS0XcXih YKO9pNHhHSA27EMs9hBs13g/kHSYz6krUVTqJ2rQPID7mtNj+HnyOgR5Tlmq6Er9zW9k nfMg== X-Forwarded-Encrypted: i=1; AJvYcCUtsVjWolX0BybKtV0gura9oqIcVx7Ma2RI9oKKEpsYgX/xaS8zy1oI6AhQEdv+borjnGsLCVzF/T9Y2PU=@vger.kernel.org X-Gm-Message-State: AOJu0YwUa31tMs1h5fqCBHSvdf53LHZmFOe1Dd3mvti+RFOLsRbf7jnb 4P4wz6xfqH2U8OTFN6LGyG7msiu8D2BKUsl/ooIjctA/P37E/T907znCt52CNGE= X-Gm-Gg: ASbGncuHfgBWITDtMEhFe4W/iuJtzi4ctkbvvC7xhYTy9Qeet867qok2Ykz04NTzbKv bE0WmmwtY/WsVw/mxvQTi1PQtb5L6jNLPSHKtaXATjbr1pB2xHX2uLqvEeiD4kvFevmG0T5PJ0v V60PEwvf606yASse+5xDcDzDGcCPp4zII2zlARaGWQ2BCNsMFobQOw8z4s9UncppWG8mTdsT91y mm91i4x28AMUgonFOxQLrXlUDN5zCddMJbaice0jGY79iYFeQZ0vXq1T2IkN1fXEvE1+3zM8giF 4KBfVj4yToRnhfrrdcoHUL3Xu+PhPZG3ZYSa69nD86Aoq5E11N7GZEYwmho= X-Google-Smtp-Source: AGHT+IEBM+dr8qCKWbxlJkdrIj4JsBo+lV0XGAheAzqt3MqfLaRT2FSWdNWTE5tc821wHEYJSxvyZA== X-Received: by 2002:a17:90b:3b8d:b0:2ee:aed2:c15c with SMTP id 98e67ed59e1d1-3087bbaeb98mr1365692a91.28.1744940270069; Thu, 17 Apr 2025 18:37:50 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3087df21278sm131772a91.29.2025.04.17.18.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 18:37:49 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, pabeni@redhat.com, shaw.leon@gmail.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 v3 3/3] selftests: drv-net: Test that NAPI ID is non-zero Date: Fri, 18 Apr 2025 01:37:05 +0000 Message-ID: <20250418013719.12094-4-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250418013719.12094-1-jdamato@fastly.com> References: <20250418013719.12094-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 | 24 ++++++ .../selftests/drivers/net/napi_id_helper.c | 83 +++++++++++++++++++ 4 files changed, 113 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..54e51633a70a --- /dev/null +++ b/tools/testing/selftests/drivers/net/napi_id.py @@ -0,0 +1,24 @@ +#!/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() + bin_remote =3D cfg.remote.deploy(cfg.test_dir / "napi_id_helper") + listen_cmd =3D f"{bin_remote} {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