Message ID | 20230717182337.1098991-12-paulmck@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1281140vqt; Mon, 17 Jul 2023 11:39:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlHuXYWJGQ29nBmIga4QN/XPzqlmD40Uf0Ik+BE4dnXOTysW+MEUDc1F9mzFZJRpOPaiOBR0 X-Received: by 2002:a17:902:f68c:b0:1b8:c8bc:c81b with SMTP id l12-20020a170902f68c00b001b8c8bcc81bmr13617866plg.21.1689619190864; Mon, 17 Jul 2023 11:39:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689619190; cv=none; d=google.com; s=arc-20160816; b=1C4dzlf7AmB/xFme3Rfhlxid09JNdDyQirDDrXmXYcIdL0R1wsUnP02f255La2Xhab YFMECrYnGpmN+CuOJa3e4XKY82ttmzupiyvsprPH9i0jesvCKgcSjYn9p3BSQfxQT4mg 2YrspIhd1mq3+izMQtaqTp2zwgkTlQXsojqJ3uvOXAn0XgjMc5jVAJmS1HjyXqc0AIf+ RWKDVZ6EpEuklYxObVUtM0e8wTLhgfL6C5V3Zc4rcBTAX5tmwTuqjK0mA92aQ0Qfj2yP 993Jv/LJHSmFIqsBSUmEhLTgw2hX1lhLQNNfYtWKFQwFIJ8/0AApyHjPdhr3fIS4Qk3w UgAg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rS4R9XUAQBObjxGYQ58tZSMzEIzzNG19mtVg68QZM+s=; fh=Ag0RbRk3LxdpQ9OdMLAf8hbnmFe6FOAHRGAvgVTwgEc=; b=rdoA35JlOOh7HM4G0v3tvAazI5BgulQnE5Oy+7LbNR99cpFF92SplN5C4b8Bo6DkT0 UtUDN/o8FsuoJ1erIN3DBEYoXfMkshUwPjwHfCm0JsEtg8VL17JgGxkrZqDNyF4mgCiX Ku1KVb5m4UII5p/K3QQFJv7FRUVQJhviNBWy3pOR+1UDYq6kGnM6JKvPep8gx+0SA32+ Z7en9FdrfIZqMwrfh317Xhxp65gbM9lUQpskVJxIasIEFQTx6nJ+QbGclKlY4YUmYV9x kPW4+jJ2Rb8j0IVl6YUQiBuBXZH+FcTYIw/xRtbY9JrVfg3BdnEZ7AJ4CDmjQ9UPAJ5d CXHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Mw0bjKH5; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s9-20020a17090330c900b001b03bacdc9dsi219472plc.343.2023.07.17.11.39.37; Mon, 17 Jul 2023 11:39:50 -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=@kernel.org header.s=k20201202 header.b=Mw0bjKH5; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231759AbjGQSYX (ORCPT <rfc822;hadasmailinglist@gmail.com> + 99 others); Mon, 17 Jul 2023 14:24:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231208AbjGQSYF (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 17 Jul 2023 14:24:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61D3210E4; Mon, 17 Jul 2023 11:23:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D11AF6120F; Mon, 17 Jul 2023 18:23:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 034B4C433BC; Mon, 17 Jul 2023 18:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689618220; bh=P4nZm0GdBnAUsfoExek52rW/j2/tlQw3/AFSywEb7CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mw0bjKH5O95bUQnfutikTew55M6HivyZiao3YDAyLIJb6Y35rtwRJmDI42mjHYeSt M3nbi2fMjrYlL5YMAelyqfWx9Yy45S1RAwEOkEZBN57gyAlBMiMgwlEp4juyHgw+hT 9Cn/lm1Ol6vC5XOLtCz3y+9nGkuuKgho+CVqecsZyaIkr0AQLrZFxuICHAqtkLffAJ WS+D43+O8OgcDKDKACmbcZiaHulbfVCMUh1d2FJxkd0i3tasFiLj+rqOvL2TdYOycA fW/FGa+7W0yg9ICCtc7XpHoE6Gl0ub27e9Zwzu3YTztiew+nJ4filXKg+d+acmtO2A BrooQC0jpDMYg== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 38D6ACE0A10; Mon, 17 Jul 2023 11:23:39 -0700 (PDT) From: "Paul E. McKenney" <paulmck@kernel.org> To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" <paulmck@kernel.org> Subject: [PATCH rcu 12/18] torture: Loosen .config checks for KCSAN kernels Date: Mon, 17 Jul 2023 11:23:31 -0700 Message-Id: <20230717182337.1098991-12-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <d03c7482-acde-4f33-a7fb-fa7c58fdc9a2@paulmck-laptop> References: <d03c7482-acde-4f33-a7fb-fa7c58fdc9a2@paulmck-laptop> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771694132856082384 X-GMAIL-MSGID: 1771694132856082384 |
Series |
Torture-test scripting updates for v6.6
|
|
Commit Message
Paul E. McKenney
July 17, 2023, 6:23 p.m. UTC
KCSAN enables some Kconfig options unilaterally and unconditionally,
including CONFIG_PROVE_LOCKING. This in turn enables CONFIG_PROVE_RCU
and CONFIG_PREEMPT_COUNT, which conflicts with constraints in SRCU-T,
TRACE01, and TREE10, which in turn causes rcutorture to emit spurious
configuration complaints. This commit therefore forgives configuration
complaints involving CONFIG_PROVE_RCU and CONFIG_PREEMPT_COUNT.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh index 97bdacc3fc55..5be670dd4009 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh @@ -52,6 +52,13 @@ do echo QEMU killed fi configcheck.sh $i/.config $i/ConfigFragment > $i/ConfigFragment.diags 2>&1 + if grep -q '^CONFIG_KCSAN=y$' $i/ConfigFragment.input + then + # KCSAN forces a number of Kconfig options, so remove + # complaints about those Kconfig options in KCSAN runs. + mv $i/ConfigFragment.diags $i/ConfigFragment.diags.kcsan + grep -v -E 'CONFIG_PROVE_RCU|CONFIG_PREEMPT_COUNT' $i/ConfigFragment.diags.kcsan > $i/ConfigFragment.diags + fi if test -s $i/ConfigFragment.diags then cat $i/ConfigFragment.diags