From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) (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 7CEFA3909BD for ; Wed, 8 Apr 2026 20:02:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775678564; cv=none; b=KtAbejnMEPMbueHePpkTsQr7F/cHXffaO4XUP4wDSXu1ZrCi+umMBNzHyW1rIFe+Zim1TGs0zhmfxM48LC0FBGAf31JqVYyAeHGhbKfJwPLz9mpBOK/Zzp0SOmOSWb/lmbABvofirgSlYAz6pcEBXVSvxmkzEDsHbEjjKe2+KI4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775678564; c=relaxed/simple; bh=hIKjF0ZA4fn0lNnk1oWbQpUQeAju5ZRz2ynTKZbuZAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H2bDJ4VM43Jcsasij0Z9EnjqVwv+rpEpikNikfQCJpprpFjYHtgAhjdtdgh5NdVBa720d4dJNSLI5ZjKnlTMuPswdtUpO3Zd+g173mxwCE1uX296wsRQNE2LWMsrostWB5FGFJQHqlM8kRSIYufOIJlpQEcfg9lKiwVWc8wQeqg= 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=pI/EYs0n; arc=none smtp.client-ip=209.85.161.48 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="pI/EYs0n" Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-688c2235cd4so92953eaf.0 for ; Wed, 08 Apr 2026 13:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775678559; x=1776283359; 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=BtzYjTItScPv3ZPv5u0hQB8QpwmveJQikTbqnzcN8xo=; b=pI/EYs0nClUhdoFRzvla5H02AvimbAECOW8ssvPsRXdHJkF9mi+Yq8x6GIxVM28iz9 cpwhBU5FyMiN4NgbD/gV8XtLOez4jJtrsbGCP/2Pz8Er2dOSTYVFnlkdRoG6yi6bLH3j fgudGYAErVI4DIR55P/93iRcOt1fm7uiyG3Ibc946oOxYYyRkeOGjuYSsbIpUO3pGo6n BbH6PXO3sigvC6u05sNl8M3t57pPqhk3uOGtimf+HJzhEe6nbqgyqvvcnVYCnd5QV+Hh rqZBi1pq0BaIDryRpbUiZXAYcgbHlfcN3atVJCIPstW7RQEp0GiLsNn12ZED9aGk69Cl v3VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775678559; x=1776283359; 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=BtzYjTItScPv3ZPv5u0hQB8QpwmveJQikTbqnzcN8xo=; b=LjUkBSMbmYGjbiX94h1G0LtA6JsCZEgG4qITmTwKYu6PXxBF4BXbIIcaRzqWhk8knm PWtkL0yllD/F41KzcPb1V9DxmWEi4nGaXsAcgBrre9pFNDA+fN7e+RukHnVycUBvZfed 60SCipOfvv5p4SDVq5Th8f62p4sw0Tx5lDIpICSyoLuRk42Jxk7VxnJZUN4KoAWcYnnh gT3aTH7TIpzc/CLMPup2vIa0Jcsv/4aJaDm/MCIdKCUbzuP9V4TjOGSvcBctT8b9NaJk MrUViDq9jOuqllUlkc3dAt0SpOQgsfnSTh29RBuD0q54rD+qclR//vYSjvfOHIGvHsjq aHLg== X-Gm-Message-State: AOJu0YxPVF+xHGPmHBIKVVPnYY/2q/Jx7WHszq8YMl8b5UWIqN7iOIVL KZAc8/O+HxmS3LTmB9w2uFdNs5Mk68FPOAzSDiTr8gB08JvfnFxY5ZPubFMjvA== X-Gm-Gg: AeBDieuYp6ipF65Y+J/BRPiFkXHk0dfFxd/yui7vxdkzZ7dREsQ7wGpS9Ll/363DknM k8ZDRV6ughgQihC69Ja+KawAtBCzASvsGdrx54ynTrnKEJZ+Ld1FIVxLvzfFZJwR6c7UpZ4eWcb r461yg2Y0KJoOBJUWlJGd7LZ1Wi7t8uK6Z3EFYSomakWViJ//yLh3Y2B7tZLPP6JD0nlLBcu0fe TXdr/K5ARTDBYQqMFisW74dcsm5SDkHRXRBGAv5iTZp6WXdGD9lWDWOQ7B3J11cRsCgrPb6OYeV Hul9Z9DgBM5wqLfvSc0FHv18K9PWxEjBJCrf21cZeFW0owxgCe6QEC211Qey5We3Ne1WG0I5ItJ ds3niqKU7t0yLOSxFCtGY2jmkqRIQ82yt5EpyX1ChbUqypH3v5OltMDmcPQOCqYegnw555aA5dn RTTL7LRCnUk2PVhvu2HGn76jNvq7ZiOmaLDkvaWlGUTg5irx60AG5FMhqcPiFwhTIm2pa8buqbt So= X-Received: by 2002:a05:6820:4b0b:b0:680:1a99:6be2 with SMTP id 006d021491bc7-6821a03c4c9mr12101836eaf.0.1775678559490; Wed, 08 Apr 2026 13:02:39 -0700 (PDT) Received: from frodo.raven-morpho.ts.net (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 006d021491bc7-680a63c7fd1sm12254208eaf.8.2026.04.08.13.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 13:02:39 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, jbaron@akamai.com, louis.chauvet@bootlin.com, Jim Cromie Subject: [PATCH v13 24/36] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Wed, 8 Apr 2026 14:01:59 -0600 Message-ID: <20260408200211.43821-25-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408200211.43821-1-jim.cromie@gmail.com> References: <20260408200211.43821-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: 8bit 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 3939b294c647..33291abd8971 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.53.0