From nobody Tue Apr 7 20:07:41 2026 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 052BD31716C for ; Wed, 11 Mar 2026 14:59:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773241194; cv=none; b=AzsGxO+x80VBuW7GQBEQ+WeyHfhl5LoaXSJHo7PNA/YDQPwseHnG6/cLbbeUQgQO6RnRS2pIcBtPmUlN+elxW6mM+Et4b3A8xOGqAefZyqDfxeWgfQcTNw+GA9CdBJc3WgkbTVXzFP8BogGTFLQb+/PyJlKRrMcZM3iAJPOOd88= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773241194; c=relaxed/simple; bh=lHu0g4YjLEy8LBYops1/bAwob+cSg3NiIFAm3sX2/P0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=IvqhM4/DjTZPsCM/95SrpHNtN6nAvTNQ2gzZJWURvxEypvT3IpyJ0AmpV+xI98Uq7grCUPxymEydw9Mgc6fBnmTYbkFoq+fAhCmXkytKwkfxey2cC5tO7g7t+xMJjxjHU86f0mHYMax9q/yFF6fldPK6SM4NTKL5AmsN51xAYGw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=gyM6gj4G; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="gyM6gj4G" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4852a8482fcso46778425e9.3 for ; Wed, 11 Mar 2026 07:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1773241191; x=1773845991; darn=vger.kernel.org; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=EKU2jyOfoEd97BYIdbbjPDrOmAmXi78iq4AtXjj+wNI=; b=gyM6gj4Gt5/Vtj8l5hGaiyyx2i2jTaihLaI8HKK6qluNmjxdFqd12hYllA8LpiVkTO sKMqn6XrsPQPtu1CEkZoomqX47H6l+3kGFnXJPVORlnIKS56MGRAr9IpDTaUdrOnc0xP fQ3z8hzXRjiWUU8U1L/aehYAdNM2Q4K+fifKjPLYjAOxJUPPlogcetQw3T2xkpfmo73l BvlBuJzDEbN/xwa7wJ4CafXS7lCYDBTLSE8XWNW0Ij0lTUu7elRrya2ueoXW7UhbigVG WXo+YlJLpM2iavEXAWwuN2s4HNPptwvuYfHFg826vhry4P4V2U+Lpg7Al08jxMtk3vDE wBIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773241191; x=1773845991; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EKU2jyOfoEd97BYIdbbjPDrOmAmXi78iq4AtXjj+wNI=; b=bpZ7N9ySTTlnp/FBg7Nhj6QmO22zwN4emwM6u2uaxIVmfEMEIp7WyJqxwwtbaOs8ey m334rUiHFuuiCnx8isMYwvnxyEeo/LKRFa2UKvt/ab5/853JLXHzKYHlpa4LpFBLucHq rLSNI5RK4sT2TRsMKv6zAB2aNkhdcKqwCT0L3zJJZDQs4V3aipBZ2QB6ajPLrXFgaOGu KZk5hlnE8VvOhXP22tdvYaewDTVTnUzBQk7XfkhdgVpf6F2FLinvRJ5smIZY+LqbjQxB 1hwZpn7D5m7/sq4xORgt7F/AsGWqtqI+ZiVskgyNPDFNuBBlRXR81zRtx/os1ghrbcTW yXHQ== X-Forwarded-Encrypted: i=1; AJvYcCXEQ2jg3b73eub07FGDi9JNhl6ozX7YBO4zrHs4y0CpACDwpXYwcrkguphhFxrX1UJjVDRoc3ibMe5Cuqc=@vger.kernel.org X-Gm-Message-State: AOJu0YzNDuEh54qavGLvyqCX2tjgZQT5hFyUavmgsm9OFhhH/DFqnT3X y+Rs3ODKZtQwCPNfdYRbyzyPZwT7jADNm7f+ma6G0KZepHuOBAgJUvhmlwJYdQqtYKlK+rjzeAM FYGvYx7w= X-Gm-Gg: ATEYQzxTSbFahDOkJaes20yQcqdx2/tB+XMkJDY+njDifk2VPIJ6HqJvdXG5pHOMFvO lDdwf1188u4z+7I65OsVUq+FxPbdGQ4q2Dqho2L6EC3sV6LAI6CPq3il0/rGLpU7yk8MeTbE2ha pF9WDe9dW+5+7AXVg0hvp0ZAeVNtBYWLVHXMH+1sIOM7cNTml7haiSjR1nL9EKnL+m38HHDaGX6 NUGcAHZPDCrxYdzcYRdJ9TYqXOn63HFMdPFJ2p1oYpl6aT2icgqAmW5d8/LKIzzT5eRu8F6XZXn A+ujwatjr3Q8o9yLI8WYTI2e1wJf+n8QAZ7trwtvGk0OdeCjdLlyemXWKr+aCxqC4VXfpLa1GvA IZsEzVtktXTWxjjGz494NAtszNxZZ35NO9RJdYb1k2o1ta9aDTruSjfbLwbhOCLGXH5OepCKFf9 S0DyP+CBXkg15MHQe113LNBu10RQyeiN0sH5ny49E75PZik7oeNw== X-Received: by 2002:a05:600c:1f8e:b0:485:4394:b0e with SMTP id 5b1f17b1804b1-4854b0be737mr50605565e9.12.1773241191238; Wed, 11 Mar 2026 07:59:51 -0700 (PDT) Received: from r1chard (1-164-69-22.dynamic-ip.hinet.net. [1.164.69.22]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae24adb7sm25888665ad.33.2026.03.11.07.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 07:59:50 -0700 (PDT) Date: Wed, 11 Mar 2026 22:59:45 +0800 From: Richard Lyu To: Thomas Gleixner Cc: Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Richard Lyu , linux-kernel@vger.kernel.org Subject: [PATCH] x86/apic/msi: Use guard(mutex) in dmar_get_irq_domain() Message-ID: <20260311145944.85399-1-richard.lyu@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email 2.51.0 User-Agent: Mutt/2.2.13 (2024-03-09) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The dmar_get_irq_domain() function uses a mutex to protect the initialization of the dmar_domain. Using guard(mutex) simplifies the control flow, removes the need for a 'out' label, and ensures the lock is automatically released regardless of the return path. Signed-off-by: Richard Lyu --- arch/x86/kernel/apic/msi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index 66bc5d3e79db..3f10b35f7c79 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -7,7 +7,9 @@ * Jiang Liu * Convert to hierarchical irqdomain */ +#include #include +#include #include #include #include @@ -346,9 +348,9 @@ static struct irq_domain *dmar_get_irq_domain(void) static DEFINE_MUTEX(dmar_lock); struct fwnode_handle *fn; =20 - mutex_lock(&dmar_lock); + guard(mutex)(&dmar_lock); if (dmar_domain) - goto out; + return dmar_domain; =20 fn =3D irq_domain_alloc_named_fwnode("DMAR-MSI"); if (fn) { @@ -357,8 +359,6 @@ static struct irq_domain *dmar_get_irq_domain(void) if (!dmar_domain) irq_domain_free_fwnode(fn); } -out: - mutex_unlock(&dmar_lock); return dmar_domain; } =20 --=20 2.51.0