From: "Nicholas Piggin" <npiggin@gmail.com>
To: "Thomas Huth" <thuth@redhat.com>
Cc: Laurent Vivier <lvivier@redhat.com>,
linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org,
Andrew Jones <andrew.jones@linux.dev>
Subject: Re: [kvm-unit-tests PATCH v9 22/31] powerpc: Add MMU support
Date: Wed, 05 Jun 2024 11:06:57 +1000 [thread overview]
Message-ID: <D1ROIXQIHXJV.38DLKI4T392V5@gmail.com> (raw)
In-Reply-To: <75adb602-7ccc-4dcd-916e-5f79fcd1cdd3@redhat.com>
On Tue Jun 4, 2024 at 5:30 PM AEST, Thomas Huth wrote:
> On 04/05/2024 14.28, Nicholas Piggin wrote:
> > Add support for radix MMU, 4kB and 64kB pages.
> >
> > This also adds MMU interrupt test cases, and runs the interrupts
> > test entirely with MMU enabled if it is available (aside from
> > machine check tests).
> >
> > Acked-by: Andrew Jones <andrew.jones@linux.dev> (configure changes)
> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> > ---
> ...
> > diff --git a/lib/ppc64/mmu.c b/lib/ppc64/mmu.c
> > new file mode 100644
> > index 000000000..5307cd862
> > --- /dev/null
> > +++ b/lib/ppc64/mmu.c
> > @@ -0,0 +1,281 @@
> > +/* SPDX-License-Identifier: GPL-2.0-only */
> > +/*
> > + * Radix MMU support
> > + *
> > + * Copyright (C) 2024, IBM Inc, Nicholas Piggin <npiggin@gmail.com>
> > + *
> > + * Derived from Linux kernel MMU code.
> > + */
> > +#include <asm/mmu.h>
> > +#include <asm/setup.h>
> > +#include <asm/smp.h>
> > +#include <asm/page.h>
> > +#include <asm/io.h>
> > +#include <asm/processor.h>
> > +#include <asm/hcall.h>
> > +
> > +#include "alloc_page.h"
> > +#include "vmalloc.h"
> > +#include <asm/pgtable-hwdef.h>
> > +#include <asm/pgtable.h>
> > +
> > +#include <linux/compiler.h>
> > +
> > +static pgd_t *identity_pgd;
> > +
> > +bool vm_available(void)
> > +{
> > + return cpu_has_radix;
> > +}
> > +
> > +bool mmu_enabled(void)
> > +{
> > + return current_cpu()->pgtable != NULL;
> > +}
> > +
> > +void mmu_enable(pgd_t *pgtable)
> > +{
> > + struct cpu *cpu = current_cpu();
> > +
> > + if (!pgtable)
> > + pgtable = identity_pgd;
> > +
> > + cpu->pgtable = pgtable;
> > +
> > + mtmsr(mfmsr() | (MSR_IR|MSR_DR));
> > +}
> > +
> > +void mmu_disable(void)
> > +{
> > + struct cpu *cpu = current_cpu();
> > +
> > + cpu->pgtable = NULL;
> > +
> > + mtmsr(mfmsr() & ~(MSR_IR|MSR_DR));
> > +}
> > +
> > +static inline void tlbie(unsigned long rb, unsigned long rs, int ric, int prs, int r)
> > +{
> > + asm volatile(".machine push ; .machine power9; ptesync ; tlbie %0,%1,%2,%3,%4 ; eieio ; tlbsync ; ptesync ; .machine pop" :: "r"(rb), "r"(rs), "i"(ric), "i"(prs), "i"(r) : "memory");
>
> That's a very long line, please split it up after every assembly instruction
> (using \n for new lines).
>
> > +}
> ...
> > diff --git a/powerpc/mmu.c b/powerpc/mmu.c
> > new file mode 100644
> > index 000000000..fef790506
> > --- /dev/null
> > +++ b/powerpc/mmu.c
> > @@ -0,0 +1,283 @@
> > +/* SPDX-License-Identifier: LGPL-2.0-only */
> > +/*
> > + * MMU Tests
> > + *
> > + * Copyright 2024 Nicholas Piggin, IBM Corp.
> > + */
> > +#include <libcflat.h>
> > +#include <asm/atomic.h>
> > +#include <asm/barrier.h>
> > +#include <asm/processor.h>
> > +#include <asm/mmu.h>
> > +#include <asm/smp.h>
> > +#include <asm/setup.h>
> > +#include <asm/ppc_asm.h>
> > +#include <vmalloc.h>
> > +#include <devicetree.h>
> > +
> > +static inline void tlbie(unsigned long rb, unsigned long rs, int ric, int prs, int r)
> > +{
> > + asm volatile(".machine push ; .machine power9; ptesync ; tlbie %0,%1,%2,%3,%4 ; eieio ; tlbsync ; ptesync ; .machine pop" :: "r"(rb), "r"(rs), "i"(ric), "i"(prs), "i"(r) : "memory");
> > +}
>
> Same function again? Maybe it could go into mmu.h instead?
>
> > +static inline void tlbiel(unsigned long rb, unsigned long rs, int ric, int prs, int r)
> > +{
> > + asm volatile(".machine push ; .machine power9; ptesync ; tlbiel %0,%1,%2,%3,%4 ; ptesync ; .machine pop" :: "r"(rb), "r"(rs), "i"(ric), "i"(prs), "i"(r) : "memory");
> > +}
>
> Please also split up the above long line.
I'll try to improve the lines.
> It would also be cool if you could get one of the other ppc guys at IBM to
> review this patch, since I don't have a clue about this MMU stuff at all.
It would be.
Thanks,
Nick
WARNING: multiple messages have this Message-ID (diff)
From: "Nicholas Piggin" <npiggin@gmail.com>
To: "Thomas Huth" <thuth@redhat.com>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Andrew Jones" <andrew.jones@linux.dev>,
<linuxppc-dev@lists.ozlabs.org>, <kvm@vger.kernel.org>
Subject: Re: [kvm-unit-tests PATCH v9 22/31] powerpc: Add MMU support
Date: Wed, 05 Jun 2024 11:06:57 +1000 [thread overview]
Message-ID: <D1ROIXQIHXJV.38DLKI4T392V5@gmail.com> (raw)
In-Reply-To: <75adb602-7ccc-4dcd-916e-5f79fcd1cdd3@redhat.com>
On Tue Jun 4, 2024 at 5:30 PM AEST, Thomas Huth wrote:
> On 04/05/2024 14.28, Nicholas Piggin wrote:
> > Add support for radix MMU, 4kB and 64kB pages.
> >
> > This also adds MMU interrupt test cases, and runs the interrupts
> > test entirely with MMU enabled if it is available (aside from
> > machine check tests).
> >
> > Acked-by: Andrew Jones <andrew.jones@linux.dev> (configure changes)
> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> > ---
> ...
> > diff --git a/lib/ppc64/mmu.c b/lib/ppc64/mmu.c
> > new file mode 100644
> > index 000000000..5307cd862
> > --- /dev/null
> > +++ b/lib/ppc64/mmu.c
> > @@ -0,0 +1,281 @@
> > +/* SPDX-License-Identifier: GPL-2.0-only */
> > +/*
> > + * Radix MMU support
> > + *
> > + * Copyright (C) 2024, IBM Inc, Nicholas Piggin <npiggin@gmail.com>
> > + *
> > + * Derived from Linux kernel MMU code.
> > + */
> > +#include <asm/mmu.h>
> > +#include <asm/setup.h>
> > +#include <asm/smp.h>
> > +#include <asm/page.h>
> > +#include <asm/io.h>
> > +#include <asm/processor.h>
> > +#include <asm/hcall.h>
> > +
> > +#include "alloc_page.h"
> > +#include "vmalloc.h"
> > +#include <asm/pgtable-hwdef.h>
> > +#include <asm/pgtable.h>
> > +
> > +#include <linux/compiler.h>
> > +
> > +static pgd_t *identity_pgd;
> > +
> > +bool vm_available(void)
> > +{
> > + return cpu_has_radix;
> > +}
> > +
> > +bool mmu_enabled(void)
> > +{
> > + return current_cpu()->pgtable != NULL;
> > +}
> > +
> > +void mmu_enable(pgd_t *pgtable)
> > +{
> > + struct cpu *cpu = current_cpu();
> > +
> > + if (!pgtable)
> > + pgtable = identity_pgd;
> > +
> > + cpu->pgtable = pgtable;
> > +
> > + mtmsr(mfmsr() | (MSR_IR|MSR_DR));
> > +}
> > +
> > +void mmu_disable(void)
> > +{
> > + struct cpu *cpu = current_cpu();
> > +
> > + cpu->pgtable = NULL;
> > +
> > + mtmsr(mfmsr() & ~(MSR_IR|MSR_DR));
> > +}
> > +
> > +static inline void tlbie(unsigned long rb, unsigned long rs, int ric, int prs, int r)
> > +{
> > + asm volatile(".machine push ; .machine power9; ptesync ; tlbie %0,%1,%2,%3,%4 ; eieio ; tlbsync ; ptesync ; .machine pop" :: "r"(rb), "r"(rs), "i"(ric), "i"(prs), "i"(r) : "memory");
>
> That's a very long line, please split it up after every assembly instruction
> (using \n for new lines).
>
> > +}
> ...
> > diff --git a/powerpc/mmu.c b/powerpc/mmu.c
> > new file mode 100644
> > index 000000000..fef790506
> > --- /dev/null
> > +++ b/powerpc/mmu.c
> > @@ -0,0 +1,283 @@
> > +/* SPDX-License-Identifier: LGPL-2.0-only */
> > +/*
> > + * MMU Tests
> > + *
> > + * Copyright 2024 Nicholas Piggin, IBM Corp.
> > + */
> > +#include <libcflat.h>
> > +#include <asm/atomic.h>
> > +#include <asm/barrier.h>
> > +#include <asm/processor.h>
> > +#include <asm/mmu.h>
> > +#include <asm/smp.h>
> > +#include <asm/setup.h>
> > +#include <asm/ppc_asm.h>
> > +#include <vmalloc.h>
> > +#include <devicetree.h>
> > +
> > +static inline void tlbie(unsigned long rb, unsigned long rs, int ric, int prs, int r)
> > +{
> > + asm volatile(".machine push ; .machine power9; ptesync ; tlbie %0,%1,%2,%3,%4 ; eieio ; tlbsync ; ptesync ; .machine pop" :: "r"(rb), "r"(rs), "i"(ric), "i"(prs), "i"(r) : "memory");
> > +}
>
> Same function again? Maybe it could go into mmu.h instead?
>
> > +static inline void tlbiel(unsigned long rb, unsigned long rs, int ric, int prs, int r)
> > +{
> > + asm volatile(".machine push ; .machine power9; ptesync ; tlbiel %0,%1,%2,%3,%4 ; ptesync ; .machine pop" :: "r"(rb), "r"(rs), "i"(ric), "i"(prs), "i"(r) : "memory");
> > +}
>
> Please also split up the above long line.
I'll try to improve the lines.
> It would also be cool if you could get one of the other ppc guys at IBM to
> review this patch, since I don't have a clue about this MMU stuff at all.
It would be.
Thanks,
Nick
next prev parent reply other threads:[~2024-06-05 1:07 UTC|newest]
Thread overview: 147+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-04 12:28 [kvm-unit-tests PATCH v9 00/31] powerpc improvements Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 01/31] doc: update unittests doc Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-06 7:03 ` Thomas Huth
2024-05-06 7:03 ` Thomas Huth
2024-05-07 3:57 ` Nicholas Piggin
2024-05-07 3:57 ` Nicholas Piggin
2024-05-06 8:02 ` Andrew Jones
2024-05-06 8:02 ` Andrew Jones
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 02/31] report: Add known failure reporting option Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-06 7:25 ` Thomas Huth
2024-05-06 8:01 ` Andrew Jones
2024-05-06 8:01 ` Andrew Jones
2024-05-06 10:19 ` Thomas Huth
2024-05-06 10:19 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 03/31] powerpc: Mark known failing tests as kfail Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-06 7:37 ` Thomas Huth
2024-05-06 7:37 ` Thomas Huth
2024-05-07 4:07 ` Nicholas Piggin
2024-05-07 4:07 ` Nicholas Piggin
2024-05-07 11:44 ` Thomas Huth
2024-05-07 11:44 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 04/31] powerpc: Update unittests for latest QEMU version Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 05/31] powerpc/sprs: Specify SPRs with data rather than code Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 06/31] powerpc/sprs: Avoid taking PMU interrupts caused by register fuzzing Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 07/31] scripts: allow machine option to be specified in unittests.cfg Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-07 15:08 ` Thomas Huth
2024-05-07 15:08 ` Thomas Huth
2024-05-08 12:27 ` Nicholas Piggin
2024-05-08 12:27 ` Nicholas Piggin
2024-05-08 12:55 ` Thomas Huth
2024-05-08 12:55 ` Thomas Huth
2024-05-08 12:58 ` Thomas Huth
2024-05-08 12:58 ` Thomas Huth
2024-05-08 13:36 ` Thomas Huth
2024-05-08 13:36 ` Thomas Huth
2024-05-09 5:44 ` Nicholas Piggin
2024-05-09 5:44 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 08/31] scripts: Accommodate powerpc powernv machine differences Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 09/31] powerpc: Support powernv machine with QEMU TCG Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 10/31] powerpc: Fix emulator illegal instruction test for powernv Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 11/31] powerpc/sprs: Test hypervisor registers on powernv machine Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 12/31] powerpc: general interrupt tests Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-07 12:12 ` Thomas Huth
2024-05-07 12:12 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 13/31] powerpc: Add rtas stop-self support Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 14/31] powerpc: Remove broken SMP exception stack setup Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-03 9:30 ` Thomas Huth
2024-06-03 9:30 ` Thomas Huth
2024-06-04 5:13 ` Nicholas Piggin
2024-06-04 5:13 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 15/31] powerpc: Enable page alloc operations Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-03 9:34 ` Thomas Huth
2024-06-03 9:34 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 16/31] powerpc: add SMP and IPI support Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 5:14 ` Thomas Huth
2024-06-04 5:14 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 17/31] powerpc: Add cpu_relax Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-07 13:44 ` Thomas Huth
2024-05-07 13:44 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 18/31] powerpc: Permit ACCEL=tcg,thread=single Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 5:17 ` Thomas Huth
2024-06-04 5:17 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 19/31] powerpc: Avoid using larx/stcx. in spinlocks when only one CPU is running Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 5:27 ` Thomas Huth
2024-06-04 5:27 ` Thomas Huth
2024-06-05 0:56 ` Nicholas Piggin
2024-06-05 0:56 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 20/31] powerpc: Add atomics tests Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 5:29 ` Thomas Huth
2024-06-04 5:29 ` Thomas Huth
2024-06-05 0:56 ` Nicholas Piggin
2024-06-05 0:56 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 21/31] powerpc: Add timebase tests Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 6:12 ` Thomas Huth
2024-06-04 6:12 ` Thomas Huth
2024-06-05 1:04 ` Nicholas Piggin
2024-06-05 1:04 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 22/31] powerpc: Add MMU support Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 7:30 ` Thomas Huth
2024-06-04 7:30 ` Thomas Huth
2024-06-05 1:06 ` Nicholas Piggin [this message]
2024-06-05 1:06 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 23/31] common/sieve: Use vmalloc.h for setup_mmu definition Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 7:53 ` Thomas Huth
2024-06-04 7:53 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 24/31] common/sieve: Support machines without MMU Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 9:30 ` Thomas Huth
2024-06-04 9:30 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 25/31] powerpc: Add sieve.c common test Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 9:30 ` Thomas Huth
2024-06-04 9:30 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 26/31] powerpc: add usermode support Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 10:26 ` Thomas Huth
2024-06-04 10:26 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 27/31] powerpc: add pmu tests Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 10:38 ` Thomas Huth
2024-06-04 10:38 ` Thomas Huth
2024-06-05 1:12 ` Nicholas Piggin
2024-06-05 1:12 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 28/31] configure: Make arch_libdir a first-class entity Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 29/31] powerpc: Remove remnants of ppc64 directory and build structure Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 10:49 ` Thomas Huth
2024-06-04 13:36 ` Andrew Jones
2024-06-04 13:36 ` Andrew Jones
2024-06-05 7:52 ` Nicholas Piggin
2024-06-05 7:52 ` Nicholas Piggin
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 30/31] powerpc: Add facility to query TCG or KVM host Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 10:53 ` Thomas Huth
2024-06-04 10:53 ` Thomas Huth
2024-05-04 12:28 ` [kvm-unit-tests PATCH v9 31/31] powerpc: gitlab CI update Nicholas Piggin
2024-05-04 12:28 ` Nicholas Piggin
2024-06-04 11:01 ` Thomas Huth
2024-06-04 11:01 ` Thomas Huth
2024-06-05 1:16 ` Nicholas Piggin
2024-06-05 1:16 ` Nicholas Piggin
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=D1ROIXQIHXJV.38DLKI4T392V5@gmail.com \
--to=npiggin@gmail.com \
--cc=andrew.jones@linux.dev \
--cc=kvm@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lvivier@redhat.com \
--cc=thuth@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.