Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200804030205.91656-1-greentime.hu@sifive.com>
In-Reply-To: <20200804030205.91656-1-greentime.hu@sifive.com>
From:   Anup Patel <anup@brainfault.org>
Date:   Tue, 4 Aug 2020 08:59:32 +0530
Message-ID: <CAAhSdy1QbMjZxxu+wSBYr3+3oaM2Qg=_Uwj8dfQidi=ck6PV_Q@mail.gmail.com>
Subject: Re: [PATCH] riscv: Add sfence.vma after page table changed
To:     Greentime Hu <greentime.hu@sifive.com>
Cc:     linux-riscv <linux-riscv@lists.infradead.org>,
        "linux-kernel@vger.kernel.org List" <linux-kernel@vger.kernel.org>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul.walmsley@sifive.com>, syven.wang@sifive.com
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Aug 4, 2020 at 8:32 AM Greentime Hu <greentime.hu@sifive.com> wrote:
>
> This patch addes local_flush_tlb_page(addr) to use sfence.vma after the

s/addes/adds

> page table changed. That address will be used immediately in
> memset(nextp, 0, PAGE_SIZE) to cause this issue so we should add the
> sfence.vma before we use it.

Alternate version of this commit description can be:

Invalidate local TLB after both set_pet() and clear_pte() because the
address can be used immediately after page table change.

>
> Fixes: f2c17aabc917 ("RISC-V: Implement compile-time fixed mappings")
>
> Reported-by: Syven Wang <syven.wang@sifive.com>
> Signed-off-by: Syven Wang <syven.wang@sifive.com>
> Signed-off-by: Greentime Hu <greentime.hu@sifive.com>
> ---
>  arch/riscv/mm/init.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index f4adb3684f3d..29b0f7108054 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -202,12 +202,11 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)
>
>         ptep = &fixmap_pte[pte_index(addr)];
>
> -       if (pgprot_val(prot)) {
> +       if (pgprot_val(prot))
>                 set_pte(ptep, pfn_pte(phys >> PAGE_SHIFT, prot));
> -       } else {
> +       else
>                 pte_clear(&init_mm, addr, ptep);
> -               local_flush_tlb_page(addr);
> -       }
> +       local_flush_tlb_page(addr);
>  }
>
>  static pte_t *__init get_pte_virt(phys_addr_t pa)
> --
> 2.28.0
>

Otherwise looks good to me.

Reviewed-by: Anup Patel <anup@brainfault.org>

Regards,
Anup