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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D181AC433B4 for ; Sun, 2 May 2021 10:36:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 350966135A for ; Sun, 2 May 2021 10:36:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 350966135A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 893F96B006C; Sun, 2 May 2021 06:36:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 844096B006E; Sun, 2 May 2021 06:36:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E40C6B0070; Sun, 2 May 2021 06:36:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0112.hostedemail.com [216.40.44.112]) by kanga.kvack.org (Postfix) with ESMTP id 469076B006C for ; Sun, 2 May 2021 06:36:22 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D371234A3 for ; Sun, 2 May 2021 10:36:21 +0000 (UTC) X-FDA: 78095936562.15.25F78BC Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf27.hostedemail.com (Postfix) with ESMTP id BA5FF80192D4 for ; Sun, 2 May 2021 10:35:54 +0000 (UTC) Received: by mail-pf1-f176.google.com with SMTP id 10so2207303pfl.1 for ; Sun, 02 May 2021 03:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:subject:to:cc:references:in-reply-to:mime-version :message-id:content-transfer-encoding; bh=nBVktWzWQs0ycy4eKYb+aWc95BFCqBy6EYnYKyLnjK8=; b=AJntAANakgvRSf7hmmuM/lzpDKoiWoXaj+vVMLF+fZsCQTOKl74DFP8kMuWnqVYbaM oFqz/6kbPE1oeOq11iQTSkeqVBbpHRimaWwnm42/3G2XuKaamx//oYbBQFURpohZGWoi edQ24k06DS0Sr/98QWi7wO9TxOeeGxC8PjCWlohkyosJsNjZ/M9OLQ4uYDwJ2GXuJ4Qy uOuhJ5fzug600sLCvHWz6e8xTLweHpQ/G5FD5rNJGzFWHxwTO+tSrbXHmvorA8DHTCs0 zwhkTLbZF2IErEfGE8cOQgOE5cGcNISZskXW/yzHOHT46myueE513k6TY/3YTXnNbqWa eyqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:subject:to:cc:references:in-reply-to :mime-version:message-id:content-transfer-encoding; bh=nBVktWzWQs0ycy4eKYb+aWc95BFCqBy6EYnYKyLnjK8=; b=DM+TwPbB+KRa8Bp43oRTNda5Ii3cjWA4PHx3OHDKyBStRRZbOJkZjhhiqJ4Cdv+eMV 1ifeqo0anthrvYz4N7YG4EmWzWjiwtSQTuNPWFVUKwRe5z/MHF0KRrEsSC6tjTkJXiwK mK3HsDv/eSGD9lMHI87WnDWM/JEUDocZAOo8QFXveNaC7R4MhlNDVznZGR8O0NaOALdN FBJhwA511TLp3s0CzlJlJ65dAHUTmqx/FrUea7Z8ubUrWd3HaHb9pmYa0/Okg1n/ww09 QYkSVnovg9OGLFS8q6epVRYgFLs5PSIsWFjJU66Am3zIQZYHUDTj9/uOxOaunv8bL2sC +4bg== X-Gm-Message-State: AOAM532kLQDM8zycQnvJ0MTJ2w+G5BkqDZUUlm8cMDlzqiRwcDr6Huxy jwBQBVJuNyvRPfIk+apqupA= X-Google-Smtp-Source: ABdhPJzCjOdkQJYJB+L/1YPQM1uheCztA9Q5CyQcFjCdn7f88RCIQ+IbD+4aI/fe71w/2u5yg4bCJg== X-Received: by 2002:a62:2d6:0:b029:204:9b3b:dced with SMTP id 205-20020a6202d60000b02902049b3bdcedmr13687340pfc.36.1619951780422; Sun, 02 May 2021 03:36:20 -0700 (PDT) Received: from localhost ([61.68.127.20]) by smtp.gmail.com with ESMTPSA id k12sm6937414pgh.16.2021.05.02.03.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 03:36:20 -0700 (PDT) Date: Sun, 02 May 2021 20:36:14 +1000 From: Nicholas Piggin Subject: Re: [PATCH] mm/ioremap: Fix iomap_max_page_shift To: Andrew Morton , Christophe Leroy Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <0d615a242c4470462da547dc332e4ec5f00479dd.1619855673.git.christophe.leroy@csgroup.eu> In-Reply-To: <0d615a242c4470462da547dc332e4ec5f00479dd.1619855673.git.christophe.leroy@csgroup.eu> MIME-Version: 1.0 Message-Id: <1619951627.yczq2mwbu6.astroid@bobo.none> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=AJntAANa; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of npiggin@gmail.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=npiggin@gmail.com X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: BA5FF80192D4 X-Stat-Signature: 1uwk4bt8r1kduur7j7k79jzw9zfcm4tj Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf27; identity=mailfrom; envelope-from=""; helo=mail-pf1-f176.google.com; client-ip=209.85.210.176 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619951754-137769 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: Excerpts from Christophe Leroy's message of May 1, 2021 5:58 pm: > iomap_max_page_shift is expected to contain a page shift, > so it can't be a 'bool', has to be an 'unsigned int' >=20 > And fix the default values: P4D_SHIFT is when huge iomap is allowed. Ugh, thanks that's obviously right. Reviewed-by: Nicholas Piggin >=20 > Signed-off-by: Christophe Leroy > Fixes: bbc180a5adb0 ("mm: HUGE_VMAP arch support cleanup") > --- > mm/ioremap.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) >=20 > diff --git a/mm/ioremap.c b/mm/ioremap.c > index d1dcc7e744ac..2f7193c6a99e 100644 > --- a/mm/ioremap.c > +++ b/mm/ioremap.c > @@ -16,16 +16,16 @@ > #include "pgalloc-track.h" > =20 > #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP > -static bool __ro_after_init iomap_max_page_shift =3D PAGE_SHIFT; > +static unsigned int __ro_after_init iomap_max_page_shift =3D P4D_SHIFT; > =20 > static int __init set_nohugeiomap(char *str) > { > - iomap_max_page_shift =3D P4D_SHIFT; > + iomap_max_page_shift =3D PAGE_SHIFT; > return 0; > } > early_param("nohugeiomap", set_nohugeiomap); > #else /* CONFIG_HAVE_ARCH_HUGE_VMAP */ > -static const bool iomap_max_page_shift =3D PAGE_SHIFT; > +static const unsigned int iomap_max_page_shift =3D PAGE_SHIFT; > #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ > =20 > int ioremap_page_range(unsigned long addr, > --=20 > 2.25.0 >=20 >=20