Re: [PATCH net-next] BNX2: fix a Null Pointer for stats_blk

2015-09-23 Thread Weidong Wang
On 2015/9/24 13:34, David Miller wrote: > From: Weidong Wang > Date: Thu, 24 Sep 2015 10:00:45 +0800 > >> It does affect the intention. Although, the problem exists then makes the >> system panic within some case. >> >> Do you have any idea about it? > > Allocate the statistics block at probe ti

Re: [PATCH net-next 0/3] l2tp: module autoloading

2015-09-23 Thread James Chapman
On 24/09/15 05:33, Stephen Hemminger wrote: > With L2TP it was necessary to manually load modules > which is a nuisance and not required with other tunneling > protocols. This set of patches adds the aliases and module > load hook to get rid of the necessity of modprobing. Looks good. Acked-By: Ja

Re: [PATCH net 0/2] lwtunnel: make it really work, for IPv4

2015-09-23 Thread Eric W. Biederman
Thomas Graf writes: > On 09/23/15 at 04:09pm, Eric W. Biederman wrote: > > [...] > >> *Blink* You were targeting net.git with a feature enhancement >> I will just ignore that. > > The point of this series is to not expose the src and dst port Netlink > bits to user space in a released kernel

Re: Race with ip=dhcp bootparameter in ip_rcv_finish on am335x

2015-09-23 Thread Alexander Aring
Hi, On Wed, Sep 23, 2015 at 09:16:00AM -0400, Trond Myklebust wrote: ... > > Is that happening when the transport is being torn down? If so, is it > fixed by > http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=79234c3db6842a3de03817211d891e0c2878f756 > ? thanks. This patch fixed

Re: [PATCH net-next] BNX2: fix a Null Pointer for stats_blk

2015-09-23 Thread David Miller
From: Weidong Wang Date: Thu, 24 Sep 2015 10:00:45 +0800 > It does affect the intention. Although, the problem exists then makes the > system panic within some case. > > Do you have any idea about it? Allocate the statistics block at probe time so that this problem is impossible. -- To unsubscr

Re: [PATCH net-next] rtnl_fdb_dump: catch errors from ndo_fdb_dump and ndo_dflt_fdb_dump

2015-09-23 Thread Scott Feldman
On Wed, Sep 23, 2015 at 9:21 AM, Roopa Prabhu wrote: > From: Wilson Kok > > current ndo_fdb_dump and ndo_dflt_fdb_dump always return the current > fdb index. They dont return errors. Which results in fdb dumps > continuing on errors. > > In one such case where bridges and vxlan devices were invol

Re: [net PATCH 1/3] i40e: Fix handling of napi budget

2015-09-23 Thread Jeff Kirsher
On Tue, 2015-09-22 at 14:35 -0700, Alexander Duyck wrote: > The polling routine for i40e was rounding up the budget for Rx > cleanup to > 1. This is incorrect as netpoll will call is expecting no Rx to be > processed as the budget passed was 0. > > Signed-off-by: Alexander Duyck > --- > drivers

[PATCH net-next 0/3] l2tp: module autoloading

2015-09-23 Thread Stephen Hemminger
With L2TP it was necessary to manually load modules which is a nuisance and not required with other tunneling protocols. This set of patches adds the aliases and module load hook to get rid of the necessity of modprobing. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the b

[PATCH net-next 1/3] l2tp: auto load type modules

2015-09-23 Thread Stephen Hemminger
It should not be necessary to do explicit module loading when configuring L2TP. Modules should be loaded as needed instead (as is done already with netlink and other tunnel types). This patch adds a new module alias type and code to load the sub module on demand. Signed-off-by: Stephen Hemminger

[PATCH net-next 2/3] l2tp: auto load IP modules

2015-09-23 Thread Stephen Hemminger
When creating a IP encapsulated tunnel the necessary l2tp module should be loaded. It already works for UDP encapsulation, it just doesn't work for direct IP encap. Signed-off-by: Stephen Hemminger --- a/net/l2tp/l2tp_ip.c2015-09-23 21:24:08.644656533 -0700 +++ b/net/l2tp/l2tp_ip.c

[PATCH net-next 3/3] l2tp: remove references to modprobe in documentation

