Received: by 2002:a05:6a10:5594:0:0:0:0 with SMTP id ee20csp292826pxb; Mon, 25 Apr 2022 10:04:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwH4oN0h/c8l270bG19UbmNNax4GU4gV8x8GABP3imBLCjbt4ef/wtONEUdH69cMz8PijL X-Received: by 2002:aca:dec6:0:b0:322:5748:418 with SMTP id v189-20020acadec6000000b0032257480418mr8659670oig.10.1650906275344; Mon, 25 Apr 2022 10:04:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650906275; cv=none; d=google.com; s=arc-20160816; b=MVY6CoNi730ppONwmmTI6/DOS/8JuVQCqQRRIFy+INE8b4e9ZplsMAo2KEn2Zp7I+t 7a1AJZQgrNDb2jeRmCC6Y5jtYe6Ud269KIsJDbL7ZU9jOCbsiWtKN8VKrqv0Sv7Z2RA4 PvmIUBrX47504a0KsAf+nVRaWYlHTl/jEIncz3K0GxPgz8U3DL2zhRuyfTsHVvbRHTK8 5kv0A53hErbYnj115AAtZMpdZAIulrQYfmc6R3Vu2AAx4VVSRjriUbHWPMTovE84KpPL /8+G21Fo3j1hbusZKevPXVqy8AyJpmhPu7kqhPxnJxcipa4VuZzLyol5/VXGMvxzM211 g2rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=5aD8nS5ZBNmtuBmsZRYQChd71qyKA5B66NT7xRKy+CU=; b=pARNsA+aKqDPGfdhvpiX0fT7hZEGww5I6si7nHE8VCoGH8Ro1vu152F/riPrOFYlpf FDtg82M0IAKk+C9UKr2mX09DHJ+lq7W/qSuRjF5Pf2J3Yz1bpR0nfij+I+wEhAfFPr5p JHof5pqpVe53VCxVTdvy0rUwM8QnHDT1eAHIxrvizXYnt4r7PeRu5wmHK1J4QWpa0elJ KFcGjgy7SP95f5zrq3vUMn81mzl2xe3EIGWPbpgR5cTn2pkK5cHqXvPW+Mqs7MXunggi ZCaocA3D5AIe0yesmnBvcr7HA/bB27MIxRaezHPQEUKByz6BBgRD0Hy7NBomTXMHhCYM 6HWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=hlMlz6Vc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p22-20020a056870831600b000e2577089b4si10024705oae.8.2022.04.25.10.04.15; Mon, 25 Apr 2022 10:04:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=hlMlz6Vc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235812AbiDYG4d (ORCPT + 99 others); Mon, 25 Apr 2022 02:56:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229757AbiDYG4b (ORCPT ); Mon, 25 Apr 2022 02:56:31 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CC3281649 for ; Sun, 24 Apr 2022 23:53:27 -0700 (PDT) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 23P4YCpD023866; Mon, 25 Apr 2022 06:53:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=5aD8nS5ZBNmtuBmsZRYQChd71qyKA5B66NT7xRKy+CU=; b=hlMlz6Vcxikh9I+MXbj9B/r/CXsNkI+NBRP8XOzeeE4cqNKv1HKCv81lL+ed55C7r08i EfVQKh/wSw2tdqllie6kwcwfHxWu/Q4Xm1RP3lxOxcooUxAnNIkJ4sbeeCpFlM16Nhii TGYWJAi00uf3+Ky5aJNrTSoYCYSIpDuD6XtN3oQSizMKrTjhd2yxYfw6eqDFaWzRqAzv /iGhFlDkyTIkf15me188ndnhfAaE8WHfS1CR0i/GUWpiZia2Ch6inKe42r9yMebGolFO l/OhSfRQFgAziQZ2XRfbPLLKRUmDzLPjaFiIp6E3GiuKIHQfgnFuCpc43IP5P+7YIhZR AQ== Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3fmuh5sqhq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Apr 2022 06:53:23 +0000 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 23P6nPok005173; Mon, 25 Apr 2022 06:53:22 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma06fra.de.ibm.com with ESMTP id 3fm8qhhjuw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Apr 2022 06:53:21 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 23P6rV2T918194 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Apr 2022 06:53:31 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 69B64A4040; Mon, 25 Apr 2022 06:53:19 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EFB91A404D; Mon, 25 Apr 2022 06:53:17 +0000 (GMT) Received: from li-6e1fa1cc-351b-11b2-a85c-b897023bb5f3.ibm.com.com (unknown [9.43.47.198]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 25 Apr 2022 06:53:17 +0000 (GMT) From: Jagdish Gediya To: andy@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Cc: Jagdish Gediya Subject: [PATCH] string_helpers: sysfs: Add helper to get bool from string Date: Mon, 25 Apr 2022 12:23:13 +0530 Message-Id: <20220425065313.77213-1-jvgediya@linux.ibm.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 0LY8KJN1Oeyyv-ytK2fx1nUxclhauXEm X-Proofpoint-GUID: 0LY8KJN1Oeyyv-ytK2fx1nUxclhauXEm X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-04-25_02,2022-04-22_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 mlxscore=0 phishscore=0 adultscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 lowpriorityscore=0 malwarescore=0 priorityscore=1501 suspectscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204250029 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At many places in kernel, It is necessary to convert sysfs input to corrosponding bool value e.g. "false" or "0" need to be converted to bool false, "true" or "1" need to be converted to bool true, places where such conversion is needed currently check the input string manually. Also, such conversions compare sysfs input using strncmp functions so even if certain number of character match in the beginning, they assume the string as valid bool, which is not the right semantic e.g. false is bool but falseX is not. Introduce new string helper function to convert sysfs input to corrosponding bool value. Modify existing such conversions to use this new function. logs, $ cat /sys/kernel/mm/numa/demotion_enabled false $ echo true > /sys/kernel/mm/numa/demotion_enabled $ cat demotion_enabled true $ echo truex > /sys/kernel/mm/numa/demotion_enabled -bash: echo: write error: Invalid argument $ echo 10 > /sys/kernel/mm/numa/demotion_enabled -bash: echo: write error: Invalid argument $ echo false > /sys/kernel/mm/numa/demotion_enabled $ cat demotion_enabled false $ echo falseabc > /sys/kernel/mm/numa/demotion_enabled -bash: echo: write error: Invalid argument $ echo 1 > /sys/kernel/mm/numa/demotion_enabled $ cat demotion_enabled true $ echo 0 > /sys/kernel/mm/numa/demotion_enabled $ cat demotion_enabled false This patch doesn't have any functionality change. Signed-off-by: Jagdish Gediya --- include/linux/string.h | 1 + lib/string_helpers.c | 20 ++++++++++++++++++++ mm/migrate.c | 7 ++----- mm/swap_state.c | 6 +----- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/include/linux/string.h b/include/linux/string.h index b6572aeca2f5..3c00991b456a 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -170,6 +170,7 @@ static inline void memcpy_flushcache(void *dst, const void *src, size_t cnt) void *memchr_inv(const void *s, int c, size_t n); char *strreplace(char *s, char old, char new); +int sysfs_strbool(const char *s, bool *output); extern void kfree_const(const void *x); diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 4f877e9551d5..cd3580b7ea06 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -967,6 +967,26 @@ void memcpy_and_pad(void *dest, size_t dest_len, const void *src, size_t count, } EXPORT_SYMBOL(memcpy_and_pad); +/** + * sysfs_strbool - Get bool value corrosponding to string + * @s: The string to operate on. + * @output: Pointer to fill resulting bool value + * + * Returns 1 if string represents bool value, 0 otherwise + */ +int sysfs_strbool(const char *s, bool *output) +{ + if (sysfs_streq(s, "1") || sysfs_streq(s, "true")) + *output = true; + else if (sysfs_streq(s, "0") || sysfs_streq(s, "false")) + *output = false; + else + return 0; + + return 1; +} +EXPORT_SYMBOL(sysfs_strbool); + #ifdef CONFIG_FORTIFY_SOURCE /* These are placeholders for fortify compile-time warnings. */ void __read_overflow2_field(size_t avail, size_t wanted) { } diff --git a/mm/migrate.c b/mm/migrate.c index 6c31ee1e1c9b..a5b105144016 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -2523,11 +2524,7 @@ static ssize_t numa_demotion_enabled_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count) { - if (!strncmp(buf, "true", 4) || !strncmp(buf, "1", 1)) - numa_demotion_enabled = true; - else if (!strncmp(buf, "false", 5) || !strncmp(buf, "0", 1)) - numa_demotion_enabled = false; - else + if (!sysfs_strbool(buf, &numa_demotion_enabled)) return -EINVAL; return count; diff --git a/mm/swap_state.c b/mm/swap_state.c index 013856004825..4f439845d176 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -865,11 +865,7 @@ static ssize_t vma_ra_enabled_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count) { - if (!strncmp(buf, "true", 4) || !strncmp(buf, "1", 1)) - enable_vma_readahead = true; - else if (!strncmp(buf, "false", 5) || !strncmp(buf, "0", 1)) - enable_vma_readahead = false; - else + if (!sysfs_strbool(buf, &enable_vma_readahead)) return -EINVAL; return count; -- 2.35.1