From nobody Tue Oct 7 05:19:38 2025 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.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 A16A6242D80; Mon, 14 Jul 2025 09:57:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752487042; cv=none; b=WbbTy8SjBhKG1jASYAlBmvEAWO7eXxIaAAxa7Aspcf1Gt1qosOrutHCGsS9Z8iWKYnuMogFKG1llti45XsPrdjy4gX3QtqXmOxiFBxZLsC4fNs63Il+JwSslVoP22w142mFLpcy0Vme/qtq9Xu8qc1Bg/8G0gF1vUyNVxxF3NwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752487042; c=relaxed/simple; bh=ChshbD/9rJO9uQPsbip0xh1KbC5quEnVK0Zi0ND3pyY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i7WYxo3PtC4DsoQAXLMjOgRtK0ZF+GybXQw8mfJKbUkGouy1MmuY3xVdmk1wchEU1eV1frpuCVoXKDEdLN2riuL9SkI52Msskz8CFQ6Z6EkqLqFzO6sNV3eJFN4NLL8ijWOTvi+Xxe1d6TQElIWspRsWcxLHmWWPrOEUF7c+RkY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-ae3b37207easo852943666b.2; Mon, 14 Jul 2025 02:57:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752487038; x=1753091838; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fmyjkGpa6kzgAyMB5Phrmt7+/790pSNzzlVYNcZMnAg=; b=n5mBXEntCENDgRfDCc/2PyxEOlS08pkW1GPd07ErR3APvZVx2VmCl265QuFwrLkW12 aSipi/Iv/1BYCXGFrtYcqYQj0xZO3SvjQPl1oBKw9EhZrqMlPkaawu2YZ51fEnSTLPYA KBC4Y9ookw9/RO+P7jT61ukRtRKh1U2VWfTHvrrL8dbz8C41FwTvc626xb3K6zsNhknQ c3XK1qR5+wxOFosjfb63EzKxcrOv1usyaIjLDtW5o20AFxDoQ2ejhwTI7WIXA137cvm7 fYxlAsuBVBDUy4qcvDvbf6aOYTJVPFSLdixKBWWsikMRyZ9+A4tA6HaD40nraNngYTA3 PSHg== X-Forwarded-Encrypted: i=1; AJvYcCUB7zM9Nf3M9p+clLFxk4CQNltYXu0UVa9Jr0itkz0vOivuaxso0UZNACNnnA9ZtLZvay4/kn6l@vger.kernel.org, AJvYcCWM5NTsng1sYx4xLn2fiieyooa5vKdMLPDbYY+VjtJnVQq/w/fHkEZFVTLKVMWsaWG08ao=@vger.kernel.org, AJvYcCXKUOfis8fK+9vct0T3gt3ohNcRdCe9v02c+8ZQ5VLIn4dbJ5J+Jtp0AmjhZhcIc5MOzOrmERN1cCwBloJBeWW8@vger.kernel.org X-Gm-Message-State: AOJu0YxG5ZUU78gk7+TYoHqrsXXmN77PNc1MseYZMVo75jU5L7oj342m EXZ6xILMxth9pvDBoqFbBbP8R+NnF+PMqkvJ9lUs0byVDdUfEECe868yh9KMvQ== X-Gm-Gg: ASbGncuTclKqeyiS10FbYYijOMwuWkk0h2woKvJK3F2vueJA6SzDo5zVS4GY94a7RTF syV545GsaSyyZ5LLSu9uySEF60+NUPrqNtsQA9SBsW23SuH91I/X9aX7uLYzTK61m4qjbdqm1ao V84pWghD9dhQ+9e5fSMySL4iWnsxVuTUleX9uutVJFxNqdE0ji0tOiRIPTzk7hWnBFfFzlDiEZ8 pg/b34guvPbhGJfPSk1HUyFVi7ZzxgLbAhfsiwE12ZyVIHQsp8Y9KCpulEKKbuZIu0yiTd8SUyA NHFaNYrGHsWKKTvl/TN7IvQEw7+x8VesvzxaIPCmPOm3D6eBwxDo9Q/GIFjISAb21LqJt3m/szu b+0+V6XaelHdH5xTIDkkezMQ= X-Google-Smtp-Source: AGHT+IHcl88k0CW/VbwwiMxugbd2UFi7hdYDKpU7l8lSt8dSo0lLgQ7HQEUJ436X21XoY75HnRDOAA== X-Received: by 2002:a17:907:3c90:b0:ae0:1fdf:ea65 with SMTP id a640c23a62f3a-ae6fbc8859emr1316842466b.17.1752487037526; Mon, 14 Jul 2025 02:57:17 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:2::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae6e7eeae48sm805749966b.65.2025.07.14.02.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 02:57:17 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Jul 2025 02:56:48 -0700 Subject: [PATCH net-next v7 1/3] selftests: drv-net: add helper/wrapper for bpftrace Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250714-netpoll_test-v7-1-c0220cfaa63e@debian.org> References: <20250714-netpoll_test-v7-0-c0220cfaa63e@debian.org> In-Reply-To: <20250714-netpoll_test-v7-0-c0220cfaa63e@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Willem de Bruijn , bpf@vger.kernel.org, kernel-team@meta.com, Breno Leitao X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=3301; i=leitao@debian.org; h=from:subject:message-id; bh=QHETBsAdJnyzm0pnaXYvDCa1NIF7Be7QLtou7j9sAGg=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBodNR6KspuX74klBS5R2CyxZPqisdNrQVrdMiA4 v7+kaunIHGJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaHTUegAKCRA1o5Of/Hh3 bT5aD/97xKIgSGRyTGqKhSaWHpMXm6OcLabL/bMR+WRhjFDP5wk0ii0csTVPJsA/OCTfePzE1bB 6SNUw9YP7+JcrY8C6WbN/UE2+zJjuWD0FtYRWkVYSCs4bZwE8Tgzsz0ISr2LdzP5IpppqluHchf A3DO5QfYmaNPnbqjGj8BVeevMeh1BnMhlKbfQU580GjBDJTPP3+Derut+63cPu6Xw7g7w28Zixr P6JNa/igiHVrARtXODIC3/Q8G7pNh+QhCvSi+XNiK7In/M5JRD5dwzcFlIJXfGLNgS8xsmXWFr9 598v4lGuVlkGmaFQff+sJg0W2ODD1HrPkIMMz4BHcFZPA4O3M4C+nbwXYQivZkGvaEfAJbNbWmE og4MGCRPOxaVpuWwsq/sqxYU5lq2zBQ364evTj25AcHs/7L+GRVouE1zGqdOZ6HuLpOOv6VI+FZ tg0nlCakq2m1+hPGDpraF0rk7Gom1jA57Voxt4pBMxzZTTn5r+BwCa10f4QRj8qwzcgpnqkFlRn uP3KnVcsubBUEszNgLdjm+kvbX9bBUsG8ax8dCcY+XIsSaOZrSMlGE6qIKXN4vmh3R7tCzjxWKG Q6F/NEKvb8aq/qsI5RF4WYMcn5GkXL0BS7w+HwIVABGP5r23Qflf0h4YXQGlHWpzUxi3hC+C8f+ AdoatGjtPkU6KaA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D From: Jakub Kicinski bpftrace is very useful for low level driver testing. perf or trace-cmd would also do for collecting data from tracepoints, but they require much more post-processing. Add a wrapper for running bpftrace and sanitizing its output. bpftrace has JSON output, which is great, but it prints loose objects and in a slightly inconvenient format. We have to read the objects line by line, and while at it return them indexed by the map name. Signed-off-by: Jakub Kicinski Reviewed-by: Breno Leitao Signed-off-by: Breno Leitao --- .../selftests/drivers/net/lib/py/__init__.py | 4 +-- tools/testing/selftests/net/lib/py/utils.py | 33 ++++++++++++++++++= ++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/drivers/net/lib/py/__init__.py b/tools= /testing/selftests/drivers/net/lib/py/__init__.py index 39968bc3df43e..8711c67ad658a 100644 --- a/tools/testing/selftests/drivers/net/lib/py/__init__.py +++ b/tools/testing/selftests/drivers/net/lib/py/__init__.py @@ -14,8 +14,8 @@ try: from net.lib.py import EthtoolFamily, NetdevFamily, NetshaperFamily, \ NlError, RtnlFamily, DevlinkFamily from net.lib.py import CmdExitFailure - from net.lib.py import bkg, cmd, defer, ethtool, fd_read_timeout, ip, \ - rand_port, tool, wait_port_listen, bpftool + from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \ + fd_read_timeout, ip, rand_port, tool, wait_port_listen from net.lib.py import fd_read_timeout from net.lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \ diff --git a/tools/testing/selftests/net/lib/py/utils.py b/tools/testing/se= lftests/net/lib/py/utils.py index acf0e2c386144..5950a643a5336 100644 --- a/tools/testing/selftests/net/lib/py/utils.py +++ b/tools/testing/selftests/net/lib/py/utils.py @@ -189,6 +189,39 @@ def ethtool(args, json=3DNone, ns=3DNone, host=3DNone): return tool('ethtool', args, json=3Djson, ns=3Dns, host=3Dhost) =20 =20 +def bpftrace(expr, json=3DNone, ns=3DNone, host=3DNone, timeout=3DNone): + """ + Run bpftrace and return map data (if json=3DTrue). + The output of bpftrace is inconvenient, so the helper converts + to a dict indexed by map name, e.g.: + { + "@": { ... }, + "@map2": { ... }, + } + """ + cmd_arr =3D ['bpftrace'] + # Throw in --quiet if json, otherwise the output has two objects + if json: + cmd_arr +=3D ['-f', 'json', '-q'] + if timeout: + expr +=3D ' interval:s:' + str(timeout) + ' { exit(); }' + cmd_arr +=3D ['-e', expr] + cmd_obj =3D cmd(cmd_arr, ns=3Dns, host=3Dhost, shell=3DFalse) + if json: + # bpftrace prints objects as lines + ret =3D {} + for l in cmd_obj.stdout.split('\n'): + if not l.strip(): + continue + one =3D _json.loads(l) + if one.get('type') !=3D 'map': + continue + for k, v in one["data"].items(): + ret[k] =3D v + return ret + return cmd_obj + + def rand_port(type=3Dsocket.SOCK_STREAM): """ Get a random unprivileged port. --=20 2.47.1 From nobody Tue Oct 7 05:19:38 2025 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.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 4D525221FD4; Mon, 14 Jul 2025 09:57:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752487042; cv=none; b=lbDsV/CQRM8wL/ZIV6Vudw05GxOOtOkBxcSkUmkuA5qCjGZtNrSm8TMLafOcasaFg4RZQCoQENFfKhCpsNdP4R3Xm176h9vkNblo3FSjtkWt98Hge7zt1s4vUm1HQeJMHLCJObV3SqdLNe3NHzHy1HLt7wYbhYBY4fJsWJAll9k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752487042; c=relaxed/simple; bh=P7JVfsBUsMMZTxDh1HoNFYhHQjPyRSuGC1h9Mc5xifY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rh63pcZM/wThfNwtx1tPdYnpT1n51Cqn1xjElpwT7lS8K4D/DyP9K4cDT2cPdPW3AoDMsuwNWybDRU1PIZMg6A+rZuQ0li25qApFY72kyF7SJR8qOc/Wk+ZWzEHQICN2TT2R8KM9mJS8Ge3LytP5u0yX7WhrpuTRcerOIokHBGM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-ae361e8ec32so773935366b.3; Mon, 14 Jul 2025 02:57:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752487039; x=1753091839; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dMqqFmzAzdaOBbXXBjjnzeqSqi7pvd+kihHl/a1RYho=; b=quOXhM/+M9JCd2JXLD6beRZvHRHWm+aa1cFPEZ6Qe+gpDfmZ+JVUzJQX5rMvumCett quRGLZV20P8xF27c6pbPFIzcpMqnqm+6Z5Hy5egUKDHPq1hvoMTIdpZ79SDyCKtruK5m xjdT4xnvaVfrkeQZ/EKrzDwAZLi1CSHJ1QFBJY3KhcmxrLakDIFeLc1KRcHERClWghsH J/cw4j8BmI9d9VDP4urC1MqiYzPuyPdmDVHsJM2IL3V8lVdOhnMaxK2/Qp+vkCp8c95W 92HlGo2RYHUrFaOpv2gcYx/PdIwmyFS0rnRQs7BDgj+nUnpLhZnwb0ghc9Z3/xtDvvtT Ie1g== X-Forwarded-Encrypted: i=1; AJvYcCV5s1bQbZ51Niyu8ln4GclmExZO190QmWQEgv6iD0aQ6puGW2BM/sdNhqqVfEo/C7dOeADETupymdDXBVA+kOQd@vger.kernel.org, AJvYcCVaXi9fL9KRVpcV/w2fPI5uQCUfpb4Yh1CjrgaMYmPrKsgkUdzA+jApSuyZyp9tfWx1NKQ=@vger.kernel.org, AJvYcCX3TDF2ZS6/n5OHVDU2bcgHh8DR3O+jGkRan8WOJtYLa1pQbEovjsiKBXtiQDEFzI0oobwvs2R4@vger.kernel.org X-Gm-Message-State: AOJu0Yzfi/hCXsac4RyJUeyN2j8AecYaCVM68SSWzIbYhyX4vtxGuK41 gd31/pukMG4UaQhWoWjlua5gRx/ENyDpalmStQI7Q8DcMs621LOFLGOQ0mANHg== X-Gm-Gg: ASbGnctdUWEE5COm3HZ+rvX+B9n98yHY6sY0Bd3tATUjWcPjAHeYt14kwi27Xyf4htL MGkZ6YF2QVjquOJVtTWlXn3bbl7LmX4/6rzS9Y3ct03iOfmBVVglCrku+zvaKGRh9qGdiUG7Zjv NwPbf8ZIzPyolG7FA/Oq9ZfQp0y6bGKRMHZoACKIwL6Cc4gQIrbp4kSvLfh6TcuerEaDBc/2GDB l/ysnPKMgCBw2jK58FQp91CEzxL+8oYpwJqvDTeG4FopBm5LQa7TduY3OfXHR4bNPAEOHXzqfEA tAdbZQ6RJ6rGET2EFl2lOamawAGew27GNBQ71ORFTVqAFi9WeyRrHmc9Q/g4VMnP0Aesq5J+r8G ejLjlIobEBJZ5ng== X-Google-Smtp-Source: AGHT+IF/vD7T/pdpzQLhGdJzue0ydgrWDnzLvOvIpcPbUQlXvvlh6V78EeHIOZ+orpW9suJ0cQjrDQ== X-Received: by 2002:a17:907:1ca1:b0:ae0:c690:1bed with SMTP id a640c23a62f3a-ae7012db12emr1256262766b.51.1752487038948; Mon, 14 Jul 2025 02:57:18 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:72::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae6e8294bb2sm794448366b.114.2025.07.14.02.57.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 02:57:18 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Jul 2025 02:56:49 -0700 Subject: [PATCH net-next v7 2/3] selftests: drv-net: Strip '@' prefix from bpftrace map keys Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250714-netpoll_test-v7-2-c0220cfaa63e@debian.org> References: <20250714-netpoll_test-v7-0-c0220cfaa63e@debian.org> In-Reply-To: <20250714-netpoll_test-v7-0-c0220cfaa63e@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Willem de Bruijn , bpf@vger.kernel.org, kernel-team@meta.com, Breno Leitao X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=1053; i=leitao@debian.org; h=from:subject:message-id; bh=P7JVfsBUsMMZTxDh1HoNFYhHQjPyRSuGC1h9Mc5xifY=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBodNR6hwPa3EaEIwDul2tGXRF7LnTiEeR0ew812 s6F9w/8zBSJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaHTUegAKCRA1o5Of/Hh3 bYAuD/4oSX5diUff8wqHFaRoOq1h/+Ucfw5o5OQig7JUXDzUD2rF5hv01rd7U9CXsMRctR+2OM5 +Hv28kJ6oaNTIsA97sn86sr/5YhMaJZb/VlTYJEwUOYlXrR+DfI5qzVaTA6tMuz2UafArmN2y6k buBfSCqe2Z5jbkVckAi4RSoTtxYVF6v+cWneKxINo3ITz25k4P9C0iORBhaamZqseV2u7PRyGD3 gs+sIi/o5QLgr56k+GN1c1wuA9m8T0oG1CE+nW6wQaqXuFcLSxmD5PkrR6DLQ3JYmlbcGqw3+0g x+rNy/YObFCJxhENyIyWtkJblGKf6c8+GMNL2sK4yVN8bMHrRe6+zXz1WeKch+yI80pZHO5aOLk WD5xadurPtmcYjxxPtSgVcgm1zo2Cw6WYMpB7SSIAoAAxK0nbjHEllOPv+8f59PNmYTpCF+T436 upP3xmhaF2DK0nJjPyADumailuC78GkHiNOk6zjr8dr0vINrXTmxFfNrsqBOa7oFqyrmgybgcGX FNSOeVXSez1Vx2shzmRsRNtZnAhUv5+tiNXvu0+cSH0kk3Fxh4JPHyjmjasK64w4vB/UCEZlk6B 3mmt/gKsOtDNwQ75ga0x+x3/khkml9ztYhyYQqTCvjrv8SxGQsh0VfrcW8868BA2iPQoF7bv6zH h7I0k3uDUq55P1A== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D The '@' prefix in bpftrace map keys is specific to bpftrace and can be safely removed when processing results. This patch modifies the bpftrace utility to strip the '@' from map keys before storing them in the result dictionary, making the keys more consistent with Python conventions. Signed-off-by: Breno Leitao --- tools/testing/selftests/net/lib/py/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/net/lib/py/utils.py b/tools/testing/se= lftests/net/lib/py/utils.py index 5950a643a5336..f395c90fb0f19 100644 --- a/tools/testing/selftests/net/lib/py/utils.py +++ b/tools/testing/selftests/net/lib/py/utils.py @@ -217,6 +217,8 @@ def bpftrace(expr, json=3DNone, ns=3DNone, host=3DNone,= timeout=3DNone): if one.get('type') !=3D 'map': continue for k, v in one["data"].items(): + if k.startswith('@'): + k =3D k.lstrip('@') ret[k] =3D v return ret return cmd_obj --=20 2.47.1 From nobody Tue Oct 7 05:19:38 2025 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.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 EAA38245014; Mon, 14 Jul 2025 09:57:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752487045; cv=none; b=LgWuBT9QqSFuOvhBKJn8pKWkT9ILcPHZ4stvIigHivhzrAZUj6zeTWVSk4HFloVId7AUTMuLnudUHkYh3uP9NW+uoi2WZ/vppbkwTk1yngBACYwR5Om/gCPc+oUc8XrgKAIF+vEhEf+XUW1McC6Y4xZ8xwq8UFhvte+dHKQSJnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752487045; c=relaxed/simple; bh=4PUUFQopNWdbDgg0u3YlG82u/hz7li2G4FaDvZ6YhcQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Gp3f3e73CpbcaJ78SpvKWXpwZ/l42My61KC7d3a2dQvm68Bn31fna8o6ObXlVK3eSssexkWqKhvyX+s5Mnp1neIte79q3RqdVrIZT17JmDjq2v46rynWhEyZ0AjMUW3qzVBCkDp4aD/5lLmHu9bhQLqFu5GPeYrOKvAccaXdK+w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-60bfcada295so6381020a12.1; Mon, 14 Jul 2025 02:57:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752487041; x=1753091841; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Iif/tPC1a66vRUitvjQII1Cjmas2fT1VMy6tpXIQwTo=; b=l4I1q82ckqIp9Uw0c5rujp4Nd/zYdcgAybU7cqfAXiHmoGpAdlOVXyGCWHC0c9qsKG 7OSmulxX1YOEQEZFjRJQPkCU4Q7+ez/Qc3f4GI3RAYR8UB8ycbdE/8ddjdByheMbabIG +AKul1Allboueuc6WEPRLfEXlDIVdERHW68HgliVIsYV7MzAFJQgMaPbBGE9QuwEtDjd CAfnBmLQtn+zlGkwX59rkT5qrg+PhYLvLFEv9GL7NH6NlZ3J5z7a9MfS01UR+Y/TB43+ vecVDeV/cA7bRNZBGkG0j8RYjWZPRbUS7V+XbUulQN1HGUH0/WvB34r6v86+pZJDUUro w4Mw== X-Forwarded-Encrypted: i=1; AJvYcCXH7Ou3e3QOwkXKmZEjctR2mLWYoH490D19SnhseZR1bnb6dJawfF6PasbJLIh1UKTVIIfAbLJYjhqG9MPCdFNp@vger.kernel.org, AJvYcCXgADIDh1zBnZ9XbL6XDdwm0gueNKwld0qU5DzQvSRxjT11dhIuAfJgG5uiUdj9w8UHeCA=@vger.kernel.org, AJvYcCXrpJP8D3rgX3eP5vU4HWH2cOZ0GwPyN/RGJVti17DGPiwKoDfOckEc6nv4XudZaQSDW9gBwTwx@vger.kernel.org X-Gm-Message-State: AOJu0YwCQj/7HLSglrjoB+olcWsrA1o9baOy+RaIxHFggRLhCqVrJpT4 MAUnGH755Ube89AmLaBrm1y3ZWm7L8YK7jg7e1Wuz0vv0FTYbO4eZDNM8ls3uw== X-Gm-Gg: ASbGncv1/3PdDuC3lBYRfqO75fykNVFZo/SMmafPfOacy9voBXp1F0m/TKg0bvKq12O XAxWiHnmb2m/HO+Cg07iALrja4oAUDyHMCd0XUvG0PIYGv/BOTCkLOOHUbJBfw2jgM50cLgqr4I XpoSlG9mtPAyjYreD1ktClJnzpmJXXkeC7cDnHtf/8jX1LS01RKL2T/YTGXvHvxCXdJrxWHw0O9 CMvod2SArcGYh8kQKFzW9Y3Adj/+W9hTheA+DVKg3gbGQc1hLopLD9BVUcqw37wFW8b9L49LBPu xeJKb4N7gfntfzA3bjVxWs3x9/oDiuGY2zT8NsxPRm9TNTUoALlJ31RaYbXGJbgj6eHiCKD/J2I ZjwhlgyhLTpLS X-Google-Smtp-Source: AGHT+IHZr5zKTLSiWv3i4+7EBokAtcoOSjrhtZ2CWmjBbZcBCbH1Pp1i1PVzl/O/1AtTkQ3iifzISQ== X-Received: by 2002:a17:907:1c26:b0:ae6:e0b1:9633 with SMTP id a640c23a62f3a-ae6fcbc2afcmr1208967066b.33.1752487040562; Mon, 14 Jul 2025 02:57:20 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:4::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae6e82645f2sm783781966b.89.2025.07.14.02.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 02:57:20 -0700 (PDT) From: Breno Leitao Date: Mon, 14 Jul 2025 02:56:50 -0700 Subject: [PATCH net-next v7 3/3] selftests: net: add netpoll basic functionality test Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250714-netpoll_test-v7-3-c0220cfaa63e@debian.org> References: <20250714-netpoll_test-v7-0-c0220cfaa63e@debian.org> In-Reply-To: <20250714-netpoll_test-v7-0-c0220cfaa63e@debian.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Willem de Bruijn , bpf@vger.kernel.org, kernel-team@meta.com, Breno Leitao , Willem de Bruijn X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=15746; i=leitao@debian.org; h=from:subject:message-id; bh=4PUUFQopNWdbDgg0u3YlG82u/hz7li2G4FaDvZ6YhcQ=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBodNR6xU6Xjp9WkrQsyehYyS/dIKJ879xpLJQbA 7lEWetWbcuJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaHTUegAKCRA1o5Of/Hh3 bT94D/49bWePQ+FL9co/oZTEg8BlN7hGFhOzi63ipZOGNVKN3T8biLgT7yR+z8bm++DOoAsOde7 DO5SqMdLxbdAR25Uzp3fV95zTDGLQmcC0SG8ruUk4DdzTohUtfqNvOQdIYYRKVOeICji3glsg9+ nbrnNSuHMEEPFe+hO6dgX6DjaNWnvwSiggTm1K01ZFscuziVvnzu+PRydWJYMIAAziB2lyFtqzX SqN4YbNjjVRwY4oscIYiLmkc5Im7lKUtQDYb3yuJFghR4JX3wqQAoDRm6I3Alr/dNFGEaDP05mR y74hoREUOnULIr757SRm/LDGq8wmkpF1Z+/PJ1seIZzKOChEDWX4vTAgUwnRocBMptXNv5y9iGp n8jart3ysi2acvgRCVYrzOQpC13FmSXk0Z5EWGQt201tXHzPBG3DiubS2xxsYDkRStHnFRQlkiO Cvp2zn2YjYSdpbCO+cO/uD7echyFEdhdEk02tyh8koTe4FLn4WovlRfHC2syQZby9QDnvaAnCu4 HbhSD6yZ2y5JBD+M/els/rF3MKplEj48/9tbStYsIY0XwMZElqt6AHKooRVA9KPm8gcypuNYmJu pv50m8N+SL32i7ZcLg4NQfXBkcFcwLTHx3PNWl29AogSo9gARwSKBX46Uy/1lbASQfBAmuxgiII JClf/ivnXjqf33A== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Add a basic selftest for the netpoll polling mechanism, specifically targeting the netpoll poll() side. The test creates a scenario where network transmission is running at maximum speed, and netpoll needs to poll the NIC. This is achieved by: 1. Configuring a single RX/TX queue to create contention 2. Generating background traffic to saturate the interface 3. Sending netconsole messages to trigger netpoll polling 4. Using dynamic netconsole targets via configfs 5. Delete and create new netconsole targets after some messages 6. Start a bpftrace in parallel to make sure netpoll_poll_dev() is called 7. If bpftrace exists and netpoll_poll_dev() was called, stop. The test validates a critical netpoll code path by monitoring traffic flow and ensuring netpoll_poll_dev() is called when the normal TX path is blocked. This addresses a gap in netpoll test coverage for a path that is tricky for the network stack. Signed-off-by: Breno Leitao Reviewed-by: Willem de Bruijn --- tools/testing/selftests/drivers/net/Makefile | 1 + .../testing/selftests/drivers/net/netpoll_basic.py | 396 +++++++++++++++++= ++++ 2 files changed, 397 insertions(+) diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/s= elftests/drivers/net/Makefile index bd309b2d39095..9bd84d6b542e5 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -16,6 +16,7 @@ TEST_PROGS :=3D \ netcons_fragmented_msg.sh \ netcons_overflow.sh \ netcons_sysdata.sh \ + netpoll_basic.py \ ping.py \ queues.py \ stats.py \ diff --git a/tools/testing/selftests/drivers/net/netpoll_basic.py b/tools/t= esting/selftests/drivers/net/netpoll_basic.py new file mode 100755 index 0000000000000..408bd54d67798 --- /dev/null +++ b/tools/testing/selftests/drivers/net/netpoll_basic.py @@ -0,0 +1,396 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 +# Author: Breno Leitao +""" + This test aims to evaluate the netpoll polling mechanism (as in + netpoll_poll_dev()). It presents a complex scenario where the network + attempts to send a packet but fails, prompting it to poll the NIC from wi= thin + the netpoll TX side. + + This has been a crucial path in netpoll that was previously untested. Jak= ub + suggested using a single RX/TX queue, pushing traffic to the NIC, and then + sending netpoll messages (via netconsole) to trigger the poll. + + In parallel, bpftrace is used to detect if netpoll_poll_dev() was called.= If + so, the test passes, otherwise it will be skipped. This test is very depe= ndent on + the driver and environment, given we are trying to trigger a tricky scena= rio. +""" + +import errno +import logging +import os +import random +import string +import threading +import time +from typing import Optional + +from lib.py import ( + bpftrace, + CmdExitFailure, + defer, + ethtool, + GenerateTraffic, + ksft_exit, + ksft_pr, + ksft_run, + KsftFailEx, + KsftSkipEx, + NetDrvEpEnv, + KsftXfailEx, +) + +# Configure logging +logging.basicConfig( + level=3Dlogging.INFO, + format=3D"%(asctime)s - %(levelname)s - %(message)s", +) + +NETCONSOLE_CONFIGFS_PATH: str =3D "/sys/kernel/config/netconsole" +NETCONS_REMOTE_PORT: int =3D 6666 +NETCONS_LOCAL_PORT: int =3D 1514 + +# Max number of netcons messages to send. Each iteration will setup +# netconsole and send MAX_WRITES messages +ITERATIONS: int =3D 20 +# Number of writes to /dev/kmsg per iteration +MAX_WRITES: int =3D 40 +# MAPS contains the information coming from bpftrace it will have only one +# key: "hits", which tells the number of times netpoll_poll_dev() was call= ed +MAPS: dict[str, int] =3D {} +# Thread to run bpftrace in parallel +BPF_THREAD: Optional[threading.Thread] =3D None +# Time bpftrace will be running in parallel. +BPFTRACE_TIMEOUT: int =3D 10 + + +def ethtool_get_ringsize(interface_name: str) -> tuple[int, int]: + """ + Read the ringsize using ethtool. This will be used to restore it after= the test + """ + try: + ethtool_result =3D ethtool(f"-g {interface_name}", json=3DTrue)[0] + rxs =3D ethtool_result["rx"] + txs =3D ethtool_result["tx"] + except (KeyError, IndexError) as exception: + raise KsftSkipEx( + f"Failed to read RX/TX ringsize: {exception}. Not going to mes= s with them." + ) from exception + + return rxs, txs + + +def ethtool_set_ringsize(interface_name: str, ring_size: tuple[int, int]) = -> bool: + """Try to the number of RX and TX ringsize.""" + rxs =3D ring_size[0] + txs =3D ring_size[1] + + logging.debug("Setting ring size to %d/%d", rxs, txs) + try: + ethtool(f"-G {interface_name} rx {rxs} tx {txs}") + except CmdExitFailure: + # This might fail on real device, retry with a higher value, + # worst case, keep it as it is. + return False + + return True + + +def ethtool_get_queues_cnt(interface_name: str) -> tuple[int, int, int]: + """Read the number of RX, TX and combined queues using ethtool""" + + try: + ethtool_result =3D ethtool(f"-l {interface_name}", json=3DTrue)[0] + rxq =3D ethtool_result.get("rx", -1) + txq =3D ethtool_result.get("tx", -1) + combined =3D ethtool_result.get("combined", -1) + + except IndexError as exception: + raise KsftSkipEx( + f"Failed to read queues numbers: {exception}. Not going to mes= s with them." + ) from exception + + return rxq, txq, combined + + +def ethtool_set_queues_cnt(interface_name: str, queues: tuple[int, int, in= t]) -> None: + """Set the number of RX, TX and combined queues using ethtool""" + rxq, txq, combined =3D queues + + cmdline =3D f"-L {interface_name}" + + if rxq !=3D -1: + cmdline +=3D f" rx {rxq}" + if txq !=3D -1: + cmdline +=3D f" tx {txq}" + if combined !=3D -1: + cmdline +=3D f" combined {combined}" + + logging.debug("calling: ethtool %s", cmdline) + + try: + ethtool(cmdline) + except CmdExitFailure as exception: + raise KsftSkipEx( + f"Failed to configure RX/TX queues: {exception}. Ethtool not a= vailable?" + ) from exception + + +def netcons_generate_random_target_name() -> str: + """Generate a random target name starting with 'netcons'""" + random_suffix =3D "".join(random.choices(string.ascii_lowercase + stri= ng.digits, k=3D8)) + return f"netcons_{random_suffix}" + + +def netcons_create_target( + config_data: dict[str, str], + target_name: str, +) -> None: + """Create a netconsole dynamic target against the interfaces""" + logging.debug("Using netconsole name: %s", target_name) + try: + os.makedirs(f"{NETCONSOLE_CONFIGFS_PATH}/{target_name}", exist_ok= =3DTrue) + logging.debug( + "Created target directory: %s/%s", NETCONSOLE_CONFIGFS_PATH, t= arget_name + ) + except OSError as exception: + if exception.errno !=3D errno.EEXIST: + raise KsftFailEx( + f"Failed to create netconsole target directory: {exception= }" + ) from exception + + try: + for key, value in config_data.items(): + path =3D f"{NETCONSOLE_CONFIGFS_PATH}/{target_name}/{key}" + logging.debug("Writing %s to %s", key, path) + with open(path, "w", encoding=3D"utf-8") as file: + # Always convert to string to write to file + file.write(str(value)) + + # Read all configuration values for debugging purposes + for debug_key in config_data.keys(): + with open( + f"{NETCONSOLE_CONFIGFS_PATH}/{target_name}/{debug_key}", + "r", + encoding=3D"utf-8", + ) as file: + content =3D file.read() + logging.debug( + "%s/%s/%s : %s", + NETCONSOLE_CONFIGFS_PATH, + target_name, + debug_key, + content.strip(), + ) + + except Exception as exception: + raise KsftFailEx( + f"Failed to configure netconsole target: {exception}" + ) from exception + + +def netcons_configure_target( + cfg: NetDrvEpEnv, interface_name: str, target_name: str +) -> None: + """Configure netconsole on the interface with the given target name""" + config_data =3D { + "extended": "1", + "dev_name": interface_name, + "local_port": NETCONS_LOCAL_PORT, + "remote_port": NETCONS_REMOTE_PORT, + "local_ip": cfg.addr, + "remote_ip": cfg.remote_addr, + "remote_mac": "00:00:00:00:00:00", # Not important for this test + "enabled": "1", + } + + netcons_create_target(config_data, target_name) + logging.debug( + "Created netconsole target: %s on interface %s", target_name, inte= rface_name + ) + + +def netcons_delete_target(name: str) -> None: + """Delete a netconsole dynamic target""" + target_path =3D f"{NETCONSOLE_CONFIGFS_PATH}/{name}" + try: + if os.path.exists(target_path): + os.rmdir(target_path) + except OSError as exception: + raise KsftFailEx( + f"Failed to delete netconsole target: {exception}" + ) from exception + + +def netcons_load_module() -> None: + """Try to load the netconsole module""" + os.system("modprobe netconsole") + + +def bpftrace_call() -> None: + """Call bpftrace to find how many times netpoll_poll_dev() is called. + Output is saved in the global variable `maps`""" + + # This is going to update the global variable, that will be seen by the + # main function + global MAPS # pylint: disable=3DW0603 + + # This will be passed to bpftrace as in bpftrace -e "expr" + expr =3D "kprobe:netpoll_poll_dev { @hits =3D count(); }" + + MAPS =3D bpftrace(expr, timeout=3DBPFTRACE_TIMEOUT, json=3DTrue) + logging.debug("BPFtrace output: %s", MAPS) + + +def bpftrace_start(): + """Start a thread to call `call_bpf` in a parallel thread""" + global BPF_THREAD # pylint: disable=3DW0603 + + BPF_THREAD =3D threading.Thread(target=3Dbpftrace_call) + BPF_THREAD.start() + if not BPF_THREAD.is_alive(): + raise KsftSkipEx("BPFtrace thread is not alive. Skipping test") + + +def bpftrace_stop() -> None: + """Stop the bpftrace thread""" + if BPF_THREAD: + BPF_THREAD.join() + + +def bpftrace_any_hit(join: bool) -> bool: + """Check if netpoll_poll_dev() was called by checking the global varia= ble `maps`""" + if not BPF_THREAD: + raise KsftFailEx("BPFtrace didn't start") + + if BPF_THREAD.is_alive(): + if join: + # Wait for bpftrace to finish + BPF_THREAD.join() + else: + # bpftrace is still running, so, we will not check the result = yet + return False + + logging.debug("MAPS coming from bpftrace =3D %s", MAPS) + if "hits" not in MAPS.keys(): + raise KsftFailEx(f"bpftrace failed to run!?: {MAPS}") + + logging.debug("Got a total of %d hits", MAPS["hits"]) + return MAPS["hits"] > 0 + + +def do_netpoll_flush_monitored(cfg: NetDrvEpEnv, ifname: str, target_name:= str) -> None: + """Print messages to the console, trying to trigger a netpoll poll""" + # Start bpftrace in parallel, so, it is watching + # netpoll_poll_dev() while we are sending netconsole messages + bpftrace_start() + defer(bpftrace_stop) + + do_netpoll_flush(cfg, ifname, target_name) + + if bpftrace_any_hit(join=3DTrue): + ksft_pr("netpoll_poll_dev() was called. Success") + return + + raise KsftXfailEx("netpoll_poll_dev() was not called during the test..= .") + + +def do_netpoll_flush(cfg: NetDrvEpEnv, ifname: str, target_name: str) -> N= one: + """Print messages to the console, trying to trigger a netpoll poll""" + netcons_configure_target(cfg, ifname, target_name) + retry =3D 0 + + for i in range(int(ITERATIONS)): + if not BPF_THREAD.is_alive() or bpftrace_any_hit(join=3DFalse): + # bpftrace is done, stop sending messages + break + + msg =3D f"netcons test #{i}" + with open("/dev/kmsg", "w", encoding=3D"utf-8") as kmsg: + for j in range(MAX_WRITES): + try: + kmsg.write(f"{msg}-{j}\n") + except OSError as exception: + # in some cases, kmsg can be busy, so, we will retry + time.sleep(1) + retry +=3D 1 + if retry < 5: + logging.info("Failed to write to kmsg. Retrying") + # Just retry a few times + continue + raise KsftFailEx( + f"Failed to write to kmsg: {exception}" + ) from exception + + netcons_delete_target(target_name) + netcons_configure_target(cfg, ifname, target_name) + # If we sleep here, we will have a better chance of triggering + # This number is based on a few tests I ran while developing this = test + time.sleep(0.4) + + +def configure_network(ifname: str) -> None: + """Configure ring size and queue numbers""" + + # Set defined queues to 1 to force congestion + prev_queues =3D ethtool_get_queues_cnt(ifname) + logging.debug("RX/TX/combined queues: %s", prev_queues) + # Only set the queues to 1 if they exists in the device. I.e, they are= > 0 + ethtool_set_queues_cnt(ifname, tuple(1 if x > 0 else x for x in prev_q= ueues)) + defer(ethtool_set_queues_cnt, ifname, prev_queues) + + # Try to set the ring size to some low value. + # Do not fail if the hardware do not accepted desired values + prev_ring_size =3D ethtool_get_ringsize(ifname) + for size in [(1, 1), (128, 128), (256, 256)]: + if ethtool_set_ringsize(ifname, size): + # hardware accepted the desired ringsize + logging.debug("Set RX/TX ringsize to: %s from %s", size, prev_= ring_size) + break + defer(ethtool_set_ringsize, ifname, prev_ring_size) + + +def test_netpoll(cfg: NetDrvEpEnv) -> None: + """ + Test netpoll by sending traffic to the interface and then sending + netconsole messages to trigger a poll + """ + + ifname =3D cfg.ifname + configure_network(ifname) + target_name =3D netcons_generate_random_target_name() + traffic =3D None + + try: + traffic =3D GenerateTraffic(cfg) + do_netpoll_flush_monitored(cfg, ifname, target_name) + finally: + if traffic: + traffic.stop() + + # Revert RX/TX queues + netcons_delete_target(target_name) + + +def test_check_dependencies() -> None: + """Check if the dependencies are met""" + if not os.path.exists(NETCONSOLE_CONFIGFS_PATH): + raise KsftSkipEx( + f"Directory {NETCONSOLE_CONFIGFS_PATH} does not exist. CONFIG_= NETCONSOLE_DYNAMIC might not be set." # pylint: disable=3DC0301 + ) + + +def main() -> None: + """Main function to run the test""" + netcons_load_module() + test_check_dependencies() + with NetDrvEpEnv(__file__) as cfg: + ksft_run( + [test_netpoll], + args=3D(cfg,), + ) + ksft_exit() + + +if __name__ =3D=3D "__main__": + main() --=20 2.47.1