From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 18E48436358 for ; Fri, 29 May 2026 22:22:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093381; cv=none; b=meoPRUQN3CRGNSdqx38Gg1koUeoPjUQornmeJ8Kn60sBuxKOO12ua6k0bvqxAWBMrlJwQAhjSfo1FVgJGSmKmD4DWxZFNu6ol21B8kOH9xXOl0u9xRprcFB/A3wgC6FD0yeGf2s1SFZoL7Z1YOKFC9x1vurGKLRxZ+TuO1oKteo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093381; c=relaxed/simple; bh=y7gBMyXrlhkkVrixZ3rMHYtJrOyLsBu671OBCVJh2sk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lsdC6ZGQj3gRA69tCRjZeTIhh6Ww1JUIHhDY7p12au5xjQvyyFxoeaBwRfVo7AAwTV2fyFn8hRL1Sdw1KMRPL6XO61md20dHVDnD6FZQL2EkUsYe6xpK8+JLJ6fWGhdvKVb6pBYH1tdFywWngsh9LFiIDzkf6f6FLP+8Cf/upZY= 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=A5L8bPr/; arc=none smtp.client-ip=209.85.214.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="A5L8bPr/" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2bd04e4fe3dso118360165ad.3 for ; Fri, 29 May 2026 15:22:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780093376; x=1780698176; 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=1d+7JTGp/HbwqWUEDQGxoEibOm7OCRTR3a6kaHjtDYs=; b=A5L8bPr/DG/tde906di8RuRDge7PPWczF3eRDYmvbnhaN7L4bgn4KwOLds716P/whg MuWH9oFlcw7utUmfTtbaQjBSGNkGYMbigTFVBuLDgdBe2dy0Byrzb5+Dyh442oLqsh0K aL52NYh/VJ9Sn2nqo9f8FcrAW2fLFvh9xyFV292CZV+l9Llybuwc1J0SaAvjzWHbskn4 VqifCa1Y9+6N29w8OW15GuLzF9P2yjQwuiIB2NNBu0aFCaJ65NGMqs3MKWBOwnTvv0lU 3Z+ZzFWSzw2vfCNK/hb/mQvk97pOdYjVQDNTqryHkOkkwiPrxb3KAkeFhamfvi/Xze4h 8iSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780093376; x=1780698176; 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=1d+7JTGp/HbwqWUEDQGxoEibOm7OCRTR3a6kaHjtDYs=; b=VuVLTwfr+dQ+oZFMHWYDMPbKUCOD6w2Nhg8NeKkJXEyOcF+FC0pRDFgvgE5aORFK1K PghIj3EnKXDEiYDp/mXlGSk6huaU4QA2AYqZqBOJIXzXmyd1BRgPcKUsS2fg3ao41hto J5/kweLylenA3KSendqaZFEDKFzkWOyRuOg9AzeqRTCLe7YT+J39dTPIefox2QvBKYLa LnEotA2jgWSvSFoWnsL1QHhD9kEYoKD9IN1o1Ye2Dwhs0ra8PY9JG+cCM0X+40CWby0x 7RNiRMzVrRP8ou450jYMTa0xwTx8rjxcRKpUywPxp0le4/aKL6PuwAbu9w/vO5oa7PTC HYMQ== X-Forwarded-Encrypted: i=1; AFNElJ+2F6inSUkHhMjKsg7rMwTzDcNF3s63y89POdP0pWyVn3viAEe5KOdSXpL2+143C0tDXx5tWkbxKJi3RwQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw24mNxcb2zdxSLclCwMbUmfIvF4sngSf8VT6tsD8DCrjcj26Th b6pbjIjSfrpSxUG9DzpsCwdG8wj/nuoVrkeRGbwrdu5HmzeCxJi2c7jmdywobTV97KNrIExNeiR 93w9oVA== X-Received: from plqq10.prod.google.com ([2002:a17:902:c74a:b0:2be:bf91:ff92]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:8d0:b0:2bd:c5f8:504f with SMTP id d9443c01a7336-2bf368d9ee5mr18560845ad.40.1780093375621; Fri, 29 May 2026 15:22:55 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 15:21:54 -0700 In-Reply-To: <20260529222223.870923-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: <20260529222223.870923-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260529222223.870923-12-seanjc@google.com> Subject: [PATCH v3 11/40] 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 , Binbin Wu , David Woodhouse , Kai Huang 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. Acked-by: Kai Huang Reviewed-by: Binbin Wu 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 2f5a1c58f3c5..876dc2814108 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.54.0.823.g6e5bcc1fc9-goog