Message ID | 20230815155612.2535947-4-andre.przywara@arm.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp251907vqi; Wed, 16 Aug 2023 12:59:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEml0zLEsCtT2jev7z92/+aGt3DEAv7ov1zIzfLJur7Q3NabR5KryCnmKI7KmA1Nbo5NNLs X-Received: by 2002:a17:902:82c8:b0:1bd:ea49:d004 with SMTP id u8-20020a17090282c800b001bdea49d004mr3100541plz.65.1692215998862; Wed, 16 Aug 2023 12:59:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692215998; cv=none; d=google.com; s=arc-20160816; b=gQenmkjwLCrqhnptwrxx+aYE23v6y8e5XvrPyzriMhpPVj+htCLzbtrAXVFV1BG9TI l6Md+GrPZIpZTf5Rxc3Z3pgcfBRUJ+sLJIBoy4BN76mHj+rZrXy1whsPUF9G8PiG7W9T KsHKq2F10YapzrWkVACnIS8Vr2fVMO1o2XvrRNZ1HagE+q9wKufdgbCM+4p4TMdvBvbo TvJsh3ezirgKHDTHNOtne8PiUSFMyRBBrMYyasQZprXlBLWLVY30+CfhBDFBZo+r0zzV ORB0W+oV1TkiXdAnhhKIFBy7pcZFbzFeSbWK9Itv+iBKxmkBAjhQ3TDQum8r2bssdLw4 rIew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=X11AuKtTvNC2UkBqL4LZFW9s6HCPxq5R6zq+xDkPXv8=; fh=UBrbDth7y5oMgl8brvefl9eZ6RQ3QXA6llOLfOqxpDM=; b=LDyfcrMwSYmmCPBl+2q53GiQHDaIL5w663JTsmEWWyuhAi/Cgab6i+rrYqEaykMQUR fNw6WSHLNH6lLD28ZtvSYSyop/X18Y8x5iEPk8RbwdiYzrhol2P034hBEJ2iAGP4qETi C4DVJoHrxmbEssQLkwKiOTxDqENY0KGCCPBC95koixfOhN0X7r1haQAUrwywvZa1vY2q 1P0bjbt7yZFDwnd0fEfUjM8mAbwkiJ1C+MHfgKdQy8br6Z3gwFC8gpGF6TwsxQPNZWEA cBrDgD+U87a4XTYLc+VUL7HkyjrK3nhSfeBaj6m4SX8Wnu99Ika6GAEIM42m8Z4UHsoK 3iUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k5-20020a170902c40500b001bb162e944dsi12680005plk.51.2023.08.16.12.59.45; Wed, 16 Aug 2023 12:59:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238398AbjHOP5L (ORCPT <rfc822;274620705z@gmail.com> + 99 others); Tue, 15 Aug 2023 11:57:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238376AbjHOP4f (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 15 Aug 2023 11:56:35 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CCD74A6; Tue, 15 Aug 2023 08:56:33 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CA2F21515; Tue, 15 Aug 2023 08:57:15 -0700 (PDT) Received: from donnerap.arm.com (donnerap.manchester.arm.com [10.32.100.58]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7B6893F6C4; Tue, 15 Aug 2023 08:56:32 -0700 (PDT) From: Andre Przywara <andre.przywara@arm.com> To: Shuah Khan <shuah@kernel.org>, Nhat Pham <nphamcs@gmail.com>, Johannes Weiner <hannes@cmpxchg.org> Cc: linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] selftests: cachestat: test for cachestat availability Date: Tue, 15 Aug 2023 16:56:12 +0100 Message-Id: <20230815155612.2535947-4-andre.przywara@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230815155612.2535947-1-andre.przywara@arm.com> References: <20230815155612.2535947-1-andre.przywara@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774417082825031863 X-GMAIL-MSGID: 1774417082825031863 |
Series |
selftests: cachestat: fix build and run on older kernels
|
|
Commit Message
Andre Przywara
Aug. 15, 2023, 3:56 p.m. UTC
As cachestat is a new syscall, it won't be available on older kernels,
for instance those running on a build machine. In this case, a run
reports all tests as "not ok" at the moment.
Test for the cachestat syscall availability first, before doing further
tests, and bail out early with a TAP SKIP comment.
This also uses the opportunity to add the proper TAP headers, and add
one check for the syscall error handling (illegal file descriptor).
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
.../selftests/cachestat/test_cachestat.c | 22 ++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
Comments
On Tue, 15 Aug 2023 16:25:54 -0700 Nhat Pham <nphamcs@gmail.com> wrote: Hi Nhat, many thanks for having a look! > On Tue, Aug 15, 2023 at 8:56 AM Andre Przywara <andre.przywara@arm.com> wrote: > > > > As cachestat is a new syscall, it won't be available on older kernels, > > for instance those running on a build machine. In this case, a run > > reports all tests as "not ok" at the moment. > Interesting - I was under the assumption that if you backported the > selftests for cachestat, you would also backport the syscall's implementation > and wiring. Well, just running the tests on the kernel you just built is only one use case. I build the tests from latest git HEAD, then copy them to a target system with some kernel running. Or I just build the tests and run them for regression testing on my build system with a distro kernel, which is Ubuntu's 5.15 flavour, in my case. The documentation explicitly mentions that selftests should work on older kernels (copying the normal userland compatibility requirements), check the second paragraph of Documentation/dev-tools/kselftest.rst. > But yeah, I guess if you build with !CONFIG_CACHESTAT_SYSCALL, > these tests would fail. > > > > Test for the cachestat syscall availability first, before doing further > > tests, and bail out early with a TAP SKIP comment. > > > > This also uses the opportunity to add the proper TAP headers, and add > > one check for the syscall error handling (illegal file descriptor). > Thanks for the addition! > > > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > > --- > > .../selftests/cachestat/test_cachestat.c | 22 ++++++++++++++++++- > > 1 file changed, 21 insertions(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/cachestat/test_cachestat.c b/tools/testing/selftests/cachestat/test_cachestat.c > > index a5a4ac8dcb76c..77620e7ecf562 100644 > > --- a/tools/testing/selftests/cachestat/test_cachestat.c > > +++ b/tools/testing/selftests/cachestat/test_cachestat.c > > @@ -15,6 +15,8 @@ > > > > #include "../kselftest.h" > > > > +#define NR_TESTS 8 > > + > > static const char * const dev_files[] = { > > "/dev/zero", "/dev/null", "/dev/urandom", > > "/proc/version", "/proc" > > @@ -235,7 +237,25 @@ bool test_cachestat_shmem(void) > > > > int main(void) > > { > > - int ret = 0; > > + int ret; > > + > > + ksft_print_header(); > > + > > + ret = syscall(__NR_cachestat, -1, NULL, NULL, 0); > > + if (ret == -1 && errno == ENOSYS) { > nit: if (ret && errno == ENOSYS) sounds cleaner, but up to you. Do you ever return a positive value other than 0? I think technically errno is only valid when the return value is -1, so in the error case, which I wanted to test here explicitly. Some syscall selftests (I checked landlock the other day) do very elaborate testing of the error path, trying to carefully cover all corner cases: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/landlock/base_test.c#n24 So this test was inspired by that, but I didn't want to go that far here ;-) > > + printf("1..0 # Skipped: cachestat syscall not available\n"); > nit: perhaps ksft_print_msg()? Ah, yes, of course! > > + return KSFT_SKIP; > > + } > > + > > + ksft_set_plan(NR_TESTS); > > + > > + if (ret == -1 && errno == EBADF) { > > + ksft_test_result_pass("bad file descriptor recognized\n"); > > + ret = 0; > > + } else { > > + ksft_test_result_fail("bad file descriptor ignored\n"); > > + ret = 1; > > + } > Nice! > > > > for (int i = 0; i < 5; i++) { > > const char *dev_filename = dev_files[i]; > > -- > > 2.25.1 > > > Nitpicking aside: > Acked-by: Nhat Pham <nphamcs@gmail.com> Thanks, I will send a v2 later, using ksft_print_msg(). But first I will try if I can detect a tmpfs instance without boiling the ocean. Cheers, Andre
On Wed, 16 Aug 2023 11:11:49 -0600 Shuah Khan <skhan@linuxfoundation.org> wrote: Hi, > On 8/15/23 09:56, Andre Przywara wrote: > > As cachestat is a new syscall, it won't be available on older kernels, > > for instance those running on a build machine. In this case, a run > > reports all tests as "not ok" at the moment. > > > > Test for the cachestat syscall availability first, before doing further > > tests, and bail out early with a TAP SKIP comment. > > > > This also uses the opportunity to add the proper TAP headers, and add > > one check for the syscall error handling (illegal file descriptor). > > > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > > --- > > .../selftests/cachestat/test_cachestat.c | 22 ++++++++++++++++++- > > 1 file changed, 21 insertions(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/cachestat/test_cachestat.c b/tools/testing/selftests/cachestat/test_cachestat.c > > index a5a4ac8dcb76c..77620e7ecf562 100644 > > --- a/tools/testing/selftests/cachestat/test_cachestat.c > > +++ b/tools/testing/selftests/cachestat/test_cachestat.c > > @@ -15,6 +15,8 @@ > > > > #include "../kselftest.h" > > > > +#define NR_TESTS 8 > > + > > static const char * const dev_files[] = { > > "/dev/zero", "/dev/null", "/dev/urandom", > > "/proc/version", "/proc" > > @@ -235,7 +237,25 @@ bool test_cachestat_shmem(void) > > > > int main(void) > > { > > - int ret = 0; > > + int ret; > > + > > + ksft_print_header(); > > + > > + ret = syscall(__NR_cachestat, -1, NULL, NULL, 0); > > + if (ret == -1 && errno == ENOSYS) { > > + printf("1..0 # Skipped: cachestat syscall not available\n"); > > + return KSFT_SKIP; > What happens when other errors besides ENOSYS? The test shouldn't > continue. -1 is an illegal file descriptor, and this is checked below (still using the same ret and errno), but reported using the normal framework. This check above is done early, before we even announce the plan, so that we can skip *all* of the tests, since they don't make any sense when the syscall is not available at all. Does that make sense? Cheers, Andre > > > + } > > + > > + ksft_set_plan(NR_TESTS); > > + > > + if (ret == -1 && errno == EBADF) { > > + ksft_test_result_pass("bad file descriptor recognized\n"); > > + ret = 0; > > + } else { > > + ksft_test_result_fail("bad file descriptor ignored\n"); > > + ret = 1; > > + } > > > > for (int i = 0; i < 5; i++) { > > const char *dev_filename = dev_files[i]; > > thanks, > -- Shuah
diff --git a/tools/testing/selftests/cachestat/test_cachestat.c b/tools/testing/selftests/cachestat/test_cachestat.c index a5a4ac8dcb76c..77620e7ecf562 100644 --- a/tools/testing/selftests/cachestat/test_cachestat.c +++ b/tools/testing/selftests/cachestat/test_cachestat.c @@ -15,6 +15,8 @@ #include "../kselftest.h" +#define NR_TESTS 8 + static const char * const dev_files[] = { "/dev/zero", "/dev/null", "/dev/urandom", "/proc/version", "/proc" @@ -235,7 +237,25 @@ bool test_cachestat_shmem(void) int main(void) { - int ret = 0; + int ret; + + ksft_print_header(); + + ret = syscall(__NR_cachestat, -1, NULL, NULL, 0); + if (ret == -1 && errno == ENOSYS) { + printf("1..0 # Skipped: cachestat syscall not available\n"); + return KSFT_SKIP; + } + + ksft_set_plan(NR_TESTS); + + if (ret == -1 && errno == EBADF) { + ksft_test_result_pass("bad file descriptor recognized\n"); + ret = 0; + } else { + ksft_test_result_fail("bad file descriptor ignored\n"); + ret = 1; + } for (int i = 0; i < 5; i++) { const char *dev_filename = dev_files[i];