lkml.org 
[lkml]   [2014]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 042/101] nfs: fix pnfs direct write memory leak
    Date
    From: Peng Tao <tao.peng@primarydata.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 8c393f9a721c30a030049a680e1bf896669bb279 upstream.

    For pNFS direct writes, layout driver may dynamically allocate ds_cinfo.buckets.
    So we need to take care to free them when freeing dreq.

    Ideally this needs to be done inside layout driver where ds_cinfo.buckets
    are allocated. But buckets are attached to dreq and reused across LD IO iterations.
    So I feel it's OK to free them in the generic layer.

    Signed-off-by: Peng Tao <tao.peng@primarydata.com>
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    fs/nfs/direct.c | 1 +
    include/linux/nfs_xdr.h | 11 +++++++++++
    2 files changed, 12 insertions(+)

    diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
    index af5f3ffcb157..d751a2383c24 100644
    --- a/fs/nfs/direct.c
    +++ b/fs/nfs/direct.c
    @@ -179,6 +179,7 @@ static void nfs_direct_req_free(struct kref *kref)
    {
    struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref);

    + nfs_free_pnfs_ds_cinfo(&dreq->ds_cinfo);
    if (dreq->l_ctx != NULL)
    nfs_put_lock_context(dreq->l_ctx);
    if (dreq->ctx != NULL)
    diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
    index 2b307018979d..715671e4c7e6 100644
    --- a/include/linux/nfs_xdr.h
    +++ b/include/linux/nfs_xdr.h
    @@ -1223,11 +1223,22 @@ struct nfs41_free_stateid_res {
    unsigned int status;
    };

    +static inline void
    +nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo)
    +{
    + kfree(cinfo->buckets);
    +}
    +
    #else

    struct pnfs_ds_commit_info {
    };

    +static inline void
    +nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo)
    +{
    +}
    +
    #endif /* CONFIG_NFS_V4_1 */

    struct nfs_page;
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-12-03 13:21    [W:4.104 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site