From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (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 A90CA39768D for ; Mon, 29 Jun 2026 19:20:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782760839; cv=none; b=UX7K96tepVIC4L5QNgOsDptV8eXhaHAtLUNWRyLPMHLM2RSvhF/F8+dgLJZfebKmc9supiOF09bCcHdSo+bQ01sz1IKne5EpGjx5TXH55IZUO7L4jtPajPRUU0nFa++VRztUG8NUkSodxpVZyETrQLVOIaiuarGjxz0imEKGiFQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782760839; c=relaxed/simple; bh=QBZxmTWawUTZNQSQjCCZw78T/8SJZ6wFeJT6/geEVGM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XFiMdTNnE3NmnvGzlLmah+lZAIH3b1llYCuo/LMc0d7BQIbLCFzbukSOCsxJ7r7FSjaLT7caEIdmB2SHq5MTBUgo4uMntcUm3vNafO/jdHIO3P+Oi05y1/Uy+pwVJY0dG+3Va5wgnuCvjwTDUkZ5jxcx/MPFRwehPdDHdfZmXzA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tanshuhao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=bd4p6ltj; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tanshuhao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bd4p6ltj" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-30b877ee493so5615388eec.1 for ; Mon, 29 Jun 2026 12:20:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782760836; x=1783365636; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=9fpTPHw0jPF1PHgzGmVWLf8QEAGl8IOcqrkx31ztxko=; b=bd4p6ltjqlA3As4odq1WHdN4n5ECMvrczee92pBCx52PdzmmzcJ+Le+u6hcaUEBp2z b6HBkVEd7NoIWLFA8VRR36oBo7Uf3lwGIL856FZpBBR0rXl1IlyyrWz5yUrB+tkfo96j Htb0QKxZT/KecBS64DmN3EiCGLM1/oatgd5vh18fXrrjhKK2PpGhVVc0VUk2PfdcZPYf eFn25OVUzW3Ms2qYsRQ2N12o66akau/9L4tcl9Fm3eWEqtBruW7o+NaDryuo3iS6UKQs Zetky7YCw9US64RHgwmyIA7C2BRhtQPQ5V0pASSn8uo3CKAL7fu17z2ddJttn4rztvkQ YGeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782760836; x=1783365636; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9fpTPHw0jPF1PHgzGmVWLf8QEAGl8IOcqrkx31ztxko=; b=AJkuGyzNH7/w4GS5wkWJcFzJds825xZXk6EVx/21WXrwxibth0TOsyJA2dSuIJT9ok z1GoSkejl1Fw+B5m51lffE+sBZNIqiH6wKcwV+uE64RKbVxZdeHXzLvsCLkFk4w706as zPBtjUlWZ4tvsKEDQyKMqQ+IKaals4klINu36uIwM0O55RQRLGfIOFs8vHDu/PFh7pn7 4OTzYcSPqJTSdAti9diKSZYOXI5zWaBSixTg5ktPLVbW+v3q+ZcrAD13lsac6fMafVoe OtY1g0CzJJEa6U7QBYG1yxc+fuFCdyc/vsM5uxEI2k067EsZ9DMrrhylLBJtsjxlxHkW 3svA== X-Forwarded-Encrypted: i=1; AHgh+RqIOj3zQhWPpSXREryUhRLCdehB/97Ek3XXlCGWeTxVucSS76pgEqhAa53W250QXiTaB0ZeGRYWskq625A=@vger.kernel.org X-Gm-Message-State: AOJu0YyjzN2MccZ9xE5PDAj6qmMOZGucyjSNrgsPQh2UGt78APt6LDK8 cTnd8yG7k66y5WpbRY9xQJHZLdKGEmLgdMmCiB8fIB9dnIy1ESrYfZb0pwuIgAAK4dk6ZpqFnT5 +CKtFFi4iE+shIhFyOA== X-Received: from dyjw37.prod.google.com ([2002:a05:7300:56a5:b0:30c:9f7d:e238]) (user=tanshuhao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:3b09:b0:30c:ab96:7306 with SMTP id 5a478bee46e88-30ee1cc79a8mr325933eec.22.1782760835402; Mon, 29 Jun 2026 12:20:35 -0700 (PDT) Date: Mon, 29 Jun 2026 12:20:27 -0700 In-Reply-To: <20260629192029.4013794-1-tanshuhao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260629192029.4013794-1-tanshuhao@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260629192029.4013794-3-tanshuhao@google.com> Subject: [PATCH net-next v1 2/2] selftests: net: Add kthread preserving test in napi_threaded and busy_poll_test From: Shuhao Tan To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn , Shuah Khan Cc: Shuhao Tan , Mina Almasry , Samiullah Khawaja , Kuniyuki Iwashima , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Add a testcase to ensure the kthread stays the same across NIC link flap. Add a testcase to ensure the same kthread can poll different napis across NIC link flap. Signed-off-by: Shuhao Tan --- .../selftests/drivers/net/napi_threaded.py | 41 ++++++++++++++++++- tools/testing/selftests/net/busy_poll_test.sh | 24 +++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/napi_threaded.py b/tools/testing/selftests/drivers/net/napi_threaded.py index f4be72b2145a..20110fb6942e 100755 --- a/tools/testing/selftests/drivers/net/napi_threaded.py +++ b/tools/testing/selftests/drivers/net/napi_threaded.py @@ -127,6 +127,44 @@ def change_num_queues(cfg, nl) -> None: _assert_napi_threaded_enabled(nl, napi0_id) _assert_napi_threaded_enabled(nl, napi1_id) +def nic_link_flap(cfg, nl) -> None: + """ + Test that if threaded is enabled, and NIC goes through + a reset, the kthread stays unchanged across the link flap. + """ + napis = nl.napi_get({'ifindex': cfg.ifindex}, dump=True) + ksft_ge(len(napis), 2) + + napi0_id = napis[0]['id'] + napi1_id = napis[1]['id'] + + _setup_deferred_cleanup(cfg) + + # set threaded + _set_threaded_state(cfg, 1) + napis = nl.napi_get({'ifindex': cfg.ifindex}, dump=True) + + # check napi threaded is set for both napis + _assert_napi_threaded_enabled(nl, napi0_id) + _assert_napi_threaded_enabled(nl, napi1_id) + + pid0 = napis[0].get('pid') + pid1 = napis[1].get('pid') + + cmd(f"ip link set {cfg.ifname} down") + cmd(f"ip link set {cfg.ifname} up") + + # re-acquire napi info + napis = nl.napi_get({'ifindex': cfg.ifindex}, dump=True) + ksft_ge(len(napis), 2) + + # check napi threaded is set for both napis + _assert_napi_threaded_enabled(nl, napi0_id) + _assert_napi_threaded_enabled(nl, napi1_id) + + # check the kthread remains the same + ksft_eq(napis[0].get('pid'), pid0) + ksft_eq(napis[1].get('pid'), pid1) def main() -> None: """ Ksft boiler plate main """ @@ -134,7 +172,8 @@ def main() -> None: with NetDrvEnv(__file__, queue_count=2) as cfg: ksft_run([napi_init, change_num_queues, - enable_dev_threaded_disable_napi_threaded], + enable_dev_threaded_disable_napi_threaded, + nic_link_flap], args=(cfg, NetdevFamily())) ksft_exit() diff --git a/tools/testing/selftests/net/busy_poll_test.sh b/tools/testing/selftests/net/busy_poll_test.sh index 5ec1c85c1623..897ce6700601 100755 --- a/tools/testing/selftests/net/busy_poll_test.sh +++ b/tools/testing/selftests/net/busy_poll_test.sh @@ -124,6 +124,23 @@ test_busypoll_with_napi_threaded() return $? } +test_busypoll_with_napi_threaded_link_flap() +{ + # Only enable napi threaded poll. Set suspend timeout and prefer busy + # poll to 0. Run again after a link flap. + test_busypoll 0 ${NAPI_THREADED_MODE_BUSY_POLL} 0 || return $? + + ip netns exec nssv ip link set dev $NSIM_SV_NAME down + ip netns exec nscl ip link set dev $NSIM_CL_NAME down + + ip netns exec nssv ip link set dev $NSIM_SV_NAME up + ip netns exec nscl ip link set dev $NSIM_CL_NAME up + + test_busypoll 0 ${NAPI_THREADED_MODE_BUSY_POLL} 0 + + return $? +} + ### ### Code start ### @@ -176,6 +193,13 @@ if [ $? -ne 0 ]; then exit 1 fi +test_busypoll_with_napi_threaded_link_flap +if [ $? -ne 0 ]; then + echo "test_busypoll_with_napi_threaded_link_flap failed" + cleanup_ns + exit 1 +fi + echo "$NSIM_SV_FD:$NSIM_SV_IFIDX" > $NSIM_DEV_SYS_UNLINK echo $NSIM_CL_ID > $NSIM_DEV_SYS_DEL -- 2.55.0.rc0.799.gd6f94ed593-goog