From nobody Mon Feb 9 12:42:49 2026 Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) (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 78FAF3064AF for ; Wed, 14 Jan 2026 02:00:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768356007; cv=none; b=eaKYW6GaU+RgW64xoThq3aq5d2aEd+2rCoWgidtMU1YQkoWdLmsLRnjyQYK5m3a4+yDmhk6WaXKhPLs/fZtGZ/eVfG3oGxRZZiOI7PIyr8tD8U3tu18w7n0YvHrNx0PLjKGQBLYlP/+SbpE9QOXLqCca8izafB+V/AfNpUGUPfs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768356007; c=relaxed/simple; bh=DLGYLqotnJ3r64tEQiOm4CWPKlpXwGXxjO6LBdcTYjk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kr9blJIhZtbligKlvY//GO4TDzj4p9SzpaGTTK3SRDByCKu+6r+znyNQuAY8UJr3lCbJspH/0nf7MlnDOrcjmsjOB2FvAZ7NqcO1c5a/z4QHspaQmvvANoeiCp1QX4D0wUM4uadaFctlyCRwqqO9QCv2ewabqWO720+35TXljQk= 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=Mqovvhhb; arc=none smtp.client-ip=209.85.210.45 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="Mqovvhhb" Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-7cfcbe7d176so77233a34.3 for ; Tue, 13 Jan 2026 18:00:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768356003; x=1768960803; 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=kgJaffb+G8M2IXpwFpfYggq/3ogV1jI3bmNBB+yiGR4=; b=MqovvhhbylkAnav9RHhKAnsn+hGPK5GPZHSmhui58leN8/pfqXYZVn/21zNb5WgY8E uYi2dl9T7mLiLd8Ms2rLQgIcE0q+wiMDZUXYCffl3ZLQh371Vb8bwtWFxDzteRCOZvZx lha+UIqqQI55TTf37bZGidj8cPvouJx+EYL+vhVcPsRuAhwF/oPBFL8Zq3N7pIJ9PsZH YVRlDQGHDMgJbgnqL9FttVlMfLU6lnMfLjA5b3cd6wQKuIMDC3HehRX54nZk4RKEy+kU SjJkfuWMTzJ7TL7h+ieFA/1MUq9UBxTZ1+4VIh75ygdQZRUSDG2fTMnbx520vhuRutJU DuAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768356003; x=1768960803; 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=kgJaffb+G8M2IXpwFpfYggq/3ogV1jI3bmNBB+yiGR4=; b=fhmCRfjEG7XAaxAnhG3ZQlgQZM4PJrs/EmSSdCZLfOAYUg4GTJIGFbVDzOdBKwwysY kWRIcMLU5pxvPZisXk1imaeucQBx3vbxhS89FKM40SCyJEvLoJd+7Wns1dQSgxqw9F5o ghvWqe0DMXwG8i3kjp5MzHhqsm4FJvHZF6JJejoCc2YRicyfjSokjYhRYbYHRKZyh4BB OX62yloJJM4N0ALePcn8dwl2Y1rAMQOk2naHZivKv8DrPjvgjcE8YD/v10GYlq4AnTXv lirJean8t7QcRb3gFQKj86jM5V8G6ttXaPRI2vOZpuzlNQCJHkKPjb7Hnc4YzngVh/Ya ieYw== X-Forwarded-Encrypted: i=1; AJvYcCXOQFG4NWaatU2lJVamqOgz854QBOmXUexi5zvd6AW+pwEwejwFyEe8sTGZdhzPgsKn77HbTrB6jT/VTnk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7kfDuW0hAqZnR4VdeagWXC73v1b9TVmdx6jN10W1PCAkdmrRs GBJKa5hIgfiN9CcuKaMnC+SOhOxsTROCPARUJsetCtBpgCOuYOo3RMl1 X-Gm-Gg: AY/fxX59hpGmsqZ1QwV/9XnuCYPai83RCUQB2vKaVjG/ov+2XTt/enuAuixvmHQxOe0 CCSdzUELW7ct93Nglx318+xLUq1H0sDLTZ3PYNQ93lPrOauR1gfGwQwpEYYtZufE5gKXKHVt8i1 RCo8DcCNkItsuqMwtI/Q5IlcS+A6Ev/hi0/b/2kv4aSRjgMgKZj7Tl9Y99WqEnClxFKV/4Vq3ar Mdd2imF2t7heUOorZuS65/KdkU/lO/40FtS37cROlNcqhxBJtrvgNfYxImKeo7w9052QKZmdXo/ 1WVtwIq6f7ORP3dD32Bfc3JF7HuRtZnXL66l7h/CTQbANjNGRCi0fR6BuRVoloZIMdAhljCed3V l6N9Z1E4CUBNKC9/AP6w6JPRjrE2Oy/ZI1c40g7s9BJn7XlQYyXxY2fYfqGPgrfC2uuAgn2whFG GFUHgrf58Ug97uKBhJLw5Of2zP+IYABi4Zi8z4wzMouumsadM= X-Received: by 2002:a05:6830:3110:b0:7ca:f639:4be6 with SMTP id 46e09a7af769-7cfc8b29b3emr1059472a34.19.1768356003373; Tue, 13 Jan 2026 18:00:03 -0800 (PST) Received: from frodo (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 46e09a7af769-7ce478ede43sm16651614a34.27.2026.01.13.18.00.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jan 2026 18:00:02 -0800 (PST) From: Jim Cromie To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org Cc: Jim Cromie , Jason Baron , =?UTF-8?q?=C5=81ukasz=20Bartosik?= , Louis Chauvet , Bagas Sanjaya , Dave Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org, Petr Mladek , Shuah Khan , linux-doc@vger.kernel.org, Steven Rostedt , "Liam R. Howlett" Subject: [PATCH v8 20/31] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Tue, 13 Jan 2026 18:57:36 -0700 Message-ID: <20260114015815.1565725-21-jim.cromie@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260114015815.1565725-1-jim.cromie@gmail.com> References: <20260114015815.1565725-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 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.52.0