From nobody Mon Feb 9 02:11:46 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF01B153513 for ; Fri, 23 Feb 2024 20:42:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708720963; cv=none; b=mMsfKNdAyoT2hDBWbGT4CilCeOs7hEdZGG6xXBJswis7oYXBR2BgXylbfJwHk9lS1YL9YVtJb735yFlOalogK8B2kSkjkbDpvbe2zbOprf+bq2b349H1+bEzflbHv84E/JVs1g1Cuex7Rw92ieOeDNWRGeDSL3Rjn3qc+BUb8D0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708720963; c=relaxed/simple; bh=k0eGgIhqmjJk6wFzrviaHr5FNb9k9KBeDzh45p9EPkE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gcWVYv/c6Mpyt3jp5eieCfATBdXXvtC5eswmaV76ZX00zMqnLIytVVGdYq4VxIWZlUD9KR6cK1MIhGqSM7cOaW1UiIbkxXZ/34bXdUPFIopbA+jPVgpFNN/nC+R7ZsYDKcx96b8esA9cE1E4tDZItjvAUEceQY9NpyGC+9JrDZw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=RLIu/5iD; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RLIu/5iD" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dcd94cc48a1so1230281276.3 for ; Fri, 23 Feb 2024 12:42:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708720961; x=1709325761; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=WHWPH6O3SBPytu8N+jRZuhsLbq0a353cKtc0xEMWOV0=; b=RLIu/5iD+zoqz+RhAk4fuiuqkqid5WFfoPhfWiE6bPZFM1UBaYyO31gLwX0lkQdAHy m9Em4E/FzUnXHoT7SgxtWq22sxR7xWhn0Nwqf+mnWbm0b/Ti3q/WzJ2BuXVgOmDjSgqQ BAHknm4jSYZrn2AaO6TBsMcql264PyXtSJ5OvxSrJFYG6MAqhBM4ZF1+espF2R/OViiI WSPhvIAiMxMUzYOjN6NwxnGCGQLqWw/mdrmL3ciHEBPno7u2o3QtfxxCAgh3b16mNw6w ///KC83uv+5e/kgfQdTHRsAvyu6OizCwY0jyAw58cADa2hH0u7QI9cKHpbUboWfbBSfY N3lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708720961; x=1709325761; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WHWPH6O3SBPytu8N+jRZuhsLbq0a353cKtc0xEMWOV0=; b=vqXt8jeKEdwqFSI/aFSzVFR0d2G1xtoPUP/Gy0lxPjUdy42l+XEVVDUiiB1ru+fbN8 9vuGBh91qX1jHLwfFZQ0n+3MB00aITlMry02bFO6a7cd5cmGYYJV0jadMVkXooPcNsA+ OMrB2eRAXVlFEQvCDsf8BWuimhW40dvGyVqeZU81PVSvXj9qvvaLWWg1KthRSIaLInIS VfucKCmd+44gcboFw2TJ8mRsSyzyqKbsBGKnsHmdrbKoLomuVDWK2YtO5KBEQ2mqSuM+ l4AXw3CemGlaCI7douUjC4l1DGoDXzcvHRYD8TAKLSOhIwYPYdOxuaEpg1m2N9EG4Fh4 dNLg== X-Forwarded-Encrypted: i=1; AJvYcCXQxGlrPk8w9fVtcY9j42TF44ipi1xlZwcIlPE/OI4o1be2tvC16Q7M3Pt7XAvNgjL2u3ZTN8QLZ9yEp6ZeqLfGV34NBdP1kDSLGEXh X-Gm-Message-State: AOJu0YwLa+0J9vGnNmmyv34FkonXfkHQH1161LoByM52VODyMqPdancr 0BuH2rirBKNSqDWMPMVlyS8pBI1YBl3CHcq4WH4MeW+id50j4nU9r7beAq5W8o1hK9GA1Pae189 urg== X-Google-Smtp-Source: AGHT+IEs8R1+cXtTADIm679PXjQV+EhmLQgYPjuzJbrMcPnC6qlCVjp69a/NLgbvariU2BnkW2q+mhoIrzo= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:aae5:0:b0:dc7:7ce9:fb4d with SMTP id t92-20020a25aae5000000b00dc77ce9fb4dmr242093ybi.12.1708720960791; Fri, 23 Feb 2024 12:42:40 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 23 Feb 2024 12:42:28 -0800 In-Reply-To: <20240223204233.3337324-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240223204233.3337324-1-seanjc@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240223204233.3337324-4-seanjc@google.com> Subject: [PATCH 3/8] KVM: SVM: Drop 32-bit "support" from __svm_sev_es_vcpu_run() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Lendacky , Michael Roth , Alexey Kardashevskiy Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Drop 32-bit "support" from __svm_sev_es_vcpu_run(), as SEV/SEV-ES firmly 64-bit only. The "support" was purely the result of bad copy+paste from __svm_vcpu_run(), which in turn was slightly less bad copy+paste from __vmx_vcpu_run(). Opportunistically convert to unadulterated register accesses so that it's easier (but still not easy) to follow which registers hold what arguments, and when. Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/vmenter.S | 44 +++++++++++--------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/arch/x86/kvm/svm/vmenter.S b/arch/x86/kvm/svm/vmenter.S index 7ee363d7517c..0026b4a56d25 100644 --- a/arch/x86/kvm/svm/vmenter.S +++ b/arch/x86/kvm/svm/vmenter.S @@ -298,17 +298,12 @@ SYM_FUNC_END(__svm_vcpu_run) * @spec_ctrl_intercepted: bool */ SYM_FUNC_START(__svm_sev_es_vcpu_run) - push %_ASM_BP -#ifdef CONFIG_X86_64 + push %rbp push %r15 push %r14 push %r13 push %r12 -#else - push %edi - push %esi -#endif - push %_ASM_BX + push %rbx =20 /* * Save variables needed after vmexit on the stack, in inverse @@ -316,39 +311,31 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run) */ =20 /* Accessed directly from the stack in RESTORE_HOST_SPEC_CTRL. */ - push %_ASM_ARG2 + push %rsi =20 /* Save @svm. */ - push %_ASM_ARG1 - -.ifnc _ASM_ARG1, _ASM_DI - /* - * Stash @svm in RDI early. On 32-bit, arguments are in RAX, RCX - * and RDX which are clobbered by RESTORE_GUEST_SPEC_CTRL. - */ - mov %_ASM_ARG1, %_ASM_DI -.endif + push %rdi =20 /* Clobbers RAX, RCX, RDX. */ RESTORE_GUEST_SPEC_CTRL =20 /* Get svm->current_vmcb->pa into RAX. */ - mov SVM_current_vmcb(%_ASM_DI), %_ASM_AX - mov KVM_VMCB_pa(%_ASM_AX), %_ASM_AX + mov SVM_current_vmcb(%rdi), %rax + mov KVM_VMCB_pa(%rax), %rax =20 /* Enter guest mode */ sti =20 -1: vmrun %_ASM_AX +1: vmrun %rax =20 2: cli =20 /* Pop @svm to RDI, guest registers have been saved already. */ - pop %_ASM_DI + pop %rdi =20 #ifdef CONFIG_RETPOLINE /* IMPORTANT: Stuff the RSB immediately after VM-Exit, before RET! */ - FILL_RETURN_BUFFER %_ASM_AX, RSB_CLEAR_LOOPS, X86_FEATURE_RETPOLINE + FILL_RETURN_BUFFER %rax, RSB_CLEAR_LOOPS, X86_FEATURE_RETPOLINE #endif =20 /* Clobbers RAX, RCX, RDX. */ @@ -364,26 +351,21 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run) UNTRAIN_RET_VM =20 /* "Pop" @spec_ctrl_intercepted. */ - pop %_ASM_BX + pop %rbx =20 - pop %_ASM_BX + pop %rbx =20 -#ifdef CONFIG_X86_64 pop %r12 pop %r13 pop %r14 pop %r15 -#else - pop %esi - pop %edi -#endif - pop %_ASM_BP + pop %rbp RET =20 RESTORE_GUEST_SPEC_CTRL_BODY RESTORE_HOST_SPEC_CTRL_BODY =20 -3: cmpb $0, _ASM_RIP(kvm_rebooting) +3: cmpb $0, kvm_rebooting(%rip) jne 2b ud2 =20 --=20 2.44.0.rc0.258.g7320e95886-goog