From nobody Tue Feb 10 03:44:58 2026 Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) (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 14714214804 for ; Sat, 25 Jan 2025 06:47:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787639; cv=none; b=ifmUMxDK08G9GgzWwML/v+lqCD2ZsaVvA9RU2Cz/WDHt8KEGnn9ig1R3Rw4lnpn0aiCZnbnz+PUKVGL8vFmZacTb8TItpQT8Qn5kOPgLfohgTmLgCJZ93rcjP567OkPxMBF1VWG/WlS/KKKuOwPVKsdW2ysUTnGCCpVXFYiKaBg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787639; c=relaxed/simple; bh=MNTktAh82iJrPM+3VKXbEqKKrDjxq0fxzS0qLGh+NCg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hb7Q4TXSWwIvQotEcVZNb3r+OU2cgXRaosbdFqLMiVq6LjfcgXNn/+BLZt43NJ6Py5DqWNLUzk4X4zVjJQ54fsMzE6hDbj8e4xN9Rv/GjOjK0cAzQNPv/qTtNEic2PNgNYF8qcUPJSbktRuy2ofRj8ApEtA5GB/KRsRj3IJ5Mcw= 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=Cw7QHiZT; arc=none smtp.client-ip=209.85.166.170 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="Cw7QHiZT" Received: by mail-il1-f170.google.com with SMTP id e9e14a558f8ab-3cfc934af74so14340795ab.2 for ; Fri, 24 Jan 2025 22:47:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737787637; x=1738392437; 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=R20pJusVAFn+0eRwjuybzN3XQmUoFo5g9xIXn//WdwU=; b=Cw7QHiZT8WnFhkkS6fQRUu++q3VsyMXt0eKDWzSrFdnCIrt/n0PRQga5CyFZMU1OLF yzC5TIjGnky8btyNhUL1nHFbB/CjwivXefX1xjovzI3YMPT1gcL+BcF3y3r8+/pVYy7l eRL6njMv3esTRFoOC++Jin3NCw8etfaJjPSQ5joC+H14uQ78N3N7buCVT56aIkXQyb1P ZAsHTqamVg77ObR2eUknN3+AG+Oi2fB5mVHkRawlXB2m4NEOG79VGeQyqmYiv2+yOlYL Kk6S2zwcoK+ytkNLqxFGUYn7J9LkKPNjRNYUb85sstC1pH9KOjiH0Mfkc+j/sbxlJ//a KsIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737787637; x=1738392437; 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=R20pJusVAFn+0eRwjuybzN3XQmUoFo5g9xIXn//WdwU=; b=JwYJXc1tq4bowJkiKZ5I7dfvGjdVEAG9iWBriga/B3GZbu2B+nBaxcz1bKvf+vM8mi ahZlzti0gODqirqSy+JiftZFZ31QvbkPFAGnMx+SdcO8aQChRaLXtBLxlJoz54xgQK1l i3/PqiRm7eTxdBpTdfLA9B7euP4aG7r8OHeWK1eUoMvoBGw3xY5UBMRtX5T8feIiquL5 jpb8OC1bMV6AlL5YVH2HoJ2jn+ftaQdp0GP+HBgMrQOYmBbstX9bfAcovJGdPGU+nMRE A30MdN8SvakGjS2+ZOIlbtG1vkKw/RIC0s821DwPIPW9kzoeGP32MgnsppP/a5dA/Mzx BOkA== X-Gm-Message-State: AOJu0YziRcQ3pi9ioM7v00kIAAHCFbD1O8airrAP8mzAjoEo2Llr3Y5R NC6FdwQBBTUtjHDZp9/XSzmxfTSKnxb9gAcgds41/wnGy0oZMICOC0j6EQ== X-Gm-Gg: ASbGncuVqXHWj0XF297JVLLx/1A42G/UfVEpfqeWTaxBMfe2k8NKSNz0xSBUXyoo+bM DgzBc0HigU5KyqpfBu5U6J6jxpfpDwaDCHJZns0ljF6LTXvfQvPt7P1PtadszpJfg8fMcflNrcb BUUDCOdhN9yFnRgxdYjpjHDtuDTSQfRInvmpeQRfNRfpzR5uUd6dP83cLL8YreLTlA6zJ04yU1B ik7SuEFjKYPPGmwmsi08hqIhQ0BqHsvV62W8Iotv6NkovoxeeFbeQoCXneQbChs+wGjHXfrxgEV tWQtppgLCUd5M3VXx0usyigce+ATlEjXlipfPQ== X-Google-Smtp-Source: AGHT+IFhqHjUjw9cNO0qk0/umRlKp25sKTeEZ9PGaxIK1gOwxXhslLtN+M7fQRx/uvI7gn1cs6FAKA== X-Received: by 2002:a05:6e02:3f03:b0:3ce:87e3:c26c with SMTP id e9e14a558f8ab-3cf743df88amr329678925ab.5.1737787636967; Fri, 24 Jan 2025 22:47:16 -0800 (PST) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id 8926c6da1cb9f-4ec1da476fesm1174144173.58.2025.01.24.22.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 22:47:16 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org Cc: intel-gfx-trybot@lists.freedesktop.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 37/63] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Fri, 24 Jan 2025 23:45:51 -0700 Message-ID: <20250125064619.8305-38-jim.cromie@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250125064619.8305-1-jim.cromie@gmail.com> References: <20250125064619.8305-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. 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index b47d1088b7ad..1ff7bb6210cf 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -331,20 +331,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_DEBUG_METADATA_CLS((id), cls, fmt); \ +#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) + func(&(id), ##__VA_ARGS__); \ +}) #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.48.1