From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-183.mta1.migadu.com (out-183.mta1.migadu.com [95.215.58.183]) (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 0EB4626B764 for ; Mon, 27 Jul 2026 16:15:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.183 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785168908; cv=none; b=CvVvPD53qUHeFiSBKQ1dARHGB9i80eZx9GoHNexNnmd2gocVTK+kxBk5itn/foItzDHj1ke2OUo4DFMx5uq8QAPliDQKER9rjpxGljVIGQ+/m3plhUWjvZsvQy9nrDU5nc2U2/WbBABMdyVbLlgGEo8O3Me01WhuUUdTx2ewwLA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785168908; c=relaxed/simple; bh=7y/mPZKYdCmCx6IYkxM7p9ci/aI8dvKGkYfbTgYesGU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tx2a3iJIYc1Xn0nXbe5FlmIkooYFOsKfUAt+tn69eypo0mMFYPXgAjIeqig/gsnhHODioTB8STaA6pq4sA5wpBdpaKcwwWTn6hNyIX7swToR/4M/hHjuCZ26IUQUWDNumtyQBASAofh1ctQHC9GAIB0iQCq8Fe8anyKwWAWWuYk= 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=FnZpP/tz; arc=none smtp.client-ip=95.215.58.183 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="FnZpP/tz" 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=1785168903; 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=lN+gicp6TmdEB+moqhp8rFaHd1rM6s5nX6VZv/lpYx8=; b=FnZpP/tzy/4qmdJ6mDKchnITOft5YnUO2sgPXEL82M7YRE1MW+qCbNuidx6w4DFV2r/e6H yU9w8tEe+95F9demBD/7RYkhyRFXIQgt2FgDGvA1W7zlUXtNWg3+aKtOnmetUUR1I3d2Uw SXJr4XSqBdAuWnujRXxbgNv11jUBOQs= 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 v3 1/2] mm: Use a folio in the softleaf_is_device_private path Date: Tue, 28 Jul 2026 00:14:30 +0800 Message-ID: <20260727161431.13455-2-hongfu.li@linux.dev> In-Reply-To: <20260727161431.13455-1-hongfu.li@linux.dev> References: <20260727161431.13455-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 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