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 1BA4933BBDF for ; Thu, 30 Oct 2025 20:11:00 +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=1761855062; cv=none; b=CbLZwWkSKndzYvo1ijA6thk9mvjJ9BX7l/MXSIz5nIej+kfmaOx6bVVsys7kQmYwV8F83GzmzRpbCV7SVUoFutQTpo/wm70CCzxzTl8+nPbrY0Kjdl0Mc+OeBC0F8fge4oWY7ap733BCvMgQjVP/RR1Xp9O24hwyJPADr0HuSuY= 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=B1rst4AB; 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="B1rst4AB" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7a432101881so2610780b3a.0 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=lists.linux.dev; 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=B1rst4ABFDdK50m54yfW3H9ooDyTUn9P2jCAYXWhADCIH0VIcohEhpcrS3lu33l1+L gbRyR1Ntke+jO2fjihSSeOuNkr9BBbr/vHcIcEwWu1CDpRezk/OlgWJBUWLI3fLMJCyO 0CUWg9DYGJjEebnh/ZIPEs4Sz6PinlMbzKSKp5QIIUs/DWQhCImrVTBTfOAt26dzhYv6 UPP/UpfTfPSr0w1CLhfT0R23RBheuoXsenB/O7+ZyfLk1Rr/TmaA4llYBwfl103hXnck TzcYfpgi+25sd3dkdnaPIJmCtxJ1TwvQePtUk5Uq+Wei4RP0X6FjHsrh3x75tkSJiAtE lMcA== 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=UuVwbCbWxataZwKWAHO67dCtHufifj/FCajFJM+cUN+xmjlyKmeFzJ/ksB/IHVc11P /a/o6z5Md+wh4twL6GVyKPbt3afcTKtjXSkS7PMeGfRgwuitPd7i8w/CGE+MW68sDGGw ayKuJY8oQeBw3NEpxtjoCl4ZVUFNwrDUZQNsVoI6Ae7Xs2qpnYgSduAflrUeJOXHZOEE 6qAeTzv1mR6mYUYybj+r6yaW/T7QPdoUTR8HtP0OZmdIN/DQD32SxJL+Zq1OSPCHgLeU /jEi7Ky0G1964l3oCDi1XZRCybDscHBcbNcboU4KDxxKFZXIc4v0+BdDpLG/0QD7shGs wcTg== X-Forwarded-Encrypted: i=1; AJvYcCVZSbi8vfn8E+nIgG99Etc6XVf/PaECPAhKKGub4VNYCwHQSKBugFjLe+mox7WxXJfdhrL6dOc=@lists.linux.dev X-Gm-Message-State: AOJu0YxJwtnKE3Gs27gyFGArhNhnSVo95lD4n3mkFy6EJeUTvBNsVnFR jh0US2JQXu7IyHVEumQ4qOt2QFiIgA6w7OF07uYukNVhnmmiVxPOyFmeahhr1z1RPm+w588VLaC ChnDT4A== 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: kvmarm@lists.linux.dev 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-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 --- 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; - mutex_lock(&kvm->lock); + guard(mutex)(&kvm->lock); switch (tdx_cmd.id) { case KVM_TDX_CAPABILITIES: @@ -2819,15 +2819,12 @@ int tdx_vm_ioctl(struct kvm *kvm, void __user *argp) r = tdx_td_finalize(kvm, &tdx_cmd); break; default: - r = -EINVAL; - goto out; + return -EINVAL; } if (copy_to_user(argp, &tdx_cmd, sizeof(struct kvm_tdx_cmd))) - r = -EFAULT; + return -EFAULT; -out: - mutex_unlock(&kvm->lock); return r; } -- 2.51.1.930.gacf6e81ea2-goog