From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 6EF8B3AA1A4 for ; Thu, 9 Apr 2026 23:56:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775779008; cv=none; b=p+8en81G1/FvlkvzcmKjBSHj4ykj9KJ7QrmIdtDERH1DlOK8lwzp2GTclCpzrQmgQXWp27lgk58mspd+JXfIFZldg14vNj4zYsfbRUfO6xTazdO8vCfck2P2StX3W28h4ge4AaBY3eqjHQ4kDRbZt8zdVnkRS/7SKJ9MHT2lblM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775779008; c=relaxed/simple; bh=4VSiwzk65MALSPIh6+qTgVvk/o5YZM/uQIkuW0RxpUA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JU2kJvl4vzfZJTngs4+9eRas7bc5P8dvXdIiMLudPCgCuVYPuyDV+IHyIVlJm6yip47qI2eGzgBjOJD97AmT1hMHrKru0V5ZdK29m7xpX0TL5Vj8aqXc0Zbeft55afqW2h+yLSpTn1Jh2ir8yMAULNp1qh70Zw6Ja/1zy623TJg= 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=LVESAgFO; arc=none smtp.client-ip=209.85.216.74 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="LVESAgFO" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3594620fe97so4118396a91.1 for ; Thu, 09 Apr 2026 16:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775779007; x=1776383807; 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=7CIhqJpO1II+dflKt7LF6AvVPHOYrkF3a/Du1JRh6EY=; b=LVESAgFOEdyAdkexc4diLa5a8DoZDkJxqODjhAj3n4eNqp2UXr2AV1cKx+rt0uGDbS KiCVCwbfHhGDAWEJTRG/lUtcu3D+6a2RFh64fCwFjcmQAy7IVflJBKQZDgU/EDU89eF/ btRlN9+kC8F1zrYDgi7kCy7yL0Wz5FNf+dCf1m46zaQCyF+jMVsCtLq5JPoJKkVsaSh5 YRQ6ZoXREClNsqRj6d0x9u6eearSLrDYDISXkauL7fI9UiFDmww/MzU997ALYzeKH27t o+8ns4UvmPjAL/ZnkFqnlOcBjGRWGxDWfsgl+FDKSbWxCzdfCzLgWTa5OhuxvgdV9rLY a+EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775779007; x=1776383807; 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=7CIhqJpO1II+dflKt7LF6AvVPHOYrkF3a/Du1JRh6EY=; b=UGhxHG5MzdHaDzUCIrkQaBdkm1hZYB3sbrOXxkpgjDI0CDubwYutL+bPts+F/vdKKj QyC5NYsRLCiU0Ge/kgol9JGknOJEkiq0AkWy1u/eNUGPbk0iMlWfxopOpuvdjzsmczHz tj95OBtaisq9/68bpQHfLJpuMPg9OZ70b5eeuTa6TsdXo9ldiHzE3AmRjliEm8mVvJwN 2ZZd79lWb1U7wLnPdsgnWE3/OcQTgdIX6W5wzLvQQk35rvFe88sNgeMfeuAY4tHSSd8V OafBSKT/ZiQ+as2F7m+ZHnB1x3xwev9itCaGcUNCgbKQHTJBjRoR6rElPhUsq/296Pyw iucw== X-Forwarded-Encrypted: i=1; AJvYcCUlDpKG9TQtRE/QEdWajQja2tLN6GzdtN42jPCWFpW8gW/+PlL31Pl+EFzNYiDZhxbB4Ro4mbODBTF/ltA=@vger.kernel.org X-Gm-Message-State: AOJu0YwST4V09g4dR28t3zk+LTUiwE3R7IO11LE8Ylo0dKHC2yJ3QEC5 LOIjw2pr3O1rUGN2LJJwL3CrU4AE4LJChA6H33+37PyVfyynZwD9ol/rkZTyNhU45wMkja4OPjr G8XhPag== X-Received: from pjbmg17.prod.google.com ([2002:a17:90b:3711:b0:35d:a66b:b3eb]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:48c1:b0:356:1db4:8fe5 with SMTP id 98e67ed59e1d1-35e42869741mr970386a91.29.1775779006701; Thu, 09 Apr 2026 16:56:46 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 9 Apr 2026 16:56:21 -0700 In-Reply-To: <20260409235622.2052730-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: <20260409235622.2052730-1-seanjc@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260409235622.2052730-11-seanjc@google.com> Subject: [PATCH 10/11] Revert "KVM: VMX: Read 32-bit GPR values for ENCLS instructions outside of 64-bit mode" From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov , David Woodhouse , Paul Durrant Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed Content-Type: text/plain; charset="UTF-8" Now that kvm__read() are mode aware, i.e. are functionally equivalent to kvm_register_read(), revert aback to the less verbose versions. No functional change intended. This reverts commit 60919eccf6764c71cef31a1afeaa1a36b8e5ab85. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/sgx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx/sgx.c b/arch/x86/kvm/vmx/sgx.c index 4ca11e5ff4eb..5476743b66e7 100644 --- a/arch/x86/kvm/vmx/sgx.c +++ b/arch/x86/kvm/vmx/sgx.c @@ -225,8 +225,8 @@ static int handle_encls_ecreate(struct kvm_vcpu *vcpu) struct x86_exception ex; int r; - if (sgx_get_encls_gva(vcpu, kvm_register_read(vcpu, VCPU_REGS_RBX), 32, 32, &pageinfo_gva) || - sgx_get_encls_gva(vcpu, kvm_register_read(vcpu, VCPU_REGS_RCX), 4096, 4096, &secs_gva)) + if (sgx_get_encls_gva(vcpu, kvm_rbx_read(vcpu), 32, 32, &pageinfo_gva) || + sgx_get_encls_gva(vcpu, kvm_rcx_read(vcpu), 4096, 4096, &secs_gva)) return 1; /* @@ -302,9 +302,9 @@ static int handle_encls_einit(struct kvm_vcpu *vcpu) gpa_t sig_gpa, secs_gpa, token_gpa; int ret, trapnr; - if (sgx_get_encls_gva(vcpu, kvm_register_read(vcpu, VCPU_REGS_RBX), 1808, 4096, &sig_gva) || - sgx_get_encls_gva(vcpu, kvm_register_read(vcpu, VCPU_REGS_RCX), 4096, 4096, &secs_gva) || - sgx_get_encls_gva(vcpu, kvm_register_read(vcpu, VCPU_REGS_RDX), 304, 512, &token_gva)) + if (sgx_get_encls_gva(vcpu, kvm_rbx_read(vcpu), 1808, 4096, &sig_gva) || + sgx_get_encls_gva(vcpu, kvm_rcx_read(vcpu), 4096, 4096, &secs_gva) || + sgx_get_encls_gva(vcpu, kvm_rdx_read(vcpu), 304, 512, &token_gva)) return 1; /* -- 2.53.0.1213.gd9a14994de-goog