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 69356C433EF for ; Mon, 28 Mar 2022 22:15:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229659AbiC1WQv (ORCPT ); Mon, 28 Mar 2022 18:16:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229612AbiC1WQh (ORCPT ); Mon, 28 Mar 2022 18:16:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DB7CC65 for ; Mon, 28 Mar 2022 15:12:50 -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 1873D61543 for ; Mon, 28 Mar 2022 22:12:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68CC3C340F0; Mon, 28 Mar 2022 22:12:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1648505569; bh=WR9UwexNQzO0haMRu85XGoIIiCAhma3Af9eeUWyLFis=; h=Date:To:From:Subject:From; b=OZS4CKXnLJenGzZajZ4cSNDEPU4Q/ryQ5YXfEVNweFa4pB2jSzszPZjVBfTwNa3hZ 8D0G5AeBlWrRp5iCL+E3xT72F17fw60iWTj4KpxWMawYCsr9Gk0R1JImA4C/HPYzoi LaaWmgP63BjfPjMbN/sC2ozcXi+oatPoiF+Lponc= Date: Mon, 28 Mar 2022 15:12:48 -0700 To: mm-commits@vger.kernel.org, ziy@nvidia.com, ying.huang@intel.com, songmuchun@bytedance.com, baolin.wang@linux.alibaba.com, apopple@nvidia.com, linmiaohe@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-migration-remove-unneeded-local-variable-mapping_locked.patch added to -mm tree Message-Id: <20220328221249.68CC3C340F0@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/migration: remove unneeded local variable mapping_locked has been added to the -mm tree. Its filename is mm-migration-remove-unneeded-local-variable-mapping_locked.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-migration-remove-unneeded-local-variable-mapping_locked.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-migration-remove-unneeded-local-variable-mapping_locked.patch 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 and is updated there every 3-4 working days ------------------------------------------------------ From: Miaohe Lin Subject: mm/migration: remove unneeded local variable mapping_locked Patch series "A few cleanup and fixup patches for migration", v2. This series contains a few patches to remove unneeded variables, jump label and use helper to simplify the code. Also we fix some bugs such as page refcounts leak , invalid node access and so on. More details can be found in the respective changelogs. This patch (of 11): When mapping_locked is true, TTU_RMAP_LOCKED is always set to ttu. We can check ttu instead so mapping_locked can be removed. And ttu is either 0 or TTU_RMAP_LOCKED now. Change '|=' to '=' to reflect this. Link: https://lkml.kernel.org/r/20220318111709.60311-1-linmiaohe@huawei.com Link: https://lkml.kernel.org/r/20220318111709.60311-2-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Reviewed-by: Muchun Song Cc: Zi Yan Cc: Baolin Wang Cc: "Huang, Ying" Cc: Muchun Song Cc: Alistair Popple Signed-off-by: Andrew Morton --- mm/migrate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/mm/migrate.c~mm-migration-remove-unneeded-local-variable-mapping_locked +++ a/mm/migrate.c @@ -1230,7 +1230,6 @@ static int unmap_and_move_huge_page(new_ goto put_anon; if (page_mapped(hpage)) { - bool mapping_locked = false; enum ttu_flags ttu = 0; if (!PageAnon(hpage)) { @@ -1244,14 +1243,13 @@ static int unmap_and_move_huge_page(new_ if (unlikely(!mapping)) goto unlock_put_anon; - mapping_locked = true; - ttu |= TTU_RMAP_LOCKED; + ttu = TTU_RMAP_LOCKED; } try_to_migrate(src, ttu); page_was_mapped = 1; - if (mapping_locked) + if (ttu & TTU_RMAP_LOCKED) i_mmap_unlock_write(mapping); } _ Patches currently in -mm which might be from linmiaohe@huawei.com are mm-shmem-make-shmem_init-return-void.patch mm-memcg-remove-unneeded-nr_scanned.patch mm-mremap-use-helper-mlock_future_check.patch mm-mlock-fix-two-bugs-in-user_shm_lock.patch mm-compaction-use-helper-isolation_suitable.patch mm-migration-remove-unneeded-local-variable-mapping_locked.patch mm-migration-remove-unneeded-out-label.patch mm-migration-remove-unneeded-local-variable-page_lru.patch mm-migration-fix-the-confusing-pagetranshuge-check.patch mm-migration-use-helper-function-vma_lookup-in-add_page_for_migration.patch mm-migration-use-helper-macro-min-in-do_pages_stat.patch mm-migration-avoid-unneeded-nodemask_t-initialization.patch mm-migration-remove-some-duplicated-codes-in-migrate_pages.patch mm-migration-fix-potential-page-refcounts-leak-in-migrate_pages.patch mm-migration-fix-potential-invalid-node-access-for-reclaim-based-migration.patch mm-migration-fix-possible-do_pages_stat_array-racing-with-memory-offline.patch