From nobody Tue Dec 2 02:41:31 2025 Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) (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 6DDE9366DD2 for ; Tue, 18 Nov 2025 20:19:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497168; cv=none; b=kwBT5ruo6sLtqABEVcT/Es9GNYiJUh5f398O9DTEye2EiO/fq1AnuMZifaOoZWrjEad/+wZYAR0emJrm+niiAX9MPmff7/cxKskIAP+mbWL6CQv9Ie6kUxiwEEhG8ndyGPLact5o8uDGujY2iurPErt/SF+kw4GEvnuX323u31M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497168; c=relaxed/simple; bh=i9n9PZ6cDORUwNXDdpR9q3FJjPyYgqk84bfG+v7pbMI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jfpQfWseAAejeIXTYKquF8zNCaQGP8zu/AX1AN+DFSalNp3ot5SmVVGZNoc7lDo0yq51FudFSy+2STX2qLzURaXn9hvYhZx/oFjIMN64T8Jh2K2otarkHAbsHseMZJxxUDwCepzgM0vLogP2tAWNPJJjydyGsN0NfKugwGevR38= 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=HSAKtKHb; arc=none smtp.client-ip=209.85.166.182 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="HSAKtKHb" Received: by mail-il1-f182.google.com with SMTP id e9e14a558f8ab-4330d78f935so38693045ab.2 for ; Tue, 18 Nov 2025 12:19:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763497163; x=1764101963; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=soWf0YG/+Srs0WepiWrUk4JAonJuGIy1dByc0giWUH4=; b=HSAKtKHbxpTOxm0sIWjdbaaWli5GPq8kEEwqWaUYE63oPg3f+lltfMdbPSifpvmH4y ahoZpzJ/8IAPF1bWx1WqtWXqgOu+8CN2MFZwu4BFJS3PeBS3yl4OCjeFZK8d3+RmOAjt E14HBWGrbft4RPDf8+hmw8u8mVRsM53DY0087xsYSH1Uadov7/hZ4lSCYOJbbfkeI1T6 D+4lq7/fvFPGRMgyhTrdVb/UWh/0YvSl72IAKYIlccQyUFj99ohGzrfWc0RMjzuIdMKP PuMA7jtd8FSfb+3xglfnyzXkQ7fNKkAN075k4QN6Yf6iESmou2nqTQ1ZUN5gOMPOQ1KW yQvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763497163; x=1764101963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=soWf0YG/+Srs0WepiWrUk4JAonJuGIy1dByc0giWUH4=; b=Nuktog0Wxp07MB4mPlwyJNAilT+zczZuirBYFcV3u+YDhyMB9w5uUoa8v9mxLG+FyX 6kPUdwyuvWgG3e7dv99ikQIromFsXlWXPI4fjiFYm4Q6v1LZBHQ+UDkUUIxr4i0JZxLr 6hQcX+9O0lerS8NF1Ik+tAcBIpOVm61rDrMGerxN5q1n+9DB6xrWaXP/v6UHt52tvFR2 yx+3gigfZFIhdlQXcpPGMqF5rwtQwRW9xuv8+9OlkDLJIMVN/uB14fnHPguSPHdWmYiU WGrAEwgy9SVdp2awZ4QQKn0t5nhgs9iPG+g4x4ksfWcNJ0s5RVabddyrpZ794dskf00b Md+g== X-Gm-Message-State: AOJu0YySWX3dK/5+8hfY4A4ctnRefc0xhLSGx2Zv4pgOYGX0029frKxm U0uO66xRlK5xXisupmmKVTfKgmCQHweCKyYRmZPB3H7nBy1kcciiZW8/XFw3AvCD X-Gm-Gg: ASbGncuBwWzlSufLVcHnd5zgH6Pl6iIaZCnj1E4hdPWL+bu7jpcFePdw1UY72VpjnrB Q1HNRO9CWTjPIxh0FUT70mQFDdYPC/Xcwn95oLXkUhHkmJCtc9VIZGAsJ544GfYBssWU9cfZZXc HCcByGGmA6L+a80csLXghE6glTupsq8cIb0ZuhU3kHkBx5zEwmjaPAkCh4yKbqFgLz6UZ2WwRYL 6BTuBnAVS28KHs2LRvcfy2ylpoHmdQOy9lybDDTboV6jOvaKRohos7vLuioSLIjK6szMBruOAEl CwbvAeGlSWn44uyU+78GzsgAoOtUtfyATQQbfgqeSHwgype1Gi5PNlWbVuR2VpSU2+WUtUCLgGs hBafEPzuJiHivQZY6v+CI4tzgkQ4ufPOAwuYWDC1qHT0IqISkEeXyynhw2EjL7ck5cDu/YNo/HY nN1ufTRgEhQ8jCWkS6e9Wjfj8yYWc1jCZsjBtJaDVUmrxx9gsHSjwEtnfipU6breGfNLB/VTyj0 BMnAQ== X-Google-Smtp-Source: AGHT+IERLZKtgnyjJfukFnqSJ6ABnoOP6yH5yt9IMBZXmZSftzdAMsB5udG44uwdyeCiZqRzEkdbag== X-Received: by 2002:a05:6e02:2282:b0:434:a88d:f80f with SMTP id e9e14a558f8ab-434a88dfaa8mr90252745ab.5.1763497162910; Tue, 18 Nov 2025 12:19:22 -0800 (PST) Received: from godzilla.raven-morpho.ts.net (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id ca18e2360f4ac-948fd4c273bsm419823939f.18.2025.11.18.12.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 12:19:22 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, gregkh@linuxfoundation.org, jbaron@akamai.com Cc: ukaszb@chromium.org, louis.chauvet@bootlin.com, Jim Cromie Subject: [PATCH v6 20/31] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Tue, 18 Nov 2025 13:18:30 -0700 Message-ID: <20251118201842.1447666-21-jim.cromie@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251118201842.1447666-1-jim.cromie@gmail.com> References: <20251118201842.1447666-1-jim.cromie@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Xe driver's XE_IOCTL_DBG macro calls drm_dbg() from inside an if (expression). This breaks when CONFIG_DRM_USE_DYNAMIC_DEBUG=3Dy 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"); 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 d543b84d447e..c4ebbccca5d1 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -217,20 +217,20 @@ 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__); \ -} while (0) +}) #define __dynamic_func_call(id, fmt, func, ...) \ __dynamic_func_call_cls(id, _DPRINTK_CLASS_DFLT, fmt, \ func, ##__VA_ARGS__) =20 -#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__); \ -} 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__) --=20 2.51.1