From: Peter Zijlstra <peterz@infradead.org>
To: Rick Edgecombe <rick.p.edgecombe@intel.com>
Cc: dave.hansen@intel.com, luto@kernel.org, linux-mm@kvack.org,
x86@kernel.org, akpm@linux-foundation.org,
linux-hardening@vger.kernel.org,
kernel-hardening@lists.openwall.com, ira.weiny@intel.com,
rppt@kernel.org, dan.j.williams@intel.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH RFC 5/9] x86, mm: Use cache of page tables
Date: Wed, 5 May 2021 10:51:55 +0200 [thread overview]
Message-ID: <YJJcqyrMEJipbevT@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20210505003032.489164-6-rick.p.edgecombe@intel.com>
On Tue, May 04, 2021 at 05:30:28PM -0700, Rick Edgecombe wrote:
> @@ -54,6 +98,8 @@ void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte)
> {
> pgtable_pte_page_dtor(pte);
> paravirt_release_pte(page_to_pfn(pte));
> + /* Set Page Table so swap knows how to free it */
> + __SetPageTable(pte);
> paravirt_tlb_remove_table(tlb, pte);
> }
>
> @@ -70,12 +116,16 @@ void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
> tlb->need_flush_all = 1;
> #endif
> pgtable_pmd_page_dtor(page);
> + /* Set Page Table so swap nows how to free it */
> + __SetPageTable(virt_to_page(pmd));
> paravirt_tlb_remove_table(tlb, page);
> }
>
> #if CONFIG_PGTABLE_LEVELS > 3
> void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)
> {
> + /* Set Page Table so swap nows how to free it */
> + __SetPageTable(virt_to_page(pud));
> paravirt_release_pud(__pa(pud) >> PAGE_SHIFT);
> paravirt_tlb_remove_table(tlb, virt_to_page(pud));
> }
> @@ -83,6 +133,8 @@ void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)
> #if CONFIG_PGTABLE_LEVELS > 4
> void ___p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d)
> {
> + /* Set Page Table so swap nows how to free it */
> + __SetPageTable(virt_to_page(p4d));
> paravirt_release_p4d(__pa(p4d) >> PAGE_SHIFT);
> paravirt_tlb_remove_table(tlb, virt_to_page(p4d));
> }
This, to me, seems like a really weird place to __SetPageTable(), why
can't we do that on allocation?
> @@ -888,6 +889,12 @@ void release_pages(struct page **pages, int nr)
> continue;
> }
>
> + if (PageTable(page)) {
> + __ClearPageTable(page);
> + free_table(page);
> + continue;
> + }
> +
> if (!put_page_testzero(page))
> continue;
>
> diff --git a/mm/swap_state.c b/mm/swap_state.c
> index 3cdee7b11da9..a60ec3d4ab21 100644
> --- a/mm/swap_state.c
> +++ b/mm/swap_state.c
> @@ -22,6 +22,7 @@
> #include <linux/swap_slots.h>
> #include <linux/huge_mm.h>
> #include <linux/shmem_fs.h>
> +#include <asm/pgalloc.h>
> #include "internal.h"
>
> /*
> @@ -310,6 +311,11 @@ static inline void free_swap_cache(struct page *page)
> void free_page_and_swap_cache(struct page *page)
> {
> free_swap_cache(page);
> + if (PageTable(page)) {
> + __ClearPageTable(page);
> + free_table(page);
> + return;
> + }
> if (!is_huge_zero_page(page))
> put_page(page);
> }
And then free_table() can __ClearPageTable() and all is nice and
symmetric and all this weirdness goes away, no?
next prev parent reply other threads:[~2021-05-05 8:52 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 0:30 [PATCH RFC 0/9] PKS write protected page tables Rick Edgecombe
2021-05-05 0:30 ` [PATCH RFC 1/9] list: Support getting most recent element in list_lru Rick Edgecombe
2021-05-05 0:30 ` [PATCH RFC 2/9] list: Support list head not in object for list_lru Rick Edgecombe
2021-05-05 0:30 ` [PATCH RFC 3/9] x86/mm/cpa: Add grouped page allocations Rick Edgecombe
2021-05-05 12:08 ` Mike Rapoport
2021-05-05 13:09 ` Peter Zijlstra
2021-05-05 18:45 ` Mike Rapoport
2021-05-05 21:57 ` Edgecombe, Rick P
2021-05-09 9:39 ` Mike Rapoport
2021-05-10 19:38 ` Edgecombe, Rick P
2021-05-05 0:30 ` [PATCH RFC 4/9] mm: Explicitly zero page table lock ptr Rick Edgecombe
2021-05-05 0:30 ` [PATCH RFC 5/9] x86, mm: Use cache of page tables Rick Edgecombe
2021-05-05 8:51 ` Peter Zijlstra [this message]
2021-05-05 12:09 ` Mike Rapoport
2021-05-05 13:19 ` Peter Zijlstra
2021-05-05 21:54 ` Edgecombe, Rick P
2021-05-06 17:59 ` Matthew Wilcox
2021-05-06 18:24 ` Shakeel Butt
2021-05-07 16:27 ` Edgecombe, Rick P
2021-05-05 0:30 ` [PATCH RFC 6/9] x86/mm/cpa: Add set_memory_pks() Rick Edgecombe
2021-05-05 0:30 ` [PATCH RFC 7/9] x86/mm/cpa: Add perm callbacks to grouped pages Rick Edgecombe
2021-05-05 0:30 ` [PATCH RFC 8/9] x86, mm: Protect page tables with PKS Rick Edgecombe
2021-05-05 0:30 ` [PATCH RFC 9/9] x86, cpa: PKS protect direct map page tables Rick Edgecombe
2021-05-05 2:03 ` [PATCH RFC 0/9] PKS write protected " Ira Weiny
2021-05-05 6:25 ` Kees Cook
2021-05-05 8:37 ` Peter Zijlstra
2021-05-05 18:38 ` Kees Cook
2021-05-05 19:51 ` Edgecombe, Rick P
2021-05-06 0:00 ` Ira Weiny
2021-05-05 11:08 ` Vlastimil Babka
2021-05-05 11:56 ` Peter Zijlstra
2021-05-05 19:46 ` Edgecombe, Rick P
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YJJcqyrMEJipbevT@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@intel.com \
--cc=ira.weiny@intel.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=rick.p.edgecombe@intel.com \
--cc=rppt@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).