From nobody Tue Dec 16 14:39:04 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 1718933BBDA for ; Thu, 30 Oct 2025 20:11:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761855062; cv=none; b=pXzEM2nPfTMdrWRO4ydr24UK1ZTbANU+RiDHSM+/jHuGgK4l8FKYXUV4FLhA+H8QuvWIhB8IhQ/S76QLzQLdEc9mxcnZp7NcYa9CPXARLtfQfZPZE6Go5AKI+VbcufKTV3rGAfvHbmje/GzyPXdDG8uZW8yjGarwzmaNGZSCtVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761855062; c=relaxed/simple; bh=P1goZ+98qKVEWbuRxPkvfQzAqWl2KpW9bCv/jdGFRzQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XIjlNUn6gEYAY/ZHeeWK/3CvMIv6a74WNKOr/FmuI/nqD0/o3UPYjQjscWwcETWjCFT0toRyZZV/HQrTKciFS+n5H0NxKjNbYHQE0pRrPalVc4g2kqHraIrTR/ziWhPO9ZF1VzgLQD4L+GCpYwyEzu9Sge68pCl04r1MeWq3CZI= 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=G7K9ZvO9; arc=none smtp.client-ip=209.85.210.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="G7K9ZvO9" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-7a675fbd71eso2043876b3a.2 for ; Thu, 30 Oct 2025 13:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1761855059; x=1762459859; 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=ZPfEDjublRysEg+wBq1Bud0evQ6Qw3SUr7bZgrR40cM=; b=G7K9ZvO9zSv+TXHHSNOZRrOzTdgbjhJ6ptgUUZ+lPfcKTfp+V4UKer0oJgPQLYLG1T LBIBF5GUOgZvmM76IIiabt4TFdYxtfOaZVhl4UWkkRY57MB79GvcAo51ivcuzfMUmh1S NlVgsOJuhKUlF20SmsqKEwyfxIeJH6GA+hAvheredf75iowyteros74dUQS9VyFpKWPa PGN2YrZmirqhXlaYy0/iKDkVD6TmWeXoG8gXIiS6HeB6yU+aCcFpj7mdNmTWCoA6TxzQ KqlxjNapCrJGghp5EZgb7tQvcdE638b6p0ayOQyUiCYChed4nvss7EjFVQ+qpQIm+LIe y+sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761855059; x=1762459859; 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=ZPfEDjublRysEg+wBq1Bud0evQ6Qw3SUr7bZgrR40cM=; b=pGHJn+naDuDkZ9QMOxuSxNHaTruFb+S/OLO3DhJ3DYiRsCpR8bxc7LMhd0yxcUltUQ e6OXjUEgvms4aUfPIZQNSyFet3Jdc6jkf2/vwriakHFJVGVDupWp9xdEQfqTdid18Go0 7ftpsjIagHR/jZ/JmqLkydl0kmTSU+z13wN2dC9Q0rEYswCca4hlTCZdxXTGawtW2cEr agNfpHShtvWW49x+CA/+50E/wdQizh0Wx9kdo6V9Tw/hXTNmmaeKoXkH9I5AaaXglUAM QFH02jL2hFLvi6n/Xvg42c/KhNhcP0JwrjQ1FlvVVgC4Ko484wNjtlP2uozkjh7FG4tD r2yQ== X-Forwarded-Encrypted: i=1; AJvYcCWhPttV6zuRwS60VWiHxm2DT8Ay7RTTYb36Js4H8l2hHwE98SzWjePK2lvkvJRv1r5LXXLZOnXnECgyAjA=@vger.kernel.org X-Gm-Message-State: AOJu0Ywl6GluF1/apQnftt+m4+6oUIjGoCMeyaz36qUdmYpdUW1GpKTW h9t6b8dEvRt5+vhk8X7tQLcyuNk23F6ZPpqw0BE4Fn+D87n6qLA94GUPeicm/iAJKGZ9PSGnC3Z K5kmsdg== X-Google-Smtp-Source: AGHT+IE4oqFNhFQQZr1IyqSPUxhZWizKY8+4h3k61YypjXkX/4HyRwAM2GyKD7DH49xWshMyjNqw52ssRLY= X-Received: from pfbgi4.prod.google.com ([2002:a05:6a00:63c4:b0:793:b157:af42]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2283:b0:7a2:721b:adb6 with SMTP id d2e1a72fcca58-7a77a9cb11amr747302b3a.28.1761855059275; Thu, 30 Oct 2025 13:10:59 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 30 Oct 2025 13:09:47 -0700 In-Reply-To: <20251030200951.3402865-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: <20251030200951.3402865-1-seanjc@google.com> X-Mailer: git-send-email 2.51.1.930.gacf6e81ea2-goog Message-ID: <20251030200951.3402865-25-seanjc@google.com> Subject: [PATCH v4 24/28] KVM: TDX: Use guard() to acquire kvm->lock in tdx_vm_ioctl() From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini , "Kirill A. Shutemov" Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, x86@kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Ira Weiny , Kai Huang , Binbin Wu , Michael Roth , Yan Zhao , Vishal Annapurve , Rick Edgecombe , Ackerley Tng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use guard() in tdx_vm_ioctl() to tidy up the code a small amount, but more importantly to minimize the diff of a future change, which will use guard-like semantics to acquire and release multiple locks. No functional change intended. Reviewed-by: Rick Edgecombe Reviewed-by: Kai Huang Signed-off-by: Sean Christopherson Reviewed-by: Binbin Wu --- arch/x86/kvm/vmx/tdx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index d6f40a481487..037429964fd7 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -2806,7 +2806,7 @@ int tdx_vm_ioctl(struct kvm *kvm, void __user *argp) if (r) return r; =20 - mutex_lock(&kvm->lock); + guard(mutex)(&kvm->lock); =20 switch (tdx_cmd.id) { case KVM_TDX_CAPABILITIES: @@ -2819,15 +2819,12 @@ int tdx_vm_ioctl(struct kvm *kvm, void __user *argp) r =3D tdx_td_finalize(kvm, &tdx_cmd); break; default: - r =3D -EINVAL; - goto out; + return -EINVAL; } =20 if (copy_to_user(argp, &tdx_cmd, sizeof(struct kvm_tdx_cmd))) - r =3D -EFAULT; + return -EFAULT; =20 -out: - mutex_unlock(&kvm->lock); return r; } =20 --=20 2.51.1.930.gacf6e81ea2-goog