* [PATCH v1 1/1] riscv: mm: call best_map_size many times during linear-mapping
@ 2022-10-06 2:12 panqinglin2020
2022-10-06 12:28 ` Andrew Jones
2022-11-15 15:38 ` Alexandre Ghiti
0 siblings, 2 replies; 6+ messages in thread
From: panqinglin2020 @ 2022-10-06 2:12 UTC (permalink / raw)
To: palmer, linux-riscv; +Cc: jeff, xuyinan, ajones, Qinglin Pan
From: Qinglin Pan <panqinglin2020@iscas.ac.cn>
Modify the best_map_size function to give map_size many times instead
of only once, so a memory region can be mapped by both PMD_SIZE and
PAGE_SIZE.
Signed-off-by: Qinglin Pan <panqinglin2020@iscas.ac.cn>
---
arch/riscv/mm/init.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index b56a0a75533f..1b76d3fe4e26 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -673,10 +673,11 @@ void __init create_pgd_mapping(pgd_t *pgdp,
static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
{
/* Upgrade to PMD_SIZE mappings whenever possible */
- if ((base & (PMD_SIZE - 1)) || (size & (PMD_SIZE - 1)))
- return PAGE_SIZE;
+ base &= PMD_SIZE - 1;
+ if (!base && size >= PMD_SIZE)
+ return PMD_SIZE;
- return PMD_SIZE;
+ return PAGE_SIZE;
}
#ifdef CONFIG_XIP_KERNEL
@@ -1111,9 +1112,9 @@ static void __init setup_vm_final(void)
if (end >= __pa(PAGE_OFFSET) + memory_limit)
end = __pa(PAGE_OFFSET) + memory_limit;
- map_size = best_map_size(start, end - start);
for (pa = start; pa < end; pa += map_size) {
va = (uintptr_t)__va(pa);
+ map_size = best_map_size(pa, end - pa);
create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
pgprot_from_va(va));
--
2.35.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] riscv: mm: call best_map_size many times during linear-mapping
2022-10-06 2:12 [PATCH v1 1/1] riscv: mm: call best_map_size many times during linear-mapping panqinglin2020
@ 2022-10-06 12:28 ` Andrew Jones
2022-10-16 14:41 ` Qinglin Pan
2022-11-19 11:45 ` Qinglin Pan
2022-11-15 15:38 ` Alexandre Ghiti
1 sibling, 2 replies; 6+ messages in thread
From: Andrew Jones @ 2022-10-06 12:28 UTC (permalink / raw)
To: panqinglin2020; +Cc: palmer, linux-riscv, jeff, xuyinan
On Thu, Oct 06, 2022 at 10:12:23AM +0800, panqinglin2020@iscas.ac.cn wrote:
> From: Qinglin Pan <panqinglin2020@iscas.ac.cn>
>
> Modify the best_map_size function to give map_size many times instead
> of only once, so a memory region can be mapped by both PMD_SIZE and
> PAGE_SIZE.
>
> Signed-off-by: Qinglin Pan <panqinglin2020@iscas.ac.cn>
> ---
> arch/riscv/mm/init.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index b56a0a75533f..1b76d3fe4e26 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -673,10 +673,11 @@ void __init create_pgd_mapping(pgd_t *pgdp,
> static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
> {
> /* Upgrade to PMD_SIZE mappings whenever possible */
> - if ((base & (PMD_SIZE - 1)) || (size & (PMD_SIZE - 1)))
> - return PAGE_SIZE;
> + base &= PMD_SIZE - 1;
> + if (!base && size >= PMD_SIZE)
> + return PMD_SIZE;
>
> - return PMD_SIZE;
> + return PAGE_SIZE;
> }
>
> #ifdef CONFIG_XIP_KERNEL
> @@ -1111,9 +1112,9 @@ static void __init setup_vm_final(void)
> if (end >= __pa(PAGE_OFFSET) + memory_limit)
> end = __pa(PAGE_OFFSET) + memory_limit;
>
> - map_size = best_map_size(start, end - start);
> for (pa = start; pa < end; pa += map_size) {
> va = (uintptr_t)__va(pa);
> + map_size = best_map_size(pa, end - pa);
>
> create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
> pgprot_from_va(va));
> --
> 2.35.1
>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] riscv: mm: call best_map_size many times during linear-mapping
2022-10-06 12:28 ` Andrew Jones
@ 2022-10-16 14:41 ` Qinglin Pan
2022-11-19 11:45 ` Qinglin Pan
1 sibling, 0 replies; 6+ messages in thread
From: Qinglin Pan @ 2022-10-16 14:41 UTC (permalink / raw)
To: palmer; +Cc: linux-riscv, jeff, xuyinan, Andrew Jones
Hi Palmer,
ping?
Thanks
Qinglin
On 10/6/22 8:28 PM, Andrew Jones wrote:
> On Thu, Oct 06, 2022 at 10:12:23AM +0800, panqinglin2020@iscas.ac.cn wrote:
>> From: Qinglin Pan <panqinglin2020@iscas.ac.cn>
>>
>> Modify the best_map_size function to give map_size many times instead
>> of only once, so a memory region can be mapped by both PMD_SIZE and
>> PAGE_SIZE.
>>
>> Signed-off-by: Qinglin Pan <panqinglin2020@iscas.ac.cn>
>> ---
>> arch/riscv/mm/init.c | 9 +++++----
>> 1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
>> index b56a0a75533f..1b76d3fe4e26 100644
>> --- a/arch/riscv/mm/init.c
>> +++ b/arch/riscv/mm/init.c
>> @@ -673,10 +673,11 @@ void __init create_pgd_mapping(pgd_t *pgdp,
>> static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
>> {
>> /* Upgrade to PMD_SIZE mappings whenever possible */
>> - if ((base & (PMD_SIZE - 1)) || (size & (PMD_SIZE - 1)))
>> - return PAGE_SIZE;
>> + base &= PMD_SIZE - 1;
>> + if (!base && size >= PMD_SIZE)
>> + return PMD_SIZE;
>>
>> - return PMD_SIZE;
>> + return PAGE_SIZE;
>> }
>>
>> #ifdef CONFIG_XIP_KERNEL
>> @@ -1111,9 +1112,9 @@ static void __init setup_vm_final(void)
>> if (end >= __pa(PAGE_OFFSET) + memory_limit)
>> end = __pa(PAGE_OFFSET) + memory_limit;
>>
>> - map_size = best_map_size(start, end - start);
>> for (pa = start; pa < end; pa += map_size) {
>> va = (uintptr_t)__va(pa);
>> + map_size = best_map_size(pa, end - pa);
>>
>> create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
>> pgprot_from_va(va));
>> --
>> 2.35.1
>>
>
> Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] riscv: mm: call best_map_size many times during linear-mapping
2022-10-06 2:12 [PATCH v1 1/1] riscv: mm: call best_map_size many times during linear-mapping panqinglin2020
2022-10-06 12:28 ` Andrew Jones
@ 2022-11-15 15:38 ` Alexandre Ghiti
2022-11-19 11:42 ` Qinglin Pan
1 sibling, 1 reply; 6+ messages in thread
From: Alexandre Ghiti @ 2022-11-15 15:38 UTC (permalink / raw)
To: panqinglin2020, palmer, linux-riscv; +Cc: jeff, xuyinan, ajones
Hi Qinglin,
On 06/10/2022 04:12, panqinglin2020@iscas.ac.cn wrote:
> From: Qinglin Pan <panqinglin2020@iscas.ac.cn>
>
> Modify the best_map_size function to give map_size many times instead
> of only once, so a memory region can be mapped by both PMD_SIZE and
> PAGE_SIZE.
>
> Signed-off-by: Qinglin Pan <panqinglin2020@iscas.ac.cn>
> ---
> arch/riscv/mm/init.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index b56a0a75533f..1b76d3fe4e26 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -673,10 +673,11 @@ void __init create_pgd_mapping(pgd_t *pgdp,
> static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
> {
> /* Upgrade to PMD_SIZE mappings whenever possible */
> - if ((base & (PMD_SIZE - 1)) || (size & (PMD_SIZE - 1)))
> - return PAGE_SIZE;
> + base &= PMD_SIZE - 1;
> + if (!base && size >= PMD_SIZE)
> + return PMD_SIZE;
>
> - return PMD_SIZE;
> + return PAGE_SIZE;
> }
>
> #ifdef CONFIG_XIP_KERNEL
> @@ -1111,9 +1112,9 @@ static void __init setup_vm_final(void)
> if (end >= __pa(PAGE_OFFSET) + memory_limit)
> end = __pa(PAGE_OFFSET) + memory_limit;
>
> - map_size = best_map_size(start, end - start);
> for (pa = start; pa < end; pa += map_size) {
> va = (uintptr_t)__va(pa);
> + map_size = best_map_size(pa, end - pa);
>
> create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
> pgprot_from_va(va));
It works fine for me, so you can add:
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Tested-by: Alexandre Ghiti <alexghiti@rivosinc.com>
FYI, I'm working right now on using hugepages of 1GB for the linear mapping.
Thanks,
Alex
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] riscv: mm: call best_map_size many times during linear-mapping
2022-11-15 15:38 ` Alexandre Ghiti
@ 2022-11-19 11:42 ` Qinglin Pan
0 siblings, 0 replies; 6+ messages in thread
From: Qinglin Pan @ 2022-11-19 11:42 UTC (permalink / raw)
To: Alexandre Ghiti, palmer, linux-riscv; +Cc: jeff, xuyinan, ajones
Hi Alex,
On 11/15/22 11:38 PM, Alexandre Ghiti wrote:
> Hi Qinglin,
>
> On 06/10/2022 04:12, panqinglin2020@iscas.ac.cn wrote:
>> From: Qinglin Pan <panqinglin2020@iscas.ac.cn>
>>
>> Modify the best_map_size function to give map_size many times instead
>> of only once, so a memory region can be mapped by both PMD_SIZE and
>> PAGE_SIZE.
>>
>> Signed-off-by: Qinglin Pan <panqinglin2020@iscas.ac.cn>
>> ---
>> arch/riscv/mm/init.c | 9 +++++----
>> 1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
>> index b56a0a75533f..1b76d3fe4e26 100644
>> --- a/arch/riscv/mm/init.c
>> +++ b/arch/riscv/mm/init.c
>> @@ -673,10 +673,11 @@ void __init create_pgd_mapping(pgd_t *pgdp,
>> static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t
>> size)
>> {
>> /* Upgrade to PMD_SIZE mappings whenever possible */
>> - if ((base & (PMD_SIZE - 1)) || (size & (PMD_SIZE - 1)))
>> - return PAGE_SIZE;
>> + base &= PMD_SIZE - 1;
>> + if (!base && size >= PMD_SIZE)
>> + return PMD_SIZE;
>> - return PMD_SIZE;
>> + return PAGE_SIZE;
>> }
>> #ifdef CONFIG_XIP_KERNEL
>> @@ -1111,9 +1112,9 @@ static void __init setup_vm_final(void)
>> if (end >= __pa(PAGE_OFFSET) + memory_limit)
>> end = __pa(PAGE_OFFSET) + memory_limit;
>> - map_size = best_map_size(start, end - start);
>> for (pa = start; pa < end; pa += map_size) {
>> va = (uintptr_t)__va(pa);
>> + map_size = best_map_size(pa, end - pa);
>> create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
>> pgprot_from_va(va));
>
>
> It works fine for me, so you can add:
>
> Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
> Tested-by: Alexandre Ghiti <alexghiti@rivosinc.com>
>
> FYI, I'm working right now on using hugepages of 1GB for the linear
> mapping.
>
> Thanks,
>
> Alex
Got it. Thanks a lot for your revew and test.
Thanks,
Qinglin
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] riscv: mm: call best_map_size many times during linear-mapping
2022-10-06 12:28 ` Andrew Jones
2022-10-16 14:41 ` Qinglin Pan
@ 2022-11-19 11:45 ` Qinglin Pan
1 sibling, 0 replies; 6+ messages in thread
From: Qinglin Pan @ 2022-11-19 11:45 UTC (permalink / raw)
To: palmer; +Cc: linux-riscv
Hi Palmer,
Is there anything I need to change about this patch? :)
Thanks,
Qinglin
On 10/6/22 8:28 PM, Andrew Jones wrote:
> On Thu, Oct 06, 2022 at 10:12:23AM +0800, panqinglin2020@iscas.ac.cn wrote:
>> From: Qinglin Pan <panqinglin2020@iscas.ac.cn>
>>
>> Modify the best_map_size function to give map_size many times instead
>> of only once, so a memory region can be mapped by both PMD_SIZE and
>> PAGE_SIZE.
>>
>> Signed-off-by: Qinglin Pan <panqinglin2020@iscas.ac.cn>
>> ---
>> arch/riscv/mm/init.c | 9 +++++----
>> 1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
>> index b56a0a75533f..1b76d3fe4e26 100644
>> --- a/arch/riscv/mm/init.c
>> +++ b/arch/riscv/mm/init.c
>> @@ -673,10 +673,11 @@ void __init create_pgd_mapping(pgd_t *pgdp,
>> static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
>> {
>> /* Upgrade to PMD_SIZE mappings whenever possible */
>> - if ((base & (PMD_SIZE - 1)) || (size & (PMD_SIZE - 1)))
>> - return PAGE_SIZE;
>> + base &= PMD_SIZE - 1;
>> + if (!base && size >= PMD_SIZE)
>> + return PMD_SIZE;
>>
>> - return PMD_SIZE;
>> + return PAGE_SIZE;
>> }
>>
>> #ifdef CONFIG_XIP_KERNEL
>> @@ -1111,9 +1112,9 @@ static void __init setup_vm_final(void)
>> if (end >= __pa(PAGE_OFFSET) + memory_limit)
>> end = __pa(PAGE_OFFSET) + memory_limit;
>>
>> - map_size = best_map_size(start, end - start);
>> for (pa = start; pa < end; pa += map_size) {
>> va = (uintptr_t)__va(pa);
>> + map_size = best_map_size(pa, end - pa);
>>
>> create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
>> pgprot_from_va(va));
>> --
>> 2.35.1
>>
>
> Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-19 11:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-06 2:12 [PATCH v1 1/1] riscv: mm: call best_map_size many times during linear-mapping panqinglin2020
2022-10-06 12:28 ` Andrew Jones
2022-10-16 14:41 ` Qinglin Pan
2022-11-19 11:45 ` Qinglin Pan
2022-11-15 15:38 ` Alexandre Ghiti
2022-11-19 11:42 ` Qinglin Pan
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.