Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A798C25B6B for ; Wed, 25 Oct 2023 23:50:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234955AbjJYXua (ORCPT ); Wed, 25 Oct 2023 19:50:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234959AbjJYXtQ (ORCPT ); Wed, 25 Oct 2023 19:49:16 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBFBF10E4 for ; Wed, 25 Oct 2023 16:49:05 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86AF1C433C7; Wed, 25 Oct 2023 23:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1698277745; bh=CEly+PxuSnoJrMWQZH8qmqZWc3Bip+VYYnBj1u2UeVw=; h=Date:To:From:Subject:From; b=cvWYAcdorgCNKMK+LYJa4c2jvQTw4rwi7KKfdo7b58AMrc/eB3ivr8Wm3NiklWFKQ I7vKBODOJb/KLwi4hxfzKnf8Q6FdvR8z8Cm9Vwk41I67IYvdD3i0muvJmjqyyU6vo3 /7D2GVgfZqUVKrzWJX0j8CDzHKQT2nDc+WqSQPy8= Date: Wed, 25 Oct 2023 16:49:04 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, wangkefeng.wang@huawei.com, shy828301@gmail.com, david@redhat.com, vishal.moola@gmail.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-khugepaged-convert-is_refcount_suitable-to-use-folios.patch removed from -mm tree Message-Id: <20231025234905.86AF1C433C7@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm/khugepaged: convert is_refcount_suitable() to use folios has been removed from the -mm tree. Its filename was mm-khugepaged-convert-is_refcount_suitable-to-use-folios.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: "Vishal Moola (Oracle)" Subject: mm/khugepaged: convert is_refcount_suitable() to use folios Date: Fri, 20 Oct 2023 11:33:29 -0700 Both callers of is_refcount_suitable() have been converted to use folios, so convert it to take in a folio. Both callers only operate on head pages of folios so mapcount/refcount conversions here are trivial. Removes 3 calls to compound head, and removes 315 bytes of kernel text. Link: https://lkml.kernel.org/r/20231020183331.10770-4-vishal.moola@gmail.com Signed-off-by: Vishal Moola (Oracle) Reviewed-by: David Hildenbrand Reviewed-by: Yang Shi Cc: Kefeng Wang Cc: Matthew Wilcox (Oracle) Signed-off-by: Andrew Morton --- mm/khugepaged.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/mm/khugepaged.c~mm-khugepaged-convert-is_refcount_suitable-to-use-folios +++ a/mm/khugepaged.c @@ -524,15 +524,15 @@ static void release_pte_pages(pte_t *pte } } -static bool is_refcount_suitable(struct page *page) +static bool is_refcount_suitable(struct folio *folio) { int expected_refcount; - expected_refcount = total_mapcount(page); - if (PageSwapCache(page)) - expected_refcount += compound_nr(page); + expected_refcount = folio_mapcount(folio); + if (folio_test_swapcache(folio)) + expected_refcount += folio_nr_pages(folio); - return page_count(page) == expected_refcount; + return folio_ref_count(folio) == expected_refcount; } static int __collapse_huge_page_isolate(struct vm_area_struct *vma, @@ -625,7 +625,7 @@ static int __collapse_huge_page_isolate( * but not from this process. The other process cannot write to * the page, only trigger CoW. */ - if (!is_refcount_suitable(&folio->page)) { + if (!is_refcount_suitable(folio)) { folio_unlock(folio); result = SCAN_PAGE_COUNT; goto out; @@ -1371,7 +1371,7 @@ static int hpage_collapse_scan_pmd(struc * has excessive GUP pins (i.e. 512). Anyway the same check * will be done again later the risk seems low. */ - if (!is_refcount_suitable(&folio->page)) { + if (!is_refcount_suitable(folio)) { result = SCAN_PAGE_COUNT; goto out_unmap; } _ Patches currently in -mm which might be from vishal.moola@gmail.com are