Em Mon, Feb 22, 2016 at 12:05:36PM +0800, Wangnan (F) escreveu:
>
>
> On 2016/2/19 21:53, Arnaldo Carvalho de Melo wrote:
> >Sorry for the top post, but the message below didn't made it thru due to
> >local problems as I recently switched notebooks, my postfix setup barfed
> >this one :-\
> >
> >This is what I have in my tmp.perf/bpf_map:
> >
> >https://git.kernel.org/cgit/linux/kernel/git/acme/linux.git/commit/?h=tmp.perf/bpf_map&id=5c78fe3c5a944ba7f9a85f59548295211f3d252c
> >
> >Please take a look and see if you're ok with it,
>
> I agree your change, but the commit you mentioned has a bug
> which I have already fixed in Feb. 19 patch set:
>
> At bpf_map__config_value:
>
> + if (!term->type_val == PARSE_EVENTS__TERM_TYPE_NUM) {
> + pr_debug("ERROR: wrong value type\n");
> + return -BPF_LOADER_ERRNO__OBJCONF_MAP_VALUE;
> + }
>
> Should use
>
> if (term->type_val != PARSE_EVENTS__TERM_TYPE_NUM)
>
> I'll switch 'maps' to 'map' as you did in my tree and send this
> patch again. (still based on perf/core, so I can solve potential
> conflicts in my side).
Ok, going thru the patchkit again, noticed the only change was the above
one for this patch, thanks:
uet linux]$ interdiff /wb/1.patch /tmp/acme.patch
diff -u b/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
--- b/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -897,7 +897,7 @@
return -BPF_LOADER_ERRNO__OBJCONF_CONF;
}
- if (term->type_val != PARSE_EVENTS__TERM_TYPE_NUM) {
+ if (!term->type_val == PARSE_EVENTS__TERM_TYPE_NUM) {
pr_debug("ERROR: wrong value type\n");
return -BPF_LOADER_ERRNO__OBJCONF_MAP_VALUE;
}
[acme@jouet linux]$