2015-09-23 Thread Stephen Hemminger
No longer need explicit modprobe's and update to use ip instead of deprecated ifconfig command. Signed-off-by: Stephen Hemminger --- a/Documentation/networking/l2tp.txt 2015-05-21 15:13:01.421115881 -0700 +++ b/Documentation/networking/l2tp.txt 2015-09-07 12:18:07.672921513 -0700 @@ -213,15 +21

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Herbert Xu
On Wed, Sep 23, 2015 at 11:43:21PM -0400, Tejun Heo wrote: > On Thu, Sep 24, 2015 at 11:42:14AM +0800, Herbert Xu wrote: > > Well I disagree so let's leave it at that. > > Leaving things disagreed is fine but there's still a patch to commit > here, so I get that you're still dead against just appl

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Tejun Heo
On Thu, Sep 24, 2015 at 11:42:14AM +0800, Herbert Xu wrote: > Well I disagree so let's leave it at that. Leaving things disagreed is fine but there's still a patch to commit here, so I get that you're still dead against just applying the pattern? -- tejun -- To unsubscribe from this list: send t

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Herbert Xu
On Wed, Sep 23, 2015 at 11:41:16PM -0400, Tejun Heo wrote: > On Thu, Sep 24, 2015 at 11:31:17AM +0800, Herbert Xu wrote: > > No this isn't what happened. My error was trying to see if there > > is a way to do it without barriers. In the end there wasn't. This > > has nothing to do with using pri

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Tejun Heo
On Thu, Sep 24, 2015 at 11:31:17AM +0800, Herbert Xu wrote: > No this isn't what happened. My error was trying to see if there > is a way to do it without barriers. In the end there wasn't. This > has nothing to do with using primitives. Hmmm... yeah, you can say that, but it still was a failur

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Herbert Xu
On Wed, Sep 23, 2015 at 11:29:28PM -0400, Tejun Heo wrote: > > So, while that also has been a common failure mode that we've been > seeing with barrier usages, what you're suggesting isn't the right > balance either. It's error-prone in a different way as amply > exemplified in this very thread.

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Tejun Heo
Hello, On Thu, Sep 24, 2015 at 11:21:00AM +0800, Herbert Xu wrote: > Well we'll have to agree to disagree on that one. I have seen too > many instances over the years where people post patches that use > primitives such as RCU and think that they must be safe because > it compiles with no warning

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Herbert Xu
On Wed, Sep 23, 2015 at 11:06:09PM -0400, Tejun Heo wrote: > > I think this is where we're not agreeing. My point is that better > understanding and lower likelihood of bug doesn't equate specializing > each usage site. That's a lot more likely to lead to unnecessary > cognition overhead and nat

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Tejun Heo
Hello, On Thu, Sep 24, 2015 at 10:54:36AM +0800, Herbert Xu wrote: > What I am concerned about is the next guy who comes along and > does a rewrite like the one that introduced the netlink_bind > bug. That person needs to fully understand what each primitive > is protecting against. > > Using pr

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Herbert Xu
On Wed, Sep 23, 2015 at 10:46:08PM -0400, Tejun Heo wrote: > > Hmm... It looks like I'm failing at communicating. Lemme try again. > There are two situations where we do this. > > 1. When there are different locking contexts. In this case, the write >path is. It's already protected by the

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Tejun Heo
Hello, Herbert. On Thu, Sep 24, 2015 at 10:30:11AM +0800, Herbert Xu wrote: > Well if someone provided helpers which > > 1) uses smp_wmb and smp_rmb instead of full barriers; This part is fine. > 2) provides raw variants for the cases that barriers aren't needed Hmm... It looks like I'm failin

Re: [PATCH v2] netlink: Replace rhash_portid with bound

2015-09-23 Thread Herbert Xu
On Wed, Sep 23, 2015 at 11:54:40AM -0400, Tejun Heo wrote: > > Hmm... lemme try again. When using barriers or RCU, it's desirable to > establish certain invariants because it usually is extremely easy to > miss corner cases. It is helpful to have an abstraction, even if just > conceptual, where

Re: [PATCH net-next] BNX2: fix a Null Pointer for stats_blk

