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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D40E1C04A95 for ; Tue, 25 Oct 2022 15:35:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233251AbiJYPfC (ORCPT ); Tue, 25 Oct 2022 11:35:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232356AbiJYPfA (ORCPT ); Tue, 25 Oct 2022 11:35:00 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 542EC5806E for ; Tue, 25 Oct 2022 08:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666712097; 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=NLEHoELw3FW3lGAgKhXLKvhRXSXYC03mFHzo1Lky6pvEkID2pMR6rKBYICtB3nSoMf1lN+ hZOvwTWRTtYyRiTbg2ps3opYv8AjsB4gXa1uUXfJSilHQ1M5tAt4+9YaufcCwWCq9rmZKw fe94xfgCJ+R3aad6fFES1l0NAansthI= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-528-xttKZzf8MQCkbW9QSy5JMg-1; Tue, 25 Oct 2022 11:34:55 -0400 X-MC-Unique: xttKZzf8MQCkbW9QSy5JMg-1 Received: by mail-wr1-f71.google.com with SMTP id j20-20020adfb314000000b002366d9f67aaso3177827wrd.3 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=AqVaZnX1I52avigB2taZNMmoRJQ6exaH5cPmr3MYvzOxn1z7oR4L4g1vyrX1eFsLF8 a/bLBndZHKMKksKpGVG3uY8nTYJUVruOTeufewmntNt5D8quPQk+Kwm+utGXH5iBV71N 7j/cvAnM5x2XEZHwKNDc9ydkLAf0Edg8Mha6kh7HgiFF+sUfnDHIFx+kgNJEnZz+fpOn JBOLapRfXozEXcCKHXLHwVdfJ9yo3cIC90cZ90f+AQQA28OJIyDYRrO2c2pL/AjCVvtv YlpI1JCGS/v9F8xEBOQ3nlOujZZf071uytko9wi81IAqG5m3gtdqy9KLEKS7eD18kN82 PWPQ== X-Gm-Message-State: ACrzQf1Q9ziRVkjAgMeqjzDkNuXbNXwGyMxqP8iUtJd/SljTfLPAIaBn Tqk8IPHWayd1in3RM3Boj5VSQOiC7I7rOKIJhNl7KcSPUnB05NSBJHEO9z1ntp6hGcBJi35Yvtg XIyylKai19CpxEQtlgj+UWw== X-Received: by 2002:a05:6000:18ad:b0:230:6d12:fc7d with SMTP id b13-20020a05600018ad00b002306d12fc7dmr25096958wri.409.1666712094506; 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 Content-Language: en-US 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> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org 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