diff mbox series

[093/143] ksm: remove dedicated macro KSM_FLAG_MASK

Message ID	20210505013742.Ld7mRpINv%akpm@linux-foundation.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=moDn=KA=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BC9161029 Date: Tue, 04 May 2021 18:37:42 -0700 From: Andrew Morton <akpm@linux-foundation.org> To: akpm@linux-foundation.org, hughd@google.com, linmiaohe@huawei.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 093/143] ksm: remove dedicated macro KSM_FLAG_MASK Message-ID: <20210505013742.Ld7mRpINv%akpm@linux-foundation.org> In-Reply-To: <20210504183219.a3cc46aee4013d77402276c5@linux-foundation.org> User-Agent: s-nail v14.8.16 Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf07; identity=mailfrom; envelope-from="<akpm@linux-foundation.org>"; helo=mail.kernel.org; client-ip=198.145.29.99 Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	[001/143] mm: introduce and use mapping_empty() \| expand [001/143] mm: introduce and use mapping_empty() [002/143] mm: stop accounting shadow entries [003/143] dax: account DAX entries as nrpages [004/143] mm: remove nrexceptional from inode [005/143] mm: remove nrexceptional from inode: remove BUG_ON [006/143] hugetlb: pass vma into huge_pte_alloc() and huge_pmd_share() [007/143] hugetlb/userfaultfd: forbid huge pmd sharing when uffd enabled [008/143] mm/hugetlb: move flush_hugetlb_tlb_range() into hugetlb.h [009/143] hugetlb/userfaultfd: unshare all pmds for hugetlbfs when register wp [010/143] mm/hugetlb: remove redundant reservation check condition in alloc_huge_page() [011/143] mm: generalize HUGETLB_PAGE_SIZE_VARIABLE [012/143] mm/hugetlb: use some helper functions to cleanup code [013/143] mm/hugetlb: optimize the surplus state transfer code in move_hugetlb_state() [014/143] mm/hugetlb_cgroup: remove unnecessary VM_BUG_ON_PAGE in hugetlb_cgroup_migrate() [015/143] mm/hugetlb: simplify the code when alloc_huge_page() failed in hugetlb_no_page() [016/143] mm/hugetlb: avoid calculating fault_mutex_hash in truncate_op case [017/143] khugepaged: remove unneeded return value of khugepaged_collapse_pte_mapped_thps() [018/143] khugepaged: reuse the smp_wmb() inside __SetPageUptodate() [019/143] khugepaged: use helper khugepaged_test_exit() in __khugepaged_enter() [020/143] khugepaged: fix wrong result value for trace_mm_collapse_huge_page_isolate() [021/143] mm/huge_memory.c: remove unnecessary local variable ret2 [022/143] mm/huge_memory.c: rework the function vma_adjust_trans_huge() [023/143] mm/huge_memory.c: make get_huge_zero_page() return bool [024/143] mm/huge_memory.c: rework the function do_huge_pmd_numa_page() slightly [025/143] mm/huge_memory.c: remove redundant PageCompound() check [026/143] mm/huge_memory.c: remove unused macro TRANSPARENT_HUGEPAGE_DEBUG_COW_FLAG [027/143] mm/huge_memory.c: use helper function migration_entry_to_page() [028/143] mm/khugepaged.c: replace barrier() with READ_ONCE() for a selective variable [029/143] khugepaged: use helper function range_in_vma() in collapse_pte_mapped_thp() [030/143] khugepaged: remove unnecessary out label in collapse_huge_page() [031/143] khugepaged: remove meaningless !pte_present() check in khugepaged_scan_pmd() [032/143] mm: huge_memory: a new debugfs interface for splitting THP tests [033/143] mm: huge_memory: debugfs for file-backed THP split [034/143] mm/hugeltb: remove redundant VM_BUG_ON() in region_add() [035/143] mm/hugeltb: simplify the return code of __vma_reservation_common() [036/143] mm/hugeltb: clarify (chg - freed) won't go negative in hugetlb_unreserve_pages() [037/143] mm/hugeltb: handle the error case in hugetlb_fix_reserve_counts() [038/143] mm/hugetlb: remove unused variable pseudo_vma in remove_inode_hugepages() [039/143] mm/cma: change cma mutex to irq safe spinlock [040/143] hugetlb: no need to drop hugetlb_lock to call cma_release [041/143] hugetlb: add per-hstate mutex to synchronize user adjustments [042/143] hugetlb: create remove_hugetlb_page() to separate functionality [043/143] hugetlb: call update_and_free_page without hugetlb_lock [044/143] hugetlb: change free_pool_huge_page to remove_pool_huge_page [045/143] hugetlb: make free_huge_page irq safe [046/143] hugetlb: add lockdep_assert_held() calls for hugetlb_lock [047/143] mm,page_alloc: bail out earlier on -ENOMEM in alloc_contig_migrate_range [048/143] mm,compaction: let isolate_migratepages_{range,block} return error codes [049/143] mm,hugetlb: drop clearing of flag from prep_new_huge_page [050/143] mm,hugetlb: split prep_new_huge_page functionality [051/143] mm: make alloc_contig_range handle free hugetlb pages [052/143] mm: make alloc_contig_range handle in-use hugetlb pages [053/143] mm,page_alloc: drop unnecessary checks from pfn_range_valid_contig [054/143] userfaultfd: add minor fault registration mode [055/143] userfaultfd: disable huge PMD sharing for MINOR registered VMAs [056/143] userfaultfd: hugetlbfs: only compile UFFD helpers if config enabled [057/143] userfaultfd: add UFFDIO_CONTINUE ioctl [058/143] userfaultfd: update documentation to describe minor fault handling [059/143] userfaultfd/selftests: add test exercising minor fault handling [060/143] mm/vmscan: move RECLAIM* bits to uapi header [061/143] mm/vmscan: replace implicit RECLAIM_ZONE checks with explicit checks [062/143] mm: vmscan: use nid from shrink_control for tracepoint [063/143] mm: vmscan: consolidate shrinker_maps handling code [064/143] mm: vmscan: use shrinker_rwsem to protect shrinker_maps allocation [065/143] mm: vmscan: remove memcg_shrinker_map_size [066/143] mm: vmscan: use kvfree_rcu instead of call_rcu [067/143] mm: memcontrol: rename shrinker_map to shrinker_info [068/143] mm: vmscan: add shrinker_info_protected() helper [069/143] mm: vmscan: use a new flag to indicate shrinker is registered [070/143] mm: vmscan: add per memcg shrinker nr_deferred [071/143] mm: vmscan: use per memcg nr_deferred of shrinker [072/143] mm: vmscan: don't need allocate shrinker->nr_deferred for memcg aware shrinkers [073/143] mm: memcontrol: reparent nr_deferred when memcg offline [074/143] mm: vmscan: shrink deferred objects proportional to priority [075/143] mm/compaction: remove unused variable sysctl_compact_memory [076/143] mm: compaction: update the COMPACT[STALL\|FAIL] events properly [077/143] mm: disable LRU pagevec during the migration temporarily [078/143] mm: replace migrate_[prep\|finish] with lru_cache_[disable\|enable] [079/143] mm: fs: invalidate BH LRU during page migration [080/143] mm/migrate.c: make putback_movable_page() static [081/143] mm/migrate.c: remove unnecessary rc != MIGRATEPAGE_SUCCESS check in 'else' case [082/143] mm/migrate.c: fix potential indeterminate pte entry in migrate_vma_insert_page() [083/143] mm/migrate.c: use helper migrate_vma_collect_skip() in migrate_vma_collect_hole() [084/143] Revert "mm: migrate: skip shared exec THP for NUMA balancing" [085/143] mm: vmstat: add cma statistics [086/143] mm: cma: use pr_err_ratelimited for CMA warning [087/143] mm: cma: add trace events for CMA alloc perf testing [088/143] mm: cma: support sysfs [089/143] mm: cma: add the CMA instance name to cma trace events [090/143] mm: use proper type for cma_[alloc\|release] [091/143] ksm: remove redundant VM_BUG_ON_PAGE() on stable_tree_search() [092/143] ksm: use GET_KSM_PAGE_NOLOCK to get ksm page in remove_rmap_item_from_tree() [093/143] ksm: remove dedicated macro KSM_FLAG_MASK [094/143] ksm: fix potential missing rmap_item for stable_node [095/143] mm/ksm: remove unused parameter from remove_trailing_rmap_items() [096/143] mm: restore node stat checking in /proc/sys/vm/stat_refresh [097/143] mm: no more EINVAL from /proc/sys/vm/stat_refresh [098/143] mm: /proc/sys/vm/stat_refresh skip checking known negative stats [099/143] mm: /proc/sys/vm/stat_refresh stop checking monotonic numa stats [100/143] x86/mm: track linear mapping split events [101/143] mm/mmap.c: don't unlock VMAs in remap_file_pages() [102/143] mm: generalize ARCH_HAS_CACHE_LINE_SIZE [104/143] mm: generalize ARCH_ENABLE_MEMORY_[HOTPLUG\|HOTREMOVE] [105/143] mm: drop redundant ARCH_ENABLE_[HUGEPAGE\|THP]_MIGRATION [108/143] mm/util.c: reduce mem_dump_obj() object size [109/143] mm/util.c: fix typo [110/143] mm/gup: don't pin migrated cma pages in movable zone [111/143] mm/gup: check every subpage of a compound page during isolation [112/143] mm/gup: return an error on migration failure [113/143] mm/gup: check for isolation errors [114/143] mm cma: rename PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN [115/143] mm: apply per-task gfp constraints in fast path [116/143] mm: honor PF_MEMALLOC_PIN for all movable pages [117/143] mm/gup: do not migrate zero page [118/143] mm/gup: migrate pinned pages out of movable zone [119/143] memory-hotplug.rst: add a note about ZONE_MOVABLE and page pinning [120/143] mm/gup: change index type to long as it counts pages [121/143] mm/gup: longterm pin migration cleanup [122/143] selftests/vm: gup_test: fix test flag [123/143] selftests/vm: gup_test: test faulting in kernel, and verify pinnable pages [124/143] mm/memory_hotplug: remove broken locking of zone PCP structures during hot remove [125/143] drivers/base/memory: introduce memory_block_{online,offline} [126/143] mm,memory_hotplug: relax fully spanned sections check [127/143] mm,memory_hotplug: factor out adjusting present pages into adjust_present_page_count() [128/143] mm,memory_hotplug: allocate memmap from the added memory range [129/143] acpi,memhotplug: enable MHP_MEMMAP_ON_MEMORY when supported [130/143] mm,memory_hotplug: add kernel boot option to enable memmap_on_memory [131/143] x86/Kconfig: introduce ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE [132/143] arm64/Kconfig: introduce ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE [133/143] mm/zswap.c: switch from strlcpy to strscpy [134/143] mm/zsmalloc: use BUG_ON instead of if condition followed by BUG. [135/143] iov_iter: lift memzero_page() to highmem.h [136/143] btrfs: use memzero_page() instead of open coded kmap pattern [137/143] mm/highmem.c: fix coding style issue [138/143] mm/mempool: minor coding style tweaks [139/143] mm/process_vm_access.c: remove duplicate include [140/143] kfence: zero guard page after out-of-bounds access [141/143] kfence: await for allocation using wait_event [142/143] kfence: maximize allocation wait timeout duration [143/143] kfence: use power-efficient work queue to run delayed work

