From patchwork Fri Apr 18 01:37:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 14056501 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 EA7B01D9346 for ; Fri, 18 Apr 2025 01:37:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744940266; cv=none; b=MD5qQb4LM+Kyo/rpQT0pkORFsLJ6OP9sFmmtdwxT3auQrUKY0D7xdPluKl0SHyOwYrS1CtC5mApjRUk7bnilFGSVTRpy0W3eUUVvxQvSLjAyjjyd0I+c2NH2yUyL7+VSk1JQOt1LOoWOztybQ9nnL0hDqMbYepr9BYF/O2TV4Ro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744940266; c=relaxed/simple; bh=peXZjv91qcnXAES8N8mnCKfga6OZjhML/WpesH4NfKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UP8rd6OLIgAfdo5ndHvIsfN9VM5k++o6rt/nboLYBvgFl13mx73kGpOvkezrmuDoIfZfXynp46vaTITyKcaLfqd7ZZbeAPMqf1vRCHxz/5gBTEusHoiNSwP92m7jmhTMNpS3zTiylbgpwFuO9avmaVQ0c9k8Zjbeemu2YoJ95RY= 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=iiYxrwzC; arc=none smtp.client-ip=209.85.216.54 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="iiYxrwzC" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-301e05b90caso1330136a91.2 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=1744940264; x=1745545064; 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=iiYxrwzCPHVwNzNkHvmgdeMg6G1GiTcCalPzEXwQw7saq/wrt8NPZQd/lz6GDMMX+W XPPtdNFinGhlG+x2SEYp1KGVoq2FwGetSV0u0R5EXdEBOSHhJOclN55yfmR1IrBEyHzK pWrgy+snDTtxGUJHA1iRmoMSw9FdGpf3Fqgy4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744940264; x=1745545064; 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=AUd9PnTFLJr1WJvGSskE+W+jrTNKFIhERLC8rB09uJg+xXVIHgNnI1CIV/UAhnZ2oQ u+A6nIhWqlwlG0naaTmTKsRl+MdbC667gEwIsT8v1iOtRJ+6PznRNwGTUKsAgvFYWYGO SfmmkoRXo4siIirwmS3lJGxQ/SzqiTqTkd1NBNZLovEz3xcBYLlX6j1DZpaNlEsFKbQs xaKA8jlOCVmyTX6LNb4mzgUWuesJHZ5tiLrqmIKufYBBU6TlxHJANG5T1qdKUXZAtUyG 8l+b5Rj+Kr8gOXq6Bu7ySgFpYRsY6j2RVf2OZeDDgsYrWp7XU5jEIMWnN7pID9rnIC1f Tybg== X-Gm-Message-State: AOJu0YyZ92WvtTNm4nD7g7KJ3DXIIigaoJTN8CeIM0MU5hp5fLBwoS9u 5VT4Z+b3cGNB9EtqPJy2vhPR3E92WGtr7BsIWtehG/c1iTMEsT2umrbKptcfQ+aw+EdNIZxRBPj ZL2+ZD/5cIlflsqlpmXeyzEs+2F0h+eCz/Sy6Y9DVbSI07ntvPxnGiprC00qGcjmVpt7wTENtrs 4i8arep+6CmLOsIumnlBt6eHTFcYX/rAILFvw= X-Gm-Gg: ASbGnctzpSxL0i2kyFis7ztuogL4Vq/tAzLLPxmBeXqFF4FOX9XojikujtPKLMqLBbl u+g9iZgxd8KCWxaBGEroUfQqVsfxAHOoZiOLF9r7w+Gp7c10X4+bz3LBHHY7woPnOTrmlZksoim B4CMGG12nZvPAN0GpMlbIQC4ZyZWZDqf5jO1GflVBNyS+o22OVYJdq6yNuMjFZxyoLdtM5QCQiV fVtOJjqcfSsDaVlDotab+i6NyZJbWT/69Jn3wmq8rFNp4WONPL/ok4tWIOum8nIKqaZD0H6oxur Iplem3JcsXydMSLfCbhdOH7LYYeqgl3orffCNOwe/UI5Dwe8 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: 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 Fri Apr 18 01:37:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 14056499 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 78BA21E0DE2 for ; Fri, 18 Apr 2025 01:37:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744940269; cv=none; b=mnYYaS4GO0rULsFqanZFEw49BU6DhdWdMvB8ZpaaQ1e8RXa45xmQADx2w0aA6+g9Kae0JYJDJQ7xf1zmU28Yfula6KLPfnrx/kJGPZTRVfPsdUDM35xRcMlLu/CoC/CD5A+0ltubMx8raQlM1N2yq8STG4Ns/zGdctLhxJF9W7E= 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.42 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-f42.google.com with SMTP id 98e67ed59e1d1-30820167b47so1501161a91.0 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=MeiFNnN5BasWF2SWStzt2aB00XwOYgsMOkXzrbQi8IDmrgLy6Tbfuwm5rWPvjnZ/p2 z69CN5VmzyCg8Bk0BbuL9wI0LjMTdsCylxGKZYtnKme0k+cXEsDUcnafjcLCinNxPhqg QzEBA8kCOEBkKx5AIfQUkTelbc96Kmkwo1OxWquWmMTyz5VWzHvPWERJMbuRWQcOo2g6 WVAGxwTv8tKInXYfyOjV3punnGk6aXm4h4WQB/aJoj9dw2GRlR3M955NRNuVbkDLoI3l I1w/n0a9Df3vr2AnhzC4Fqc7Qrn41Gecg5mDg1g9GKo2WTCT2qXNVXvtpdXToILdtM0/ sqMA== X-Forwarded-Encrypted: i=1; AJvYcCXgoL2XMkhn6ek688xhTfn3//zV72YvzV3v859+Etz5BHSyP3WxAu4AbE4DkAdlGD6RCJY=@vger.kernel.org X-Gm-Message-State: AOJu0YwQKl9RfRvdF2c5qO1heXYf+TGgqsYAMBH6gT7A4hnk6B4Wv26o y2w14g/Zemd/U8JJ4tbPw/ACsRP1QqDCuyAyLqfwUp0V8TyyDZ4HGmzUmTqsztQ= X-Gm-Gg: ASbGncs6eh633D7EIeMXrM92EPT6NWAQOul+/vK2lELktih+WgcocMJWdJksHXPZRPL maDaKrpu8JUamRRKqxWCb3K0dzKC3i5c01VLryYDryT1TjTS8WBfFOOyO+x3jDl/cMBxQz/FxAj exzSndmkDjDQlo0f8wfsxHoXovbPLDaxKilyAIAFrX5DPUAZhuC7lxOHbodYI0mb1Dvj/dJqWgl ltY6OIqIcfx4U1UiTEnaifZzUd55lM4fExA2mDTlpyrUwBkQ+7PxfAbL2KV9vBQ3HNCL0GO0Z8Z tbHJqPM//um9EAATwIEaJgrkLCMlX2BVXOCZ6Y7deWsZPoMPcyMmLingR5M= 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: 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 Fri Apr 18 01:37:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 14056500 X-Patchwork-Delegate: kuba@kernel.org 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 C63711E51EF 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-3015001f862so1121312a91.3 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=XJ3FxRbICKyi4O1Gntbn5SgE51sAQ6hTlIC63va9OtCIpEfIUfmyt7P/Vt71xEgbsp k3FNW/ZGZr1x2ROwUVeZ/aqJETFsHn1wIfD4D7ZL7na8KAkc5Nvde+R+GJLnaaciYKK5 GY7t/6bsbUIeDsd+TQupIHZM4s140Zf7ntDuTynypqMOteQ09+vbEng1tHkJxvlTFnOG gG6LIQosbeApxiVSPKjZz/AzL0zRJoGRC9yN0YrsnKmGu0WSBVbleUOqApSAQ2TGeVQN WZ/tBJewhUZaJ1RBA7rBNnUcqAhYWun3k4BcYEZbDPIFgShVgJKYlvfJ5i9B2uQfz74z WrXw== X-Forwarded-Encrypted: i=1; AJvYcCV2rGBb6ktF2BuZY+SnqunKNsYvwtivDmWO0XS3cKiaIgG1tHcsyGuY1FajMMvINGizw+Y=@vger.kernel.org X-Gm-Message-State: AOJu0YyGCKOyQKoM2onrfRfuTy7aVfE48zwatvvNXvELHY7by/5041ac +dJ3zjbxgIi1oRRn9pjEbXa4XhSToLC/VGy6HvzPp+z/Oq9iRwL5l0SjMqeS+Xc= X-Gm-Gg: ASbGnct5EuHzawJYjdg43D94NLEkHLUKpcE2t29wYBtqpjwZONR/IfSXid8ev9dz1kE Cqi8796oRwiPY8E43YHOHY5NMOgOg9HfH5xJqTZS/d6boUd3ez/8eMo4SoL/K7oOMDjzg6vRx1D CS+N/s669vwCiEuZlNzSWXVD0c4GaJQY0Nes5B+2oJu+RpmE4kWtLoSB+1kUN4Vjn30qNmGP98i NCuaftiO2Uku3WyzK726iFZT0Vb6h+5/q/CSv2WL8Y8lBfQXo+5XIEiBi9hbHUBXTPY+L5K0r1I ADW1cWnjI1/gofcahImLen3DawNcKn8RhJmw6yiLeqf4OhMVyObk17ZO9rE= 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: 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..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/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..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 = rand_port() + bin_remote = cfg.remote.deploy(cfg.test_dir / "napi_id_helper") + listen_cmd = f"{bin_remote} {cfg.addr_v['4']} {port}" + + with bkg(listen_cmd, ksft_wait=3) as server: + 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; +}