mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 10:01:00 +00:00
6562c9acb4
perf record __cmd_record() does not poll evlist pollfds. Instead it polls
thread_data[0].pollfd. That happens whether or not threads are being used.
perf record duplicates evlist mmap pollfds as needed for separate threads.
The non-perf-event represented by evlist->ctl_fd has to handled separately,
which is done explicitly, duplicating it into the thread_data[0] pollfds.
That approach neglects any other non-perf-event file descriptors. Currently
there is also done_fd which needs the same handling.
Add a new generalized approach.
Add fdarray_flag__non_perf_event to identify the file descriptors that
need the special handling. For those cases, also keep a mapping of the
evlist pollfd index and thread pollfd index, so that the evlist revents
can be updated.
Although this patch adds the new handling, it does not take it into use.
There is no functional change, but it is the precursor to a fix, so is
marked as a fix.
Fixes: 415ccb58f6 ("perf record: Introduce thread specific data array")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20220824072814.16422-2-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
59 lines
1.6 KiB
C
59 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __API_FD_ARRAY__
|
|
#define __API_FD_ARRAY__
|
|
|
|
#include <stdio.h>
|
|
|
|
struct pollfd;
|
|
|
|
/**
|
|
* struct fdarray: Array of file descriptors
|
|
*
|
|
* @priv: Per array entry priv area, users should access just its contents,
|
|
* not set it to anything, as it is kept in synch with @entries, being
|
|
* realloc'ed, * for instance, in fdarray__{grow,filter}.
|
|
*
|
|
* I.e. using 'fda->priv[N].idx = * value' where N < fda->nr is ok,
|
|
* but doing 'fda->priv = malloc(M)' is not allowed.
|
|
*/
|
|
struct fdarray {
|
|
int nr;
|
|
int nr_alloc;
|
|
int nr_autogrow;
|
|
struct pollfd *entries;
|
|
struct priv {
|
|
union {
|
|
int idx;
|
|
void *ptr;
|
|
};
|
|
unsigned int flags;
|
|
} *priv;
|
|
};
|
|
|
|
enum fdarray_flags {
|
|
fdarray_flag__default = 0x00000000,
|
|
fdarray_flag__nonfilterable = 0x00000001,
|
|
fdarray_flag__non_perf_event = 0x00000002,
|
|
};
|
|
|
|
void fdarray__init(struct fdarray *fda, int nr_autogrow);
|
|
void fdarray__exit(struct fdarray *fda);
|
|
|
|
struct fdarray *fdarray__new(int nr_alloc, int nr_autogrow);
|
|
void fdarray__delete(struct fdarray *fda);
|
|
|
|
int fdarray__add(struct fdarray *fda, int fd, short revents, enum fdarray_flags flags);
|
|
int fdarray__dup_entry_from(struct fdarray *fda, int pos, struct fdarray *from);
|
|
int fdarray__poll(struct fdarray *fda, int timeout);
|
|
int fdarray__filter(struct fdarray *fda, short revents,
|
|
void (*entry_destructor)(struct fdarray *fda, int fd, void *arg),
|
|
void *arg);
|
|
int fdarray__grow(struct fdarray *fda, int extra);
|
|
int fdarray__fprintf(struct fdarray *fda, FILE *fp);
|
|
|
|
static inline int fdarray__available_entries(struct fdarray *fda)
|
|
{
|
|
return fda->nr_alloc - fda->nr;
|
|
}
|
|
|
|
#endif /* __API_FD_ARRAY__ */
|