From patchwork Mon Nov 28 16:14:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5785717wrr; Mon, 28 Nov 2022 08:19:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf5PBZQhFFQtv7D9KSelM9+7FzjnU0bsPVMCk1hPO0kOf7KeJlwi6Ywdz9FHyD8rqgreFv2S X-Received: by 2002:a05:6402:4504:b0:463:71ef:b9ce with SMTP id ez4-20020a056402450400b0046371efb9cemr38814399edb.75.1669652374767; Mon, 28 Nov 2022 08:19:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669652374; cv=none; d=google.com; s=arc-20160816; b=OaDn5Jt/E2tCHYTOto9rgq19fQSqNyGtXP5deqnXuludqw3vBMS4lbW3PphcVMpw0c w1byqnfBLOfrnsSQikiPBkjLJU9l7ge2McTwpdqqXxV0VZOQUoS/BUGBNWI5MGmntEn+ l928wvTy3GIBvIo/0nCWcqmPY1VExmrDoikHfmuAJWld2KnjCJZEiLgfcaB2d4EXJ7Rz X8k0YxANllAme6NDl3i7ww6j6Aw8VLTIVin8xtU3v0V0KEwq3kAwdQEoHZ32RQ+w5f45 SpSEhBwTHKDlHQRFJ1rzGFe8e3HE2ESiGwp5iEekeQ18tpDxnPI5GAYsS5UWirSivLZ7 SaLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uRYTh3DpQ80LeZuXMwrf/BBG8HZ9tRsbrJY4o7VrTgs=; b=klnHAxv+ABP8sjXKl6oryN7sJnKYIHYTlXtuH00rp+cRholYqv81ZLo/SLFXCgtnhh 2+6bVPHqQChpYK1gHy1t3vhPjrjMbZBtAG0UqBIxqBO7Wob/G5YRyX2i3OG3gCgZzlVg NeqFZgWUshKD1FpE3lzx5PkAG8Vf/gVrUpFYvUuzgk0Mt6AHEPCKA9HtnAUDmasYeUkI WhbAycF+nXuMoZg8kN8pnj5Cb6GoQvzDysqBVLXVEisf9IdYK8j4YhEtjbyC7sLV6b2Q iwExryyA74UUdstRUNuP5L+FITfBu5c3LrUZWUHch+w9bf+pn7U8wAhqX6CKEhaN/rem STKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=e1sLIlmJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b10-20020a056402084a00b0046721c5b7e0si11465497edz.511.2022.11.28.08.19.07; Mon, 28 Nov 2022 08:19:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=e1sLIlmJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232579AbiK1QOp (ORCPT + 99 others); Mon, 28 Nov 2022 11:14:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232552AbiK1QOm (ORCPT ); Mon, 28 Nov 2022 11:14:42 -0500 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 90F7EE029 for ; Mon, 28 Nov 2022 08:14:39 -0800 (PST) Received: by mail-pf1-x42e.google.com with SMTP id w129so10944931pfb.5 for ; Mon, 28 Nov 2022 08:14:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uRYTh3DpQ80LeZuXMwrf/BBG8HZ9tRsbrJY4o7VrTgs=; b=e1sLIlmJiHEANPq+U54eAHf3W4Nh0ttJp7jgZEIsl19CGXzTS5KTdXxdGnZVN95VOm +fAjj4XJIlDcHqh/lhmM2cKyH8S7xnJ6+xt9Xoc3zF1xyNHKqfxdMk+nr7kzDY35QfXJ sXCb4pmj60ibe5fwRoceD8yLBnBMr8xYrO8nlMwYwUpdcrzfzC0l9xsHZAejcc0BYvlG mSYPf0SqDvsN/0nnevlQ3Ndz/freshRH8YX0YTQfmVaUuKSzIelx2EoRE/8e5aVkTNKg oNksB5v1mkmr1c36OgBHsAdJ7725WTdLQuwabxSvQntLoGYMzYNq2l5CjNVxBGc/URnO hkUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=uRYTh3DpQ80LeZuXMwrf/BBG8HZ9tRsbrJY4o7VrTgs=; b=hKAZwaXYFPqw6qAzD57zbfginrvoewEfYl9Zwus27yqGuxE96JyYdOFAIlhmK7EO32 22S4wASufFXEjv6zQLoWq2lS/7J2VKBrdgVI//XtYxc079JDJdvHfLsRIi64jEyJHETU yl9LlqWrImjKuZnwGodFbM0GSU527LKvoMB147OTij+tpjthWfO6AUxsa2bRdXkOrf1P 2K2zOdPJDNZgON1CZ2lN2OAFb2fY4nCAoXkusRccnZeDPuk8/cGpVNU5YhKBEZJ2zWNh yP1XbTUhMF94L2v1TTD627TWUTepe1tJmOXKmWrOQc/wt4Gc824QKzIJLpLz8gPt+CmE F6LQ== X-Gm-Message-State: ANoB5pm9vb5RGoUyb76mFwHNC2suoUfircFLSXcf19xFjy8DoofI8gug t+jSzxHRpUojVJqIJz7XLbULOg== X-Received: by 2002:a63:5c0f:0:b0:470:8e8a:8e11 with SMTP id q15-20020a635c0f000000b004708e8a8e11mr28249402pgb.490.1669652078905; Mon, 28 Nov 2022 08:14:38 -0800 (PST) Received: from anup-ubuntu-vm.localdomain ([171.76.85.0]) by smtp.gmail.com with ESMTPSA id k145-20020a628497000000b0056246403534sm8210805pfd.88.2022.11.28.08.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 08:14:38 -0800 (PST) From: Anup Patel To: Paolo Bonzini , Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH 1/9] RISC-V: KVM: Fix reg_val check in kvm_riscv_vcpu_set_reg_config() Date: Mon, 28 Nov 2022 21:44:16 +0530 Message-Id: <20221128161424.608889-2-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128161424.608889-1-apatel@ventanamicro.com> References: <20221128161424.608889-1-apatel@ventanamicro.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750757408315845367?= X-GMAIL-MSGID: =?utf-8?q?1750757408315845367?= The reg_val check in kvm_riscv_vcpu_set_reg_config() should only be done for isa config register. Fixes: 9bfd900beeec ("RISC-V: KVM: Improve ISA extension by using a bitmap") Signed-off-by: Anup Patel Reviewed-by: Andrew Jones Reviewed-by: Atish Patra --- arch/riscv/kvm/vcpu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 17d5b3f8c2ee..982a3f5e7130 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -296,12 +296,15 @@ static int kvm_riscv_vcpu_set_reg_config(struct kvm_vcpu *vcpu, if (copy_from_user(®_val, uaddr, KVM_REG_SIZE(reg->id))) return -EFAULT; - /* This ONE REG interface is only defined for single letter extensions */ - if (fls(reg_val) >= RISCV_ISA_EXT_BASE) - return -EINVAL; - switch (reg_num) { case KVM_REG_RISCV_CONFIG_REG(isa): + /* + * This ONE REG interface is only defined for + * single letter extensions. + */ + if (fls(reg_val) >= RISCV_ISA_EXT_BASE) + return -EINVAL; + if (!vcpu->arch.ran_atleast_once) { /* Ignore the enable/disable request for certain extensions */ for (i = 0; i < RISCV_ISA_EXT_BASE; i++) { From patchwork Mon Nov 28 16:14:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26855 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5784289wrr; Mon, 28 Nov 2022 08:17:35 -0800 (PST) X-Google-Smtp-Source: AA0mqf4dUcbMC7mkgWSFEha1VlJwjTmc9ceZjudrIYzCQFyW7f145mn1y3ROs+9+i2rzCOdmZFi/ X-Received: by 2002:a17:906:95c3:b0:78e:975:5e8 with SMTP id n3-20020a17090695c300b0078e097505e8mr27879404ejy.82.1669652255482; Mon, 28 Nov 2022 08:17:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669652255; cv=none; d=google.com; s=arc-20160816; b=gu8syQxwit7l7pfIPVD+OQBJt+7IPl+62E0rulO7Q+4RFvVYGeCR/rEgYZv6YeAhWH 0IvewMA/V7vy/v+jZcM6M4CE9oxg+ZuNa5wGWogxKnlr4ehLpVDCl6WrPo0eqqNht33X Kfrzn8f/y6vcE2mk4kuesBMx32DC/yqlcd7B9emF6pbq9keRQqx2FtNThcMiZK8m0gYv 0rJyeKDO0fE7IIsZXvKBeBHEz+8gHay0HKPMITwUMwnvtXMicDU6GBtr8tVuBw537FDY GKNJeKUTswOq/49wBiKPIHFjto8IZP2q3VhdefPXZa/yD4LHnU1ET4HZLfw84TOykAIt t8QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=S7x0oTKpsWp1eBMVcd2HvR7GLV5FrDh1MXNEuBtWibU=; b=iFSY7u8qa0oFbNgHCPp2DmzDSa3VN86d/HzT0b27frmO85oe9zx/xyeGjW1VSFEJkO iKgV/Dn1UQhH7SY8hb7lCh7A8Oqbu5064KQIiZ3i2uE04Lub6cq7aFjfFFWrXU25pfW+ 4VeFiqOviRPIjHTdW/xITf19SlWudVrsuEM4CoKYfrs/og78SmenSjn8vtiJIDkPiA7Y RIP42vadgIHRM4fxiTdB3bCWV5o9/J/jVjwxQQ6KuxEJi0QfOLAVud8fSR5vReTlvQGL tA6zE7E92X67l/RokY2MeLo6BwXeL8+BZ2PvnA1aDb7nwJ9Qi9U0BWIDdqzM6wbh0J6/ QNuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=GdZOldmS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a0564020e8600b0046b16afc438si3637522eda.323.2022.11.28.08.17.11; Mon, 28 Nov 2022 08:17:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=GdZOldmS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229967AbiK1QOt (ORCPT + 99 others); Mon, 28 Nov 2022 11:14:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232396AbiK1QOo (ORCPT ); Mon, 28 Nov 2022 11:14:44 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B81CD62DF for ; Mon, 28 Nov 2022 08:14:43 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id u15-20020a17090a3fcf00b002191825cf02so6296712pjm.2 for ; Mon, 28 Nov 2022 08:14:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S7x0oTKpsWp1eBMVcd2HvR7GLV5FrDh1MXNEuBtWibU=; b=GdZOldmSeoejY/4MEdz+TDxR+dEPbxAHB2nFoU0GWyxVoxQhUERCL+ZxaQCp1JkRK0 KhzMcM1nrUYd9KYVlLYnbC17ODw/dUbnRoGsYGB7y8iw08CP2OMlbZ3Tdu9Ag7j8rSoN QOUXNtJ7qcbTfXaMrwQ05eXW3JnpLDLGReoYynXAGlFdrLOjgPNGnBBxxoLDR2kwPy2B vD+qzpsMtpHy8F1xF7IG3RsR+xK1Ofxq2aXVIUqCjhZC8W0HpDEbv39lHq38zVTbxttZ rDWQtzL4WRfsED+a1UfPwP1DqwSyIvz7n72G4HGVBcspcAQCONIAtb+597M9SqvswxVw GmRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=S7x0oTKpsWp1eBMVcd2HvR7GLV5FrDh1MXNEuBtWibU=; b=2tYYmjtpJBE2ZxCJTt5OJII09AnwmCBxguN51FrSqKN2Sw46uD0w1K/gq6vAr30tWo J2TKxGrALWGLvSOOReBk6r6CG5/ZxvZ9WELPiR21IyFyCEk+xbiS40Y//F4hhFtr4pPo z/0vD9bd44v3Gt0EHNTJO9dhkpXP5YCH3RXa7bS74RJ+Zvi9ZwB1Oqi4eH/iqbJ2E57Z a5H/lxQugtXDp92zzIRuBM0LsI/4M5Kgku1aeuyvuLouPxbUsswc9PSbDuw5t10zypaf PVtbtbpqgU+NyyaYtOUlt+fU3pVxzYcHOuw+lEHkFmccXVFuAZs04QSchvXY8mnlDIFu EbJQ== X-Gm-Message-State: ANoB5pnL+VUSabHpnnzvssHxUf9yOJZINYkp6/tJiONrcWTRSYdk0g7T G4wYAy0xt0dCeEQ8LXohfWsq6Q== X-Received: by 2002:a17:902:e886:b0:188:fb19:5f39 with SMTP id w6-20020a170902e88600b00188fb195f39mr36071752plg.21.1669652083071; Mon, 28 Nov 2022 08:14:43 -0800 (PST) Received: from anup-ubuntu-vm.localdomain ([171.76.85.0]) by smtp.gmail.com with ESMTPSA id k145-20020a628497000000b0056246403534sm8210805pfd.88.2022.11.28.08.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 08:14:42 -0800 (PST) From: Anup Patel To: Paolo Bonzini , Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH 2/9] RISC-V: KVM: Remove redundant includes of asm/kvm_vcpu_timer.h Date: Mon, 28 Nov 2022 21:44:17 +0530 Message-Id: <20221128161424.608889-3-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128161424.608889-1-apatel@ventanamicro.com> References: <20221128161424.608889-1-apatel@ventanamicro.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750757283637951631?= X-GMAIL-MSGID: =?utf-8?q?1750757283637951631?= The asm/kvm_vcpu_timer.h is redundantly included in vcpu_sbi_base.c so let us remove it. Signed-off-by: Anup Patel Reviewed-by: Atish Patra Reviewed-by: Andrew Jones --- arch/riscv/kvm/vcpu_sbi_base.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/riscv/kvm/vcpu_sbi_base.c b/arch/riscv/kvm/vcpu_sbi_base.c index 48f431091cdb..22b9126e2872 100644 --- a/arch/riscv/kvm/vcpu_sbi_base.c +++ b/arch/riscv/kvm/vcpu_sbi_base.c @@ -12,7 +12,6 @@ #include #include #include -#include #include static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, From patchwork Mon Nov 28 16:14:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26856 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5784340wrr; Mon, 28 Nov 2022 08:17:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf5+IA8HbGkfG8h8EVCjzaZ/CLtA2yB4jaG3B3vNS91bf9uOYxphUxUh6iQuk91mpi61ri3n X-Received: by 2002:a05:651c:19ab:b0:276:66a4:47c3 with SMTP id bx43-20020a05651c19ab00b0027666a447c3mr10932637ljb.49.1669652259543; Mon, 28 Nov 2022 08:17:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669652259; cv=none; d=google.com; s=arc-20160816; b=skNezWqRGEtyExVDSHmkYjgoCCn0JQ55O/68WDc//kqIYmcrkxQCqoPEctbNQqHJkG usLxiSoduLj60xStIh6zcYr97qPNVkpcDhlRyyuuEIreXDhmtv5+gaj7yJHpSckWwYW+ VLM9HUfJKbgqC4+Rx3k3VXiB/KXmSOf74n5uUHW/etDo/YKdWIBq4HFqPTn+j6GBahCT MzKbXcX89gNQ6AmmeAcxGTIjfk7l90PpkYK6KYOPxltihxEnNUx+mwuQuWN72mQid0H5 /plgApib2XZAbIzIEHnfaEI66q9ndk8skgmGdM5AWxfhblb26ldAWw3tOMhOCaFGL/tN ugDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7G5jJwuL5a/PRNCMiCmBEuKFRdtzizPv7c8U41zNCGg=; b=IqMp4AzadhTnfpBT/Snuz19IvOgSSuNla8x8rXW7Sb3sOESrGA68eGcwSzLXO6pXGq 7K9PAyr4iwPkCa35N44NZL4eKsI+6Bnt1d+U5SogvA/dvMG1fsuQZy7HLuogTB4HsC4k ecWT1aCxgUn7UudhzPxHekiUqsLwoFYTNzlH3ZFLLEhNuj9+lPSQw+37fzyvHWDYY4x1 VqBxMmS0XFJ6rYj6rsSbejKfVgP/YlvnxECxvxJcdnKUEutr3uQhJr2DGQsToXEDXHne Frp9g07YZ111Zrrf8hbdeXrFiHOvY8H0hhBLjpf+QsMwjexg5dPCuHWFVY+yZ+gdsJCH eb7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=lrhiGfsI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hr14-20020a1709073f8e00b00787abcb1ce0si10933816ejc.679.2022.11.28.08.17.13; Mon, 28 Nov 2022 08:17:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=lrhiGfsI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232648AbiK1QO4 (ORCPT + 99 others); Mon, 28 Nov 2022 11:14:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232552AbiK1QOt (ORCPT ); Mon, 28 Nov 2022 11:14:49 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24A7F1E731 for ; Mon, 28 Nov 2022 08:14:47 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id d6so10617137pll.7 for ; Mon, 28 Nov 2022 08:14:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7G5jJwuL5a/PRNCMiCmBEuKFRdtzizPv7c8U41zNCGg=; b=lrhiGfsIfOZZ6ZSUfqLx0rHc7pIdz7RcfT9qTrum1U7zEbSdCBeuIAffCX9Zp8ALzF QijgFUXavVRujVGmYAnKR1lA7+nl0rsXn93dezLwx1IfkYQzPwSBifIe80oHP5YPSNfc knJREFODU6y9oD6lGpxSJe1Z11OJ6f2uhBT+lDLN5hl+0oVV4AfxOOWa3kwft1/6s6lx aTDoavz9I3OMPVZ9lBIUtc5Ojne1pFtIbwfL9S3hme8LFnTWMBEPkv0ZxJO9IERhQXKD LrpdyEUC76y9Wc7Qr2xmmRCricyYcugnKM711T3L0zNHCOD60LH6Nf7/CUcYy2YCLjPs 1heg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=7G5jJwuL5a/PRNCMiCmBEuKFRdtzizPv7c8U41zNCGg=; b=lFB6LkCkKjW24ZWzIPLgdN+UJ53+3CT2BUtWqcQr+1Rvzs8aixKsgXoJ4oRkFc4z6s nrFhwnt0rmqN+9/uD9yoTnegVZbpPFZeiJxWvmSKvpdvOEmTgu0hPEAiu2XW2n9EhUZO lP1+E/FIqC2Rnak3Zl8suVwjjM+NKWeK8FcYGKdqpVG7AZPmdQtuCiVxv005N5gvdSuk J8J81xU5wN8hp+QRFpIkileU/pp8+O5DeawD5f2DgldmLJ219Y0F3iHvzdWzmDKqtpKU 1MyvuwO46A/pWDZCadYQM0oAKGh/i0Qv+ICJ4SDaHjiEHiKDRmPoGnOIcbXCEl4tUgnq 8d9Q== X-Gm-Message-State: ANoB5pmHlnZX55YPnEgZVBwH9P+3ejRVDhNvmy6qQWipRt4pG5UEg6ab MG9vozK+1UR2FrJngKW9ZCAXXg== X-Received: by 2002:a17:902:9307:b0:189:9284:2140 with SMTP id bc7-20020a170902930700b0018992842140mr2574760plb.111.1669652087098; Mon, 28 Nov 2022 08:14:47 -0800 (PST) Received: from anup-ubuntu-vm.localdomain ([171.76.85.0]) by smtp.gmail.com with ESMTPSA id k145-20020a628497000000b0056246403534sm8210805pfd.88.2022.11.28.08.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 08:14:46 -0800 (PST) From: Anup Patel To: Paolo Bonzini , Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH 3/9] RISC-V: KVM: Remove redundant includes of asm/csr.h Date: Mon, 28 Nov 2022 21:44:18 +0530 Message-Id: <20221128161424.608889-4-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128161424.608889-1-apatel@ventanamicro.com> References: <20221128161424.608889-1-apatel@ventanamicro.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750757287676418293?= X-GMAIL-MSGID: =?utf-8?q?1750757287676418293?= We should include asm/csr.h only where required so let us remove redundant includes of this header. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- arch/riscv/include/asm/kvm_host.h | 1 - arch/riscv/kvm/vcpu_sbi_base.c | 1 - arch/riscv/kvm/vcpu_sbi_hsm.c | 1 - arch/riscv/kvm/vcpu_sbi_replace.c | 1 - arch/riscv/kvm/vcpu_sbi_v01.c | 1 - 5 files changed, 5 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index dbbf43d52623..6502f9099965 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/riscv/kvm/vcpu_sbi_base.c b/arch/riscv/kvm/vcpu_sbi_base.c index 22b9126e2872..0c806f61c629 100644 --- a/arch/riscv/kvm/vcpu_sbi_base.c +++ b/arch/riscv/kvm/vcpu_sbi_base.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/arch/riscv/kvm/vcpu_sbi_hsm.c b/arch/riscv/kvm/vcpu_sbi_hsm.c index 239dec0a628a..2e915cafd551 100644 --- a/arch/riscv/kvm/vcpu_sbi_hsm.c +++ b/arch/riscv/kvm/vcpu_sbi_hsm.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include diff --git a/arch/riscv/kvm/vcpu_sbi_replace.c b/arch/riscv/kvm/vcpu_sbi_replace.c index 4c034d8a606a..03a0198389f0 100644 --- a/arch/riscv/kvm/vcpu_sbi_replace.c +++ b/arch/riscv/kvm/vcpu_sbi_replace.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/riscv/kvm/vcpu_sbi_v01.c b/arch/riscv/kvm/vcpu_sbi_v01.c index 8a91a14e7139..489f225ee66d 100644 --- a/arch/riscv/kvm/vcpu_sbi_v01.c +++ b/arch/riscv/kvm/vcpu_sbi_v01.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include From patchwork Mon Nov 28 16:14:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26857 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5784485wrr; Mon, 28 Nov 2022 08:17:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf4c6uIDxPislRxL0d3zNjG/NfA+uj6GIdg94KFJreGls30QvFxElwVOzrE5Xy+ufdxSWVUF X-Received: by 2002:a17:906:1641:b0:7ae:7d78:9fa1 with SMTP id n1-20020a170906164100b007ae7d789fa1mr43210424ejd.98.1669652269260; Mon, 28 Nov 2022 08:17:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669652269; cv=none; d=google.com; s=arc-20160816; b=V95nZlJ7t/LXDcBVBtFTI4dqTMvoZDDD2/JJaacnkv9VcHZXwNMXuLbFxmsot7IFQ4 IzSaDfg3ecO5DC8JhjF6cXhJF109ogBoGWBk7/5bZGjyZgS7AAjQHNx4zMEDThuF1HDb YNS4XLdYInmDGHCKpQxp8DX4BFVlFmW8QxlBVOhpMTro1TWt70JVAc5AQeO6u3QY5q8M T5QAX+wt4NgNdgpaOk+76EEa3BXAt8PR0H+eWbTxm/HtbLXiEfrupjnihRPJtNDGXIeh BCfgQh/PsSN6OAwSiyT767tw5gaKBQgYYO34AWGal98OI8upYBv6NQIihPi2Fmqvlv+I VMOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NydSuZRA0dQJSw5CpEPlhY7ambuW6DYL2PJN724q2rI=; b=ssnEG+DDUIreojVxDTpXy2gRUulS1bZwbd2gqsuOiPWNJNGi98f3Fisew9Z4SBQu0C CohDoCo7W/1frFDS/Oin8eloWB3mDQu4GMv7FItL4zp+qmPMz1Uy9QIeqskTCXdYYna6 FG+MZAUSl2/LbJZR+uPSLGltZmujeG6ybTiKQdqC5VFwJw+06/ZgBfFDH5L0EXRnKQwS UhoB9zPtX85ImPBnGWpdg2qPRFs0hTPJqoTxD4dro0r5sjzIW7hdcl9iUQchSAbnNAjr rrfC3A9gX5x8g4MZDswJUR8wG3bCQ4BXqAfjJqG3wayaNZqjD/FTdiPGpwLvcYdF8zH1 8pGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=AVabAj97; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt12-20020a1709072d8c00b007ba89a4fd85si10424715ejc.487.2022.11.28.08.17.22; Mon, 28 Nov 2022 08:17:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=AVabAj97; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232654AbiK1QPI (ORCPT + 99 others); Mon, 28 Nov 2022 11:15:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230234AbiK1QPD (ORCPT ); Mon, 28 Nov 2022 11:15:03 -0500 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 1E24C24BD1 for ; Mon, 28 Nov 2022 08:14:51 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id w79so10963169pfc.2 for ; Mon, 28 Nov 2022 08:14:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NydSuZRA0dQJSw5CpEPlhY7ambuW6DYL2PJN724q2rI=; b=AVabAj97DTRMDHk26gRQuTTvqQGRoIDt2H/tGtRwd8LHgE1VEctsODHZScQIhJkXYN E0Q5igJWPbdFexk1mtJJfhVtldDVKyXylDiKWPpzJwgCUWR8VotqizkG0gRjy6dBWXmr tUXyyg0cpn/OrwFExlEBj5gt7vMuR4MBNbYnE21OEAyhKvyHCToWXJsstFTI17y0Bwl2 Z4i4NbmR8QAdxRhzMRr30V9dBUvW+RI1+0eFo9jfBOknZoUfazzUD74HPDxwOUVjMSj1 DoBDubwRU1TQhiAP5lhcLkA4+Km9UT/0dOD27oFlWZvFr8pkN9LlxPKvsXsAIqo447Z6 UOFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=NydSuZRA0dQJSw5CpEPlhY7ambuW6DYL2PJN724q2rI=; b=ptFLUaTfVevwvG5rQESM3+VMRsTMpp/1y+7FN83XS80dqNRnTNljv1K0Kd5Z99te/+ WKoqifr7ByjgBrMP/FLoGsCAecru8kQKKfd1XxjDzShDzpl3QOKVII+HhTf3nLZ4KBJP YaND5wRQZoy/+CRgnG8b0YbrQxKy5VZK9KwF9qDq7ri7v23Zc0L04MOGZnyfAuwZtN4h 0cUuMG2fWDnZ896ee5ClM2oegCFCOPkEfU0aVrLnCjNUXP4J6vZcfxPeJam7RNL4Z/WT EcLrUlOBvuvgeJC596SqPUqFc9nAOTyNDJMPyIQd5QFgO7A8aCxlx8U5UFrs9llAdRuo cvww== X-Gm-Message-State: ANoB5pnl1f+yl2jpA1p38aaoQxNUPaDYd6escjLytg+kunmOTkZ0tBA2 wb/Xo/dJy4rwMx283Cfcxg3HlQ== X-Received: by 2002:a65:5a4c:0:b0:477:ba9d:ef8 with SMTP id z12-20020a655a4c000000b00477ba9d0ef8mr23807987pgs.98.1669652091114; Mon, 28 Nov 2022 08:14:51 -0800 (PST) Received: from anup-ubuntu-vm.localdomain ([171.76.85.0]) by smtp.gmail.com with ESMTPSA id k145-20020a628497000000b0056246403534sm8210805pfd.88.2022.11.28.08.14.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 08:14:50 -0800 (PST) From: Anup Patel To: Paolo Bonzini , Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH 4/9] RISC-V: KVM: Use switch-case in kvm_riscv_vcpu_set/get_reg() Date: Mon, 28 Nov 2022 21:44:19 +0530 Message-Id: <20221128161424.608889-5-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128161424.608889-1-apatel@ventanamicro.com> References: <20221128161424.608889-1-apatel@ventanamicro.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750757297762054630?= X-GMAIL-MSGID: =?utf-8?q?1750757297762054630?= We should use switch-case in kvm_riscv_vcpu_set/get_reg() functions because the else-if ladder is quite big now. Signed-off-by: Anup Patel Reviewed-by: Andrew Jones Reviewed-by: Atish Patra --- arch/riscv/kvm/vcpu.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 982a3f5e7130..68c86f632d37 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -544,22 +544,26 @@ static int kvm_riscv_vcpu_set_reg_isa_ext(struct kvm_vcpu *vcpu, static int kvm_riscv_vcpu_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) { - if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_CONFIG) + switch (reg->id & KVM_REG_RISCV_TYPE_MASK) { + case KVM_REG_RISCV_CONFIG: return kvm_riscv_vcpu_set_reg_config(vcpu, reg); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_CORE) + case KVM_REG_RISCV_CORE: return kvm_riscv_vcpu_set_reg_core(vcpu, reg); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_CSR) + case KVM_REG_RISCV_CSR: return kvm_riscv_vcpu_set_reg_csr(vcpu, reg); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_TIMER) + case KVM_REG_RISCV_TIMER: return kvm_riscv_vcpu_set_reg_timer(vcpu, reg); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_FP_F) + case KVM_REG_RISCV_FP_F: return kvm_riscv_vcpu_set_reg_fp(vcpu, reg, KVM_REG_RISCV_FP_F); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_FP_D) + case KVM_REG_RISCV_FP_D: return kvm_riscv_vcpu_set_reg_fp(vcpu, reg, KVM_REG_RISCV_FP_D); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_ISA_EXT) + case KVM_REG_RISCV_ISA_EXT: return kvm_riscv_vcpu_set_reg_isa_ext(vcpu, reg); + default: + break; + } return -EINVAL; } @@ -567,22 +571,26 @@ static int kvm_riscv_vcpu_set_reg(struct kvm_vcpu *vcpu, static int kvm_riscv_vcpu_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) { - if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_CONFIG) + switch (reg->id & KVM_REG_RISCV_TYPE_MASK) { + case KVM_REG_RISCV_CONFIG: return kvm_riscv_vcpu_get_reg_config(vcpu, reg); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_CORE) + case KVM_REG_RISCV_CORE: return kvm_riscv_vcpu_get_reg_core(vcpu, reg); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_CSR) + case KVM_REG_RISCV_CSR: return kvm_riscv_vcpu_get_reg_csr(vcpu, reg); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_TIMER) + case KVM_REG_RISCV_TIMER: return kvm_riscv_vcpu_get_reg_timer(vcpu, reg); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_FP_F) + case KVM_REG_RISCV_FP_F: return kvm_riscv_vcpu_get_reg_fp(vcpu, reg, KVM_REG_RISCV_FP_F); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_FP_D) + case KVM_REG_RISCV_FP_D: return kvm_riscv_vcpu_get_reg_fp(vcpu, reg, KVM_REG_RISCV_FP_D); - else if ((reg->id & KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_ISA_EXT) + case KVM_REG_RISCV_ISA_EXT: return kvm_riscv_vcpu_get_reg_isa_ext(vcpu, reg); + default: + break; + } return -EINVAL; } From patchwork Mon Nov 28 16:14:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5784551wrr; Mon, 28 Nov 2022 08:17:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf4NejP76AmQkhcL43XHx0IO9FEVdT9c4apNn3vm657Id5dSqxwmwiB4j35hRbGaGIscnh/B X-Received: by 2002:a17:906:e0d7:b0:7b9:a74b:f16a with SMTP id gl23-20020a170906e0d700b007b9a74bf16amr22585008ejb.192.1669652276267; Mon, 28 Nov 2022 08:17:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669652276; cv=none; d=google.com; s=arc-20160816; b=DVT/vd40VN40pa0F9iK6DxDeLFqBjnFL16dB2sH4xG0RIshxFrFlN9O/desskGXL6c zRlM18VNN/tQH2Pr7IdEcIHp7V78Mb5urz8KIoBZnFxMAQJNTjk+whyPtmJtCVzkMShR zYW4hXzC4ZZJ7QvffaN8zm9g3hcRTe2OCU0keV2NtIQcQviE4pg+08ZSZuiEb5Xo+Sy6 qb6MkI8IyJI9KKx3mvm0zRCiOqeOXnF2wQWjd8EXync7DrjpvobuDveVJj9QYxs9bLlp 0LHrL5nsBQ1e0CUe98fFyFJi+9VllAQJp0L0lr4vjZf2D2C2f8fOCBrvLWA8YxUBdzHd +kog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5vvqUKmjIlo2M+VXNYk9fymWjR9KRElpX3u4BLE4jMI=; b=MWEgZ0/FDKFgifhcmX29BA4cItB0yx84OHE4aICnuWT/c2eGOfvQnKeLWFp7WA4Hs9 KzoKodXTfEN1d6bF3fbi/Eou7b1JhJgItbmos7ZHHHus6ZTYzG9bW3+ocLc2Zs5pbFqY ONkPc0AjjfEy4A84zfTLhm3HmE9O44Oufuz5dSYUVI1I9DlmnT+/QPmPIv7S/gHdnEv+ jfeOuzQ9lpigPe80IyjGIJirYHsaDIF3FuzgCjixr8+hz9BbXuajAwn9Ja7ZSvY450hO l0PfYNCQ/JXZ9Qyq5Ye5HAtqsB1wr6wKfrDl+Jx+c2kd3IlB0CxdQY1DXq+Kt6Aw8ngd MtGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=liRaBUEK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs34-20020a1709073ea200b007bf848e0a05si170046ejc.912.2022.11.28.08.17.29; Mon, 28 Nov 2022 08:17:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=liRaBUEK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232672AbiK1QPK (ORCPT + 99 others); Mon, 28 Nov 2022 11:15:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232662AbiK1QPF (ORCPT ); Mon, 28 Nov 2022 11:15:05 -0500 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03BC763F9 for ; Mon, 28 Nov 2022 08:14:56 -0800 (PST) Received: by mail-pl1-x634.google.com with SMTP id p12so10622332plq.4 for ; Mon, 28 Nov 2022 08:14:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5vvqUKmjIlo2M+VXNYk9fymWjR9KRElpX3u4BLE4jMI=; b=liRaBUEKu2MYafBpndLUswBx84/iGkUeSpwIkM1ayLv71FbHHAdoSwYsy8RFoOuVg0 NVRR46SYjlR4McTk73LTvT7Vn+S0o0JxILW2NqjxMbYb5cDH3rmtRFM/mxmM7KOECHBv EwvJRiMLiC+aVVzG5UblNwd9Lf7PVDCnGirQJ87Supl0JpY5MCxal8Nk2kVibfnt6pFG 79/qA0AyZXTyFBy4upYyciVHZHY8H0+xFpdUBvqwsd4j3xtReMeRCmaDNnggFEmmSRJo gqv5IBRmUjCuS6yjsCwh7rGPsCaGO0w09rhCjkXWuucdTO5Nqwwh/gTAhKkuZ5w4Rmg0 t5iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=5vvqUKmjIlo2M+VXNYk9fymWjR9KRElpX3u4BLE4jMI=; b=gj9OIeSrFn23UH9D0ErSV7kCJLf80UiB3dlAb6p/FlnQQe44JwkH5Qrilw6olCdzl0 0rKouvO/R9wbU5ZR6GkJPGOVBvRa3RbJ0cSR74Yv4rW96B9/4GRG7J8yUuHtb5lnf9aI XOknM/ZylIU7R+HUA92lG+a9tBl++3sXSI56/uFBtIC6zHduOa8XhU6z39t5Rtb5rD0W W/3COFGmTFzzOVGhj7M5s9ndeDfY20L3ujdyWkozKFL/msRlp0LmzckND6R7Fp/JGqjl zLsW7DYX7NLOcHTz/YGa1fDw6ZxABv2eXYta6K/cKEvz2jRWIsHYYJVWuZLC645mKCY2 4J9Q== X-Gm-Message-State: ANoB5plrc9WQrBoVB3HVbfWqgxc0ie9f/tha7A3mXUbufSAM9GFnWM2f 7Uh73FtzFqzPVzEX+YkYPX87xA== X-Received: by 2002:a17:90a:4302:b0:20a:e469:dc7d with SMTP id q2-20020a17090a430200b0020ae469dc7dmr53155068pjg.97.1669652095403; Mon, 28 Nov 2022 08:14:55 -0800 (PST) Received: from anup-ubuntu-vm.localdomain ([171.76.85.0]) by smtp.gmail.com with ESMTPSA id k145-20020a628497000000b0056246403534sm8210805pfd.88.2022.11.28.08.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 08:14:55 -0800 (PST) From: Anup Patel To: Paolo Bonzini , Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH 5/9] RISC-V: KVM: Move sbi related struct and functions to kvm_vcpu_sbi.h Date: Mon, 28 Nov 2022 21:44:20 +0530 Message-Id: <20221128161424.608889-6-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128161424.608889-1-apatel@ventanamicro.com> References: <20221128161424.608889-1-apatel@ventanamicro.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750757305677741848?= X-GMAIL-MSGID: =?utf-8?q?1750757305677741848?= Just like asm/kvm_vcpu_timer.h, we should have all sbi related struct and functions in asm/kvm_vcpu_sbi.h. Signed-off-by: Anup Patel Reviewed-by: Atish Patra Reviewed-by: Andrew Jones --- arch/riscv/include/asm/kvm_host.h | 10 ++-------- arch/riscv/include/asm/kvm_vcpu_sbi.h | 6 ++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index 6502f9099965..91c74b09a970 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -16,6 +16,7 @@ #include #include #include +#include #include #define KVM_MAX_VCPUS 1024 @@ -94,10 +95,6 @@ struct kvm_arch { struct kvm_guest_timer timer; }; -struct kvm_sbi_context { - int return_handled; -}; - struct kvm_cpu_trap { unsigned long sepc; unsigned long scause; @@ -216,7 +213,7 @@ struct kvm_vcpu_arch { struct kvm_csr_decode csr_decode; /* SBI context */ - struct kvm_sbi_context sbi_context; + struct kvm_vcpu_sbi_context sbi_context; /* Cache pages needed to program page tables with spinlock held */ struct kvm_mmu_memory_cache mmu_page_cache; @@ -326,7 +323,4 @@ bool kvm_riscv_vcpu_has_interrupts(struct kvm_vcpu *vcpu, unsigned long mask); void kvm_riscv_vcpu_power_off(struct kvm_vcpu *vcpu); void kvm_riscv_vcpu_power_on(struct kvm_vcpu *vcpu); -int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run); -int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run); - #endif /* __RISCV_KVM_HOST_H__ */ diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm/kvm_vcpu_sbi.h index d4e3e600beef..f79478a85d2d 100644 --- a/arch/riscv/include/asm/kvm_vcpu_sbi.h +++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h @@ -14,6 +14,10 @@ #define KVM_SBI_VERSION_MAJOR 1 #define KVM_SBI_VERSION_MINOR 0 +struct kvm_vcpu_sbi_context { + int return_handled; +}; + struct kvm_vcpu_sbi_extension { unsigned long extid_start; unsigned long extid_end; @@ -31,7 +35,9 @@ void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run); void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu, struct kvm_run *run, u32 type, u64 flags); +int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run); const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext(unsigned long extid); +int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run); #ifdef CONFIG_RISCV_SBI_V01 extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01; From patchwork Mon Nov 28 16:14:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26859 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5784879wrr; Mon, 28 Nov 2022 08:18:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Hmuf7M9GVNwLag/EXQ0FsuqB9py0WNafSOeepFYYO6N2+SIwYD/qQNVACYPGFnKDPFM06 X-Received: by 2002:a05:6402:2488:b0:467:3ea1:acdd with SMTP id q8-20020a056402248800b004673ea1acddmr49313147eda.96.1669652305554; Mon, 28 Nov 2022 08:18:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669652305; cv=none; d=google.com; s=arc-20160816; b=YK56/T4XqyWGNqVYxkLsMn4SzuzOr177ecEMVhM3MJAnR6QaJvkMmZ7JtjAPLBEVre +7XTdeRse34Hd3gTXglQLTbuQCvZHpQOvXdaKSPcpGW429sATyyUhctmHyQDvVMW2aCh D00zkU2tZwn+B1n/H3SklRuQxWLaw+UkZFRl8EsknUEoGYjlOMyLrRQ6QWPnsTF0svEp zfgOrxdE45hqVwA03OVwkQQL3CFGtJnbdiiOuvlauqOQ46g1rV1rjV7GXHemgKNhR+0v GcACKKKJG6FAP0Ar8968GlvBtgVNaCr2bTq1nlT++VQ+SHuwb/prhE3bYQ0zn72Ab5fE keVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hv1OFha79GkiviE0uDMGNS7exO8nWxI6HdONFPzodJA=; b=e5rKCSE6NvwRc95oM8nNl5KwPnTQYjwijRUz5AF0A688Df8eUS+P+caZ5Nw2Xg8QFG YTdGw/PbX3zoCT38PdswtHWXokHR6NaXAvKsRRzmDj4G9l3krtaopMHHtSWpJ/h4KhxV f0O/FqgI3v3UeESX+dqxIfebw+mMcq0f0JrHlX225oc49BxuVSrq1h9p8lOnuNlc+efi NaF4d0ctS8ZuFYNyti3bAskvTlTvfXWxEFRt2IJJaK/UfQdx5FEOgqQxBAugkcP7ylid ITxMr/rUKC7YIp1Fz45sYq4B+g/jnMu7V4e1wEtIQGl6wokIxeDJCDALXSky6LRHG9Yn G09Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=lqSNnSKb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g9-20020a1709065d0900b007804b5a2c48si11776075ejt.521.2022.11.28.08.18.01; Mon, 28 Nov 2022 08:18:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=lqSNnSKb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232742AbiK1QPW (ORCPT + 99 others); Mon, 28 Nov 2022 11:15:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232552AbiK1QPH (ORCPT ); Mon, 28 Nov 2022 11:15:07 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1221424942 for ; Mon, 28 Nov 2022 08:14:59 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id l22-20020a17090a3f1600b00212fbbcfb78so14479840pjc.3 for ; Mon, 28 Nov 2022 08:14:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hv1OFha79GkiviE0uDMGNS7exO8nWxI6HdONFPzodJA=; b=lqSNnSKbWlZ374V5w1PVkdsGEI3ifekQqCTHz1J8U2HZjC+qA2twMy4VL0AEBUMCZq YlVw/udi8rz6lWI6K5sg5aKFW4rmOunzSL+MhQFVRuwhVeQzSAhebIAU14uB4oVjvCqq D8KstXofbeugtPgqSLS1GOjivEnhF0SXoDoEXhZm6ka44+q9OOxiuFEh3aInV5zPuw/W DBhuvqTxSIIcygMAKPvxVkBC2KcF9udOi+NUfmXJZY0RgndFe+I3sBv2esLSSM0n3ERr w8WAggDnqRUs4gOPYWhALfXR6aReh98SeHWE3VFdVmOIUCvnVbRhjDcUn479ZGbIAbz9 Tm/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=hv1OFha79GkiviE0uDMGNS7exO8nWxI6HdONFPzodJA=; b=M0cPtAhfLuOeFevVmbbkwdIprAtF8jwmbQlUNgc96l85RJGyhixz00HB7rkUXCklWd FUM2cyPHGjh8X7yFoYLW7HtFHBuouz9aTh86rYfQySevOd2Hb4Q1EF0q2DLTAIozQHJJ pPMA1Lbkp5ppc//T4HJxVgxPRkEgRU32gTTqu7sQxPWKEEq/l9kC+Nr98lwKGCLqaWqg bcWrwaSu3lUS1SQb+D8uwB49xwwkN6p2bsAcusfJBLVDNG7+GAG8j8vLLQhESm8J6zoT XNzudULiXP52lwt39SHcGYEpt17zMwFw1xzhOCUu+0euI94A5kg9m6iHcjW6q2EeoPuf kp0g== X-Gm-Message-State: ANoB5pm5xO6007+PQXJfmMYEEP7wJLOIumYvqJZfoU8ScBPme3SSlVLn oeV53+UlxBPEQxfklWs8Mutvpw== X-Received: by 2002:a17:902:d893:b0:188:542a:68d8 with SMTP id b19-20020a170902d89300b00188542a68d8mr34593125plz.126.1669652099425; Mon, 28 Nov 2022 08:14:59 -0800 (PST) Received: from anup-ubuntu-vm.localdomain ([171.76.85.0]) by smtp.gmail.com with ESMTPSA id k145-20020a628497000000b0056246403534sm8210805pfd.88.2022.11.28.08.14.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 08:14:59 -0800 (PST) From: Anup Patel To: Paolo Bonzini , Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH 6/9] RISC-V: Export sbi_get_mvendorid() and friends Date: Mon, 28 Nov 2022 21:44:21 +0530 Message-Id: <20221128161424.608889-7-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128161424.608889-1-apatel@ventanamicro.com> References: <20221128161424.608889-1-apatel@ventanamicro.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750757335955915875?= X-GMAIL-MSGID: =?utf-8?q?1750757335955915875?= The sbi_get_mvendorid(), sbi_get_marchid(), and sbi_get_mimpid() can be used by KVM module so let us export these functions. Signed-off-by: Anup Patel Reviewed-by: Atish Patra Reviewed-by: Andrew Jones Acked-by: Palmer Dabbelt Acked-by: Palmer Dabbelt --- arch/riscv/kernel/sbi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index 775d3322b422..5c87db8fdff2 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -627,16 +627,19 @@ long sbi_get_mvendorid(void) { return __sbi_base_ecall(SBI_EXT_BASE_GET_MVENDORID); } +EXPORT_SYMBOL_GPL(sbi_get_mvendorid); long sbi_get_marchid(void) { return __sbi_base_ecall(SBI_EXT_BASE_GET_MARCHID); } +EXPORT_SYMBOL_GPL(sbi_get_marchid); long sbi_get_mimpid(void) { return __sbi_base_ecall(SBI_EXT_BASE_GET_MIMPID); } +EXPORT_SYMBOL_GPL(sbi_get_mimpid); static void sbi_send_cpumask_ipi(const struct cpumask *target) { From patchwork Mon Nov 28 16:14:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5784972wrr; Mon, 28 Nov 2022 08:18:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf7MWAmbCFMW+1HDB8cSXUoHXLEQkWJu0B7MP1M3L2FBPJdExaYXlSczhZtSbhKtkYf6MziD X-Received: by 2002:a17:906:5fd5:b0:7ac:2e16:a8d3 with SMTP id k21-20020a1709065fd500b007ac2e16a8d3mr30385729ejv.667.1669652312636; Mon, 28 Nov 2022 08:18:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669652312; cv=none; d=google.com; s=arc-20160816; b=Y02SV3yxEmwITEot29PpthpYbot4Y4hV7XOwOyj8RwSXQ6k0MUlKXIZjbJB61/evTr 48H5WmGraOFUYhPIY40aFjmZcBzTrxp/ZtjjsTVEzKsxlfGXjjNf2syFI4m/7Stc/xmZ 6RiXlGla/eammC2vF0hut4WKWiu5jQgFAlttqCKa+YQYcb4NzXrEjLMgpeO2VZEbYthi W8IDY15kPUoQ94nRAkThlafh5ZOpGnXbMEITS+AOXmVbDRNOTklg5mmjv1aS+iYySR6D iV7eICH9+kWUA95I++KOFIXqIXcmkF1hZLge8ZTBCQRrrTH8Fm5a0VDw4fEFAXaTs1la Rk9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ji6gUrAoWYT3XHk2lFOFtFs8PLEDbbIx9YYSf+S6VSU=; b=CIx/frmtG+JFQDKljbdx2Fc+dj1HJCJwvt06OeAaNO4vF57KUykFNcx2SDNPD2r8eT JQ1fW3f/6SMFlUdB15rNMAZxJ4VT/u0I5k2U8hKdEGubmJ0pJANrhiuFqvjS9u4deOB+ v5cqx7WC1i3ZphZBO3P5mPbgXKlPr5GeLcT2iC3fs1K89G4hH/Uww6yhJ2cV+Fk6XVgM 1ImOVb/y0n28b6lOE4HVbvJPiXccej7jXY0Hbl34SVOW5z5cGXyekPTzZTtJlggX4fmx ib8FGRhnwuYpvIdqLVKn66U64eRXsAJrH4Wz2vsmenIJn4BDqi3IVPsJpcOq+Tzqdr0+ +s6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=AjDuDNL8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ho34-20020a1709070ea200b0078ddd8656d9si11408481ejc.9.2022.11.28.08.18.08; Mon, 28 Nov 2022 08:18:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=AjDuDNL8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232752AbiK1QP1 (ORCPT + 99 others); Mon, 28 Nov 2022 11:15:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232702AbiK1QPK (ORCPT ); Mon, 28 Nov 2022 11:15:10 -0500 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 649A325283 for ; Mon, 28 Nov 2022 08:15:04 -0800 (PST) Received: by mail-pl1-x636.google.com with SMTP id w23so10604583ply.12 for ; Mon, 28 Nov 2022 08:15:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ji6gUrAoWYT3XHk2lFOFtFs8PLEDbbIx9YYSf+S6VSU=; b=AjDuDNL8yAH4u64rbRauvAnfDwFYGSkUwRQHNT35gUX2qBC27sLneXYjLxoHThqaMD 2XKsXAk0kyRCA8MF5ECg+7l/bjOsfAhXTdcnUzQKToxbZCG0Q2GZmXEWxCxO4g2snJLE foNXnRy9leX4WRty4LXz7pmeQJLWIQ1A8NVw+F5ctpUmMQ32/SLtKOmvjs1GkJ1qwusW lUuvExjF232MPQ4MgVW27YlIZHN8VjhclqVGFcw/FodzbFb00xTqWaAgx20VQEApxtLr oLMdXe0Q9PX7jsop2JH5Pb0TXuCxBMNa4l83br5MLpo/XVe6m/rYKBz4/sQHPpIOH9uW tAaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=ji6gUrAoWYT3XHk2lFOFtFs8PLEDbbIx9YYSf+S6VSU=; b=jJFtg6Z0XYo12ljbrzb+G85oYVEt+yq1R60bCD6R0zVIMAZwsbsusmgjETBylf2VNI pqI3lFGu+Vz4xsA2aok10vQQgvt7QC8G1WesnSQvAJDN0or/7hynUx4lpeLSwkNEiUVs PpxYiQzuCBAwrO6J/eeXTG3USCvdb2p8bJ1P3XuVim0UmbCRwX9NT2cmxAuiAyGNK7E4 AyfIuJi8EhEG52P5QmT5QFck4UHdNfxaUbHvBwAL/QkueM8Dcw+DMSo2zTaXeNzVMBBn Wco5jhVVtNNbov3slan7ur36XRc8IKcn0FaldYZrTO7dGoA891ujCWC/m7DhWTix0te7 wj9A== X-Gm-Message-State: ANoB5plyTEu3o3xexV8zGiYu8iCeEp1OUFBNXNgAifu1OzI5vL9fsytH HRdUpBf8CDUtq009LIHuxnlySQ== X-Received: by 2002:a17:902:c702:b0:189:4bde:53c1 with SMTP id p2-20020a170902c70200b001894bde53c1mr25593754plp.1.1669652103621; Mon, 28 Nov 2022 08:15:03 -0800 (PST) Received: from anup-ubuntu-vm.localdomain ([171.76.85.0]) by smtp.gmail.com with ESMTPSA id k145-20020a628497000000b0056246403534sm8210805pfd.88.2022.11.28.08.14.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 08:15:03 -0800 (PST) From: Anup Patel To: Paolo Bonzini , Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH 7/9] RISC-V: KVM: Save mvendorid, marchid, and mimpid when creating VCPU Date: Mon, 28 Nov 2022 21:44:22 +0530 Message-Id: <20221128161424.608889-8-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128161424.608889-1-apatel@ventanamicro.com> References: <20221128161424.608889-1-apatel@ventanamicro.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750757343357761861?= X-GMAIL-MSGID: =?utf-8?q?1750757343357761861?= We should save VCPU mvendorid, marchid, and mimpid at the time of creating VCPU so that we don't have to do host SBI call every time Guest/VM ask for these details. Signed-off-by: Anup Patel Reviewed-by: Atish Patra Reviewed-by: Andrew Jones --- arch/riscv/include/asm/kvm_host.h | 5 +++++ arch/riscv/kvm/vcpu.c | 6 ++++++ arch/riscv/kvm/vcpu_sbi_base.c | 11 +++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index 91c74b09a970..93f43a3e7886 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -165,6 +165,11 @@ struct kvm_vcpu_arch { /* ISA feature bits (similar to MISA) */ DECLARE_BITMAP(isa, RISCV_ISA_EXT_MAX); + /* Vendor, Arch, and Implementation details */ + unsigned long mvendorid; + unsigned long marchid; + unsigned long mimpid; + /* SSCRATCH, STVEC, and SCOUNTEREN of Host */ unsigned long host_sscratch; unsigned long host_stvec; diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 68c86f632d37..312a8a926867 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -21,6 +21,7 @@ #include #include #include +#include const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = { KVM_GENERIC_VCPU_STATS(), @@ -171,6 +172,11 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) set_bit(host_isa, vcpu->arch.isa); } + /* Setup vendor, arch, and implementation details */ + vcpu->arch.mvendorid = sbi_get_mvendorid(); + vcpu->arch.marchid = sbi_get_marchid(); + vcpu->arch.mimpid = sbi_get_mimpid(); + /* Setup VCPU hfence queue */ spin_lock_init(&vcpu->arch.hfence_lock); diff --git a/arch/riscv/kvm/vcpu_sbi_base.c b/arch/riscv/kvm/vcpu_sbi_base.c index 0c806f61c629..5d65c634d301 100644 --- a/arch/riscv/kvm/vcpu_sbi_base.c +++ b/arch/riscv/kvm/vcpu_sbi_base.c @@ -19,7 +19,6 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, { int ret = 0; struct kvm_cpu_context *cp = &vcpu->arch.guest_context; - struct sbiret ecall_ret; switch (cp->a6) { case SBI_EXT_BASE_GET_SPEC_VERSION: @@ -48,13 +47,13 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, *out_val = kvm_vcpu_sbi_find_ext(cp->a0) ? 1 : 0; break; case SBI_EXT_BASE_GET_MVENDORID: + *out_val = vcpu->arch.mvendorid; + break; case SBI_EXT_BASE_GET_MARCHID: + *out_val = vcpu->arch.marchid; + break; case SBI_EXT_BASE_GET_MIMPID: - ecall_ret = sbi_ecall(SBI_EXT_BASE, cp->a6, 0, 0, 0, 0, 0, 0); - if (!ecall_ret.error) - *out_val = ecall_ret.value; - /*TODO: We are unnecessarily converting the error twice */ - ret = sbi_err_map_linux_errno(ecall_ret.error); + *out_val = vcpu->arch.mimpid; break; default: ret = -EOPNOTSUPP; From patchwork Mon Nov 28 16:14:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5785450wrr; Mon, 28 Nov 2022 08:19:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf4kUbJWR68n2RUbacnz/Y0k7OEdjiDTyk2SuZP8GcDzvq/j+3+jl+n+pSlTLq9LOH7okhiy X-Received: by 2002:a5d:684f:0:b0:242:7a2:a014 with SMTP id o15-20020a5d684f000000b0024207a2a014mr9761235wrw.228.1669652352724; Mon, 28 Nov 2022 08:19:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669652352; cv=none; d=google.com; s=arc-20160816; b=zmJydbvhvYfU4CY5Aq/ANC4ebU7H7pWoa44cuvDj7LArTe9ZW/QhwuER2Nh6pVuiKW kEUaiHX9SHtsdr+faGArvAVtfhFjZTtacjfaLkt3N1KS6Sww50rkiIQYkQnQLk6bc4uE 19TCP2yfXRiOyh/+Zy367XPtruVjBH26S4aM+e0LZX0RzZVWvUWS1iWfqEx3Uy7/F3yo C/qf83m89WoN5YsQJJ06wLYv9AiskLTHFA1Tz62ahlng9ckNmNZDv8ZNmmHVast5UkdU VOpLjCXz6AkGyA0DGHQ0qSbfs7M7tlee8yQkQ1I7s1qy6v8IBbWe1JWwcIArvPJvRtys rzVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=F1jSlqGdECL73YnDzNqagg9psRJkFm1roQJKa2djZKM=; b=KIQ+aS0aBBcSZyJG4wpbQqHfU/dEz7rzpj1p7Sy93CkQm4if9LCwnUPVUaVN082dKu coDehUHEKdZ+K65nsxEn2GbImL6vD4KILGHxmorK25ExCTtbfhqbhjKVdtdG6jl/AlEB iH9kz/zSm7e6pwGY7LlnYEX+L0roHFDs9IWPmhjH9/n3K/Q+0GfdcxH4edRZqc0J0JIr 6PRc08H72EBNWzkSnIJXSL4Lma+YqutMBLP2gB1o47awkc+Y5DzVxSI/Tuig1Cnl6mrF YcIvUrTmcrHsmJ7p8y4/ond1jpGFtrOJkWQC2Vwm+4E4N/vZ+UxuGWD259V+pXdiDhAA 5/pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=L6a6o+4S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n14-20020a05640206ce00b004661ece3fabsi9402769edy.575.2022.11.28.08.18.47; Mon, 28 Nov 2022 08:19:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=L6a6o+4S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232645AbiK1QPl (ORCPT + 99 others); Mon, 28 Nov 2022 11:15:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232678AbiK1QPQ (ORCPT ); Mon, 28 Nov 2022 11:15:16 -0500 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC80524BD6 for ; Mon, 28 Nov 2022 08:15:08 -0800 (PST) Received: by mail-pl1-x636.google.com with SMTP id y17so2725012plp.3 for ; Mon, 28 Nov 2022 08:15:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F1jSlqGdECL73YnDzNqagg9psRJkFm1roQJKa2djZKM=; b=L6a6o+4S9rBnv86Payvu0dzLCpF3lYvbi9NgJKV1CXCbWK/dyxbBu12WF2ZSV1keFB Be5L4CQlc7zjqpjF6lzrgrLKhGpxAdOBzvySlGKafYVqSgKttpVsj1iLemVo1nzzntgN adrM1WO3AfzgiuPqku8d6jS/TcuLI6wFqlCiL2toC0f0oEceRHbBRVpTlDsES0hjt864 fHMJji5dsKGR0hIfMjMzZqqaTDbprry/wE7FcXdxWIZLl63ov42CGsb46Ec2kk6xA0wh 211lCV2nNEEp/sQsDC2VVRnSPgg4aUVEnoUBcPgJcRATQeaiDIrVZv2n+d5zzrYJVl9H Qi/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=F1jSlqGdECL73YnDzNqagg9psRJkFm1roQJKa2djZKM=; b=otwN9rSUgPMpg5EucTAzeT1b9hxxxT8SwKVy1Ux74AD1dWfIHFgmkDNxIPSRzVBBmB hGhXoigJdmGdOueEheRDXQ7gMxZf3EU7e2qI3Uq/3HJAFkH6TXIpeMa4iMRUtSv93owN sft7ZdUCdfw74xbLzQZlFZHOwkP4/8T6rcpqIDD8lTtgPim9Xqlx0yYr0Rd1z9+4i3/y AQDgD4JZvguKb15S6wJRF08pLnA6c17YnoUE4kEVyaxVGSI8hOgU2pIXqlVNpy7QtVo0 bZAxVW37Dl/C8wxdFbuVXJmx1VqzMhgCnP7A3vh/lspIxN/EUEysBUEe0ZtG0sp/o6DO xVng== X-Gm-Message-State: ANoB5pmn6on1fCN+8L4yUqY3fP8Y3dauG9t+16XczHmUSphQu175uMjH vzMgLfo8C4Bmdp22/20DSsGf8w== X-Received: by 2002:a17:90a:5801:b0:218:90b5:d1f2 with SMTP id h1-20020a17090a580100b0021890b5d1f2mr46721362pji.142.1669652108111; Mon, 28 Nov 2022 08:15:08 -0800 (PST) Received: from anup-ubuntu-vm.localdomain ([171.76.85.0]) by smtp.gmail.com with ESMTPSA id k145-20020a628497000000b0056246403534sm8210805pfd.88.2022.11.28.08.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 08:15:07 -0800 (PST) From: Anup Patel To: Paolo Bonzini , Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH 8/9] RISC-V: KVM: Add ONE_REG interface for mvendorid, marchid, and mimpid Date: Mon, 28 Nov 2022 21:44:23 +0530 Message-Id: <20221128161424.608889-9-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128161424.608889-1-apatel@ventanamicro.com> References: <20221128161424.608889-1-apatel@ventanamicro.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750757385397124908?= X-GMAIL-MSGID: =?utf-8?q?1750757385397124908?= We add ONE_REG interface for VCPU mvendorid, marchid, and mimpid so that KVM user-space can change this details to support migration across heterogeneous hosts. Signed-off-by: Anup Patel Reviewed-by: Atish Patra Reviewed-by: Andrew Jones --- arch/riscv/include/uapi/asm/kvm.h | 3 +++ arch/riscv/kvm/vcpu.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index 8985ff234c01..92af6f3f057c 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -49,6 +49,9 @@ struct kvm_sregs { struct kvm_riscv_config { unsigned long isa; unsigned long zicbom_block_size; + unsigned long mvendorid; + unsigned long marchid; + unsigned long mimpid; }; /* CORE registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 312a8a926867..7c08567097f0 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -276,6 +276,15 @@ static int kvm_riscv_vcpu_get_reg_config(struct kvm_vcpu *vcpu, return -EINVAL; reg_val = riscv_cbom_block_size; break; + case KVM_REG_RISCV_CONFIG_REG(mvendorid): + reg_val = vcpu->arch.mvendorid; + break; + case KVM_REG_RISCV_CONFIG_REG(marchid): + reg_val = vcpu->arch.marchid; + break; + case KVM_REG_RISCV_CONFIG_REG(mimpid): + reg_val = vcpu->arch.mimpid; + break; default: return -EINVAL; } @@ -338,6 +347,24 @@ static int kvm_riscv_vcpu_set_reg_config(struct kvm_vcpu *vcpu, break; case KVM_REG_RISCV_CONFIG_REG(zicbom_block_size): return -EOPNOTSUPP; + case KVM_REG_RISCV_CONFIG_REG(mvendorid): + if (!vcpu->arch.ran_atleast_once) + vcpu->arch.mvendorid = reg_val; + else + return -EBUSY; + break; + case KVM_REG_RISCV_CONFIG_REG(marchid): + if (!vcpu->arch.ran_atleast_once) + vcpu->arch.marchid = reg_val; + else + return -EBUSY; + break; + case KVM_REG_RISCV_CONFIG_REG(mimpid): + if (!vcpu->arch.ran_atleast_once) + vcpu->arch.mimpid = reg_val; + else + return -EBUSY; + break; default: return -EINVAL; } From patchwork Mon Nov 28 16:14:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 26865 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5786446wrr; Mon, 28 Nov 2022 08:20:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf5cp7tkqtcMqntigbfdGBF2PiueYTzo/hNiPGz8JkdoQ/ddmUj/B8IqgQ3hgHXm1GgIWvKb X-Received: by 2002:a05:6402:298f:b0:468:f142:3040 with SMTP id eq15-20020a056402298f00b00468f1423040mr47546866edb.107.1669652438142; Mon, 28 Nov 2022 08:20:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669652438; cv=none; d=google.com; s=arc-20160816; b=YLdtGwaCW7l39owuMSR1s3ak3ixLODhQ34rXfQ296Rs7tk16he1H7hqh2hssyjX9hb 7oongxjAQe1UQhr0dBcFFNMZ9I3+0ZadXwoIKb0cV7QtbaGFnwsVEeEL+wZBhLwh+TRp bAfk7awWz18jS6obMYQ8XOHPTsoxZ1tylzKBFCA/mQYGxfzU9dT/qqTBJqI7lvT2K13o nMo6yMUU8pPR5qEL9v8lU9/uykuHJPNT9KXMYssTcArdRupcXq224EpvJydCQDBT1RS4 yjzjVHWdp29qjMNQo5GBZP2VG3WMsYuwrXuMv5NfjmPk0dhgYw5wkqBOou/ZHrxIAdoq ghAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HEa4jrNjhDHgDWleCwUC9jP5Upr+bP5hcFJpr0dDzPM=; b=k2KMDE95pTdx9++lSf15iqmjR0lJbDU8VZdQm0oTMgDJMg+TWXCzyShxTOnL46dtmB MtQ4C1nGyW/7polLS3nvY5ld4ic4Ur4hBgoEt//XGxTT/QYaIMaEmZhQKJqLsXEOFTIb DeQyopVsGQ2tOTfpT61L32iAZAUea02Bs0eBBK4ccG9IYTjd/Xn/WS2D6SMMMpCxvMal HMZNiAI565K3NwJOOJ/qtaN2EIHHuiZmcwBpk9Qy6u/lLTu/KplT8Fqqhz0CqW7Q1xae 7lTeXVQbmxulomRza8trIkuv5XW35xFrVVjisG+deGSf91pWprG1YqhLtcRCUjzpyWVJ GHQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=KgsVU6To; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w17-20020aa7cb51000000b004615b657cbcsi8287921edt.190.2022.11.28.08.20.12; Mon, 28 Nov 2022 08:20:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=KgsVU6To; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232772AbiK1QPr (ORCPT + 99 others); Mon, 28 Nov 2022 11:15:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232638AbiK1QPV (ORCPT ); Mon, 28 Nov 2022 11:15:21 -0500 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C83F924F03 for ; Mon, 28 Nov 2022 08:15:12 -0800 (PST) Received: by mail-pf1-x435.google.com with SMTP id a16so10535702pfg.4 for ; Mon, 28 Nov 2022 08:15:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HEa4jrNjhDHgDWleCwUC9jP5Upr+bP5hcFJpr0dDzPM=; b=KgsVU6To3PhGBvxzeYihsHEsefYw1Lwjd7RBoWGjZ5b9AKi9T7e5SmxULH1uWbAU+2 +DltX3HebEAGrFxKCEcSwEFwjpomIoLIGh1CSjQkmh5ZNXecnKXx6tRsQi9tchGzzZ/i NbfW0RaPpd31mHEbWLDkecx8UDb26Yfn+/6cKZy6YJEdoVtFYRDOAewiGJrVcIRnN/ep JoD+8vKD4rrEcG+EvaTPAwGc/0zLRxMQu9eay46TcU3w78rI2zTWTeKYCYhnhMhhQWmt wMVTA7XeviZd9UBeE30eynu1o16eE9q1BYugIW8EDSzAvKBRa8stRWulXtw0K36wfQy9 ez7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=HEa4jrNjhDHgDWleCwUC9jP5Upr+bP5hcFJpr0dDzPM=; b=xi7v7ZajVNPIkkh/o3PoELMxO3Lq92XshsqBfXGNPE43EECg0iCNUmrI8Zs/eNRon/ IoDKrvBIhIKtAWw+PRNF+oPFrBJ7RhevNzc6Kq6NIAW+yqaIhgG8twzmc/IqHPHGhX0K awQU7FHpe6UYLEDs+3UEwbEf3jv26u6bmbEdrZOhbMkFKBNK3reRKERc2ii2sU8eODzS ieEJ9hns6lpyCRKulXoQkNpBhzypJr7/5+8XQ7Wf8uqS1XEJ2/ms0RknLewwxPCkewTg 2qlN2FrhkiKxgH4/fvCpDP3T0luW52NADxqvJLcWBiighVKe6AWCDDHrCaEWVfyfjlzm BJYQ== X-Gm-Message-State: ANoB5pn9Wmk3+GA1fZRSyqp2TCSttC7/vblrulk7YJWHRjUq9xxBY03H SSssTo6IjsY76ky5HoyM0E9weA== X-Received: by 2002:aa7:8054:0:b0:56b:d951:67d2 with SMTP id y20-20020aa78054000000b0056bd95167d2mr54163707pfm.55.1669652112141; Mon, 28 Nov 2022 08:15:12 -0800 (PST) Received: from anup-ubuntu-vm.localdomain ([171.76.85.0]) by smtp.gmail.com with ESMTPSA id k145-20020a628497000000b0056246403534sm8210805pfd.88.2022.11.28.08.15.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 08:15:11 -0800 (PST) From: Anup Patel To: Paolo Bonzini , Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH 9/9] RISC-V: KVM: Add ONE_REG interface to enable/disable SBI extensions Date: Mon, 28 Nov 2022 21:44:24 +0530 Message-Id: <20221128161424.608889-10-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128161424.608889-1-apatel@ventanamicro.com> References: <20221128161424.608889-1-apatel@ventanamicro.com> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750757474868170274?= X-GMAIL-MSGID: =?utf-8?q?1750757474868170274?= We add ONE_REG interface to enable/disable SBI extensions (just like the ONE_REG interface for ISA extensions). This allows KVM user-space to decide the set of SBI extension enabled for a Guest and by default all SBI extensions are enabled. Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- arch/riscv/include/asm/kvm_vcpu_sbi.h | 8 +- arch/riscv/include/uapi/asm/kvm.h | 19 ++++ arch/riscv/kvm/vcpu.c | 2 + arch/riscv/kvm/vcpu_sbi.c | 145 +++++++++++++++++++++++--- arch/riscv/kvm/vcpu_sbi_base.c | 2 +- 5 files changed, 158 insertions(+), 18 deletions(-) diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm/kvm_vcpu_sbi.h index f79478a85d2d..baa342dadf95 100644 --- a/arch/riscv/include/asm/kvm_vcpu_sbi.h +++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h @@ -16,6 +16,7 @@ struct kvm_vcpu_sbi_context { int return_handled; + bool extension_disabled[KVM_RISCV_SBI_EXT_MAX]; }; struct kvm_vcpu_sbi_extension { @@ -36,7 +37,12 @@ void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu, struct kvm_run *run, u32 type, u64 flags); int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run); -const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext(unsigned long extid); +int kvm_riscv_vcpu_set_reg_sbi_ext(struct kvm_vcpu *vcpu, + const struct kvm_one_reg *reg); +int kvm_riscv_vcpu_get_reg_sbi_ext(struct kvm_vcpu *vcpu, + const struct kvm_one_reg *reg); +const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext( + struct kvm_vcpu *vcpu, unsigned long extid); int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run); #ifdef CONFIG_RISCV_SBI_V01 diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index 92af6f3f057c..71992ff1f9dd 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -108,6 +108,22 @@ enum KVM_RISCV_ISA_EXT_ID { KVM_RISCV_ISA_EXT_MAX, }; +/* + * SBI extension IDs specific to KVM. This is not the same as the SBI + * extension IDs defined by the RISC-V SBI specification. + */ +enum KVM_RISCV_SBI_EXT_ID { + KVM_RISCV_SBI_EXT_V01 = 0, + KVM_RISCV_SBI_EXT_TIME, + KVM_RISCV_SBI_EXT_IPI, + KVM_RISCV_SBI_EXT_RFENCE, + KVM_RISCV_SBI_EXT_SRST, + KVM_RISCV_SBI_EXT_HSM, + KVM_RISCV_SBI_EXT_EXPERIMENTAL, + KVM_RISCV_SBI_EXT_VENDOR, + KVM_RISCV_SBI_EXT_MAX, +}; + /* Possible states for kvm_riscv_timer */ #define KVM_RISCV_TIMER_STATE_OFF 0 #define KVM_RISCV_TIMER_STATE_ON 1 @@ -152,6 +168,9 @@ enum KVM_RISCV_ISA_EXT_ID { /* ISA Extension registers are mapped as type 7 */ #define KVM_REG_RISCV_ISA_EXT (0x07 << KVM_REG_RISCV_TYPE_SHIFT) +/* SBI extension registers are mapped as type 8 */ +#define KVM_REG_RISCV_SBI_EXT (0x08 << KVM_REG_RISCV_TYPE_SHIFT) + #endif #endif /* __LINUX_KVM_RISCV_H */ diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 7c08567097f0..2260adaf2de8 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -594,6 +594,8 @@ static int kvm_riscv_vcpu_set_reg(struct kvm_vcpu *vcpu, KVM_REG_RISCV_FP_D); case KVM_REG_RISCV_ISA_EXT: return kvm_riscv_vcpu_set_reg_isa_ext(vcpu, reg); + case KVM_REG_RISCV_SBI_EXT: + return kvm_riscv_vcpu_set_reg_sbi_ext(vcpu, reg); default: break; } diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c index f96991d230bf..0abb44f8f4d1 100644 --- a/arch/riscv/kvm/vcpu_sbi.c +++ b/arch/riscv/kvm/vcpu_sbi.c @@ -40,16 +40,48 @@ static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01 = { }; #endif -static const struct kvm_vcpu_sbi_extension *sbi_ext[] = { - &vcpu_sbi_ext_v01, - &vcpu_sbi_ext_base, - &vcpu_sbi_ext_time, - &vcpu_sbi_ext_ipi, - &vcpu_sbi_ext_rfence, - &vcpu_sbi_ext_srst, - &vcpu_sbi_ext_hsm, - &vcpu_sbi_ext_experimental, - &vcpu_sbi_ext_vendor, +struct kvm_riscv_sbi_extension_entry { + enum KVM_RISCV_SBI_EXT_ID dis_idx; + const struct kvm_vcpu_sbi_extension *ext_ptr; +}; + +static const struct kvm_riscv_sbi_extension_entry sbi_ext[] = { + { + .dis_idx = KVM_RISCV_SBI_EXT_V01, + .ext_ptr = &vcpu_sbi_ext_v01, + }, + { + .dis_idx = KVM_RISCV_SBI_EXT_MAX, /* Can't be disabled */ + .ext_ptr = &vcpu_sbi_ext_base, + }, + { + .dis_idx = KVM_RISCV_SBI_EXT_TIME, + .ext_ptr = &vcpu_sbi_ext_time, + }, + { + .dis_idx = KVM_RISCV_SBI_EXT_IPI, + .ext_ptr = &vcpu_sbi_ext_ipi, + }, + { + .dis_idx = KVM_RISCV_SBI_EXT_RFENCE, + .ext_ptr = &vcpu_sbi_ext_rfence, + }, + { + .dis_idx = KVM_RISCV_SBI_EXT_SRST, + .ext_ptr = &vcpu_sbi_ext_srst, + }, + { + .dis_idx = KVM_RISCV_SBI_EXT_HSM, + .ext_ptr = &vcpu_sbi_ext_hsm, + }, + { + .dis_idx = KVM_RISCV_SBI_EXT_EXPERIMENTAL, + .ext_ptr = &vcpu_sbi_ext_experimental, + }, + { + .dis_idx = KVM_RISCV_SBI_EXT_VENDOR, + .ext_ptr = &vcpu_sbi_ext_vendor, + }, }; void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run) @@ -108,14 +140,95 @@ int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run) return 0; } -const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext(unsigned long extid) +int kvm_riscv_vcpu_set_reg_sbi_ext(struct kvm_vcpu *vcpu, + const struct kvm_one_reg *reg) +{ + unsigned long __user *uaddr = + (unsigned long __user *)(unsigned long)reg->addr; + unsigned long reg_num = reg->id & ~(KVM_REG_ARCH_MASK | + KVM_REG_SIZE_MASK | + KVM_REG_RISCV_SBI_EXT); + unsigned long i, reg_val; + const struct kvm_riscv_sbi_extension_entry *sext = NULL; + struct kvm_vcpu_sbi_context *scontext = &vcpu->arch.sbi_context; + + if (KVM_REG_SIZE(reg->id) != sizeof(unsigned long)) + return -EINVAL; + + if (copy_from_user(®_val, uaddr, KVM_REG_SIZE(reg->id))) + return -EFAULT; + + if (reg_num >= KVM_RISCV_SBI_EXT_MAX || + (reg_val != 1 && reg_val != 0)) + return -EINVAL; + + if (vcpu->arch.ran_atleast_once) + return -EBUSY; + + for (i = 0; i < ARRAY_SIZE(sbi_ext); i++) { + if (sbi_ext[i].dis_idx == reg_num) { + sext = &sbi_ext[i]; + break; + } + } + if (!sext) + return -ENOENT; + + scontext->extension_disabled[sext->dis_idx] = !reg_val; + + return 0; +} + +int kvm_riscv_vcpu_get_reg_sbi_ext(struct kvm_vcpu *vcpu, + const struct kvm_one_reg *reg) +{ + unsigned long __user *uaddr = + (unsigned long __user *)(unsigned long)reg->addr; + unsigned long reg_num = reg->id & ~(KVM_REG_ARCH_MASK | + KVM_REG_SIZE_MASK | + KVM_REG_RISCV_SBI_EXT); + unsigned long i, reg_val; + const struct kvm_riscv_sbi_extension_entry *sext = NULL; + struct kvm_vcpu_sbi_context *scontext = &vcpu->arch.sbi_context; + + if (KVM_REG_SIZE(reg->id) != sizeof(unsigned long)) + return -EINVAL; + + if (reg_num >= KVM_RISCV_SBI_EXT_MAX) + return -EINVAL; + + for (i = 0; i < ARRAY_SIZE(sbi_ext); i++) { + if (sbi_ext[i].dis_idx == reg_num) { + sext = &sbi_ext[i]; + break; + } + } + if (!sext) + return -ENOENT; + + reg_val = !scontext->extension_disabled[sext->dis_idx]; + if (copy_to_user(uaddr, ®_val, KVM_REG_SIZE(reg->id))) + return -EFAULT; + + return 0; +} + +const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext( + struct kvm_vcpu *vcpu, unsigned long extid) { - int i = 0; + int i; + const struct kvm_riscv_sbi_extension_entry *sext; + struct kvm_vcpu_sbi_context *scontext = &vcpu->arch.sbi_context; for (i = 0; i < ARRAY_SIZE(sbi_ext); i++) { - if (sbi_ext[i]->extid_start <= extid && - sbi_ext[i]->extid_end >= extid) - return sbi_ext[i]; + sext = &sbi_ext[i]; + if (sext->ext_ptr->extid_start <= extid && + sext->ext_ptr->extid_end >= extid) { + if (sext->dis_idx < KVM_RISCV_SBI_EXT_MAX && + scontext->extension_disabled[sext->dis_idx]) + return NULL; + return sbi_ext[i].ext_ptr; + } } return NULL; @@ -132,7 +245,7 @@ int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run) unsigned long out_val = 0; bool ext_is_v01 = false; - sbi_ext = kvm_vcpu_sbi_find_ext(cp->a7); + sbi_ext = kvm_vcpu_sbi_find_ext(vcpu, cp->a7); if (sbi_ext && sbi_ext->handler) { #ifdef CONFIG_RISCV_SBI_V01 if (cp->a7 >= SBI_EXT_0_1_SET_TIMER && diff --git a/arch/riscv/kvm/vcpu_sbi_base.c b/arch/riscv/kvm/vcpu_sbi_base.c index 5d65c634d301..a51ed0c615bf 100644 --- a/arch/riscv/kvm/vcpu_sbi_base.c +++ b/arch/riscv/kvm/vcpu_sbi_base.c @@ -44,7 +44,7 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, kvm_riscv_vcpu_sbi_forward(vcpu, run); *exit = true; } else - *out_val = kvm_vcpu_sbi_find_ext(cp->a0) ? 1 : 0; + *out_val = kvm_vcpu_sbi_find_ext(vcpu, cp->a0) ? 1 : 0; break; case SBI_EXT_BASE_GET_MVENDORID: *out_val = vcpu->arch.mvendorid;