From nobody Thu Apr 2 20:20:44 2026 Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) (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 2A6A440FDA8 for ; Thu, 26 Mar 2026 18:55:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774551308; cv=none; b=re6d4LJnfb8i9w1Gwo8W0DET/JC6A9oefQJiXLsZ5Q+BHzMyrtkx5of6dw+rwxkYOXO0wLsFAwcvA3XvVvkx5GxDXQ4rPubAVCVzqqTcVlLVHUYKslKuKHXqI12smBAX9e2tGV1KN77dtwi3YlX89tFo7np4hPSquXwDA1FK2O0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774551308; c=relaxed/simple; bh=hIKjF0ZA4fn0lNnk1oWbQpUQeAju5ZRz2ynTKZbuZAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BJjxn7j3Q66HnDa7LVqrHHsPfnV3OKdg86ovHo2ozlEJ/szj0tlIsVQ6BedPRkiV8wPg7Q1dALj+aZ7kleDBZO2XkF66D88RAwDpXMqknoD4wn8kpot5uBHLHhizfWsASVKriP5iGBfqbxgjhO/jxTfEKIEmJEOuc5HTInC7Bko= 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=KeJpMnvj; arc=none smtp.client-ip=209.85.160.51 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="KeJpMnvj" Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-40ea611d1a4so611528fac.2 for ; Thu, 26 Mar 2026 11:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774551306; x=1775156106; 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=KeJpMnvjG/U5oEAFOvgZXlfasVVeXvsp+nURhVQUwMmG8lEa8tTbfotPM8al5m1j7t HPXluCZ5NBgCSk3k5dc3Ocu2PlqTpG4BiZqPPJhV8R8IzirgLp0bAMCtGoWuZPOsiq7u NG1KUZd113/u42Z1w2+eGarn5mjIeJO/x6Edwd7eKknLuoZfnip8yACko3Y+nXhQ/2JB k7HGd3pg44pNRB3YKtl6Wwxn8tG+E8yOZ4Lzca4WMFv3ilOW8YwjEJ09VYtE/jobelVd qk8YfxXZApYlGMdz4G1dm4VnmciMbItRkvn4OrPRKc3KWs3K4pL+bYhAw+wRgtzIMhr5 N2Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774551306; x=1775156106; 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=B5PBhHZnWl2bnNx758oWpV1xyybh5rYAufkRGcp1OlEc8e3zVhBToH9e0X3HR5/IK8 W+LC5E/DBYvdmgQqUcrCtG8LNqkqVmbCe49PoeO3EUzSHtRJLiBVUvcVIZQRzhZIC2ev VaZp+FA2EYRhSSm0zsorI0OkQXwgTkRJEfeN8jQOa+m+cS78WFWVQDkiBOQEaKdPqcDV 5tc3Ch2hKJIignn+etMOOEIBQK9FvkCpJz7fp9XVyVr/M8k6+wk9sdy6htVpBCOYT2Eq ZjbJoDY7d8dvdOYhOkePR66d/qc8BV92uxdmewOk7iVVGAOICNxpwNfkmaI3iCsvODRV xzfQ== X-Gm-Message-State: AOJu0YyiSEvS8K1rrH0RGcdDX1jlhcqtTL0pE5JFJ879pbmTOpskeTd9 4f8Llii/e7t7fXFCBCu2FeFtGiIqejLta90idPUetjxS2pDZsc01Y1F4KU4ffg== X-Gm-Gg: ATEYQzz0UNTvusVSvKCXeBUnFgtXkIRhSvXtfo8DvR30g5Qvt5pnmR9UKoHhgBL+OwQ ugIxN366Ds0Bq9M9bux2K+vChUIjSckc9VFsiXkN4TaX+2vcgpP/qGuePvvOUz01E0gfA5izV8B 0nafexR8n9tpmnNmcjLmlkW9Z2uTmSUToRnnBddlNNf1VBCtpaIvxzXY5XJRFVp1YzBmQK76aVF JHjTEf28f3B12fi9Ufr5sTgHgPl5V9FPj/Y6F9lrwCUAXTTwhPHeRmT/tsR3icngl0asO/p96eF yABv1U1uOjObEe1zjWV7Mdd6f5PaX1GmKl2H7LVDNBvnLy9/WZZRoqmZF2uBAGixF+8F3RWPZxT XrKJerWDtOa6TRvpQ1DalohC4J/Ah+sXIHCDQjRwwmEmt6+kjHQLkapeaWFdC7QRXtlFS6K/3Jh yEAEVo+StcB52nVXHcsr0LRSoPtaUEqZUCxSvLUi6blEbpPHyn X-Received: by 2002:a05:6870:d18d:b0:417:4679:d550 with SMTP id 586e51a60fabf-41ca6e15946mr4548356fac.22.1774551305958; Thu, 26 Mar 2026 11:55:05 -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 586e51a60fabf-41cc7760c08sm3075171fac.4.2026.03.26.11.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:55:05 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org, airlied@gmail.com, simona@ffwll.ch, jbaron@akamai.com, gregkh@linuxfoundation.org Cc: jim.cromie@gmail.com, 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 v12 24/69] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Thu, 26 Mar 2026 12:53:28 -0600 Message-ID: <20260326185413.1205870-25-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326185413.1205870-1-jim.cromie@gmail.com> References: <20260326185413.1205870-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 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__) =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