From nobody Tue May 7 00:43:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1686215681; cv=none; d=zohomail.com; s=zohoarc; b=I8mZd8GbehGz3Mi+pnDao818wnqNzFF1SozzSGNQHg0C+ooOm4J2tv/wl5A0o3xikMJT7dY4i+M6QSyE+BoX4fa7iXA5fXW35chbcqiifuz+c6CXMX5S93S5iVHa5Kg0rMnTu6xHxIooa9lC13GGo/39knzZAXLoKTFEsQN14ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686215681; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+doDSOWQ/yYEapg3XaTRgcOqrIoUXvANsMUQVhLDyMA=; b=WOXdGTWyyzj2EjyG/PvDsV7Lxy/tCyo9aP1W2wndT6AADvbTLmUeuIrM89GYQpb0wZqF9JnkY+PZFblt2RyTncH4Vgf5puFl8GAe86/9gCYJFv1LU1oTnvTtGFNdrHeziMCZ/ABIK/vRr0cTBsHTjJSRpFKQuCpwS7foYiKW0qA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686215681292813.9736312478135; Thu, 8 Jun 2023 02:14:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7BiS-0001Zh-8y; Thu, 08 Jun 2023 05:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7BiR-0001ZA-CB; Thu, 08 Jun 2023 05:13:59 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7BiP-0005Mb-RY; Thu, 08 Jun 2023 05:13:59 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-256422ad25dso185127a91.0; Thu, 08 Jun 2023 02:13:57 -0700 (PDT) Received: from wheely.local0.net (58-6-224-112.tpgi.com.au. [58.6.224.112]) by smtp.gmail.com with ESMTPSA id t11-20020a17090a5d8b00b002563e8a0225sm823577pji.48.2023.06.08.02.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 02:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686215635; x=1688807635; 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=+doDSOWQ/yYEapg3XaTRgcOqrIoUXvANsMUQVhLDyMA=; b=E/ykourkCAEi95nLoOTUFYyv4QA8zQqbW1NRrHoHMNcyADwDZlrU+onm9P5nZw8gQb /Wt3q+ZV8ubLz+VgqSdTzHeGStNv8eMM+TATdhFx3hL0rlUAYa+4rP5S0zywVfiZ3QyU RbWtSSZf9xtVeqfJrwGSICye/XrJ/zy+ARN3F6IBOnX6va9dFiV++ymi/NdBzigWxwxT pjVYS93z2TYi3EYS/EhFq0PUXVKi42i0C+DiWdrIqjQeImtT7EhF93GZnRl8e1kclUgN SbdALa9TMfhV1TXRslWeshHlcg0XmxHo9MENXCu2rxIqGNKWGfE1Zq61lSdNlo7VtHeR bQSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686215635; x=1688807635; 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=+doDSOWQ/yYEapg3XaTRgcOqrIoUXvANsMUQVhLDyMA=; b=T+Sie++UXg0UIEjs2+Lpqu3WxCvLkjsN8FXfIQsa6MSm9dpJYGXGSsl/DC4omSlX9/ bKYeh7N8BEWDeiUCZOajiWFtMkJkDes8CWRJhKk3nCf8n9jnlJ/bPwfVhdAnn4OxmiX3 LmOz18L8w+UCxMF2+AlF5NEYNKDO69y/6vxzc0hmNOHgdgjYvorltj3FE0FMixFLfhV3 siVKiyxL+j6sKAChG8QNdxvkIUOHEKKURm/BeiKpUhNdEN49LwEYw/7slhFeqLc0nUTI JQvZNv24Cd6VRiOeYcS9xgXRUg63clfyfYopzNC6gjfm52DHPO+quWykdnx3q1M+CcPr QfKg== X-Gm-Message-State: AC+VfDz1ovAnnZQ86+g58g76awgPsINxQRMw2x766+/ONt91SmtvqJDR juFwBsyxpgNKhhBmD0XEMPWyqW+lUAk= X-Google-Smtp-Source: ACHHUZ4CXZ7/zWCEIICrCTMBKFXV/ScMNrEhNG6Bcpdww6v61pVqTQ90FF4xEmV9gCkDuCOrCFacWQ== X-Received: by 2002:a17:90a:bb91:b0:256:5637:2b30 with SMTP id v17-20020a17090abb9100b0025656372b30mr3296002pjr.40.1686215635531; Thu, 08 Jun 2023 02:13:55 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Harsh Prateek Bora , Daniel Henrique Barboza Subject: [PATCH 1/4] ppc/spapr: H_ENTER_NESTED should restore host XER ca field Date: Thu, 8 Jun 2023 19:13:41 +1000 Message-Id: <20230608091344.88685-2-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608091344.88685-1-npiggin@gmail.com> References: <20230608091344.88685-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=npiggin@gmail.com; helo=mail-pj1-x102a.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, FREEMAIL_FROM=0.001, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1686215683496100003 Content-Type: text/plain; charset="utf-8" Fix missing env->ca restore when going from L2 back to the host. Fixes: 120f738a467 ("spapr: implement nested-hv capability for the virtual = hypervisor") Reviewed-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_hcall.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index b904755575..0582b524d1 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1773,6 +1773,7 @@ out_restore_l1: env->cfar =3D spapr_cpu->nested_host_state->cfar; env->xer =3D spapr_cpu->nested_host_state->xer; env->so =3D spapr_cpu->nested_host_state->so; + env->ca =3D spapr_cpu->nested_host_state->ca; env->ov =3D spapr_cpu->nested_host_state->ov; env->ov32 =3D spapr_cpu->nested_host_state->ov32; env->ca32 =3D spapr_cpu->nested_host_state->ca32; --=20 2.40.1 From nobody Tue May 7 00:43:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1686215713; cv=none; d=zohomail.com; s=zohoarc; b=aiwGoLV8Y2hE+cBTGix/TeGBNhATJIezk6oYg3ixgeyN8HxFrR9vqE/u8mTFVPh4H1Iufzy79jdqUFoCuqvF2dhecNnwmsmbNXFIakJXsrmvKkHriiX3NKsHqJiJuivOSS7yx/g3MTxYC4uU9DWNEDmQZzdo2nSQheOnIfIn/8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686215713; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pmN3cFMVWbvkqRrXvnAfhQ/wP7K2BbiCBZ4lOxt9qQc=; b=iAJ8jejE5a7Fzsv2D+NxHtabo57G7qYgWVY2RrJt4v4XUvNFz+UQbIH/vy2Kz87N0BYn9FtG1cMp7VmuJlT67qKmxcDVz9fwg8wXzxSjCt3xYfODuJiTEfUY2L0RkH75QryVs1GAZIB1xZ4X1cE3o5T4G5HBAREWAqInUPBdFoo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686215713365756.6658588959277; Thu, 8 Jun 2023 02:15:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7BiW-0001ae-13; Thu, 08 Jun 2023 05:14:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7BiU-0001aG-M1; Thu, 08 Jun 2023 05:14:02 -0400 Received: from mail-oi1-x231.google.com ([2607:f8b0:4864:20::231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7BiS-0005Og-OM; Thu, 08 Jun 2023 05:14:02 -0400 Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-39a55e5cfc0so303438b6e.3; Thu, 08 Jun 2023 02:14:00 -0700 (PDT) Received: from wheely.local0.net (58-6-224-112.tpgi.com.au. [58.6.224.112]) by smtp.gmail.com with ESMTPSA id t11-20020a17090a5d8b00b002563e8a0225sm823577pji.48.2023.06.08.02.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 02:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686215639; x=1688807639; 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=pmN3cFMVWbvkqRrXvnAfhQ/wP7K2BbiCBZ4lOxt9qQc=; b=Ds/eW7Eu29nlmKkpmjYwozbFgxgTd4raAdMZll7OV+WeAtWEd1QUdRmRvsYZGL0ZUW uoXieVxzzU/IN+16AaLfNuqj5NAXFnrTU2mJC5xUJwuMuIKqLbQoZrf84JQ+7fIchJzZ 1aSiMXjovWMLzdy7Xi7REjTmTl1vrU7UWxGLY7j7TVld4ViwMOFWy7anRZK4PRJXlzj5 lH1byCyoWo5RSp6S8YkSjKLu37B/qSjtb37HIsWL+fA3H+YRfrgGkB4AmjegPgUaESZl puu2dEDlOfZGk1PqPTOl1/ETUCP0ahFIEX/dY6TVb03OK0eZb4Qntepr38YPWDVYw57Z 81Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686215639; x=1688807639; 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=pmN3cFMVWbvkqRrXvnAfhQ/wP7K2BbiCBZ4lOxt9qQc=; b=aPVpHO+lqhJCGGgpHx7V8uLPyerRY+eue3t2iK5LSt8cyN6vKQX4kf38hnbFRu5E2G RcqSc3rUkm/G4+QeHT22mFqo2So29QcfsmOnXyGRYXmtRPjl9Y7ri3zseN4HK3Uy7OdO T46iOCwYUEdo9uPVQaxS8ry7GS76hrERuTmhCmUR+7WjRk/I/kcwnPgdpd8WbztT6cID Ni7jrf0wRjBVY7bZf5YG5Pj+G4ZaZC4y/ozGNBNACmzx0W7Ft6ISP3VcknVhX15/yZGA ZntIyFo2krxCGkdTybl+Hf7reThmi0f1EOSa+D5h8HwvQ7UMELXbi79gB/Wov/4jPEz1 VwkA== X-Gm-Message-State: AC+VfDxcGz1xmkn15I+PP4Y5v1KuBpS5N+x+OsIVxr4Vaq1okBPD3mBr AXeL4WzOvl5jaCEi5L90pHjaNr1kPtg= X-Google-Smtp-Source: ACHHUZ7tBURINGX3Pw4ejyhYaVSQd9wpzcbtWXSFGTdkb5IuHvjtWxSOuDg04Tv5kLuxg4z5tpZoRQ== X-Received: by 2002:aca:1c10:0:b0:39c:76ec:9ba8 with SMTP id c16-20020aca1c10000000b0039c76ec9ba8mr2442088oic.44.1686215638953; Thu, 08 Jun 2023 02:13:58 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Harsh Prateek Bora , Daniel Henrique Barboza Subject: [PATCH 2/4] ppc/spapr: Add a nested state struct Date: Thu, 8 Jun 2023 19:13:42 +1000 Message-Id: <20230608091344.88685-3-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608091344.88685-1-npiggin@gmail.com> References: <20230608091344.88685-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::231; envelope-from=npiggin@gmail.com; helo=mail-oi1-x231.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, FREEMAIL_FROM=0.001, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1686215715520100005 Content-Type: text/plain; charset="utf-8" Rather than use a copy of CPUPPCState to store the host state while the environment has been switched to the L2, use a new struct for this purpose. Have helper functions to save and load this host state. Signed-off-by: Nicholas Piggin Reviewed-by: Harsh Prateek Bora --- hw/ppc/spapr_hcall.c | 150 ++++++++++++++++++++++++-------- include/hw/ppc/spapr_cpu_core.h | 5 +- 2 files changed, 115 insertions(+), 40 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 0582b524d1..d5b8d54692 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1546,6 +1546,112 @@ static target_ulong h_copy_tofrom_guest(PowerPCCPU = *cpu, return H_FUNCTION; } =20 +struct nested_ppc_state { + uint64_t gpr[32]; + uint64_t lr; + uint64_t ctr; + uint64_t cfar; + uint64_t msr; + uint64_t nip; + uint32_t cr; + + uint64_t xer; + + uint64_t lpcr; + uint64_t lpidr; + uint64_t pidr; + uint64_t pcr; + uint64_t dpdes; + uint64_t hfscr; + uint64_t srr0; + uint64_t srr1; + uint64_t sprg0; + uint64_t sprg1; + uint64_t sprg2; + uint64_t sprg3; + uint64_t ppr; + + int64_t tb_offset; +}; + +static void nested_save_state(struct nested_ppc_state *save, PowerPCCPU *c= pu) +{ + CPUPPCState *env =3D &cpu->env; + + memcpy(save->gpr, env->gpr, sizeof(save->gpr)); + + save->lr =3D env->lr; + save->ctr =3D env->ctr; + save->cfar =3D env->cfar; + save->msr =3D env->msr; + save->nip =3D env->nip; + + save->cr =3D ppc_get_cr(env); + save->xer =3D cpu_read_xer(env); + + save->lpcr =3D env->spr[SPR_LPCR]; + save->lpidr =3D env->spr[SPR_LPIDR]; + save->pcr =3D env->spr[SPR_PCR]; + save->dpdes =3D env->spr[SPR_DPDES]; + save->hfscr =3D env->spr[SPR_HFSCR]; + save->srr0 =3D env->spr[SPR_SRR0]; + save->srr1 =3D env->spr[SPR_SRR1]; + save->sprg0 =3D env->spr[SPR_SPRG0]; + save->sprg1 =3D env->spr[SPR_SPRG1]; + save->sprg2 =3D env->spr[SPR_SPRG2]; + save->sprg3 =3D env->spr[SPR_SPRG3]; + save->pidr =3D env->spr[SPR_BOOKS_PID]; + save->ppr =3D env->spr[SPR_PPR]; + + save->tb_offset =3D env->tb_env->tb_offset; +} + +static void nested_load_state(PowerPCCPU *cpu, struct nested_ppc_state *lo= ad) +{ + CPUState *cs =3D CPU(cpu); + CPUPPCState *env =3D &cpu->env; + + memcpy(env->gpr, load->gpr, sizeof(env->gpr)); + + env->lr =3D load->lr; + env->ctr =3D load->ctr; + env->cfar =3D load->cfar; + env->msr =3D load->msr; + env->nip =3D load->nip; + + ppc_set_cr(env, load->cr); + cpu_write_xer(env, load->xer); + + env->spr[SPR_LPCR] =3D load->lpcr; + env->spr[SPR_LPIDR] =3D load->lpidr; + env->spr[SPR_PCR] =3D load->pcr; + env->spr[SPR_DPDES] =3D load->dpdes; + env->spr[SPR_HFSCR] =3D load->hfscr; + env->spr[SPR_SRR0] =3D load->srr0; + env->spr[SPR_SRR1] =3D load->srr1; + env->spr[SPR_SPRG0] =3D load->sprg0; + env->spr[SPR_SPRG1] =3D load->sprg1; + env->spr[SPR_SPRG2] =3D load->sprg2; + env->spr[SPR_SPRG3] =3D load->sprg3; + env->spr[SPR_BOOKS_PID] =3D load->pidr; + env->spr[SPR_PPR] =3D load->ppr; + + env->tb_env->tb_offset =3D load->tb_offset; + + /* + * MSR updated, compute hflags and possible interrupts. + */ + hreg_compute_hflags(env); + ppc_maybe_interrupt(env); + + /* + * Nested HV does not tag TLB entries between L1 and L2, so must + * flush on transition. + */ + tlb_flush(cs); + env->reserve_addr =3D -1; /* Reset the reservation */ +} + /* * When this handler returns, the environment is switched to the L2 guest * and TCG begins running that. spapr_exit_nested() performs the switch fr= om @@ -1593,12 +1699,14 @@ static target_ulong h_enter_nested(PowerPCCPU *cpu, return H_PARAMETER; } =20 - spapr_cpu->nested_host_state =3D g_try_new(CPUPPCState, 1); + spapr_cpu->nested_host_state =3D g_try_new(struct nested_ppc_state, 1); if (!spapr_cpu->nested_host_state) { return H_NO_MEM; } =20 - memcpy(spapr_cpu->nested_host_state, env, sizeof(CPUPPCState)); + assert(env->spr[SPR_LPIDR] =3D=3D 0); + assert(env->spr[SPR_DPDES] =3D=3D 0); + nested_save_state(spapr_cpu->nested_host_state, cpu); =20 len =3D sizeof(*regs); regs =3D address_space_map(CPU(cpu)->as, regs_ptr, &len, false, @@ -1639,7 +1747,6 @@ static target_ulong h_enter_nested(PowerPCCPU *cpu, env->spr[SPR_DPDES] =3D hv_state.dpdes; env->spr[SPR_HFSCR] =3D hv_state.hfscr; hdec =3D hv_state.hdec_expiry - now; - spapr_cpu->nested_tb_offset =3D hv_state.tb_offset; /* TCG does not implement DAWR*, CIABR, PURR, SPURR, IC, VTB, HEIR SPR= s*/ env->spr[SPR_SRR0] =3D hv_state.srr0; env->spr[SPR_SRR1] =3D hv_state.srr1; @@ -1665,7 +1772,7 @@ static target_ulong h_enter_nested(PowerPCCPU *cpu, * and it's not obviously worth a new data structure to do it. */ =20 - env->tb_env->tb_offset +=3D spapr_cpu->nested_tb_offset; + env->tb_env->tb_offset +=3D hv_state.tb_offset; spapr_cpu->in_nested =3D true; =20 hreg_compute_hflags(env); @@ -1684,7 +1791,6 @@ static target_ulong h_enter_nested(PowerPCCPU *cpu, =20 void spapr_exit_nested(PowerPCCPU *cpu, int excp) { - CPUState *cs =3D CPU(cpu); CPUPPCState *env =3D &cpu->env; SpaprCpuState *spapr_cpu =3D spapr_cpu_state(cpu); target_ulong r3_return =3D env->excp_vectors[excp]; /* hcall return va= lue */ @@ -1766,34 +1872,8 @@ void spapr_exit_nested(PowerPCCPU *cpu, int excp) address_space_unmap(CPU(cpu)->as, regs, len, len, true); =20 out_restore_l1: - memcpy(env->gpr, spapr_cpu->nested_host_state->gpr, sizeof(env->gpr)); - env->lr =3D spapr_cpu->nested_host_state->lr; - env->ctr =3D spapr_cpu->nested_host_state->ctr; - memcpy(env->crf, spapr_cpu->nested_host_state->crf, sizeof(env->crf)); - env->cfar =3D spapr_cpu->nested_host_state->cfar; - env->xer =3D spapr_cpu->nested_host_state->xer; - env->so =3D spapr_cpu->nested_host_state->so; - env->ca =3D spapr_cpu->nested_host_state->ca; - env->ov =3D spapr_cpu->nested_host_state->ov; - env->ov32 =3D spapr_cpu->nested_host_state->ov32; - env->ca32 =3D spapr_cpu->nested_host_state->ca32; - env->msr =3D spapr_cpu->nested_host_state->msr; - env->nip =3D spapr_cpu->nested_host_state->nip; - assert(env->spr[SPR_LPIDR] !=3D 0); - env->spr[SPR_LPCR] =3D spapr_cpu->nested_host_state->spr[SPR_LPCR]; - env->spr[SPR_LPIDR] =3D spapr_cpu->nested_host_state->spr[SPR_LPIDR]; - env->spr[SPR_PCR] =3D spapr_cpu->nested_host_state->spr[SPR_PCR]; - env->spr[SPR_DPDES] =3D 0; - env->spr[SPR_HFSCR] =3D spapr_cpu->nested_host_state->spr[SPR_HFSCR]; - env->spr[SPR_SRR0] =3D spapr_cpu->nested_host_state->spr[SPR_SRR0]; - env->spr[SPR_SRR1] =3D spapr_cpu->nested_host_state->spr[SPR_SRR1]; - env->spr[SPR_SPRG0] =3D spapr_cpu->nested_host_state->spr[SPR_SPRG0]; - env->spr[SPR_SPRG1] =3D spapr_cpu->nested_host_state->spr[SPR_SPRG1]; - env->spr[SPR_SPRG2] =3D spapr_cpu->nested_host_state->spr[SPR_SPRG2]; - env->spr[SPR_SPRG3] =3D spapr_cpu->nested_host_state->spr[SPR_SPRG3]; - env->spr[SPR_BOOKS_PID] =3D spapr_cpu->nested_host_state->spr[SPR_BOOK= S_PID]; - env->spr[SPR_PPR] =3D spapr_cpu->nested_host_state->spr[SPR_PPR]; + nested_load_state(cpu, spapr_cpu->nested_host_state); =20 /* * Return the interrupt vector address from H_ENTER_NESTED to the L1 @@ -1801,14 +1881,8 @@ out_restore_l1: */ env->gpr[3] =3D r3_return; =20 - env->tb_env->tb_offset -=3D spapr_cpu->nested_tb_offset; spapr_cpu->in_nested =3D false; =20 - hreg_compute_hflags(env); - ppc_maybe_interrupt(env); - tlb_flush(cs); - env->reserve_addr =3D -1; /* Reset the reservation */ - g_free(spapr_cpu->nested_host_state); spapr_cpu->nested_host_state =3D NULL; } diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_cor= e.h index b560514560..69a52e39b8 100644 --- a/include/hw/ppc/spapr_cpu_core.h +++ b/include/hw/ppc/spapr_cpu_core.h @@ -41,6 +41,8 @@ void spapr_cpu_set_entry_state(PowerPCCPU *cpu, target_ul= ong nip, target_ulong r1, target_ulong r3, target_ulong r4); =20 +struct nested_ppc_state; + typedef struct SpaprCpuState { uint64_t vpa_addr; uint64_t slb_shadow_addr, slb_shadow_size; @@ -51,8 +53,7 @@ typedef struct SpaprCpuState { =20 /* Fields for nested-HV support */ bool in_nested; /* true while the L2 is executing */ - CPUPPCState *nested_host_state; /* holds the L1 state while L2 execute= s */ - int64_t nested_tb_offset; /* L1->L2 TB offset */ + struct nested_ppc_state *nested_host_state; /* holds the L1 state whil= e L2 executes */ } SpaprCpuState; =20 static inline SpaprCpuState *spapr_cpu_state(PowerPCCPU *cpu) --=20 2.40.1 From nobody Tue May 7 00:43:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1686215693; cv=none; d=zohomail.com; s=zohoarc; b=k5boLtFPJcQIN/cIosoUnIfE7WRMWUnJ8Yib32Of7DOuJalh1uQY3QXB7t3dv/mfBL6KqYd9ICoEgj3We23zINChbqx8Qy+zN3tqApRRJFLVrVRq7nW0VlBpuZ3Zc7nvP4Hz2KeR4QgCSX5bWuIxfkx0pfgB31IAwrSxSVOxqEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686215693; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pBKlsQGmNESnd5f161f21LEW1NdURDBamigTOA8If0E=; b=c4b5FyLwyqkx+DKckfBe7mDb+MsUah08kH0hABJhW7wMspjZNEE9U8jZhphO4fCNfDoxusVj4TukUykYoO0OM3lFNCMWoMoQmrG8VJnsHwGEnXTfsLk/FLnPWp+YuOMJPkVmVyTmKYONwD5MaqDE7ipUoSedu/Ryp0wkZ9q8L04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686215693601214.4748661689531; Thu, 8 Jun 2023 02:14:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7Bib-0001d8-LO; Thu, 08 Jun 2023 05:14:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7BiZ-0001cR-U0; Thu, 08 Jun 2023 05:14:07 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7BiX-0005Py-RK; Thu, 08 Jun 2023 05:14:07 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-256e1d87998so278523a91.3; Thu, 08 Jun 2023 02:14:04 -0700 (PDT) Received: from wheely.local0.net (58-6-224-112.tpgi.com.au. [58.6.224.112]) by smtp.gmail.com with ESMTPSA id t11-20020a17090a5d8b00b002563e8a0225sm823577pji.48.2023.06.08.02.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 02:14:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686215643; x=1688807643; 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=pBKlsQGmNESnd5f161f21LEW1NdURDBamigTOA8If0E=; b=TOKbn9cZuzNCQDxTx+8yN06W6g61S9BezTlxJ8z68mXexsxXyXUSvxNzUdST1nA2tA 90Wlvm0fnmGxy9un5063s2/YpoGj0yoE6HNTiuW1HSF/jMTd23bUjcJN6DLKpsLgIXX8 kOP9F130x3suqouRLizyA91NMaxVEhkQ/eXyOSVifwJr25MeVFN/1wGvxduD0ofaZGy0 EnHcSKwmVHlnaEWapsg4xCVXsKwA6wmQfIiy36Tv2KB5AGgsx5GAQBdswEfujjpkSaIR x8ELV9IsQ0kSnHPn9ai4RwfRDDtse9IgJIGvOI30POZgTTxoZvyhZDflt3T90g3UIxeP TZjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686215643; x=1688807643; 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=pBKlsQGmNESnd5f161f21LEW1NdURDBamigTOA8If0E=; b=cY+bFXS/w1IWqoxgQVqewUmbu8FkoyUmOHcB7jtqnAsO7+4rgSRPbr2BnyqiSKvSyq /9ok2pifbuBr6Q/hx7LMI9FZ9ur6/VnNFrECaAuwJ1ODeDYVn0sCvozgaierc+Dgay18 Ro+a/HucbuOK8b3+DBAg3ziaIBjIngkg3V4f4If0ZncAZRm/TDzfzxrHKdK1rq712xSY iOnBFmHzQpmJ2eaCl1fdwhzlXFyu5X/b9ezIofFmAXNk2262yqHP5a2TZiNtlu2SEaAI tWOYGpcDP+jWJa+j+erTtczzGa8KNezWSDX7iJqgxLZYrOTEoAzsYZ8P9nl92iUQ9KS/ ag9A== X-Gm-Message-State: AC+VfDyO8uhCVDnktUvsafMQKH+l9osonXg63aDVVOrfBo0gQDpS7+W7 QchcvloXYFHEArReCnV0IZSaVR0kHuM= X-Google-Smtp-Source: ACHHUZ6JFQFYup/36qyuVi2TVdi2CuvytzF8nMrkRiarvAAotZPZTbLggEKcMtUOKM+ML5Ac3hsTIA== X-Received: by 2002:a17:90b:110e:b0:258:b43d:bdcc with SMTP id gi14-20020a17090b110e00b00258b43dbdccmr7255104pjb.8.1686215642525; Thu, 08 Jun 2023 02:14:02 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Harsh Prateek Bora , Daniel Henrique Barboza Subject: [PATCH 3/4] ppc/spapr: load and store l2 state with helper functions Date: Thu, 8 Jun 2023 19:13:43 +1000 Message-Id: <20230608091344.88685-4-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608091344.88685-1-npiggin@gmail.com> References: <20230608091344.88685-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=npiggin@gmail.com; helo=mail-pj1-x102f.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, FREEMAIL_FROM=0.001, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1686215695551100003 Content-Type: text/plain; charset="utf-8" Arguably this is just shuffling around register accesses, but one nice thing it does is allow the exit to save away the L2 state then switch the environment to the L1 before copying L2 data back to the L1, which logically flows more naturally and simplifies the error paths. Signed-off-by: Nicholas Piggin Reviewed-by: Harsh Prateek Bora --- hw/ppc/spapr_hcall.c | 164 ++++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 79 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index d5b8d54692..da6440f235 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1663,9 +1663,9 @@ static target_ulong h_enter_nested(PowerPCCPU *cpu, target_ulong *args) { PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); - CPUState *cs =3D CPU(cpu); CPUPPCState *env =3D &cpu->env; SpaprCpuState *spapr_cpu =3D spapr_cpu_state(cpu); + struct nested_ppc_state l2_state; target_ulong hv_ptr =3D args[0]; target_ulong regs_ptr =3D args[1]; target_ulong hdec, now =3D cpu_ppc_load_tbl(env); @@ -1699,6 +1699,10 @@ static target_ulong h_enter_nested(PowerPCCPU *cpu, return H_PARAMETER; } =20 + if (hv_state.lpid =3D=3D 0) { + return H_PARAMETER; + } + spapr_cpu->nested_host_state =3D g_try_new(struct nested_ppc_state, 1); if (!spapr_cpu->nested_host_state) { return H_NO_MEM; @@ -1717,46 +1721,49 @@ static target_ulong h_enter_nested(PowerPCCPU *cpu, return H_P2; } =20 - len =3D sizeof(env->gpr); + len =3D sizeof(l2_state.gpr); assert(len =3D=3D sizeof(regs->gpr)); - memcpy(env->gpr, regs->gpr, len); + memcpy(l2_state.gpr, regs->gpr, len); =20 - env->lr =3D regs->link; - env->ctr =3D regs->ctr; - cpu_write_xer(env, regs->xer); - ppc_set_cr(env, regs->ccr); - - env->msr =3D regs->msr; - env->nip =3D regs->nip; + l2_state.lr =3D regs->link; + l2_state.ctr =3D regs->ctr; + l2_state.xer =3D regs->xer; + l2_state.cr =3D regs->ccr; + l2_state.msr =3D regs->msr; + l2_state.nip =3D regs->nip; =20 address_space_unmap(CPU(cpu)->as, regs, len, len, false); =20 - env->cfar =3D hv_state.cfar; - - assert(env->spr[SPR_LPIDR] =3D=3D 0); - env->spr[SPR_LPIDR] =3D hv_state.lpid; + l2_state.cfar =3D hv_state.cfar; + l2_state.lpidr =3D hv_state.lpid; =20 lpcr_mask =3D LPCR_DPFD | LPCR_ILE | LPCR_AIL | LPCR_LD | LPCR_MER; lpcr =3D (env->spr[SPR_LPCR] & ~lpcr_mask) | (hv_state.lpcr & lpcr_mas= k); lpcr |=3D LPCR_HR | LPCR_UPRT | LPCR_GTSE | LPCR_HVICE | LPCR_HDICE; lpcr &=3D ~LPCR_LPES0; - env->spr[SPR_LPCR] =3D lpcr & pcc->lpcr_mask; + l2_state.lpcr =3D lpcr & pcc->lpcr_mask; =20 - env->spr[SPR_PCR] =3D hv_state.pcr; + l2_state.pcr =3D hv_state.pcr; /* hv_state.amor is not used */ - env->spr[SPR_DPDES] =3D hv_state.dpdes; - env->spr[SPR_HFSCR] =3D hv_state.hfscr; - hdec =3D hv_state.hdec_expiry - now; + l2_state.dpdes =3D hv_state.dpdes; + l2_state.hfscr =3D hv_state.hfscr; /* TCG does not implement DAWR*, CIABR, PURR, SPURR, IC, VTB, HEIR SPR= s*/ - env->spr[SPR_SRR0] =3D hv_state.srr0; - env->spr[SPR_SRR1] =3D hv_state.srr1; - env->spr[SPR_SPRG0] =3D hv_state.sprg[0]; - env->spr[SPR_SPRG1] =3D hv_state.sprg[1]; - env->spr[SPR_SPRG2] =3D hv_state.sprg[2]; - env->spr[SPR_SPRG3] =3D hv_state.sprg[3]; - env->spr[SPR_BOOKS_PID] =3D hv_state.pidr; - env->spr[SPR_PPR] =3D hv_state.ppr; + l2_state.srr0 =3D hv_state.srr0; + l2_state.srr1 =3D hv_state.srr1; + l2_state.sprg0 =3D hv_state.sprg[0]; + l2_state.sprg1 =3D hv_state.sprg[1]; + l2_state.sprg2 =3D hv_state.sprg[2]; + l2_state.sprg3 =3D hv_state.sprg[3]; + l2_state.pidr =3D hv_state.pidr; + l2_state.ppr =3D hv_state.ppr; + l2_state.tb_offset =3D env->tb_env->tb_offset + hv_state.tb_offset; + + /* + * Switch to the nested guest environment and start the "hdec" timer. + */ + nested_load_state(cpu, &l2_state); =20 + hdec =3D hv_state.hdec_expiry - now; cpu_ppc_hdecr_init(env); cpu_ppc_store_hdecr(env, hdec); =20 @@ -1772,14 +1779,8 @@ static target_ulong h_enter_nested(PowerPCCPU *cpu, * and it's not obviously worth a new data structure to do it. */ =20 - env->tb_env->tb_offset +=3D hv_state.tb_offset; spapr_cpu->in_nested =3D true; =20 - hreg_compute_hflags(env); - ppc_maybe_interrupt(env); - tlb_flush(cs); - env->reserve_addr =3D -1; /* Reset the reservation */ - /* * The spapr hcall helper sets env->gpr[3] to the return value, but at * this point the L1 is not returning from the hcall but rather we @@ -1793,49 +1794,69 @@ void spapr_exit_nested(PowerPCCPU *cpu, int excp) { CPUPPCState *env =3D &cpu->env; SpaprCpuState *spapr_cpu =3D spapr_cpu_state(cpu); - target_ulong r3_return =3D env->excp_vectors[excp]; /* hcall return va= lue */ + struct nested_ppc_state l2_state; target_ulong hv_ptr =3D spapr_cpu->nested_host_state->gpr[4]; target_ulong regs_ptr =3D spapr_cpu->nested_host_state->gpr[5]; + target_ulong hsrr0, hsrr1, hdar, asdr, hdsisr; struct kvmppc_hv_guest_state *hvstate; struct kvmppc_pt_regs *regs; hwaddr len; =20 assert(spapr_cpu->in_nested); =20 + nested_save_state(&l2_state, cpu); + hsrr0 =3D env->spr[SPR_HSRR0]; + hsrr1 =3D env->spr[SPR_HSRR1]; + hdar =3D env->spr[SPR_HDAR]; + hdsisr =3D env->spr[SPR_HDSISR]; + asdr =3D env->spr[SPR_ASDR]; + + /* + * Switch back to the host environment (including for any error). + */ + assert(env->spr[SPR_LPIDR] !=3D 0); + nested_load_state(cpu, spapr_cpu->nested_host_state); + env->gpr[3] =3D env->excp_vectors[excp]; /* hcall return value */ + cpu_ppc_hdecr_exit(env); =20 + spapr_cpu->in_nested =3D false; + + g_free(spapr_cpu->nested_host_state); + spapr_cpu->nested_host_state =3D NULL; + len =3D sizeof(*hvstate); hvstate =3D address_space_map(CPU(cpu)->as, hv_ptr, &len, true, MEMTXATTRS_UNSPECIFIED); if (len !=3D sizeof(*hvstate)) { address_space_unmap(CPU(cpu)->as, hvstate, len, 0, true); - r3_return =3D H_PARAMETER; - goto out_restore_l1; + env->gpr[3] =3D H_PARAMETER; + return; } =20 - hvstate->cfar =3D env->cfar; - hvstate->lpcr =3D env->spr[SPR_LPCR]; - hvstate->pcr =3D env->spr[SPR_PCR]; - hvstate->dpdes =3D env->spr[SPR_DPDES]; - hvstate->hfscr =3D env->spr[SPR_HFSCR]; + hvstate->cfar =3D l2_state.cfar; + hvstate->lpcr =3D l2_state.lpcr; + hvstate->pcr =3D l2_state.pcr; + hvstate->dpdes =3D l2_state.dpdes; + hvstate->hfscr =3D l2_state.hfscr; =20 if (excp =3D=3D POWERPC_EXCP_HDSI) { - hvstate->hdar =3D env->spr[SPR_HDAR]; - hvstate->hdsisr =3D env->spr[SPR_HDSISR]; - hvstate->asdr =3D env->spr[SPR_ASDR]; + hvstate->hdar =3D hdar; + hvstate->hdsisr =3D hdsisr; + hvstate->asdr =3D asdr; } else if (excp =3D=3D POWERPC_EXCP_HISI) { - hvstate->asdr =3D env->spr[SPR_ASDR]; + hvstate->asdr =3D asdr; } =20 /* HEIR should be implemented for HV mode and saved here. */ - hvstate->srr0 =3D env->spr[SPR_SRR0]; - hvstate->srr1 =3D env->spr[SPR_SRR1]; - hvstate->sprg[0] =3D env->spr[SPR_SPRG0]; - hvstate->sprg[1] =3D env->spr[SPR_SPRG1]; - hvstate->sprg[2] =3D env->spr[SPR_SPRG2]; - hvstate->sprg[3] =3D env->spr[SPR_SPRG3]; - hvstate->pidr =3D env->spr[SPR_BOOKS_PID]; - hvstate->ppr =3D env->spr[SPR_PPR]; + hvstate->srr0 =3D l2_state.srr0; + hvstate->srr1 =3D l2_state.srr1; + hvstate->sprg[0] =3D l2_state.sprg0; + hvstate->sprg[1] =3D l2_state.sprg1; + hvstate->sprg[2] =3D l2_state.sprg2; + hvstate->sprg[3] =3D l2_state.sprg3; + hvstate->pidr =3D l2_state.pidr; + hvstate->ppr =3D l2_state.ppr; =20 /* Is it okay to specify write length larger than actual data written?= */ address_space_unmap(CPU(cpu)->as, hvstate, len, len, true); @@ -1845,46 +1866,31 @@ void spapr_exit_nested(PowerPCCPU *cpu, int excp) MEMTXATTRS_UNSPECIFIED); if (!regs || len !=3D sizeof(*regs)) { address_space_unmap(CPU(cpu)->as, regs, len, 0, true); - r3_return =3D H_P2; - goto out_restore_l1; + env->gpr[3] =3D H_P2; + return; } =20 len =3D sizeof(env->gpr); assert(len =3D=3D sizeof(regs->gpr)); - memcpy(regs->gpr, env->gpr, len); + memcpy(regs->gpr, l2_state.gpr, len); =20 - regs->link =3D env->lr; - regs->ctr =3D env->ctr; - regs->xer =3D cpu_read_xer(env); - regs->ccr =3D ppc_get_cr(env); + regs->link =3D l2_state.lr; + regs->ctr =3D l2_state.ctr; + regs->xer =3D l2_state.xer; + regs->ccr =3D l2_state.cr; =20 if (excp =3D=3D POWERPC_EXCP_MCHECK || excp =3D=3D POWERPC_EXCP_RESET || excp =3D=3D POWERPC_EXCP_SYSCALL) { - regs->nip =3D env->spr[SPR_SRR0]; - regs->msr =3D env->spr[SPR_SRR1] & env->msr_mask; + regs->nip =3D l2_state.srr0; + regs->msr =3D l2_state.srr1 & env->msr_mask; } else { - regs->nip =3D env->spr[SPR_HSRR0]; - regs->msr =3D env->spr[SPR_HSRR1] & env->msr_mask; + regs->nip =3D hsrr0; + regs->msr =3D hsrr1 & env->msr_mask; } =20 /* Is it okay to specify write length larger than actual data written?= */ address_space_unmap(CPU(cpu)->as, regs, len, len, true); - -out_restore_l1: - assert(env->spr[SPR_LPIDR] !=3D 0); - nested_load_state(cpu, spapr_cpu->nested_host_state); - - /* - * Return the interrupt vector address from H_ENTER_NESTED to the L1 - * (or error code). - */ - env->gpr[3] =3D r3_return; - - spapr_cpu->in_nested =3D false; - - g_free(spapr_cpu->nested_host_state); - spapr_cpu->nested_host_state =3D NULL; } =20 static void hypercall_register_nested(void) --=20 2.40.1 From nobody Tue May 7 00:43:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1686215712; cv=none; d=zohomail.com; s=zohoarc; b=GJKBTaE07woWrBg01fDMVj43rojO3Mxh4Kh//PPeRIiW5hz9HYSpFv0666OftrJSnYN6nev7DI24BwAWrFmN7jkj5oEArO2QnpT77lEhGE6Qyr1eXhWPGp3zqcb1fkWb6Bioz+4WKKJsCv7oqJ0Y4qAE8Y0GwUwa3T8QUKCTUyM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686215712; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l0JpJs7+hTqlJ/9g6nrrm7Yh9xa0lcWgLvMRTOUKvcg=; b=iYzXRTy2ae/SIqJ/c++TB/G3Td5MBsxG0zmessEq9B+ctYvZjocS9nXlN95/6ZGegtwkz3lHk6ei8d3sXcGlSloaiCZ2zONPHuGq1jinKYboa/Tzxm0iR4U3tbSm0lA0xmpvvEK5D14UdyLQkA6LnYOARFdOnDiYgq0fGeF2ivQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686215712254547.3054633840851; Thu, 8 Jun 2023 02:15:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7Bih-0001e0-1q; Thu, 08 Jun 2023 05:14:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7Bie-0001dL-Hg; Thu, 08 Jun 2023 05:14:12 -0400 Received: from mail-oi1-x231.google.com ([2607:f8b0:4864:20::231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7Bib-0005R1-BO; Thu, 08 Jun 2023 05:14:12 -0400 Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-38c35975545so299951b6e.1; Thu, 08 Jun 2023 02:14:08 -0700 (PDT) Received: from wheely.local0.net (58-6-224-112.tpgi.com.au. [58.6.224.112]) by smtp.gmail.com with ESMTPSA id t11-20020a17090a5d8b00b002563e8a0225sm823577pji.48.2023.06.08.02.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 02:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686215646; x=1688807646; 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=l0JpJs7+hTqlJ/9g6nrrm7Yh9xa0lcWgLvMRTOUKvcg=; b=QavMYt+rZ8nYJrmUy4bTZ0QIqUgvI+Rqvuw6tV0kgN2TJOfxN9+tcqwgLW2l2N2umd MSw3xOkYxwyDSP79eaMJwGmVjT8BAlbIxBPuo3ESqpHCHuP4K/yq7d+gcUCPulrt5uue olSKDsPQ92uNtbaQlI9D5O3HGlnt7gBDZS9m5uoqIlsqv1fkVECLVm6VB7Re6nsRHqHd tmbx/exFfx1MA4VIthRdIyM7ZvYWCaCInVkJrbItYGFE53PWoebJT21Me70nK4Dx9LMY Rhw/FXAXv3avxBKKGcKErPSnsIe7ZvFFThMla4FpGi4G4bI2pDmb2GvgdoLHr6RbAW5/ 5iHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686215646; x=1688807646; 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=l0JpJs7+hTqlJ/9g6nrrm7Yh9xa0lcWgLvMRTOUKvcg=; b=aytON7Mw9cdvksJts7mBldHtceS5cjZSFDb4oTh1yXsHHnfFbdexyIAijVNYko5WCl Wrqe4dhz1xEfBwr1Tt1S6+G1LslgqakstAaDvQOyUa3gsCjhVnQiAxiTBLsBKg80QN9X O2Lo+mPXqNJ3A8ZyI8yNORDnUN21EmyIa6Om3DZTxJEYbWkn2JG0qenv7gB0Hz1vk67q 8KDi3kdnJIr/JXR1BFQAyXUQjl+b9nf2c8CxUm9UMTE6MgeqKtEl5he9NmyTstQV0NQO Qm5TjM/0DhCo3DiG9TvaVRDkPW/Pr3+F/mEDSYkSmhXWxLPkcrF3LpaOnHjosdUjYkVS wALA== X-Gm-Message-State: AC+VfDyK/aGCToU/uxuCeyy5xnVVu0JnvsxXBDLb8RQPfwuZdSy3Zd60 XNwFnE4/l4BlbTvWz5iEfMPJdaX4TTo= X-Google-Smtp-Source: ACHHUZ6UA9hRN3FuXnnn0uILiIYwiXvYmip4I+IwTZuFE/QGX2JPV1UwFJ0tMlzqv3zPhJkyEX7NSw== X-Received: by 2002:a05:6808:3c9:b0:396:cd:829c with SMTP id o9-20020a05680803c900b0039600cd829cmr7569179oie.3.1686215646040; Thu, 08 Jun 2023 02:14:06 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Harsh Prateek Bora , Daniel Henrique Barboza Subject: [PATCH 4/4] ppc/spapr: Move spapr nested HV to a new file Date: Thu, 8 Jun 2023 19:13:44 +1000 Message-Id: <20230608091344.88685-5-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608091344.88685-1-npiggin@gmail.com> References: <20230608091344.88685-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::231; envelope-from=npiggin@gmail.com; helo=mail-oi1-x231.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, FREEMAIL_FROM=0.001, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1686215713698100001 Content-Type: text/plain; charset="utf-8" Create spapr_nested.c for most of the nested HV implementation. Signed-off-by: Nicholas Piggin --- hw/ppc/meson.build | 1 + hw/ppc/spapr_hcall.c | 415 +--------------------------------- hw/ppc/spapr_nested.c | 496 +++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 61 +---- 4 files changed, 499 insertions(+), 474 deletions(-) create mode 100644 hw/ppc/spapr_nested.c diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index c927337da0..a313d4b964 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -15,6 +15,7 @@ ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files( 'spapr_vio.c', 'spapr_events.c', 'spapr_hcall.c', + 'spapr_nested.c', 'spapr_iommu.c', 'spapr_rtas.c', 'spapr_pci.c', diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index da6440f235..93285527ad 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1498,430 +1498,17 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu, targ= et_ulong opcode, } =20 #ifdef CONFIG_TCG -#define PRTS_MASK 0x1f - -static target_ulong h_set_ptbl(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong opcode, - target_ulong *args) -{ - target_ulong ptcr =3D args[0]; - - if (!spapr_get_cap(spapr, SPAPR_CAP_NESTED_KVM_HV)) { - return H_FUNCTION; - } - - if ((ptcr & PRTS_MASK) + 12 - 4 > 12) { - return H_PARAMETER; - } - - spapr->nested_ptcr =3D ptcr; /* Save new partition table */ - - return H_SUCCESS; -} - -static target_ulong h_tlb_invalidate(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong opcode, - target_ulong *args) -{ - /* - * The spapr virtual hypervisor nested HV implementation retains no L2 - * translation state except for TLB. And the TLB is always invalidated - * across L1<->L2 transitions, so nothing is required here. - */ - - return H_SUCCESS; -} - -static target_ulong h_copy_tofrom_guest(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong opcode, - target_ulong *args) -{ - /* - * This HCALL is not required, L1 KVM will take a slow path and walk t= he - * page tables manually to do the data copy. - */ - return H_FUNCTION; -} - -struct nested_ppc_state { - uint64_t gpr[32]; - uint64_t lr; - uint64_t ctr; - uint64_t cfar; - uint64_t msr; - uint64_t nip; - uint32_t cr; - - uint64_t xer; - - uint64_t lpcr; - uint64_t lpidr; - uint64_t pidr; - uint64_t pcr; - uint64_t dpdes; - uint64_t hfscr; - uint64_t srr0; - uint64_t srr1; - uint64_t sprg0; - uint64_t sprg1; - uint64_t sprg2; - uint64_t sprg3; - uint64_t ppr; - - int64_t tb_offset; -}; - -static void nested_save_state(struct nested_ppc_state *save, PowerPCCPU *c= pu) -{ - CPUPPCState *env =3D &cpu->env; - - memcpy(save->gpr, env->gpr, sizeof(save->gpr)); - - save->lr =3D env->lr; - save->ctr =3D env->ctr; - save->cfar =3D env->cfar; - save->msr =3D env->msr; - save->nip =3D env->nip; - - save->cr =3D ppc_get_cr(env); - save->xer =3D cpu_read_xer(env); - - save->lpcr =3D env->spr[SPR_LPCR]; - save->lpidr =3D env->spr[SPR_LPIDR]; - save->pcr =3D env->spr[SPR_PCR]; - save->dpdes =3D env->spr[SPR_DPDES]; - save->hfscr =3D env->spr[SPR_HFSCR]; - save->srr0 =3D env->spr[SPR_SRR0]; - save->srr1 =3D env->spr[SPR_SRR1]; - save->sprg0 =3D env->spr[SPR_SPRG0]; - save->sprg1 =3D env->spr[SPR_SPRG1]; - save->sprg2 =3D env->spr[SPR_SPRG2]; - save->sprg3 =3D env->spr[SPR_SPRG3]; - save->pidr =3D env->spr[SPR_BOOKS_PID]; - save->ppr =3D env->spr[SPR_PPR]; - - save->tb_offset =3D env->tb_env->tb_offset; -} - -static void nested_load_state(PowerPCCPU *cpu, struct nested_ppc_state *lo= ad) -{ - CPUState *cs =3D CPU(cpu); - CPUPPCState *env =3D &cpu->env; - - memcpy(env->gpr, load->gpr, sizeof(env->gpr)); - - env->lr =3D load->lr; - env->ctr =3D load->ctr; - env->cfar =3D load->cfar; - env->msr =3D load->msr; - env->nip =3D load->nip; - - ppc_set_cr(env, load->cr); - cpu_write_xer(env, load->xer); - - env->spr[SPR_LPCR] =3D load->lpcr; - env->spr[SPR_LPIDR] =3D load->lpidr; - env->spr[SPR_PCR] =3D load->pcr; - env->spr[SPR_DPDES] =3D load->dpdes; - env->spr[SPR_HFSCR] =3D load->hfscr; - env->spr[SPR_SRR0] =3D load->srr0; - env->spr[SPR_SRR1] =3D load->srr1; - env->spr[SPR_SPRG0] =3D load->sprg0; - env->spr[SPR_SPRG1] =3D load->sprg1; - env->spr[SPR_SPRG2] =3D load->sprg2; - env->spr[SPR_SPRG3] =3D load->sprg3; - env->spr[SPR_BOOKS_PID] =3D load->pidr; - env->spr[SPR_PPR] =3D load->ppr; - - env->tb_env->tb_offset =3D load->tb_offset; - - /* - * MSR updated, compute hflags and possible interrupts. - */ - hreg_compute_hflags(env); - ppc_maybe_interrupt(env); - - /* - * Nested HV does not tag TLB entries between L1 and L2, so must - * flush on transition. - */ - tlb_flush(cs); - env->reserve_addr =3D -1; /* Reset the reservation */ -} - -/* - * When this handler returns, the environment is switched to the L2 guest - * and TCG begins running that. spapr_exit_nested() performs the switch fr= om - * L2 back to L1 and returns from the H_ENTER_NESTED hcall. - */ -static target_ulong h_enter_nested(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong opcode, - target_ulong *args) -{ - PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); - CPUPPCState *env =3D &cpu->env; - SpaprCpuState *spapr_cpu =3D spapr_cpu_state(cpu); - struct nested_ppc_state l2_state; - target_ulong hv_ptr =3D args[0]; - target_ulong regs_ptr =3D args[1]; - target_ulong hdec, now =3D cpu_ppc_load_tbl(env); - target_ulong lpcr, lpcr_mask; - struct kvmppc_hv_guest_state *hvstate; - struct kvmppc_hv_guest_state hv_state; - struct kvmppc_pt_regs *regs; - hwaddr len; - - if (spapr->nested_ptcr =3D=3D 0) { - return H_NOT_AVAILABLE; - } - - len =3D sizeof(*hvstate); - hvstate =3D address_space_map(CPU(cpu)->as, hv_ptr, &len, false, - MEMTXATTRS_UNSPECIFIED); - if (len !=3D sizeof(*hvstate)) { - address_space_unmap(CPU(cpu)->as, hvstate, len, 0, false); - return H_PARAMETER; - } - - memcpy(&hv_state, hvstate, len); - - address_space_unmap(CPU(cpu)->as, hvstate, len, len, false); - - /* - * We accept versions 1 and 2. Version 2 fields are unused because TCG - * does not implement DAWR*. - */ - if (hv_state.version > HV_GUEST_STATE_VERSION) { - return H_PARAMETER; - } - - if (hv_state.lpid =3D=3D 0) { - return H_PARAMETER; - } - - spapr_cpu->nested_host_state =3D g_try_new(struct nested_ppc_state, 1); - if (!spapr_cpu->nested_host_state) { - return H_NO_MEM; - } - - assert(env->spr[SPR_LPIDR] =3D=3D 0); - assert(env->spr[SPR_DPDES] =3D=3D 0); - nested_save_state(spapr_cpu->nested_host_state, cpu); - - len =3D sizeof(*regs); - regs =3D address_space_map(CPU(cpu)->as, regs_ptr, &len, false, - MEMTXATTRS_UNSPECIFIED); - if (!regs || len !=3D sizeof(*regs)) { - address_space_unmap(CPU(cpu)->as, regs, len, 0, false); - g_free(spapr_cpu->nested_host_state); - return H_P2; - } - - len =3D sizeof(l2_state.gpr); - assert(len =3D=3D sizeof(regs->gpr)); - memcpy(l2_state.gpr, regs->gpr, len); - - l2_state.lr =3D regs->link; - l2_state.ctr =3D regs->ctr; - l2_state.xer =3D regs->xer; - l2_state.cr =3D regs->ccr; - l2_state.msr =3D regs->msr; - l2_state.nip =3D regs->nip; - - address_space_unmap(CPU(cpu)->as, regs, len, len, false); - - l2_state.cfar =3D hv_state.cfar; - l2_state.lpidr =3D hv_state.lpid; - - lpcr_mask =3D LPCR_DPFD | LPCR_ILE | LPCR_AIL | LPCR_LD | LPCR_MER; - lpcr =3D (env->spr[SPR_LPCR] & ~lpcr_mask) | (hv_state.lpcr & lpcr_mas= k); - lpcr |=3D LPCR_HR | LPCR_UPRT | LPCR_GTSE | LPCR_HVICE | LPCR_HDICE; - lpcr &=3D ~LPCR_LPES0; - l2_state.lpcr =3D lpcr & pcc->lpcr_mask; - - l2_state.pcr =3D hv_state.pcr; - /* hv_state.amor is not used */ - l2_state.dpdes =3D hv_state.dpdes; - l2_state.hfscr =3D hv_state.hfscr; - /* TCG does not implement DAWR*, CIABR, PURR, SPURR, IC, VTB, HEIR SPR= s*/ - l2_state.srr0 =3D hv_state.srr0; - l2_state.srr1 =3D hv_state.srr1; - l2_state.sprg0 =3D hv_state.sprg[0]; - l2_state.sprg1 =3D hv_state.sprg[1]; - l2_state.sprg2 =3D hv_state.sprg[2]; - l2_state.sprg3 =3D hv_state.sprg[3]; - l2_state.pidr =3D hv_state.pidr; - l2_state.ppr =3D hv_state.ppr; - l2_state.tb_offset =3D env->tb_env->tb_offset + hv_state.tb_offset; - - /* - * Switch to the nested guest environment and start the "hdec" timer. - */ - nested_load_state(cpu, &l2_state); - - hdec =3D hv_state.hdec_expiry - now; - cpu_ppc_hdecr_init(env); - cpu_ppc_store_hdecr(env, hdec); - - /* - * The hv_state.vcpu_token is not needed. It is used by the KVM - * implementation to remember which L2 vCPU last ran on which physical - * CPU so as to invalidate process scope translations if it is moved - * between physical CPUs. For now TLBs are always flushed on L1<->L2 - * transitions so this is not a problem. - * - * Could validate that the same vcpu_token does not attempt to run on - * different L1 vCPUs at the same time, but that would be a L1 KVM bug - * and it's not obviously worth a new data structure to do it. - */ - - spapr_cpu->in_nested =3D true; - - /* - * The spapr hcall helper sets env->gpr[3] to the return value, but at - * this point the L1 is not returning from the hcall but rather we - * start running the L2, so r3 must not be clobbered, so return env->g= pr[3] - * to leave it unchanged. - */ - return env->gpr[3]; -} - -void spapr_exit_nested(PowerPCCPU *cpu, int excp) -{ - CPUPPCState *env =3D &cpu->env; - SpaprCpuState *spapr_cpu =3D spapr_cpu_state(cpu); - struct nested_ppc_state l2_state; - target_ulong hv_ptr =3D spapr_cpu->nested_host_state->gpr[4]; - target_ulong regs_ptr =3D spapr_cpu->nested_host_state->gpr[5]; - target_ulong hsrr0, hsrr1, hdar, asdr, hdsisr; - struct kvmppc_hv_guest_state *hvstate; - struct kvmppc_pt_regs *regs; - hwaddr len; - - assert(spapr_cpu->in_nested); - - nested_save_state(&l2_state, cpu); - hsrr0 =3D env->spr[SPR_HSRR0]; - hsrr1 =3D env->spr[SPR_HSRR1]; - hdar =3D env->spr[SPR_HDAR]; - hdsisr =3D env->spr[SPR_HDSISR]; - asdr =3D env->spr[SPR_ASDR]; - - /* - * Switch back to the host environment (including for any error). - */ - assert(env->spr[SPR_LPIDR] !=3D 0); - nested_load_state(cpu, spapr_cpu->nested_host_state); - env->gpr[3] =3D env->excp_vectors[excp]; /* hcall return value */ - - cpu_ppc_hdecr_exit(env); - - spapr_cpu->in_nested =3D false; - - g_free(spapr_cpu->nested_host_state); - spapr_cpu->nested_host_state =3D NULL; - - len =3D sizeof(*hvstate); - hvstate =3D address_space_map(CPU(cpu)->as, hv_ptr, &len, true, - MEMTXATTRS_UNSPECIFIED); - if (len !=3D sizeof(*hvstate)) { - address_space_unmap(CPU(cpu)->as, hvstate, len, 0, true); - env->gpr[3] =3D H_PARAMETER; - return; - } - - hvstate->cfar =3D l2_state.cfar; - hvstate->lpcr =3D l2_state.lpcr; - hvstate->pcr =3D l2_state.pcr; - hvstate->dpdes =3D l2_state.dpdes; - hvstate->hfscr =3D l2_state.hfscr; - - if (excp =3D=3D POWERPC_EXCP_HDSI) { - hvstate->hdar =3D hdar; - hvstate->hdsisr =3D hdsisr; - hvstate->asdr =3D asdr; - } else if (excp =3D=3D POWERPC_EXCP_HISI) { - hvstate->asdr =3D asdr; - } - - /* HEIR should be implemented for HV mode and saved here. */ - hvstate->srr0 =3D l2_state.srr0; - hvstate->srr1 =3D l2_state.srr1; - hvstate->sprg[0] =3D l2_state.sprg0; - hvstate->sprg[1] =3D l2_state.sprg1; - hvstate->sprg[2] =3D l2_state.sprg2; - hvstate->sprg[3] =3D l2_state.sprg3; - hvstate->pidr =3D l2_state.pidr; - hvstate->ppr =3D l2_state.ppr; - - /* Is it okay to specify write length larger than actual data written?= */ - address_space_unmap(CPU(cpu)->as, hvstate, len, len, true); - - len =3D sizeof(*regs); - regs =3D address_space_map(CPU(cpu)->as, regs_ptr, &len, true, - MEMTXATTRS_UNSPECIFIED); - if (!regs || len !=3D sizeof(*regs)) { - address_space_unmap(CPU(cpu)->as, regs, len, 0, true); - env->gpr[3] =3D H_P2; - return; - } - - len =3D sizeof(env->gpr); - assert(len =3D=3D sizeof(regs->gpr)); - memcpy(regs->gpr, l2_state.gpr, len); - - regs->link =3D l2_state.lr; - regs->ctr =3D l2_state.ctr; - regs->xer =3D l2_state.xer; - regs->ccr =3D l2_state.cr; - - if (excp =3D=3D POWERPC_EXCP_MCHECK || - excp =3D=3D POWERPC_EXCP_RESET || - excp =3D=3D POWERPC_EXCP_SYSCALL) { - regs->nip =3D l2_state.srr0; - regs->msr =3D l2_state.srr1 & env->msr_mask; - } else { - regs->nip =3D hsrr0; - regs->msr =3D hsrr1 & env->msr_mask; - } - - /* Is it okay to specify write length larger than actual data written?= */ - address_space_unmap(CPU(cpu)->as, regs, len, len, true); -} - -static void hypercall_register_nested(void) -{ - spapr_register_hypercall(KVMPPC_H_SET_PARTITION_TABLE, h_set_ptbl); - spapr_register_hypercall(KVMPPC_H_ENTER_NESTED, h_enter_nested); - spapr_register_hypercall(KVMPPC_H_TLB_INVALIDATE, h_tlb_invalidate); - spapr_register_hypercall(KVMPPC_H_COPY_TOFROM_GUEST, h_copy_tofrom_gue= st); -} - static void hypercall_register_softmmu(void) { /* DO NOTHING */ } #else -void spapr_exit_nested(PowerPCCPU *cpu, int excp) -{ - g_assert_not_reached(); -} - static target_ulong h_softmmu(PowerPCCPU *cpu, SpaprMachineState *spapr, target_ulong opcode, target_ulong *args) { g_assert_not_reached(); } =20 -static void hypercall_register_nested(void) -{ - /* DO NOTHING */ -} - static void hypercall_register_softmmu(void) { /* hcall-pft */ @@ -1991,7 +1578,7 @@ static void hypercall_register_types(void) =20 spapr_register_hypercall(KVMPPC_H_UPDATE_DT, h_update_dt); =20 - hypercall_register_nested(); + spapr_register_nested(); } =20 type_init(hypercall_register_types) diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c new file mode 100644 index 0000000000..c06dd8903c --- /dev/null +++ b/hw/ppc/spapr_nested.c @@ -0,0 +1,496 @@ +#include "qemu/osdep.h" +#include "qemu/cutils.h" +#include "exec/exec-all.h" +#include "helper_regs.h" +#include "hw/ppc/ppc.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_cpu_core.h" + +/* + * Register state for entering a nested guest with H_ENTER_NESTED. + * New member must be added at the end. + */ +struct kvmppc_hv_guest_state { + uint64_t version; /* version of this structure layout, must be fi= rst */ + uint32_t lpid; + uint32_t vcpu_token; + /* These registers are hypervisor privileged (at least for writing) */ + uint64_t lpcr; + uint64_t pcr; + uint64_t amor; + uint64_t dpdes; + uint64_t hfscr; + int64_t tb_offset; + uint64_t dawr0; + uint64_t dawrx0; + uint64_t ciabr; + uint64_t hdec_expiry; + uint64_t purr; + uint64_t spurr; + uint64_t ic; + uint64_t vtb; + uint64_t hdar; + uint64_t hdsisr; + uint64_t heir; + uint64_t asdr; + /* These are OS privileged but need to be set late in guest entry */ + uint64_t srr0; + uint64_t srr1; + uint64_t sprg[4]; + uint64_t pidr; + uint64_t cfar; + uint64_t ppr; + /* Version 1 ends here */ + uint64_t dawr1; + uint64_t dawrx1; + /* Version 2 ends here */ +}; + +/* Latest version of hv_guest_state structure */ +#define HV_GUEST_STATE_VERSION 2 + +/* Linux 64-bit powerpc pt_regs struct, used by nested HV */ +struct kvmppc_pt_regs { + uint64_t gpr[32]; + uint64_t nip; + uint64_t msr; + uint64_t orig_gpr3; /* Used for restarting system calls */ + uint64_t ctr; + uint64_t link; + uint64_t xer; + uint64_t ccr; + uint64_t softe; /* Soft enabled/disabled */ + uint64_t trap; /* Reason for being here */ + uint64_t dar; /* Fault registers */ + uint64_t dsisr; /* on 4xx/Book-E used for ESR */ + uint64_t result; /* Result of a system call */ +}; + +#ifdef CONFIG_TCG +#define PRTS_MASK 0x1f + +static target_ulong h_set_ptbl(PowerPCCPU *cpu, + SpaprMachineState *spapr, + target_ulong opcode, + target_ulong *args) +{ + target_ulong ptcr =3D args[0]; + + if (!spapr_get_cap(spapr, SPAPR_CAP_NESTED_KVM_HV)) { + return H_FUNCTION; + } + + if ((ptcr & PRTS_MASK) + 12 - 4 > 12) { + return H_PARAMETER; + } + + spapr->nested_ptcr =3D ptcr; /* Save new partition table */ + + return H_SUCCESS; +} + +static target_ulong h_tlb_invalidate(PowerPCCPU *cpu, + SpaprMachineState *spapr, + target_ulong opcode, + target_ulong *args) +{ + /* + * The spapr virtual hypervisor nested HV implementation retains no L2 + * translation state except for TLB. And the TLB is always invalidated + * across L1<->L2 transitions, so nothing is required here. + */ + + return H_SUCCESS; +} + +static target_ulong h_copy_tofrom_guest(PowerPCCPU *cpu, + SpaprMachineState *spapr, + target_ulong opcode, + target_ulong *args) +{ + /* + * This HCALL is not required, L1 KVM will take a slow path and walk t= he + * page tables manually to do the data copy. + */ + return H_FUNCTION; +} + +struct nested_ppc_state { + uint64_t gpr[32]; + uint64_t lr; + uint64_t ctr; + uint64_t cfar; + uint64_t msr; + uint64_t nip; + uint32_t cr; + + uint64_t xer; + + uint64_t lpcr; + uint64_t lpidr; + uint64_t pidr; + uint64_t pcr; + uint64_t dpdes; + uint64_t hfscr; + uint64_t srr0; + uint64_t srr1; + uint64_t sprg0; + uint64_t sprg1; + uint64_t sprg2; + uint64_t sprg3; + uint64_t ppr; + + int64_t tb_offset; +}; + +static void nested_save_state(struct nested_ppc_state *save, PowerPCCPU *c= pu) +{ + CPUPPCState *env =3D &cpu->env; + uint32_t cr; + int i; + + memcpy(save->gpr, env->gpr, sizeof(save->gpr)); + + save->lr =3D env->lr; + save->ctr =3D env->ctr; + save->cfar =3D env->cfar; + save->msr =3D env->msr; + save->nip =3D env->nip; + + cr =3D 0; + for (i =3D 0; i < 8; i++) { + cr |=3D (env->crf[i] & 15) << (4 * (7 - i)); + } + save->cr =3D cr; + + save->xer =3D cpu_read_xer(env); + + save->lpcr =3D env->spr[SPR_LPCR]; + save->lpidr =3D env->spr[SPR_LPIDR]; + save->pcr =3D env->spr[SPR_PCR]; + save->dpdes =3D env->spr[SPR_DPDES]; + save->hfscr =3D env->spr[SPR_HFSCR]; + save->srr0 =3D env->spr[SPR_SRR0]; + save->srr1 =3D env->spr[SPR_SRR1]; + save->sprg0 =3D env->spr[SPR_SPRG0]; + save->sprg1 =3D env->spr[SPR_SPRG1]; + save->sprg2 =3D env->spr[SPR_SPRG2]; + save->sprg3 =3D env->spr[SPR_SPRG3]; + save->pidr =3D env->spr[SPR_BOOKS_PID]; + save->ppr =3D env->spr[SPR_PPR]; + + save->tb_offset =3D env->tb_env->tb_offset; +} + +static void nested_load_state(PowerPCCPU *cpu, struct nested_ppc_state *lo= ad) +{ + CPUState *cs =3D CPU(cpu); + CPUPPCState *env =3D &cpu->env; + uint32_t cr; + int i; + + memcpy(env->gpr, load->gpr, sizeof(env->gpr)); + + env->lr =3D load->lr; + env->ctr =3D load->ctr; + env->cfar =3D load->cfar; + env->msr =3D load->msr; + env->nip =3D load->nip; + + cr =3D load->cr; + for (i =3D 7; i >=3D 0; i--) { + env->crf[i] =3D cr & 15; + cr >>=3D 4; + } + + cpu_write_xer(env, load->xer); + + env->spr[SPR_LPCR] =3D load->lpcr; + env->spr[SPR_LPIDR] =3D load->lpidr; + env->spr[SPR_PCR] =3D load->pcr; + env->spr[SPR_DPDES] =3D load->dpdes; + env->spr[SPR_HFSCR] =3D load->hfscr; + env->spr[SPR_SRR0] =3D load->srr0; + env->spr[SPR_SRR1] =3D load->srr1; + env->spr[SPR_SPRG0] =3D load->sprg0; + env->spr[SPR_SPRG1] =3D load->sprg1; + env->spr[SPR_SPRG2] =3D load->sprg2; + env->spr[SPR_SPRG3] =3D load->sprg3; + env->spr[SPR_BOOKS_PID] =3D load->pidr; + env->spr[SPR_PPR] =3D load->ppr; + + env->tb_env->tb_offset =3D load->tb_offset; + + /* + * MSR updated, compute hflags and possible interrupts. + */ + hreg_compute_hflags(env); + ppc_maybe_interrupt(env); + + /* + * Nested HV does not tag TLB entries between L1 and L2, so must + * flush on transition. + */ + tlb_flush(cs); + env->reserve_addr =3D -1; /* Reset the reservation */ +} + +/* + * When this handler returns, the environment is switched to the L2 guest + * and TCG begins running that. spapr_exit_nested() performs the switch fr= om + * L2 back to L1 and returns from the H_ENTER_NESTED hcall. + */ +static target_ulong h_enter_nested(PowerPCCPU *cpu, + SpaprMachineState *spapr, + target_ulong opcode, + target_ulong *args) +{ + PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); + CPUPPCState *env =3D &cpu->env; + SpaprCpuState *spapr_cpu =3D spapr_cpu_state(cpu); + struct nested_ppc_state l2_state; + target_ulong hv_ptr =3D args[0]; + target_ulong regs_ptr =3D args[1]; + target_ulong hdec, now =3D cpu_ppc_load_tbl(env); + target_ulong lpcr, lpcr_mask; + struct kvmppc_hv_guest_state *hvstate; + struct kvmppc_hv_guest_state hv_state; + struct kvmppc_pt_regs *regs; + hwaddr len; + + if (spapr->nested_ptcr =3D=3D 0) { + return H_NOT_AVAILABLE; + } + + len =3D sizeof(*hvstate); + hvstate =3D address_space_map(CPU(cpu)->as, hv_ptr, &len, false, + MEMTXATTRS_UNSPECIFIED); + if (len !=3D sizeof(*hvstate)) { + address_space_unmap(CPU(cpu)->as, hvstate, len, 0, false); + return H_PARAMETER; + } + + memcpy(&hv_state, hvstate, len); + + address_space_unmap(CPU(cpu)->as, hvstate, len, len, false); + + /* + * We accept versions 1 and 2. Version 2 fields are unused because TCG + * does not implement DAWR*. + */ + if (hv_state.version > HV_GUEST_STATE_VERSION) { + return H_PARAMETER; + } + + if (hv_state.lpid =3D=3D 0) { + return H_PARAMETER; + } + + spapr_cpu->nested_host_state =3D g_try_new(struct nested_ppc_state, 1); + if (!spapr_cpu->nested_host_state) { + return H_NO_MEM; + } + + assert(env->spr[SPR_LPIDR] =3D=3D 0); + assert(env->spr[SPR_DPDES] =3D=3D 0); + nested_save_state(spapr_cpu->nested_host_state, cpu); + + len =3D sizeof(*regs); + regs =3D address_space_map(CPU(cpu)->as, regs_ptr, &len, false, + MEMTXATTRS_UNSPECIFIED); + if (!regs || len !=3D sizeof(*regs)) { + address_space_unmap(CPU(cpu)->as, regs, len, 0, false); + g_free(spapr_cpu->nested_host_state); + return H_P2; + } + + len =3D sizeof(l2_state.gpr); + assert(len =3D=3D sizeof(regs->gpr)); + memcpy(l2_state.gpr, regs->gpr, len); + + l2_state.lr =3D regs->link; + l2_state.ctr =3D regs->ctr; + l2_state.xer =3D regs->xer; + l2_state.cr =3D regs->ccr; + l2_state.msr =3D regs->msr; + l2_state.nip =3D regs->nip; + + address_space_unmap(CPU(cpu)->as, regs, len, len, false); + + l2_state.cfar =3D hv_state.cfar; + l2_state.lpidr =3D hv_state.lpid; + + lpcr_mask =3D LPCR_DPFD | LPCR_ILE | LPCR_AIL | LPCR_LD | LPCR_MER; + lpcr =3D (env->spr[SPR_LPCR] & ~lpcr_mask) | (hv_state.lpcr & lpcr_mas= k); + lpcr |=3D LPCR_HR | LPCR_UPRT | LPCR_GTSE | LPCR_HVICE | LPCR_HDICE; + lpcr &=3D ~LPCR_LPES0; + l2_state.lpcr =3D lpcr & pcc->lpcr_mask; + + l2_state.pcr =3D hv_state.pcr; + /* hv_state.amor is not used */ + l2_state.dpdes =3D hv_state.dpdes; + l2_state.hfscr =3D hv_state.hfscr; + /* TCG does not implement DAWR*, CIABR, PURR, SPURR, IC, VTB, HEIR SPR= s*/ + l2_state.srr0 =3D hv_state.srr0; + l2_state.srr1 =3D hv_state.srr1; + l2_state.sprg0 =3D hv_state.sprg[0]; + l2_state.sprg1 =3D hv_state.sprg[1]; + l2_state.sprg2 =3D hv_state.sprg[2]; + l2_state.sprg3 =3D hv_state.sprg[3]; + l2_state.pidr =3D hv_state.pidr; + l2_state.ppr =3D hv_state.ppr; + l2_state.tb_offset =3D env->tb_env->tb_offset + hv_state.tb_offset; + + /* + * Switch to the nested guest environment and start the "hdec" timer. + */ + nested_load_state(cpu, &l2_state); + + hdec =3D hv_state.hdec_expiry - now; + cpu_ppc_hdecr_init(env); + cpu_ppc_store_hdecr(env, hdec); + + /* + * The hv_state.vcpu_token is not needed. It is used by the KVM + * implementation to remember which L2 vCPU last ran on which physical + * CPU so as to invalidate process scope translations if it is moved + * between physical CPUs. For now TLBs are always flushed on L1<->L2 + * transitions so this is not a problem. + * + * Could validate that the same vcpu_token does not attempt to run on + * different L1 vCPUs at the same time, but that would be a L1 KVM bug + * and it's not obviously worth a new data structure to do it. + */ + + spapr_cpu->in_nested =3D true; + + /* + * The spapr hcall helper sets env->gpr[3] to the return value, but at + * this point the L1 is not returning from the hcall but rather we + * start running the L2, so r3 must not be clobbered, so return env->g= pr[3] + * to leave it unchanged. + */ + return env->gpr[3]; +} + +void spapr_exit_nested(PowerPCCPU *cpu, int excp) +{ + CPUPPCState *env =3D &cpu->env; + SpaprCpuState *spapr_cpu =3D spapr_cpu_state(cpu); + struct nested_ppc_state l2_state; + target_ulong hv_ptr =3D spapr_cpu->nested_host_state->gpr[4]; + target_ulong regs_ptr =3D spapr_cpu->nested_host_state->gpr[5]; + target_ulong hsrr0, hsrr1, hdar, asdr, hdsisr; + struct kvmppc_hv_guest_state *hvstate; + struct kvmppc_pt_regs *regs; + hwaddr len; + + assert(spapr_cpu->in_nested); + + nested_save_state(&l2_state, cpu); + hsrr0 =3D env->spr[SPR_HSRR0]; + hsrr1 =3D env->spr[SPR_HSRR1]; + hdar =3D env->spr[SPR_HDAR]; + hdsisr =3D env->spr[SPR_HDSISR]; + asdr =3D env->spr[SPR_ASDR]; + + /* + * Switch back to the host environment (including for any error). + */ + assert(env->spr[SPR_LPIDR] !=3D 0); + nested_load_state(cpu, spapr_cpu->nested_host_state); + env->gpr[3] =3D env->excp_vectors[excp]; /* hcall return value */ + + cpu_ppc_hdecr_exit(env); + + spapr_cpu->in_nested =3D false; + + g_free(spapr_cpu->nested_host_state); + spapr_cpu->nested_host_state =3D NULL; + + len =3D sizeof(*hvstate); + hvstate =3D address_space_map(CPU(cpu)->as, hv_ptr, &len, true, + MEMTXATTRS_UNSPECIFIED); + if (len !=3D sizeof(*hvstate)) { + address_space_unmap(CPU(cpu)->as, hvstate, len, 0, true); + env->gpr[3] =3D H_PARAMETER; + return; + } + + hvstate->cfar =3D l2_state.cfar; + hvstate->lpcr =3D l2_state.lpcr; + hvstate->pcr =3D l2_state.pcr; + hvstate->dpdes =3D l2_state.dpdes; + hvstate->hfscr =3D l2_state.hfscr; + + if (excp =3D=3D POWERPC_EXCP_HDSI) { + hvstate->hdar =3D hdar; + hvstate->hdsisr =3D hdsisr; + hvstate->asdr =3D asdr; + } else if (excp =3D=3D POWERPC_EXCP_HISI) { + hvstate->asdr =3D asdr; + } + + /* HEIR should be implemented for HV mode and saved here. */ + hvstate->srr0 =3D l2_state.srr0; + hvstate->srr1 =3D l2_state.srr1; + hvstate->sprg[0] =3D l2_state.sprg0; + hvstate->sprg[1] =3D l2_state.sprg1; + hvstate->sprg[2] =3D l2_state.sprg2; + hvstate->sprg[3] =3D l2_state.sprg3; + hvstate->pidr =3D l2_state.pidr; + hvstate->ppr =3D l2_state.ppr; + + /* Is it okay to specify write length larger than actual data written?= */ + address_space_unmap(CPU(cpu)->as, hvstate, len, len, true); + + len =3D sizeof(*regs); + regs =3D address_space_map(CPU(cpu)->as, regs_ptr, &len, true, + MEMTXATTRS_UNSPECIFIED); + if (!regs || len !=3D sizeof(*regs)) { + address_space_unmap(CPU(cpu)->as, regs, len, 0, true); + env->gpr[3] =3D H_P2; + return; + } + + len =3D sizeof(env->gpr); + assert(len =3D=3D sizeof(regs->gpr)); + memcpy(regs->gpr, l2_state.gpr, len); + + regs->link =3D l2_state.lr; + regs->ctr =3D l2_state.ctr; + regs->xer =3D l2_state.xer; + regs->ccr =3D l2_state.cr; + + if (excp =3D=3D POWERPC_EXCP_MCHECK || + excp =3D=3D POWERPC_EXCP_RESET || + excp =3D=3D POWERPC_EXCP_SYSCALL) { + regs->nip =3D l2_state.srr0; + regs->msr =3D l2_state.srr1 & env->msr_mask; + } else { + regs->nip =3D hsrr0; + regs->msr =3D hsrr1 & env->msr_mask; + } + + /* Is it okay to specify write length larger than actual data written?= */ + address_space_unmap(CPU(cpu)->as, regs, len, len, true); +} + +void spapr_register_nested(void) +{ + spapr_register_hypercall(KVMPPC_H_SET_PARTITION_TABLE, h_set_ptbl); + spapr_register_hypercall(KVMPPC_H_ENTER_NESTED, h_enter_nested); + spapr_register_hypercall(KVMPPC_H_TLB_INVALIDATE, h_tlb_invalidate); + spapr_register_hypercall(KVMPPC_H_COPY_TOFROM_GUEST, h_copy_tofrom_gue= st); +} +#else +void spapr_exit_nested(PowerPCCPU *cpu, int excp) +{ + g_assert_not_reached(); +} + +void spapr_register_nested(void) +{ + /* DO NOTHING */ +} +#endif diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index bd5a6c4780..e167d09d60 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -621,66 +621,6 @@ struct SpaprMachineState { #define SVM_H_TPM_COMM 0xEF10 #define SVM_HCALL_MAX SVM_H_TPM_COMM =20 -/* - * Register state for entering a nested guest with H_ENTER_NESTED. - * New member must be added at the end. - */ -struct kvmppc_hv_guest_state { - uint64_t version; /* version of this structure layout, must be fi= rst */ - uint32_t lpid; - uint32_t vcpu_token; - /* These registers are hypervisor privileged (at least for writing) */ - uint64_t lpcr; - uint64_t pcr; - uint64_t amor; - uint64_t dpdes; - uint64_t hfscr; - int64_t tb_offset; - uint64_t dawr0; - uint64_t dawrx0; - uint64_t ciabr; - uint64_t hdec_expiry; - uint64_t purr; - uint64_t spurr; - uint64_t ic; - uint64_t vtb; - uint64_t hdar; - uint64_t hdsisr; - uint64_t heir; - uint64_t asdr; - /* These are OS privileged but need to be set late in guest entry */ - uint64_t srr0; - uint64_t srr1; - uint64_t sprg[4]; - uint64_t pidr; - uint64_t cfar; - uint64_t ppr; - /* Version 1 ends here */ - uint64_t dawr1; - uint64_t dawrx1; - /* Version 2 ends here */ -}; - -/* Latest version of hv_guest_state structure */ -#define HV_GUEST_STATE_VERSION 2 - -/* Linux 64-bit powerpc pt_regs struct, used by nested HV */ -struct kvmppc_pt_regs { - uint64_t gpr[32]; - uint64_t nip; - uint64_t msr; - uint64_t orig_gpr3; /* Used for restarting system calls */ - uint64_t ctr; - uint64_t link; - uint64_t xer; - uint64_t ccr; - uint64_t softe; /* Soft enabled/disabled */ - uint64_t trap; /* Reason for being here */ - uint64_t dar; /* Fault registers */ - uint64_t dsisr; /* on 4xx/Book-E used for ESR */ - uint64_t result; /* Result of a system call */ -}; - typedef struct SpaprDeviceTreeUpdateHeader { uint32_t version_id; } SpaprDeviceTreeUpdateHeader; @@ -698,6 +638,7 @@ void spapr_register_hypercall(target_ulong opcode, spap= r_hcall_fn fn); target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong *args); =20 +void spapr_register_nested(void); void spapr_exit_nested(PowerPCCPU *cpu, int excp); =20 target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState= *spapr, --=20 2.40.1