From patchwork Wed Oct 19 08:30:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5521 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp337102wrs; Wed, 19 Oct 2022 06:48:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6XreXsIxojlalyQIeD6L3eSFKEYJhtozDkGP50uQvdf3DGQG67/2g2+6B6DFXUzW4IEAvZ X-Received: by 2002:a17:90b:3891:b0:20d:59e3:1f4f with SMTP id mu17-20020a17090b389100b0020d59e31f4fmr9822210pjb.21.1666187308584; Wed, 19 Oct 2022 06:48:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666187308; cv=none; d=google.com; s=arc-20160816; b=vI1LR4dTGNqcXf1R6w1Rk74jFQCTarYyNXy9rTGBiJ+jUT05haQ2hpmjUZu0EeYKDC nLGpaqeCl2CqN9TeOUMQpLy/e9LA1PgxnKTqeQ18vTYReTupzQSLA693kp5pD/gOI2ow 7w/8tADmrzcQVc9rJUUBj9XvrV1MHPxSxy3xBu0OcFZO+FsCkQdq2Zb1e+A0EeHqNr5q RndzDzFM7Si7X1kSu+VY6zcnQeXoYCNb8hPCUZfpCRvyID3wk/V3Qa7ZUBJfYRjsOwET K59o9clsTcNUvOupgg5X3Ogn9xI31gba3zHew/eJr7bfz5hweICfK4kaw9HVVenxkSzL YOTQ== 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=UF/zsWPDSHMuDpBZZBe2pktanFlOQaNnPDeY1gNJSbXr3wW+Vcwg16vG2/zg/S5HjM Lowkm7boDDzCbPgEfR0tw8UQmL37IB7Hx1g6kG+PheY+4gnumfsn2YR43101t9KIP/OO D6UWlgR9AUQoTy1ElEZq2maDZuToBbqZiBSBBXEUUeHnjopEnqwVJ9zkDX/H1F8COcP7 CUAZzF4b3U49jTdlGB2GETfK04jqCuV0Bw4pj26+fVJMFxxb5QhgJJazs26e9jJNi6aw 8gfKMCzy/uHGJyYE0k24kFc7mEgBOFNbhXp7KLzsYhE3J2H+16Ojr3SN0MOkuUMC9QbH 3W9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CQyu8c3i; 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 z5-20020aa785c5000000b0054307ac90f1si17437814pfn.319.2022.10.19.06.48.16; Wed, 19 Oct 2022 06:48:28 -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=CQyu8c3i; 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 S233068AbiJSNrx (ORCPT + 99 others); Wed, 19 Oct 2022 09:47:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233366AbiJSNqX (ORCPT ); Wed, 19 Oct 2022 09:46:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEDD313D0D; Wed, 19 Oct 2022 06:32:15 -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 ams.source.kernel.org (Postfix) with ESMTPS id E946DB823C3; Wed, 19 Oct 2022 09:01:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49E51C433D6; Wed, 19 Oct 2022 09:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170067; bh=4wv5WtR//CDdsvxu8xL/5g2O2bXmliW8UL1zS+PsHLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CQyu8c3ip3MooVefqQvBWcxKhNA8KNBlVoKBWDpteEzHwmKjwrcIx/RYxop3/lHsr GApJCNpSrxApuZPiuT8Uds92APTHBZ8IdSm9o5I0z0dWyp+wWHt/fM2oaijjO5MRP8 1VOxH0ZNfElHmFuiDwPWmMQe6x9FxhT+5//+uCjM= 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 6.0 513/862] dyndbg: fix static_branch manipulation Date: Wed, 19 Oct 2022 10:30:00 +0200 Message-Id: <20221019083312.654631487@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@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?1747124023432485941?= X-GMAIL-MSGID: =?utf-8?q?1747124023432485941?= 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",