2015-09-23 Thread Weidong Wang
On 2015/9/24 6:31, David Miller wrote: > From: Weidong Wang > Date: Tue, 22 Sep 2015 20:42:40 +0800 > >> @@ -880,6 +882,7 @@ bnx2_alloc_mem(struct bnx2 *bp) >> } >> } >> >> +spin_lock(&bp->stats64_lock); >> bp->stats_blk = status_blk + status_blk_size; >> >> bp->st

Re: [PATCH v2 1/5] net: add Hisilicon Network Subsystem support (config and documents)

2015-09-23 Thread huangdaode
On 2015/9/21 22:52, Rob Herring wrote: On 09/17/2015 01:51 AM, huangdaode wrote: The Hisilicon Network Subsystem is a long term evolution IP which is supposed to be used in Hisilicon ICT SoC. The IP, which is called hns for short, is a TCP/IP acceleration engine, which can directly decode TCP/IP

Re: [PATCH next 02/84] ipvs: Don't use current in proc_do_defense_mode

2015-09-23 Thread Simon Horman
On Tue, Sep 22, 2015 at 08:53:30PM -0500, Eric W. Biederman wrote: > Simon Horman writes: > > > On Mon, Sep 21, 2015 at 01:01:39PM -0500, Eric W. Biederman wrote: > >> Instead store ipvs in extra2 so that proc_do_defense_mode can easily > >> find the ipvs that it's value is associated with. > >>

[PATCH net-next] net: dsa: Set a "dsa" device_type

2015-09-23 Thread Florian Fainelli
Provide a device_type information for slave network devices created by DSA, this is useful for user-space application to easily locate/search for devices of a specific kind. Signed-off-by: Florian Fainelli --- net/dsa/slave.c | 5 + 1 file changed, 5 insertions(+) diff --git a/net/dsa/slave

[PATCH nf-next 21/84] ipvs: Pass ipvs not net to ip_vs_service_net_cleanup

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_core.c | 6 -- net/netfilter/ipvs/ip_vs_ctl.c | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-)

[PATCH nf-next 26/84] ipvs: Pass ipvs not net to __ip_vs_get_service_entries

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index

[PATCH nf-next 22/84] ipvs: Pass ipvs not net to ip_vs_zero_all

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c ind

[PATCH nf-next 20/84] ipvs: Pass ipvs not net to ip_vs_flush

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c

[PATCH nf-next 32/84] ipvs: Pass ipvs not net to ip_vs_genl_del_daemon

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c ind

[PATCH nf-next 25/84] ipvs: Pass ipvs not net to ip_vs_set_timeout

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c in

[PATCH nf-next 28/84] ipvs: Pass ipvs not net to __ip_vs_get_timeouts

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.

[PATCH nf-next 29/84] ipvs: Pass ipvs not net to ip_vs_genl_parse_service

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c in

[PATCH nf-next 27/84] ipvs: Pass ipvs not net to __ip_vs_get_dest_entries

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index

[PATCH nf-next 31/84] ipvs: Pass ipvs not net to ip_vs_genl_new_daemon

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c ind

[PATCH nf-next 24/84] ipvs: Pass ipvs not net to ip_vs_proto_data_get

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 8 net/netfilter/ipvs/ip_vs

[PATCH nf-next 23/84] ipvs: Cache ipvs in ip_vs_in_icmp and ip_vs_in_icmp_v6

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Storte the value of net_ipvs in a variable named ipvs so that when there are more users struct netns_ipvs in ip_vs_in_cmp and ip_vs_in_icmp_v6 they won't need to compute the value again. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simo

[PATCH nf-next 17/84] ipvs: Pass ipvs not net to ip_vs_dest_trash_expire

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index

[PATCH nf-next 15/84] ipvs: Pass ipvs not net to ip_vs_trash_cleanup

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index

[PATCH nf-next 05/84] ipvs: Store ipvs not net in struct ip_vs_conn_param

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" In practice struct netns_ipvs is as meaningful as struct net and more useful as it holds the ipvs specific data. So store a pointer to struct netns_ipvs. Update the accesses of param->net to access param->ipvs->net instead. When lookup up struct ip_vs_conn in a hash t

[PATCH nf-next 36/84] ipvs: Pass ipvs not net to make_receive_sock

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_sync.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c

