From patchwork Fri Sep 22 08:56:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong-Xuan Wang X-Patchwork-Id: 143687 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5891139vqi; Fri, 22 Sep 2023 15:05:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGv0AsE5RtIapi2IQBxTJI2u6E8BeOgn0yzOR3tPYxz5ZzocbOaY7WCjG5f8tViBq+1kUbJ X-Received: by 2002:a17:902:f693:b0:1bf:13a7:d3ef with SMTP id l19-20020a170902f69300b001bf13a7d3efmr614319plg.66.1695420307806; Fri, 22 Sep 2023 15:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695420307; cv=none; d=google.com; s=arc-20160816; b=WiSGkE5zK3MVbE6UvFngUbpbRaJsldwce2ZBYjEQWowzEWFkAHjFuZ9cwMo51OwU81 bdVcO5tKms37KJRWXT7XhEz85UhM7VttfJnY3PTo07QzigajTgoMidIL9Uk/IBZMW6Vy 4JIE8RaqCPjUdfrFlSHqZ3jQs6VJNdaj3+8KDFGjsR3hZsinZ7FkrvGAFrixT8xH6QrE hi0Seoai7WTMt9Pu6sraC2BphOxXKBq/UtCAKMWBzsvgR5UUXqOdpdDKMpdXJBiXrE84 advMsJGNSgqq5iyhjfz3y/ZhRpo2jjvkXOgwJogs5ok70D4QfBdz72czUMHxLCKfKUjq AB/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=F/fCPUALx1igoJTdhtRLyUtdiJnxsv78mR4MUJv4qBk=; fh=NgRP3CepksQVDuwsAwrdxAqisTwr5xn/rouih7STK1w=; b=mNkATrxVjNXvLD/gz8ay/BrIyzdyDxyKU4lrtxvM9aCLCe1uz7COuqdCef/1YMc01r mdmRt8XMMN6dB+1v9y3woNcsq1KzbgxM8+OlCXtJYPXoFY3r8uv6w8nm/Q6ol7M67YEN 7W408jcpNeJxLq29UJNP29zKWzPfK3yauDmYPfHsuO3dmgLzrqrQAZertPNmooGKXWZ7 83u8kHsQ9XNgNQBfErO5H+hRbQcUuPXEzmxKyy2v/b0pd6KPJsUY5JSRHaI7SRpQfdwS maUOycFDNtYMpZI8NXRgsGXOnEh/YxoSmU6TUZXw/qFKvY9GnrNAU62ib/mgPYmN7k3p IKmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=beGgKb+T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id lf6-20020a170902fb4600b001b878f9e11csi4556432plb.54.2023.09.22.15.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 15:05:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=beGgKb+T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B03E18354517; Fri, 22 Sep 2023 01:57:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232740AbjIVI5Z (ORCPT + 30 others); Fri, 22 Sep 2023 04:57:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232719AbjIVI5Y (ORCPT ); Fri, 22 Sep 2023 04:57:24 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B0F7CA for ; Fri, 22 Sep 2023 01:57:18 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-53fa455cd94so1338512a12.2 for ; Fri, 22 Sep 2023 01:57:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1695373037; x=1695977837; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=F/fCPUALx1igoJTdhtRLyUtdiJnxsv78mR4MUJv4qBk=; b=beGgKb+TWYwjrmuzhVeSyxaEjpST9dGh22eUeEs/44FmdhDJCOv2vqgsCGuKDDmAcV p9TXAUJvJ+dmrRfLicGAL4g90N4IKmpus/7vSgHN2DTrGXRR9z7orZ5qGpDIVwmwikf2 LLYdn72GmOaZZV4snGLjY4TFn0hEsSSRjbzDyByolkX3PJS39t1WrL5uQS1u34lr6vk8 QDGVPbFw/7p3eXlCCX4X9J7esONLIOuaJaiaLkdD2TWMHeTKkNEKcT6JREYwhyIMhcBu HgFsTUVvi5hpX8rb12dYH/+UMV1O5q0MUEHrysPfzi8jDQveD8d9MbLBFnj/YJgV8Xxv acXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695373037; x=1695977837; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=F/fCPUALx1igoJTdhtRLyUtdiJnxsv78mR4MUJv4qBk=; b=GSUoEZP8DM53nNfqehKC8ncEOiPfgCP/Y8BWJERaZgiM82BituCg8gnCaMCU/Lp2DX 54PW84RuxWt5pLpV8POGmnbomhcMLaJgd4OB7aUE8cSjymffJU1AC9iAV7rsmeShetcW PPMZ9G+OCcyQMO2qnr9KCWgz9/6hklas7Wm9EVZbBLMv/3CurdLg1UaSO3YFsbNCdl5B wKfWI9mE01ipuiyLPGAl4xsP4d9BkRhAegLdPeEQbeKarufKILkWktnXzwKNi9UaPKd4 G7wWpcE7X8D28psF/j+K3GaQ2QY1nh48ccycpFmzAmp7MIGx0Kp/srTDVu6V7Q3lHf2X WR6w== X-Gm-Message-State: AOJu0Yx1KfLwIpYzDSusBk9fvwdsNhGUPLgwE/5inCAYFgMiAKXLrJUA bsEFDOqVWzlJmkvcszkqNoc3fw== X-Received: by 2002:a05:6a21:7899:b0:131:b3fa:eaaa with SMTP id bf25-20020a056a21789900b00131b3faeaaamr7980727pzc.61.1695373037555; Fri, 22 Sep 2023 01:57:17 -0700 (PDT) Received: from hsinchu26.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id t15-20020a17090a024f00b00256b67208b1sm4815024pje.56.2023.09.22.01.57.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 01:57:17 -0700 (PDT) From: Yong-Xuan Wang To: linux-riscv@lists.infradead.org, kvm-riscv@lists.infradead.org Cc: greentime.hu@sifive.com, vincent.chen@sifive.com, tjytimi@163.com, alex@ghiti.fr, Yong-Xuan Wang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Guo Ren , Andrew Jones , Conor Dooley , Daniel Henrique Barboza , wchen , Heiko Stuebner , Jisheng Zhang , Andrew Morton , Alexandre Ghiti , Kemeng Shi , "Matthew Wilcox (Oracle)" , Charlie Jenkins , Sergey Matyukevich , David Hildenbrand , Qinglin Pan , Rick Edgecombe , Sunil V L , Evan Green , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] RISC-V: Detect and Enable Svadu Extension Support Date: Fri, 22 Sep 2023 08:56:47 +0000 Message-Id: <20230922085701.3164-2-yongxuan.wang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230922085701.3164-1-yongxuan.wang@sifive.com> References: <20230922085701.3164-1-yongxuan.wang@sifive.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 22 Sep 2023 01:57:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777730800219198241 X-GMAIL-MSGID: 1777777044736281772 We detect Svadu extension support from DTB and add arch_has_hw_pte_young() to enable optimization in MGLRU and __wp_page_copy_user() if Svadu extension is available. Co-developed-by: Jinyu Tang Signed-off-by: Jinyu Tang Signed-off-by: Yong-Xuan Wang --- arch/riscv/include/asm/csr.h | 1 + arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/include/asm/pgtable.h | 6 ++++++ arch/riscv/kernel/cpufeature.c | 1 + 4 files changed, 9 insertions(+) diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h index 777cb8299551..10648b372a2a 100644 --- a/arch/riscv/include/asm/csr.h +++ b/arch/riscv/include/asm/csr.h @@ -194,6 +194,7 @@ /* xENVCFG flags */ #define ENVCFG_STCE (_AC(1, ULL) << 63) #define ENVCFG_PBMTE (_AC(1, ULL) << 62) +#define ENVCFG_HADE (_AC(1, ULL) << 61) #define ENVCFG_CBZE (_AC(1, UL) << 7) #define ENVCFG_CBCFE (_AC(1, UL) << 6) #define ENVCFG_CBIE_SHIFT 4 diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index b7b58258f6c7..1013661d6516 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -58,6 +58,7 @@ #define RISCV_ISA_EXT_ZICSR 40 #define RISCV_ISA_EXT_ZIFENCEI 41 #define RISCV_ISA_EXT_ZIHPM 42 +#define RISCV_ISA_EXT_SVADU 43 #define RISCV_ISA_EXT_MAX 64 diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index b2ba3f79cfe9..028b700cd27b 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -629,6 +629,12 @@ static inline pgprot_t pgprot_writecombine(pgprot_t _prot) return __pgprot(prot); } +#define arch_has_hw_pte_young arch_has_hw_pte_young +static inline bool arch_has_hw_pte_young(void) +{ + return riscv_has_extension_unlikely(RISCV_ISA_EXT_SVADU); +} + /* * THP functions */ diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 1cfbba65d11a..ead378c04991 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -178,6 +178,7 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = { __RISCV_ISA_EXT_DATA(ssaia, RISCV_ISA_EXT_SSAIA), __RISCV_ISA_EXT_DATA(sscofpmf, RISCV_ISA_EXT_SSCOFPMF), __RISCV_ISA_EXT_DATA(sstc, RISCV_ISA_EXT_SSTC), + __RISCV_ISA_EXT_DATA(svadu, RISCV_ISA_EXT_SVADU), __RISCV_ISA_EXT_DATA(svinval, RISCV_ISA_EXT_SVINVAL), __RISCV_ISA_EXT_DATA(svnapot, RISCV_ISA_EXT_SVNAPOT), __RISCV_ISA_EXT_DATA(svpbmt, RISCV_ISA_EXT_SVPBMT), From patchwork Fri Sep 22 08:56:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong-Xuan Wang X-Patchwork-Id: 143560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5766114vqi; Fri, 22 Sep 2023 10:54:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuY4xIKIAjC4o9psm2iWe/N2MdpiiKUwo3rEyRjQWxnOK9d3gbsFvqVvgs5GHagWBWA+VE X-Received: by 2002:a05:6a21:788e:b0:133:f0b9:856d with SMTP id bf14-20020a056a21788e00b00133f0b9856dmr334907pzc.17.1695405266657; Fri, 22 Sep 2023 10:54:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695405266; cv=none; d=google.com; s=arc-20160816; b=ovQc3d7veWlxB6N0WF9b4stPY1LLwDHBz6kCkYhrdxR6pde1zavT7hzs7ki/8iXomV Dy7YN0kSN5PYGYvJhFs9HsnomI1+75/ASW6qdKddy9Lbst01FXlIdLFE3ICUOqfboaZN dzhh6mAc5n1JZkhsJEMNL+MYpfQQJuI+46T1K4zPbDFP/C7xuHriiFdXJvdEouLUiP2q M0sm6DnZcxxmhIIRo4v97zv1VKfRqP64Y6yoYnW9036MkXC568S7u4IWnWN9lWAPr8FG F0k/n6MlSuMsD8ENWB8gT9SOYbWIVmKdXykHUK0bExH2Qh7yy2/JY4bTtclWFv1du9qg K7eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=RDJs3U1rqa7YI0/roeh/1SBiVi3tTUp7AZYFFQzYY+8=; fh=+uZnt4Sd9pWjbKbQctw8oiWGuUpRhYgs4oyDrLP/J+8=; b=PgFamWdOFqesKHxSDhqUNgPki5LbU5Xs/duxVOu4855W1nI07JXrq+zO2Nhlu7KZ1j XALB+kQhv2ONzWv2IGlg0Rl89AeyvJ1Ef2Xc0yP9/1m1nFeICrRMIMdq2T52aCfHSiST crd66SJHL30yEBKX7raZtMRt0dagJsenMH0LU7C9ZfAfzcJenHsMA4ZmDZY6ZoXPCszt DrV4UjIUaFoQgAzVxpHGmSebfijrr15A3JAx7FfR+3xXPaGB4MldGbqj0awg7PNS2W0r 2TmANvqz6t2QWSBRvhHnQLahH4aoB5HnnBDRc/mKCJ5BUmycP9mp1RyHiEAJdZtHbKmK HaKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=A22TP6mB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id bw9-20020a056a00408900b0068fc49cc456si4325941pfb.248.2023.09.22.10.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:54:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=A22TP6mB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 9A73482B7CBB; Fri, 22 Sep 2023 01:57:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232758AbjIVI5a (ORCPT + 30 others); Fri, 22 Sep 2023 04:57:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232719AbjIVI53 (ORCPT ); Fri, 22 Sep 2023 04:57:29 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF234BB for ; Fri, 22 Sep 2023 01:57:22 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-274972a4cb6so1382119a91.1 for ; Fri, 22 Sep 2023 01:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1695373042; x=1695977842; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=RDJs3U1rqa7YI0/roeh/1SBiVi3tTUp7AZYFFQzYY+8=; b=A22TP6mBKkhBhsokDD0dytb++Qhl90MPUcW6CZ8LOan6CSc1di7aeIYmcQk8e5S3q4 gYpZlV8ZmqbKYi5gXzQYvjbwguGdM7J7xz+3DXgxpy8WVelte2dNvBXM2eaBilpwrC+6 t7Z4NLbRLpPLLNdo+piJlkO2Q3bOhSdJ6V7L3v1GRuAgUATMORceR4WX28dLkDoDzPUL Bs8LBD67D3VCyfkwUjqufH+837oy/alGIHqq7EN8u13UQQZVa7zRsoZ5TgwWOQnVZqjb O86rqbCPOfekzsQVrr3xfWI8dUxGTmpCOxSiOsLXhZ5CS0Wdwgf0C5zb9S5IvBaZtm2V UX0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695373042; x=1695977842; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RDJs3U1rqa7YI0/roeh/1SBiVi3tTUp7AZYFFQzYY+8=; b=YAkfuhw8YZTKcTOaMzZygqJ6mCUUiUwFE4Nfhaf2GijQEW0/74mqltmyVKx6W7lehO 8h56FISfuxb2aoDzIsz2uEclFHbJR+9FV20EEGQsXEh6g7QiAh+987Q/4ND8zsPayVwQ rnhXto6TjlVaM9ppo4NmrbbBdb/mk9ikGHFhYcr+f4nzrSkC/AlmFDmOw60IE5J0Rkdo 1gQJZ3aA6k22/ESUcvn+eqibBhvAsEWc0XgSzBfYwmX69YqcpYR7dfBoOBg26YECtgi7 hu9BKM4MdrP2MoK8wru8kUb14ofaYNGH36VV1Rh63bh+R/Wwlj2m6rY8NFqmhrpoJTvS ViZg== X-Gm-Message-State: AOJu0Yzs8A2HEm+HoLbGEJb4LvYz2VNXJ7mzYLNIfP2XP+ERAUWA/X2K wOQAJxy3ucQE47h+XnNGSsftEQ== X-Received: by 2002:a17:90a:f687:b0:274:74ee:eda5 with SMTP id cl7-20020a17090af68700b0027474eeeda5mr7847201pjb.4.1695373042268; Fri, 22 Sep 2023 01:57:22 -0700 (PDT) Received: from hsinchu26.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id t15-20020a17090a024f00b00256b67208b1sm4815024pje.56.2023.09.22.01.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 01:57:21 -0700 (PDT) From: Yong-Xuan Wang To: linux-riscv@lists.infradead.org, kvm-riscv@lists.infradead.org Cc: greentime.hu@sifive.com, vincent.chen@sifive.com, tjytimi@163.com, alex@ghiti.fr, Yong-Xuan Wang , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] dt-bindings: riscv: Add Svadu Entry Date: Fri, 22 Sep 2023 08:56:48 +0000 Message-Id: <20230922085701.3164-3-yongxuan.wang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230922085701.3164-1-yongxuan.wang@sifive.com> References: <20230922085701.3164-1-yongxuan.wang@sifive.com> X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 22 Sep 2023 01:57:46 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777730026478102952 X-GMAIL-MSGID: 1777761272962256005 Add an entry for the Svadu extension to the riscv,isa-extensions property. Signed-off-by: Yong-Xuan Wang Reviewed-by: Andrew Jones --- Documentation/devicetree/bindings/riscv/extensions.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/riscv/extensions.yaml b/Documentation/devicetree/bindings/riscv/extensions.yaml index cc1f546fdbdc..b5a0aed0165b 100644 --- a/Documentation/devicetree/bindings/riscv/extensions.yaml +++ b/Documentation/devicetree/bindings/riscv/extensions.yaml @@ -147,6 +147,12 @@ properties: ratified at commit 3f9ed34 ("Add ability to manually trigger workflow. (#2)") of riscv-time-compare. + - const: svadu + description: | + The standard Svadu supervisor-level extension for hardware updating + of PTE A/D bits as frozen at commit b65e07c ("move to Frozen + state") of riscv-svadu. + - const: svinval description: The standard Svinval supervisor-level extension for fine-grained From patchwork Fri Sep 22 08:56:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong-Xuan Wang X-Patchwork-Id: 143394 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5519696vqi; Fri, 22 Sep 2023 05:11:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGhbQPPU+fi7ngl/ICFbMsVPDJ3+//xLyLZ1nylAMxVzLkLkQEE11Q2+70h1+MSNKwWztaB X-Received: by 2002:a05:6358:2921:b0:134:d282:92e9 with SMTP id y33-20020a056358292100b00134d28292e9mr7998264rwb.29.1695384687570; Fri, 22 Sep 2023 05:11:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695384687; cv=none; d=google.com; s=arc-20160816; b=EZ6/O8SUYXfgvetGOwx+00p0nU0OZFFDchINJsXtiWSyuOSEdGfGWOfGJvj1+p8Kx8 Qnq12wnOGU11nVnck58zH7cetgmt7LQbRawxY16pVQhfC2+6KyZZkiHmyC5K5lxl5eOz E8F2BmOJiTsQ/AEFVuAbH13IorDpRNiTxAoAJOaASTRuoz/8T5IH4yMdaaMGOzugMvI0 TBx+PCVJ+JFfhbQeeWMOmzK59FdFm5Mn6qDcw3t7G0pP1LPsRxFi3PwRD5Udsgo6/w6h gwrQ2WxCBCYTLQYO0N0yrW5nLhnFAjGjHSMrlrU32T2J4rxFlRivl7Ku2845J836ZDEo 9CWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=vCzI3E8aO188t/F32/cMXTqfHUINrJvH0Tp5qCpKPJc=; fh=ejC2l+bOB1t4KQQR905tsfe+1gEIJ7QXA0l0V+UOAq0=; b=MxhbeJpzhaZx04W2k/F2FrB9L1LwlE5dQp2XFRzIU+FlQJozeci8U5+BWTxaW8isgj e+xNvXxO8EJ2cM1UzNlIxZigZBk+xpkCNH0bwX6pJuHFi9r/xCpdpm09NfcDO+LunzrP Y/d5xv3TT+13vF7Bgen+1ZiXTrVXh0uavUUlaVqd84n/9Se+E/XdmIRh18B8l5CrLzFy USLj7SDjv/R7B0aXIF5HiYrAAU53mzhJQonP9viRbHV/98HPJ+7ELPCnAMvACduTshF3 ktVRQV95OnWPZgrWnlc1Y/5fm3pXQoWb6AnToYv1rr7iShJLjuU0S9qXFck8amTv9lNt AuHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=JDhVh2x3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id d19-20020a637353000000b00578da0d5b6bsi3470791pgn.724.2023.09.22.05.11.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 05:11:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=JDhVh2x3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 0EEF0828E868; Fri, 22 Sep 2023 01:57:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232795AbjIVI5g (ORCPT + 30 others); Fri, 22 Sep 2023 04:57:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232817AbjIVI5d (ORCPT ); Fri, 22 Sep 2023 04:57:33 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC1B6197 for ; Fri, 22 Sep 2023 01:57:27 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-274c05edb69so1259327a91.2 for ; Fri, 22 Sep 2023 01:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1695373047; x=1695977847; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=vCzI3E8aO188t/F32/cMXTqfHUINrJvH0Tp5qCpKPJc=; b=JDhVh2x3NxpylYsDhJdLsAp3CzW6s5mi8kQj6JB7hm7I5ZawlOyTd7dUlmAmoZHV+K 6qc8hCZ3H+4u3PXDPXmTlkWHfaik3rQObfBRKNdcG8V/uKMWSFGNaToVEgVmipfamI4S XFgmFuAJ7JU7JLcXKHs++3Bhl9bAksT+bERZyI2r4XXYXGEfYTueh0zpfYqaSYnSdPOv Z5pRM0YMN58Zklgxyir/q9gsTWQRlBjjmw9Vh8hW7KgtXITMVyrlQK1RUgLVztog21z3 MTpo7s+/i6NNzv4vZ7yZBrVipXYSr5W9CiTqV17vvX27a/Y/SMiadvQt89K57qihwGvY idRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695373047; x=1695977847; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vCzI3E8aO188t/F32/cMXTqfHUINrJvH0Tp5qCpKPJc=; b=h1+k2O0vud/KEwxgHI9+WS/wqZjcbhOFzHw+HYk6DxfnrDoUYqXeRNj29ElMoM6xfN aKyNCQV6QJT/29NwIcjhhPSJ3HQqaCgqrZ98QW3za44ukGUG04vL7PksiNWUK9gNjJtg h6oxm9sLyZcy8XslDpiBBdkclnqRua8plOaACoKWQ2+GaxIE3ZsR70PtNpeYcuwkC0jc M0Zj2IdbZJi1DFyx0MSKx2cyblQd9l/zC8QwMQIpyTTRHeovMNBe8rE/nSsnazQg+MfJ YPKtcb6Ki56TnjmlQV2G5/ydn2dN2SkfYFDQ8qjFBJ/hGYhh5+igjT8RJctkuTaugTpS /yOA== X-Gm-Message-State: AOJu0YzD3EIjGqYKpB1cI+g7jGYrmExUCXSh8tlTTrybBdXVsgaofgTy WiuSCijDi9bvWjGN2gHvyhxGRg== X-Received: by 2002:a17:90a:7066:b0:269:3cdb:4edf with SMTP id f93-20020a17090a706600b002693cdb4edfmr7843278pjk.16.1695373047171; Fri, 22 Sep 2023 01:57:27 -0700 (PDT) Received: from hsinchu26.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id t15-20020a17090a024f00b00256b67208b1sm4815024pje.56.2023.09.22.01.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 01:57:26 -0700 (PDT) From: Yong-Xuan Wang To: linux-riscv@lists.infradead.org, kvm-riscv@lists.infradead.org Cc: greentime.hu@sifive.com, vincent.chen@sifive.com, tjytimi@163.com, alex@ghiti.fr, Yong-Xuan Wang , Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Albert Ou , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] RISC-V: KVM: Add Svadu Extension Support for Guest/VM Date: Fri, 22 Sep 2023 08:56:49 +0000 Message-Id: <20230922085701.3164-4-yongxuan.wang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230922085701.3164-1-yongxuan.wang@sifive.com> References: <20230922085701.3164-1-yongxuan.wang@sifive.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 22 Sep 2023 01:57:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777739693931258417 X-GMAIL-MSGID: 1777739693931258417 We extend the KVM ISA extension ONE_REG interface to allow VMM tools to detect and enable Svadu extension for Guest/VM. Also set the HADE bit in henvcfg CSR if Svadu extension is available for Guest/VM. Signed-off-by: Yong-Xuan Wang Reviewed-by: Andrew Jones --- arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/vcpu.c | 3 +++ arch/riscv/kvm/vcpu_onereg.c | 1 + 3 files changed, 5 insertions(+) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index 992c5e407104..3c7a6c762d0f 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -131,6 +131,7 @@ enum KVM_RISCV_ISA_EXT_ID { KVM_RISCV_ISA_EXT_ZICSR, KVM_RISCV_ISA_EXT_ZIFENCEI, KVM_RISCV_ISA_EXT_ZIHPM, + KVM_RISCV_ISA_EXT_SVADU, KVM_RISCV_ISA_EXT_MAX, }; diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 82229db1ce73..91b92a1f4e33 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -487,6 +487,9 @@ static void kvm_riscv_vcpu_update_config(const unsigned long *isa) if (riscv_isa_extension_available(isa, ZICBOZ)) henvcfg |= ENVCFG_CBZE; + if (riscv_isa_extension_available(isa, SVADU)) + henvcfg |= ENVCFG_HADE; + csr_write(CSR_HENVCFG, henvcfg); #ifdef CONFIG_32BIT csr_write(CSR_HENVCFGH, henvcfg >> 32); diff --git a/arch/riscv/kvm/vcpu_onereg.c b/arch/riscv/kvm/vcpu_onereg.c index 1b7e9fa265cb..211915dad677 100644 --- a/arch/riscv/kvm/vcpu_onereg.c +++ b/arch/riscv/kvm/vcpu_onereg.c @@ -36,6 +36,7 @@ static const unsigned long kvm_isa_ext_arr[] = { /* Multi letter extensions (alphabetically sorted) */ KVM_ISA_EXT_ARR(SSAIA), KVM_ISA_EXT_ARR(SSTC), + KVM_ISA_EXT_ARR(SVADU), KVM_ISA_EXT_ARR(SVINVAL), KVM_ISA_EXT_ARR(SVNAPOT), KVM_ISA_EXT_ARR(SVPBMT),