From patchwork Fri Jan 27 11:29:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 49299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp788141wrn; Fri, 27 Jan 2023 03:46:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXtRSGfIOuwJjveBrsrF6R1PZoSgehnQtSUXEAIHSNqqxlFACWyv5xa1nrZ85XBMnR5KvnCg X-Received: by 2002:a17:906:eb8e:b0:871:6b9d:dbc with SMTP id mh14-20020a170906eb8e00b008716b9d0dbcmr39753850ejb.21.1674819972324; Fri, 27 Jan 2023 03:46:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674819972; cv=none; d=google.com; s=arc-20160816; b=aeCa/ZTLu2kyc6oLdWF6Kvo9UTMcKAm3aNkMDeCPwsvBkXS+pyf5W5zsjKTCYPBpAY d/or86T1FdS40s/45fcI2kW+Pz6BBf8irtkM0HmQzgBk3Q5HDew1WBeuejgoSPdoLIQv OiNV3/VRh7ZQpYlvwjsg1PZSC9rI/enNZ9X+QsFv+U4xEHpQCE9x3B11LhdR7e7niZ1d JyXBH6DpRBNtEP/nONsBjWj24X/tl0eyIKSBJ4i10yp6YLJ2Xl0LgNieTzpVW48EAl3b AnLfDwf7B3SygpcErVx0nvv9vXsLXjebey+8EztWi7BfPcafjHaPaysry2HbXZdB7RSU UE7w== 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; bh=9980iIMZ5Z7kLzyRzssdFLgJOIY90SHDOCFWoTx/F/w=; b=PcRD2dG1NY4RzcP7IyckUJ6y0FCY2j/MV4aDUxxPJ4oLUD+sOQ4aZJIJyp63PgOTVh ZP/rKovWCWNjCBmPCXYlmp+aQ8wvm9slenZYHaEj6P8A+JJ2iJUnJ51kGSO+iaYpqIxL qN7EAFH/KqPSDan1XdYX/HgVyls0k5wpkZq7IK12obflQ2KjJHHrBGtol6F4RTFssRFm vyq/ywOAEbU6NbMD92nOrNM9PXtOibVkm3ZtzKMaiuxWe5DoaU9obsXGF7i0W1D93lJq ecUaEyjKi7aANjEvP2MInsokmf0+O9Qh+NgW47dwOX7qzAg1bTBY8Jz47dZCspxyEM13 AMkA== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e6-20020a17090658c600b0084ca32731dcsi6262969ejs.675.2023.01.27.03.45.48; Fri, 27 Jan 2023 03:46: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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233964AbjA0LmT (ORCPT + 99 others); Fri, 27 Jan 2023 06:42:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233741AbjA0Llo (ORCPT ); Fri, 27 Jan 2023 06:41:44 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 444947C306; Fri, 27 Jan 2023 03:41:10 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CE14E1596; Fri, 27 Jan 2023 03:31:15 -0800 (PST) Received: from e122027.cambridge.arm.com (e122027.cambridge.arm.com [10.1.35.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A62613F64C; Fri, 27 Jan 2023 03:30:31 -0800 (PST) From: Steven Price To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: Steven Price , Catalin Marinas , Marc Zyngier , Will Deacon , James Morse , Oliver Upton , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Joey Gouly , Alexandru Elisei , Christoffer Dall , Fuad Tabba , linux-coco@lists.linux.dev Subject: [RFC PATCH 20/28] KVM: arm64: Handle Realm PSCI requests Date: Fri, 27 Jan 2023 11:29:24 +0000 Message-Id: <20230127112932.38045-21-steven.price@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127112932.38045-1-steven.price@arm.com> References: <20230127112248.136810-1-suzuki.poulose@arm.com> <20230127112932.38045-1-steven.price@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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?1756176027424771399?= X-GMAIL-MSGID: =?utf-8?q?1756176027424771399?= The RMM needs to be informed of the target REC when a PSCI call is made with an MPIDR argument. Signed-off-by: Steven Price --- arch/arm64/include/asm/kvm_rme.h | 1 + arch/arm64/kvm/psci.c | 23 +++++++++++++++++++++++ arch/arm64/kvm/rme.c | 13 +++++++++++++ 3 files changed, 37 insertions(+) diff --git a/arch/arm64/include/asm/kvm_rme.h b/arch/arm64/include/asm/kvm_rme.h index 303e4a5e5704..2254e28c855e 100644 --- a/arch/arm64/include/asm/kvm_rme.h +++ b/arch/arm64/include/asm/kvm_rme.h @@ -65,6 +65,7 @@ int realm_map_non_secure(struct realm *realm, int realm_set_ipa_state(struct kvm_vcpu *vcpu, unsigned long addr, unsigned long end, unsigned long ripas); +int realm_psci_complete(struct kvm_vcpu *calling, struct kvm_vcpu *target); #define RME_RTT_BLOCK_LEVEL 2 #define RME_RTT_MAX_LEVEL 3 diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c index 7fbc4c1b9df0..e2061cab9b26 100644 --- a/arch/arm64/kvm/psci.c +++ b/arch/arm64/kvm/psci.c @@ -76,6 +76,10 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) */ if (!vcpu) return PSCI_RET_INVALID_PARAMS; + + if (vcpu_is_rec(vcpu)) + realm_psci_complete(source_vcpu, vcpu); + if (!kvm_arm_vcpu_stopped(vcpu)) { if (kvm_psci_version(source_vcpu) != KVM_ARM_PSCI_0_1) return PSCI_RET_ALREADY_ON; @@ -135,6 +139,25 @@ static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu) /* Ignore other bits of target affinity */ target_affinity &= target_affinity_mask; + if (vcpu_is_rec(vcpu)) { + struct kvm_vcpu *target_vcpu; + + /* RMM supports only zero affinity level */ + if (lowest_affinity_level != 0) + return PSCI_RET_INVALID_PARAMS; + + target_vcpu = kvm_mpidr_to_vcpu(kvm, target_affinity); + if (!target_vcpu) + return PSCI_RET_INVALID_PARAMS; + + /* + * Provide the references of running and target RECs to the RMM + * so that the RMM can complete the PSCI request. + */ + realm_psci_complete(vcpu, target_vcpu); + return PSCI_RET_SUCCESS; + } + /* * If one or more VCPU matching target affinity are running * then ON else OFF diff --git a/arch/arm64/kvm/rme.c b/arch/arm64/kvm/rme.c index 3d46191798e5..6ac50481a138 100644 --- a/arch/arm64/kvm/rme.c +++ b/arch/arm64/kvm/rme.c @@ -126,6 +126,19 @@ static void free_delegated_page(struct realm *realm, phys_addr_t phys) free_page((unsigned long)phys_to_virt(phys)); } +int realm_psci_complete(struct kvm_vcpu *calling, struct kvm_vcpu *target) +{ + int ret; + + ret = rmi_psci_complete(virt_to_phys(calling->arch.rec.rec_page), + virt_to_phys(target->arch.rec.rec_page)); + + if (ret) + return -EINVAL; + + return 0; +} + static void realm_destroy_undelegate_range(struct realm *realm, unsigned long ipa, unsigned long addr,