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 1BC20C433EF for ; Wed, 23 Mar 2022 17:42:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7487E6B0074; Wed, 23 Mar 2022 13:42:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D1126B0075; Wed, 23 Mar 2022 13:42:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 523B56B0078; Wed, 23 Mar 2022 13:42:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0141.hostedemail.com [216.40.44.141]) by kanga.kvack.org (Postfix) with ESMTP id 421A06B0074 for ; Wed, 23 Mar 2022 13:42:55 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id F2591A0FAE for ; Wed, 23 Mar 2022 17:42:54 +0000 (UTC) X-FDA: 79276371468.25.F3618F7 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by imf08.hostedemail.com (Postfix) with ESMTP id 9328E16001F for ; Wed, 23 Mar 2022 17:42:54 +0000 (UTC) Received: by mail-ed1-f42.google.com with SMTP id a17so2739004edm.9 for ; Wed, 23 Mar 2022 10:42:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=WXItiXCQz5Vw2Hrps28AyoQxpxOIY3YlmmRg+b0brOE=; b=Ad5P83rtyjFJkIHpTwqdisAfJ/ztomVrkyAP+/G5xcG7X7fSZdTAaNlkX1NuUaO62v 6aGCEicDllFaaP4wKxcjPdZ8/eBjrIcBioriIOWrBPlQXjDgDH3HATEcmEq4pjmYmyuL sNPU+M67PiW55rp6J4ntdoUUQq3sdqTdfGCWVfLFYxhpAQWUXVy4wevJiFkU2IMHO6Xl JPn1R6Jk+K+BjwjAF55y5ojrOPrvDZxddQtL6CQMHjNSNskYTkA8hejsHn2YnvwD/rz0 mzsS1QCUXyKXqlpj49Xo/tbAm5QXBY6vtamYRPwNdpX+LKjs8TCuwOUPC003HsbCgdXZ Y9YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=WXItiXCQz5Vw2Hrps28AyoQxpxOIY3YlmmRg+b0brOE=; b=G1nNBuZJ5sTBZZ3cBjKm+Cx4Sz5dcvQ9OWRIa36jT2wGUKdidzMvkXMqldX9+NT/rE 9eaU1YkQJvyCuWIv280w1ZKRNeQPYbd6EC1I8z+kRJgqyR8B41VeMtYal+yT8a2auR03 M/VNHyLyoY2gUG/L86YUT9QmX88VlRK2Cw3YlbyjNoP4XdrqBxmlwlp60ARcW1xiJVt8 yGWePdMSoSig/Od++LrsjsJKwa4CutTWWPP+DtRqeZbZtu8BOlCeF4PBSGM5ZRUE/Y/x c5B5smmUCLAq0TpENRqP/jUDJBq12D7Db4dBKTI0/HGwJ2qxm5ZlyOuwVWv++a1KFfcL CDjQ== X-Gm-Message-State: AOAM531is9mqkF/fAv0HUMftNeZxETM4Hg0etX8E0NeBZBVekvOW0DS5 kUOXAVH/TejtaTRnWgtssjiFrNChAqRFPCGvkCDx5g== X-Google-Smtp-Source: ABdhPJy6cLr1ddZfcfPHFBk/SvkOJjbyy8M1sRFi3dxI2xQMUYKnKZHJSoBfOoqSYj8bhYV5u6Fc1RkjdJy1KyGB1XQ= X-Received: by 2002:aa7:dbd0:0:b0:416:633c:a0cc with SMTP id v16-20020aa7dbd0000000b00416633ca0ccmr1530996edt.349.1648057373156; Wed, 23 Mar 2022 10:42:53 -0700 (PDT) MIME-Version: 1.0 References: <20220322144447.3563146-1-tongtiangen@huawei.com> <20220322144447.3563146-3-tongtiangen@huawei.com> In-Reply-To: <20220322144447.3563146-3-tongtiangen@huawei.com> From: Pasha Tatashin Date: Wed, 23 Mar 2022 13:42:16 -0400 Message-ID: Subject: Re: [PATCH -next v2 2/4] mm: page_table_check: add hooks to public helpers To: Tong Tiangen Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "H. Peter Anvin" , Andrew Morton , Catalin Marinas , Will Deacon , Paul Walmsley , Palmer Dabbelt , Albert Ou , LKML , linux-mm , Linux ARM , linux-riscv@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=soleen.com header.s=google header.b=Ad5P83rt; spf=pass (imf08.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.208.42 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com; dmarc=none X-Stat-Signature: j7j1zdggd51z4yttq4p5fe79hnenifkh X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 9328E16001F X-HE-Tag: 1648057374-805168 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 Tue, Mar 22, 2022 at 10:25 AM Tong Tiangen wrote: > > Move ptep_clear() to the include/linux/pgtable.h and add page table check > relate hooks to some helpers, it's prepare for support page table check > feature on new architecture. > > Signed-off-by: Tong Tiangen > --- > arch/x86/include/asm/pgtable.h | 10 ---------- > include/linux/pgtable.h | 27 +++++++++++++++++++-------- > 2 files changed, 19 insertions(+), 18 deletions(-) > > diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h > index 8cd6514e3052..8c85f2eabbaa 100644 > --- a/arch/x86/include/asm/pgtable.h > +++ b/arch/x86/include/asm/pgtable.h > @@ -1077,16 +1077,6 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, > return pte; > } > > -#define __HAVE_ARCH_PTEP_CLEAR > -static inline void ptep_clear(struct mm_struct *mm, unsigned long addr, > - pte_t *ptep) > -{ > - if (IS_ENABLED(CONFIG_PAGE_TABLE_CHECK)) > - ptep_get_and_clear(mm, addr, ptep); > - else > - pte_clear(mm, addr, ptep); > -} > - > #define __HAVE_ARCH_PTEP_SET_WRPROTECT > static inline void ptep_set_wrprotect(struct mm_struct *mm, > unsigned long addr, pte_t *ptep) > diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h > index f4f4077b97aa..d27fd0ed84a9 100644 > --- a/include/linux/pgtable.h > +++ b/include/linux/pgtable.h > @@ -12,6 +12,7 @@ > #include > #include > #include > +#include > > #if 5 - defined(__PAGETABLE_P4D_FOLDED) - defined(__PAGETABLE_PUD_FOLDED) - \ > defined(__PAGETABLE_PMD_FOLDED) != CONFIG_PGTABLE_LEVELS > @@ -259,14 +260,6 @@ static inline int pmdp_clear_flush_young(struct vm_area_struct *vma, > #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > #endif > > -#ifndef __HAVE_ARCH_PTEP_CLEAR > -static inline void ptep_clear(struct mm_struct *mm, unsigned long addr, > - pte_t *ptep) > -{ > - pte_clear(mm, addr, ptep); > -} > -#endif > - > #ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR > static inline pte_t ptep_get_and_clear(struct mm_struct *mm, > unsigned long address, > @@ -274,10 +267,23 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, > { > pte_t pte = *ptep; > pte_clear(mm, address, ptep); > + page_table_check_pte_clear(mm, address, pte); > return pte; > } > #endif > > +#ifndef __HAVE_ARCH_PTEP_CLEAR > +static inline void ptep_clear(struct mm_struct *mm, unsigned long addr, > + pte_t *ptep) > +{ > +#ifdef CONFIG_PAGE_TABLE_CHECK > + ptep_get_and_clear(mm, addr, ptep); > +#else > + pte_clear(mm, addr, ptep); > +#endif I have a preference to use if (IS_ENABLED(CONFIG_PAGE_TABLE_CHECK)) instead of #ifdef. The end result is the same. Otherwise it looks good. Thanks, Pasha