Re: [PATCH 21/31] perf tools: Move linux/filter.h to tools/include

[Arnaldo Carvalho de Melo <acme@redhat.com>]

Em Wed, Sep 02, 2015 at 05:08:27AM +0800, pi3orama escreveu:
> 发自我的 iPhone
> > 在 2015年9月2日，上午3:39，Arnaldo Carvalho de Melo <acme@redhat.com> 写道：

> > Em Sat, Aug 29, 2015 at 04:21:55AM +0000, Wang Nan escreveu:
> >> From: He Kuang <hekuang@huawei.com>
> >> This patch moves filter.h from include/linux/kernel.h to

> > I said that before: this is not moving anything, it is copying :-)

> >> tools/include/linux/filter.h to enable other libraries use macros in
> >> it, like libbpf which will be introduced by further patches. Currenty,
> >> the moved filter.h only contains the useful macros needed by libbpf
> >> for not introducing too much dependence.

> >> MANIFEST is also updated for 'make perf-*-src-pkg'.

> > So, I did a:
> > 
> > $ diff -u include/linux/filter.h tools/include/linux/filter.h
> > 
> > And noticed these:
> > 
> > -/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */
> > +/* Endianness conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */
> > 
> > -/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
> > +/* Short form of mov based on type,
> > + * BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32
> > + */
> > 
> > -/* Conditional jumps against registers, if (dst_reg 'op' src_reg) goto pc + off16 */
> > +/* Conditional jumps against registers,
> > + * if (dst_reg 'op' src_reg) goto pc + off16
> > + */
> > 
> > -/* Conditional jumps against immediates, if (dst_reg 'op' imm32) goto pc + off16 */
> > +/* Conditional jumps against immediates,
> > + * if (dst_reg 'op' imm32) goto pc + off16
> > + */
> > 
> > ------------------------------------------------------------------
> > 
> 
> I think these changes are made after we made this patch.

Don't think so, for instance, this one:

/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */

[acme@zoo linux]$ git log -p include/linux/filter.h | grep 'Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32'
 /* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
 /* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
 /* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
+/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
[acme@zoo linux]$

Was introduced, in just one line, and never again touched, just appearing as context in
subsequent patches.

I bet this was related to checkpatch.pl complaining it has more than 80 lines ;-\

Ditto for:

[acme@zoo linux]$ git log -p include/linux/filter.h | grep 'Endiann\?ess conversion'
 /* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */
 /* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */
+/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */
[acme@zoo linux]$
 
> Thank you for checking it.

np.

- Arnaldo