Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Message-ID: <5414753a03b924c5a5f5784783f4a530187be383.camel@kernel.org>
Subject: Re: [PATCH -next v2] sunrpc: Use no_printk() in dfprintk*() dummies
From:   Jeff Layton <jlayton@kernel.org>
To:     Geert Uytterhoeven <geert+renesas@glider.be>,
        Chuck Lever <chuck.lever@oracle.com>,
        Neil Brown <neilb@suse.de>,
        Olga Kornievskaia <kolga@netapp.com>,
        Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
        Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna@kernel.org>
Cc:     linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Date:   Thu, 12 Oct 2023 06:13:32 -0400
In-Reply-To: <a93de2e8afa826745746b00fc5f64e513df5d52f.1697104757.git.geert+renesas@glider.be>
References: <a93de2e8afa826745746b00fc5f64e513df5d52f.1697104757.git.geert+renesas@glider.be>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 (3.48.4-1.module_f38+17164+63eeee4a) 
MIME-Version: 1.0
Precedence: bulk

On Thu, 2023-10-12 at 12:08 +0200, Geert Uytterhoeven wrote:
> When building NFS with W=3D1 and CONFIG_WERROR=3Dy, but
> CONFIG_SUNRPC_DEBUG=3Dn:
>=20
>     fs/nfs/nfs4proc.c: In function =E2=80=98nfs4_proc_create_session=E2=
=80=99:
>     fs/nfs/nfs4proc.c:9276:19: error: variable =E2=80=98ptr=E2=80=99 set =
but not used [-Werror=3Dunused-but-set-variable]
>      9276 |         unsigned *ptr;
> 	  |                   ^~~
>       CC      fs/nfs/callback.o
>     fs/nfs/callback.c: In function =E2=80=98nfs41_callback_svc=E2=80=99:
>     fs/nfs/callback.c:98:13: error: variable =E2=80=98error=E2=80=99 set =
but not used [-Werror=3Dunused-but-set-variable]
>        98 |         int error;
> 	  |             ^~~~~
>       CC      fs/nfs/flexfilelayout/flexfilelayout.o
>     fs/nfs/flexfilelayout/flexfilelayout.c: In function =E2=80=98ff_layou=
t_io_track_ds_error=E2=80=99:
>     fs/nfs/flexfilelayout/flexfilelayout.c:1230:13: error: variable =E2=
=80=98err=E2=80=99 set but not used [-Werror=3Dunused-but-set-variable]
>      1230 |         int err;
> 	  |             ^~~
>       CC      fs/nfs/flexfilelayout/flexfilelayoutdev.o
>     fs/nfs/flexfilelayout/flexfilelayoutdev.c: In function =E2=80=98nfs4_=
ff_alloc_deviceid_node=E2=80=99:
>     fs/nfs/flexfilelayout/flexfilelayoutdev.c:55:16: error: variable =E2=
=80=98ret=E2=80=99 set but not used [-Werror=3Dunused-but-set-variable]
>        55 |         int i, ret =3D -ENOMEM;
> 	  |                ^~~
>=20
> All these are due to variables that are set unconditionally, but are
> used only when debugging is enabled.
>=20
> Fix this by changing the dfprintk*() dummy macros from empty loops to
> calls to the no_printk() helper.  This informs the compiler that the
> passed debug parameters are actually used, and enables format specifier
> checking as a bonus.
>=20
> This requires removing the protection by CONFIG_SUNRPC_DEBUG of the
> declaration of nlmdbg_cookie2a(), as its reference is now visible to the
> compiler, but optimized away.
>=20
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> v2:
>   - s/uncontionally/unconditionally/,
>   - Drop CONFIG_SUNRPC_DEBUG check in fs/lockd/svclock.c to fix build
>     failure.
> ---
>  fs/lockd/svclock.c           | 2 --
>  include/linux/sunrpc/debug.h | 6 +++---
>  2 files changed, 3 insertions(+), 5 deletions(-)
>=20
> diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
> index 43aeba9de55cbbc5..119a0c31d30eed4f 100644
> --- a/fs/lockd/svclock.c
> +++ b/fs/lockd/svclock.c
> @@ -55,7 +55,6 @@ static const struct rpc_call_ops nlmsvc_grant_ops;
>  static LIST_HEAD(nlm_blocked);
>  static DEFINE_SPINLOCK(nlm_blocked_lock);
> =20
> -#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
>  static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie)
>  {
>  	/*
> @@ -82,7 +81,6 @@ static const char *nlmdbg_cookie2a(const struct nlm_coo=
kie *cookie)
> =20
>  	return buf;
>  }
> -#endif
> =20
>  /*
>   * Insert a blocked lock into the global list
> diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
> index f6aeed07fe04e3d5..76539c6673f2fb15 100644
> --- a/include/linux/sunrpc/debug.h
> +++ b/include/linux/sunrpc/debug.h
> @@ -67,9 +67,9 @@ do {									\
>  # define RPC_IFDEBUG(x)		x
>  #else
>  # define ifdebug(fac)		if (0)
> -# define dfprintk(fac, fmt, ...)	do {} while (0)
> -# define dfprintk_cont(fac, fmt, ...)	do {} while (0)
> -# define dfprintk_rcu(fac, fmt, ...)	do {} while (0)
> +# define dfprintk(fac, fmt, ...)	no_printk(fmt, ##__VA_ARGS__)
> +# define dfprintk_cont(fac, fmt, ...)	no_printk(fmt, ##__VA_ARGS__)
> +# define dfprintk_rcu(fac, fmt, ...)	no_printk(fmt, ##__VA_ARGS__)
>  # define RPC_IFDEBUG(x)
>  #endif
> =20

Acked-by: Jeff Layton <jlayton@kernel.org>