From mboxrd@z Thu Jan 1 00:00:00 1970 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 214C634A3CC; Thu, 19 Mar 2026 17:20:31 +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=1773940832; cv=none; b=AEj+KkAJ7//aPO8IYLhHxpKsLQN+720pekrf1ucwd/uAmmzg2zpq7YTClyF0MYlaecgRkkZjwhjBqo6+7H8lRu/2WZFAnPi+skg0gJ3woHOdnGd8iDNb7ctcT/FS3i1ybAzq8cApFri6UORqtKsqFNXJcDuswE/rXpTJb8wkt0o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773940832; c=relaxed/simple; bh=kgD69+muWITBcTGV+KnbYP0pvQSkkY00OjAstUepKTY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=eDZMHr0TTfygl0d39I0mqS8qVfhX7R6HLCUk0vesgofPsWDUxay5mBsFp/te/oc70YNDY1lvkOSmHUN6DnNpvqojIe9HX8LT1wbV0HM4HMNQq9kmXV5q0yOyersNt7jrEN1DD9+ZzXkcTTDgPmA1LxeVppw3ib6Ni+xrg/Y5Om8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QRpy9Hsp; 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="QRpy9Hsp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 276EEC19424; Thu, 19 Mar 2026 17:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773940831; bh=kgD69+muWITBcTGV+KnbYP0pvQSkkY00OjAstUepKTY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QRpy9HspVOZRZmYSyOUluLhCW++p7IYk/JfgMXF8/I6KwQNt0a7Il/pRFHYqeGTxA p8hRxBLbUEGCLblYuhsPZd20WTgVIKXNT5IP2NvK9nU+43GNMVqaebUPI9XqtHX8/p t+tOPiuAR720tqf3kAgj6SsQy551k5QBq1RwYvSjV7GLPQ0QYFHNItmVo+fyjMd/Ru ns7J8tk6IKfWw+UmRemKyORFNPfLe4atGyXEJtZA7F3P21Uqz8n7eVNEQoeoM+8HwL C6te3esHkTUSuwxl/hDH+GQAQ8Cj63BgZeVryqmZWz1iThwHipQIuFNYCd7SPZlzJy Da5HQQOmzC1wA== Date: Thu, 19 Mar 2026 19:20:21 +0200 From: Mike Rapoport To: Chunyu Hu Cc: akpm@linux-foundation.org, david@kernel.org, shuah@kernel.org, linux-mm@kvack.org, ljs@kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, vbabka@suse.cz, surenb@google.com, mhocko@suse.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, npache@redhat.com, ryan.roberts@arm.com, dev.jain@arm.com, baohua@kernel.org, lance.yang@linux.dev Subject: Re: [PATCH v4 3/5] selftests/mm: move write_file helper to vm_util Message-ID: References: <20260319160656.1480279-1-chuhu@redhat.com> <20260319160656.1480279-4-chuhu@redhat.com> 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=us-ascii Content-Disposition: inline In-Reply-To: <20260319160656.1480279-4-chuhu@redhat.com> On Fri, Mar 20, 2026 at 12:06:54AM +0800, Chunyu Hu wrote: > thp_settings provides write_file() helper for safely writing to a file and > exit when write failure happens. It's a very low level helper and many sub > tests need such a helper, not only thp tests. > > split_huge_page_test also defines a write_file locally. The two have minior > differences in return type and used exit api. And there would be conflicts > if split_huge_page_test wanted to include thp_settings.h because of > different prototype, making it less convenient. > > It's possisble to merge the two, although some tests don't use the > kselftest infrastrucutre for testing. It would also work when using the > ksft_exit_msg() to exit in my test, as the counters are all zero. Output > will be like: > > TAP version 13 > 1..62 > Bail out! /proc/sys/vm/drop_caches1 open failed: No such file or directory > # Totals: pass:0 fail:0 xfail:0 xpass:0 skip:0 error:0 > > So here we just keep the version in split_huge_page_test, and move it into > the vm_util. This makes it easy to maitain and user could just include one > vm_util.h when they don't need thp setting helpers. Keep the prototype of > void return as the function will exit on any error, return value is not > necessary, and will simply the callers like write_num() and write_string(). > > Suggested-by: Mike Rapoport > Signed-off-by: Chunyu Hu Acked-by: Mike Rapoport (Microsoft) > --- > Changes in v3: > - make the write_file void return > Changes in v2: > new patch from v2 > --- > .../selftests/mm/split_huge_page_test.c | 15 -------- > tools/testing/selftests/mm/thp_settings.c | 35 ++----------------- > tools/testing/selftests/mm/thp_settings.h | 1 - > tools/testing/selftests/mm/vm_util.c | 15 ++++++++ > tools/testing/selftests/mm/vm_util.h | 2 ++ > 5 files changed, 20 insertions(+), 48 deletions(-) > > diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c > index e0167111bdd1..93f205327b84 100644 > --- a/tools/testing/selftests/mm/split_huge_page_test.c > +++ b/tools/testing/selftests/mm/split_huge_page_test.c > @@ -255,21 +255,6 @@ static int check_after_split_folio_orders(char *vaddr_start, size_t len, > return status; > } > > -static void write_file(const char *path, const char *buf, size_t buflen) > -{ > - int fd; > - ssize_t numwritten; > - > - fd = open(path, O_WRONLY); > - if (fd == -1) > - ksft_exit_fail_msg("%s open failed: %s\n", path, strerror(errno)); > - > - numwritten = write(fd, buf, buflen - 1); > - close(fd); > - if (numwritten < 1) > - ksft_exit_fail_msg("Write failed\n"); > -} > - > static void write_debugfs(const char *fmt, ...) > { > char input[INPUT_MAX]; > diff --git a/tools/testing/selftests/mm/thp_settings.c b/tools/testing/selftests/mm/thp_settings.c > index 574bd0f8ae48..e748ebfb3d4e 100644 > --- a/tools/testing/selftests/mm/thp_settings.c > +++ b/tools/testing/selftests/mm/thp_settings.c > @@ -6,6 +6,7 @@ > #include > #include > > +#include "vm_util.h" > #include "thp_settings.h" > > #define THP_SYSFS "/sys/kernel/mm/transparent_hugepage/" > @@ -64,29 +65,6 @@ int read_file(const char *path, char *buf, size_t buflen) > return (unsigned int) numread; > } > > -int write_file(const char *path, const char *buf, size_t buflen) > -{ > - int fd; > - ssize_t numwritten; > - > - fd = open(path, O_WRONLY); > - if (fd == -1) { > - printf("open(%s)\n", path); > - exit(EXIT_FAILURE); > - return 0; > - } > - > - numwritten = write(fd, buf, buflen - 1); > - close(fd); > - if (numwritten < 1) { > - printf("write(%s)\n", buf); > - exit(EXIT_FAILURE); > - return 0; > - } > - > - return (unsigned int) numwritten; > -} > - > unsigned long read_num(const char *path) > { > char buf[21]; > @@ -104,10 +82,7 @@ void write_num(const char *path, unsigned long num) > char buf[21]; > > sprintf(buf, "%ld", num); > - if (!write_file(path, buf, strlen(buf) + 1)) { > - perror(path); > - exit(EXIT_FAILURE); > - } > + write_file(path, buf, strlen(buf) + 1); > } > > int thp_read_string(const char *name, const char * const strings[]) > @@ -165,11 +140,7 @@ void thp_write_string(const char *name, const char *val) > printf("%s: Pathname is too long\n", __func__); > exit(EXIT_FAILURE); > } > - > - if (!write_file(path, val, strlen(val) + 1)) { > - perror(path); > - exit(EXIT_FAILURE); > - } > + write_file(path, val, strlen(val) + 1); > } > > unsigned long thp_read_num(const char *name) > diff --git a/tools/testing/selftests/mm/thp_settings.h b/tools/testing/selftests/mm/thp_settings.h > index 76eeb712e5f1..7748a9009191 100644 > --- a/tools/testing/selftests/mm/thp_settings.h > +++ b/tools/testing/selftests/mm/thp_settings.h > @@ -63,7 +63,6 @@ struct thp_settings { > }; > > int read_file(const char *path, char *buf, size_t buflen); > -int write_file(const char *path, const char *buf, size_t buflen); > unsigned long read_num(const char *path); > void write_num(const char *path, unsigned long num); > > diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests/mm/vm_util.c > index a6d4ff7dfdc0..ad96d19d1b85 100644 > --- a/tools/testing/selftests/mm/vm_util.c > +++ b/tools/testing/selftests/mm/vm_util.c > @@ -764,3 +764,18 @@ int unpoison_memory(unsigned long pfn) > > return ret > 0 ? 0 : -errno; > } > + > +void write_file(const char *path, const char *buf, size_t buflen) > +{ > + int fd; > + ssize_t numwritten; > + > + fd = open(path, O_WRONLY); > + if (fd == -1) > + ksft_exit_fail_msg("%s open failed: %s\n", path, strerror(errno)); > + > + numwritten = write(fd, buf, buflen - 1); > + close(fd); > + if (numwritten < 1) > + ksft_exit_fail_msg("Write failed\n"); > +} > diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests/mm/vm_util.h > index e9c4e24769c1..1a07305ceff4 100644 > --- a/tools/testing/selftests/mm/vm_util.h > +++ b/tools/testing/selftests/mm/vm_util.h > @@ -166,3 +166,5 @@ int unpoison_memory(unsigned long pfn); > > #define PAGEMAP_PRESENT(ent) (((ent) & (1ull << 63)) != 0) > #define PAGEMAP_PFN(ent) ((ent) & ((1ull << 55) - 1)) > + > +void write_file(const char *path, const char *buf, size_t buflen); > -- > 2.53.0 > -- Sincerely yours, Mike.