[PATCH nf-next 18/84] ipvs: Cache ipvs in ip_vs_genl_set_cmd

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Compute ipvs early in ip_vs_genl_set_cmd and use the cached value to access ipvs->sync_state. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 de

[PATCH nf-next 52/84] ipvs: Pass ipvs not net into register_app and unregister_app

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_app.c| 6 -- net/netfilter/ipvs/ip_vs_proto_sctp.c | 7 +++ net/netfilter/ipvs/ip_vs

[PATCH nf-next 37/84] ipvs: Store ipvs not net in struct ip_vs_sync_thread_data

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" In practice struct netns_ipvs is as meaningful as struct net and more useful as it holds the ipvs specific data. So store a pointer to struct netns_ipvs. Update the accesses of tinfo->net to access tinfo->ipvs->net instead. Signed-off-by: "Eric W. Biederman" Acked-by

[PATCH nf-next 02/84] ipvs: Don't use current in proc_do_defense_mode

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Instead store ipvs in extra2 so that proc_do_defense_mode can easily find the ipvs that it's value is associated with. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 8 ++-- 1 file c

[PATCH nf-next 55/84] ipvs: Pass ipvs not net to register_ip_vs_app and unregister_ip_vs_app

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Also move the tests for net_ipvs being NULL into __ip_vs_ftp_init and __ip_vs_ftp_exit. The only places where they possibly make sense. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h| 4

[PATCH nf-next 07/84] ipvs: Store ipvs not net in struct ip_vs_service

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" In practice struct netns_ipvs is as meaningful as struct net and more useful as it holds the ipvs specific data. So store a pointer to struct netns_ipvs. Update the accesses of param->net to access param->ipvs->net instead. In functions where we are searching for an s

[PATCH nf-next 47/84] ipvs: Pass ipvs not net to ip_vs_random_drop_entry

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) d

[PATCH nf-next 11/84] ipvs: Pass ipvs not net to __ip_vs_service_find

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_v

[PATCH nf-next 10/84] ipvs: Pass ipvs not net to ip_vs_svc_hashkey

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Use the address of ipvs not the address of net when computing the hash value. This removes an unncessary dependency on struct net. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 8 -

[PATCH nf-next 03/84] ipvs: Use state->net in the ipvs forward functions

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_core.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c

[PATCH nf-next 38/84] ipvs: Pass ipvs not net to ip_vs_process_message

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_sync.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c

[PATCH nf-next 08/84] ipvs: Pass ipvs not net to ip_vs_svc_fwm_hashkey

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c in

[PATCH nf-next 43/84] ipvs: Pass ipvs not net to ip_vs_sync_net_init

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) d

[PATCH nf-next 41/84] ipvs: Pass ipvs not net to ip_vs_proc_conn

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_sync.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_s

[PATCH nf-next 39/84] ipvs: Pass ipvs not net to ip_vs_sync_conn_v0

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_sync.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c

[PATCH nf-next 06/84] ipvs: Pass ipvs not net to ip_vs_fill_conn

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" ipvs is what is actually desired so change the parameter and the modify the callers to pass struct netns_ipvs. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 4 ++-- net/netfil

[PATCH nf-next 61/84] ipvs: Pass ipvs into .conn_in_get and ip_vs_conn_in_get_proto

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Stop relying on "net_ipvs(skb_net(skb))" to derive the ipvs as skb_net is a hack. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 6 -- net/netfilter/ipvs/ip_vs_conn.c

[PATCH nf-next 16/84] ipvs: Pass ipvs not net to __ip_vs_del_dest

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c

[PATCH nf-next 45/84] ipvs: Pass ipvs not net to ip_vs_genl_set_config

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index

[PATCH nf-next 51/84] ipvs: Pass ipvs not net to ip_vs_estimator_net_init and ip_vs_estimator_cleanup

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- net/netfilter/ipvs/ip_vs_est.c | 8 +++- 3 files changed, 8 insertions(+), 10 dele

[PATCH nf-next 04/84] ipvs: Store ipvs not net in struct ip_vs_conn

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" In practice struct netns_ipvs is as meaningful as struct net and more useful as it holds the ipvs specific data. So store a pointer to struct netns_ipvs. Update the accesses of conn->net to access conn->ipvs->net instead. Signed-off-by: "Eric W. Biederman" Acked-by:

