From nobody Thu Dec 18 09:44:34 2025 Received: from out-177.mta1.migadu.com (out-177.mta1.migadu.com [95.215.58.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D4751FC0E8 for ; Tue, 17 Dec 2024 21:21:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734470492; cv=none; b=qLvG60jnH9mUpWDl+0nTk4RyMhwZylry8ojhtvDhOeGjgGcK03w94AO63mir03KM3TtSTuMi42Wvmh7NJ7Ek8QsU7dOZjYXZbVLjh4zy40wfNHyZ9vtt6F6pQbc91lY5cU3Gf/CWCCcYuUddFJn0/wDhP6vdBXq2/fZdiGoEpJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734470492; c=relaxed/simple; bh=y+ObmbNISJLb+uQ/1aO7C0d5l+RElAtrw1fQHEN6vfI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tt+jdIcPFxD4o+gm9mqyQaIIEHhSpEx/wT52HnXvl7go9LW8n7ERvLxdV/2nt57lvgw9sU5kxeymZYkdckksBmdLpOMdUQ1gUOpYr/0+OwkYy6EuUSc78d7e+aJCZsMvEPLxiK3hNhJig061HCvAe/GvxzPonvvJPGxzhuRYsQo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=wFRC6+CU; arc=none smtp.client-ip=95.215.58.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="wFRC6+CU" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1734470488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NTQ2Tzn1HxAPU/EVgkiyp2AhrhJBkik6I90AqfM4kFo=; b=wFRC6+CUAMdRwboZkqFztEUtrhANO3wvwnKa2x+r/zKBV+O2jkyh51t0hCh82UiFi/wjZ5 c0KX6V49bHL19huUTON3rMl+szrUm3Psf81+4lO1iPBGS1KhE4ZipLoBMOBVc+u/EbqBPf 6tfob6iPBsWLgRokJUrSihicu3tT+F0= From: Oliver Upton To: kvmarm@lists.linux.dev Cc: Marc Zyngier , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Mingwei Zhang , Colton Lewis , Raghavendra Rao Ananta , Catalin Marinas , Will Deacon , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Oliver Upton Subject: [PATCH 10/18] KVM: arm64: Use guard() to cleanup usage of arm_pmus_lock Date: Tue, 17 Dec 2024 13:20:40 -0800 Message-Id: <20241217212048.3709204-11-oliver.upton@linux.dev> In-Reply-To: <20241217212048.3709204-1-oliver.upton@linux.dev> References: <20241217212048.3709204-1-oliver.upton@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Get rid of some goto label patterns by using guard() to drop the arm_pmus_lock when returning from a function. Signed-off-by: Oliver Upton --- arch/arm64/kvm/pmu-emul.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c index 33cd694c754f..2c98cf24bef3 100644 --- a/arch/arm64/kvm/pmu-emul.c +++ b/arch/arm64/kvm/pmu-emul.c @@ -821,26 +821,23 @@ void kvm_host_pmu_init(struct arm_pmu *pmu) if (!pmuv3_implemented(kvm_arm_pmu_get_pmuver_limit())) return; =20 - mutex_lock(&arm_pmus_lock); + guard(mutex)(&arm_pmus_lock); =20 entry =3D kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) - goto out_unlock; + return; =20 entry->arm_pmu =3D pmu; list_add_tail(&entry->entry, &arm_pmus); - -out_unlock: - mutex_unlock(&arm_pmus_lock); } =20 static struct arm_pmu *kvm_pmu_probe_armpmu(void) { - struct arm_pmu *tmp, *pmu =3D NULL; struct arm_pmu_entry *entry; + struct arm_pmu *pmu; int cpu; =20 - mutex_lock(&arm_pmus_lock); + guard(mutex)(&arm_pmus_lock); =20 /* * It is safe to use a stale cpu to iterate the list of PMUs so long as @@ -861,17 +858,13 @@ static struct arm_pmu *kvm_pmu_probe_armpmu(void) */ cpu =3D raw_smp_processor_id(); list_for_each_entry(entry, &arm_pmus, entry) { - tmp =3D entry->arm_pmu; + pmu =3D entry->arm_pmu; =20 - if (cpumask_test_cpu(cpu, &tmp->supported_cpus)) { - pmu =3D tmp; - break; - } + if (cpumask_test_cpu(cpu, &pmu->supported_cpus)) + return pmu; } =20 - mutex_unlock(&arm_pmus_lock); - - return pmu; + return NULL; } =20 static u64 __compute_pmceid(struct arm_pmu *pmu, bool pmceid1) --=20 2.39.5