From nobody Tue Apr 7 12:55:15 2026 Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) (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 4423639D6E4 for ; Fri, 13 Mar 2026 13:23:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773408222; cv=none; b=V0ckg0AknlcD7AQYoIFcWBwnZB7FxmWN4XZJXUnZJYv1JKtezPb97Dqa9RCaQNxYv/WhHheTYd6AAplVx0xKvvOrfKDOMhSGQQu1HxzJ5PUN/VzQdACjQ36gfDXvQplc9GM+RFTEREwbchQR1LVTEP0UhDYe6PnUFy9n1dmsCBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773408222; c=relaxed/simple; bh=By1JXffxmAy43iPfrrj7xzanTYb1AnrGPmlJ/GKVsB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sL30YnU/nnXJjBxlOd0+eSxogf6/AFET6ghc/N/AsqJVpHud6VqsHL/RMpiewtO+xw/H4Rt4OBtKveJSHLEQVJcpAorIGoYOPLsGiCJ0RRVQFfsoWN1MC3YxHEJkmQDsANyC/sl3gcyPs4CGd+7eK8jLr0swhKgNLATvZx5Bffc= 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=aFf//Npg; arc=none smtp.client-ip=209.85.167.176 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="aFf//Npg" Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-466f935a82fso1463810b6e.0 for ; Fri, 13 Mar 2026 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773408220; x=1774013020; 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=o/myr2hp6uBA+KWlkM+krb2AJfDnLypCssuuL9Sraxc=; b=aFf//Npg0l5iNhdmkcdkHv2u1rCcPmL/z8t9fFy18Hiyx1pgC6wwFxbw+C4/dEUdDg rbVUHPwZdiLGk3FRNmCV6Hp/AsZAwnCFgB/yOBpfy31EwgklKBWR212INC4HcwC4rqNC B/nHmqfNJepdV1STSBUDgNcaYwjjGu1jbpHuA3mLxATpWdTSvd/AGV9Qr29yEdbiJXJ1 RZEpx/83W4aDSLgsVURuvf19DIdfcwNrPzL7cIe1QR0hZdluIu0sjKu/h7CnVsYAsS4+ e9YpGc+prZOCb4hV9hsqJANj/nE3APMDvtkfT4x4ywlRhCNzAATefMFSHV4z3wADjEe5 17mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773408220; x=1774013020; 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=o/myr2hp6uBA+KWlkM+krb2AJfDnLypCssuuL9Sraxc=; b=l7PpmotKXrAc4w/0t3CbbWjlwjsm1SaIBS3Ohw9u0HjckJyEh/udfnVDXsjf1xfv3Y D5yDmhTE9FwZ3FyUNckubeXY7Hr87HQbWwjmH1/BXdf+OTW9czFxG2Kp1glVDYN6M567 X+mwMhuKh8JbFqklDFp8hRcVsMHtU5GheJx9zC03y5EatxolcAMbcXxp83tcWijxTQyE tBw0sZ6pOqIG0CRH1R+tcGdhE2V/+y4XuYzyFYmPEv9wReSSJAuwL1f9dolKjT+40nJi JjOrJVLv60WhyrVlLZeg+poVDAZA9zuUXeFCDvLSRAHV/DE/ba1OJ3o3dg0ykGeyLbKM 6Vyw== X-Forwarded-Encrypted: i=1; AJvYcCXoqgi73QYo1W6jnMbPyGKjxUVGCdgs3YFcYkdSzs3ib8btcUg6N4MzIe0kSukVdaqwjnMGwjNDl1fWArw=@vger.kernel.org X-Gm-Message-State: AOJu0YyBSbkOCJ3iW1IQ0eG0Unkv8oS4Dluep2e0TaYafqQDXY9JYBnD vJIxKtRDRPv6zYRYqIKyJQU7u9qPk7IePUAE+Jqed8E+PlOX36AgiohP X-Gm-Gg: ATEYQzyhTaPCb9H95cImYZKJYgMLO/5LWyST3of+zhuvL8SRzzLtwzjFxunbCw0FmRf vQ/quI6Chw8qBvy8H9i2ohJVelHXYX+LA5K3tHnbgR1lW+2WBGHNRVWpY6HB6xHAN76ie98aYGl zMiLX/5QyxSO4wtCoekAfc0RLcreVXJzCjtzCoOMuRN6BRgSl8LM8CNJuzTvSClVIJJrBsOaVgB TDNoPTS7pLlYMKIXihrLvDNP6IyV5y24dEbaqBYquBL4h+rqWJJzDjeecHr3sVpz2RNBROj6KHo ZOp7lS086V9OCp8Q8VuOy4g8pyCU3bTFZ36FWCgl/3Tw58g5Stu8FzTZpuLmBP+jwaoMY35w7WV RxEKpnY8svh3aCrRP1xSsiKjvyLBeIrxVhxKQxoyJlcK4VFIhrwKQaAMP94mSok+m1IXxq+30qv 8ifuXRi9jXWuLGKu5ojrA32e3widQpSQaUcw9tN6CKLSSy0Cuz X-Received: by 2002:a05:6808:6604:b0:45c:8fa8:7497 with SMTP id 5614622812f47-46757530482mr1581686b6e.34.1773408220142; Fri, 13 Mar 2026 06:23:40 -0700 (PDT) Received: from frodo (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 5614622812f47-4673434a35csm4795987b6e.20.2026.03.13.06.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 06:23:39 -0700 (PDT) From: Jim Cromie To: airlied@gmail.com, simona@ffwll.ch, jbaron@akamai.com, gregkh@linuxfoundation.org, Jim Cromie , linux-kernel@vger.kernel.org Cc: mripard@kernel.org, tzimmermann@suse.de, maarten.lankhorst@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, christian.koenig@amd.com, matthew.auld@intel.com, arunpravin.paneerselvam@amd.com, louis.chauvet@bootlin.com, skhan@linuxfoundation.org, pmladek@suse.com, ukaszb@chromium.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH v11 21/65] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Fri, 13 Mar 2026 07:19:46 -0600 Message-ID: <20260313132103.2529746-22-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260313132103.2529746-1-jim.cromie@gmail.com> References: <20260313132103.2529746-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"); 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 b6198ecc854d..80160028461a 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__) =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__); \ __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__) --=20 2.53.0