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 B9000C433EF for ; Thu, 10 Feb 2022 04:12:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 019E66B0073; Wed, 9 Feb 2022 23:12:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F094B6B0074; Wed, 9 Feb 2022 23:12:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD0866B0075; Wed, 9 Feb 2022 23:12:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0154.hostedemail.com [216.40.44.154]) by kanga.kvack.org (Postfix) with ESMTP id CDDB76B0073 for ; Wed, 9 Feb 2022 23:12:47 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 80A5E998B9 for ; Thu, 10 Feb 2022 04:12:47 +0000 (UTC) X-FDA: 79125549174.27.8DDFD96 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf17.hostedemail.com (Postfix) with ESMTP id DE21240002 for ; Thu, 10 Feb 2022 04:12:46 +0000 (UTC) Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 21A0ULdK010183; Thu, 10 Feb 2022 04:12:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : in-reply-to : references : date : message-id : mime-version : content-type; s=pp1; bh=HGgqYKlknenAdjcbiaWaaZFGXBMcfKbexxJhz30X6yo=; b=YNCRH02AYpfRaNUCgucDKwK3wg5T9YOcgnCG7AKIEX5ZrMYSwFXDZZarUfgHN0maewvP PqtLGvb7pN4aGvavSlCloDss3VaaFJeaUbE+J2eWewrreBDJLUHTzqgNHf1Alsh+4LJ9 mLIINpVB/HBEgsPqA+O4WkjAEwrBvoGDMSdgwqBTHwsqnM0FYMmG5IrU4eYhsLcB+B6r IcBcRzr+omtUMEv2WeJwRsyH9eTD7VQrAalUpuA+UanyvP8EGB2t2LMcuPc85Insh9Uf mjoagICrUcpKp6bDj17kdIq519+jZQHv5xuNcVGyhSV3kMrZ0e5pY4Wy7VYshk44XlRc 9A== Received: from ppma03wdc.us.ibm.com (ba.79.3fa9.ip4.static.sl-reverse.com [169.63.121.186]) by mx0a-001b2d01.pphosted.com with ESMTP id 3e4r7jbjxa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Feb 2022 04:12:33 +0000 Received: from pps.filterd (ppma03wdc.us.ibm.com [127.0.0.1]) by ppma03wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 21A49pRW015726; Thu, 10 Feb 2022 04:12:32 GMT Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by ppma03wdc.us.ibm.com with ESMTP id 3e1gvc065f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Feb 2022 04:12:32 +0000 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 21A4CVXY22348048 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Feb 2022 04:12:31 GMT Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A50156E05F; Thu, 10 Feb 2022 04:12:31 +0000 (GMT) Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DBA9E6E05E; Thu, 10 Feb 2022 04:12:26 +0000 (GMT) Received: from skywalker.linux.ibm.com (unknown [9.43.23.209]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP; Thu, 10 Feb 2022 04:12:26 +0000 (GMT) X-Mailer: emacs 29.0.50 (via feedmail 11-beta-1 I) From: "Aneesh Kumar K.V" To: Shuah Khan , linux-mm@kvack.org, akpm@linux-foundation.org Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, Shuah Khan , Shuah Khan Subject: Re: [PATCH] selftest/vm: Use correct PAGE_SHIFT value for ppc64 In-Reply-To: <84508bb4-9400-f429-e6d2-d8b05a1e8368@linuxfoundation.org> References: <20220209154301.42024-1-aneesh.kumar@linux.ibm.com> <84508bb4-9400-f429-e6d2-d8b05a1e8368@linuxfoundation.org> Date: Thu, 10 Feb 2022 09:42:21 +0530 Message-ID: <87zgmz9x7e.fsf@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-GCONF: 00 X-Proofpoint-GUID: crRP15SMbCibQDLUJPQaofUdXCl4Qq2R X-Proofpoint-ORIG-GUID: crRP15SMbCibQDLUJPQaofUdXCl4Qq2R X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-10_01,2022-02-09_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 impostorscore=0 priorityscore=1501 suspectscore=0 phishscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 malwarescore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202100022 X-Rspamd-Queue-Id: DE21240002 Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=YNCRH02A; spf=pass (imf17.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com X-Stat-Signature: b4igf83rh947os55hin4scd9pntidm1r X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1644466366-162474 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: Shuah Khan writes: > On 2/9/22 8:43 AM, 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 >> Signed-off-by: Aneesh Kumar K.V >> --- >> tools/testing/selftests/vm/ksm_tests.c | 8 ++++++++ >> tools/testing/selftests/vm/transhuge-stress.c | 8 ++++++++ >> 2 files changed, 16 insertions(+) >> >> diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c >> index 1436e1a9a3d3..8200328ff018 100644 >> --- a/tools/testing/selftests/vm/ksm_tests.c >> +++ b/tools/testing/selftests/vm/ksm_tests.c >> @@ -22,8 +22,16 @@ >> #define KSM_MERGE_ACROSS_NODES_DEFAULT true >> #define MB (1ul << 20) >> >> +#ifdef __powerpc64__ >> +#define PAGE_SHIFT 16 >> +/* >> + * This will only work with radix 2M hugepage size >> + */ >> +#define HPAGE_SHIFT 21 >> +#else >> #define PAGE_SHIFT 12 >> #define HPAGE_SHIFT 21 >> +#endif >> >> #define PAGE_SIZE (1 << PAGE_SHIFT) >> #define HPAGE_SIZE (1 << HPAGE_SHIFT) >> diff --git a/tools/testing/selftests/vm/transhuge-stress.c b/tools/testing/selftests/vm/transhuge-stress.c >> index 5e4c036f6ad3..f04c8aa4bcf6 100644 >> --- a/tools/testing/selftests/vm/transhuge-stress.c >> +++ b/tools/testing/selftests/vm/transhuge-stress.c >> @@ -16,8 +16,16 @@ >> #include >> #include >> >> +#ifdef __powerpc64__ >> +#define PAGE_SHIFT 16 >> +/* >> + * This will only work with radix 2M hugepage size >> + */ >> +#define HPAGE_SHIFT 21 > > Why not have this is in common code? Can you suggest where I can move that. We also have helper functions like allocate_transhuge() duplicated between tests. I didn't find libutil.a or anything similar supported by the selftets build. > >> +#else >> #define PAGE_SHIFT 12 >> #define HPAGE_SHIFT 21 > > Same here. > >> +#endif >> >> #define PAGE_SIZE (1 << PAGE_SHIFT) >> #define HPAGE_SIZE (1 << HPAGE_SHIFT) >> > > Please cc linux-kselftest mailing list in the future. > > With the above fixed. > > Reviewed-by: Shuah Khan > > thanks, > -- Shuah -aneesh