From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 42230CCD196 for ; Fri, 10 Oct 2025 08:03:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C1F4210EB70; Fri, 10 Oct 2025 08:03:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g1+OTruO"; dkim-atps=neutral Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) by gabe.freedesktop.org (Postfix) with ESMTPS id B1BF610EAE9 for ; Thu, 9 Oct 2025 17:59:08 +0000 (UTC) Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-4291359714eso11118015ab.1 for ; Thu, 09 Oct 2025 10:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760032748; x=1760637548; darn=lists.freedesktop.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=bBVZWusQDNba37/oJBvqNeU2d7R0nqKRYCmReL4RLfo=; b=g1+OTruOwXUtpZCChlqSjufkn1gHQw47rdHtOIz7woS69D9fktOUS8kicdNKmC0PW4 tQuTFE5w3oh/drt8EVAtrfsPExFuG5ra3rQXaHQoZOB9YE+bEDpl2S2fqwJYKKd1jdYe Uq/6VHhaiquvWG4/d5Le7HlicmnYdMAZFUQ57ilgq7reEyoTFC5z6SKHw3h4LSI9GLWC nNYLau2CxOvRXESk1G8Mr7Jha+fgXnKl+G7b8ZmHC4yOqPro471ImuVyOWXFpwfKU3h/ YxQdBtaYrDAwHSyA1ekyooT55zlkpc0YYUKUISdH2VV6IsLBY8LQvmOgWxtUpOy0KFHe GFkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760032748; x=1760637548; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bBVZWusQDNba37/oJBvqNeU2d7R0nqKRYCmReL4RLfo=; b=EHK6oNesLSKyOgtiM1GNQlcol+06Fn6WfBme/8iXJF8n3ABmSj9Lv6cH47Obi96Yuq 0YSH+/lzzPoysG6rgG7CxCkGLF2j7IMmEvWlo3WYcbzFOi9fwZqDljhEoicl3+K66F0D 3erk0r10wpYLQ9/rBp75htTeq3XCMT5kYKbruYIyp9zi7MM+o2uN1NbjCzJGtIgm9N+D eDk7QHyc3tNhGj1fvu4CwlMTKKxeDea1lAG1uXpki6Y/q9xoYb1Y5ScWSET+03WbeeHM u9vC10UWfDq35QQu83Q9M+XyVqJAf9mUk+mE3xorkHIZNMOLAlhdCRBrWx9dwC0c6StI gHIw== X-Forwarded-Encrypted: i=1; AJvYcCVKmi3RXSnEa1kh7CkehPVrJQhwXkumlswRWWCHpHDKIo77KjtpntJ+1ez0bK/ygrgAYvGyqrFu@lists.freedesktop.org X-Gm-Message-State: AOJu0YwPRaNN8FvkCx0Z1Om9cHPiba2vBtnwPYz8WsOzpQDcqyJUzr/w WgypSTiayyqPAHBgdfqxmX5n9nLzLdSvPmmKbohm93/GSdvkzzEqVw7G X-Gm-Gg: ASbGncu1jbl5m36yuDbJeuMFiW52BjQ3zWHrrYuECGsoiOtMH5qk+d0ImAFU4PWbPU3 lBQppzkdPuNwS1Iotkdq3jQtOxV8U4drMaaEwgkyjk80wKzA2WAb0lfx1vmcVIXf8FAilJuaqxH Ifib2bIJUQb1S9QkuzZ3TsXx3p/dHlNenbAt6GFAcHY1AdZVRkluZApISyirslLaa3wvP78ckcd h41LI2v5Gbg1g2F9sBmFt72SP7VAwllHqrZKukxs7oxs7PR9dVWCi4VwTJMC52qksF/+gVpMz3C YRYxMc/Gz8PioT2ssHxdNiZJg1O5PN3TX6CKjSVQOkLHQVK5KhDXUL45BwVmepIVeB5O2NcVUwt /03+HW4kpKhZvh7b1pr3cx2qiwA3OjU7aiAbG+8OttOBtAyOM2G9IVZTii+DsKTKIwS9GAjOki1 nNIDkJFBd/FYDIzlrcX9c3K+ah/qI= X-Google-Smtp-Source: AGHT+IGyz5PWJ72Qylu52JN98V5hPC/owd9s7jI1qO3g0mG+L/5zspcKIM0k6PzzDXXuTsCSBFWwxA== X-Received: by 2002:a05:6e02:1a88:b0:42d:86cc:1bd2 with SMTP id e9e14a558f8ab-42f87410bd5mr76537985ab.32.1760032747736; Thu, 09 Oct 2025 10:59:07 -0700 (PDT) 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 8926c6da1cb9f-58f7200c4afsm30256173.35.2025.10.09.10.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Oct 2025 10:59:07 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com Cc: gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, daniel.vetter@ffwll.ch, tvrtko.ursulin@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, Jim Cromie Subject: [PATCH v5 19/30] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Thu, 9 Oct 2025 11:58:23 -0600 Message-ID: <20251009175834.1024308-20-jim.cromie@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009175834.1024308-1-jim.cromie@gmail.com> References: <20251009175834.1024308-1-jim.cromie@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Fri, 10 Oct 2025 08:03:12 +0000 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" 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"); 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 b6f3689912fe..68568a71f265 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__) -#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__) -- 2.51.0