From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 F232C372EE7 for ; Tue, 3 Mar 2026 14:07:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772546861; cv=none; b=WJAT9PoSR2mFxq67pFshkwRJAaC38p1jXvmfp4/kQVji7AF5cqCdcdAye/dehhu8VHjir/oEoLi4XCY1WDeIzhfzCIz6BR0+PRtM6RF+Shf2i+/m2I6+QAMLe35CkTUpzwCTbAsLRHFZh59iAN4KMLxtH7rtHcDOdoQFzf2T54M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772546861; c=relaxed/simple; bh=UwehxMHrmwHSRNEekpwxr0PA0ZKFDi1e3KFwspH0cx4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=mwoAigQ3RJmNilzVmGiMu/73uLBLPN0jhGwb9wvjAShl4fmcW8AuAESMLPUjfsxtzRCUFd0bqZQQSUUNrUrC1YLQCz8LjLPWy+0RSkz3uQuVyQWdNvMHpqMveMIjGlBQuVUhLkeGVj9wINAi6iX6WF9cjd4Vvj+UC0QMaJcMXD4= 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=BDB0noCF; arc=none smtp.client-ip=209.85.210.177 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="BDB0noCF" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-82735a41985so3424950b3a.2 for ; Tue, 03 Mar 2026 06:07:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772546859; x=1773151659; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=qGn42rpsqVcew2iPbY1Z01ZsVFTS4vK/usD0Aqx9bko=; b=BDB0noCFjax3JP13xxyOi5P7EUxHpT6hwrH7R0QW95IgZj1ChU9Y9WrQnQoV24zXg8 WATruYC7DnQGNdk6G6r7CSMpwg1fe6YT1J3lSIG54vnHX9ytgrnfkRmIiOq4UKt9TmP/ cbbZeaEkkMGoVIcScEV8tMv+BlSM3Rx3ER+wxk4VuxlZ8v90aQBn6iY4vI8AF0Fm+A3x vqoTtNtMFd3qWHzzkqbvt1wzyvTtd7q84U2YnLnOFwfW1WKmauViXyg43ZTnW7uewbOk tGBdWxSJHqRO8V/mesBr2y3F+rGWhg0YSxhLhIKRqvp8kISQ6GEeZVTrDenT6t1xBGIh BolA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772546859; x=1773151659; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qGn42rpsqVcew2iPbY1Z01ZsVFTS4vK/usD0Aqx9bko=; b=xKWmGI3gwEz0UZ21q/GdpVS/wdqSRAhwBDW55hNp/tIinXgzRnhoRm/FmlAYnwSoph Uh585RsHXvVmTf5ClSBDpSS+s1qp5eohMRjQKjBoyodPzIWQOHxfRezCSiC0+MDD74mk O6rQiw+iLIYoLyqTapeS6FhO7VlqlyUh8Db+kvdBcTi6pn3HBOU5djZbPaiP+pj27RfI vOG0SGsyAsSv08z+CgFNPGywSvJxqamVMjynk7Iy5cfiHeVLC3kBLFoasdKxirrI/4Ez oa+eVVr8UaEre2zuJtdsRXaEn3Yyfbewc4QSe1e8lGwJd/WU25SySEW4dnRoz105/1+L QvCg== X-Gm-Message-State: AOJu0YyQt7FHtuOoxiLZV95f4Dx/HwwKX2AL1LKyGHt6Lq2ZhI2+i/HC 7mA5Quas7Tad3E+NfPAeUHVbCzTkQAK+JjeSkVSYURUCoEgy0atFpenB X-Gm-Gg: ATEYQzzXawM+nA73BCcwoLoxrqTwmGQgPno5fg1n4sqHOIqom/6AzAKV8RA3IVGB5ol bpWrQzelZWUV32rLTDWt2WDGwOmU8NSx0uuCw0lA+CBDpi2hzzL43zX+jpw6QPkKTvCozd6znSL rLX32ZmjcFIEwaCfUlqrwTnyfzWAPrCBT8pXUxAAslz8HmYC0h32XkjbVffOlD9j6MbgKqYu0jk xvsEQ2jm4sVkLkFzwvDQ3a8Kpg0HZ/YMdmKgZ8Hw2hXTHzhVrCVeA5pO0i/2PSLWhIWVvoiKuM5 dpq0XUKTWnj5NdSoEAQ699GujwWaWnP68Cfaz+/dATLxHNQYf4XmQBK1fFZmnKupvxZHFC/1ajl yr8dTaLM0vVlWazcSBxLwHZ5ssrBuhClCxUJUU2Fe9NG3259iWty/qHiR/Cmj5GPH1KrnCH8dFq 3IkLxSeCBpm5cv2ZQiQBEAqXFfMqS5QhkuQr5cmH2g5Wih3heBVA6sYPiNnmFA5Nn74E2V X-Received: by 2002:a05:6a00:ab84:b0:81c:96b7:7faa with SMTP id d2e1a72fcca58-8274da12630mr14276407b3a.41.1772546858952; Tue, 03 Mar 2026 06:07:38 -0800 (PST) Received: from sean-All-Series.. (1-160-230-14.dynamic-ip.hinet.net. [1.160.230.14]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739db3ab8sm16045781b3a.27.2026.03.03.06.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2026 06:07:38 -0800 (PST) From: Sean Chang To: Andrew Lunn , Chuck Lever , David Laight , Anna Schumaker , Andy Shevchenko Cc: netdev@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Chang Subject: [PATCH v2] sunrpc: simplify dprintk() macros and cleanup redundant debug guards Date: Tue, 3 Mar 2026 22:07:25 +0800 Message-Id: <20260303140725.86260-1-seanwascoding@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Following David Laight's suggestion, simplify the macro definitions by removing the unnecessary 'fmt' argument and using no_printk(__VA_ARGS__) directly. Verification with .lst files under -O2 confirms that the compiler successfully performs "dead code elimination". Even when variables (like char buf[] in nfsfh.c) or static helper functions (like nlmdbg_cookie2a() in svclock.c) are declared without #ifdef, they are completely optimized out (no stack allocation, no symbol references in the final executable) as they are only referenced within no_printk(). Suggested-by: Andrew Lunn Suggested-by: David Laight Signed-off-by: Sean Chang --- v2: - Follow reversed xmas tree order for variables in svc_rdma_transport.c as requested by Andy Shevchenko. - Polish commit message: use dprintk() and remove redundant file list. - Correct the technical claim about dprintk() type checking. fs/lockd/svclock.c | 7 ------- fs/nfsd/nfsfh.c | 8 +++----- include/linux/sunrpc/debug.h | 8 ++------ net/sunrpc/xprtrdma/svc_rdma_transport.c | 25 +++++++++++------------- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index ee23f5802af1..9b978a087b3c 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -47,7 +47,6 @@ static const struct rpc_call_ops nlmsvc_grant_ops; static LIST_HEAD(nlm_blocked); static DEFINE_SPINLOCK(nlm_blocked_lock); -#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie) { /* @@ -74,12 +73,6 @@ static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie) return buf; } -#else -static inline const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie) -{ - return "???"; -} -#endif /* * Insert a blocked lock into the global list diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 68b629fbaaeb..91514326d1b4 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -105,12 +105,10 @@ static __be32 nfsd_setuser_and_check_port(struct svc_rqst *rqstp, { /* Check if the request originated from a secure port. */ if (rqstp && !nfsd_originating_port_ok(rqstp, cred, exp)) { - if (IS_ENABLED(CONFIG_SUNRPC_DEBUG)) { - char buf[RPC_MAX_ADDRBUFLEN]; + char buf[RPC_MAX_ADDRBUFLEN]; - dprintk("nfsd: request from insecure port %s!\n", - svc_print_addr(rqstp, buf, sizeof(buf))); - } + dprintk("nfsd: request from insecure port %s!\n", + svc_print_addr(rqstp, buf, sizeof(buf))); return nfserr_perm; } diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h index ab61bed2f7af..f6f2a106eeaf 100644 --- a/include/linux/sunrpc/debug.h +++ b/include/linux/sunrpc/debug.h @@ -38,8 +38,6 @@ extern unsigned int nlm_debug; do { \ ifdebug(fac) \ __sunrpc_printk(fmt, ##__VA_ARGS__); \ - else \ - no_printk(fmt, ##__VA_ARGS__); \ } while (0) # define dfprintk_rcu(fac, fmt, ...) \ @@ -48,15 +46,13 @@ do { \ rcu_read_lock(); \ __sunrpc_printk(fmt, ##__VA_ARGS__); \ rcu_read_unlock(); \ - } else { \ - no_printk(fmt, ##__VA_ARGS__); \ } \ } while (0) #else # define ifdebug(fac) if (0) -# define dfprintk(fac, fmt, ...) no_printk(fmt, ##__VA_ARGS__) -# define dfprintk_rcu(fac, fmt, ...) no_printk(fmt, ##__VA_ARGS__) +# define dfprintk(fac, ...) no_printk(__VA_ARGS__) +# define dfprintk_rcu(fac, ...) no_printk(__VA_ARGS__) #endif /* diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index f2d72181a6fe..0759444bda50 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -413,6 +413,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) struct rpcrdma_connect_private pmsg; struct ib_qp_init_attr qp_attr; struct ib_device *dev; + struct sockaddr *sap; int ret = 0; listen_rdma = container_of(xprt, struct svcxprt_rdma, sc_xprt); @@ -559,20 +560,16 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) goto errout; } - if (IS_ENABLED(CONFIG_SUNRPC_DEBUG)) { - struct sockaddr *sap; - - dprintk("svcrdma: new connection accepted on device %s:\n", dev->name); - sap = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr; - dprintk(" local address : %pIS:%u\n", sap, rpc_get_port(sap)); - sap = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr; - dprintk(" remote address : %pIS:%u\n", sap, rpc_get_port(sap)); - dprintk(" max_sge : %d\n", newxprt->sc_max_send_sges); - dprintk(" sq_depth : %d\n", newxprt->sc_sq_depth); - dprintk(" rdma_rw_ctxs : %d\n", ctxts); - dprintk(" max_requests : %d\n", newxprt->sc_max_requests); - dprintk(" ord : %d\n", conn_param.initiator_depth); - } + dprintk("svcrdma: new connection accepted on device %s:\n", dev->name); + sap = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr; + dprintk(" local address : %pIS:%u\n", sap, rpc_get_port(sap)); + sap = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr; + dprintk(" remote address : %pIS:%u\n", sap, rpc_get_port(sap)); + dprintk(" max_sge : %d\n", newxprt->sc_max_send_sges); + dprintk(" sq_depth : %d\n", newxprt->sc_sq_depth); + dprintk(" rdma_rw_ctxs : %d\n", ctxts); + dprintk(" max_requests : %d\n", newxprt->sc_max_requests); + dprintk(" ord : %d\n", conn_param.initiator_depth); return &newxprt->sc_xprt; -- 2.34.1