From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B8B0C433F5 for ; Fri, 14 Jan 2022 11:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E1HxMBcCPOI38nmgkd46odq/fCpU4qqzJ12FvmsKy24=; b=DwzMVPej5DDxRL PLH/j4W+DGPidznqGvaXgpFyRwwphtBQHFY1acI4aqZQypHbSk1uqc6bn0CiV8KMyVkfCSeXaf/QE bz9VJmIlLf9uelLGbw8Tc5hd+VNbtNEwr/0JEildjmlMZQW2m1MG/6e7aRp31V3dXB7Co2xpbLoy5 k+KCUSbbZiB590x5dfSqKO04yE7XXz1DpnabbpJMm8QrFlZ+hM42jEKJZW70y7ObNrv34RNResunQ /t9A5xGIeha5VFJcYwz9w1VH2TNmGYvYueZxQNtr3ivPDh/O0ENsMmAWxwX832+QNsOb4/l2bPlJa aFfG8KbPInAy4tIpVYww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8LCv-0090tU-CN; Fri, 14 Jan 2022 11:57:25 +0000 Received: from smtp2.axis.com ([195.60.68.18]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8LCr-0090si-FU for linux-arm-kernel@lists.infradead.org; Fri, 14 Jan 2022 11:57:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1642161442; x=1673697442; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=GxYdK86AwVncAjnPJuoy99CKiKtTmvQPJrbjyinZXo0=; b=K6Bb66TgHSLe9Eto1TTvmIMMX4fWSEGiwArKscNhF9ON0+Nhc1arpw6v oRAgoWkGLAI74zVOy9IXsW8doj6CiDJNxQ1l67gpJqTec5qvpIyYT4k84 ZxDdpqy/yO6CBxFPPb2zyCB6Ay7eBGWFXhOv+Glht2WOSpqBS9d0fAIju bouTMq2Ig4C/kPAC5c/C2PBSpy3z6gXBxA7Qu3BGdRtA1a8ucy582WxVA X6K87uPn7WIBe9a+/FKAzTbtnPBEb7MYCuGB56noEVvDXbAmTzPG956VR LLAnS0LBjQX2Gtb/KpIOdzDmpft530ZhE8hwOhmUlDkYL0IH/tmKBG5J9 g==; Date: Fri, 14 Jan 2022 12:57:18 +0100 From: Vincent Whitchurch To: Jim Cromie CC: "jbaron@akamai.com" , "gregkh@linuxfoundation.org" , "linux@rasmusvillemoes.dk" , "rostedt@goodmis.org" , "mathieu.desnoyers@efficios.com" , "daniel.vetter@ffwll.ch" , "seanpaul@chromium.org" , "robdclark@gmail.com" , "dri-devel@lists.freedesktop.org" , "amd-gfx@lists.freedesktop.org" , "intel-gvt-dev@lists.freedesktop.org" , "intel-gfx@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , "quic_saipraka@quicinc.com" , "will@kernel.org" , "catalin.marinas@arm.com" , "quic_psodagud@quicinc.com" , "maz@kernel.org" , "arnd@arndb.de" , "linux-arm-kernel@lists.infradead.org" , "linux-arm-msm@vger.kernel.org" , "mingo@redhat.com" Subject: Re: [PATCH v11 01/19] dyndbg: add _DPRINTK_FLAGS_ENABLED Message-ID: <20220114115718.GB23983@axis.com> References: <20220107052942.1349447-1-jim.cromie@gmail.com> <20220107052942.1349447-2-jim.cromie@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220107052942.1349447-2-jim.cromie@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220114_035721_873581_41125832 X-CRM114-Status: GOOD ( 13.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jan 07, 2022 at 06:29:24AM +0100, Jim Cromie wrote: > #ifdef CONFIG_JUMP_LABEL > - if (dp->flags & _DPRINTK_FLAGS_PRINT) { > - if (!(modifiers->flags & _DPRINTK_FLAGS_PRINT)) > + if (dp->flags & _DPRINTK_FLAGS_ENABLED) { > + if (!(modifiers->flags & _DPRINTK_FLAGS_ENABLED)) > static_branch_disable(&dp->key.dd_key_true); > - } else if (modifiers->flags & _DPRINTK_FLAGS_PRINT) > + } else if (modifiers->flags & _DPRINTK_FLAGS_ENABLED) > static_branch_enable(&dp->key.dd_key_true); > #endif > dp->flags = newflags; > -- > 2.33.1 > I haven't tested it so I could be mistaken, but when _DPRINTK_FLAGS_ENABLED gets two flags in the next patch, it looks like this code still has the problem which I mentioned in https://lore.kernel.org/lkml/20211209150910.GA23668@axis.com/? | I noticed a bug inside the CONFIG_JUMP_LABEL handling (also present | in the last version I posted) which should be fixed as part of the | diff below (I've added a comment). | [...] | #ifdef CONFIG_JUMP_LABEL | - if (dp->flags & _DPRINTK_FLAGS_PRINT) { | - if (!(modifiers->flags & _DPRINTK_FLAGS_PRINT)) | + if (dp->flags & _DPRINTK_FLAGS_ENABLE) { | + /* | + * The newflags check is to ensure that the | + * static branch doesn't get disabled in step | + * 3: | + * | + * (1) +pf | + * (2) +x | + * (3) -pf | + */ | + if (!(modifiers->flags & _DPRINTK_FLAGS_ENABLE) && | + !(newflags & _DPRINTK_FLAGS_ENABLE)) { | static_branch_disable(&dp->key.dd_key_true); | - } else if (modifiers->flags & _DPRINTK_FLAGS_PRINT) | + } | + } else if (modifiers->flags & _DPRINTK_FLAGS_ENABLE) { | static_branch_enable(&dp->key.dd_key_true); | + } | #endif _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel