From patchwork Wed Nov 9 14:51:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 17626 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp379206wru; Wed, 9 Nov 2022 06:56:55 -0800 (PST) X-Google-Smtp-Source: AMsMyM73NHHBm4s7h49RvZ75wUkCBq2QehsaqT1etfnBOy9zJhW9dkavt4T9Uov3Opc4eCZi6ME7 X-Received: by 2002:a17:907:3e87:b0:7ae:46a8:af0a with SMTP id hs7-20020a1709073e8700b007ae46a8af0amr21642882ejc.554.1668005814980; Wed, 09 Nov 2022 06:56:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668005814; cv=none; d=google.com; s=arc-20160816; b=G5QF3XZNRXorNZCz7QQC0LJfYgd6/G9/qiB4WDnHjj4sLrx9wJkw0qZZhKHgCxUJhQ uaoSGGS5shuoo1gGM2Ft0MOvALsjoslMTqlF/L40ACqf/ZVEvjutZLLYAoWdbnrWd9mS nEVneBoT9gUMAjPPVUrbBvrpNdGC/IpT6med0ON30vB6CFPDd0SN2pU62YH3x4Ko4Vn7 Ioq+KIkxKNDP0MMNjQh3Hu/nGTIsUWYFN6U2dCU939KxZXOnYfvWcXox82aWPLqTvSq4 w+M5VsqCIMTZy/R47qF4tD36VkgRzLgvAsa96eILRrQMmwNvOauxqyjv8i/cqg/5wCQn T3Sw== 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=4mh5o9gxeUfBD7NzeoTZTme01fxrU7LqBgoBf7n9fQQ=; b=DfoI3whEwa9+87ES5xP1RIVbGzkxG0dHv8YB4nffRByuLGHhV1jg4E5e/IpJwvGxCT xacMHLghdBK/wZHCpiV5jpIAFvRI/vEV+Z1vGbDIdTshv4umGem/2e+j54HuWkQUJiW2 rLaZb80DnaXgSfhGCuZ1vr3j8+Dmt8YP1pS5AW2B8qbpnY+4OEA+2c/AUI5DApfObzyB /DXq4jS6dM48Sbagom3ya92NRaJKdzH4jshCfEjstXaMpzOc8/La7wxJgUJ5l2LC3FPu vAnaDRopKzlAAK9CjS+vZjbhRsIccz8lUPV9TYwl3G4cyBOZaEcq+oibiW6HUQIIBFlk ryFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=R98pF8MV; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p11-20020a056402500b00b00457f9c97f13si14508862eda.581.2022.11.09.06.56.29; Wed, 09 Nov 2022 06:56:54 -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=@redhat.com header.s=mimecast20190719 header.b=R98pF8MV; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231735AbiKIOzX (ORCPT + 99 others); Wed, 9 Nov 2022 09:55:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231263AbiKIOys (ORCPT ); Wed, 9 Nov 2022 09:54:48 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 071871D672 for ; Wed, 9 Nov 2022 06:52:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668005525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4mh5o9gxeUfBD7NzeoTZTme01fxrU7LqBgoBf7n9fQQ=; b=R98pF8MV7jz7LVhODcWpN3TyQ5ZvSQISZeSlSqdB2bbiuwtJZ2PswdfYebNQmKiFdZQAS+ eeZ4YryWkeLNO6sklQUAEPlgeHWkp4yRErNah/Cc5rbtTDDrHXd9JHDb8j/0JfUnaa87HQ 1fp6JHKw1cKM4R/CK9SLIRqZuINLPz4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-524-ieSxKkwqOOmc5D53rniUMw-1; Wed, 09 Nov 2022 09:52:00 -0500 X-MC-Unique: ieSxKkwqOOmc5D53rniUMw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4406B802551; Wed, 9 Nov 2022 14:51:58 +0000 (UTC) Received: from virtlab511.virt.lab.eng.bos.redhat.com (virtlab511.virt.lab.eng.bos.redhat.com [10.19.152.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16C95140EBF5; Wed, 9 Nov 2022 14:51:58 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: thomas.lendacky@amd.com, jmattson@google.com, seanjc@google.com, stable@vger.kernel.org Subject: [PATCH 03/11] KVM: SVM: adjust register allocation for __svm_vcpu_run Date: Wed, 9 Nov 2022 09:51:48 -0500 Message-Id: <20221109145156.84714-4-pbonzini@redhat.com> In-Reply-To: <20221109145156.84714-1-pbonzini@redhat.com> References: <20221109145156.84714-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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?1749030865705674500?= X-GMAIL-MSGID: =?utf-8?q?1749030865705674500?= In preparation for moving vmload/vmsave to __svm_vcpu_run, keep the pointer to the struct vcpu_svm in %rdi. This way it is possible to load svm->vmcb01.pa in %rax without clobbering the pointer to svm itself. No functional change intended. Cc: stable@vger.kernel.org Fixes: a149180fbcf3 ("x86: Add magic AMD return-thunk") Signed-off-by: Paolo Bonzini Reviewed-by: Sean Christopherson --- arch/x86/kvm/svm/vmenter.S | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/x86/kvm/svm/vmenter.S b/arch/x86/kvm/svm/vmenter.S index f0ff41103e4c..531510ab6072 100644 --- a/arch/x86/kvm/svm/vmenter.S +++ b/arch/x86/kvm/svm/vmenter.S @@ -54,29 +54,29 @@ SYM_FUNC_START(__svm_vcpu_run) /* Save @vmcb. */ push %_ASM_ARG1 - /* Move @svm to RAX. */ - mov %_ASM_ARG2, %_ASM_AX + /* Move @svm to RDI. */ + mov %_ASM_ARG2, %_ASM_DI + + /* "POP" @vmcb to RAX. */ + pop %_ASM_AX /* Load guest registers. */ - mov VCPU_RCX(%_ASM_AX), %_ASM_CX - mov VCPU_RDX(%_ASM_AX), %_ASM_DX - mov VCPU_RBX(%_ASM_AX), %_ASM_BX - mov VCPU_RBP(%_ASM_AX), %_ASM_BP - mov VCPU_RSI(%_ASM_AX), %_ASM_SI - mov VCPU_RDI(%_ASM_AX), %_ASM_DI + mov VCPU_RCX(%_ASM_DI), %_ASM_CX + mov VCPU_RDX(%_ASM_DI), %_ASM_DX + mov VCPU_RBX(%_ASM_DI), %_ASM_BX + mov VCPU_RBP(%_ASM_DI), %_ASM_BP + mov VCPU_RSI(%_ASM_DI), %_ASM_SI #ifdef CONFIG_X86_64 - mov VCPU_R8 (%_ASM_AX), %r8 - mov VCPU_R9 (%_ASM_AX), %r9 - mov VCPU_R10(%_ASM_AX), %r10 - mov VCPU_R11(%_ASM_AX), %r11 - mov VCPU_R12(%_ASM_AX), %r12 - mov VCPU_R13(%_ASM_AX), %r13 - mov VCPU_R14(%_ASM_AX), %r14 - mov VCPU_R15(%_ASM_AX), %r15 + mov VCPU_R8 (%_ASM_DI), %r8 + mov VCPU_R9 (%_ASM_DI), %r9 + mov VCPU_R10(%_ASM_DI), %r10 + mov VCPU_R11(%_ASM_DI), %r11 + mov VCPU_R12(%_ASM_DI), %r12 + mov VCPU_R13(%_ASM_DI), %r13 + mov VCPU_R14(%_ASM_DI), %r14 + mov VCPU_R15(%_ASM_DI), %r15 #endif - - /* "POP" @vmcb to RAX. */ - pop %_ASM_AX + mov VCPU_RDI(%_ASM_DI), %_ASM_DI /* Enter guest mode */ sti