From mboxrd@z Thu Jan 1 00:00:00 1970 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 04BB4C43334 for ; Mon, 4 Jul 2022 23:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230179AbiGDXEQ (ORCPT ); Mon, 4 Jul 2022 19:04:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbiGDXEQ (ORCPT ); Mon, 4 Jul 2022 19:04:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B8D6BF48 for ; Mon, 4 Jul 2022 16:04:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 01CEF617A1 for ; Mon, 4 Jul 2022 23:04:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 517C2C341CB; Mon, 4 Jul 2022 23:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1656975854; bh=498f3qj1kVV+srJ8hqGio4x1kNbWgRCq2vhvyohHIaU=; h=Date:To:From:Subject:From; b=n9cuVFXFkV7kZ05/Q5bbbh/osqkIM5GS0eugsqzl3DlmH1FULu08m6he9gPnaAQzJ zF/YhbnQLpA2T/SJSz5n+XS/yn52n6PgcmdKVofLW4dL/odw/WixfUZlp7CuSq+j0p rioIUNPg+grO24SuRMAW0Rf8fnvUdnL+dwPRRvh4= Date: Mon, 04 Jul 2022 16:04:13 -0700 To: mm-commits@vger.kernel.org, zokeefe@google.com, willy@infradead.org, songmuchun@bytedance.com, shy828301@gmail.com, linmiaohe@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-huge_memory-rename-mmun_start-to-haddr-in-remove_migration_pmd.patch added to mm-unstable branch Message-Id: <20220704230414.517C2C341CB@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/huge_memory: rename mmun_start to haddr in remove_migration_pmd has been added to the -mm mm-unstable branch. Its filename is mm-huge_memory-rename-mmun_start-to-haddr-in-remove_migration_pmd.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-huge_memory-rename-mmun_start-to-haddr-in-remove_migration_pmd.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Miaohe Lin Subject: mm/huge_memory: rename mmun_start to haddr in remove_migration_pmd Date: Mon, 4 Jul 2022 21:21:51 +0800 mmun_start indicates mmu_notifier start address but there's no mmu_notifier stuff in remove_migration_pmd. This will make it hard to get the meaning of mmun_start. Rename it to haddr to avoid confusing readers and also imporve readability. Link: https://lkml.kernel.org/r/20220704132201.14611-7-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Reviewed-by: Muchun Song Cc: Matthew Wilcox Cc: Yang Shi Cc: Zach O'Keefe Signed-off-by: Andrew Morton --- mm/huge_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/huge_memory.c~mm-huge_memory-rename-mmun_start-to-haddr-in-remove_migration_pmd +++ a/mm/huge_memory.c @@ -3279,7 +3279,7 @@ void remove_migration_pmd(struct page_vm struct vm_area_struct *vma = pvmw->vma; struct mm_struct *mm = vma->vm_mm; unsigned long address = pvmw->address; - unsigned long mmun_start = address & HPAGE_PMD_MASK; + unsigned long haddr = address & HPAGE_PMD_MASK; pmd_t pmde; swp_entry_t entry; @@ -3302,12 +3302,12 @@ void remove_migration_pmd(struct page_vm if (!is_readable_migration_entry(entry)) rmap_flags |= RMAP_EXCLUSIVE; - page_add_anon_rmap(new, vma, mmun_start, rmap_flags); + page_add_anon_rmap(new, vma, haddr, rmap_flags); } else { page_add_file_rmap(new, vma, true); } VM_BUG_ON(pmd_write(pmde) && PageAnon(new) && !PageAnonExclusive(new)); - set_pmd_at(mm, mmun_start, pvmw->pmd, pmde); + set_pmd_at(mm, haddr, pvmw->pmd, pmde); /* No need to invalidate - it was non-present before */ update_mmu_cache_pmd(vma, address, pvmw->pmd); _ Patches currently in -mm which might be from linmiaohe@huawei.com are mm-page_alloc-minor-clean-up-for-memmap_init_compound.patch mm-mmapc-fix-missing-call-to-vm_unacct_memory-in-mmap_region.patch filemap-minor-cleanup-for-filemap_write_and_wait_range.patch mm-huge_memory-use-flush_pmd_tlb_range-in-move_huge_pmd.patch mm-huge_memory-access-vm_page_prot-with-read_once-in-remove_migration_pmd.patch mm-huge_memory-fix-comment-of-__pud_trans_huge_lock.patch mm-huge_memory-use-helper-touch_pud-in-huge_pud_set_accessed.patch mm-huge_memory-use-helper-touch_pmd-in-huge_pmd_set_accessed.patch mm-huge_memory-rename-mmun_start-to-haddr-in-remove_migration_pmd.patch mm-huge_memory-use-helper-function-vma_lookup-in-split_huge_pages_pid.patch mm-huge_memory-use-helper-macro-__attr_rw.patch mm-huge_memory-fix-comment-in-zap_huge_pud.patch mm-huge_memory-check-pmd_present-first-in-is_huge_zero_pmd.patch mm-huge_memory-try-to-free-subpage-in-swapcache-when-possible.patch mm-huge_memory-minor-cleanup-for-split_huge_pages_all.patch mm-huge_memory-fix-comment-of-page_deferred_list.patch mm-huge_memory-correct-comment-of-prep_transhuge_page.patch mm-huge_memory-comment-the-subtly-logic-in-__split_huge_pmd.patch mm-huge_memory-use-helper-macro-is_err_or_null-in-split_huge_pages_pid.patch