Hi Alexander, Thanks for picking this up/adapting it. Just one comment below
On Mon, Feb 20, 2017 at 03:33:50PM +0200, Alexander Shishkin wrote: > From: Will Deacon <[email protected]> > > In preparation for adding more flags to perf AUX records, introduce a > separate API for setting the flags for a session, rather than appending > more bool arguments to perf_aux_output_end. This allows to set each > flag at the time a corresponding condition is detected, instead of > tracking it in each driver's private state. > > Cc: Mathieu Poirier <[email protected]> > Signed-off-by: Will Deacon <[email protected]> > Signed-off-by: Alexander Shishkin <[email protected]> > --- --->8 > +void perf_aux_output_flag(struct perf_output_handle *handle, u64 flags) > +{ > + /* > + * OVERWRITE is determined by perf_aux_output_end() and can't > + * be passed in directly. > + */ > + if (WARN_ON_ONCE(flags & PERF_AUX_FLAG_OVERWRITE)) > + return; Now that you've added this check... > + handle->aux_flags |= flags; > +} > +EXPORT_SYMBOL_GPL(perf_aux_output_flag); > + > /* > * This is called before hardware starts writing to the AUX area to > * obtain an output handle and make sure there's room in the buffer. > @@ -360,6 +373,7 @@ void *perf_aux_output_begin(struct perf_output_handle > *handle, > handle->event = event; > handle->head = aux_head; > handle->size = 0; > + handle->aux_flags = 0; > > /* > * In overwrite mode, AUX data stores do not depend on aux_tail, > @@ -409,34 +423,32 @@ EXPORT_SYMBOL_GPL(perf_aux_output_begin); > * of the AUX buffer management code is that after pmu::stop(), the AUX > * transaction must be stopped and therefore drop the AUX reference count. > */ > -void perf_aux_output_end(struct perf_output_handle *handle, unsigned long > size, > - bool truncated) > +void perf_aux_output_end(struct perf_output_handle *handle, unsigned long > size) > { > struct ring_buffer *rb = handle->rb; > - bool wakeup = truncated; > + bool wakeup = !!handle->aux_flags; > unsigned long aux_head; > - u64 flags = 0; > - > - if (truncated) > - flags |= PERF_AUX_FLAG_TRUNCATED; > > /* in overwrite mode, driver provides aux_head via handle */ > if (rb->aux_overwrite) { > - flags |= PERF_AUX_FLAG_OVERWRITE; > + handle->aux_flags |= PERF_AUX_FLAG_OVERWRITE; > > aux_head = handle->head; > local_set(&rb->aux_head, aux_head); > } else { > + handle->aux_flags &= ~PERF_AUX_FLAG_OVERWRITE; > + ... I don't think you need this addition anymore. It's harmless, though. Will
