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 8E5EDC433EF for ; Thu, 10 Feb 2022 15:04:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E67856B0071; Thu, 10 Feb 2022 10:04:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E490C6B0074; Thu, 10 Feb 2022 10:04:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB6E46B0075; Thu, 10 Feb 2022 10:04:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0244.hostedemail.com [216.40.44.244]) by kanga.kvack.org (Postfix) with ESMTP id BBB546B0071 for ; Thu, 10 Feb 2022 10:04:03 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 63DAF8249980 for ; Thu, 10 Feb 2022 15:04:03 +0000 (UTC) X-FDA: 79127190366.24.E6EF29B Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf19.hostedemail.com (Postfix) with ESMTP id CC1AC1A0013 for ; Thu, 10 Feb 2022 15:04:02 +0000 (UTC) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 21AEv57o027859; Thu, 10 Feb 2022 15:03:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=rD8FT0wQazng9rSpyV1D6sspQnqgrrTPv7XQ0rDDKfE=; b=Hg5kbNwLmSMdZy8E4JmpHbBQ/JFKzRcDAOFUv3ZSXWBFyfHgML/59XWSDWctE3WO/U7i 30yBjJiFsUiJbna0aCVSvvO0eBs8Vw7qVpyATxohr9Xnu3cH3GsFIWDd6ExKCjP8yU3T cxmlbLvY/ZXukjq8p2/rIgLRTxfLfsEI1mmJWpYmh6NkLM8IfAWExQWsglQw8UiN+HiN KLb1TLQilMUvB6DdpDykNrsFSiVwfa8dLBbqxEMXi5rjpLOnqCo55tghdLlnTk2alDXA pysUN/nbFvPlzvQDtOCHCAbBJjWEP1lL1FKu7/VPumaIloycQlnbOvph1Bn/WfYaPTAw rA== Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 3e542f1kpf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Feb 2022 15:03:56 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 21AEY6L8007200; Thu, 10 Feb 2022 15:03:54 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma04fra.de.ibm.com with ESMTP id 3e2ygqp6wx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Feb 2022 15:03:54 +0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 21AF3pv843844080 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Feb 2022 15:03:51 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EAD60AE055; Thu, 10 Feb 2022 15:03:50 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1F7B3AE056; Thu, 10 Feb 2022 15:03:49 +0000 (GMT) Received: from [9.43.23.209] (unknown [9.43.23.209]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 10 Feb 2022 15:03:48 +0000 (GMT) Message-ID: Date: Thu, 10 Feb 2022 20:33:47 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH] selftest/vm: Use correct PAGE_SHIFT value for ppc64 Content-Language: en-US To: Shuah Khan , linux-mm@kvack.org, akpm@linux-foundation.org Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, Shuah Khan References: <20220209154301.42024-1-aneesh.kumar@linux.ibm.com> <84508bb4-9400-f429-e6d2-d8b05a1e8368@linuxfoundation.org> <87zgmz9x7e.fsf@linux.ibm.com> From: Aneesh Kumar K V In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 3ziXRdaEV6x82nCwSJaj_mZJZ08v99E4 X-Proofpoint-ORIG-GUID: 3ziXRdaEV6x82nCwSJaj_mZJZ08v99E4 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_06,2022-02-09_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 impostorscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 adultscore=0 priorityscore=1501 spamscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202100081 X-Stat-Signature: sx9uxkjm4bzf6w9jqgpq8p8aacm81srj X-Rspam-User: Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Hg5kbNwL; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf19.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: CC1AC1A0013 X-HE-Tag: 1644505442-855149 Content-Transfer-Encoding: quoted-printable 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 2/10/22 20:09, Shuah Khan wrote: > On 2/9/22 9:12 PM, Aneesh Kumar K.V wrote: >> 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=20 >>>> size >>>> and huge page size. >>>> >>>> Without this tests are broken w.r.t reading /proc/self/pagemap >>>> >>>> =C2=A0=C2=A0=C2=A0=C2=A0if (pread(pagemap_fd, ent, sizeof(ent), >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (= uintptr_t)ptr >> (PAGE_SHIFT - 3)) !=3D sizeof(ent)) >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 err(2, "read pagemap"); >>>> >>>> Cc: Shuah Khan >>>> Signed-off-by: Aneesh Kumar K.V >>>> --- >>>> =C2=A0=C2=A0 tools/testing/selftests/vm/ksm_tests.c=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 | 8 ++++++++ >>>> =C2=A0=C2=A0 tools/testing/selftests/vm/transhuge-stress.c | 8 +++++= +++ >>>> =C2=A0=C2=A0 2 files changed, 16 insertions(+) >>>> >>>> diff --git a/tools/testing/selftests/vm/ksm_tests.c=20 >>>> 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 @@ >>>> =C2=A0=C2=A0 #define KSM_MERGE_ACROSS_NODES_DEFAULT true >>>> =C2=A0=C2=A0 #define MB (1ul << 20) >>>> +#ifdef __powerpc64__ >>>> +#define PAGE_SHIFT=C2=A0=C2=A0=C2=A0 16 >>>> +/* >>>> + * This will only work with radix 2M hugepage size >>>> + */ >>>> +#define HPAGE_SHIFT 21 >>>> +#else >>>> =C2=A0=C2=A0 #define PAGE_SHIFT 12 >>>> =C2=A0=C2=A0 #define HPAGE_SHIFT 21 >>>> +#endif >>>> =C2=A0=C2=A0 #define PAGE_SIZE (1 << PAGE_SHIFT) >>>> =C2=A0=C2=A0 #define HPAGE_SIZE (1 << HPAGE_SHIFT) >>>> diff --git a/tools/testing/selftests/vm/transhuge-stress.c=20 >>>> 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 @@ >>>> =C2=A0=C2=A0 #include >>>> =C2=A0=C2=A0 #include >>>> +#ifdef __powerpc64__ >>>> +#define PAGE_SHIFT=C2=A0=C2=A0=C2=A0 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. >> >>> >=20 > I noticed that HPAGE_SHIFT is defined in #ifdef __powerpc64__ block > as well as #else. I am asking is it necessary to be part of both > blocks. >=20 > +#ifdef __powerpc64__ > +#define PAGE_SHIFT=C2=A0=C2=A0=C2=A0 16 > +/* > + * This will only work with radix 2M hugepage size > + */ > +#define HPAGE_SHIFT 21=C2=A0 --- this one > +#else > =C2=A0 #define PAGE_SHIFT 12 > =C2=A0 #define HPAGE_SHIFT 21=C2=A0=C2=A0 --- this one > +#endif >=20 The reason I did that was to add the comment which is relevant only for=20 ppc64. ppc64 supports two hugepage sizes, 2M and 16M. The test won't=20 work correctly with 16M hugepage size. We do have other tests in=20 selftest/vm/ with similar restrictions. -aneesh