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 064E9ECAAD8 for ; Fri, 16 Sep 2022 20:06:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230152AbiIPUGk (ORCPT ); Fri, 16 Sep 2022 16:06:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230213AbiIPUGg (ORCPT ); Fri, 16 Sep 2022 16:06:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31A0CB7282 for ; Fri, 16 Sep 2022 13:06:35 -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 BEBD062D76 for ; Fri, 16 Sep 2022 20:06:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25E98C433D6; Fri, 16 Sep 2022 20:06:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1663358794; bh=af/iofOeIudTgGVkbv3q1Meo+lGYHimZQn09wuEJCD0=; h=Date:To:From:Subject:From; b=nn2tNcay9xBHAD7LDXBGc9hYtTWOq8SnyI4Ffqyhke9NB875rdXksT9y3hWLkKmrm VkP+l99eCEIVSPLNqZdTtgFzC1kzewvydJTSnuDg4JLqa4LBXtKxgojKJy+tnhYA1e 3ZSXD58oorzV/rQV/TgMstArVl4P469/PSGo/5nw= Date: Fri, 16 Sep 2022 13:06:33 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, osalvador@suse.de, david@redhat.com, anshuman.khandual@arm.com, linmiaohe@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-page_alloc-ensure-kswapd-doesnt-accidentally-go-to-sleep.patch added to mm-unstable branch Message-Id: <20220916200634.25E98C433D6@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/page_alloc: ensure kswapd doesn't accidentally go to sleep has been added to the -mm mm-unstable branch. Its filename is mm-page_alloc-ensure-kswapd-doesnt-accidentally-go-to-sleep.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-page_alloc-ensure-kswapd-doesnt-accidentally-go-to-sleep.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/page_alloc: ensure kswapd doesn't accidentally go to sleep Date: Fri, 16 Sep 2022 15:22:42 +0800 Patch series "A few cleanup patches for mm", v2. This series contains a few cleanup patches to remove the obsolete comments and functions, use helper macro to improve readability and so on. More details can be found in the respective changelogs. This patch (of 16): If ALLOC_KSWAPD is set, wake_all_kswapds() will be called to ensure kswapd doesn't accidentally go to sleep. But when reserve_flags is set, alloc_flags will be overwritten and ALLOC_KSWAPD is thus lost. Preserve the ALLOC_KSWAPD flag in alloc_flags to ensure kswapd won't go to sleep accidentally. Link: https://lkml.kernel.org/r/20220916072257.9639-1-linmiaohe@huawei.com Link: https://lkml.kernel.org/r/20220916072257.9639-2-linmiaohe@huawei.com Fixes: 0a79cdad5eb2 ("mm: use alloc_flags to record if kswapd can wake") Signed-off-by: Miaohe Lin Acked-by: David Hildenbrand Reviewed-by: Oscar Salvador Cc: Anshuman Khandual Cc: Matthew Wilcox Signed-off-by: Andrew Morton --- mm/page_alloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/mm/page_alloc.c~mm-page_alloc-ensure-kswapd-doesnt-accidentally-go-to-sleep +++ a/mm/page_alloc.c @@ -5148,7 +5148,8 @@ retry: reserve_flags = __gfp_pfmemalloc_flags(gfp_mask); if (reserve_flags) - alloc_flags = gfp_to_alloc_flags_cma(gfp_mask, reserve_flags); + alloc_flags = gfp_to_alloc_flags_cma(gfp_mask, reserve_flags) | + (alloc_flags & ALLOC_KSWAPD); /* * Reset the nodemask and zonelist iterators if memory policies can be _ Patches currently in -mm which might be from linmiaohe@huawei.com are mm-hwpoison-use-clearpagehwpoison-in-memory_failure.patch mm-hwpoison-use-__pagemovable-to-detect-non-lru-movable-pages.patch mm-hwpoison-use-num_poisoned_pages_sub-to-decrease-num_poisoned_pages.patch mm-hwpoison-avoid-unneeded-page_mapped_in_vma-overhead-in-collect_procs_anon.patch mm-hwpoison-check-pagetable-explicitly-in-hwpoison_user_mappings.patch mm-hwpoison-cleanup-some-obsolete-comments.patch writeback-remove-unused-macro-dirty_full_scope.patch mm-page_alloc-ensure-kswapd-doesnt-accidentally-go-to-sleep.patch mm-page_alloc-make-zone_pcp_update-static.patch mm-remove-obsolete-macro-nr_pcp_order_mask-and-nr_pcp_order_width.patch mm-page_alloc-remove-obsolete-comment-in-zone_statistics.patch mm-page_alloc-add-__init-annotations-to-init_mem_debugging_and_hardening.patch mm-page_alloc-fix-freeing-static-percpu-memory.patch mm-remove-obsolete-pgdat_is_empty.patch mm-page_alloc-add-missing-is_migrate_isolate-check-in-set_page_guard.patch mm-page_alloc-use-local-variable-zone_idx-directly.patch mm-memory_hotplug-remove-obsolete-generic_free_nodedata.patch mm-page_alloc-make-boot_nodestats-static.patch mm-page_alloc-use-helper-macro-sz_1km.patch mm-page_alloc-init-local-variable-buddy_pfn.patch mm-page_alloc-use-costly_order-in-warn_on_once_gfp.patch mm-page_alloc-remove-obsolete-gfpflags_normal_context.patch mm-page_alloc-fix-obsolete-comment-in-deferred_pfn_valid.patch