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 shelob.surriel.com (shelob.surriel.com [96.67.55.147]) (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 41FC1C3DA59 for ; Tue, 16 Jul 2024 19:09:24 +0000 (UTC) Received: from localhost ([::1] helo=shelob.surriel.com) by shelob.surriel.com with esmtp (Exim 4.97.1) (envelope-from ) id 1sTnY8-000000001mY-0zAM; Tue, 16 Jul 2024 15:09:20 -0400 Received: from mail-io1-xd2a.google.com ([2607:f8b0:4864:20::d2a]) by shelob.surriel.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.97.1) (envelope-from ) id 1sTnOQ-000000000hc-35VZ for kernelnewbies@kernelnewbies.org; Tue, 16 Jul 2024 14:59:19 -0400 Received: by mail-io1-xd2a.google.com with SMTP id ca18e2360f4ac-7f6e9662880so4743739f.2 for ; Tue, 16 Jul 2024 11:58:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721156338; x=1721761138; darn=kernelnewbies.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=i/7VuWci/fAdciTJrLUpogyH7arPQhCiQPPhJCx3EJc=; b=B4PTJbzk/AJ5ndAFWaaw5d/HxqjWokR65xiBN26KC0aDiMAMi2iV+3BEJU1e3y2Hey JRBKSkt9EyYXtEwIOcIYW5ecKr1LA2Imzp0i5NaXZW3Q9GkiNdc3ddmB/dm8qKTFNmUL EIIr7hvJYaZiacwcmqIrFzP/a9e2Zz7RJE+/RqphhtkiMhhKep8IDIoDO3g5PvmOY0AM xeEsvi48jBhEMbayGfwfyPqW7wVC2YUX05wQrtnbnW+lD9KwcSpu1Q8rGZKw0jcvLGc3 OcswXQ9onQpqVOmCbhBfnXYs29F4J/jJ4cpquf9ZDTytiKEsFFZyflpya3wKn9dlO8WO pswA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721156338; x=1721761138; 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=i/7VuWci/fAdciTJrLUpogyH7arPQhCiQPPhJCx3EJc=; b=CxM0R8Q81gz8s0QBVy22ii3h195qhEm0pphtI4Pe4aKDpL7e7yTSqKghoCr253pt5V URzfE41cp80UcSQctgO8FeOjIARmsA689KKwtkMRe7IJcc+UUM4tupyoQ1W/sagBePCi RBLW8e4kZnTZs3c/ldzkmcenS8BkTlN2cRFdQPMz7rSSAPg6Cyi5lHcR+lJxXjxSKBqe fBWjHg1OOnXndQz9rabZUxHhMZWKrQHWp0OwTxzXWAoYkLBSf/tFRh0ik87/FX5h2rne DAoZbBtZP+bH09+dkwes3aBpodLujIsp65SF81bV5/KID4Bmt/gtxiD2/oAuHel5jibv 9NuA== X-Forwarded-Encrypted: i=1; AJvYcCUIlD/QdPmyC7UuNCy5sJEKVL53b2KTwli2YSurD16ePBVFzse+mdLXOj5qaBoJoBPh7PMjkH4xLZSEDgGKVTHRMWuWoNr2CUIQmjvcKJp6 X-Gm-Message-State: AOJu0Yx5WYE0ZRWgmSpfZ8aU2h6F5tVUc5oAdJV2GLUN+mbnXXIwx+KP cqUd6YB01IcbaTuc5Z0GpMtiIgqrOI27TINMa5gR/HlqCCNZFNRU X-Google-Smtp-Source: AGHT+IHzpE9SbYwkG5siTLQEKUl8Xu5QeKQLe1T8MPzVIFBNpAur8fUdPhqKhgFYHtZREDVfwyEkOA== X-Received: by 2002:a05:6602:484:b0:809:83e3:a35c with SMTP id ca18e2360f4ac-816c33f0308mr46697739f.7.1721156338284; Tue, 16 Jul 2024 11:58:58 -0700 (PDT) Received: from frodo.. (c-73-78-62-130.hsd1.co.comcast.net. [73.78.62.130]) by smtp.googlemail.com with ESMTPSA id 8926c6da1cb9f-4c210f23f1csm75301173.102.2024.07.16.11.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 11:58:57 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org, daniel.vetter@ffwll.ch, tvrtko.ursulin@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com Subject: [PATCH v9-resend 26/54] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Tue, 16 Jul 2024 12:57:38 -0600 Message-ID: <20240716185806.1572048-27-jim.cromie@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716185806.1572048-1-jim.cromie@gmail.com> References: <20240716185806.1572048-1-jim.cromie@gmail.com> MIME-Version: 1.0 Cc: groeck@google.com, linux-doc@vger.kernel.org, Jim Cromie , yanivt@google.com, intel-gfx@lists.freedesktop.org, kernelnewbies@kernelnewbies.org, linux@rasmusvillemoes.dk, robdclark@gmail.com, dri-devel@lists.freedesktop.org, mcgrof@kernel.org, seanpaul@chromium.org, amd-gfx@lists.freedesktop.org, joe@perches.com, bleung@google.com, intel-gvt-dev@lists.freedesktop.org, ukaszb@chromium.org X-BeenThere: kernelnewbies@kernelnewbies.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Learn about the Linux kernel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kernelnewbies-bounces@kernelnewbies.org 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. if (cond && (drm_dbg("expr-form"),1)) { ... do some more stuff } Fix it by changing __dynamic_func_call_cls{,_no_desc} macros into expressions, by replacing the do-while-0s with a ({ }) wrapper. In C, all legal expressions are also legal statements, as converted by the trailing semi-colon in a statement-style macro invocation: 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 4a9b9cd53eb7..c958085e0df4 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -287,20 +287,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.45.2 _______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies