Received: by 2002:a05:7412:f589:b0:e2:908c:2ebd with SMTP id eh9csp761616rdb; Wed, 1 Nov 2023 01:39:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDvKWoFBCCiy05pvqA/QWyBf+UmoIaKNcA5U02F8OtAGDkjlORX24BmkMpmoj3m/HoCG46 X-Received: by 2002:a17:903:22d1:b0:1ca:b8d3:f880 with SMTP id y17-20020a17090322d100b001cab8d3f880mr7176480plg.20.1698827978343; Wed, 01 Nov 2023 01:39:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698827978; cv=none; d=google.com; s=arc-20160816; b=wtyAnDGml2FFk8T2DJ0LCeNp5KRoOBjwHIF1mYvpHv982pJJjp5C5SNsU7+PZIZ2hK LIA5W4tRzdX6wh51pnig5GXtHFNOqxWgXuVU/pvCvleNapUnBujiD4zUBBBKywRoD0+h EGp8+ZxX2lN1jSfskGjxLT1nVqKvVMgHmBcjEKYSV/gGYwVyztXpR7XeeoF3AZLc8kBs mUV9kh5F4Zz7DXeZP0UdPjb8DZ4blB/OUg+ibiEfrCJtd+BDVfX4fuzlHMSrDnlgni56 LVDEoII0UEuS3oD/coXMkzLjo5So2dFHNp/FYGQwprAXxdHctYyijwkDRoyX8+v001Ix DhDg== 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=qHKy7r8XSWbcrsH08Y6M4CYFyriUGJivRTimePMPBT8=; fh=5rtJondKFUUdPSZ20LM1g2fhl8gQmIEiQ0mi9MO0APQ=; b=yFYtsjwQNjRgDPkvWyJfB9E+cEd1ohAtDL4z8fK5pORGpn53BOGoQRSPkY3d3hURGz xXr6RRsULISQGIkMKltQt7QCNq4RC240OmFE0AHSEtK4GF9h7qoxOG24KaOViHje7Gbf F13RecQyG1j9bOMa9L6iK7aqO+Bw2nGg6GLQvTp/aqwQPo+8nygtI+Cfl59ItBqd4tU+ 6OF+PQrJJhth84cIpASRVfznr40YSa59RU9JtEh1/JbtqQKIOBoURZmW35v49+n2h3jX Xh17m/2PolHMf5Jna619CjZK3kaX3mchmT+qmRQmjnxRzHu2H++7/VVn4G4E7SylYzpg J1JA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id w20-20020a170902d11400b001c5d09c7b0dsi2483283plw.458.2023.11.01.01.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 01:39:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id DC1AF809C4FC; Wed, 1 Nov 2023 01:39:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232185AbjKAIj3 (ORCPT + 99 others); Wed, 1 Nov 2023 04:39:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232204AbjKAIj2 (ORCPT ); Wed, 1 Nov 2023 04:39:28 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71C81109 for ; Wed, 1 Nov 2023 01:39:25 -0700 (PDT) Received: from dggpemm500020.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SL0j14TFkzrTJX; Wed, 1 Nov 2023 16:36:21 +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:23 +0800 From: WoZ1zh1 To: CC: , , , Subject: [PATCH -next,V2] cachefiles: support to disable assert macro Date: Thu, 2 Nov 2023 00:34:31 +0800 Message-ID: <20231101163431.2108688-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=-0.8 required=5.0 tests=DATE_IN_FUTURE_06_12, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email 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 (pete.vger.email [0.0.0.0]); Wed, 01 Nov 2023 01:39:36 -0700 (PDT) In fs/cachefiles/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 CACHEFILES_ASSERT to control it. Signed-off-by: WoZ1zh1 --- fs/cachefiles/Kconfig | 11 +++++++++++ fs/cachefiles/internal.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/fs/cachefiles/Kconfig b/fs/cachefiles/Kconfig index 8df715640a48..83d8ec3ba2d8 100644 --- a/fs/cachefiles/Kconfig +++ b/fs/cachefiles/Kconfig @@ -38,3 +38,14 @@ config CACHEFILES_ONDEMAND and is delegated to userspace. If unsure, say N. + +config CACHEFILES_ASSERT + bool "CACHEFILES asserts" + default n + depends on CACHEFILES + 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/cachefiles/internal.h b/fs/cachefiles/internal.h index 2ad58c465208..263b1f13e943 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h @@ -425,7 +425,7 @@ do { \ #define _debug(FMT, ...) no_printk(FMT, ##__VA_ARGS__) #endif -#if 1 /* defined(__KDEBUGALL) */ +#ifdef CONFIG_CACHEFILES_ASSERT #define ASSERT(X) \ do { \ -- 2.39.2