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 0447A1F4281 for ; Tue, 28 Oct 2025 00:37:05 +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=1761611827; cv=none; b=SJWOVmNAXZ52/YOd5yEr3Lbs6EHF/VaOdpPpkW5uxhpuMIDS3S1u4OJk0qxA4mgcgTgcbQaJcUvboRWiwIU1W3UNc4MjQc/937lZzGmfsGZBfRBi/uNhhinMWdffY5i7rKH+ooDXTzaje/JtRgzZklbvkScYxF+cVvHHigWHj+Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761611827; c=relaxed/simple; bh=QdkEAMsGYBzU3fN0cne5qZg46IOFvPzz9xbD2HV7VAQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=D5Ty51yS1V3Vz+p6iC7VOrpnFRLFheV0/QMvnz1FNZ6fFlPei0G3F/NAgzxp+fuYzu2M3LkLR+fKSN69rGBSaqscocGoNS6yxDrDBQi1lYpySqtWzdPCxR2SRXIsn4t8kGfIWTnDDua5cvqn44dSHF5EiQL5xoqKxO1YOk0CW6A= 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=2/V6+zXH; 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="2/V6+zXH" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-33dadf7c5beso4768945a91.0 for ; Mon, 27 Oct 2025 17:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1761611825; x=1762216625; darn=lists.linux.dev; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=J3mxOKer4OGfyDxlfqvGDsZ/A3KYgtdet3LczK0ONqE=; b=2/V6+zXHWCHrK5V2LqsfcRTm+vH8YC2yk+fp0qjdAI4mg6ooPBAiBEdbNhEYXKWySc dBfunVGTyX9F+nbI5mkvI+MLNS8SPItgY0sFQj8jdhfTiV13gWC1L1JVTtzk81DXGXB4 MtzbDS26dz+3Hkat9jedrtzrILqY3hOG7BtmkdViJH13dPFmOYe4yX7fmIwziH+/KQKY bZaOcEzZQgOIK0iGhQNQJA2mQYFCsEwNtU5Q9AfYgfbhH2OCtzrDkdbPMqK/eBtaGQy9 7OkYUPxp8pJHtdjE1RqXsck6DbCrIye/h4wVmcV6jPpu46eJ93p6O+/aOF3FXTD/9rsA OXyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761611825; x=1762216625; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=J3mxOKer4OGfyDxlfqvGDsZ/A3KYgtdet3LczK0ONqE=; b=a3TI37eCt1m8onL8ANfr6XlEzY5DKhowItUgaeVaV5pNhNP8Ny3AYsYQhCG3sNVlEM OulLjkuTyx/Lj6Lctsf48Y34EB3yGQFuPmZMoFSLTR70sapkOXdpfk5CIK2DnQqmUYMz UdPB78dYN9TJoiBWL+2jcf8CSPiQUEWqTBzE+gtThHpI7Ez7ov96knIYPoEfYYtDKWKS p0fQ6lx7RDu5dlef3m0SRj48SCJECwgGRo/K1hm2a8NHssqqUfs34WsYmgsOSzo9hTrB C0AtOF0xNwPf8uX6NPvlneDITkBGJtB3bqdx+lYa+haLLOWeWBDpaAEy1ly6a4bcEQOz FeNA== X-Forwarded-Encrypted: i=1; AJvYcCWN5jK+WBSR37mj2d6sqEoZkI5JBqXTqHdzk2i6Lf7GoyQqBY2SJOzmEYdXUOIACapy4FFxo/UzI39m@lists.linux.dev X-Gm-Message-State: AOJu0YzKJz3yNtm7uDD3badkhC5oZTnH8uOzpJak7O7RLZlsFHCwPria R5/jWZKMGNVABCtHBJc4srZc3FOTSOPNWpajFiV++O+8+XMpB1V9CUaZOhETSy9yuKsovctXMut wp+XvUw== X-Google-Smtp-Source: AGHT+IGoxyiEdJHjsguM4HhfYAa3a3WGl9IwGzua+OMwKu3+3dxnKcX9NeqRP2yYPcwFhiCcHGTefjSDvqI= X-Received: from pjcc13.prod.google.com ([2002:a17:90b:574d:b0:33d:813f:6829]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5241:b0:329:cb75:fef2 with SMTP id 98e67ed59e1d1-340279e5c84mr1590788a91.3.1761611825209; Mon, 27 Oct 2025 17:37:05 -0700 (PDT) Date: Mon, 27 Oct 2025 17:37:03 -0700 In-Reply-To: <55461c549803e08db97528127c29e092c597adc5.camel@intel.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251017003244.186495-1-seanjc@google.com> <20251017003244.186495-25-seanjc@google.com> <55461c549803e08db97528127c29e092c597adc5.camel@intel.com> Message-ID: Subject: Re: [PATCH v3 24/25] KVM: TDX: Guard VM state transitions with "all" the locks From: Sean Christopherson To: Kai Huang Cc: "chenhuacai@kernel.org" , "frankja@linux.ibm.com" , "maz@kernel.org" , "borntraeger@linux.ibm.com" , "pjw@kernel.org" , "aou@eecs.berkeley.edu" , "kas@kernel.org" , "maobibo@loongson.cn" , "pbonzini@redhat.com" , "maddy@linux.ibm.com" , "palmer@dabbelt.com" , "imbrenda@linux.ibm.com" , "zhaotianrui@loongson.cn" , "anup@brainfault.org" , "oliver.upton@linux.dev" , "kvm@vger.kernel.org" , "linux-coco@lists.linux.dev" , Yan Y Zhao , "michael.roth@amd.com" , "linux-kernel@vger.kernel.org" , Ira Weiny , "loongarch@lists.linux.dev" , "binbin.wu@linux.intel.com" , "ackerleytng@google.com" , "kvmarm@lists.linux.dev" , "kvm-riscv@lists.infradead.org" , Vishal Annapurve , "linuxppc-dev@lists.ozlabs.org" , Rick P Edgecombe , "linux-mips@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-riscv@lists.infradead.org" , "x86@kernel.org" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Tue, Oct 28, 2025, Kai Huang wrote: > On Thu, 2025-10-16 at 17:32 -0700, Sean Christopherson wrote: > > @@ -2781,8 +2827,6 @@ int tdx_vm_ioctl(struct kvm *kvm, void __user *ar= gp) > > =C2=A0 if (r) > > =C2=A0 return r; > > =C2=A0 > > - guard(mutex)(&kvm->lock); > > - > > =C2=A0 switch (tdx_cmd.id) { > > =C2=A0 case KVM_TDX_CAPABILITIES: > > =C2=A0 r =3D tdx_get_capabilities(&tdx_cmd); >=20 > IIRC, this patch removes grabbing the kvm->lock in tdx_vm_ioctl() but onl= y > adds the "big hammer" to tdx_td_init() and tdx_td_finalize(), so the > tdx_get_capabilities() lost holding the kvm->lock. Ooh, yeah, nice catch, that is indeed silly and unnecessary churn. > As replied earlier, I think we can just hold the "big hammer" in > tdx_vm_ioctl()? Actually, I think we can have our cake and eat it too. With this slotted i= n as a prep patch, the big hammer can land directly in tdx_vm_ioctl(), without a= ny change in functionality for KVM_TDX_CAPABILITIES. -- From: Sean Christopherson Date: Mon, 27 Oct 2025 17:32:34 -0700 Subject: [PATCH] KVM: TDX: Don't copy "cmd" back to userspace for KVM_TDX_CAPABILITIES Don't copy the kvm_tdx_cmd structure back to userspace when handling KVM_TDX_CAPABILITIES, as tdx_get_capabilities() doesn't modify hw_error or any other fields. Opportunistically hoist the call to tdx_get_capabilities() outside of the kvm->lock critical section, as getting the capabilities doesn't touch the VM in any way, e.g. doesn't even take @kvm. Suggested-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/tdx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 1642da9c1fa9..43c0c3f6a8c0 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -2807,12 +2807,12 @@ int tdx_vm_ioctl(struct kvm *kvm, void __user *argp= ) if (r) return r; =20 + if (tdx_cmd.id =3D=3D KVM_TDX_CAPABILITIES) + return tdx_get_capabilities(&tdx_cmd); + guard(mutex)(&kvm->lock); =20 switch (tdx_cmd.id) { - case KVM_TDX_CAPABILITIES: - r =3D tdx_get_capabilities(&tdx_cmd); - break; case KVM_TDX_INIT_VM: r =3D tdx_td_init(kvm, &tdx_cmd); break; base-commit: 672537233b8da2c29dca7154bf3a3211af7f6128 --