From patchwork Thu Apr 11 01:28:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 788134 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F07269D0A; Thu, 11 Apr 2024 01:28:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712798921; cv=none; b=YLnsT6jmlUKohjuseuCQQYjxs1qbriORnk0LnFkonw1Nc+qIM7Cwf2E/q4qx0asiSuUhfd1b/vA41lzEMMH/IeiSdtJj/3Hh/4z673oDkDIBBSXrWT7NEm+lCcSoF6OQNMsODIcIbPUCMJD8ZabzTKDWBjjGskU+QJxXbLpRCH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712798921; c=relaxed/simple; bh=Vfp9UyJOM8kMpvSyXcIKRtaJ0zyB4mIgfD2CwgNCQVY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fxnF1qgrYVawBIoR6jBbKHQxPStXfN7b6sqVIBAjzUHE9/PFuaMCQahqf6e/Gb/nBoT9aOfJPgCKB9AIPwCoKP9vEqQZde9qWstpXnQCDbkiX2dCxruWYcaxVxX7jHxd08JwEqWxyjfbLcHW4uN2QM3dfzsZg6uozGdopHNpd4k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AdQeKtR+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AdQeKtR+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DD4CC433F1; Thu, 11 Apr 2024 01:28:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712798921; bh=Vfp9UyJOM8kMpvSyXcIKRtaJ0zyB4mIgfD2CwgNCQVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AdQeKtR+qCBjWICspR0vy/IahEeGkhri/1IP/Gv7WxC6maxfhizZ0c06v5oB/h1m3 rh13c1Wd9g838zzQtciVKPfcZoADvLEbYVWB0ryher0n5Po6r5O85BtZKctzW0bXpe V6GkV3X1fPr7TnQ+LVYxmo2z6EIBmbfuaOId4GwrCvmvJT4wXUGnJAUCWBzBFHHhLS n13jvbNa7lGbNMb3zktVsFdryeXlfTRE/1+ydOKfwUh7epEnp834uHo79qk2AlIllH o54mM9zpbuqUL2d7eFeMUT9wpspNjQ71fRU5+cM4mzMQUQ2UFWV2f+OrHSKDgrPNr5 ZGBS6hXOBbIyA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, shuah@kernel.org, petrm@nvidia.com, linux-kselftest@vger.kernel.org, Jakub Kicinski , donald.hunter@gmail.com, jiri@resnulli.us Subject: [PATCH net-next 2/6] tools: ynl: don't return None for dumps Date: Wed, 10 Apr 2024 18:28:11 -0700 Message-ID: <20240411012815.174400-3-kuba@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411012815.174400-1-kuba@kernel.org> References: <20240411012815.174400-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 YNL currently reports None for empty dump: $ cli.py ...netdev.yaml --dump page-pool-get None This doesn't matter for the CLI but when writing YNL based tests having to deal with either list or None is annoying. Limit the None conversion to non-dump ops: $ cli.py ...netdev.yaml --dump page-pool-get [] Signed-off-by: Jakub Kicinski --- CC: donald.hunter@gmail.com CC: jiri@resnulli.us --- tools/net/ynl/lib/ynl.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py index 0ba5f6fb8747..a67f7b6fef92 100644 --- a/tools/net/ynl/lib/ynl.py +++ b/tools/net/ynl/lib/ynl.py @@ -995,9 +995,11 @@ genl_family_name_to_id = None rsp_msg.update(self._decode_struct(decoded.raw, op.fixed_header)) rsp.append(rsp_msg) + if dump: + return rsp if not rsp: return None - if not dump and len(rsp) == 1: + if len(rsp) == 1: return rsp[0] return rsp From patchwork Thu Apr 11 01:28:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 788133 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A764D74BF4; Thu, 11 Apr 2024 01:28:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712798922; cv=none; b=I7Runz0F0jsYzFpAfCfv/gn5/qK+HV1n4svxdnj+6rNUK9zzKavAgD4QVoO7q7cXPKxXfwuAAVAJVigUv7JtPIVmDYHnszpdw8iIA9fYZTT1sYPbuKPrLw1Uan6tx7RqYtMm3jAjfzZIlAUrr+0/kaUWHpwHrwYThb1d0BasIu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712798922; c=relaxed/simple; bh=q5ZxAEbUk4C1HZCRmIzc2uhxryfpIrMHKHvTDR9QIKk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VqdMzPZsxR+lOU8/hTxBnx01AJNDB5OCGgEKbsvL1fdZEOHT2zTEOsET4wIXHPmA0GzD6Gr1sYEHj+UxKqMEN+GgQZJu44hMizYwaA919tXneUlHB/qlxSA72INHbzLN7LuD4isF+sYW3Xdw4MQAVm68cmqOJPip+jZd6nBuoc0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JO4KNTz2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JO4KNTz2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FDADC43399; Thu, 11 Apr 2024 01:28:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712798922; bh=q5ZxAEbUk4C1HZCRmIzc2uhxryfpIrMHKHvTDR9QIKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JO4KNTz2UCOau7bGpUAGulsPluWCqfpim1erlvGqfVNRFl5/y8xZ03yMAm38BFqaA S1C3UOzOTShZGk8rnX8XlzAr/W5RYz8Is/1uEfAGWgDgHYRS+g9UEaXt/spRN/1Mfg 82Lc/Ge47LoF+Hy+1Uu18kFh0V73djZR265uRGhMakIZ0faVLpEaxAMQSTw4TUxGdb Xw0N8EtP9HWjrn/StZZl5AdO8GRXbtnclOV2hsmf30Ma0qP6TEH1Bmmplj0D4uvewg 9sN5W275R+mZqRh9lq2bHpjShif2GIEPAeQoNsrvoMSJGFtLWa82/MIbrgBQErtd1m +IozHT5RJCcgw== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, shuah@kernel.org, petrm@nvidia.com, linux-kselftest@vger.kernel.org, Jakub Kicinski Subject: [PATCH net-next 4/6] selftests: net: print full exception on failure Date: Wed, 10 Apr 2024 18:28:13 -0700 Message-ID: <20240411012815.174400-5-kuba@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411012815.174400-1-kuba@kernel.org> References: <20240411012815.174400-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Instead of a summary line print the full exception. This makes debugging Python tests much easier. Signed-off-by: Jakub Kicinski --- tools/testing/selftests/net/lib/py/ksft.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/lib/py/ksft.py b/tools/testing/selftests/net/lib/py/ksft.py index 5838aadd95a7..6e1f4685669c 100644 --- a/tools/testing/selftests/net/lib/py/ksft.py +++ b/tools/testing/selftests/net/lib/py/ksft.py @@ -2,6 +2,7 @@ import builtins import inspect +import traceback from .consts import KSFT_MAIN_NAME KSFT_RESULT = None @@ -85,7 +86,8 @@ KSFT_RESULT = None totals['xfail'] += 1 continue except Exception as e: - for line in str(e).split('\n'): + tb = traceback.format_exc() + for line in tb.strip().split('\n'): ksft_pr("Exception|", line) ktap_result(False, cnt, case) totals['fail'] += 1 From patchwork Thu Apr 11 01:28:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 788132 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1185D73171; Thu, 11 Apr 2024 01:28:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712798924; cv=none; b=fU3ozhB2FDeIYfeXnQQTPrVTcej1ekc5fYRSPO7i/AMXFlcUFMGKQLXdWUL2URcA1vEyfgJ5vIZstnnog9iFo6EjSlx+J23hVUxU0V5d+8Zgoz7uzRmR3CYR63Mx1bA0HdrS9xvVAzDumKD1XKz4hmTOVjt+4/MW8BXlpNNHTxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712798924; c=relaxed/simple; bh=Dt+N9TSEXMGWfFEH27py4ZfTIinmlfGwSEEGHIQSoco=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ca6QUUYCgZe0CiWgAOiOtoodCBuTr1Jft+84/d2ldo0cyBAXyzNeTVi0Yx79zfTmZ/HQETpZxUFj+63NTAKDv2pX2BNLS9yM4V9Qo3kMtDfSaAjXu5RxLFkVDQGlBSEzSqOGuBkisTGL996c+5N2qU4KSr9Ghp7Px8QFarg2s2c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OahLLZf9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OahLLZf9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DD33C43399; Thu, 11 Apr 2024 01:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712798923; bh=Dt+N9TSEXMGWfFEH27py4ZfTIinmlfGwSEEGHIQSoco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OahLLZf9vIOhO54V3vzzapGnETus+wNJxWrh0o6K9C/DD+j6CFQkiTeNtgSesU0ew Sp8mHBAKH9DIoGkaGLZiF5DiFrp2CDjT/D1ez8S+rv209hRf4qZNZi9ZuadGT3mxtB Z5siQ24JPWXU3CE+6ejbCLiN2JyK03rYTEAx1TGbaV90mY/9o3dvNXlbqIHzaTWCDL f9BOX4P46d7pMre2MASQUktBJ3/9RF19dwL9AH2uPBs+jdN6NeQBdT3zkSKNi6VlIW vPFYQuvebdxwbMMS9q2+K6FxO0syrRrt9pQVgA9buBVQa37zoIP+umbpEZFs1AknK2 tUvd5V08ce1sQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, shuah@kernel.org, petrm@nvidia.com, linux-kselftest@vger.kernel.org, Jakub Kicinski Subject: [PATCH net-next 6/6] selftests: net: exercise page pool reporting via netlink Date: Wed, 10 Apr 2024 18:28:15 -0700 Message-ID: <20240411012815.174400-7-kuba@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411012815.174400-1-kuba@kernel.org> References: <20240411012815.174400-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add a Python test for the basic ops. # ./net/nl_netdev.py KTAP version 1 1..3 ok 1 nl_netdev.empty_check ok 2 nl_netdev.lo_check ok 3 nl_netdev.page_pool_check # Totals: pass:3 fail:0 xfail:0 xpass:0 skip:0 error:0 Signed-off-by: Jakub Kicinski --- tools/testing/selftests/net/lib/py/nsim.py | 7 ++ tools/testing/selftests/net/nl_netdev.py | 79 +++++++++++++++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/lib/py/nsim.py b/tools/testing/selftests/net/lib/py/nsim.py index 94aa32f59fdb..1fd50a308408 100644 --- a/tools/testing/selftests/net/lib/py/nsim.py +++ b/tools/testing/selftests/net/lib/py/nsim.py @@ -28,6 +28,13 @@ from .utils import cmd, ip self.dfs_dir = "%s/ports/%u/" % (nsimdev.dfs_dir, port_index) ret = ip("-j link show dev %s" % ifname, ns=ns) self.dev = json.loads(ret.stdout)[0] + self.ifindex = self.dev["ifindex"] + + def up(self): + ip("link set dev {} up".format(self.ifname)) + + def down(self): + ip("link set dev {} down".format(self.ifname)) def dfs_write(self, path, val): self.nsimdev.dfs_write(f'ports/{self.port_index}/' + path, val) diff --git a/tools/testing/selftests/net/nl_netdev.py b/tools/testing/selftests/net/nl_netdev.py index 2b8b488fb419..afc510c044ce 100755 --- a/tools/testing/selftests/net/nl_netdev.py +++ b/tools/testing/selftests/net/nl_netdev.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: GPL-2.0 -from lib.py import ksft_run, ksft_pr, ksft_eq, ksft_ge, NetdevFamily +import time +from lib.py import ksft_run, ksft_pr, ksft_eq, ksft_ge, NetdevFamily, NetdevSimDev, ip def empty_check(nf) -> None: @@ -15,9 +16,83 @@ from lib.py import ksft_run, ksft_pr, ksft_eq, ksft_ge, NetdevFamily ksft_eq(len(lo_info['xdp-rx-metadata-features']), 0) +def page_pool_check(nf) -> None: + with NetdevSimDev() as nsimdev: + nsim = nsimdev.nsims[0] + + # No page pools when down + nsim.down() + pp_list = nf.page_pool_get({}, dump=True) + pp_list = [pp for pp in pp_list if pp.get("ifindex") == nsim.ifindex] + ksft_eq(len(pp_list), 0) + + # Up, empty page pool appears + nsim.up() + pp_list = nf.page_pool_get({}, dump=True) + pp_list = [pp for pp in pp_list if pp.get("ifindex") == nsim.ifindex] + ksft_ge(len(pp_list), 0) + refs = sum([pp["inflight"] for pp in pp_list]) + ksft_eq(refs, 0) + + # Down, it disappears, again + nsim.down() + pp_list = nf.page_pool_get({}, dump=True) + pp_list = [pp for pp in pp_list if pp.get("ifindex") == nsim.ifindex] + ksft_eq(len(pp_list), 0) + + # Up, allocate a page + nsim.up() + nsim.dfs_write("pp_hold", "y") + pp_list = nf.page_pool_get({}, dump=True) + refs = sum([pp["inflight"] for pp in pp_list if pp.get("ifindex") == nsim.ifindex]) + ksft_ge(refs, 1) + + # Now let's leak a page + nsim.down() + pp_list = nf.page_pool_get({}, dump=True) + pp_list = [pp for pp in pp_list if pp.get("ifindex") == nsim.ifindex] + ksft_eq(len(pp_list), 1) + refs = sum([pp["inflight"] for pp in pp_list if pp.get("ifindex") == nsim.ifindex]) + ksft_eq(refs, 1) + undetached = [pp for pp in pp_list if "detach-time" not in pp] + ksft_eq(len(undetached), 0) + + # New pp can get created, and we'll have two + nsim.up() + pp_list = nf.page_pool_get({}, dump=True) + pp_list = [pp for pp in pp_list if pp.get("ifindex") == nsim.ifindex] + attached = [pp for pp in pp_list if "detach-time" not in pp] + undetached = [pp for pp in pp_list if "detach-time" in pp] + ksft_eq(len(attached), 1) + ksft_eq(len(undetached), 1) + + # Free the old page and the old pp is gone + nsim.dfs_write("pp_hold", "n") + # Freeing check is once a second so we may need to retry + for i in range(50): + pp_list = nf.page_pool_get({}, dump=True) + pp_list = [pp for pp in pp_list if pp.get("ifindex") == nsim.ifindex] + if len(pp_list) == 1: + break + time.sleep(0.05) + ksft_eq(len(pp_list), 1) + + # And down... + nsim.down() + pp_list = nf.page_pool_get({}, dump=True) + pp_list = [pp for pp in pp_list if pp.get("ifindex") == nsim.ifindex] + ksft_eq(len(pp_list), 0) + + # Last, leave the page hanging for destroy, nothing to check + # we're trying to exercise the orphaning path in the kernel + nsim.up() + nsim.dfs_write("pp_hold", "y") + + def main() -> None: nf = NetdevFamily() - ksft_run([empty_check, lo_check], args=(nf, )) + ksft_run([empty_check, lo_check, page_pool_check], + args=(nf, )) if __name__ == "__main__":