From patchwork Sat Oct 22 07:24:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7807 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1139305wrr; Sat, 22 Oct 2022 03:21:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4iuiboMpv2GXVj2JAQFG8/bCAeMsyJaaRspsIDyqSXiJgb3THiXndE8DOIi63YEOAj5Gc3 X-Received: by 2002:a17:907:3f04:b0:741:4bf4:fe42 with SMTP id hq4-20020a1709073f0400b007414bf4fe42mr19839578ejc.664.1666434118125; Sat, 22 Oct 2022 03:21:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666434118; cv=none; d=google.com; s=arc-20160816; b=CvAmicDgOLP6GpkK1Ha7HKgDfGKX+Vt41UzdOB5o4rkxxPd1c6zKHzS1c6xmrM+FZ/ yCNNpsi2CpO+U4LXLiL8TweD78xZ3KQvYlRGEwph1eF96nl122OWjsAUtGDnoG7VT/5f lr7UvaNQIWSA+ystxLX/qS6BReBdnQvrAtYZNIlWO36Lze3m34NGlWYPw40lqkEhIzp6 F0vMskJ0SPJzbn4Q8gbFE52jzIHGcL7C3nrXrIijOwxszfUHVyLnUVQFchBMGeLnTVat 8k9hvOeDrXkU/aDGXatrYJsk4jPwNmsgCEZ3SLCRa3gVI15dXTHfCDrps7+39UCqn4fp 2UoQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Xe257ESVMWjRoUD+pbBPd+DmfH4zAbDtmevNwHwQndE=; b=CeDfRwZLn+RWtrZPkYgQE+CVXPaMhk/wioPtyfpeOS1zCW7Mc1K+RWbF7LdFHVWbzU y0NIOQEbrTSD+f0VWBa8y3LM8/NX4TiWe/cRg6Tlj9/7ZBUy+cogZ4Od/wmnE6iJdEeD h0jadzafT/FqDMH9/MJNzHJ1gRcX39le9dI9Xmyc67NvqCfc+uewqL73V6tiCFjaFG6C OoeNz2RU5E8I6a5BM/kBD57JG0uqFFNiw2hGNXbj22dHsp61bYL8EnvaiR3T6IfEsVZU boXwAx4C3JcHgdqE+JOP68e2CsIPqt8iiCgo14ISvd0wcP7jnsZcuEabao6HTQso0rvV QkBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wpa1+Tma; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hq15-20020a1709073f0f00b0078dcd8dfac5si22344827ejc.467.2022.10.22.03.21.32; Sat, 22 Oct 2022 03:21:58 -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=@linuxfoundation.org header.s=korg header.b=wpa1+Tma; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230207AbiJVKO0 (ORCPT + 99 others); Sat, 22 Oct 2022 06:14:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230300AbiJVKOB (ORCPT ); Sat, 22 Oct 2022 06:14:01 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 412EAB03FB; Sat, 22 Oct 2022 02:31:34 -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 sin.source.kernel.org (Postfix) with ESMTPS id 07534CE2CAC; Sat, 22 Oct 2022 07:53:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8C3BC433C1; Sat, 22 Oct 2022 07:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425180; bh=4wv5WtR//CDdsvxu8xL/5g2O2bXmliW8UL1zS+PsHLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wpa1+Tmadnty8pzd3Gn6oYmMvMjwJzv7T/ZaZV2h0nEbNbKY0qAh5qC9frEhG2s+g xEzLIu/oTim3kMaur0cBjECfkPhin0tEtgNUz2I4Cr54IEDOUf/CRuM0g5+KRwXwO2 Tw7rEk15gOypjVLYIWMt/fvDzAn7Omz+d9TSYb+g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, vincent.whitchurch@axis.com, Jason Baron , Daniel Vetter , Jim Cromie , Sasha Levin Subject: [PATCH 5.19 417/717] dyndbg: fix static_branch manipulation Date: Sat, 22 Oct 2022 09:24:56 +0200 Message-Id: <20221022072516.673209048@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747382821800744369?= X-GMAIL-MSGID: =?utf-8?q?1747382821800744369?= From: Jim Cromie [ Upstream commit ee879be38bc87f8cedc79ae2742958db6533ca59 ] In https://lore.kernel.org/lkml/20211209150910.GA23668@axis.com/ Vincent's patch commented on, and worked around, a bug toggling static_branch's, when a 2nd PRINTK-ish flag was added. The bug results in a premature static_branch_disable when the 1st of 2 flags was disabled. The cited commit computed newflags, but then in the JUMP_LABEL block, failed to use that result, instead using just one of the terms in it. Using newflags instead made the code work properly. This is Vincents test-case, reduced. It needs the 2nd flag to demonstrate the bug, but it's explanatory here. pt_test() { echo 5 > /sys/module/dynamic_debug/verbose site="module tcp" # just one callsite echo " $site =_ " > /proc/dynamic_debug/control # clear it # A B ~A ~B for flg in +T +p "-T #broke here" -p; do echo " $site $flg " > /proc/dynamic_debug/control done; # A B ~B ~A for flg in +T +p "-p #broke here" -T; do echo " $site $flg " > /proc/dynamic_debug/control done } pt_test Fixes: 84da83a6ffc0 dyndbg: combine flags & mask into a struct, simplify with it CC: vincent.whitchurch@axis.com Acked-by: Jason Baron Acked-by: Daniel Vetter Signed-off-by: Jim Cromie Link: https://lore.kernel.org/r/20220904214134.408619-2-jim.cromie@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- lib/dynamic_debug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index dd7f56af9aed..a56c1286ffa4 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -211,10 +211,11 @@ static int ddebug_change(const struct ddebug_query *query, continue; #ifdef CONFIG_JUMP_LABEL if (dp->flags & _DPRINTK_FLAGS_PRINT) { - if (!(modifiers->flags & _DPRINTK_FLAGS_PRINT)) + if (!(newflags & _DPRINTK_FLAGS_PRINT)) static_branch_disable(&dp->key.dd_key_true); - } else if (modifiers->flags & _DPRINTK_FLAGS_PRINT) + } else if (newflags & _DPRINTK_FLAGS_PRINT) { static_branch_enable(&dp->key.dd_key_true); + } #endif dp->flags = newflags; v4pr_info("changed %s:%d [%s]%s =%s\n",