From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) (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 00B433C2764 for ; Wed, 8 Jul 2026 02:19:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783477153; cv=none; b=H09sbLJUxTSdHxWUGzrapf6x2BhMqFJOcm1tc317PxIJW0Yxa2GgU8GL+yszUq0PPt96kaaO82SbTx0LdTFuGOIxfZHl9TqEJ/wQRx0/L4mJl0zKJ5+BRFExr1iq4pimDOdVWxbHtl5DWqLU8O0DsIF9duJZU0PuUOaP/axCt0s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783477153; c=relaxed/simple; bh=x7Lmuj8LN3O7Zdv08MDGavB+OL7HP+Z+IL4O8u3sLcQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gzyHXnb8a/752ugumZI861DBthWi523l6BJP+xLlGCgDOcoPksdo2vxDs7mS4rTdF0mP/VeJxniCoePW3QTmw7UtwPOSOr7aA4kzvt8K67jy1XS1PvYfeoavb8l5rIOsZ4WGPj6IEIHSsHuc4gCU/Ywf3qFtFKuTW79HA0aKyNI= 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=edsYDpzl; arc=none smtp.client-ip=209.85.167.169 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="edsYDpzl" Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-497e6956acfso168677b6e.1 for ; Tue, 07 Jul 2026 19:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783477148; x=1784081948; 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=QEjbqhV2gwoIMldtbZBgfn/e8I1IhfNrhj/88jNL8xA=; b=edsYDpzlnhXtbeoG7Ot2Rvj0DHvh3HGcrxaJhM8gLcXiMUpSpxsRvdpn8ccH9BFXOg 0b3pagiztUe4F/nsLqrAJV8dLVVTLaKsSP5Z7sCJD6luyufgCNlplbhSRfYEeRr8CmqC T7M2DPJLeDGk5z9zHtdpHp9NBYBVWsM4SewrE3zt4/u0Y5nmQRa9SOGSwL/bTb/sj3C6 YeeeXpmfV1dYiKIfa89jL8oir5L8XbQ9RRAT1WTb3O2H84ADdNH6d/2Iv5MqTRRGF7vQ Jv7BPsONWxTMHZwjDeC9eDcVSN2SxyUqk78i3KNgSaxswBx4JG7zKicOQR0CiUnbwtVI BK9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783477148; x=1784081948; 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=QEjbqhV2gwoIMldtbZBgfn/e8I1IhfNrhj/88jNL8xA=; b=OIe69rOWbpzFujwDfM6Oj3weklA7xYSV/+mSuWUy0UZ0XMzh1up/afa7f4fXKRqVCn aY4WEMnAWvbTqEThwMEShQbToPTKcYmkgW02sQXwgbkhij/CHGLD54m2cqIIbdf7/0HZ f795Lql+llr8xghXlDiiOqfhs1oKoZTJhjP9jhhD4gcIpxqhzxCvdpesWIN/dIcp0O8K y7cDUM7q83qvEiS4NWgy12hrEU5q9JMTa2Nj0P91kFm4VDfx3aaeAcpnm1WCR4DDZpkS aApaViiH96jcUs2jajpTVDwDpqFlruqNshuKUZSD4tpL90zkHUixEse5apP6y5tYoS4m luSg== X-Gm-Message-State: AOJu0YyU98qkI8vtvS2VIveMWgikYdsHa8QohoeiWu6SqBHYqRt9xEGv iXzWInhPeM7Pp/PtJDSBThia6vgnPpwbEDx0iu0K8a3n3z6mdXsfQanr X-Gm-Gg: AfdE7cmYDDdhDfUx36bZ0DiOFtrEi8IMADxKOTPAokESi9nks8f3WI4Pa9yrTUdFDXw 5Eo0BsFdKOvrCGBZ1dptiz3BC8hM+Th6GsFCH+fAWd9oiVnv5rSEbgRaeyJ5C6LYLgG6SNpZkiM WLeou/DOb2qOwkjAxG6H4dL4TBlRxLb3JZH/BzDO5JjhuNzg8xBVCdCA8Fl6LNjjkPFiP40s1N3 fM56NF5HF2zxleOewYG45q2YjhIVpfB9LPBJmFs0HeeF9QF2/I5Z/CvaV8qT8HkEOi+MNlko/Ik ZAhfaqvkdfEtKJCb7HgawMn91n2WCkv4Hbj83zWlLHgolrph1/gBuM7VPbLOkSqXFjspRWqNROx muSa8Yz/x4dDqpDQeQpjMQ5VXVR51Qo8o2ylm+8EsprVuU0XP4IqlTXS01xYiO5ORaJeVUZ1flz NrRBRmnWVsQxNKyBTjGxP4pOfNtt0NE5OlMbPmHQme6iDqrMMqp/LPuh9e6QQnRg== X-Received: by 2002:a05:6808:3502:b0:4a1:8ace:b41f with SMTP id 5614622812f47-4a1f090567cmr454807b6e.10.1783477148516; Tue, 07 Jul 2026 19:19:08 -0700 (PDT) Received: from [192.168.0.245] (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 5614622812f47-4a1aa006f74sm799975b6e.0.2026.07.07.19.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 19:19:07 -0700 (PDT) From: Jim Cromie Date: Tue, 07 Jul 2026 20:18:23 -0600 Subject: [PATCH v6 23/24] 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: <20260707-dd-maint-2-v6-23-381f3edb0045@gmail.com> References: <20260707-dd-maint-2-v6-0-381f3edb0045@gmail.com> In-Reply-To: <20260707-dd-maint-2-v6-0-381f3edb0045@gmail.com> To: Andrew Morton , Jason Baron , Greg Kroah-Hartman , Jonathan Corbet , Shuah Khan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Arnd Bergmann , Luis Chamberlain , Petr Pavlu Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arch@vger.kernel.org, linux-modules@vger.kernel.org, Jim Cromie , Louis Chauvet X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1783477102; l=3522; i=jim.cromie@gmail.com; s=20260203; h=from:subject:message-id; bh=x7Lmuj8LN3O7Zdv08MDGavB+OL7HP+Z+IL4O8u3sLcQ=; b=auMc58zWcPnKYuLlJzABwZIDMclW0m/WEujPrsC0hQmmgedi7cqvgzrPVVb/aJbMKrOobeRnz DBkn9Zgm7FKBGU/A4pvfN0yNcOY+GUSa1HBOOL551M4YWstK6tjcURa 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"); Additionally, change the dynamic_hex_dump() fallback macro (used when CONFIG_DYNAMIC_DEBUG is disabled) from a do-while-0 statement into a statement expression returning 0. This ensures that the fallback form of dynamic_hex_dump() behaves consistently with its enabled form, and makes it safe for use in conditional expression contexts. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- v5: also convert dynamic_hex_dump() stub v2: fix statement-expressions to return 0 (not void) like their respective fallbacks 1. Add 0; to __dynamic_func_call_cls 2. Add 0; to __dynamic_func_call_cls_no_desc 3. Convert the disabled fallback of dynamic_hex_dump from do { ... } while(0) to ({ ... 0; }) move RvB after SoB --- include/linux/dynamic_debug.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 355f2cb11733..8822f9a3605f 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -238,24 +238,26 @@ 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) + 0; /* match no_printk return value */ \ +}) #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) + 0; /* match no_printk return value */ \ +}) #define __dynamic_func_call_no_desc(id, fmt, func, ...) \ __dynamic_func_call_cls_no_desc(id, _DPRINTK_CLASS_DFLT, \ fmt, func, ##__VA_ARGS__) @@ -335,10 +337,12 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, dev_no_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__) #define dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ groupsize, buf, len, ascii) \ - do { if (0) \ +({ \ + if (0) \ print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, \ - rowsize, groupsize, buf, len, ascii); \ - } while (0) + rowsize, groupsize, buf, len, ascii); \ + 0; \ +}) #endif /* CONFIG_DYNAMIC_DEBUG || (CONFIG_DYNAMIC_DEBUG_CORE && DYNAMIC_DEBUG_MODULE) */ -- 2.55.0