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 4AC10ECAAD3 for ; Fri, 9 Sep 2022 21:59:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229893AbiIIV7k (ORCPT ); Fri, 9 Sep 2022 17:59:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230272AbiIIV7j (ORCPT ); Fri, 9 Sep 2022 17:59:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA24912AF9 for ; Fri, 9 Sep 2022 14:59:36 -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 ams.source.kernel.org (Postfix) with ESMTPS id 8020FB82656 for ; Fri, 9 Sep 2022 21:59:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23777C433C1; Fri, 9 Sep 2022 21:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1662760774; bh=TjpaOgJpuUJK6Aw9fT+u93g+IRNjcG9X8TMsVPHT1tg=; h=Date:To:From:Subject:From; b=pEZjVZug3iFiFnmGw37wHTUDwOxPOYywo6m4E+Fk7Fw2TrQvhfhqCpxQbUcc4zpwS L7Zfgyrw7odKQk/Ex5Kt20w56jdIv7iEU98A5ahMatrq4lGflLi0gpSxUoZKljdRhG EOEbqo4QALZbjKjQLNXBwom2ktz678XNFUii+H+0= Date: Fri, 09 Sep 2022 14:59:33 -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: [to-be-updated] mm-memcontrol-use-kstrtobool-for-swapaccount-param-parsing.patch removed from -mm tree Message-Id: <20220909215934.23777C433C1@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm/memcontrol: use kstrtobool for swapaccount param parsing has been removed from the -mm tree. Its filename was mm-memcontrol-use-kstrtobool-for-swapaccount-param-parsing.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ 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 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-shuffle-convert-module_param_call-to-module_param_cb.patch mm-kfence-convert-to-define_seq_attribute.patch