Commit Message

Andrew Morton May 5, 2021, 1:37 a.m. UTC

From: Miaohe Lin <linmiaohe@huawei.com>
Subject: ksm: remove dedicated macro KSM_FLAG_MASK

The macro KSM_FLAG_MASK is used in rmap_walk_ksm() only.  So we can
replace ~KSM_FLAG_MASK with PAGE_MASK to remove this dedicated macro and
make code more consistent because PAGE_MASK is used elsewhere in this
file.

Link: https://lkml.kernel.org/r/20210330140228.45635-4-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/ksm.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff mbox series

Patch

--- a/mm/ksm.c~ksm-remove-dedicated-macro-ksm_flag_mask
+++ a/mm/ksm.c
@@ -215,8 +215,6 @@  struct rmap_item {
 #define SEQNR_MASK	0x0ff	/* low bits of unstable tree seqnr */
 #define UNSTABLE_FLAG	0x100	/* is a node of the unstable tree */
 #define STABLE_FLAG	0x200	/* is listed from the stable tree */
-#define KSM_FLAG_MASK	(SEQNR_MASK|UNSTABLE_FLAG|STABLE_FLAG)
-				/* to mask all the flags */
 
 /* The stable and unstable tree heads */
 static struct rb_root one_stable_tree[1] = { RB_ROOT };
@@ -2631,7 +2629,7 @@  again:
 			vma = vmac->vma;
 
 			/* Ignore the stable/unstable/sqnr flags */
-			addr = rmap_item->address & ~KSM_FLAG_MASK;
+			addr = rmap_item->address & PAGE_MASK;
 
 			if (addr < vma->vm_start || addr >= vma->vm_end)
 				continue;