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 A2D2EC38A2D for ; Tue, 25 Oct 2022 15:34:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 403DB8E0002; Tue, 25 Oct 2022 11:34:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 38C458E0001; Tue, 25 Oct 2022 11:34:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2530A8E0002; Tue, 25 Oct 2022 11:34:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 139018E0001 for ; Tue, 25 Oct 2022 11:34:58 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D301B401C9 for ; Tue, 25 Oct 2022 15:34:57 +0000 (UTC) X-FDA: 80059869834.30.4864B6B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 7414920021 for ; Tue, 25 Oct 2022 15:34:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666712096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q1GvBOBCP6KETy6rTK6QCl92NvC/MctQ2jjFIvDTUSU=; b=b13kbdLUVwqXNTqJolWmQtiYQmPCUoxLIbKagY42F5xcL4wAQYmjTIkO92VcKOxGY4lmd9 VR7sEWMCkIGY3uvKH+35/TYvea+L+xMaAGB/4q5IBJkC+7phRSW+BRup9jqweFZ6HQaW5C QMnEeiAuVthDcoW/krbHQsEtaeADaG4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-604-67NSJvfsOY-7C7SB6tjwFg-1; Tue, 25 Oct 2022 11:34:55 -0400 X-MC-Unique: 67NSJvfsOY-7C7SB6tjwFg-1 Received: by mail-wr1-f69.google.com with SMTP id r4-20020adfbb04000000b00236639438e9so3467340wrg.11 for ; Tue, 25 Oct 2022 08:34:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=q1GvBOBCP6KETy6rTK6QCl92NvC/MctQ2jjFIvDTUSU=; b=sBc8gCrglpbaDVei26I8TzBBNgMaEMj5uihS89IOjIbYfYHMR+oXoGwgkD7Ww/5Pah JruEvb1a7gtxPYH49oz2BkvHE4krul5E6efO0OJH/fYdXBXVSp8qAF2nsQD7rTIGQKUi kxWaIEo/EzrQcqf6Y47U6upMWMiE/M7FdNpKp7MugHKmehoiAKtBK0aw39fQfpw+2f1H 0Qh+vlUMLP9iycCwdQFrItMlZF/0ef1Fwxw3G8W7dx1uRfWAgjqfn16qtI8QvEOKTvF5 Ql9Y255vG1bstPEzc0SIdQQEnKtOznjHl2VgmPjVpiN2JvDXxcqaRuBI6j0j0BWxzN4i 4TsA== X-Gm-Message-State: ACrzQf1Nxr4IKKkchhGL8u8VDdUGG26ETTV+7KI+9q59e0YM4pChf7j3 ZWnc0G/NLmvDAvHgCJTPZ9ZQO46QlzFIgrQnKaHJDhDx9lCchBKS7gY0wqI++fP36ug7g3gyZM+ 0zWO/jgsZeXI= X-Received: by 2002:a05:6000:18ad:b0:230:6d12:fc7d with SMTP id b13-20020a05600018ad00b002306d12fc7dmr25096956wri.409.1666712094505; Tue, 25 Oct 2022 08:34:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5MF3ZzlWB5p5BMwQBW0Xp49UZmIOa+s5CbB/a5oA0uLsaa08jpku5+sqs+rXA4yS/NADMYVw== X-Received: by 2002:a05:6000:18ad:b0:230:6d12:fc7d with SMTP id b13-20020a05600018ad00b002306d12fc7dmr25096938wri.409.1666712094252; Tue, 25 Oct 2022 08:34:54 -0700 (PDT) Received: from ?IPV6:2003:cb:c719:d00:eae9:3af6:9999:7b63? (p200300cbc7190d00eae93af699997b63.dip0.t-ipconnect.de. [2003:cb:c719:d00:eae9:3af6:9999:7b63]) by smtp.gmail.com with ESMTPSA id c1-20020adfe741000000b00236883f2f5csm506813wrn.94.2022.10.25.08.34.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Oct 2022 08:34:53 -0700 (PDT) Message-ID: Date: Tue, 25 Oct 2022 17:34:52 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: [PATCH] selftests: vm: use 1 MB hugepage size for s390 To: Gerald Schaefer , Andrew Morton , Shuah Khan , Muchun Song Cc: linux-mm , LKML , linux-kselftest@vger.kernel.org, linux-s390 References: <20221025152610.3439102-1-gerald.schaefer@linux.ibm.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20221025152610.3439102-1-gerald.schaefer@linux.ibm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666712097; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=q1GvBOBCP6KETy6rTK6QCl92NvC/MctQ2jjFIvDTUSU=; b=DfsEwvvzPgIkMiTFjBbVe07wUUdx6KhW2BkK48V6UjsHXS27hsZiPXW5dQDSYxIYjO0Jop 2n943L/oNwR6P61VUx9G6Xwh/F01FgAWtmJVohCouq32xwS7YH3xwonv40PwZrfvyMunvz 6Nhjcc7IXD0BfnMZXeYbkEQljYE9+iI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=b13kbdLU; spf=pass (imf03.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666712097; a=rsa-sha256; cv=none; b=Tg0N3JJ1vEJ9lyYKU2Xy8dj5h1ULB0sGr4X6+c7/cybCpwP7KxpTiDrGAM+1WB9gq0jTFL Arlluy8idmEYC4PQLAYFZ+CUZtVIEVTByyfDk2tHpK7rDkyhk6AzG+LTQxlQjBBHP3Px7/ RC27Vsf1t14B3G+6HS/dkYKvHX04lm4= X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7414920021 X-Rspam-User: Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=b13kbdLU; spf=pass (imf03.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Stat-Signature: uqzru1ei64mn8fgmxqw4rf8yp5kcu9jc X-HE-Tag: 1666712097-68183 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 25.10.22 17:26, Gerald Schaefer wrote: > 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 Why not detect it at runtime, so this works on any architecture (e.g., ppc64 with 16 MiB IIRC and arm64 with weird sizes)? A patch that adds such detection code is currently on its way upstream: https://lore.kernel.org/all/20220927110120.106906-5-david@redhat.com/T/#u We could factor that out into vm_utils.c -- Thanks, David / dhildenb