From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C7FF218BBAE; Tue, 30 Sep 2025 15:24:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759245866; cv=none; b=oVgLruj1YTuygZwdwxJ+0qgz9bRnAJzj756wOLoRWL34ixb6M1mI1rYksj+CY6BCJ+dU7dH3lsRppYwOWHgSglniGQioBhqVzoFFhw4tL5SZSvjL0KjWp/V/xw2v2wZOGO/UJCwG+WDneTDuU6y/rPIV99w8xG7bgAv2HWkPRgw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759245866; c=relaxed/simple; bh=MtsrfGIJTqPJoE2xo7KwlwprVvKpV6A6sX3ARkH2ovE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iJLBdcb9iNOxyTRPTSJJ6ZOa7tukRZ4Og0vNzayfXn2K+oj8uF/L7Wz3N19dp0tUbrETzmWK7MSEbV+w7x/Sa8LYi60eMMa9YiSLHVpMowgldjJeLzGaNG+0sSDVByGVubbfrGef4cnEzgt7tLbEfXH+JQ8ITRGXIPZRy41SxaE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=djot/St1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="djot/St1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37AD2C4CEF0; Tue, 30 Sep 2025 15:24:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1759245866; bh=MtsrfGIJTqPJoE2xo7KwlwprVvKpV6A6sX3ARkH2ovE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=djot/St1742JFxraAltZKQTmBcblC3srSQeLvdwK6MbSk46ijRRSe6uI0owaBePQw FrdTdRwwhBsPzPuzkD9pbzLEOeFqaWMYriuI/WCIY4xs7JCMwtUjUGnkbr5Q6+8rBi 6PW2plugKUscjXVi16dqg8XQQFEUicA8NtvpRS3U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kefeng Wang , "Vishal Moola (Oracle)" , Alistair Popple , Baolin Wang , David Hildenbrand , Jonathan Corbet , "Matthew Wilcox (Oracle)" , Zi Yan , Andrew Morton Subject: [PATCH 6.6 73/91] mm: migrate_device: use more folio in migrate_device_finalize() Date: Tue, 30 Sep 2025 16:48:12 +0200 Message-ID: <20250930143824.218420264@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930143821.118938523@linuxfoundation.org> References: <20250930143821.118938523@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kefeng Wang commit 58bf8c2bf47550bc94fea9cafd2bc7304d97102c upstream. Saves a couple of calls to compound_head() and remove last two callers of putback_lru_page(). Link: https://lkml.kernel.org/r/20240826065814.1336616-5-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang Reviewed-by: Vishal Moola (Oracle) Reviewed-by: Alistair Popple Cc: Baolin Wang Cc: David Hildenbrand Cc: Jonathan Corbet Cc: Matthew Wilcox (Oracle) Cc: Zi Yan Signed-off-by: Andrew Morton Signed-off-by: David Hildenbrand Signed-off-by: Greg Kroah-Hartman --- mm/migrate_device.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -814,42 +814,45 @@ void migrate_device_finalize(unsigned lo unsigned long i; for (i = 0; i < npages; i++) { - struct folio *dst, *src; + struct folio *dst = NULL, *src = NULL; struct page *newpage = migrate_pfn_to_page(dst_pfns[i]); struct page *page = migrate_pfn_to_page(src_pfns[i]); + if (newpage) + dst = page_folio(newpage); + if (!page) { - if (newpage) { - unlock_page(newpage); - put_page(newpage); + if (dst) { + folio_unlock(dst); + folio_put(dst); } continue; } - if (!(src_pfns[i] & MIGRATE_PFN_MIGRATE) || !newpage) { - if (newpage) { - unlock_page(newpage); - put_page(newpage); + src = page_folio(page); + + if (!(src_pfns[i] & MIGRATE_PFN_MIGRATE) || !dst) { + if (dst) { + folio_unlock(dst); + folio_put(dst); } - newpage = page; + dst = src; } - src = page_folio(page); - dst = page_folio(newpage); remove_migration_ptes(src, dst, false); folio_unlock(src); - if (is_zone_device_page(page)) - put_page(page); + if (folio_is_zone_device(src)) + folio_put(src); else - putback_lru_page(page); + folio_putback_lru(src); - if (newpage != page) { - unlock_page(newpage); - if (is_zone_device_page(newpage)) - put_page(newpage); + if (dst != src) { + folio_unlock(dst); + if (folio_is_zone_device(dst)) + folio_put(dst); else - putback_lru_page(newpage); + folio_putback_lru(dst); } } }