From patchwork Fri Jan 27 11:29:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 49263 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp783431wrn; Fri, 27 Jan 2023 03:33:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXuNN7vQbSNlINp9qhx5+pEl2K09Vn9KdgxQPN79jKqMRYMlRY99zc/W8oAi2oMMQai/9FNH X-Received: by 2002:a05:6a20:d2c6:b0:b8:5ab4:279c with SMTP id ir6-20020a056a20d2c600b000b85ab4279cmr41903596pzb.30.1674819225962; Fri, 27 Jan 2023 03:33:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674819225; cv=none; d=google.com; s=arc-20160816; b=wPn13lxZr3L9trDUsk5eDgEBONoLvnrmOQUUUzjLar/zahGh7ZFQ45cyzostqNRpjs i/2lcRkpfHsxdqS7DqmS4Z7RUjZ90AozsIa14w9s+frYl/OTdMaFjSqAh6YgMk8weL3K BN1b9y6MHXsPEbnFTkH91WaZMFang7ct49LETQGH2Pt9XTvgJYsyaHADM1r65WJ3kMA1 TJMklRcR1/iUwZGSo96hVaBCRLlKUxKZ0koT01seidYUNOaelJR4mhtjO8hjQKNvHH5o tNA4lza5pWwD4ga3Cl+j5XWgYSRIdRcVg2lnK4Vhww11U26x+MMjF1ARnR/Ue3Q0PFWj fzyg== 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=OFOs0fxW6egAE3hhk4y//teQyeNTPZdogvEqaRcZbTg=; b=o9GpFO1jfzVeT3P8sNTkNeLangXYvx4rXL2/FsIDS4QzmOQCzFb+iKoAsJ2SS1QwwD 0KtMh6QSBMswfqqufgfn8J2XqOGX9xUO6tD5WYY4Mefzb4zHKy2wfBDWzFCDwTvt4mMQ ypMDYMXr7kz5Y1ybTANyQWx4LzugdoAGzRWVr5G1X2CSs2mASMhIBbOxdzi/4bTb6/IJ Nra2T2I0rHbk03J6o8mQeD/ooeuYFGfASGGs/dR2nweIE/6OKXmwhJrt84T6IuC/qnDq RIEd7iq0MlCfGhi07rxneo4DqtYQaUZH8PoCPqmmW9Mn+RdYLEjhuRGpCRMdeZsOfSXC RweQ== 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 c123-20020a633581000000b004df79405902si2420459pga.295.2023.01.27.03.33.33; Fri, 27 Jan 2023 03:33:45 -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 S233694AbjA0LdN (ORCPT + 99 others); Fri, 27 Jan 2023 06:33:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233638AbjA0Lcj (ORCPT ); Fri, 27 Jan 2023 06:32:39 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1DB821709; Fri, 27 Jan 2023 03:31:12 -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 0658A1692; Fri, 27 Jan 2023 03:31:11 -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 EC4773F64C; Fri, 27 Jan 2023 03:30:26 -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 18/28] KVM: arm64: Handle realm VCPU load Date: Fri, 27 Jan 2023 11:29:22 +0000 Message-Id: <20230127112932.38045-19-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?1756175244317057407?= X-GMAIL-MSGID: =?utf-8?q?1756175244317057407?= When loading a realm VCPU much of the work is handled by the RMM so only some of the actions are required. Rearrange kvm_arch_vcpu_load() slightly so we can bail out early for a realm guest. Signed-off-by: Steven Price --- arch/arm64/kvm/arm.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index fd9e28f48903..46c152a9a150 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -451,19 +451,25 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) vcpu->cpu = cpu; + if (single_task_running()) + vcpu_clear_wfx_traps(vcpu); + else + vcpu_set_wfx_traps(vcpu); + kvm_vgic_load(vcpu); kvm_timer_vcpu_load(vcpu); + + if (kvm_arm_is_pvtime_enabled(&vcpu->arch)) + kvm_make_request(KVM_REQ_RECORD_STEAL, vcpu); + + /* No additional state needs to be loaded on Realmed VMs */ + if (vcpu_is_rec(vcpu)) + return; + if (has_vhe()) kvm_vcpu_load_sysregs_vhe(vcpu); kvm_arch_vcpu_load_fp(vcpu); kvm_vcpu_pmu_restore_guest(vcpu); - if (kvm_arm_is_pvtime_enabled(&vcpu->arch)) - kvm_make_request(KVM_REQ_RECORD_STEAL, vcpu); - - if (single_task_running()) - vcpu_clear_wfx_traps(vcpu); - else - vcpu_set_wfx_traps(vcpu); if (vcpu_has_ptrauth(vcpu)) vcpu_ptrauth_disable(vcpu);