From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 D23833E0C5C for ; Fri, 29 May 2026 22:22:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093376; cv=none; b=KLSnjndVu7ZK+Q4fseIzyP9UxkfUrXrGu4KYVOQrs8TCq+M3EjhETJDiOJWCiwWPv/v2FcGt3uo4l9ZZPqxXfOy9uaE3pw+Tk0cCgRI6586A33aYQO8l9Q4sd9xPmVYe65wFPYgX196dqyNPvcm+2Qh9T4ulFup8tZPsXMcHOWI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093376; c=relaxed/simple; bh=rNEMOfQP0lISV4GXkkh7r4YHYgmX95gg+RO88qDWtLA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qbfuR7/1IvvykrCW9kVrH4vmIPcyyb1VipofhBnIb2yILtguoZx+LjzaeYdO0O2nDFckTd6sy/DfCTvCFnCeh2Ok/vFl6FPGa01fD0r80ZEPtYpFldKVPglhjkmrX/9UZTkMw+c63pdpB3jg2AOzK8d0/ufTxfSh2/LUg21g5uA= 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=X9FoXxLR; arc=none smtp.client-ip=209.85.210.202 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="X9FoXxLR" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-8422aa07fe2so58596b3a.2 for ; Fri, 29 May 2026 15:22:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780093368; x=1780698168; 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=IFUIQ/grqF4H0Xyudg/Qm5uUCCNXYoJ9yfo9zM/sbkk=; b=X9FoXxLRCfoRy11dmMlzJPQzdEcFkvbPH4ZyXOxHrh4rD0UqB7nI33XDYdQKetSF2+ Hn4oTGhlbu4I9Lb04v7ivE2rDtvUTJEK+cihxP17PmT8putSG5JOeS38AztDHoVwQUyw Kle1YmsYH75pldbcqkacPJBMYze15F9YbdVh5wG4onY2CMhSWQHHEN/9Zv/SL6NTW/n6 bTB8GoMgZ3F4T9ImySSQPJXOvYgl2StdOOmGQnPYu8C74xZunZmM2EOFRJLEl0TajVex poI7u9ofCxukYtw9qKhPfgWab8NXqE2IY8JhpHT661RcI0w36njfuXdzPojN0S8ZeqC0 TDgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780093368; x=1780698168; 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=IFUIQ/grqF4H0Xyudg/Qm5uUCCNXYoJ9yfo9zM/sbkk=; b=G2sFqs+i/y+W8UHOYmT0vnCjnrK7JZlQ+WH/kgYyI6fo5jp2SBbb4m4haJTki/bnLU lu2diKW3zT9fl2z20SfhMHJuKBlgpIKSd/s9dy388RXU/xb5FxFvH1NR9X9PgdqGf5S7 FD8IDA+e1q4eAXfk0hed3vsJD7QIqZNGGD8mJU0fH2Uzw4oqWKLRKbgHfEbIWYxP3Yg0 5xDC/lr0JYH60saj8wy4PB12768377UAHtKcTSTYD4OiAC50bAulwMrlNhEGkthMJ8qG o0ictqALb7q4ACL9BYJqfHnyY6OjKkDrBj28Z0dvmzyA/fYQXwKJicuX+qriUILB9EU2 JnOQ== X-Forwarded-Encrypted: i=1; AFNElJ+8zuhSwqo3B8o8RyStrl9DXbwVAUdFz8Cou66nauYHKi7LE/GgPuV1aG0qY+tqDxAqngygYHo6Obc/Q4I=@vger.kernel.org X-Gm-Message-State: AOJu0YzbnFLsQEbXWNPcUZgzSqSjuqKBPedAKM9VtkmahCVYmPYxsHid Wzzphnv3QjGUYmVpP+jrv4pEm8pwB0aGP0ic58I3tyaqkFiQsK3oVxhCvI8AvMcNP71LoHjfXk5 FLUBpeg== X-Received: from pfbk22.prod.google.com ([2002:a05:6a00:b016:b0:842:1f96:2713]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:27a0:b0:833:2398:cde2 with SMTP id d2e1a72fcca58-8422570a361mr1184893b3a.43.1780093367744; Fri, 29 May 2026 15:22:47 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 15:21:47 -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-5-seanjc@google.com> Subject: [PATCH v3 04/40] 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" When getting register values for ENCLS emulation, use kvm_register_read() instead of kvm__read() so that bits 63:32 of the register are dropped if the guest is in 32-bit mode. Note, the misleading/surprising behavior of kvm__read() being "raw" variants under the hood will be addressed once all non-benign bugs are fixed. Fixes: 70210c044b4e ("KVM: VMX: Add SGX ENCLS[ECREATE] handler to enforce CPUID restrictions") Fixes: b6f084ca5538 ("KVM: VMX: Add ENCLS[EINIT] handler to support SGX Launch Control (LC)") 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 df1d0cf76947..4c61fc33f764 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_rbx_read(vcpu), 32, 32, &pageinfo_gva) || - sgx_get_encls_gva(vcpu, kvm_rcx_read(vcpu), 4096, 4096, &secs_gva)) + 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)) 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_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)) + 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)) return 1; /* -- 2.54.0.823.g6e5bcc1fc9-goog