From patchwork Tue Oct 25 15:26:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerald Schaefer X-Patchwork-Id: 13019479 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 4CAE2C04A95 for ; Tue, 25 Oct 2022 15:27:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E412D8E0002; Tue, 25 Oct 2022 11:27:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DF1AE8E0001; Tue, 25 Oct 2022 11:27:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB95F8E0002; Tue, 25 Oct 2022 11:27:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BB6638E0001 for ; Tue, 25 Oct 2022 11:27:18 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 9D9341A01C0 for ; Tue, 25 Oct 2022 15:27:18 +0000 (UTC) X-FDA: 80059850556.29.04604C2 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf21.hostedemail.com (Postfix) with ESMTP id A163F1C0019 for ; Tue, 25 Oct 2022 15:27:16 +0000 (UTC) Received: from pps.filterd (m0187473.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29PEr5a8021511; Tue, 25 Oct 2022 15:27:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=GGFbsnWykh4fbfGryO7D4Cga+is61229sObN4S+/oX0=; b=bcCjSX83agkBJcPPBpR37y7efTEqxZZh53yevmVNe6AMdYnJ9HPT3wME5cduJrx3BRzE TBWAXw3vsvbDrxKuLzz0I5f/CytfQlW88MC1vdyFPmsquLVR/LyyRHA/1vRDCzGx2KDG lGG15qyaA7sCjthcwmkyL+8/88jcHIqnTroBPLlbn3YWGh+L/FLgC6hex18lY4ldd36r UsGX9NGI9rd4y3jnn8/3C7cl/9hFEfGgocVxJyHVVoP2ysstRhcaBYHZsOtoDwG6lMKc u6XTUfRtoYqYA9n82UGy2yhRxvNbOfpiWT/bUK8rrwKPv6D5pj7V8ZgZwiYEcGT0IrbB dA== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kee362q41-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Oct 2022 15:27:11 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 29PFPPso002042; Tue, 25 Oct 2022 15:27:09 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma06ams.nl.ibm.com with ESMTP id 3kc7sj5utx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Oct 2022 15:27:09 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 29PFR7c445482344 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Oct 2022 15:27:07 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0CE9D42045; Tue, 25 Oct 2022 15:27:07 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B266642041; Tue, 25 Oct 2022 15:27:06 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 25 Oct 2022 15:27:06 +0000 (GMT) From: Gerald Schaefer To: Andrew Morton , Shuah Khan , Muchun Song Cc: linux-mm , LKML , , linux-s390 Subject: [PATCH] selftests: vm: use 1 MB hugepage size for s390 Date: Tue, 25 Oct 2022 17:26:10 +0200 Message-Id: <20221025152610.3439102-1-gerald.schaefer@linux.ibm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: tCPza0spCnqBsDU9_hqvLwgFi3o8ihpQ X-Proofpoint-GUID: tCPza0spCnqBsDU9_hqvLwgFi3o8ihpQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-25_08,2022-10-25_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=664 suspectscore=0 adultscore=0 mlxscore=0 malwarescore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1011 phishscore=0 bulkscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210250086 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666711636; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=GGFbsnWykh4fbfGryO7D4Cga+is61229sObN4S+/oX0=; b=OxkGQtgi6qvO9BSPdMdanGnzH9w9HEK3/0/GY2W+NyoKiIy/WylsnPT7w9IKLb5t4UtxjY MhFKebNvWQj3SQ5tFMHonR2N9sSElTsK/8bSZRsE2nPKGG4lCAIzFwoZdQs1cGreWxXR+k meS6MYSNDxb4SlsPW7qd6b8aKp4rAUM= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=bcCjSX83; spf=pass (imf21.hostedemail.com: domain of gerald.schaefer@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=gerald.schaefer@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666711636; a=rsa-sha256; cv=none; b=S1hVL4NGr1i0xHU5nuTmcTYpkm4QveWQenv3N8jpZjVWyJFHDi0uSCNwgfbvN2Ebm4SviG rSQRmkuz/8yAAvro4R0X72hAeqITTiHvVtDE55yWAr44Eek+0VnLGXI0m5V6ud6Ml3e7vv rlQr35VXY+DRlownvRp2LV6aa9WGghA= X-Rspamd-Queue-Id: A163F1C0019 Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=bcCjSX83; spf=pass (imf21.hostedemail.com: domain of gerald.schaefer@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=gerald.schaefer@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com X-Rspam-User: X-Rspamd-Server: rspam10 X-Stat-Signature: 1hjeshoq1er56d7sastixcme1uiyms6m X-HE-Tag: 1666711636-352211 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: hugepage-vmemmap test fails for s390 because it assumes a hugepagesize of 2 MB, while we have 1 MB on s390. This results in iterating over two hugepages. If they are consecutive in memory, check_page_flags() will stumble over the additional head page. Otherwise, it will stumble over non-huge pageflags, after crossing the first 1 MB hugepage. Fix this by using 1 MB MAP_LENGTH for s390. Signed-off-by: Gerald Schaefer --- tools/testing/selftests/vm/hugepage-vmemmap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/testing/selftests/vm/hugepage-vmemmap.c b/tools/testing/selftests/vm/hugepage-vmemmap.c index 557bdbd4f87e..a4695f138cec 100644 --- a/tools/testing/selftests/vm/hugepage-vmemmap.c +++ b/tools/testing/selftests/vm/hugepage-vmemmap.c @@ -11,7 +11,14 @@ #include #include +/* + * 1 MB hugepage size for s390 + */ +#if defined(__s390x__) +#define MAP_LENGTH (1UL * 1024 * 1024) +#else #define MAP_LENGTH (2UL * 1024 * 1024) +#endif #ifndef MAP_HUGETLB #define MAP_HUGETLB 0x40000 /* arch specific */