Re: [PATCHv2] perf: Fix vmalloc ring buffer free function

[Jiri Olsa]

On Mon, Mar 11, 2013 at 05:26:33PM +0100, Peter Zijlstra wrote:
> On Mon, 2013-03-11 at 12:21 +0100, Jiri Olsa wrote:
> > >  pg_nr     = offset >> page_shift;
> > >  pg_offset = offset & (1 << page_shift) - 1;
> > > 
> > > You just wrecked that.
> > > 
> > > >     handle->page &= rb->nr_pages - 1;
> > 
> > here's ^^^ where the handle->page becomes 0 due to (rb->nr_pages == 0)
> 
> then that'll be &= -1, which is a nop, no?

ugh.. should have been: '..due to (rb->nr_pages == 1)' as from:

+       rb->nr_pages      = nr_pages ? 1 : 0;

if it's 0, it never make it throught the perf_output_begin

> 
> Also, you wrecked it for anything that uses some intermediate page
> order (we currently don't).

I'll put that hunk back then:

-       handle->page = offset >> (PAGE_SHIFT + page_order(rb));
+       /* page is allways 0 for CONFIG_PERF_USE_VMALLOC option */
+       handle->page = offset >> PAGE_SHIFT;

I did not know there were other plans for that, seemed useless

jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/