From patchwork Wed Mar 10 06:22:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiuyang Liu X-Patchwork-Id: 12127099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9A4CC433DB for ; Wed, 10 Mar 2021 06:24:35 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0C11C64FE8 for ; Wed, 10 Mar 2021 06:24:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C11C64FE8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jiuyang.me Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=i6lpL1g6PLB1s7mTtKI6ly0NhjVqq4dNE/kDR+Kh5SU=; b=KhvBMMU85NNCqZ0ji7lo9cqchI EW5opUp12z5goZtVWttp6OUkMX/TPngwmasNjDNMjPKfODe7kCTOZDtHnRhC/RBtmWuuyB4qDhBo8 N2KBiSoos3X0zlYXq+DgpSitX1rmlRejKfDkIjpKiAe+ZF3o5/9L2+bCqtG9fHcG0epCzg23EUGAS 2eP1ud6cY5fSsy/L/6GE2A1FWvmeBekjvDmhzilGlekM/FFPfPYTderjTWVjCLNczi8OUUuGk7Ceh mZubEFwvVVEnTJ1ivGqgsfMvi1a5fvDctJCzX4aBPLM8SGRNi6lqbfcbnC/eCSRLL3VRJo6OQN5lG 9oZ63shQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJsGH-0067mP-K6; Wed, 10 Mar 2021 06:24:01 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJsFw-0067lm-Ot for linux-riscv@lists.infradead.org; Wed, 10 Mar 2021 06:23:45 +0000 Received: by mail-pf1-x42b.google.com with SMTP id y67so11408180pfb.2 for ; Tue, 09 Mar 2021 22:23:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jiuyang-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DdObe57su8xWHYEXhsxkrNxyAPh3DbqM32syLxOl1vk=; b=NllT/NACDMzFsEk3Hzskh2TZBUFdSBO3iLOfYaXrVQ8Bi8N/F1MRL343M+r02fmowl HmVKGM5YA33uWkK09suxlHp6BmenKYSbL8qqQ94tLbIYUWmXVQ/PFzuZPgBVg0wkDutB pLDj/8QZ87OBNCKAgWP9fXk6vKcUwuswTDMET+ogV9LIHa6L29LteOIM4xWcs1DHSIJa jN9HGGjZNV8lE2gz2+8KZPNcRr5Jb0pT/F2si4wZIAvAFePqM4xebE8FLR5SH0ttCmv9 VUwojsr8xb5tRi2rtUayc05Wq3A+St9L6zvEQX5vOC+6PFNS2tj53JoTQgi1AYCzB/HD 9nAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DdObe57su8xWHYEXhsxkrNxyAPh3DbqM32syLxOl1vk=; b=dLaSLbz1kOo/+aKeABLSRTAkWAgcDXdxVnDoUinNEwQdf0nQc8d/k2RSmQFw4cxhJA czQl8HrxiYSEM7YM8auuzvw4adIYARdtfm9+NSpbMziaWCvy/w7qJx9WF5GKisraYYXf 33l3xbTTFHPIUoSDrc39LONEqDhmF9dCcRcbrYluAnKr9bztCpljCOWItOs+Km6s0I9g MP0JPCJqN3CnWhBCLwHTDUrQhb7J5bCGEwE/sB22rr5MTjxJbiJP/1T8tNbdZfVioDyF izvSY3durYZR09PLZ6GAlNo7cZ/oUQbfaL30XgkiNGYQ+OgIXzbNvvDoOUoV2HqNMEgh DQHw== X-Gm-Message-State: AOAM531ckE3Clo6axtLc+7cAhOyV/IkSJdR01J2aES6Lt1qwQQLb+OE0 Asz7+wfFFIZoGMJ7+aHaGMbC7GVZYIYf+Vpatt6A1w== X-Google-Smtp-Source: ABdhPJy8IqbvJ8+yH2KVTgI3FD35hwJPvy7alCO7fbQKvwYfNHQBsbzNtNacjHi/zXD0ZeUFEAhDeQ== X-Received: by 2002:a05:6a00:16cd:b029:1c9:6f5b:3d8c with SMTP id l13-20020a056a0016cdb02901c96f5b3d8cmr1586965pfc.1.1615357413716; Tue, 09 Mar 2021 22:23:33 -0800 (PST) Received: from localhost.localdomain ([193.110.201.196]) by smtp.gmail.com with ESMTPSA id bb24sm5013795pjb.5.2021.03.09.22.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Mar 2021 22:23:33 -0800 (PST) From: Jiuyang To: Cc: Andrew Waterman , Jiuyang Liu , Paul Walmsley , Palmer Dabbelt , Albert Ou , Atish Patra , Anup Patel , Andrew Morton , Mike Rapoport , Kefeng Wang , Greentime Hu , Zong Li , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] Insert SFENCE.VMA in function set_pte_at for RISCV Date: Wed, 10 Mar 2021 06:22:46 +0000 Message-Id: <20210310062250.74583-1-liu@jiuyang.me> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210310_062343_515579_7BE0D57A X-CRM114-Status: GOOD ( 14.98 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Jiuyang Liu This patch inserts SFENCE.VMA after modifying PTE based on RISC-V specification. arch/riscv/include/asm/pgtable.h: 1. implement pte_user, pte_global and pte_leaf to check correspond attribute of a pte_t. 2. insert SFENCE.VMA in set_pte_at based on RISC-V Volume 2, Privileged Spec v. 20190608 page 66 and 67: If software modifies a non-leaf PTE, it should execute SFENCE.VMA with rs1=x0. If any PTE along the traversal path had its G bit set, rs2 must be x0; otherwise, rs2 should be set to the ASID for which the translation is being modified. If software modifies a leaf PTE, it should execute SFENCE.VMA with rs1 set to a virtual address within the page. If any PTE along the traversal path had its G bit set, rs2 must be x0; otherwise, rs2 should be set to the ASID for which the translation is being modified. arch/riscv/include/asm/tlbflush.h: 1. implement local_flush_tlb_asid to flush tlb with asid. Signed-off-by: Jiuyang Liu --- arch/riscv/include/asm/pgtable.h | 28 ++++++++++++++++++++++++++++ arch/riscv/include/asm/tlbflush.h | 8 ++++++++ 2 files changed, 36 insertions(+) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index ebf817c1bdf4..95f6546ddb5b 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -222,6 +222,16 @@ static inline int pte_write(pte_t pte) return pte_val(pte) & _PAGE_WRITE; } +static inline int pte_user(pte_t pte) +{ + return pte_val(pte) & _PAGE_USER; +} + +static inline int pte_global(pte_t pte) +{ + return pte_val(pte) & _PAGE_GLOBAL; +} + static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_EXEC; @@ -248,6 +258,11 @@ static inline int pte_special(pte_t pte) return pte_val(pte) & _PAGE_SPECIAL; } +static inline int pte_leaf(pte_t pte) +{ + return pte_val(pte) & (_PAGE_READ | _PAGE_WRITE | _PAGE_EXEC); +} + /* static inline pte_t pte_rdprotect(pte_t pte) */ static inline pte_t pte_wrprotect(pte_t pte) @@ -358,6 +370,18 @@ static inline void set_pte_at(struct mm_struct *mm, flush_icache_pte(pteval); set_pte(ptep, pteval); + + if (pte_present(pteval)) { + if (pte_leaf(pteval)) { + local_flush_tlb_page(addr); + } else { + if (pte_global(pteval)) + local_flush_tlb_all(); + else + local_flush_tlb_asid(); + + } + } } static inline void pte_clear(struct mm_struct *mm, diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h index 394cfbccdcd9..4b25f51f163d 100644 --- a/arch/riscv/include/asm/tlbflush.h +++ b/arch/riscv/include/asm/tlbflush.h @@ -21,6 +21,14 @@ static inline void local_flush_tlb_page(unsigned long addr) { __asm__ __volatile__ ("sfence.vma %0" : : "r" (addr) : "memory"); } + +static unsigned long asid; +static inline void local_flush_tlb_asid(void) +{ + asid = csr_read(CSR_SATP) | (SATP_ASID_MASK << SATP_ASID_SHIFT); + __asm__ __volatile__ ("sfence.vma x0, %0" : : "r" (asid) : "memory"); +} + #else /* CONFIG_MMU */ #define local_flush_tlb_all() do { } while (0) #define local_flush_tlb_page(addr) do { } while (0) From patchwork Tue Mar 16 01:53:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiuyang Liu X-Patchwork-Id: 12140979 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55F62C43381 for ; Tue, 16 Mar 2021 01:55:37 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9EE3564F89 for ; Tue, 16 Mar 2021 01:55:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9EE3564F89 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jiuyang.me Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tmxOrciFXZROZMvxqpWdGueU2601jXarjE8HhjZXn8o=; b=kN/7rk+pTdpl7HiEe9MP/Tygk 11RJsv6YITzHIIYGk2HgAfXvDUInK1WEbyqouI6Qpcw00KuOKgQ2X6wGCHbcUD1ERPC66drf1ZjkR oQAb/CyT59fbfwsgkWIWzdMsHPQFL3r5KlIWT0dgQNOnSiwmo8cLWDErkgBf/g5eImO9pWGLLARLV UZC3dttwaHR9BcX9gIJrNLHuogOwNVTF3gZgtqP/YgHOantoBjn0LFHt2cctl589G7iMJlocuIH+c n0GNdHt4O8xqQmVewuHP+9+BZURPUb8pZkbRyE0mpyP8RAr2G95LQp2QhPJpcob68zxeQAIFwo+ZU LoePGUqug==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lLyvO-00HCwa-7i; Tue, 16 Mar 2021 01:55:10 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lLyvJ-00HCvq-Rt for linux-riscv@lists.infradead.org; Tue, 16 Mar 2021 01:55:08 +0000 Received: by mail-pf1-x42f.google.com with SMTP id y13so7789038pfr.0 for ; Mon, 15 Mar 2021 18:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jiuyang-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5q/FUsghTIcsJ8LEI0rH+7iHgVJefL/qNsLbH3bIMyE=; b=DZn7Td2xbVs8NZjEwSGxuiKun0khhEHJLByCFwgBrC582ZQ9KrrdSYCJ/+9C+7Oecx AbbWxLiut0bGD3Dzwg25jQAb2gBCbt91q84fKL9Bqza7Ma+uXuyBSq11/zCPR7MDMJb4 otUSpsaGolGGcBJPqvtxYEvSwBS6xpOfRjZ8T50HP1cO+EXJcDd+1pV1yQWANINMAssm hmTciRg3y6HssOmgIedl5hpKeaZoY8OB8pfnIutck/idiqOpx22iQqI3xGc0u0tY5pPO wg9u2cauXGiWuoP7/aBROyxW2LOG6DGIITXwSv1hiKidX5d1gvre+H8cZeNUdN8zHqyR Nokg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5q/FUsghTIcsJ8LEI0rH+7iHgVJefL/qNsLbH3bIMyE=; b=OmwMfUvRLhTD2bnlXQInIHIqroYfstUOz+lsqpXQpEykIP3zyoOm/zZENvTUjoMpHS loQ8PEN37IcXqHKAtkFzJhh4GszWjTbOJUKd2APF5uai6XawAI+5wlM4SWIQbVhp+M0m d/pQyuVSAe/1XGp34mNlU9hq8Cj7EVu1pjcBQl9D6OX2ofCayJ+8SN+l4L10uJVwbyYj wPmUl32wB71VONAwUBE4DglDJFydDxYVMbpO08pWRczxbeFsitMZOW3vwMvUTc8q7mz/ HRAx8uAMqVRe2P0EAnmlJgHcLmD4VykrgKl33NRZBFAYhNBOLwoiVpR1tzPuOM4dXb2f 31YQ== X-Gm-Message-State: AOAM531+JPgHP9gPpEbMKpM+2oJ9swd2Vavx9h8vXdcEemLwOUJPnNJ8 RgshXiLVmneivxPrRdt/9+kYcQ== X-Google-Smtp-Source: ABdhPJwIqVw4yhW+idQ908m9N/zKI/xk+pVeWaj6BxEcrOYB6QD8dBl3skulZ7CbQFh2JIUVGij92A== X-Received: by 2002:a63:fa02:: with SMTP id y2mr1672518pgh.412.1615859702050; Mon, 15 Mar 2021 18:55:02 -0700 (PDT) Received: from localhost.localdomain ([193.110.201.196]) by smtp.gmail.com with ESMTPSA id y17sm865180pju.50.2021.03.15.18.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 18:55:01 -0700 (PDT) From: Jiuyang Liu To: Cc: Andrew Waterman , Jiuyang Liu , Paul Walmsley , Palmer Dabbelt , Albert Ou , Atish Patra , Andrew Morton , Anup Patel , Kefeng Wang , Mike Rapoport , Greentime Hu , Zong Li , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] Bug Fix for last patch Date: Tue, 16 Mar 2021 01:53:25 +0000 Message-Id: <20210316015328.13516-1-liu@jiuyang.me> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210310062250.74583-1-liu@jiuyang.me> References: <20210310062250.74583-1-liu@jiuyang.me> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210316_015506_261301_91247775 X-CRM114-Status: GOOD ( 11.36 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Sorry for the noise, Andrew gave me feedbacks, and pointed two bugs in last patch. 1. asid should be thread safe, which is not the intent. 2. asid extracting logic was wrong. This patch fixes these bugs. Signed-off-by: Jiuyang Liu --- arch/riscv/include/asm/tlbflush.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h index 4b25f51f163d..1f9b62b3670b 100644 --- a/arch/riscv/include/asm/tlbflush.h +++ b/arch/riscv/include/asm/tlbflush.h @@ -22,10 +22,14 @@ static inline void local_flush_tlb_page(unsigned long addr) __asm__ __volatile__ ("sfence.vma %0" : : "r" (addr) : "memory"); } -static unsigned long asid; +static inline unsigned long get_current_asid(void) +{ + return (csr_read(CSR_SATP) >> SATP_ASID_SHIFT) & SATP_ASID_MASK; +} + static inline void local_flush_tlb_asid(void) { - asid = csr_read(CSR_SATP) | (SATP_ASID_MASK << SATP_ASID_SHIFT); + unsigned long asid = get_current_asid(); __asm__ __volatile__ ("sfence.vma x0, %0" : : "r" (asid) : "memory"); }