From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-189.mta0.migadu.com (out-189.mta0.migadu.com [91.218.175.189]) (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 45AB62AEE1 for ; Thu, 23 Jul 2026 03:08:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.189 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784776113; cv=none; b=GnnXQGxPLxuorc1iC4sJnr3jY3Nec/jIQKWJAWRfwgrqN7jM9YzIudwSa3AE0ZHiYmTVGHAtwnxGVwveHTwtJ8bDIQOVTzTPpkesV1co41NSpi+40xl8mZmLi8xyf+nQWbcDsLYR6Nou7Xf/dRYYZ/meKPKawMycBvJSlgWKFyY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784776113; c=relaxed/simple; bh=k157slDsMwzLsG6WpdKVOZvRZuLU3Rv+whswosQVQNA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cS8E7RHFSLeZ0ahEfewI1leWpVttWMT1BB3vBSAb8MzfvRLl578GNxD5Tug/tv8HEYkTETdre2r5NJl/la/ot/O/y6/y2ys/XlVvtR/K0VrftNjdhCcVMbmFg0468LhdZlrAvGgtgBbsig0isrYGxVD1CD3PAnqTiij7d9XPTS8= 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=NhdfXIrw; arc=none smtp.client-ip=91.218.175.189 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="NhdfXIrw" 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=1784776110; 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=zh1iI5mLWpS+VDOHW4U6amM9imbdnYQ7KT34I489wBU=; b=NhdfXIrwsO0SAJE6eS2ihTQzVD7bTOUjzd2G6m2sDiOfn7RYt4rUE72Mp0/GFM9TD+Mv25 qAmyRQ6ORtzakAFm5N2bsLy0ppXzjSZQGdSpEmd1Kc+p1r1GqTloszuf17VWBHsuhNrCTE JloJHT2tyJg6gororePhQOabkEK1Kb8= 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 v2 1/2] mm: Use a folio in the softleaf_is_device_private path Date: Thu, 23 Jul 2026 11:07:51 +0800 Message-ID: <20260723030752.16979-2-hongfu.li@linux.dev> In-Reply-To: <20260723030752.16979-1-hongfu.li@linux.dev> References: <20260723030752.16979-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) --- mm/memory.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index d5e87624f692..ae521baa8c84 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4871,18 +4871,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