[PATCH nf-next 13/84] ipvs: Pass ipvs not net to ip_vs_has_real_service

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_core.c | 6 -- net/netfilter/ipvs/ip_vs_ctl.c | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-)

[PATCH nf-next 35/84] ipvs: Pass ipvs not net to make_send_sock

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_sync.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c

[PATCH nf-next 14/84] ipvs: Pass ipvs not net to ip_vs_find_dest

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- net/netfilter/ipvs/ip_vs_sync.c | 2 +- 4 files cha

[PATCH nf-next 01/84] ipvs: Hoist computation of ipvs earlier in sctp_conn_schedule

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" The addition of sysctl_sloppy_sctp in sctp_conn_schedule resulted in a use of ipvs before it was computed. Hoist the computation of ipvs earlier to avoid this problem. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net

[PATCH nf-next 54/84] ipvs: Pass ipvs not net to register_ip_vs_app_inc

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h| 2 +- net/netfilter/ipvs/ip_vs_app.c | 3 +-- net/netfilter/ipvs/ip_vs_ftp.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff

[PATCH nf-next 09/84] ipvs: Pass ipvs not net to __ip_vs_svc_fwm_find

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" ipvs is what the code actually wants to use. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_ctl.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net/netfilte

[PATCH nf-next 83/84] ipvs: Remove skb_sknet

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" This function adds no real value and it obscures what the code is doing. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h| 22 -- net/netfilter/ipvs/ip_vs_ctl.c | 25 +++

[PATCH nf-next 60/84] ipvs: Pass ipvs into ip_vs_conn_fill_param_proto

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Move the ugly hack net_ipvs(skb_net(skb)) up a layer in the call stack so it is easier to remove. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_conn.c | 10 ++ 1 file changed, 6 inserti

[PATCH nf-next 57/84] ipvs: Pass ipvs not net into ip_vs_app_net_init and ip_vs_app_net_cleanup

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_app.c | 8 net/netfilter/ipvs/ip_vs_core.c | 6 +++--- 3 files changed, 9 insertions(+), 9 delet

[PATCH nf-next 58/84] ipvs: Pass ipvs not net into [un]register_ip_vs_proto_netns

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_proto.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip

[PATCH nf-next 79/84] ipvs: Pass ipvs through ip_vs_route_me_harder into sysctl_snat_reroute

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" This removes the need to use the hack skb_net. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_core.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net/netfi

[PATCH nf-next 71/84] ipvs: Better derivation of ipvs in ip_vs_in_stats and ip_vs_out_stats

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c ind

[PATCH nf-next 76/84] ipvs: Pass ipvs into ip_vs_in

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Derive ipvs from state->net in the callers of ip_vs_in and pass it into ip_vs_out. Removing the need to use the hack skb_net. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_core.c | 14 +---

[PATCH nf-next 75/84] ipvs: Pass ipvs into ip_vs_out

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Derive ipvs from state->net in the callers of ip_vs_out and pass it into ip_vs_out. Removing the need to use the hack skb_net. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_core.c | 15 ++-

[PATCH nf-next 62/84] ipvs: Pass ipvs into conn_out_get

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Move the hack of relying on "net_ipvs(skb_net(skb))" to derive the ipvs up a layer. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 6 -- net/netfilter/ipvs/ip_vs_conn.c

[PATCH nf-next 67/84] ipvs: Better derivation of ipvs in ip_vs_tunnel_xmit

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Don't use "net_ipvs(skb_net(skb))" as skb_net is a bad hack. Instead use cp->ipvs and ipvs->net for the net. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_xmit.c | 4 ++-- 1 file changed, 2 in

[PATCH nf-next 80/84] ipvs: Remove net argument from ip_vs_tcp_conn_listen

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" The argument is unnecessary and in practice confusing, and has caused the callers to do all manner of silly things. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 2 +- net/netfilt

[PATCH nf-next 66/84] ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" This moves the hack "net_ipvs(skb_net(skb))" up one level where it will be easier to remove. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 3 ++- net/netfilter/ipvs/ip_vs_core

[PATCH nf-next 84/84] ipvs: Pass ipvs into ip_vs_gather_frags

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" This will be needed later when the network namespace guessing is removed from ip_defrag. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_core.c | 9 + 1 file changed, 5 insertions(+), 4 d

