Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-28 Thread David Miller
From: Alexei Starovoitov Date: Mon, 28 Jul 2014 18:12:05 -0700 > On Mon, Jul 28, 2014 at 2:45 PM, Pablo Neira Ayuso > wrote: >>> > struct sk_filter_cb { >>> > int type; >>> > struct module *me; >>> > void (*charge)(struct sock *sk, struct sk_filter *fp); >>> >

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-28 Thread Alexei Starovoitov
On Mon, Jul 28, 2014 at 2:45 PM, Pablo Neira Ayuso wrote: >> > struct sk_filter_cb { >> > int type; >> > struct module *me; >> > void (*charge)(struct sock *sk, struct sk_filter *fp); >> > void (*uncharge)(struct sock *sk, struct sk_filter *fp); >> >

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-28 Thread David Miller
From: Pablo Neira Ayuso Date: Mon, 28 Jul 2014 23:45:52 +0200 > By renaming this, you're not fixing up things the semantics. It seems > to me you just want to find a quick path to solve inconsistencies in > your code. Agreed, this looks just like messing around with naming to me. But to the

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-28 Thread Pablo Neira Ayuso
On Sat, Jul 26, 2014 at 10:41:04PM -0700, Alexei Starovoitov wrote: > On Fri, Jul 25, 2014 at 3:17 PM, Pablo Neira Ayuso > wrote: > > The struct sk_filter is almost providing the generic framework, it > > just needs to be generalized, a quick layout for it: > > > > struct sk_filter { > >

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-28 Thread Pablo Neira Ayuso
On Sat, Jul 26, 2014 at 10:41:04PM -0700, Alexei Starovoitov wrote: On Fri, Jul 25, 2014 at 3:17 PM, Pablo Neira Ayuso pa...@netfilter.org wrote: The struct sk_filter is almost providing the generic framework, it just needs to be generalized, a quick layout for it: struct sk_filter {

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-28 Thread David Miller
From: Pablo Neira Ayuso pa...@netfilter.org Date: Mon, 28 Jul 2014 23:45:52 +0200 By renaming this, you're not fixing up things the semantics. It seems to me you just want to find a quick path to solve inconsistencies in your code. Agreed, this looks just like messing around with naming to

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-28 Thread Alexei Starovoitov
On Mon, Jul 28, 2014 at 2:45 PM, Pablo Neira Ayuso pa...@netfilter.org wrote: struct sk_filter_cb { int type; struct module *me; void (*charge)(struct sock *sk, struct sk_filter *fp); void (*uncharge)(struct sock *sk, struct sk_filter *fp);

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-28 Thread David Miller
From: Alexei Starovoitov a...@plumgrid.com Date: Mon, 28 Jul 2014 18:12:05 -0700 On Mon, Jul 28, 2014 at 2:45 PM, Pablo Neira Ayuso pa...@netfilter.org wrote: struct sk_filter_cb { int type; struct module *me; void (*charge)(struct sock *sk, struct sk_filter

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-26 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 3:17 PM, Pablo Neira Ayuso wrote: > On Fri, Jul 25, 2014 at 10:24:29AM -0700, Alexei Starovoitov wrote: >> On Fri, Jul 25, 2014 at 6:00 AM, Daniel Borkmann wrote: >> > On 07/25/2014 01:54 PM, Pablo Neira Ayuso wrote: >> >> >> >> On Fri, Jul 25, 2014 at 01:25:35PM +0200,

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-26 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 3:17 PM, Pablo Neira Ayuso pa...@netfilter.org wrote: On Fri, Jul 25, 2014 at 10:24:29AM -0700, Alexei Starovoitov wrote: On Fri, Jul 25, 2014 at 6:00 AM, Daniel Borkmann dbork...@redhat.com wrote: On 07/25/2014 01:54 PM, Pablo Neira Ayuso wrote: On Fri, Jul 25,

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Pablo Neira Ayuso
On Fri, Jul 25, 2014 at 02:50:32PM -0400, Willem de Bruijn wrote: > On Fri, Jul 25, 2014 at 2:43 PM, Alexei Starovoitov wrote: > > On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn > > wrote: > This follows a convention in include/uapi/linux/netfilter/*.h that > likely predates the

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Pablo Neira Ayuso
On Fri, Jul 25, 2014 at 10:24:29AM -0700, Alexei Starovoitov wrote: > On Fri, Jul 25, 2014 at 6:00 AM, Daniel Borkmann wrote: > > On 07/25/2014 01:54 PM, Pablo Neira Ayuso wrote: > >> > >> On Fri, Jul 25, 2014 at 01:25:35PM +0200, Daniel Borkmann wrote: > >>> > >>> [ also Cc'ing Willem, Pablo ] >

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 11:58 AM, Alexei Starovoitov wrote: > On Fri, Jul 25, 2014 at 11:50 AM, Willem de Bruijn wrote: >> On Fri, Jul 25, 2014 at 2:43 PM, Alexei Starovoitov >> wrote: >>> On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn >>> wrote: >> This follows a convention in

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 11:50 AM, Willem de Bruijn wrote: > On Fri, Jul 25, 2014 at 2:43 PM, Alexei Starovoitov wrote: >> On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn >> wrote: > This follows a convention in include/uapi/linux/netfilter/*.h that > likely predates the introduction

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Willem de Bruijn
On Fri, Jul 25, 2014 at 2:43 PM, Alexei Starovoitov wrote: > On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn wrote: This follows a convention in include/uapi/linux/netfilter/*.h that likely predates the introduction of uapi. A search for "Used internally by the kernel" shows

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn wrote: >>> This follows a convention in include/uapi/linux/netfilter/*.h that >>> likely predates the introduction of uapi. A search for "Used >>> internally by the kernel" shows many more examples. I should not have >>> included filter.h,

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Willem de Bruijn
>> This follows a convention in include/uapi/linux/netfilter/*.h that >> likely predates the introduction of uapi. A search for "Used >> internally by the kernel" shows many more examples. I should not have >> included filter.h, however. The common behavior when using pointers >> to

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 6:53 AM, Willem de Bruijn wrote: >>> >alternative fix for xt_bpf.h could be to replace: >>> > /* only used in the kernel */ >>> > struct sk_filter *filter __attribute__((aligned(8))); >>> >with >>> > /* only used in the kernel */ >>> > void *filter

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 6:00 AM, Daniel Borkmann wrote: > On 07/25/2014 01:54 PM, Pablo Neira Ayuso wrote: >> >> On Fri, Jul 25, 2014 at 01:25:35PM +0200, Daniel Borkmann wrote: >>> >>> [ also Cc'ing Willem, Pablo ] >>> >>> On 07/25/2014 10:04 AM, Alexei Starovoitov wrote: 'sk_filter'

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Willem de Bruijn
>> >alternative fix for xt_bpf.h could be to replace: >> > /* only used in the kernel */ >> > struct sk_filter *filter __attribute__((aligned(8))); >> >with >> > /* only used in the kernel */ >> > void *filter __attribute__((aligned(8))); >> > >> >but this 'void *' approach

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Daniel Borkmann
On 07/25/2014 01:54 PM, Pablo Neira Ayuso wrote: On Fri, Jul 25, 2014 at 01:25:35PM +0200, Daniel Borkmann wrote: [ also Cc'ing Willem, Pablo ] On 07/25/2014 10:04 AM, Alexei Starovoitov wrote: 'sk_filter' name is used as 'struct sk_filter', function sk_filter() and as variable 'sk_filter',

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Pablo Neira Ayuso
On Fri, Jul 25, 2014 at 01:25:35PM +0200, Daniel Borkmann wrote: > [ also Cc'ing Willem, Pablo ] > > On 07/25/2014 10:04 AM, Alexei Starovoitov wrote: > >'sk_filter' name is used as 'struct sk_filter', function sk_filter() and > >as variable 'sk_filter', which makes code hard to read. > >Also

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Daniel Borkmann
[ also Cc'ing Willem, Pablo ] On 07/25/2014 10:04 AM, Alexei Starovoitov wrote: 'sk_filter' name is used as 'struct sk_filter', function sk_filter() and as variable 'sk_filter', which makes code hard to read. Also it's easily confused with 'struct sock_filter' Rename 'struct sk_filter' to

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Daniel Borkmann
[ also Cc'ing Willem, Pablo ] On 07/25/2014 10:04 AM, Alexei Starovoitov wrote: 'sk_filter' name is used as 'struct sk_filter', function sk_filter() and as variable 'sk_filter', which makes code hard to read. Also it's easily confused with 'struct sock_filter' Rename 'struct sk_filter' to

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Pablo Neira Ayuso
On Fri, Jul 25, 2014 at 01:25:35PM +0200, Daniel Borkmann wrote: [ also Cc'ing Willem, Pablo ] On 07/25/2014 10:04 AM, Alexei Starovoitov wrote: 'sk_filter' name is used as 'struct sk_filter', function sk_filter() and as variable 'sk_filter', which makes code hard to read. Also it's easily

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Daniel Borkmann
On 07/25/2014 01:54 PM, Pablo Neira Ayuso wrote: On Fri, Jul 25, 2014 at 01:25:35PM +0200, Daniel Borkmann wrote: [ also Cc'ing Willem, Pablo ] On 07/25/2014 10:04 AM, Alexei Starovoitov wrote: 'sk_filter' name is used as 'struct sk_filter', function sk_filter() and as variable 'sk_filter',

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Willem de Bruijn
alternative fix for xt_bpf.h could be to replace: /* only used in the kernel */ struct sk_filter *filter __attribute__((aligned(8))); with /* only used in the kernel */ void *filter __attribute__((aligned(8))); but this 'void *' approach may further break

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 6:00 AM, Daniel Borkmann dbork...@redhat.com wrote: On 07/25/2014 01:54 PM, Pablo Neira Ayuso wrote: On Fri, Jul 25, 2014 at 01:25:35PM +0200, Daniel Borkmann wrote: [ also Cc'ing Willem, Pablo ] On 07/25/2014 10:04 AM, Alexei Starovoitov wrote: 'sk_filter' name is

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 6:53 AM, Willem de Bruijn will...@google.com wrote: alternative fix for xt_bpf.h could be to replace: /* only used in the kernel */ struct sk_filter *filter __attribute__((aligned(8))); with /* only used in the kernel */ void *filter

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Willem de Bruijn
This follows a convention in include/uapi/linux/netfilter/*.h that likely predates the introduction of uapi. A search for Used internally by the kernel shows many more examples. I should not have included filter.h, however. The common behavior when using pointers to kernel-internal structures

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn will...@google.com wrote: This follows a convention in include/uapi/linux/netfilter/*.h that likely predates the introduction of uapi. A search for Used internally by the kernel shows many more examples. I should not have included filter.h,

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Willem de Bruijn
On Fri, Jul 25, 2014 at 2:43 PM, Alexei Starovoitov a...@plumgrid.com wrote: On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn will...@google.com wrote: This follows a convention in include/uapi/linux/netfilter/*.h that likely predates the introduction of uapi. A search for Used internally by

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 11:50 AM, Willem de Bruijn will...@google.com wrote: On Fri, Jul 25, 2014 at 2:43 PM, Alexei Starovoitov a...@plumgrid.com wrote: On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn will...@google.com wrote: This follows a convention in include/uapi/linux/netfilter/*.h

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Alexei Starovoitov
On Fri, Jul 25, 2014 at 11:58 AM, Alexei Starovoitov a...@plumgrid.com wrote: On Fri, Jul 25, 2014 at 11:50 AM, Willem de Bruijn will...@google.com wrote: On Fri, Jul 25, 2014 at 2:43 PM, Alexei Starovoitov a...@plumgrid.com wrote: On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Pablo Neira Ayuso
On Fri, Jul 25, 2014 at 10:24:29AM -0700, Alexei Starovoitov wrote: On Fri, Jul 25, 2014 at 6:00 AM, Daniel Borkmann dbork...@redhat.com wrote: On 07/25/2014 01:54 PM, Pablo Neira Ayuso wrote: On Fri, Jul 25, 2014 at 01:25:35PM +0200, Daniel Borkmann wrote: [ also Cc'ing Willem, Pablo ]

Re: [PATCH net-next] net: filter: rename 'struct sk_filter' to 'struct bpf_prog'

2014-07-25 Thread Pablo Neira Ayuso
On Fri, Jul 25, 2014 at 02:50:32PM -0400, Willem de Bruijn wrote: On Fri, Jul 25, 2014 at 2:43 PM, Alexei Starovoitov a...@plumgrid.com wrote: On Fri, Jul 25, 2014 at 11:32 AM, Willem de Bruijn will...@google.com wrote: This follows a convention in include/uapi/linux/netfilter/*.h that