From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E98632BF5D for ; Mon, 4 May 2026 20:45:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777927548; cv=none; b=tFTuzTaJbEBP4sEnAPwaBwXMYeW635E/GAvLFO8g+EEWGp4ePUhsu6HfQ1C6jlUYyMmK3mNyyQgDGgDA2w/5GKyw8ffYwimBoANUBKSLwiZCiZu9pJ2T45flx6midymkCd+YNNmAU6FL5Wzbvs52D0aJEBaRvA04cAPABhGgHKs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777927548; c=relaxed/simple; bh=YZwMAR3uqET/bZH1qZJj95QcpN0V++SSyz4QoqNaiUk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dsBQtxKiWBMCWvsGu3VesAKB0xzIKUPGGSH4v0299WU/rAjaw6DWBWY3zb5RG905RVnsSHF98rwV8Na+l8gsQcLKzm48orTUo7ncgKicNmaGq5nRV5i+I6fjSbLqBTcuOX+t1VdTR2UYFBG5HwgwL9PFesXST31TQ5S6xWS6B7Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=U+9dnfDo; arc=none smtp.client-ip=209.85.210.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U+9dnfDo" Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-7de44ed7a11so3749437a34.1 for ; Mon, 04 May 2026 13:45:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777927538; x=1778532338; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=3nmzwB7G7wQji/lU/ygTPGmrlGNrlrcnn35fzNwdq90=; b=U+9dnfDoUWfFxRDkfXIu6OMMgD7h/o5jK0z87sroarYMb4njliyxoIDWfMdFhdXaXs wdmzWDL/VnfXvp6/c4GXJHMhI8Idzkyw0daOoM1YiQC2scseTZHODpGU+iMBSE+he/b+ 6cYBBxc6eRElXH42gep1/69pn+Gv+L+Ho1T3qvfjN36DuJnxtIew3ajoHB4F5EFb7DMq 7vfflndq0yfRDbdv+duZnj3PNmJ+uGlwP3FgrEaYCOsJ9j7kchGLiww+78qE6XtTNMDi BnU2WFOeVTcij0ldHSUHYHR4iHDkYcWmu/tTwmS5Opg50ZcpEjthFNxHY/z1KSI9IRId IpRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777927538; x=1778532338; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3nmzwB7G7wQji/lU/ygTPGmrlGNrlrcnn35fzNwdq90=; b=nSr1kLKnmLjHKoezW/meLdJPx2hNzV8bHvTpLPsSv0D25wxubQqDIg48n9imF84Olm o+5fSjPajwZfRlJ/eQklZK8ZSMJwxl8aC8NyWYL0a9Gq/9mm/16IINETek9Cog/dbvtz SVXq+8gnLrkd+M7ZYXJKLBIZm61LPof+KUajXK89RWr4XJY77hxcvg8OLLlYF/5I7pIJ VZa/N+jcCh1JC6RCywPVbQP/iehZU1egD0SEy/70rnUVvahpVax0e+uRWClA+RZsStYz 0yd2E9l/VM2mRqLhagXr7A/qERrU7o99PYdcFVHi87vtE4YfBpiWtXnUMhLVTIlVQ1jc AKqQ== X-Gm-Message-State: AOJu0YwNPb2LiPECtSQP9/QGIbTUt+ZUao9Hifg9MM+1xrNLZZ7xJnCJ zCwmWpW4qV7+WL5xVcFdrF4Is/0oahuIDV7BjrEI4WxP4rxY1t/umdJt X-Gm-Gg: AeBDiesp+40BeUcNr1Hkpdp8IIriGlMckCGCOickIpAgOL3y5YFn1nh7Yg1GuBMdcW5 3ggzbuYKqJ6HSwrpcJpd1mGEKstHqKewhs3CunNxZz3DLNl4Fi65K5mUQu+zbcoRiRTA9QG5RBL 00QTZCEAZk/wCMLbrtA86w8voewTgxMEJ8YPZh8rgh9tJXTEMl2QqR1TmsWA+mkv7vh9CqPlnwe ZvnUiVF3u3hgs9ecs0WklFtrvtBxU/vAci52ShiEZvp0+xlhaX08xWYY1aaNz9/X1n3qZD4B360 DrULT/nNFxPfYM/44IGIaFj1gjH4kgqhHT79oPD8SD166co8+KjRoW4BhEQwpV5F0WHSXiYsQKw YRVluMeJiyoLLyl7AWBYCJLJNgW/M0nsasCa82X3AE0/JeLUAteHF/wjHHhXgTLRGVH/Lfo4jh1 HV1LaVfrM83xGHANR3nEwlgSL0jRgbiuQZyGrc5Xa8XjwwCoZC82zmjjeAHL/+mByAc85OBjRt X-Received: by 2002:a05:6820:2908:b0:696:14c0:3f9f with SMTP id 006d021491bc7-696979ad3c5mr5336413eaf.11.1777927538248; Mon, 04 May 2026 13:45:38 -0700 (PDT) Received: from [100.82.231.29] (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 006d021491bc7-69689266bacsm7144713eaf.0.2026.05.04.13.45.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 13:45:37 -0700 (PDT) From: Jim Cromie Date: Mon, 04 May 2026 14:45:23 -0600 Subject: [PATCH 17/17] dyndbg: change __dynamic_func_call_cls* macros into expressions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260504-dd-cleanups-2-v1-17-6fdd24040642@gmail.com> References: <20260504-dd-cleanups-2-v1-0-6fdd24040642@gmail.com> In-Reply-To: <20260504-dd-cleanups-2-v1-0-6fdd24040642@gmail.com> To: Andrew Morton , Jason Baron , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , Shuah Khan , Louis Chauvet Cc: linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, linux-kselftest@vger.kernel.org, Jim Cromie X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777927513; l=2145; i=jim.cromie@gmail.com; s=20260203; h=from:subject:message-id; bh=YZwMAR3uqET/bZH1qZJj95QcpN0V++SSyz4QoqNaiUk=; b=eISda3doke6ER4wdyvj6HcSygG7ahPVJyzRZLi0/2Xp1UhRLhMFfOJo3ZTRiElFtSC1U9xb7z NOeCSToXMEdBLWMSznSMQx3SVwpwr30T98dHODRqXEtoAIJAy012N13 X-Developer-Key: i=jim.cromie@gmail.com; a=ed25519; pk=C6E5ODlPQo7ZBynATXH9wg7K6HxP0pIXyf4s38Qw0XE= The Xe driver's XE_IOCTL_DBG macro calls drm_dbg() from inside an if (expression). This breaks when CONFIG_DRM_USE_DYNAMIC_DEBUG=y because the invoked macro has a do-while-0 wrapper, and is not an expression. if (cond && (drm_dbg("expr-form"),1)) { ... do some more stuff } Fix for this usage by changing __dynamic_func_call_cls{,_no_desc} macros into expressions, by replacing the do-while-0s with a ({ }) wrapper. In the common usage, the trailing ';' converts the expression into a statement. drm_dbg("statement form"); Reviewed-by: Louis Chauvet Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 027e96e0889b..3aa51e7f1938 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -224,24 +224,24 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, * (|_cls): adds in _DPRINT_CLASS_DFLT as needed * (|_no_desc): former gets callsite descriptor as 1st arg (for prdbgs) */ -#define __dynamic_func_call_cls(id, cls, fmt, func, ...) do { \ +#define __dynamic_func_call_cls(id, cls, fmt, func, ...) ({ \ DEFINE_DYNAMIC_DEBUG_METADATA_CLS(id, cls, fmt); \ if (DYNAMIC_DEBUG_BRANCH(id)) { \ func(&id, ##__VA_ARGS__); \ __dynamic_dump_stack(id); \ } \ -} while (0) +}) #define __dynamic_func_call(id, fmt, func, ...) \ __dynamic_func_call_cls(id, _DPRINTK_CLASS_DFLT, fmt, \ func, ##__VA_ARGS__) -#define __dynamic_func_call_cls_no_desc(id, cls, fmt, func, ...) do { \ +#define __dynamic_func_call_cls_no_desc(id, cls, fmt, func, ...) ({ \ DEFINE_DYNAMIC_DEBUG_METADATA_CLS(id, cls, fmt); \ if (DYNAMIC_DEBUG_BRANCH(id)) { \ func(__VA_ARGS__); \ __dynamic_dump_stack(id); \ } \ -} while (0) +}) #define __dynamic_func_call_no_desc(id, fmt, func, ...) \ __dynamic_func_call_cls_no_desc(id, _DPRINTK_CLASS_DFLT, \ fmt, func, ##__VA_ARGS__) -- 2.54.0