From nobody Thu Apr 2 17:14:28 2026 Received: from mail.ilvokhin.com (mail.ilvokhin.com [178.62.254.231]) (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 E71F834B186 for ; Fri, 27 Mar 2026 16:15:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.62.254.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774628117; cv=none; b=j3ktOm6MnD828ShPctugn6eXYn9FlkUGfxPddKHOwxXN987e/EysnjVQar5oNhBm4YQUSmGka/kv/HlL1dhfU+JGW4VJFMNmhnHjImZRTRujz+L+CEnhgmvsrsk+GFlmT6k3QRoG1iEHPWX7xtFa4s6Rd4QImsI3JeGjfq498yM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774628117; c=relaxed/simple; bh=5xho3O5B6nJ8PvcmJTH4aQ4EWFcI0pzhUw8xh0YvCzo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u7sVSAcHTBmT8eZGGco0QMjfDcpuavOMbj2qhAmBDKMaD05XEpIXwA9kpg9A1+M8L7mf8fb7Xvm76rDynCBUP2RBmKysMbvYnxs9pcvG96+vFiq/ZfkAalCQAHPNd0eOhc5kcxNDCVRdwzhiVm+Cmeeqqzn6+pp6tMZrVjuL4i8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ilvokhin.com; spf=pass smtp.mailfrom=ilvokhin.com; dkim=pass (1024-bit key) header.d=ilvokhin.com header.i=@ilvokhin.com header.b=gkjmX8xQ; arc=none smtp.client-ip=178.62.254.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ilvokhin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ilvokhin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ilvokhin.com header.i=@ilvokhin.com header.b="gkjmX8xQ" Received: from localhost.localdomain (shell.ilvokhin.com [138.68.190.75]) (Authenticated sender: d@ilvokhin.com) by mail.ilvokhin.com (Postfix) with ESMTPSA id ECBD6BDFFE; Fri, 27 Mar 2026 16:15:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ilvokhin.com; s=mail; t=1774628107; bh=XCId2zbix+QCFEZnLdcQLxRLUHjV8l04CxkNFJM13pM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gkjmX8xQkBKFXycL5JAS21V0pRqS8HUCoMN2sUOGhAQQxV04kJzsO/ohT4zsQuunl NmHvf6ni91o8J5lsA5bY9BPjuPE/y9UZFUP8Si/QeuuJq9Eo40B4uBSB2qvca9OWqZ 3jB2V4Aor8GvVmNs4pwBnzOoraJG24cDjvN4kyeo= From: Dmitry Ilvokhin To: Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, Dmitry Ilvokhin , Steven Rostedt Subject: [PATCH v2 5/8] mm: use zone lock guard in take_page_off_buddy() Date: Fri, 27 Mar 2026 16:14:45 +0000 Message-ID: <79d3acf242a3a56e55c6cacd60698f427292621d.1774627568.git.d@ilvokhin.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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 Content-Type: text/plain; charset="utf-8" Use spinlock_irqsave zone lock guard in take_page_off_buddy() to replace the explicit lock/unlock pattern with automatic scope-based cleanup. This also allows to return directly from the loop, removing the 'ret' variable. Suggested-by: Steven Rostedt Signed-off-by: Dmitry Ilvokhin --- mm/page_alloc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f06d8b5ffc88..a124e4eebda4 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7488,11 +7488,9 @@ bool take_page_off_buddy(struct page *page) { struct zone *zone =3D page_zone(page); unsigned long pfn =3D page_to_pfn(page); - unsigned long flags; unsigned int order; - bool ret =3D false; =20 - spin_lock_irqsave(&zone->lock, flags); + guard(spinlock_irqsave)(&zone->lock); for (order =3D 0; order < NR_PAGE_ORDERS; order++) { struct page *page_head =3D page - (pfn & ((1 << order) - 1)); int page_order =3D buddy_order(page_head); @@ -7507,14 +7505,12 @@ bool take_page_off_buddy(struct page *page) break_down_buddy_pages(zone, page_head, page, 0, page_order, migratetype); SetPageHWPoisonTakenOff(page); - ret =3D true; - break; + return true; } if (page_count(page_head) > 0) break; } - spin_unlock_irqrestore(&zone->lock, flags); - return ret; + return false; } =20 /* --=20 2.52.0