lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 201/351] NFSD: Fix TP_printk() format specifier in nfsd_clid_class
    Date
    From: Chuck Lever <chuck.lever@oracle.com>

    [ Upstream commit a948b1142cae66785521a389cab2cce74069b547 ]

    Since commit 9a6944fee68e ("tracing: Add a verifier to check string
    pointers for trace events"), which was merged in v5.13-rc1,
    TP_printk() no longer tacitly supports the "%.*s" format specifier.

    These are low value tracepoints, so just remove them.

    Reported-by: David Wysochanski <dwysocha@redhat.com>
    Fixes: dd5e3fbc1f47 ("NFSD: Add tracepoints to the NFSD state management code")
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfsd/nfs4state.c | 3 ---
    fs/nfsd/trace.h | 29 -----------------------------
    2 files changed, 32 deletions(-)

    diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
    index b517a8794400..6abe48dee6ed 100644
    --- a/fs/nfsd/nfs4state.c
    +++ b/fs/nfsd/nfs4state.c
    @@ -7229,7 +7229,6 @@ nfs4_client_to_reclaim(struct xdr_netobj name, struct xdr_netobj princhash,
    unsigned int strhashval;
    struct nfs4_client_reclaim *crp;

    - trace_nfsd_clid_reclaim(nn, name.len, name.data);
    crp = alloc_reclaim();
    if (crp) {
    strhashval = clientstr_hashval(name);
    @@ -7279,8 +7278,6 @@ nfsd4_find_reclaim_client(struct xdr_netobj name, struct nfsd_net *nn)
    unsigned int strhashval;
    struct nfs4_client_reclaim *crp = NULL;

    - trace_nfsd_clid_find(nn, name.len, name.data);
    -
    strhashval = clientstr_hashval(name);
    list_for_each_entry(crp, &nn->reclaim_str_hashtbl[strhashval], cr_strhash) {
    if (compare_blob(&crp->cr_name, &name) == 0) {
    diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
    index 27a93ebd1d80..42ad2a02f953 100644
    --- a/fs/nfsd/trace.h
    +++ b/fs/nfsd/trace.h
    @@ -536,35 +536,6 @@ DEFINE_EVENT(nfsd_net_class, nfsd_##name, \
    DEFINE_NET_EVENT(grace_start);
    DEFINE_NET_EVENT(grace_complete);

    -DECLARE_EVENT_CLASS(nfsd_clid_class,
    - TP_PROTO(const struct nfsd_net *nn,
    - unsigned int namelen,
    - const unsigned char *namedata),
    - TP_ARGS(nn, namelen, namedata),
    - TP_STRUCT__entry(
    - __field(unsigned long long, boot_time)
    - __field(unsigned int, namelen)
    - __dynamic_array(unsigned char, name, namelen)
    - ),
    - TP_fast_assign(
    - __entry->boot_time = nn->boot_time;
    - __entry->namelen = namelen;
    - memcpy(__get_dynamic_array(name), namedata, namelen);
    - ),
    - TP_printk("boot_time=%16llx nfs4_clientid=%.*s",
    - __entry->boot_time, __entry->namelen, __get_str(name))
    -)
    -
    -#define DEFINE_CLID_EVENT(name) \
    -DEFINE_EVENT(nfsd_clid_class, nfsd_clid_##name, \
    - TP_PROTO(const struct nfsd_net *nn, \
    - unsigned int namelen, \
    - const unsigned char *namedata), \
    - TP_ARGS(nn, namelen, namedata))
    -
    -DEFINE_CLID_EVENT(find);
    -DEFINE_CLID_EVENT(reclaim);
    -
    TRACE_EVENT(nfsd_clid_inuse_err,
    TP_PROTO(const struct nfs4_client *clp),
    TP_ARGS(clp),
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 20:10    [W:4.118 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site