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 0A95CC38145 for ; Thu, 8 Sep 2022 22:02:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229505AbiIHWCm (ORCPT ); Thu, 8 Sep 2022 18:02:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229502AbiIHWCX (ORCPT ); Thu, 8 Sep 2022 18:02:23 -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 B093A399E4 for ; Thu, 8 Sep 2022 15:02:01 -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 21F2D61E3D for ; Thu, 8 Sep 2022 22:02:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7946DC433C1; Thu, 8 Sep 2022 22:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1662674520; bh=72ZTUqe6szIduWg5m+0xkUWL9zHMW1bgcFY1gsJMsnw=; h=Date:To:From:Subject:From; b=jPtFQetaCbAA5NjKUREHRpcpLVLgrPtkOp2bASk0N2PxjMLIddF4c2GCRGMA6GyLj 36Z8krLcHk/tP6OO+wz6ml4ZUbNFQ+cgiNWPLtmpo0TNu5HwiFhKBvRtYV1BdrRXZ8 ClnNm21cAwYMU4grK46s23kZJpaZ4oKBvkBj2+ok= Date: Thu, 08 Sep 2022 15:01:59 -0700 To: mm-commits@vger.kernel.org, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, shakeelb@google.com, roman.gushchin@linux.dev, mhocko@suse.com, hannes@cmpxchg.org, corbet@lwn.net, liushixin2@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-memcontrol-use-kstrtobool-for-swapaccount-param-parsing.patch added to mm-unstable branch Message-Id: <20220908220200.7946DC433C1@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/memcontrol: use kstrtobool for swapaccount param parsing has been added to the -mm mm-unstable branch. Its filename is mm-memcontrol-use-kstrtobool-for-swapaccount-param-parsing.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-memcontrol-use-kstrtobool-for-swapaccount-param-parsing.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: Liu Shixin Subject: mm/memcontrol: use kstrtobool for swapaccount param parsing Date: Thu, 8 Sep 2022 16:34:52 +0800 Use kstrtobool which is more powerful to handle all kinds of parameters like 'Yy1Nn0' or [oO][NnFf] for "on" and "off". Link: https://lkml.kernel.org/r/20220908083452.2844125-1-liushixin2@huawei.com Signed-off-by: Liu Shixin Cc: Michal Hocko Cc: Roman Gushchin Cc: Johannes Weiner Cc: Shakeel Butt Cc: Muchun Song Cc: Jonathan Corbet Cc: Kefeng Wang Cc: Liu Shixin Signed-off-by: Andrew Morton --- Documentation/admin-guide/kernel-parameters.txt | 7 ++++--- mm/memcontrol.c | 8 ++++---- mm/swap_cgroup.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) --- a/Documentation/admin-guide/kernel-parameters.txt~mm-memcontrol-use-kstrtobool-for-swapaccount-param-parsing +++ a/Documentation/admin-guide/kernel-parameters.txt @@ -6037,10 +6037,11 @@ Execution Facility on pSeries. swapaccount= [KNL] - Format: [0|1] + Format: { [oO][Nn]/Y/y/1 | [oO][Ff]/N/n/0 } Enable accounting of swap in memory resource - controller if no parameter or 1 is given or disable - it if 0 is given (See Documentation/admin-guide/cgroup-v1/memory.rst) + controller if no parameter or [oO][Nn]/Y/y/1 is given + or disable it if [oO][Ff]/N/n/0 is given + (See Documentation/admin-guide/cgroup-v1/memory.rst) swiotlb= [ARM,IA-64,PPC,MIPS,X86] Format: { [,] | force | noforce } --- a/mm/memcontrol.c~mm-memcontrol-use-kstrtobool-for-swapaccount-param-parsing +++ a/mm/memcontrol.c @@ -7507,10 +7507,10 @@ bool mem_cgroup_swap_full(struct folio * static int __init setup_swap_account(char *s) { - if (!strcmp(s, "1")) - cgroup_memory_noswap = false; - else if (!strcmp(s, "0")) - cgroup_memory_noswap = true; + bool res; + + if (!kstrtobool(s, &res)) + cgroup_memory_noswap = !res; return 1; } __setup("swapaccount=", setup_swap_account); --- a/mm/swap_cgroup.c~mm-memcontrol-use-kstrtobool-for-swapaccount-param-parsing +++ a/mm/swap_cgroup.c @@ -194,7 +194,7 @@ int swap_cgroup_swapon(int type, unsigne return 0; nomem: pr_info("couldn't allocate enough memory for swap_cgroup\n"); - pr_info("swap_cgroup can be disabled by swapaccount=0 boot option\n"); + pr_info("swap_cgroup can be disabled by swapaccount=[oO][Ff]/N/n/0 boot option\n"); return -ENOMEM; } _ Patches currently in -mm which might be from liushixin2@huawei.com are revert-frontswap-remove-support-for-multiple-ops.patch revert-mm-mark-swap_lock-and-swap_active_head-static.patch revert-frontswap-simplify-frontswap_register_ops.patch mm-zswap-replace-zswap_init_started-failed-with-zswap_init_state.patch mm-zswap-delay-the-initializaton-of-zswap-until-the-first-enablement.patch mm-zswap-skip-confusing-print-info.patch mm-thp-simplify-has_transparent_hugepage-by-using-is_builtin.patch mm-thp-remove-redundant-config_transparent_hugepage.patch mm-kmemleak-make-create_object-return-void.patch mm-huge_memory-prevent-thp_zero_page_alloc-increased-twice.patch mm-memcontrol-use-kstrtobool-for-swapaccount-param-parsing.patch