From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F977C433FE for ; Fri, 11 Feb 2022 10:34:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17D5D6B0078; Fri, 11 Feb 2022 05:34:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 106266B007B; Fri, 11 Feb 2022 05:34:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE7956B007D; Fri, 11 Feb 2022 05:34:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id DC8846B0078 for ; Fri, 11 Feb 2022 05:34:09 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 99041180958B0 for ; Fri, 11 Feb 2022 10:34:09 +0000 (UTC) X-FDA: 79130139018.14.82F507F Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf19.hostedemail.com (Postfix) with ESMTP id 15CEA1A0006 for ; Fri, 11 Feb 2022 10:34:08 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3178EB8294F; Fri, 11 Feb 2022 10:34:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AED7C340E9; Fri, 11 Feb 2022 10:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644575645; bh=wXXuyKBQt46IGOEHezmN82dITuXgKrK5o/eWPXu2fvY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=SvqgYTsPaCzQdgevk0P6T6vM6jW6nDW8c4Md4WJQARQLFYVVvGHCfSM3lOGaDZL2m zJhOtTpJWum2yeaLgVDIhHKciV0E8HE7GgjUI6g5vkGsm6QT9O9f/XEL7rO2oSGM32 Wb6+NgshhTdM2q/d9LDUChl7laPTCNStwtZ3wR1t2LjtwY1DazH7nJrxUByhI0cb3y FKLeEyg8UjIp8pey9AYNC27YThq42ecrLJ7sUiW+Tkhq9yH2P2DJoVuv12tS9TvPhu 8pzH6EhPyfHX8BH3dveaWXMJRiUYrkVK+offjxfTHFacoVRlLJBDdm8CInbKRnItbc yB/EPxDXx8DvA== Date: Fri, 11 Feb 2022 12:33:56 +0200 From: Mike Rapoport To: "Aneesh Kumar K.V" Cc: linux-mm@kvack.org, akpm@linux-foundation.org, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, Shuah Khan , linux-kselftest@vger.kernel.org Subject: Re: [PATCH v2 1/2] selftest/vm: Use correct PAGE_SHIFT value for ppc64 Message-ID: References: <20220211063330.99648-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220211063330.99648-1-aneesh.kumar@linux.ibm.com> X-Stat-Signature: eti7neqowegkpygmaif5j5j5q463njdf X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 15CEA1A0006 Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SvqgYTsP; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org X-Rspam-User: X-HE-Tag: 1644575648-924951 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Feb 11, 2022 at 12:03:28PM +0530, Aneesh Kumar K.V wrote: > Keep it simple by using a #define and limiting hugepage size to 2M. > This keeps the test simpler instead of dynamically finding the page size > and huge page size. > > Without this tests are broken w.r.t reading /proc/self/pagemap > > if (pread(pagemap_fd, ent, sizeof(ent), > (uintptr_t)ptr >> (PAGE_SHIFT - 3)) != sizeof(ent)) > err(2, "read pagemap"); > > Cc: Shuah Khan > Cc: linux-kselftest@vger.kernel.org > Signed-off-by: Aneesh Kumar K.V > --- > tools/testing/selftests/vm/ksm_tests.c | 9 ++++++++- > tools/testing/selftests/vm/transhuge-stress.c | 9 ++++++++- > 2 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c > index 1436e1a9a3d3..cae72872152b 100644 > --- a/tools/testing/selftests/vm/ksm_tests.c > +++ b/tools/testing/selftests/vm/ksm_tests.c > @@ -22,7 +22,14 @@ > #define KSM_MERGE_ACROSS_NODES_DEFAULT true > #define MB (1ul << 20) > > -#define PAGE_SHIFT 12 > +#ifdef __powerpc64__ > +#define PAGE_SHIFT 16 > +#else > +#define PAGE_SHIFT 12 > +#endif Page size can be other than 4096 for other configurations as well. And even on ppc64 it's not necessarily 64k. Ideally page size in selftests/vm should be sysconf(_SC_PAGESIZE) > +/* > + * On ppc64 this will only work with radix 2M hugepage size > + */ > #define HPAGE_SHIFT 21 > > #define PAGE_SIZE (1 << PAGE_SHIFT) > diff --git a/tools/testing/selftests/vm/transhuge-stress.c b/tools/testing/selftests/vm/transhuge-stress.c > index 5e4c036f6ad3..b1f8d98355c5 100644 > --- a/tools/testing/selftests/vm/transhuge-stress.c > +++ b/tools/testing/selftests/vm/transhuge-stress.c > @@ -16,7 +16,14 @@ > #include > #include > > -#define PAGE_SHIFT 12 > +#ifdef __powerpc64__ > +#define PAGE_SHIFT 16 > +#else > +#define PAGE_SHIFT 12 > +#endif > +/* > + * On ppc64 this will only work with radix 2M hugepage size > + */ > #define HPAGE_SHIFT 21 > > #define PAGE_SIZE (1 << PAGE_SHIFT) > -- > 2.34.1 > > -- Sincerely yours, Mike.