lkml.org 
[lkml]   [2019]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 037/100] ceph: fix ci->i_head_snapc leak
    Date
    From: Yan, Zheng <zyan@redhat.com>

    commit 37659182bff1eeaaeadcfc8f853c6d2b6dbc3f47 upstream.

    We missed two places that i_wrbuffer_ref_head, i_wr_ref, i_dirty_caps
    and i_flushing_caps may change. When they are all zeros, we should free
    i_head_snapc.

    Cc: stable@vger.kernel.org
    Link: https://tracker.ceph.com/issues/38224
    Reported-and-tested-by: Luis Henriques <lhenriques@suse.com>
    Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
    Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ceph/mds_client.c | 9 +++++++++
    fs/ceph/snap.c | 7 ++++++-
    2 files changed, 15 insertions(+), 1 deletion(-)

    --- a/fs/ceph/mds_client.c
    +++ b/fs/ceph/mds_client.c
    @@ -1290,6 +1290,15 @@ static int remove_session_caps_cb(struct
    list_add(&ci->i_prealloc_cap_flush->i_list, &to_remove);
    ci->i_prealloc_cap_flush = NULL;
    }
    +
    + if (drop &&
    + ci->i_wrbuffer_ref_head == 0 &&
    + ci->i_wr_ref == 0 &&
    + ci->i_dirty_caps == 0 &&
    + ci->i_flushing_caps == 0) {
    + ceph_put_snap_context(ci->i_head_snapc);
    + ci->i_head_snapc = NULL;
    + }
    }
    spin_unlock(&ci->i_ceph_lock);
    while (!list_empty(&to_remove)) {
    --- a/fs/ceph/snap.c
    +++ b/fs/ceph/snap.c
    @@ -568,7 +568,12 @@ void ceph_queue_cap_snap(struct ceph_ino
    old_snapc = NULL;

    update_snapc:
    - if (ci->i_head_snapc) {
    + if (ci->i_wrbuffer_ref_head == 0 &&
    + ci->i_wr_ref == 0 &&
    + ci->i_dirty_caps == 0 &&
    + ci->i_flushing_caps == 0) {
    + ci->i_head_snapc = NULL;
    + } else {
    ci->i_head_snapc = ceph_get_snap_context(new_snapc);
    dout(" new snapc is %p\n", new_snapc);
    }

    \
     
     \ /
      Last update: 2019-04-30 14:02    [W:4.670 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site