From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 31A9A32C33F for ; Mon, 22 Dec 2025 08:24:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766391898; cv=none; b=Bntt/sUyZI2JwwaxK4n/8OLdUFzoOHwywPp2Aukogm1wKZWRWsBKsibFaKszW3sMmDlywtuzrl0uWbIphD3YUFhMz9l5t24xp0fTNU6AIbJTVU46y+c0ypcnQc2HKG1j93iD1zLRcZa5LUZXdGkFQGRsKkMJNCWz7hzLQ9xMSRE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766391898; c=relaxed/simple; bh=DLGYLqotnJ3r64tEQiOm4CWPKlpXwGXxjO6LBdcTYjk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eaHoWap5QD4n/UDN9OAuWqMumwB028VUfayPIscsOCJZBsqVS9qOB4eQcmGEklt2cM+2whCoRvv8rki5f4Chme0PmcGjgd1+Lw6gl6XSPoeDSpgB6uDQEXE93U/5sh0/HF1K5JKihcji3R0C3HCC7Cd9dzzmAt0r4zaQuzr5L5s= 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=CO3/alo5; arc=none smtp.client-ip=209.85.210.176 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="CO3/alo5" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-7b9387df58cso6064633b3a.3 for ; Mon, 22 Dec 2025 00:24:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766391896; x=1766996696; 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=CO3/alo5qNZi8M51kHbHwOHnP8MEkvXrDU8mZEdEQkJ+Oc3aZQB42Ymyf5PdedYH/V K8i9+UDOL0avb2m3lrJT640vYEz5gnRwA3P4d7VnegSpCqjXn5qBBuhjUELkVHt2Nked iXAVBWRPE/3HZYLmA0z9/Wzk/bJM1ZcsSRJSoZgUlPvaWOLkn6EERo+YC0qIkVkpliJu RXe8PqH168CbBvEfLb4iNAuhi8IbDCgYx5iw9/XrtsGrBGIs926BNyfFJT/Ufiu+0heN EHV6gz/kkwc5sRUMTY3wq5XXnnbYADUhqs7zE0kw1PiQl7j1edgPJ4+mfev3N2RL0sUx xhiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766391896; x=1766996696; 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=buH45oNB2EzCkLkfR9EtTOxqdIk53Y7wT6/IyXbkHivj94/0Hu6efUpVYs0f3zb8rq XRUN46feCNrR92PTUSPgiEv6j9HTSKZpUiaAGdwjlGU8lBQ2xBkY8r2B/PVQs05agG4b SSWD8Hu97jo/TSvHopsrC5Pl2erKomMOj7/rbzLe911kuApNypexQbr3FzddkgqMrYoq F843EsA8ufLO75p1aZ1SGe00VW1+Ei6y9O2ETLg9DzM3O231jMGSNztRnIawhPzJ2GiI jevggMaMMpuh380xBmxroeMqtwWz0N7tcgl0H49SFXt1up2p8goIvu1g/qQmXBKJYVEh PFSw== X-Gm-Message-State: AOJu0YwMQldbyqVH6RR+Fk2YNdxMWBVW5t0s1y+RX6IJnOOi0D3KmF8k P8uhaABdCixqiZC3H1iBo1ih+k7SRnuhf7g+Cm5+1qAWL/vqzG5/w+6TFQARcZrklhU= X-Gm-Gg: AY/fxX61YMOT0J3SpK2X7S8SikaYpy51kRmA2b+I4nQhrASCubI2XKp4S9pf2egPLk5 CE9Vq3r0lSIQEHvOvQd3J5Ee+0SQAc6cTZUXQDs6PK/j8R52bND06NJ6Bo4+0b75a8rZJ0py8a2 FrGXphk2NobNxNzsFb+ZG/baR3gQdMqk8CRfNz8rreBmZnHviYSsOFkZ2A40efSX20W1U//1Mo9 XLApMSNyUGR/KURVsbSMy5rse9ktcCccbDTxzKzmqeoBLSVhBNxIXOy5yYUeWo9Un0dJIg6Bvcc Al+AJLFA4lgstJubpCCnBw3y2vfKOs7FtQKT1Xo6iAt07x3TCWpP7VijM7DvRDkkQmmcLboeW4f gf2cKSy0EMH1nS2HAbEbAkoy7S2kG0hV7Zx6/jis/T56h/K3B97IK87yxQrflYRkYqPp5tDQ7bC dOII5PrckJ X-Google-Smtp-Source: AGHT+IEBN8n7tfe9iu0lB0z5JyKVlf1YDr7ixcXKx8kSouS/KoZMy7Fhajpfqtky2YSRXNA/9ikrkg== X-Received: by 2002:a05:6a00:1d12:b0:7b8:16af:3bbc with SMTP id d2e1a72fcca58-7ff650ce054mr9990683b3a.31.1766391896403; Mon, 22 Dec 2025 00:24:56 -0800 (PST) Received: from frodo ([2404:4400:417e:3d00:8b90:7f55:1261:772f]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-7ff7e493123sm9540699b3a.50.2025.12.22.00.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Dec 2025 00:24:55 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com Cc: 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, seanpaul@chromium.org, robdclark@gmail.com, groeck@google.com, yanivt@google.com, bleung@google.com, quic_saipraka@quicinc.com, will@kernel.org, catalin.marinas@arm.com, quic_psodagud@quicinc.com, maz@kernel.org, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, mingo@redhat.com, jim.cromie@gmail.com Subject: [PATCH v7 20/31] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Mon, 22 Dec 2025 21:20:37 +1300 Message-ID: <20251222082049.1782440-21-jim.cromie@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251222082049.1782440-3-jim.cromie@gmail.com> References: <20251222082049.1782440-3-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 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__) -#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.52.0