From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Mike Rapoport <rppt@kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Peter Xu <peterx@redhat.com>,
maobibo <maobibo@loongson.cn>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
linux-mips@vger.kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, Mike Rapoport <rppt@linux.ibm.com>
Subject: Re: [PATCH] mips: define pud_index() regardless of page table folding
Date: Wed, 15 Apr 2020 08:43:18 +0200 [thread overview]
Message-ID: <191a4b86-3921-e72c-998d-c490de3ee6e0@amsat.org> (raw)
In-Reply-To: <20200402081614.5696-1-rppt@kernel.org>
On 4/2/20 10:16 AM, Mike Rapoport wrote:
> From: Mike Rapoport <rppt@linux.ibm.com>
>
> Commit 31168f033e37 ("mips: drop __pXd_offset() macros that duplicate
> pXd_index() ones") is correct that pud_index() & __pud_offset() are the
> same when pud_index() is actually provided, however it does not take into
> account the __PAGETABLE_PUD_FOLDED case. This has broken MIPS KVM
> compilation because it relied on availability of pud_index().
>
> Define pud_index() regardless of page table folded. It will evaluate to
> actual index for 4-level pagetables and to 0 for folded PUD level.
>
> Link: https://lore.kernel.org/lkml/20200331154749.5457-1-pbonzini@redhat.com
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> arch/mips/include/asm/pgtable-64.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h
> index f92716cfa4f4..ee5dc0c145b9 100644
> --- a/arch/mips/include/asm/pgtable-64.h
> +++ b/arch/mips/include/asm/pgtable-64.h
> @@ -172,6 +172,8 @@
>
> extern pte_t invalid_pte_table[PTRS_PER_PTE];
>
> +#define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))
> +
> #ifndef __PAGETABLE_PUD_FOLDED
> /*
> * For 4-level pagetables we defines these ourselves, for 3-level the
> @@ -210,8 +212,6 @@ static inline void p4d_clear(p4d_t *p4dp)
> p4d_val(*p4dp) = (unsigned long)invalid_pud_table;
> }
>
> -#define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))
> -
> static inline unsigned long p4d_page_vaddr(p4d_t p4d)
> {
> return p4d_val(p4d);
>
next prev parent reply other threads:[~2020-04-15 6:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-02 8:16 [PATCH] mips: define pud_index() regardless of page table folding Mike Rapoport
2020-04-13 6:21 ` Huacai Chen
2020-04-15 6:43 ` Philippe Mathieu-Daudé [this message]
2020-04-16 16:35 ` Thomas Bogendoerfer
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=191a4b86-3921-e72c-998d-c490de3ee6e0@amsat.org \
--to=f4bug@amsat.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=maobibo@loongson.cn \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=rppt@kernel.org \
--cc=rppt@linux.ibm.com \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=tsbogend@alpha.franken.de \
/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).