Received: by 2002:a05:7412:f589:b0:e2:908c:2ebd with SMTP id eh9csp761487rdb; Wed, 1 Nov 2023 01:39:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMNmQW73uxYKGuOic6nSWIgChjXZEQZJSCEVZ5qIj52IYwSNvv5V71gyx1xJWVxqDazUy1 X-Received: by 2002:a81:790e:0:b0:5a7:d461:a2b7 with SMTP id u14-20020a81790e000000b005a7d461a2b7mr12824680ywc.43.1698827955734; Wed, 01 Nov 2023 01:39:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698827955; cv=none; d=google.com; s=arc-20160816; b=C/Nwv0GfU1Sp4QBLhcmYgWJaGRAKlXyLFC/SY3l40HtAjPT9RO5/JXXU+2PhkzrAI2 a7MKlPDxiT4865OAhR2pXRkEaIJmgfjys0YYrkBM/ryaKsmlQtZEmk9dURELUMdUty0N E8cpsjzDxsXf+fCwtKnCjrc0BhLhD3fP6HGQLkhatR9wu1zZlhWFJazyam8dPQVeJiWf bjsqTnMtm1zJJo5brxuIDTse74lviVMoEr2xiecdt3cUdbmOEICur931kDdgqBPLSQxT KV2S5QLmnbaFHMlAwSqIVsf12zTfkP1u7pMT6yB6t1yR0zViw6sR7/L+ck2nXYlQiWWY b7Mg== 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; bh=rxFfoLKMeK38H67Ss5gUmTx3dAhAqPkNNVZCrSWD+Yw=; fh=5rtJondKFUUdPSZ20LM1g2fhl8gQmIEiQ0mi9MO0APQ=; b=Xl0LlDGp7q6SBYcf+fiODjXZfZoxeeYDm4O5JJKv4fY9ePIsaZjUqIzt1nORukep/B Q6KfPdWR4ZTWCaMfUHXwl1aP5PVtpnieQ00vjCmkDhtXCpwWG5x0tDdozqLqSL9NLgLN b323bWLDptciF+eoC5gZyTJm9vS7wa55d45C8p9N53+R31V3jK0mxag4qFZcSvg9vnu1 bd36vN/e8D4JluGnV0VwgOyXLG5SAOoMdXoLZRGqXtagB+woZybSNvnxoxI2L3pnnUWe mBzlrwOPUySeHHeNHAHRn374jdnr9v//qTydgPlqxzqXRR75FNdhYfgTcsIvIwRMnj7B DOjw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id j20-20020a056a00235400b00690c1a57210si1181843pfj.115.2023.11.01.01.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 01:39:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 863F0804868C; Wed, 1 Nov 2023 01:39:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232097AbjKAIjL (ORCPT + 99 others); Wed, 1 Nov 2023 04:39:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbjKAIjL (ORCPT ); Wed, 1 Nov 2023 04:39:11 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6EA6DF for ; Wed, 1 Nov 2023 01:39:07 -0700 (PDT) Received: from dggpemm500020.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4SL0hh5gT4z1P7l9; Wed, 1 Nov 2023 16:36:04 +0800 (CST) Received: from localhost.localdomain (10.175.104.67) by dggpemm500020.china.huawei.com (7.185.36.49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 1 Nov 2023 16:39:05 +0800 From: WoZ1zh1 To: CC: , , , Subject: [PATCH -next,V2] fscache: support to disable assert macro Date: Thu, 2 Nov 2023 00:34:14 +0800 Message-ID: <20231101163414.2105727-1-wozizhi@huawei.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.104.67] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500020.china.huawei.com (7.185.36.49) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 01 Nov 2023 01:39:14 -0700 (PDT) In fs/fscache/internal.h, ASSERT macro is enabled by default and can not be disabled, then assert failure will crash the kernel as the BUG() is included in the ASSERT macro. Therefore, add FSCACHE_ASSERT to control it. Signed-off-by: WoZ1zh1 --- fs/fscache/Kconfig | 10 ++++++++++ fs/fscache/internal.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/fscache/Kconfig b/fs/fscache/Kconfig index b313a978ae0a..7ff844038bc3 100644 --- a/fs/fscache/Kconfig +++ b/fs/fscache/Kconfig @@ -38,3 +38,13 @@ config FSCACHE_DEBUG enabled by setting bits in /sys/modules/fscache/parameter/debug. See Documentation/filesystems/caching/fscache.rst for more information. + +config FSCACHE_ASSERT + bool "FSCACHE asserts" + default n + depends on FSCACHE + help + Support the ASSERT mode for failure behavior. + Say N here to disable the ASSERT by default. + Say Y to add assertion checks in some places. But the assertion + failure will result in fatal errors that BUG() the kernel. diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h index 1336f517e9b1..951166ed772f 100644 --- a/fs/fscache/internal.h +++ b/fs/fscache/internal.h @@ -225,7 +225,7 @@ do { \ /* * assertions */ -#if 1 /* defined(__KDEBUGALL) */ +#ifdef CONFIG_FSCACHE_ASSERT #define ASSERT(X) \ do { \ -- 2.39.2