From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 CF3A826A08F for ; Wed, 29 Jul 2026 11:11:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.92.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785323518; cv=none; b=Ub2loAuqr0IjjqroeYXXnKb6J4/jo8A+f5nLkkTbZrZyntjHNFbZwZMYwrA6kdZpu5LRIIgf00Zh6kjNUQOCGNjv5sFY3AxkRLqb8XxSelo7CKvXLZ15N7YEOGEe5mLsWP89VPz09DuGFd/tVoE7ipIJJCX9/7aLEQZPw9XbZEs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785323518; c=relaxed/simple; bh=4WK1Tf+sTv7iIV/pSHgUBXu92ZphZbBUzBQL02f4aHk=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=gSuwKutL56YQlJ3sN/oW1LXppmlvza3XOlibK30+aSGvgt23PNW8Btkzmt/j3Ft+CUBpynyn1NgEOzF01bemb3hAIWH3Tpq+S6kJIzbYFyurc6C5QZ+fessh+1ZRC8mPJpB4uTwEv9f4Pcjj0Gf46GzLuHbEdzTUsNjGg/VuSNg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=infradead.org; spf=pass smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=lS1SiLOM; arc=none smtp.client-ip=90.155.92.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="lS1SiLOM" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=n9RxULfIB529s6BAgXo/FHZeN8z2+6YWnKjKsUubeUU=; b=lS1SiLOM4VgohPxGU1ZYKuJYza Ehb2kESRj7tHBJvMe6nvRMIT9BtOqT890S7Yc2cKAiStMu+iicgXyzpXfeFvGcKRDGU071cVWRgdi QG51980yTzf4hbXiV+pD1MNvgsQ1RPE9DqoFpuppaHdLnWO7YMoaCXhKVuFx/jAd3dEROGiBlF7E/ rIQBlGha+WIVeY+nDyvNesyomD+DRPQ+EVZtrZklNhX+N+2A5PcEQnB0FVM+L5K9G0jeuLOOBuw9Q +/Cfl7WFY7a1QINg6WWsxEyBbbJaPLmD4mmtkOnZk/c2wT56OS3MXHVpkvB+DYyW10omE0r+B30Co jqVs2ChQ==; Received: from 77-249-17-252.cable.dynamic.v4.ziggo.nl ([77.249.17.252] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.99.2 #2 (Red Hat Linux)) id 1wp2CM-00000005hpz-1aoZ; Wed, 29 Jul 2026 11:11:42 +0000 Received: by noisy.programming.kicks-ass.net (Postfix, from userid 0) id B2C4F300E8B; Wed, 29 Jul 2026 13:11:40 +0200 (CEST) Message-ID: <20260729111119.375614011@infradead.org> User-Agent: quilt/0.68 Date: Wed, 29 Jul 2026 13:08:08 +0200 From: Peter Zijlstra To: Dave Hansen Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, Andy Lutomirski , Borislav Petkov , David Hildenbrand , Ingo Molnar , Jason Gunthorpe , Juergen Gross , Kevin Tian , Kiryl Shutsemau , "Liam R. Howlett" , Lorenzo Stoakes , Lu Baolu , Mike Rapoport , "H. Peter Anvin" , Shakeel Butt , Suren Baghdasaryan , Thomas Gleixner , Toshi Kani , Vlastimil Babka , Will Deacon , linux-mm@kvack.org, x86@kernel.org Subject: [PATCH 1/3] x86/mm: Use guard() in cpa_collapse_large_pages() References: <20260729110807.797920433@infradead.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/mm/pat/set_memory.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -417,7 +417,7 @@ static void cpa_collapse_large_pages(str int collapsed = 0; int i; - spin_lock(&cpa_lock); + guard(spinlock)(&cpa_lock); if (cpa->flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) { for (i = 0; i < cpa->numpages; i++) @@ -432,10 +432,8 @@ static void cpa_collapse_large_pages(str collapsed += collapse_large_pages(addr, &pgtables); } - if (!collapsed) { - spin_unlock(&cpa_lock); + if (!collapsed) return; - } flush_tlb_all(); @@ -443,8 +441,6 @@ static void cpa_collapse_large_pages(str list_del(&ptdesc->pt_list); pagetable_free(ptdesc); } - - spin_unlock(&cpa_lock); } static void cpa_flush(struct cpa_data *cpa, int cache)