From patchwork Thu Jun 30 06:11:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 12901257 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DA962C433EF for ; Thu, 30 Jun 2022 06:21:24 +0000 (UTC) Received: from localhost ([::1]:40026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6nYJ-0001LS-Nv for qemu-devel@archiver.kernel.org; Thu, 30 Jun 2022 02:21:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6nPu-0002vO-OE for qemu-devel@nongnu.org; Thu, 30 Jun 2022 02:12:42 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:33329) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o6nPt-00009O-06 for qemu-devel@nongnu.org; Thu, 30 Jun 2022 02:12:42 -0400 Received: by mail-pf1-x430.google.com with SMTP id n12so17252075pfq.0 for ; Wed, 29 Jun 2022 23:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0V8kDP+oNTzrb5XC+Br+wrvMv2zDwwg3nO5BEOrf9Ew=; b=Njg9/niivwJInXC8T33mx1fSJLTEQiDZhbqMeLrs7fyX+765mS9Ixk4RreY/kEVaM1 khlwdcAoNkEj8qJT6yuajPyXFAHAO+ltLEfjL9ORbc8ftwuBx9tGcOkdCKv+YbGR/L5K mEZemQau+kiaXxv2SLQOHVxpANwdDmolcokvt666Ce+YWOcR2s+RuiNN4JBkBrxrlNKN qXENEiyjArSZa5HMipxdgOd2VmrgAPUBAeSApVcT6LmTVAqD+INWtRp6ZXa9Ovr4z6b2 sRTJPsgGwAiABCx+RMuAba35/J9hiixhh393RNJdMgrcQGakpNSCFIY/yDD8cKTvhRcX xFeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0V8kDP+oNTzrb5XC+Br+wrvMv2zDwwg3nO5BEOrf9Ew=; b=yfHgfentPsUQgq38bk8ba2tXlRYGrKuez8aqRgCaalF4iVbDFNgTrjGQ4ot3gaICcT bYWr8zMp77W+RgUr7M1ktUdScjrs/fRUwqLJ9IwQwGklEn4GiVmaP92mJ0H5ZbEOJpxS ZypnqhTqpCipNEmV85spVg/kmtM9OrYShtW/5q8I2ruARKCC0BiT6cqOXlx02djTRjzo 57ZAROulpiMPaYz5kRa5dPXEIm0Ro3drXBpz9ju4MX/oa0RcGRgAu6X51dtq8L8FO+Hh KBWpVleGot0OdEuPMrB0Wim0TfAXvPpo12JAl83wuKL9y9bMQ2rMEY/0eEKuJsYrdn1U 9MGA== X-Gm-Message-State: AJIora90zIWNkQySAw4aPjHxpx4XMAR7m1emK4qvGwXEFSuIO5QMahsV 1MXdgCnnj1IpmD5dFKfs2jR/PA== X-Google-Smtp-Source: AGRyM1tLJvWezpO1w4M1uFeAW0G7ruLA/6qcdfzWVMfBC6qxaFy6Uc8xcO25U7L9QhYFRv0HnravbA== X-Received: by 2002:a63:88c1:0:b0:40d:5305:b36b with SMTP id l184-20020a6388c1000000b0040d5305b36bmr6311213pgd.394.1656569559018; Wed, 29 Jun 2022 23:12:39 -0700 (PDT) Received: from anup-ubuntu64-vm.. ([223.226.107.19]) by smtp.gmail.com with ESMTPSA id a25-20020aa79719000000b0052551c1a413sm12647618pfg.204.2022.06.29.23.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:12:38 -0700 (PDT) From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar Cc: Atish Patra , Anup Patel , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Anup Patel Subject: [PATCH v9 0/2] QEMU RISC-V nested virtualization fixes Date: Thu, 30 Jun 2022 11:41:48 +0530 Message-Id: <20220630061150.905174-1-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=apatel@ventanamicro.com; helo=mail-pf1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This series does fixes and improvements to have nested virtualization on QEMU RISC-V. These patches can also be found in riscv_nested_fixes_v9 branch at: https://github.com/avpatel/qemu.git The RISC-V nested virtualization was tested on QEMU RISC-V using Xvisor RISC-V which has required hypervisor support to run another hypervisor as Guest/VM. Changes since v7: - Improve tinst "Addr. Offset" in PATCH3 Changes since v6: - Droppred original PATCH1 and PATCH2 since these are already merged - Added PATCH1 to revert dummy mcountinhibit CSR - Added PATCH2 to fix minimum priv spec version for mcountinhibit CSR - Fixed checkpatch error in PATCH3 - Fixed compile error in PATCH4 Changes since v5: - Correctly set "Addr. Offset" for misaligned load/store traps in PATCH3 - Use offsetof() instead of pointer in PATCH4 Changes since v4: - Updated commit description in PATCH1, PATCH2, and PATCH4 - Use "const" for local array in PATCH5 Changes since v3: - Updated PATCH3 to set special pseudoinstructions in htinst for guest page faults which result due to VS-stage page table walks - Updated warning message in PATCH4 Changes since v2: - Dropped the patch which are already in Alistair's next branch - Set "Addr. Offset" in the transformed instruction for PATCH3 - Print warning in riscv_cpu_realize() if we are disabling an extension due to privilege spec verions mismatch for PATCH4 Changes since v1: - Set write_gva to env->two_stage_lookup which ensures that for HS-mode to HS-mode trap write_gva is true only for HLV/HSV instructions - Included "[PATCH 0/3] QEMU RISC-V priv spec version fixes" patches in this series for easy review - Re-worked PATCH7 to force disable extensions if required priv spec version is not staisfied - Added new PATCH8 to fix "aia=aplic-imsic" mode of virt machine Anup Patel (2): target/riscv: Update [m|h]tinst CSR in riscv_cpu_do_interrupt() target/riscv: Force disable extensions if priv spec version does not match target/riscv/cpu.c | 150 ++++++++++++++--------- target/riscv/cpu.h | 5 + target/riscv/cpu_helper.c | 252 +++++++++++++++++++++++++++++++++++++- target/riscv/instmap.h | 45 +++++++ 4 files changed, 390 insertions(+), 62 deletions(-)