From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) (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 DF75C2C0268 for ; Mon, 3 Aug 2026 03:16:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785726980; cv=none; b=KQqZtpZSF9AUcu4CI0vOFomrL6ttkg16aL41bD+qb0RDFCfGJoisNJ8w+j7TrVCS+hgsQSsigPpXUOPqUscUprtqSq3pNTPFiyOzLTvcDhDKp0t1nIGEqJ9fVktSlmU410RLNXA/uMSlpTmdC9jpusJwLzWJI5uuPxkcSsPbtvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785726980; c=relaxed/simple; bh=UCKeHCVVoDxRKLSiqfeZeG/U7C8ru2wcyboTjahVwQE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LJMsadYDJForVS6Z69baZaqUUqqK8coXyir1ZxY1paSEKrSwKzhOstp24sNhHesTt1IrbluYfaPMqLT2Hnu/ZE6y+q3Bg4in9JGbB/kHIslLKo7qoB51d1wUFfvRNZ8g+E+Vu7rzMvye68MJDrELw6/y6UzxHAESuDBcI0OhF3g= 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=Fx/Z3Ul0; arc=none smtp.client-ip=95.215.58.176 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="Fx/Z3Ul0" 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=1785726975; 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; bh=b+aMIKSO//d1fSg8tl4/EeetnqsPLo+vwdX9y23O+JA=; b=Fx/Z3Ul0PW2clHWzK3++h8OorOKGBAsq/apRPKxJ8vQV3nrNGufpmkpaPpMZxb9LyFR6q1 4muuRhUeJrp5TzISmabx7H+3pvefcRjxYG3Yn/xWpOqQwyPQ45JjDVL/HdiU44m/3F4A0G C2KCQSSMzudPO3+KRIJ6KcwoJL4NF+A= From: Hongfu Li To: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, liam@infradead.org, vbabka@kernel.org, rppt@kernel.org, surenb@google.com, mhocko@suse.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, hongfu.li@linux.dev, Hongfu Li Subject: [PATCH v4] mm: Use a folio in the softleaf_is_device_private path Date: Mon, 3 Aug 2026 11:15:54 +0800 Message-ID: <20260803031554.30421-1-hongfu.li@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: 8bit X-Migadu-Flow: FLOW_OUT From: Hongfu Li Use the folio APIs in the device_private migration path of do_swap_page(), replacing four calls to compound_head() with one. Signed-off-by: Hongfu Li Acked-by: David Hildenbrand (Arm) Reviewed-by: Lorenzo Stoakes (ARM) --- v4: - Drop the do_non_swap_page() extraction (patch 2/2 from v2) - Added Reviewed-by: Lorenzo Stoakes - Link to v2: https://lore.kernel.org/all/20260723030752.16979-1-hongfu.li@linux.dev/ v3: - Please ignore v3. v2: - Drop fault_folio, reuse the existing folio variable instead - Refresh commit messages - Update comment to use "folio" instead of "page" in the device_private path - Add Acked-by: David Hildenbrand - Add patch 2/2 to extract do_non_swap_page() from do_swap_page() - Link to v1: https://lore.kernel.org/all/20260721013347.65698-1-hongfu.li@linux.dev/ --- mm/memory.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 56b244552f13..bbb289ba09d3 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4873,18 +4873,19 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) goto unlock; /* - * Get a page reference while we know the page can't be + * Get a folio reference while we know the folio can't be * freed. */ - if (trylock_page(vmf->page)) { + folio = page_folio(vmf->page); + if (folio_trylock(folio)) { struct dev_pagemap *pgmap; - get_page(vmf->page); + folio_get(folio); pte_unmap_unlock(vmf->pte, vmf->ptl); pgmap = page_pgmap(vmf->page); ret = pgmap->ops->migrate_to_ram(vmf); - unlock_page(vmf->page); - put_page(vmf->page); + folio_unlock(folio); + folio_put(folio); } else { pte_unmap(vmf->pte); softleaf_entry_wait_on_locked(entry, vmf->ptl); -- 2.54.0