From patchwork Thu Nov 2 12:01:22 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: 160857 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp300520vqu; Thu, 2 Nov 2023 05:04:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHfy0pNmnrjoGicg0B1RoTvgdpKD2RTkNSly0aqBuvl8tzgeD7despSid1eupNinh12Xh1D X-Received: by 2002:a17:902:f990:b0:1c6:21b4:30bb with SMTP id ky16-20020a170902f99000b001c621b430bbmr13658385plb.15.1698926699216; Thu, 02 Nov 2023 05:04:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698926699; cv=none; d=google.com; s=arc-20160816; b=ji2RAZaBiwHatQJgWVNuvmRAUO0Z6oQ3RiV6TR/RvLTnVpy1S/XZHm/Nu17vMMn8TJ KPAvCVWpu6e4FO0frShmAHQnv9pDpTT4H34pDWW+ey0Ag509kQyYj8z/2EMUw33Aj6A5 aAGakCvzS/xgz57xF29bNZifyW9GZGUxvghR+5HWBflLhNIgGBDpliJyhcPbCtJmGW5l SuEUcGknUD6imjcSnCB6HzKSxqKoEUZYbJxmzQVGehlo96oWvSXifSPxnhJQk5y56gER NBWvUL/RJ7YaqzIOpFsJrsZbqevciEsqhZUHGmUI424TFRg0wUoNgl334VHI955b8rkf zGug== 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=xJAq1yPvWqyGBi5ZsWwrpgoSqVAMHLxRpGtyjE8Lpog=; fh=HHNqnBz96gbnYUNxvRsuXhndl8Lhwx4hc0x/4pwDXng=; b=Pw9Coh6cKYNy4K5qbogkYRWqMt5XLvaoGN3VS2cjM6jhGrTjGwtsiEqFvdhrEmEir+ ZPxsVCHCK3IqvrsfzomcOuokjyLsSZ+HAjGFS/mUE3NTyU7BRLPC+gZJ9mHU5EeAxV4y 5OcSl23swOSJU/9WYIeO31pcLhsgtc6FRHHP4lZoA1FkiR2XSCvrt6MVaNQ/8BodZHCY OmnxY1tczzxrkeC27S/o8Q5Ec5PDGWj4d/BA0m8MXXGMFUMnWzESVdfxoOXgePd5tNeq +cwNL0ys4i+TUvOJfafqCLssI1LBXGOB2HibKbz9lTRhIor4IyWKQmhiwwzWBRXSaG6o R41g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=FF6zsVUm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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. [23.128.96.37]) by mx.google.com with ESMTPS id d20-20020a170902e15400b001b8a67f1c10si4572702pla.468.2023.11.02.05.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:04:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=FF6zsVUm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 6DC7880B81C6; Thu, 2 Nov 2023 05:04:53 -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 S1345566AbjKBMEq (ORCPT + 36 others); Thu, 2 Nov 2023 08:04:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235294AbjKBMEh (ORCPT ); Thu, 2 Nov 2023 08:04:37 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D007210C2 for ; Thu, 2 Nov 2023 05:01:46 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1cacde97002so6391505ad.2 for ; Thu, 02 Nov 2023 05:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1698926506; x=1699531306; 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=xJAq1yPvWqyGBi5ZsWwrpgoSqVAMHLxRpGtyjE8Lpog=; b=FF6zsVUmmvmiObdm3E4jVv+YYKMBNbt1a19Y9NAfSXN/nFqrzzMfScZnJBX8kf4nZA 8FHUq2WU761da6atFkQLHgzpbAeq4tZQmzQA2z8CrWudON74aOvEAbuXyycyaVFVQ8am WF7/mXaP1pNkKtMEJ8QGmO0V8hX7lx3wZb1XkCPA7IHQSuAbwICwuXOLnvx4dgRP3gVu NTPdavCKuXQP5EcK9jW7GCvO8xy/kZRUsPZGodCC72VavmAwNTgmE+MbPz/vcQcvhlys dxq1GZixeOsV/hdb2OhnQ7pGulwDm8XJErbZtigIPYILkksJ9h2haDcrKoBM8hj3w88h KK9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698926506; x=1699531306; 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=xJAq1yPvWqyGBi5ZsWwrpgoSqVAMHLxRpGtyjE8Lpog=; b=VU5FvIFdkpVoaHiqSWctZaeyCv+nx/Nww04I9m9AFWZZq1QC7I3rzPZOqg629TJBU8 dzeN04qQjjWIlk8oEdgUWGyW/5kWMyRW0xLBzzZCASNrAJ/jVoU6I9BiOJYghsn+M2bW Pdzw4P72p79JfLMoRKDQItBW5MnfMeW/zzIrVjS4CXjauZ1KT2M6K+pLfXW2zKoGCCR6 rVb+f+Zx9LRJLmZCtta+jAO2/UsXdqKGOUa0KlCBVFGXxoP317piDeaW/9VNE7Zi2Xon TjKZlLt2esVcs5TRNCFlLUxl5Bk2iVbk5MrysP7kF/E7KMtGCFWto3dsDgkJjNS8/6cX 0dZg== X-Gm-Message-State: AOJu0YxCIQ2SX9gamjgk+Jx8Ngaxw4Rc9OZ8HhPajL2JLN0PQfzPtQkb uzFf7Yed8ftLrG6AKYWodyfQDA== X-Received: by 2002:a17:902:db10:b0:1cc:5833:cf5e with SMTP id m16-20020a170902db1000b001cc5833cf5emr10617317plx.27.1698926506097; Thu, 02 Nov 2023 05:01:46 -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 l12-20020a170902f68c00b001cc0f6028b8sm2969008plg.106.2023.11.02.05.01.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:01:45 -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, conor.dooley@microchip.com, ajones@ventanamicro.com, Yong-Xuan Wang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Guo Ren , Daniel Henrique Barboza , Heiko Stuebner , Jisheng Zhang , Andrew Morton , Alexandre Ghiti , Kemeng Shi , David Hildenbrand , Charlie Jenkins , Sergey Matyukevich , "Matthew Wilcox (Oracle)" , Qinglin Pan , Rick Edgecombe , Evan Green , Sunil V L , linux-kernel@vger.kernel.org Subject: [PATCH v3 1/4] RISC-V: Detect and Enable Svadu Extension Support Date: Thu, 2 Nov 2023 12:01:22 +0000 Message-Id: <20231102120129.11261-2-yongxuan.wang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231102120129.11261-1-yongxuan.wang@sifive.com> References: <20231102120129.11261-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,T_SCC_BODY_TEXT_LINE,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]); Thu, 02 Nov 2023 05:04:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781453762562837394 X-GMAIL-MSGID: 1781453762562837394 Svadu is a RISC-V extension for hardware updating of PTE A/D bits. In this patch 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 Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones --- 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..e6935fd48c0c 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_ADUE (_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 Thu Nov 2 12:01:23 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: 160858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp300591vqu; Thu, 2 Nov 2023 05:05:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE49+H9BW8rHLuCTQXAgbvvtldlGtFRlHuVbJA46lvReYtm+kvFPnThaHv+OVP41bXCpsZA X-Received: by 2002:a05:6a21:3290:b0:17b:129b:1817 with SMTP id yt16-20020a056a21329000b0017b129b1817mr18298958pzb.45.1698926705067; Thu, 02 Nov 2023 05:05:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698926705; cv=none; d=google.com; s=arc-20160816; b=Xh4ACXVOGONVnwB0C7J9GSyj4QbMSUM4Z3nUDC45TSQ12m5X7S255f3pDNhzvS2llA 3GuSNqfPlSK6HAixeZjJUQLZq+/S3KG6sZp7/MwEZzeuVnu5ezQiqI7JnPWk0V/sllQP xKA40N9Nw7xHJ4xYz4dHsfCSNTXvhqObtbE7prNH9Dh7xI7ibvIIzOJt9OiBT/x4TcMR Ze5iqwHSl8RMhruYLJUfgdKJorNgzt4mENbYJUsSmoMkJf5ctiwXbalC5mtEtzCFCMb0 IsJOwaoT0nGs7Q5f1hOpTw+Jv7ORf2c3FoAdmkXzsV1PrfW9gXoC5gJ1evCp4lsL+GnL 660A== 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=jtFETPopYL9qQsqV12E64PSYpI6sEe2ykn1CxLszp0g=; fh=H3RXaSmPFYCN7wvORnwEuhlQcwwv8lMPOqHq5F70iag=; b=zb52vOwTHEw8VDJUablBM7rT/m0bwNPDVlwCiTC/2tBw7fEhuKuLzPRPWUJYD6xYa5 SSHAvsQ0pESpo2O4QmSAYY+LgK2N29Eiclu37OqpgUEEyqRBg8oNjY4VSqEr5H+bGwCO FekYPCipwXj79AiFL+2VuVsmSh75hl5sQZcxP0tp+tmHWaKI1PJRFPqmjU/7ii2bXFig ArDhzbcha7myq6iiIvzT+uC7Tgj8eclSsI4/w0Lfb5bqEUBXcWXZ/ri9BL5jvKt2jpRZ 0rZBrowKecfcG+D8Ey7RYilsPpaiT8vxXn/uQh+BynZq+IRYa2aShOztcStNLvX9Deqb ziyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=DLXfjLgq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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. [23.128.96.37]) by mx.google.com with ESMTPS id ck5-20020a056a00328500b00690c953e024si3524012pfb.119.2023.11.02.05.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:05:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=DLXfjLgq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 DC9388217EC5; Thu, 2 Nov 2023 05:05:00 -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 S1345993AbjKBMEt (ORCPT + 36 others); Thu, 2 Nov 2023 08:04:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235392AbjKBMEi (ORCPT ); Thu, 2 Nov 2023 08:04:38 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB9C4195 for ; Thu, 2 Nov 2023 05:01:52 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6c3443083f2so148452b3a.0 for ; Thu, 02 Nov 2023 05:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1698926512; x=1699531312; 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=jtFETPopYL9qQsqV12E64PSYpI6sEe2ykn1CxLszp0g=; b=DLXfjLgqWwQ8vYW7sWxECI1BRXzLe8nIJ0Y7zbwjiXysayV1Z7mfWI+QkHSH3Spwbg YCq92kvS7UQS8Vwue0Xp+Gl660UiyaOL6u2XrsZpIfNZHTGLpt0S33LSIa1+EjftN5fP /h3k2iDz6iJxv7MbQQ0r9k42+FXkpigoyDr8AWu7wRZMdPmWFP2dj5nIM5pC0f4cuZ0J O/J3s9dBVYr0m4uog+0wZw5VHB2Ap/j1b+QFh+IfLwZlFtND98iWq81wZ8hl3IQ3wXDb jOspcklFNGzLoqrZsS866eujfNBK94G1Um8SdBFSJyjulgDeQKYOCfw6mj0ytRLlJtN5 mQbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698926512; x=1699531312; 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=jtFETPopYL9qQsqV12E64PSYpI6sEe2ykn1CxLszp0g=; b=qAhgb4j+TeoTS+5L57lxci3tHWKu41bYp1WtVC9rtRvadd9sytymaFh0MyqMJyiX67 rQIbhdnCdyFEaAna/Cp5/+2mAVvOYzS14CvX36lJm3ZAAEAJtocWSUiSIccSE9yggsag WRgps4JVCU8OuZGyHJLgTVdA21Htf64cZ4HKQUO9X/i07F1mZXYWrRqqhiQh6iq1agYe a9ITlxYBme/y24oV9NVd7JOe9cbv/cSM6NEQ0DbGjA1Syh2JpuadxgjF+LVQmyWloNG5 sObXaEl0jfwOuBz7E6bNV3fmMGExe68n9cd/3ilhLU0JRla3Eq2iZFuB6wVtW12QYkzH 30QA== X-Gm-Message-State: AOJu0YzVTXiGC5iWfzXBapGk+/8Jsceot9pgvPUcz55M2f4DVe8p+nZ4 dqhZKOQqbTegESK35O1K9gsV7w== X-Received: by 2002:a17:902:e5cf:b0:1cc:3c6c:ce23 with SMTP id u15-20020a170902e5cf00b001cc3c6cce23mr13093008plf.42.1698926512333; Thu, 02 Nov 2023 05:01:52 -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 l12-20020a170902f68c00b001cc0f6028b8sm2969008plg.106.2023.11.02.05.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:01:51 -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, conor.dooley@microchip.com, ajones@ventanamicro.com, 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 v3 2/4] dt-bindings: riscv: Add Svadu Entry Date: Thu, 2 Nov 2023 12:01:23 +0000 Message-Id: <20231102120129.11261-3-yongxuan.wang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231102120129.11261-1-yongxuan.wang@sifive.com> References: <20231102120129.11261-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,T_SCC_BODY_TEXT_LINE,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]); Thu, 02 Nov 2023 05:05:00 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781453768561939289 X-GMAIL-MSGID: 1781453768561939289 Add an entry for the Svadu extension to the riscv,isa-extensions property. Signed-off-by: Yong-Xuan Wang Acked-by: Conor Dooley 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 Thu Nov 2 12:01:24 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: 160860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp302175vqu; Thu, 2 Nov 2023 05:07:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHtnYnAHQ68bkkyWO61rT7z3VbJOzJJzX7qrkwORQvrx+8ORMuJEppov0iP3Xwt59puGwks X-Received: by 2002:a17:90a:1f44:b0:280:5e0f:d1c3 with SMTP id y4-20020a17090a1f4400b002805e0fd1c3mr10277309pjy.3.1698926828622; Thu, 02 Nov 2023 05:07:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698926828; cv=none; d=google.com; s=arc-20160816; b=lJPfw+Pa7XVVc+onRjvtdNrWKnq98jBolp6nRmvU1tpAG/VDUWNa4qixRz4MBxHnLS I4KDzvkljuHGNp7afJ5AKVHGUWPw+uWuWdnM4qrDgGzRoXIbGw+v1fqH/Fc8sMOsBfxd 04tqCn7fYHQiYF5XT2AL8OqmCHr28bXr6GGKuY3b2V3dqAHGZInb8cjRYginuFzSCcIs 3xJ/D0W98rH0hfGEHRw6ZrlFmqmOLYstN1wS+SE5m/yA0ujN0IQmCOIXrb3jY8PWkKa5 NIyhd8Pu1ccQjOLNB9Kluiz6o/REGUC5bf5PuKbth+/Mt3BEb26NoScFRB9qL+zPjgqZ jj0A== 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=KoS5Yzc43oJ/fOlEyyLAOhYHKPtTN8IraB0rRBs3MmU=; fh=rmTgKj9puTXW9DiAq3bV2tv3nt+zpeVMEnexRAD3QCU=; b=IvPPNwlkGUEwX0saw01mJzDsH5qkKzjkr1KRnc25mVnl739GqdlIK60kdCV1hbVUO+ uPgE0n37QmyrOXH23WqojS6UzUD5Atml+pl+5YcEQZtY2GQ77eDekP0yOgEGBjv2PA9T jm9Nqla3J5i5wWv/ezqS48+H1SkoJmHp0WUL7kcAUMFCJcZtcuzbHwCtciH8bG7T7bbZ UVhTLQHunQTdbvxI/AJXLRRxEdlEqCrGGAbloFqOJvTLFLND/D99C8rdZvBwKVjKjkUY KiNRdHTR2BrA3BlogAIUAHgZ+ySJsRD5woK4u1/SM7GH4Ao306lm+PpnhcoOTGQaIXL6 QjoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=bJlBdzJ0; 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 cl23-20020a17090af69700b0028047ab56desi2649372pjb.36.2023.11.02.05.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:07:08 -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=bJlBdzJ0; 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 9D1D1807EB3E; Thu, 2 Nov 2023 05:06:56 -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 S235444AbjKBMGe (ORCPT + 36 others); Thu, 2 Nov 2023 08:06:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235482AbjKBMEi (ORCPT ); Thu, 2 Nov 2023 08:04:38 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A7A410DA for ; Thu, 2 Nov 2023 05:01:58 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1cc5b705769so7342405ad.0 for ; Thu, 02 Nov 2023 05:01:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1698926518; x=1699531318; 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=KoS5Yzc43oJ/fOlEyyLAOhYHKPtTN8IraB0rRBs3MmU=; b=bJlBdzJ0AHhWdQCIf3SrLDFKVkvXvKWlDTdT8FDfZxgdcFinpT6OXPPgolZt1g9YVU J6jEJSkdOMB9kDm3ikWP+8NJUFaVjFPscf5aHmWoj9x4hzKyTGMPvXDOqAKKtVMVySNs nWWmjg8qBBW6xaf1DJyjJ5RxPJc4RPEmsQ1SpnQNshYyfjCoLu5ldn8pe2eu63EuWypR uuXvsCJv/2c2H434TOfVT+LhaGErdJ8Wd9Sf9+zrnRVIRefeBJkxCgeyAxuzbjo9lcaZ EmQ3V7UgEj4ssX4veBaph+/7ekgNmJEfbXKP03TMUZjcYKhAFDNYLw5osLZZYLEOLLRI tWdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698926518; x=1699531318; 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=KoS5Yzc43oJ/fOlEyyLAOhYHKPtTN8IraB0rRBs3MmU=; b=roCAmXtTZJHgqtq2xJegd1GqLHsC5Xxx04rlCeZXMc7B3PTjNj2BYokfMEIih/qc2R 5K0kszsY4jTYzFM2ZVpeHJAr7mOc7PxIrOy88UY3fykX6QhDEKejTQ2gi+QzW24Cu7PP KzKJId8NCS0B0x+/mQOyH5zqvyHX34TLZPAq+a2ZcRrSrnBFke/s1Pdoued0xVpeRioY Y0stNyp1ga7URlFT52+FHMxMgnuNnscgBlyoGLCvX3Cb9WBnAxvJyMsLl4Dj882gi15h OJ0yk/SQY2H35C8UzM18zpnW9kl1Edj+2TzHhZbQp9tiroDTstuWYqrUqg7surE7woOm n2CA== X-Gm-Message-State: AOJu0YxUURCyFPwGLFtZa79AAh3JguRu8gHzqLpXilhvTsT6LExsr8My dBrmhjRaulckEJ7nrz+b2cWIVQ== X-Received: by 2002:a17:902:e80f:b0:1cc:7af4:d12c with SMTP id u15-20020a170902e80f00b001cc7af4d12cmr4685399plg.62.1698926517886; Thu, 02 Nov 2023 05:01:57 -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 l12-20020a170902f68c00b001cc0f6028b8sm2969008plg.106.2023.11.02.05.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:01:56 -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, conor.dooley@microchip.com, ajones@ventanamicro.com, Yong-Xuan Wang , Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Albert Ou , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/4] RISC-V: KVM: Add Svadu Extension Support for Guest/VM Date: Thu, 2 Nov 2023 12:01:24 +0000 Message-Id: <20231102120129.11261-4-yongxuan.wang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231102120129.11261-1-yongxuan.wang@sifive.com> References: <20231102120129.11261-1-yongxuan.wang@sifive.com> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,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]); Thu, 02 Nov 2023 05:06:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781453898615873688 X-GMAIL-MSGID: 1781453898615873688 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 ADUE 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..c95a3447eb50 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_ADUE; + 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 b7e0e03c69b1..2b7c7592e273 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), From patchwork Thu Nov 2 12:01:25 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: 160861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp302196vqu; Thu, 2 Nov 2023 05:07:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrvS2CxLSaleaP0CyeBS9q6zfyO4SOL0v3nWZERBHT3yPLG1qSf4reK7MoQntwJVd4PmhN X-Received: by 2002:a05:6358:7209:b0:169:4c8a:7eb7 with SMTP id h9-20020a056358720900b001694c8a7eb7mr25817178rwa.4.1698926830941; Thu, 02 Nov 2023 05:07:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698926830; cv=none; d=google.com; s=arc-20160816; b=P53er9qrJYHOyTm8losIW/ihIb6dgEWwY+sukIOp/RarjliiSAkt+mPBLKtUMRnv+f kDbTjZyk7p9qXQJRmyt1D0/1hfGgpQLKDUm70X7Q1z4YS9+kCZTrQExKSOeumfQyL+lb jpr/vn1XmokkxhFQy9h029gMpyH3w1N57Sk2EXZNGzZ5eYVDJ57iLCKicH6aaXcoixL3 AfnRdtWPYLERvxVZkW4zU9dW3G6Q/LcZK0iX1asptP/Na0iuJMmmyb3sXnNN8kNTxs2y d1QD3aLlu4UeFL4mUbD3P0XrdEGS5g2S8ikXZnwK4lg0DgsxUl7PPgBiuq9Wk1AnJmz4 zLxw== 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=ftnYGlHohU4PgAvOLDfsNbFmXMcl+RaArmfMB/fCVZg=; fh=WxEQ060hcXMllTvwPjILVQRWExfoTCYVIJoFBeMGS9Y=; b=bHGxSadJ0GJPnXEpP6m/qHetS8dPqg2CW8zacxoCHbTcFi7gKIHYJ1R2w3V4ZSdlC7 RfEGlkolXeWvv8fY7qUkrPDuyvfW1PN44Dt+0pn0Zx4JuNoHXSPObp6mkuO4fPgz2UKa Er2+Cp9rJ4nL5AlkD+L6EAwAAdBCeUK9WkHt3bSCF/0KW8RKHcqpgFTK7ybTpQDiCGp0 IvDljqx+JDlf9xl2pBdeaAHhmxBUJk+BpzlPgrAOaqMDyikgCMIYvrXa9JMBA/fO/FEY EH2rwMMPpc+axADWsLvV1YxthDPt/FBbv749odnTJukz7j+udabQmPrfOHhGq+y7/MPt 2DOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=T+jOFR+8; 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 m76-20020a633f4f000000b00577680ccf1bsi1754249pga.709.2023.11.02.05.07.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:07:10 -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=T+jOFR+8; 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 40ECC81552C1; Thu, 2 Nov 2023 05:07:03 -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 S235575AbjKBMGg (ORCPT + 36 others); Thu, 2 Nov 2023 08:06:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235583AbjKBMEj (ORCPT ); Thu, 2 Nov 2023 08:04:39 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9007110F9 for ; Thu, 2 Nov 2023 05:02:07 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-6c0f14d6875so860585b3a.1 for ; Thu, 02 Nov 2023 05:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1698926527; x=1699531327; 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=ftnYGlHohU4PgAvOLDfsNbFmXMcl+RaArmfMB/fCVZg=; b=T+jOFR+8YUBSxO12vO53oCoIukGFpca/JywKIajBwzf3v3VdE/wUsYzG32sjxJVR4c +9ZHUOvqPMaGaIUfoSClF44U8nOeXepH6kD0C8KwWbjmNLNzFOn0O47moht18tVoEDv6 99xwWaKryihz/Euxj8t6JhgQN6gbpmdkpE1LWIYQ/fIi36zj5dirgdtrMqxJd+1o4p1t XHsYpr21UJikwH2Cwa10hq/99llIbo33DGLTN34S7daCVPxEd7xF1IIowf13GdD3x4Eq WmmpP3yjZQT14KYBbf2q/PZ0E52hnxBNdw9d8U9YqtTK2gK5GWeT0SfdTeHit9XYfOfH mVXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698926527; x=1699531327; 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=ftnYGlHohU4PgAvOLDfsNbFmXMcl+RaArmfMB/fCVZg=; b=YyJOrRjHQ5qPg0ikJKFFghI8xGcavlM0P7tIUOOUE05eS4GnHLJJEX9dZDRJJWgw0B blxozWQwYoE5DsFkLFZ4HcLi5gRvH7nJawtMpPwVCGrmD10BYLu6MtAsEGP1yLVI5iJg PNpei0PqIkqeaOs7MH8ihRGW1QGdXFgbUj8m3vu2ol4SgqY0FscBWbQNG3n4sBlAC2AU Z/NeBoHfEDOQbPhd6A9RVAwWHpw/AUo/d5fTaqQLruGZmUyMHKmRHOKT0qe1003S771U jKbmmi4aliGSNkMC6WXDqr8DkN+8SuVoFEONPMXbien36280nHgHuibKRwuuO//KemkK 4xeg== X-Gm-Message-State: AOJu0YyCGfncD8QXr26oCsuQWZJpW3rv3OdNmHdcEA5YnewQJNmK3s2r q2KOd0pI+wOIeMFTB5+7JHfxmA== X-Received: by 2002:a17:902:d50d:b0:1cc:3875:e654 with SMTP id b13-20020a170902d50d00b001cc3875e654mr12967681plg.26.1698926526894; Thu, 02 Nov 2023 05:02:06 -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 l12-20020a170902f68c00b001cc0f6028b8sm2969008plg.106.2023.11.02.05.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 05:02:06 -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, conor.dooley@microchip.com, ajones@ventanamicro.com, Yong-Xuan Wang , Paolo Bonzini , Shuah Khan , Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Haibo Xu , kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/4] KVM: riscv: selftests: Add Svadu Extension to get-reg-list testt Date: Thu, 2 Nov 2023 12:01:25 +0000 Message-Id: <20231102120129.11261-5-yongxuan.wang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231102120129.11261-1-yongxuan.wang@sifive.com> References: <20231102120129.11261-1-yongxuan.wang@sifive.com> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,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]); Thu, 02 Nov 2023 05:07:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781453900686481286 X-GMAIL-MSGID: 1781453900686481286 Update the get-reg-list test to test the Svadu Extension is available for guest OS. Signed-off-by: Yong-Xuan Wang --- .../testing/selftests/kvm/riscv/get-reg-list.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/testing/selftests/kvm/riscv/get-reg-list.c b/tools/testing/selftests/kvm/riscv/get-reg-list.c index 9f99ea42f45f..972538d76f48 100644 --- a/tools/testing/selftests/kvm/riscv/get-reg-list.c +++ b/tools/testing/selftests/kvm/riscv/get-reg-list.c @@ -49,6 +49,7 @@ bool filter_reg(__u64 reg) case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_ZICSR: case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_ZIFENCEI: case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_ZIHPM: + case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_SVADU: return true; /* AIA registers are always available when Ssaia can't be disabled */ case KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_AIA_REG(siselect): @@ -340,6 +341,7 @@ static const char *isa_ext_id_to_str(__u64 id) "KVM_RISCV_ISA_EXT_ZICSR", "KVM_RISCV_ISA_EXT_ZIFENCEI", "KVM_RISCV_ISA_EXT_ZIHPM", + "KVM_RISCV_ISA_EXT_SVADU", }; if (reg_off >= ARRAY_SIZE(kvm_isa_ext_reg_name)) { @@ -700,6 +702,10 @@ static __u64 fp_d_regs[] = { KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_D, }; +static __u64 svadu_regs[] = { + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_SVADU, +}; + #define BASE_SUBLIST \ {"base", .regs = base_regs, .regs_n = ARRAY_SIZE(base_regs), \ .skips_set = base_skips_set, .skips_set_n = ARRAY_SIZE(base_skips_set),} @@ -739,6 +745,9 @@ static __u64 fp_d_regs[] = { #define FP_D_REGS_SUBLIST \ {"fp_d", .feature = KVM_RISCV_ISA_EXT_D, .regs = fp_d_regs, \ .regs_n = ARRAY_SIZE(fp_d_regs),} +#define SVADU_REGS_SUBLIST \ + {"svadu", .feature = KVM_RISCV_ISA_EXT_SVADU, .regs = svadu_regs, \ + .regs_n = ARRAY_SIZE(svadu_regs),} static struct vcpu_reg_list h_config = { .sublists = { @@ -876,6 +885,14 @@ static struct vcpu_reg_list fp_d_config = { }, }; +static struct vcpu_reg_list svadu_config = { + .sublists = { + BASE_SUBLIST, + SVADU_REGS_SUBLIST, + {0}, + }, +}; + struct vcpu_reg_list *vcpu_configs[] = { &h_config, &zicbom_config, @@ -894,5 +911,6 @@ struct vcpu_reg_list *vcpu_configs[] = { &aia_config, &fp_f_config, &fp_d_config, + &svadu_config, }; int vcpu_configs_n = ARRAY_SIZE(vcpu_configs);