Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 14 Sep 2020 22:59:36 +0200
From:   Jiri Olsa <jolsa@redhat.com>
To:     Namhyung Kim <namhyung@kernel.org>
Cc:     Jiri Olsa <jolsa@kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        lkml <linux-kernel@vger.kernel.org>,
        Ingo Molnar <mingo@kernel.org>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Michael Petlan <mpetlan@redhat.com>,
        Wade Mealing <wmealing@redhat.com>
Subject: Re: [PATCH] perf: Fix race in perf_mmap_close function
Message-ID: <20200914205936.GD1714160@krava>
References: <20200910104153.1672460-1-jolsa@kernel.org>
 <CAM9d7cjqq8+wcZWJ77oONKXu-FsaT_YvRxzaGbRT8PjLOw-AkQ@mail.gmail.com>
 <20200910144744.GA1663813@krava>
 <CAM9d7ciEAA_3Quo1-q7hU=Te+hBgJ2wYAjbDazXd7yS70HrhPA@mail.gmail.com>
 <20200911074931.GA1714160@krava>
 <CAM9d7cicyzZvkrXTvSrGrOE626==myvF2hnuUNiUoLXiOKHB+A@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAM9d7cicyzZvkrXTvSrGrOE626==myvF2hnuUNiUoLXiOKHB+A@mail.gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Sep 14, 2020 at 09:48:43PM +0900, Namhyung Kim wrote:
> On Fri, Sep 11, 2020 at 4:49 PM Jiri Olsa <jolsa@redhat.com> wrote:
> > ugh, that's right.. how about change below
> 
> Acked-by: Namhyung Kim <namhyung@kernel.org>

thanks, I'll send full patch after we're done testing this

jirka

> 
> Thanks
> Namhyung
> 
> 
> >
> > jirka
> >
> >
> > ---
> > diff --git a/kernel/events/core.c b/kernel/events/core.c
> > index 7ed5248f0445..8ab2400aef55 100644
> > --- a/kernel/events/core.c
> > +++ b/kernel/events/core.c
> > @@ -5868,11 +5868,11 @@ static void perf_pmu_output_stop(struct perf_event *event);
> >  static void perf_mmap_close(struct vm_area_struct *vma)
> >  {
> >         struct perf_event *event = vma->vm_file->private_data;
> > -
> >         struct perf_buffer *rb = ring_buffer_get(event);
> >         struct user_struct *mmap_user = rb->mmap_user;
> >         int mmap_locked = rb->mmap_locked;
> >         unsigned long size = perf_data_size(rb);
> > +       bool detach_rest = false;
> >
> >         if (event->pmu->event_unmapped)
> >                 event->pmu->event_unmapped(event, vma->vm_mm);
> > @@ -5903,7 +5903,8 @@ static void perf_mmap_close(struct vm_area_struct *vma)
> >                 mutex_unlock(&event->mmap_mutex);
> >         }
> >
> > -       atomic_dec(&rb->mmap_count);
> > +       if (atomic_dec_and_test(&rb->mmap_count))
> > +               detach_rest = true;
> >
> >         if (!atomic_dec_and_mutex_lock(&event->mmap_count, &event->mmap_mutex))
> >                 goto out_put;
> > @@ -5912,7 +5913,7 @@ static void perf_mmap_close(struct vm_area_struct *vma)
> >         mutex_unlock(&event->mmap_mutex);
> >
> >         /* If there's still other mmap()s of this buffer, we're done. */
> > -       if (atomic_read(&rb->mmap_count))
> > +       if (!detach_rest)
> >                 goto out_put;
> >
> >         /*
> >
>