[PATCH nf-next 82/84] ipvs: Remove skb_net

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" This hack has no more users so remove it. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 31 --- 1 file changed, 31 deletions(-) diff --git a/include/net/ip_vs.h b/incl

[PATCH nf-next 56/84] ipvs: Pass ipvs not net into ip_vs_app_inc_release

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_app.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c inde

[PATCH nf-next 53/84] ipvs: Pass ipvs not net into ip_vs_app_inc_new

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_app.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c inde

[PATCH nf-next 70/84] ipvs: Pass ipvs into ensure_mtu_is adequate

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" This allows two different ways for computing/guessing net to be removed from ensure_mtu_is_adequate. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_xmit.c | 11 +-- 1 file changed, 5 ins

[PATCH nf-next 59/84] ipvs: Pass ipvs not net into init_netns and exit_netns

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_proto.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_sctp.c | 6 ++ net/netfilter/ipvs/ip_vs_pr

[PATCH nf-next 64/84] ipvs: Pass ipvs not net into ip_vs_conn_net_flush

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_conn.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c

[PATCH nf-next 73/84] ipvs: Simplify ipvs and net access in ip_vs_leave

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Stop using the hack skb_net(skb) to compute the network namespace. Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_core.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git

[PATCH nf-next 77/84] ipvs: Pass ipvs into ip_vs_in_icmp and ip_vs_in_icmp_v6

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" With ipvs passed into ip_vs_in_icmp and ip_vs_in_icmp_v6 they no longer need to call the hack that is skb_net. Additionally ipvs_in_icmp no longer needs to call dev_net(skb->dev) and can use the ipvs->net instead. Signed-off-by: "Eric W. Biederman" Acked-by: Julian An

[PATCH nf-next 81/84] ipvs: Pass ipvs not net to ip_vs_protocol_net_(init|cleanup)

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- net/netfilter/ipvs/ip_vs_proto.c | 8 +++- 3 files changed, 8 insertions(+), 10 d

[PATCH nf-next 63/84] ipvs: Pass ipvs not net to ip_vs_conn_hashkey

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Use the address of struct netns_ipvs in the hash not the address of struct net. Both addresses are equally valid candidates and by using the address of struct netns_ipvs there becomes no need deal with struct net in this part of the code. Signed-off-by: "Eric W. Bieder

[PATCH nf-next 68/84] ipvs: Pass ipvs into __ip_vs_get_out_rt

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_xmit.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_v

[PATCH nf-next 50/84] ipvs: Pass ipvs not net to estimation_timer

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_est.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c inde

[PATCH nf-next 78/84] ipvs: Pass ipvs into ip_vs_out_icmp and ip_vs_out_icmp_v6

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" This removes the need to compute ipvs with the hack "net_ipvs(skb_net(skb))" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_core.c | 15 +++ 1 file changed, 7 insertions(+), 8 deleti

[PATCH nf-next 74/84] ipvs: Pass ipvs not net into sysctl_nat_icmp_send

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_core.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c

[PATCH nf-next 69/84] ipvs: Pass ipvs into __ip_vs_get_out_rt_v6

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- net/netfilter/ipvs/ip_vs_xmit.c | 21 + 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ip

[PATCH nf-next 49/84] ipvs: Pass ipvs not net into ip_vs_control_net_(init|cleanup)

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- net/netfilter/ipvs/ip_vs_ctl.c | 8 3 files changed, 9 insertions(+), 9 delet

[PATCH nf-next 72/84] ipvs: Wrap sysctl_cache_bypass and remove ifdefs in ip_vs_leave

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" With sysctl_cache_bypass now a compile time constant the compiler can figue out that it can elimiate all of the code that depends on sysctl_cache_bypass being true. Also remove the duplicate computation of net previously necessitated by #ifdef CONFIG_SYSCTL Signed-off-

[PATCH nf-next 65/84] ipvs: Pass ipvs not net into ip_vs_conn_net_init and ip_vs_conn_net_cleanup

2015-09-23 Thread Simon Horman
From: "Eric W. Biederman" Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_conn.c | 8 net/netfilter/ipvs/ip_vs_core.c | 6 +++--- 3 files changed, 9 insertions(+), 9 delet

  1   2   3   4   >