Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932971Ab3CLREq (ORCPT ); Tue, 12 Mar 2013 13:04:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45311 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932534Ab3CLREp (ORCPT ); Tue, 12 Mar 2013 13:04:45 -0400 Date: Tue, 12 Mar 2013 18:04:16 +0100 From: Jiri Olsa To: Peter Zijlstra Cc: linux-kernel@vger.kernel.org, Corey Ashford , Frederic Weisbecker , Ingo Molnar , Namhyung Kim , Paul Mackerras , Arnaldo Carvalho de Melo Subject: Re: [PATCHv3] perf: Fix vmalloc ring buffer free function Message-ID: <20130312170416.GD32001@krava.brq.redhat.com> References: <1363019193.14933.14.camel@laptop> <20130311164309.GG13679@krava.brq.redhat.com> <1363023885.14933.16.camel@laptop> <20130311180229.GI13679@krava.brq.redhat.com> <20130312100502.GC1348@krava.brq.redhat.com> <1363084030.14933.23.camel@laptop> <20130312135219.GA32001@krava.brq.redhat.com> <1363101972.24558.3.camel@laptop> <20130312153609.GC32001@krava.brq.redhat.com> <1363105490.24558.12.camel@laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1363105490.24558.12.camel@laptop> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1821 Lines: 58 On Tue, Mar 12, 2013 at 05:24:50PM +0100, Peter Zijlstra wrote: > Right you are.. > > How about something like the below; using that 0 << -1 is still 0. hum.. we are obviously not on the same page wrt 'confusing' ;-) looks ok, I'll test it jirka > > --- > kernel/events/ring_buffer.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c > index 23cb34f..e72ca70 100644 > --- a/kernel/events/ring_buffer.c > +++ b/kernel/events/ring_buffer.c > @@ -316,7 +316,7 @@ void rb_free(struct ring_buffer *rb) > struct page * > perf_mmap_to_page(struct ring_buffer *rb, unsigned long pgoff) > { > - if (pgoff > (1UL << page_order(rb))) > + if (pgoff > (rb->nr_pages << page_order(rb))) > return NULL; > > return vmalloc_to_page((void *)rb->user_page + pgoff * PAGE_SIZE); > @@ -336,10 +336,10 @@ static void rb_free_work(struct work_struct *work) > int i, nr; > > rb = container_of(work, struct ring_buffer, work); > - nr = 1 << page_order(rb); > + nr = rb->nr_pages << page_order(rb); > > base = rb->user_page; > - for (i = 0; i < nr + 1; i++) > + for (i = 0; i <= nr; i++) > perf_mmap_unmark_page(base + (i * PAGE_SIZE)); > > vfree(base); > @@ -373,7 +373,7 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) > rb->user_page = all_buf; > rb->data_pages[0] = all_buf + PAGE_SIZE; > rb->page_order = ilog2(nr_pages); > - rb->nr_pages = 1; > + rb->nr_pages = !!nr_pages; > > ring_buffer_init(rb, watermark, flags); > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/