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 0DC7AC3271E for ; Thu, 4 Jul 2024 14:48:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 857846B0093; Thu, 4 Jul 2024 10:48:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E0F16B0095; Thu, 4 Jul 2024 10:48:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 659CB6B0096; Thu, 4 Jul 2024 10:48:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4476E6B0093 for ; Thu, 4 Jul 2024 10:48:44 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DC8DA80EAD for ; Thu, 4 Jul 2024 14:48:43 +0000 (UTC) X-FDA: 82302351726.11.3221D22 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id BDA7040013 for ; Thu, 4 Jul 2024 14:48:40 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Bm7ZRajf; spf=pass (imf27.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720104501; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vXECjDJrtIl4BpVTyYC6fwJS8w+7LK06QJNYlI1sP8Y=; b=uWG/VCeRhNbs/YZDxA9KMS4/mYOdFwVZZuB9b7yJZ6W228JJMIMrLhqAAI3BmPBaIE8CvG T6uu05dtAUOfym4sSaNX4T3cKwsd6OGmHdePrOLAHlVPOb5okO0yo0W5BuMt/MLizMdzpf yVeLpbei1x6cx2x+t0/QnkZwvmxLN8U= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Bm7ZRajf; spf=pass (imf27.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720104501; a=rsa-sha256; cv=none; b=hrNCcfcavo+j2S8v5/X/l4ZhdhxumzYIHWeRYlsX69Fo2N89S6Vka9xH5q7LRpxK1xDSEc AHdqF86vDtNZAEJnrET49uo6h758vs94zz2rRgjUGGbpYqJjrx1enijvHVtQvFf1hpRhv4 SBD2mopTCFuwfPT+I1wdDtRlAGClnzw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720104520; 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: in-reply-to:in-reply-to:references:references; bh=vXECjDJrtIl4BpVTyYC6fwJS8w+7LK06QJNYlI1sP8Y=; b=Bm7ZRajfsLaY1QQV7VFpRVsCp0krxkVBh8qXXjTY8Ta1WJCip4VXN/mQoe5wMaSLfvXB1L UkhlOEU6uJhY12ATPlfYMFGo7A1iysMC4Uu4au3RkGQXYXllXJ9x7QiqvQ8XjUR1Sea+0M nQqCWpk/Dbq7JR1jBwrA7HTZ/O7IDs4= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-74-BDuLgYTKNqifLxMqN8aGAQ-1; Thu, 04 Jul 2024 10:48:38 -0400 X-MC-Unique: BDuLgYTKNqifLxMqN8aGAQ-1 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-445b5b87c64so1978891cf.0 for ; Thu, 04 Jul 2024 07:48:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720104518; x=1720709318; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vXECjDJrtIl4BpVTyYC6fwJS8w+7LK06QJNYlI1sP8Y=; b=q3oSSbQttCezwtJTqpHTcq+zdHfJsZEEiU4OAxIiBCprB1p+dEIuiNgN16bTjmyscY ISNb3QGCBC/OwZTwhToUdGssYTBoXbWSxoBg5/4cLjZeQHnhTW5GVEHA5EnXZJPBHUIY NNGOkXkCWuH+hy2CmErAy9tmGwMxQRH8hXWaLd6Z/76XiIOzVHqz6NSjUjGlGiZzaBpt VqdSPKlJ5mv2lnXK2KnKXZAnqqUAu+pAFo4yLHGL49k+lC15ae27LctzZJA2IU8UvRFw 8ERkxt/vyL5NdCA71Ji+kcuyItT8pw7MsR6avc4JApkUDlRrGPQwIJPg6geMtSlDrJQH pMwg== X-Forwarded-Encrypted: i=1; AJvYcCUyD+3wLrcl2HhbtsPl07viBE7tn5OGuBE32X6NJYQdu/Xg4vBt2r+HhiK7vA/mmMT2SPzKte3U964WGZJr3U3PmuA= X-Gm-Message-State: AOJu0YxB/LO25GVgaJ92bnZGc5eI/s6jqWelyfkB9icrTqTzTeBbrFvE qwt8p/lIX9/gu5+0SKEPxXZcMKyPPqmcFmH75L5zoC9dXdlw/PmX2y3lBcgq+Q5/3pgpZ+4Ce8N EG5yE0OpQgzG/38klYT8/46NSWuZkIxiGrJ2MkL1FlPkI253G X-Received: by 2002:a05:6214:19ca:b0:6b5:de38:d6ee with SMTP id 6a1803df08f44-6b5ed25fef8mr17983516d6.3.1720104518271; Thu, 04 Jul 2024 07:48:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbfJ4Dl8q9Di4ADjKh3fKHELg53QNLbtDJ7V6Dfgq9r/AZUi3Tjq7eYCPt4FX3A5juSme39A== X-Received: by 2002:a05:6214:19ca:b0:6b5:de38:d6ee with SMTP id 6a1803df08f44-6b5ed25fef8mr17983356d6.3.1720104517861; Thu, 04 Jul 2024 07:48:37 -0700 (PDT) Received: from x1n (pool-99-254-121-117.cpe.net.cable.rogers.com. [99.254.121.117]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b5f04c9fdcsm3194276d6.34.2024.07.04.07.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 07:48:37 -0700 (PDT) Date: Thu, 4 Jul 2024 10:48:34 -0400 From: Peter Xu To: Christophe Leroy Cc: Andrew Morton , Arnd Bergmann , linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, linux-riscv@lists.infradead.org, Oscar Salvador Subject: Re: [PATCH 3/3] mm: Add p{g/4}d_leaf() in asm-generic/pgtable-nop{4/u}d.h Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Stat-Signature: yc86m6estkbo7k7jhtt55epcyq7xcm9y X-Rspam-User: X-Rspamd-Queue-Id: BDA7040013 X-Rspamd-Server: rspam02 X-HE-Tag: 1720104520-916929 X-HE-Meta: U2FsdGVkX1//yFsDpG8zp7GeUP7OB00OPqZrXFK1CR3yEkfVymro5A7nSdNP9Ga/Bh3I8Gx3YypQuHQxsfH0bJ8XEe7VLZ91DWHRRJuNm/J53E4Mp1uB4Akd7Kg+mkMi+6JtrtKho77s9otOmXhkQPx10/POiq0/ZL5NlHrcePJFt3W5UvtKCWvp/6aQTzoQeHxUkzLHInwQN2zAVL0wDPjF31J7fuk+beaMyhbXT8AB9bDtv+JTyKeu3nMWKG1UyF5H6+i/VgR/3cumPiV1DB31z93WGBc6xa9D51YwNmgv9Gp4vmOH1g5Ha3TV6pBwDWmush0R/5TgjuORjyV/44HZn50/FRPSrlv65VavRzYg7iW21JK6Fb0Wvmo5bzX2YZeC3nnhv1P2+ZBVRuiMFVE2XVXR43OcEs1/sVtiMNIzklf0v8F0NYe7GFJ5FgV4Pgmug1DnCCvDLDcoqjUThnhhw+HzGJoPmr9M6LfEDTGE1dI6cW8BYX+7NoyJ/vfkjezWoKEqO7gX+AMKKD5iXCgLsH19u6bUeeh9+889o3zSX5p283gGOu71HwAso3msEtPZiqEVQ9x54rYhwJdUnFKM7cE22iYLVG3v8HW/OGHN+L1/rP75L9b8DLD0W+XHtF8kvkwm01qvmw0x9Rb/xVWwHWSGPKaJhVSoq/aR/fL00URfTQ9xJy56fLMzcaDpjIyUnkdB4Cp00jK/+6FN0OHVoXo+y10tz0yqhmnyCLV/gXSbV9z1wwcU7ZKr3IYgva0pyl5pT6AzrG2cPObI5eRkdz+ePufL4Bmfn5URnxkuDHKbFpG6eVEJ5i5x6HX5mp4BdQcb1hMbauJ1B5A8edimWs4vXFzjlTYTPubPhm8yUWI7MP0R5ccyAf8XYxnXnEfrbyiy6tZIXqWnFzMWL19cYsukVMOj+wMAqMrc8dQkciJYonh4WhfxbipuHOTYjRfQ8cD1rT3QxEWi/9n M6Vu7fzB IWHpocmpmXZjeGYIaurar5/hZ7uI/HhTq5a47qM5so8OXakKIhc3RYCkq2q0SDkq2CThUYNzqiOxos/NTIk/Qeur9bPhi01yrL6C3bm4Vg9xgzVjM9PnCxNx79i9gls+wHI8V0/dpYEXdlZoBOElbVGkCDsUJIT49LL4ez4vsMc5r5rOY2N2KPPWCU12xPngIi4Vfm3EKtVF+L+ZN85GCe4QBHBO2XtaUCzCfjX6MlziJO/t0c33u7fWrxK4kFlSmnkeRcHAQSUAAfjxOuMrQ8Bzi2o5aGEO6FL0FCFQE5PSKhSgcX5MTcyYZKzxhLP50OwoqiqcJrJYChP5I+jdrKNZ1HsTLWSwECEUNgVqmB5tsHBnMvql/NMK/FE7Q05ce0/IWijjwnOH7bZ61+pIGf6USsd6l95uyLk79X8zObsbTdUZctMikpeo1nP0P3L096c82UhOMwiRp5tw= 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: List-Subscribe: List-Unsubscribe: On Thu, Jul 04, 2024 at 08:30:05AM +0200, Christophe Leroy wrote: > Commit 2c8a81dc0cc5 ("riscv/mm: fix two page table check related > issues") added pud_leaf() in include/asm-generic/pgtable-nopmd.h > > Do the same for p4d_leaf() and pgd_leaf() to avoid getting them > erroneously defined by architectures that do not implement the > related page level. > > Signed-off-by: Christophe Leroy > --- > include/asm-generic/pgtable-nop4d.h | 1 + > include/asm-generic/pgtable-nopud.h | 1 + > include/linux/pgtable.h | 6 +++--- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/include/asm-generic/pgtable-nop4d.h b/include/asm-generic/pgtable-nop4d.h > index 03b7dae47dd4..75c96bbc5a96 100644 > --- a/include/asm-generic/pgtable-nop4d.h > +++ b/include/asm-generic/pgtable-nop4d.h > @@ -21,6 +21,7 @@ typedef struct { pgd_t pgd; } p4d_t; > static inline int pgd_none(pgd_t pgd) { return 0; } > static inline int pgd_bad(pgd_t pgd) { return 0; } > static inline int pgd_present(pgd_t pgd) { return 1; } > +static inline int pgd_leaf(pgd_t pgd) { return 0; } > static inline void pgd_clear(pgd_t *pgd) { } > #define p4d_ERROR(p4d) (pgd_ERROR((p4d).pgd)) > > diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h > index eb70c6d7ceff..14aeb8ef2d8a 100644 > --- a/include/asm-generic/pgtable-nopud.h > +++ b/include/asm-generic/pgtable-nopud.h > @@ -28,6 +28,7 @@ typedef struct { p4d_t p4d; } pud_t; > static inline int p4d_none(p4d_t p4d) { return 0; } > static inline int p4d_bad(p4d_t p4d) { return 0; } > static inline int p4d_present(p4d_t p4d) { return 1; } > +static inline int p4d_leaf(p4d_t p4d) { return 0; } > static inline void p4d_clear(p4d_t *p4d) { } > #define pud_ERROR(pud) (p4d_ERROR((pud).p4d)) > > diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h > index 2a6a3cccfc36..b27e66f542d6 100644 > --- a/include/linux/pgtable.h > +++ b/include/linux/pgtable.h > @@ -1882,13 +1882,13 @@ typedef unsigned int pgtbl_mod_mask; > * - It should cover all kinds of huge mappings (e.g., pXd_trans_huge(), > * pXd_devmap(), or hugetlb mappings). > */ > -#ifndef pgd_leaf > +#if !defined(__PAGETABLE_P4D_FOLDED) && !defined(pgd_leaf) > #define pgd_leaf(x) false > #endif > -#ifndef p4d_leaf > +#if !defined(__PAGETABLE_PUD_FOLDED) && !defined(p4d_leaf) > #define p4d_leaf(x) false > #endif > -#ifndef pud_leaf > +#if !defined(__PAGETABLE_PMD_FOLDED) && !defined(pud_leaf) > #define pud_leaf(x) false > #endif > #ifndef pmd_leaf Is it possible to do it the other way round, so that we can still rely on "ifdef pxx_leaf" to decide whether to provide a fallback, and define them properly when needed? IMHO it was a neat way to avoid worrying on any macro defined; it'll be as simple as "if function xxx not defined, let's define a fallback for xxx". Per my limited experience it helped a lot on avoid compile issues here and there.. Thanks, -- Peter Xu