From patchwork Thu Apr 17 01:32:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 14054781 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 D29AC19F13B for ; Thu, 17 Apr 2025 01:33:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744853589; cv=none; b=L+921TrrRutl6M0Z67QGZtird0W3zgjnEYrzUeW91vij0WGxr6Yy1zm8+GLGhK4yLsgjXtudmEkgHuyJsAmmvoDqOEnIR6/P+FVtnjkIDiCb9wmFxs4j2Yjdk/Ugp+GSSZFG31HRQSw+xOrRWq13Kvap4Hcez1wFtNEUqTvEGkc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744853589; c=relaxed/simple; bh=peXZjv91qcnXAES8N8mnCKfga6OZjhML/WpesH4NfKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XGYtigEf0Lv1AjKwRaGOolLdVhuP3lF4mEvtLlCECir1ypXKuVOb06OttUT5fKNvXUCdO8F7EJUmLc1q+oo4zfygQ+2A5LB1NmXFCF3n9RJAMNmG55qf2ND+ElmekBYZGokfrlP2xv/3jw/HhVRGfRtqLjwdt7LWF3FbYlSIX5k= 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=KEoOja1W; arc=none smtp.client-ip=209.85.214.182 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="KEoOja1W" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-22928d629faso2708655ad.3 for ; Wed, 16 Apr 2025 18:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1744853587; x=1745458387; 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=KEoOja1WrHdGFy2G9Cy/x0JAFWGshQWF2ggKPEQUR/xQrAYvlq/SIZsWKrPmUNmNfI VqJau2ZF/rN8DNBr/ErheYuzu8wTi//IQxb5PeKIokmgVwNkqgkIbNxSw49UlhoUTYeS HzfABUJhxOvmrwe/6VET/0KJ662uMf+F7fBsY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744853587; x=1745458387; 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=gT5DGyxj5PuIlJiYE16uX9rQ5TEPLMmWnbYdeOLouNhFVPa0MmCWRzeBUK4luzHZbu ZulKjLvAQ/R7aBjlk1KWrAx90CvZ3nnYY+Ji8ETgZ1m48RxwmWa/Vk/xd12IO7VaUVdF er1ng/fbfl4oPvQvY1KmvSnlsBjNxrIzkRLj5txsIUqOZxaID1cqgyvLMrW/p4TAGB+6 IxS7Yl/PPt9Ar6wib0CB7eyYxXtsFgsQz8KfU2auh601LdiXGmoEbostT6C5a5qhfCLR hWwD1BsF4OzW/U24vcRe1DLeO0ZNHOENfEqk7CbN+IXG9kEOhod8gtx3r33R5lmEpK90 +cYA== X-Gm-Message-State: AOJu0YwtPnFVyX8bqld/C5HpIBYkLdzZx1UNmmPBJkUrraWRpgX/km6Z 7ADNlHLyCN7lWJUOmLomzdemSaBUfXqzUgXQVnzh4k8I61HXo7tzcS5ctyphWYr4+t9k0syE6Dm 514jV1vB3BiwIJm9DEn2oKw3tyvOnyoMCGYii7wBtTeTe+F+vRUv6PMW0feKRZK9rtz0CQbYIoZ k3DbHecokqgn88gRLmSZpHv69+6wKE6q+AWPE= X-Gm-Gg: ASbGncvLB+4a9xt8QCZBbr5N9eI6JoAgmx74bn9BUUoGl+0VHxqOQMj6t4+LKzhguNo +zZWDzzf5xEiJ4JTHVo8HW2sE4HfN+Cyhin+S631WYyWtQ8e2AwDLgyfMTqdjk85w/GOO6Zan5t KhpPFUWvr1zqCghw8/xs/mm/7PMZbAT1zSuFrYNczu9HWX2lDbXVdSwfVScO4G0jHU0zohkHlvE 54v9eP3EWjKnoXeTYUBTw4PqoYWW8wv+9W2CIYifIOlR4n7XfiHEaXcxmr1ZxDp8gMuPJ+MtlRf zO/6MjcnyaZ025CnOss0swF5mbL/zK5TDClvCO+dgmyFLbbp X-Google-Smtp-Source: AGHT+IHG7ipMCyI6c0/c97Gk3L/+AoJB9ydcVHy1jbC151MdKqezcYzCYtt+B9Ehn2HYIZfDsowUZw== X-Received: by 2002:a17:903:1252:b0:225:b718:4dff with SMTP id d9443c01a7336-22c35983151mr69095555ad.53.1744853586637; Wed, 16 Apr 2025 18:33:06 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c33ef11c7sm21349505ad.37.2025.04.16.18.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 18:33:06 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v2 1/4] netdevsim: Mark NAPI ID on skb in nsim_rcv Date: Thu, 17 Apr 2025 01:32:39 +0000 Message-ID: <20250417013301.39228-2-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417013301.39228-1-jdamato@fastly.com> References: <20250417013301.39228-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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 #include "netdevsim.h" @@ -357,6 +358,7 @@ static int nsim_rcv(struct nsim_rq *rq, int budget) break; skb = skb_dequeue(&rq->skb_queue); + skb_mark_napi_id(skb, &rq->napi); netif_receive_skb(skb); } From patchwork Thu Apr 17 01:32:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 14054779 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 A52681B4236 for ; Thu, 17 Apr 2025 01:33:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744853592; cv=none; b=P/AdybuJhv1GakqDjp5wABayK7FI+0rUDn/IoOg4aPLbM/pjb+vdJOTWPD4GVQNFjYYKPlKZhPyPQ0Q1agMrr2pd1a1o5EbrmyCYZEq2o2AlsFvhPr+10wswMTC1qfFqK3Sfg7vUv5WNeOABo1IVxuqhqmfdWyaq7O2zqrCNlSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744853592; c=relaxed/simple; bh=iC38gdoHa0iB1zJg2rOXQF/27QGDkW0uzWiTqqa4j3U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AU543kNER2D7V8sFv1J8GvUgCS4b8nIze5kbMgwiE+clQIRm3pryXxqZPkTgkMOWdTDsDPHHtyBDYH+tlBNPM3nGueT6F5+dAeMvF6TcMEZq3A+oBfFJoN2KouIOJ/ZL5W5sKZbO9+X89Ddwfy+OjiLP7aMGpBAps2bYdKtVG2I= 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=vSuxi/dE; arc=none smtp.client-ip=209.85.216.50 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="vSuxi/dE" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-3085f827538so264878a91.0 for ; Wed, 16 Apr 2025 18:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1744853590; x=1745458390; 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=vSuxi/dEclKZP/Uw2HlGkujTqUsjwtcgulp4TI8gVBA0qXXl3BYAdL9Mz5dTEo/a4+ 2+LBJF+x26DlKumHooL/iPouP2w27utGceCOFB3ta5FwokuRCNsESkJP7Q1ROiuMqX83 tmO6dYZ4OglgM9ncvu30Un7+EnAziLaQ0Rars= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744853590; x=1745458390; 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=i19ASo1KC5bvu59A74cCVjaoMBuDSVM0s4FtkdYRY6E19FSliEjsKRW21pRdRgesJC sSnnRfnmGEVThcHWKVm2UhgTwFeS4z5LCNkzpNqrvjB04639f+aaQ94rrCPrTe9qgl5B NHAjI428oshLY2Zzat3pMBMaEhwEpexCI4bfk+psn0J5wrL6HdMpKgweFRRe9wpT9yu7 vwuR7JibjpPSJab2ZFuKJL/iQWr3TsnYVvr16qJqjBhDrUYOj8daXPAM8NDzYnEnCI8a MnodENG8yvBnnbaLxEymxyYLm0HS1d5sJSLy3Cwy9VA1BLa988etc0cjUNf0YPNRYu2+ kYOg== X-Forwarded-Encrypted: i=1; AJvYcCXs02+Z45//oFDYvQaA3I85jAz4xIKPfjA0fwRb+v9gtOV4BhFIffoQubfE2jKCtJGLPuw=@vger.kernel.org X-Gm-Message-State: AOJu0YzsKSqrrO+bk20m6Ynk3F5kqGVnWtWhJ0alE29AcamKzA0AvM7Z 8JNbUfjGlc2cnhRY9P15SMB8OlDX6FzZaaj3zcR3v7NigMGNXr7AlrC8e6vODXehrriqXCxQLfp X X-Gm-Gg: ASbGncspxy/Yye6xhAhRxRwLrlL1FV0OIhrzxpGO1/4n8oqPEVcFthqjGAicOs7xb/8 Gsl6KC0kWJDhfZsoL3xG2APlac1fzglbQub9kd7vsreJRUvM0JLMGTZ4kRksT/nesSmXuFFpugC /gYOxP/PzUMAW/mjxtSz2rIrdjgx4XsboGeE4KI2tYQ+sHrl3Th3m0KPjtu4r5PuhYcZoTRImcW 1gvtkp75XMZ2ZUgFEjThXuu/o/US+pC48i+bRiF3ZSCM0srTPdoWYBzVni3XW0irIG15lq485Qm 0mR+xTJLfx4reiBgZltIKF6maCRUwE3BMgSGfaMpww56y7sH X-Google-Smtp-Source: AGHT+IFURUTFYkzHYQIncz+BfKUAREfkEb0hfHFXyfz2gYFuInISIzikqK/QQxnSU1SXGYMuPoyaZA== X-Received: by 2002:a17:90b:2f4e:b0:2ff:6167:e92d with SMTP id 98e67ed59e1d1-30864173b39mr5158528a91.32.1744853589813; Wed, 16 Apr 2025 18:33:09 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c33ef11c7sm21349505ad.37.2025.04.16.18.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 18:33:09 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , 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 v2 2/4] selftests: drv-net: Factor out ksft C helpers Date: Thu, 17 Apr 2025 01:32:40 +0000 Message-ID: <20250417013301.39228-3-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417013301.39228-1-jdamato@fastly.com> References: <20250417013301.39228-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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/selftests/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] = "ready\n"; + char *env_str; + int fd; + + env_str = getenv("KSFT_READY_FD"); + if (env_str) { + fd = atoi(env_str); + if (!fd) { + fprintf(stderr, "invalid KSFT_READY_FD = '%s'\n", + env_str); + return; + } + } else { + fd = STDOUT_FILENO; + } + + write(fd, msg, sizeof(msg)); + if (fd != STDOUT_FILENO) + close(fd); +} + +static void ksft_wait(void) +{ + char *env_str; + char byte; + int fd; + + env_str = getenv("KSFT_WAIT_FD"); + if (env_str) { + fd = atoi(env_str); + if (!fd) { + fprintf(stderr, "invalid KSFT_WAIT_FD = '%s'\n", + env_str); + return; + } + } else { + /* Not running in KSFT env, wait for input from STDIN instead */ + fd = STDIN_FILENO; + } + + read(fd, &byte, sizeof(byte)); + if (fd != STDIN_FILENO) + close(fd); +} + +#endif diff --git a/tools/testing/selftests/drivers/net/xdp_helper.c b/tools/testing/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 +#include "ksft.h" + #define UMEM_SZ (1U << 16) #define NUM_DESC (UMEM_SZ / 2048) -/* Move this to a common header when reused! */ -static void ksft_ready(void) -{ - const char msg[7] = "ready\n"; - char *env_str; - int fd; - - env_str = getenv("KSFT_READY_FD"); - if (env_str) { - fd = atoi(env_str); - if (!fd) { - fprintf(stderr, "invalid KSFT_READY_FD = '%s'\n", - env_str); - return; - } - } else { - fd = STDOUT_FILENO; - } - - write(fd, msg, sizeof(msg)); - if (fd != STDOUT_FILENO) - close(fd); -} - -static void ksft_wait(void) -{ - char *env_str; - char byte; - int fd; - - env_str = getenv("KSFT_WAIT_FD"); - if (env_str) { - fd = atoi(env_str); - if (!fd) { - fprintf(stderr, "invalid KSFT_WAIT_FD = '%s'\n", - env_str); - return; - } - } else { - /* Not running in KSFT env, wait for input from STDIN instead */ - fd = STDIN_FILENO; - } - - read(fd, &byte, sizeof(byte)); - if (fd != STDIN_FILENO) - close(fd); -} /* this is a simple helper program that creates an XDP socket and does the * minimum necessary to get bind() to succeed. From patchwork Thu Apr 17 01:32:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 14054782 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 924331AA1C9 for ; Thu, 17 Apr 2025 01:33:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744853596; cv=none; b=SWYp6WQIHnSJZiyJZtISuMV+3Cvk1PeJK/Xq3/uNJV9phepnaGXHat3VHzw/Wtg08Cm8+gxAs2jiQR2NOCs8P2vBupXkzzrL+DBw16QxzIg/6z7ah2xRbt15GshUurU+NXgV24YZJSdaIqc+IurQwsuLjG6sbJdvULvi7iQY8M4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744853596; c=relaxed/simple; bh=HDQGG1Q34BlSkCWW84cNeWYaQgfA3isd36S41ZwwwX8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tp2IZdqUfkY/1rp3t2qjFLvvp9xUouwpFfKXs8lFWrQvzAEKyf+TIVewYO1Kw1cJUKYCqJtqL0I2WjlcRbfn+E4zVgMDT/s0CC7DdosE6BTxxtaBzaEgOHGP3FKC406xhinIZtyApe8WcF0dkVljI+5s3HHVq1iwlG6v7ui+25k= 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=hkUrl3Li; arc=none smtp.client-ip=209.85.214.171 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="hkUrl3Li" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-226185948ffso2893855ad.0 for ; Wed, 16 Apr 2025 18:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1744853593; x=1745458393; 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=T9lrbIvu6zRRiCj4HgSRrtBo19PyxJ2njnhqzeLily8=; b=hkUrl3LiEJHREHfPNkhc2sQgCARPtZWI8yljzopy2FWFpAPbqq4sKtNwsLZe5pvUE3 9IT5cOffJqq0SXyWpZlcz1TX5BHxwDA0KtUXi24A2/sgRUsc2a+NGQYFDyb8aKySkiy7 vILEHcsZod/awwSFn7Z8ixz0BG4KkSowIUvmU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744853593; x=1745458393; 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=T9lrbIvu6zRRiCj4HgSRrtBo19PyxJ2njnhqzeLily8=; b=pA0ywbZExI4d03dJjzIZQZIafRsuJOysK+arfrck3Yp/98qTVmAb4jRj4W0Y21xJ6k flT0XEWMI6cW9yt+ZmnciXwzck/lLG6Qaom0tzMnUN1vvt0fXF/bRusHH4pjTYOMO8wi vaxUcdpCWWAc7juEW4M+S7ksDf6OeSFLpWepH56dGc1moZP8Chy11FczABNbvk8MkVOs 9kFxThPnXtg9kf3dMrJ7pjrKLJUMJcIhtgiV0UkckOzHgXYcb4adjFW2UHX+CeAZ6L5m 5k1F1KpUnRyB596cFKlgeSSRheY4F3kw9Ib1nlJQqz9kRGd7Av5LPzybJcYr95+fbQ2W CKrw== X-Gm-Message-State: AOJu0YwtQ0nVLBparCrbZ0LFJ1gbTbEVrva0HXV9zyAwctGzsXxMlGgR gIf7+iWYHavqCS3zPnfDi23++tW2rmOO4DAHgFyO0fKP6AGZnAbNQ6BqbnvSavC/nPUW71D7yIQ tP3cv6KZEMFq9wo993xzDzvn3rxXwO1BeqkOrX/kd0aAYb81r2f9RHKkxqfJnOV5sa9UDajZnn2 DHJE4MSC4FHC7gA+VtXeRWTvJAD+8vYDHC32Q= X-Gm-Gg: ASbGnctclFE5UpsXLtP6o/Ab6JPEctvBSacTHIW3/vNFy5ch/nswiYdO0kvz10Nq+Qi i+W7t38VWgxJvHjcVNgLs/VsyEX9jPx2branbbgjQF3frSOopGmzP0owODvl2T9iAFXevY6/ANz JMMMZ8eqP93Noj11Oji8gsSL3ussIiBCU/yo9ge9mhh/PT1GaRCKQgbmbgc2U2tvUTjwwZlxpng dDfHrMg6shcshdldd5ZYo3MZjQr0bOL4PhyVQ/xU4x5VM7z7GY8fLPWiJVAkbF/S8RKvf0arBfL Y+8MT5BT6RXr4UYAUbsF70RSxATnK1HXEhAsNTlLPu0UL+O3 X-Google-Smtp-Source: AGHT+IGIfvnYetCCtpkkTem0fvDPcVdKvorATj17pj9pyflpstgaWD/lkjveVAKVWM6ThAFzVxniww== X-Received: by 2002:a17:902:d4ce:b0:220:c63b:d93c with SMTP id d9443c01a7336-22c3598533cmr61830925ad.44.1744853593562; Wed, 16 Apr 2025 18:33:13 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c33ef11c7sm21349505ad.37.2025.04.16.18.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 18:33:13 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, Joe Damato , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Shuah Khan , Xiao Liang , Willem de Bruijn , linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v2 3/4] selftests: net: Allow custom net ns paths Date: Thu, 17 Apr 2025 01:32:41 +0000 Message-ID: <20250417013301.39228-4-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417013301.39228-1-jdamato@fastly.com> References: <20250417013301.39228-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Extend NetNSEnter to allow custom paths in order to support, for example, /proc/self/ns/net. Signed-off-by: Joe Damato --- tools/testing/selftests/net/lib/py/netns.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/lib/py/netns.py b/tools/testing/selftests/net/lib/py/netns.py index 8e9317044eef..8d5c26317cb0 100644 --- a/tools/testing/selftests/net/lib/py/netns.py +++ b/tools/testing/selftests/net/lib/py/netns.py @@ -35,8 +35,8 @@ class NetNS: class NetNSEnter: - def __init__(self, ns_name): - self.ns_path = f"/run/netns/{ns_name}" + def __init__(self, ns_name, ns_path="/run/netns/"): + self.ns_path = f"{ns_path}{ns_name}" def __enter__(self): self.saved = open("/proc/thread-self/ns/net") From patchwork Thu Apr 17 01:32:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 14054780 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 82A441AA1C9 for ; Thu, 17 Apr 2025 01:33:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744853599; cv=none; b=bP6FMBcizRrngWytvcVV4NKNp/VZ1ZnDHD0ETDfek3afkuLAU3q7KQ/yAp1Xr7X4rtmhdzmNQ/RhdQIESTg6Rqvujp+L216NoBFG8Vky0glFufz3m8TT0b92PmCqktJABTWGr2BfErSv9OLFo+sBq7NGZy5XR1dSR7aq3YXQu/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744853599; c=relaxed/simple; bh=7/43IpTzeRiEM6Px6bilPKt+XjpfXGEavwRwx/SGMHg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D7tQTzzjYKweHjPURSt2LrJ2xR4QBmzxaGEW0Ei2UTb4W53ExNQVC3eZ5gGBFEeiE2NJbGOXSstYMLrbFdDwV1Sgeg4I8jVL5VBJdxjUAg0kGp3Wl1ZM8ywqXwmUKVnxqBgMKUOugJB4OdZfw8M7DaoWetGWA8q4gBMBzV16k/U= 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=Z14ren/J; arc=none smtp.client-ip=209.85.216.47 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="Z14ren/J" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-3081fe5987eso162819a91.3 for ; Wed, 16 Apr 2025 18:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1744853597; x=1745458397; 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=06V3AHEiTyRxQXWcUBqLLERPc2tH+snQC0VRRM2/tsY=; b=Z14ren/JMi4GWFhzOQNe0vyUdMCPw6kGzhVeVtems/5lF7WmdmNIbQeCP93QqYBdFW +9dpZKdQm4SEo3YsyocQpjhvRm0x7OgDDyHMDb4LO/pyusZPkRxTP6un8mCJW+GnQkKl uNl/OC0YeogNPsYjR35mujRmrEpw1Th0JOeEw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744853597; x=1745458397; 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=06V3AHEiTyRxQXWcUBqLLERPc2tH+snQC0VRRM2/tsY=; b=IPuKpr7eLqrrIKnCnFw4o0Kx2I7G7EzOXuTJdkNF29KwISLbzVPTKXQ0FzFXPS8DNT 9ZJMirtQkvkIqicA9SGCw8evf256nZbHLyDHpSLj0Kv7hISwb1GCHsrGEH2i9Kiixm48 pC22WYhnVjsbgX8qjPADRUnFSv5BZ6p05Ox3zNFBIQaWJ76NFh/sFuHSfrpI4w90Y9EO 9BoTWKo13Iv409walMCkTj5euOq+PPNkCMxhWC7mGeYY4HLDjAbgZ+2MV/4TVS3WJmx/ 0uQdVO4llN27DBmT8+1zLr9JljEL6BVW2BWgRYa1RJigrjEyFTwvLkoE+9kwoQPsJnar J68Q== X-Forwarded-Encrypted: i=1; AJvYcCWBxrwGorsrIInrltMEHoojxSKXgF3/ce721bDBPdh+m3Uscr6RsdW/9ck4jC9MpN8Oy8Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwTSfbH2n8adTG8qW/GoVkyNAfXo1QzkffZ+CzmgdeG3aYLlg0d +YPI2fO7oqbZlvGFXA+m4NCXB5tsPSsSPR+yJ2GbJJfqAANjCaq/6cf3jkaYxLI= X-Gm-Gg: ASbGncvonl4OljhypPbciIshgra7EhjetZw1k5s84y4BysIuJ7N21nyq6EEpMwomnYV ncnxAY254ks/sQKcYLXcHXF/Wu+glwKi3F9CnlkseOmDz56KxAvzlItWf6HXkCnWW5948QfZxjY CS7wiVjeAs1tHMpa95F4+Ar60fWbL8LliSixpb7nBskY+NE8Yl0otzHrn1zwEhomA8uG9otjM28 7MBMgU6BhQHOYGHykGL3lToG0NJpZGehbqcWXP5Zvwi4PbYwBBauxWme1jOEUsJVOWW2PuduB9l RSabRA8I1qpfXJgnhnKej7wKMVrB/uG+3y/FgnutnEn2DTkN X-Google-Smtp-Source: AGHT+IFwch9vZHyhnlVsQfTQrueevfR77nz+jh/2oHSkFCsSh+vQ8ZBfNCPWGD7K+cO6E4Q2GoQ9ww== X-Received: by 2002:a17:90b:5211:b0:2ee:f22a:61dd with SMTP id 98e67ed59e1d1-3086417cbacmr5223592a91.32.1744853596874; Wed, 16 Apr 2025 18:33:16 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c33ef11c7sm21349505ad.37.2025.04.16.18.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 18:33:16 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , 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 v2 4/4] selftests: drv-net: Test that NAPI ID is non-zero Date: Thu, 17 Apr 2025 01:32:42 +0000 Message-ID: <20250417013301.39228-5-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417013301.39228-1-jdamato@fastly.com> References: <20250417013301.39228-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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..71bd7d651233 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 xdp_helper +napi_id_helper diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/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 := $(wildcard lib/py/*.py) \ ../../net/net_helper.sh \ ../../net/lib.sh \ -TEST_GEN_FILES := xdp_helper +TEST_GEN_FILES := \ + napi_id_helper \ + xdp_helper \ +# end of TEST_GEN_FILES TEST_PROGS := \ + 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..aee6f90be49b --- /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 = rand_port() + listen_cmd = f'{cfg.test_dir / "napi_id_helper"} {cfg.addr_v['4']} {port}' + + with bkg(listen_cmd, ksft_wait=3) as server: + with NetNSEnter('net', '/proc/self/ns/'): + cmd(f"echo a | socat - TCP:{cfg.addr_v['4']}:{port}", host=cfg.remote, shell=True) + + ksft_eq(0, server.ret) + +def main() -> None: + with NetDrvEpEnv(__file__) as cfg: + ksft_run([test_napi_id], args=(cfg,)) + ksft_exit() + +if __name__ == "__main__": + main() diff --git a/tools/testing/selftests/drivers/net/napi_id_helper.c b/tools/testing/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 = 1; + int server; + int client; + int ret; + + server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (server < 0) { + perror("socket creation failed"); + if (errno == EAFNOSUPPORT) + return -1; + return 1; + } + + port = atoi(argv[2]); + + if (setsockopt(server, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) { + perror("setsockopt"); + return 1; + } + + address.sin_family = AF_INET; + inet_pton(AF_INET, argv[1], &address.sin_addr); + address.sin_port = 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 = accept(server, NULL, 0); + if (client < 0) { + perror("accept"); + return 1; + } + + optlen = sizeof(napi_id); + ret = getsockopt(client, SOL_SOCKET, SO_INCOMING_NAPI_ID, &napi_id, + &optlen); + if (ret != 0) { + perror("getsockopt"); + return 1; + } + + read(client, buf, 1024); + + ksft_wait(); + + if (napi_id == 0) { + fprintf(stderr, "napi ID is 0\n"); + return 1; + } + + close(client); + close(server); + + return 0; +}