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 600E678C66 for ; Fri, 26 Apr 2024 03:42:04 +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=1714102924; cv=none; b=kaTBKlo6EbMZki6qwezPyGlU7QG2Agwz0mOt1El/wyfEMalukwBxeWpJA7oRR9vNPQ6moYmgLKxCj5dIaGLB1ue9Wm7KAE/ESfWhgb3xRWjmglqgbMvLwUjp8z7b9i7oLRZAx11Z2qzoKYSpOecXJSengmluP81O972GY3MhpVg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714102924; c=relaxed/simple; bh=IgkiQgrrUPal5q1EmmtTuH7RE0gK62bfWKoXl9KNTYI=; h=Date:To:From:Subject:Message-Id; b=rFRLlJYj5RtfYD5e9CKl40Az9givREKQyCa+Kn+yMezStjslhV1srdkIa1X1r9u8TDEPLaicTd56VpnBBtLqTJntCc3TX6+5yqzsZGNq6RgATOWNx3+gqZxC/8bS66d1+H2rTlQDx1r6Ocq/IHVqGB+TPJfDR9Hy854FRwO41qo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=NCojgyeM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="NCojgyeM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF305C113CD; Fri, 26 Apr 2024 03:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1714102923; bh=IgkiQgrrUPal5q1EmmtTuH7RE0gK62bfWKoXl9KNTYI=; h=Date:To:From:Subject:From; b=NCojgyeM064+1RciDQaSKG7Wywc+jr3tZfpbltMqepcOII/7+styNZ/Z/IyAyglPk un9USRUCs9+kOkgSL7GXCZeaZwF+DoTDi4YUlnP41ck0OL/Gv2/BEYI1WIntNmnz/N mpi+8AIupVPzJy+jzrB6E/g8JXqqXYTBP6IfNj1o= Date: Thu, 25 Apr 2024 20:42:03 -0700 To: mm-commits@vger.kernel.org,ying.huang@intel.com,wangkefeng.wang@huawei.com,ryan.roberts@arm.com,mgorman@techsingularity.net,jhubbard@nvidia.com,david@redhat.com,baolin.wang@linux.alibaba.com,akpm@linux-foundation.org From: Andrew Morton Subject: [folded-merged] mm-support-multi-size-thp-numa-balancing-v3.patch removed from -mm tree Message-Id: <20240426034203.CF305C113CD@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm-support-multi-size-thp-numa-balancing-v3 has been removed from the -mm tree. Its filename was mm-support-multi-size-thp-numa-balancing-v3.patch This patch was dropped because it was folded into mm-support-multi-size-thp-numa-balancing.patch ------------------------------------------------------ From: Baolin Wang Subject: mm-support-multi-size-thp-numa-balancing-v3 Date: Wed, 3 Apr 2024 16:39:10 +0800 - Reuse numa_rebuild_single_mapping() to remove duplicate code per Kefeng Wang. - Remove an unnecessary vma_wants_manual_pte_write_upgrad() per Huang, Ying. Link: https://lkml.kernel.org/r/c33a5c0b0a0323b1f8ed53772f50501f4b196e25.1712132950.git.baolin.wang@linux.alibaba.com Signed-off-by: Baolin Wang Reviewed-by: "Huang, Ying" Cc: David Hildenbrand Cc: John Hubbard Cc: Kefeng Wang Cc: Mel Gorman Cc: Ryan Roberts Signed-off-by: Andrew Morton --- mm/memory.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) --- a/mm/memory.c~mm-support-multi-size-thp-numa-balancing-v3 +++ a/mm/memory.c @@ -5064,32 +5064,32 @@ int numa_migrate_prep(struct folio *foli } static void numa_rebuild_single_mapping(struct vm_fault *vmf, struct vm_area_struct *vma, + unsigned long fault_addr, pte_t *fault_pte, bool writable) { pte_t pte, old_pte; - old_pte = ptep_modify_prot_start(vma, vmf->address, vmf->pte); + old_pte = ptep_modify_prot_start(vma, fault_addr, fault_pte); pte = pte_modify(old_pte, vma->vm_page_prot); pte = pte_mkyoung(pte); if (writable) pte = pte_mkwrite(pte, vma); - ptep_modify_prot_commit(vma, vmf->address, vmf->pte, old_pte, pte); - update_mmu_cache_range(vmf, vma, vmf->address, vmf->pte, 1); + ptep_modify_prot_commit(vma, fault_addr, fault_pte, old_pte, pte); + update_mmu_cache_range(vmf, vma, fault_addr, fault_pte, 1); } static void numa_rebuild_large_mapping(struct vm_fault *vmf, struct vm_area_struct *vma, - struct folio *folio, pte_t fault_pte, bool ignore_writable) + struct folio *folio, pte_t fault_pte, + bool ignore_writable, bool pte_write_upgrade) { int nr = pte_pfn(fault_pte) - folio_pfn(folio); unsigned long start = max(vmf->address - nr * PAGE_SIZE, vma->vm_start); unsigned long end = min(vmf->address + (folio_nr_pages(folio) - nr) * PAGE_SIZE, vma->vm_end); pte_t *start_ptep = vmf->pte - (vmf->address - start) / PAGE_SIZE; - bool pte_write_upgrade = vma_wants_manual_pte_write_upgrade(vma); unsigned long addr; /* Restore all PTEs' mapping of the large folio */ for (addr = start; addr != end; start_ptep++, addr += PAGE_SIZE) { - pte_t pte, old_pte; pte_t ptent = ptep_get(start_ptep); bool writable = false; @@ -5107,13 +5107,7 @@ static void numa_rebuild_large_mapping(s writable = true; } - old_pte = ptep_modify_prot_start(vma, addr, start_ptep); - pte = pte_modify(old_pte, vma->vm_page_prot); - pte = pte_mkyoung(pte); - if (writable) - pte = pte_mkwrite(pte, vma); - ptep_modify_prot_commit(vma, addr, start_ptep, old_pte, pte); - update_mmu_cache_range(vmf, vma, addr, start_ptep, 1); + numa_rebuild_single_mapping(vmf, vma, addr, start_ptep, writable); } } @@ -5123,6 +5117,7 @@ static vm_fault_t do_numa_page(struct vm struct folio *folio = NULL; int nid = NUMA_NO_NODE; bool writable = false, ignore_writable = false; + bool pte_write_upgrade = vma_wants_manual_pte_write_upgrade(vma); int last_cpupid; int target_nid; pte_t pte, old_pte; @@ -5148,7 +5143,7 @@ static vm_fault_t do_numa_page(struct vm * is only valid while holding the PT lock. */ writable = pte_write(pte); - if (!writable && vma_wants_manual_pte_write_upgrade(vma) && + if (!writable && pte_write_upgrade && can_change_pte_writable(vma, vmf->address, pte)) writable = true; @@ -5221,9 +5216,11 @@ out_map: * non-accessible ptes, some can allow access by kernel mode. */ if (folio && folio_test_large(folio)) - numa_rebuild_large_mapping(vmf, vma, folio, pte, ignore_writable); + numa_rebuild_large_mapping(vmf, vma, folio, pte, ignore_writable, + pte_write_upgrade); else - numa_rebuild_single_mapping(vmf, vma, writable); + numa_rebuild_single_mapping(vmf, vma, vmf->address, vmf->pte, + writable); pte_unmap_unlock(vmf->pte, vmf->ptl); goto out; } _ Patches currently in -mm which might be from baolin.wang@linux.alibaba.com are mm-record-the-migration-reason-for-struct-migration_target_control.patch mm-hugetlb-make-the-hugetlb-migration-strategy-consistent.patch docs-hugetlbpagerst-add-hugetlb-migration-description.patch mm-factor-out-the-numa-mapping-rebuilding-into-a-new-helper.patch mm-support-multi-size-thp-numa-balancing.patch mm-huge_memory-add-the-missing-folio_test_pmd_mappable-for-thp-split-statistics.patch mm-huge_memory-add-the-missing-folio_test_pmd_mappable-for-thp-split-statistics-v2.patch mm-page_alloc-use-the-correct-thp-order-for-thp-pcp.patch mm-set-pageblock_order-to-hpage_pmd_order-in-case-with-config_hugetlb_page-but-thp-enabled.patch mm-page_alloc-allowing-mthp-compaction-to-capture-the-freed-page-directly.patch