From: Weiwei Li <liweiwei@iscas.ac.cn> To: Guo Ren <guoren@kernel.org>, Anup Patel <apatel@ventanamicro.com> Cc: "open list:RISC-V" <qemu-riscv@nongnu.org>, "Anup Patel" <anup@brainfault.org>, "Wang Junqiang" <wangjunqiang@iscas.ac.cn>, "Bin Meng" <bin.meng@windriver.com>, "QEMU Developers" <qemu-devel@nongnu.org>, "Alistair Francis" <alistair.francis@wdc.com>, "Guo Ren" <ren_guo@c-sky.com>, "Wei Wu (吴伟)" <lazyparser@gmail.com>, "Palmer Dabbelt" <palmer@dabbelt.com> Subject: Re: [PATCH v5 1/5] target/riscv: Ignore reserved bits in PTE for RV64 Date: Tue, 18 Jan 2022 19:29:06 +0800 [thread overview] Message-ID: <bdb141c7-e45c-b05e-60ff-9e60603df6e6@iscas.ac.cn> (raw) In-Reply-To: <CAJF2gTQp3RTbj51-5J4md_6UWT7qTYxXvvyZmSK5LN91h4fB0w@mail.gmail.com> 在 2022/1/18 下午7:15, Guo Ren 写道: > On Tue, Jan 18, 2022 at 4:51 PM Anup Patel <apatel@ventanamicro.com> wrote: >> On Tue, Jan 18, 2022 at 2:16 PM Guo Ren <guoren@kernel.org> wrote: >>> On Tue, Jan 18, 2022 at 11:32 AM Anup Patel <anup@brainfault.org> wrote: >>>> On Tue, Jan 18, 2022 at 6:47 AM Weiwei Li <liweiwei@iscas.ac.cn> wrote: >>>>> From: Guo Ren <ren_guo@c-sky.com> >>>>> >>>>> Highest bits of PTE has been used for svpbmt, ref: [1], [2], so we >>>>> need to ignore them. They cannot be a part of ppn. >>>>> >>>>> 1: The RISC-V Instruction Set Manual, Volume II: Privileged Architecture >>>>> 4.4 Sv39: Page-Based 39-bit Virtual-Memory System >>>>> 4.5 Sv48: Page-Based 48-bit Virtual-Memory System >>>>> >>>>> 2: https://github.com/riscv/virtual-memory/blob/main/specs/663-Svpbmt-diff.pdf >>>>> >>>>> Signed-off-by: Guo Ren <ren_guo@c-sky.com> >>>>> Tested-by: Bin Meng <bmeng.cn@gmail.com> >>>>> Reviewed-by: Liu Zhiwei <zhiwei_liu@c-sky.com> >>>>> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> >>>>> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> >>>>> --- >>>>> target/riscv/cpu_bits.h | 7 +++++++ >>>>> target/riscv/cpu_helper.c | 2 +- >>>>> 2 files changed, 8 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h >>>>> index 5a6d49aa64..282cd8eecd 100644 >>>>> --- a/target/riscv/cpu_bits.h >>>>> +++ b/target/riscv/cpu_bits.h >>>>> @@ -490,6 +490,13 @@ typedef enum { >>>>> /* Page table PPN shift amount */ >>>>> #define PTE_PPN_SHIFT 10 >>>>> >>>>> +/* Page table PPN mask */ >>>>> +#if defined(TARGET_RISCV32) >>>>> +#define PTE_PPN_MASK 0xffffffffUL >>>>> +#elif defined(TARGET_RISCV64) >>>>> +#define PTE_PPN_MASK 0x3fffffffffffffULL >>>>> +#endif >>>>> + >>>> Going forward we should avoid using target specific "#if" >>>> so that we can use the same qemu-system-riscv64 for both >>>> RV32 and RV64. >>>> >>>>> /* Leaf page shift amount */ >>>>> #define PGSHIFT 12 >>>>> >>>>> diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c >>>>> index 434a83e66a..26608ddf1c 100644 >>>>> --- a/target/riscv/cpu_helper.c >>>>> +++ b/target/riscv/cpu_helper.c >>>>> @@ -619,7 +619,7 @@ restart: >>>>> return TRANSLATE_FAIL; >>>>> } >>>>> >>>>> - hwaddr ppn = pte >> PTE_PPN_SHIFT; >>>>> + hwaddr ppn = (pte & PTE_PPN_MASK) >> PTE_PPN_SHIFT; >>>> Rather than using "#if", please use "xlen" comparison to extract >>>> PPN correctly from PTE. >>> Do you mean? >>> >>> diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c >>> index 9fffaccffb..071b7ea4cf 100644 >>> --- a/target/riscv/cpu_helper.c >>> +++ b/target/riscv/cpu_helper.c >>> @@ -619,7 +619,11 @@ restart: >>> return TRANSLATE_FAIL; >>> } >>> >>> - hwaddr ppn = (pte & PTE_PPN_MASK) >> PTE_PPN_SHIFT; >>> + if (riscv_cpu_mxl(env) == MXL_RV32) { >>> + hwaddr ppn = pte >> PTE_PPN_SHIFT; >>> + } else { >>> + hwaddr ppn = (pte & 0x3fffffffffffffULL) >> PTE_PPN_SHIFT; >>> + } >> Yes, something like this but use a define for 0x3fffffffffffffULL > Just as Alistair said: This will need to be dynamic based on get_xl() > > I still prefer: > +#if defined(TARGET_RISCV32) > +#define PTE_PPN_MASK 0xffffffffUL > +#elif defined(TARGET_RISCV64) > +#define PTE_PPN_MASK 0x3fffffffffffffULL > +#endif > > + hwaddr ppn = (pte & PTE_PPN_MASK) >> PTE_PPN_SHIFT; I think the difference may be xl = MXL_RV32 in RV64. Or we may define PTE_PPN_MASK as 0x3fffffffffffffULL, and use type contrast + hwaddr ppn = (pte & (target_ulong)PTE_PPN_MASK) >> PTE_PPN_SHIFT; Regards, Weiwei Li >> Regards, >> Anup >> >>> RISCVCPU *cpu = env_archcpu(env); >>> if (!(pte & PTE_V)) { >>> >>>> Regards, >>>> Anup >>>> >>>>> if (!(pte & PTE_V)) { >>>>> /* Invalid PTE */ >>>>> -- >>>>> 2.17.1 >>>>> >>> >>> -- >>> Best Regards >>> Guo Ren >>> >>> ML: https://lore.kernel.org/linux-csky/ >>> > >
WARNING: multiple messages have this Message-ID (diff)
From: Weiwei Li <liweiwei@iscas.ac.cn> To: Guo Ren <guoren@kernel.org>, Anup Patel <apatel@ventanamicro.com> Cc: "Anup Patel" <anup@brainfault.org>, "open list:RISC-V" <qemu-riscv@nongnu.org>, "Wang Junqiang" <wangjunqiang@iscas.ac.cn>, "Bin Meng" <bin.meng@windriver.com>, "QEMU Developers" <qemu-devel@nongnu.org>, "Alistair Francis" <alistair.francis@wdc.com>, "Guo Ren" <ren_guo@c-sky.com>, "Wei Wu (吴伟)" <lazyparser@gmail.com>, "Palmer Dabbelt" <palmer@dabbelt.com> Subject: Re: [PATCH v5 1/5] target/riscv: Ignore reserved bits in PTE for RV64 Date: Tue, 18 Jan 2022 19:29:06 +0800 [thread overview] Message-ID: <bdb141c7-e45c-b05e-60ff-9e60603df6e6@iscas.ac.cn> (raw) In-Reply-To: <CAJF2gTQp3RTbj51-5J4md_6UWT7qTYxXvvyZmSK5LN91h4fB0w@mail.gmail.com> 在 2022/1/18 下午7:15, Guo Ren 写道: > On Tue, Jan 18, 2022 at 4:51 PM Anup Patel <apatel@ventanamicro.com> wrote: >> On Tue, Jan 18, 2022 at 2:16 PM Guo Ren <guoren@kernel.org> wrote: >>> On Tue, Jan 18, 2022 at 11:32 AM Anup Patel <anup@brainfault.org> wrote: >>>> On Tue, Jan 18, 2022 at 6:47 AM Weiwei Li <liweiwei@iscas.ac.cn> wrote: >>>>> From: Guo Ren <ren_guo@c-sky.com> >>>>> >>>>> Highest bits of PTE has been used for svpbmt, ref: [1], [2], so we >>>>> need to ignore them. They cannot be a part of ppn. >>>>> >>>>> 1: The RISC-V Instruction Set Manual, Volume II: Privileged Architecture >>>>> 4.4 Sv39: Page-Based 39-bit Virtual-Memory System >>>>> 4.5 Sv48: Page-Based 48-bit Virtual-Memory System >>>>> >>>>> 2: https://github.com/riscv/virtual-memory/blob/main/specs/663-Svpbmt-diff.pdf >>>>> >>>>> Signed-off-by: Guo Ren <ren_guo@c-sky.com> >>>>> Tested-by: Bin Meng <bmeng.cn@gmail.com> >>>>> Reviewed-by: Liu Zhiwei <zhiwei_liu@c-sky.com> >>>>> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> >>>>> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> >>>>> --- >>>>> target/riscv/cpu_bits.h | 7 +++++++ >>>>> target/riscv/cpu_helper.c | 2 +- >>>>> 2 files changed, 8 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h >>>>> index 5a6d49aa64..282cd8eecd 100644 >>>>> --- a/target/riscv/cpu_bits.h >>>>> +++ b/target/riscv/cpu_bits.h >>>>> @@ -490,6 +490,13 @@ typedef enum { >>>>> /* Page table PPN shift amount */ >>>>> #define PTE_PPN_SHIFT 10 >>>>> >>>>> +/* Page table PPN mask */ >>>>> +#if defined(TARGET_RISCV32) >>>>> +#define PTE_PPN_MASK 0xffffffffUL >>>>> +#elif defined(TARGET_RISCV64) >>>>> +#define PTE_PPN_MASK 0x3fffffffffffffULL >>>>> +#endif >>>>> + >>>> Going forward we should avoid using target specific "#if" >>>> so that we can use the same qemu-system-riscv64 for both >>>> RV32 and RV64. >>>> >>>>> /* Leaf page shift amount */ >>>>> #define PGSHIFT 12 >>>>> >>>>> diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c >>>>> index 434a83e66a..26608ddf1c 100644 >>>>> --- a/target/riscv/cpu_helper.c >>>>> +++ b/target/riscv/cpu_helper.c >>>>> @@ -619,7 +619,7 @@ restart: >>>>> return TRANSLATE_FAIL; >>>>> } >>>>> >>>>> - hwaddr ppn = pte >> PTE_PPN_SHIFT; >>>>> + hwaddr ppn = (pte & PTE_PPN_MASK) >> PTE_PPN_SHIFT; >>>> Rather than using "#if", please use "xlen" comparison to extract >>>> PPN correctly from PTE. >>> Do you mean? >>> >>> diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c >>> index 9fffaccffb..071b7ea4cf 100644 >>> --- a/target/riscv/cpu_helper.c >>> +++ b/target/riscv/cpu_helper.c >>> @@ -619,7 +619,11 @@ restart: >>> return TRANSLATE_FAIL; >>> } >>> >>> - hwaddr ppn = (pte & PTE_PPN_MASK) >> PTE_PPN_SHIFT; >>> + if (riscv_cpu_mxl(env) == MXL_RV32) { >>> + hwaddr ppn = pte >> PTE_PPN_SHIFT; >>> + } else { >>> + hwaddr ppn = (pte & 0x3fffffffffffffULL) >> PTE_PPN_SHIFT; >>> + } >> Yes, something like this but use a define for 0x3fffffffffffffULL > Just as Alistair said: This will need to be dynamic based on get_xl() > > I still prefer: > +#if defined(TARGET_RISCV32) > +#define PTE_PPN_MASK 0xffffffffUL > +#elif defined(TARGET_RISCV64) > +#define PTE_PPN_MASK 0x3fffffffffffffULL > +#endif > > + hwaddr ppn = (pte & PTE_PPN_MASK) >> PTE_PPN_SHIFT; I think the difference may be xl = MXL_RV32 in RV64. Or we may define PTE_PPN_MASK as 0x3fffffffffffffULL, and use type contrast + hwaddr ppn = (pte & (target_ulong)PTE_PPN_MASK) >> PTE_PPN_SHIFT; Regards, Weiwei Li >> Regards, >> Anup >> >>> RISCVCPU *cpu = env_archcpu(env); >>> if (!(pte & PTE_V)) { >>> >>>> Regards, >>>> Anup >>>> >>>>> if (!(pte & PTE_V)) { >>>>> /* Invalid PTE */ >>>>> -- >>>>> 2.17.1 >>>>> >>> >>> -- >>> Best Regards >>> Guo Ren >>> >>> ML: https://lore.kernel.org/linux-csky/ >>> > >
next prev parent reply other threads:[~2022-01-18 11:45 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-18 1:17 [PATCH v5 0/5] support subsets of virtual memory extension Weiwei Li 2022-01-18 1:17 ` Weiwei Li 2022-01-18 1:17 ` [PATCH v5 1/5] target/riscv: Ignore reserved bits in PTE for RV64 Weiwei Li 2022-01-18 3:30 ` Anup Patel 2022-01-18 3:30 ` Anup Patel 2022-01-18 4:51 ` Alistair Francis 2022-01-18 4:51 ` Alistair Francis 2022-01-18 11:54 ` Guo Ren 2022-01-18 11:54 ` Guo Ren 2022-01-20 13:47 ` Guo Ren 2022-01-20 22:28 ` LIU Zhiwei 2022-01-21 1:50 ` Guo Ren 2022-01-21 1:50 ` Guo Ren 2022-01-21 2:08 ` LIU Zhiwei 2022-01-21 2:08 ` LIU Zhiwei 2022-01-18 8:33 ` Guo Ren 2022-01-18 8:33 ` Guo Ren 2022-01-18 8:51 ` Anup Patel 2022-01-18 8:51 ` Anup Patel 2022-01-18 11:15 ` Guo Ren 2022-01-18 11:15 ` Guo Ren 2022-01-18 11:25 ` Anup Patel 2022-01-18 11:25 ` Anup Patel 2022-01-18 11:28 ` Anup Patel 2022-01-18 11:28 ` Anup Patel 2022-01-18 11:57 ` Guo Ren 2022-01-18 11:57 ` Guo Ren 2022-01-18 11:29 ` Weiwei Li [this message] 2022-01-18 11:29 ` Weiwei Li 2022-01-19 3:14 ` LIU Zhiwei 2022-01-18 1:17 ` [PATCH v5 2/5] target/riscv: add PTE_A/PTE_D/PTE_U bits check for inner PTE Weiwei Li 2022-01-18 1:17 ` Weiwei Li 2022-01-18 1:17 ` [PATCH v5 3/5] target/riscv: add support for svnapot extension Weiwei Li 2022-01-18 1:17 ` Weiwei Li 2022-01-18 3:32 ` Anup Patel 2022-01-18 3:32 ` Anup Patel 2022-01-18 8:32 ` Weiwei Li 2022-01-18 8:32 ` Weiwei Li 2022-01-18 1:17 ` [PATCH v5 4/5] target/riscv: add support for svinval extension Weiwei Li 2022-01-18 1:17 ` Weiwei Li 2022-01-18 1:17 ` [PATCH v5 5/5] target/riscv: add support for svpbmt extension Weiwei Li 2022-01-18 1:17 ` Weiwei Li 2022-01-18 3:35 ` Anup Patel 2022-01-18 3:35 ` Anup Patel 2022-01-18 8:33 ` Weiwei Li 2022-01-18 8:33 ` Weiwei Li 2022-01-18 9:09 ` Weiwei Li 2022-01-18 9:09 ` Weiwei Li 2022-01-18 11:04 ` Anup Patel 2022-01-18 11:04 ` Anup Patel 2022-01-18 11:21 ` Weiwei Li 2022-01-18 11:21 ` Weiwei Li
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=bdb141c7-e45c-b05e-60ff-9e60603df6e6@iscas.ac.cn \ --to=liweiwei@iscas.ac.cn \ --cc=alistair.francis@wdc.com \ --cc=anup@brainfault.org \ --cc=apatel@ventanamicro.com \ --cc=bin.meng@windriver.com \ --cc=guoren@kernel.org \ --cc=lazyparser@gmail.com \ --cc=palmer@dabbelt.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ --cc=ren_guo@c-sky.com \ --cc=wangjunqiang@iscas.ac.cn \ /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: linkBe 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.