* Re: [PATCH net-next-2.6 7/8] sctp: Allow bindx_del to accept 0 port
From: David Miller @ 2011-04-20 4:47 UTC (permalink / raw)
To: yjwei; +Cc: netdev, linux-sctp
In-Reply-To: <4DAD1A47.5080007@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 19 Apr 2011 13:14:47 +0800
> From: Vlad Yasevich <vladislav.yasevich@hp.com>
>
> We allow 0 port when adding new addresses. It only
> makes sence to allow 0 port when removing addresses.
> When removing the currently bound port will be used
> when the port in the address is set to 0.
>
> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 6/8] sctp: teach CACC algorithm about removed transports
From: David Miller @ 2011-04-20 4:47 UTC (permalink / raw)
To: yjwei; +Cc: netdev, linux-sctp
In-Reply-To: <4DAD1A14.9060603@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 19 Apr 2011 13:13:56 +0800
> From: Vlad Yasevich <vladislav.yasevich@hp.com>
>
> When we have have to remove a transport due to ASCONF, we move
> the data to a new active path. This can trigger CACC algorithm
> to not mark that data as missing when SACKs arrive. This is
> because the transport passed to the CACC algorithm is the one
> this data is sitting on, not the one it was sent on (that one
> may be gone). So, by sending the original transport (even if
> it's NULL), we may start marking data as missing.
>
> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 5/8] sctp: use memdup_user to copy data from userspace
From: David Miller @ 2011-04-20 4:47 UTC (permalink / raw)
To: yjwei; +Cc: netdev, linux-sctp
In-Reply-To: <4DAD19EE.1070707@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 19 Apr 2011 13:13:18 +0800
> From: Shan Wei <shanwei@cn.fujitsu.com>
>
> Use common function to simply code.
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 4/8] sctp: kill abandoned SCTP_CMD_TRANSMIT command
From: David Miller @ 2011-04-20 4:47 UTC (permalink / raw)
To: yjwei; +Cc: netdev, linux-sctp
In-Reply-To: <4DAD19C8.8010105@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 19 Apr 2011 13:12:40 +0800
> From: Shan Wei <shanwei@cn.fujitsu.com>
>
> Remove SCTP_CMD_TRANSMIT command as it never be used.
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 3/8] sctp: use common head of addr parameter to access member in addr-unrelated code
From: David Miller @ 2011-04-20 4:47 UTC (permalink / raw)
To: yjwei; +Cc: netdev, linux-sctp
In-Reply-To: <4DAD1993.5070801@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 19 Apr 2011 13:11:47 +0800
> From: Shan Wei <shanwei@cn.fujitsu.com>
>
> The 'p' member of struct sctp_paramhdr is common part for
> IPv4 addr parameter and IPv6 addr parameter in union sctp_addr_param.
>
> For addr-related code, use specified addr parameter.
> Otherwise, use common header to access type/length member.
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 2/8] sctp: fix the comment of sctp_sf_violation_paramlen()
From: David Miller @ 2011-04-20 4:47 UTC (permalink / raw)
To: yjwei; +Cc: netdev, linux-sctp
In-Reply-To: <4DAD1965.7090100@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 19 Apr 2011 13:11:01 +0800
> From: Shan Wei <shanwei@cn.fujitsu.com>
>
> Update the comment about sctp_sf_violation_paramlen() to be
> more precise.
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 1/8 v2] sctp: delete unused macro definition of sctp_chunk_is_control
From: David Miller @ 2011-04-20 4:47 UTC (permalink / raw)
To: yjwei; +Cc: netdev, linux-sctp
In-Reply-To: <4DAD1B61.6080504@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 19 Apr 2011 13:19:29 +0800
> From: Shan Wei <shanwei@cn.fujitsu.com>
>
> The macro never be used.
> And if needed, can use !sctp_chunk_is_data instead of.
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Applied.
^ permalink raw reply
* Re: ipqueue allocation failure.
From: David Miller @ 2011-04-20 3:41 UTC (permalink / raw)
To: davej; +Cc: netdev
In-Reply-To: <20110420014221.GC26949@redhat.com>
From: Dave Jones <davej@redhat.com>
Date: Tue, 19 Apr 2011 21:42:22 -0400
> Not catastrophic, but ipqueue seems to be too trusting of what it gets
> passed from userspace, and passes it on down to the page allocator,
> where it will spew warnings if the page order is too high.
>
> __ipq_rcv_skb has several checks for lengths too small, but doesn't
> seem to have any for oversized ones. I'm not sure what the maximum
> we should check for is. I'll code up a diff if anyone has any ideas
> on a sane maximum.
Maybe the thing to do is to simply pass __GFP_NOWARN to nlmsg_new()
in netlink_ack()?
Anyone else have a better idea?
^ permalink raw reply
* Re: Add missing socket check in can/bcm release.
From: David Miller @ 2011-04-20 3:37 UTC (permalink / raw)
To: davej; +Cc: netdev
In-Reply-To: <20110420033001.GA32635@redhat.com>
From: Dave Jones <davej@redhat.com>
Date: Tue, 19 Apr 2011 23:30:01 -0400
> We can get here with a NULL socket argument passed from userspace,
> so we need to handle it accordingly.
>
> Signed-off-by: Dave Jones <davej@redhat.com>
Applied and queued up for -stable, thanks Dave.
^ permalink raw reply
* Add missing socket check in can/bcm release.
From: Dave Jones @ 2011-04-20 3:30 UTC (permalink / raw)
To: netdev
We can get here with a NULL socket argument passed from userspace,
so we need to handle it accordingly.
Signed-off-by: Dave Jones <davej@redhat.com>
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 57b1aed..8a6a05e 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1427,9 +1427,14 @@ static int bcm_init(struct sock *sk)
static int bcm_release(struct socket *sock)
{
struct sock *sk = sock->sk;
- struct bcm_sock *bo = bcm_sk(sk);
+ struct bcm_sock *bo;
struct bcm_op *op, *next;
+ if (sk == NULL)
+ return 0;
+
+ bo = bcm_sk(sk);
+
/* remove bcm_ops, timer, rx_unregister(), etc. */
unregister_netdevice_notifier(&bo->notifier);
^ permalink raw reply related
* Re: [PATCH net-next 0/5] be2net: allow register dump only for PFs
From: David Miller @ 2011-04-20 3:13 UTC (permalink / raw)
To: ajit.khaparde; +Cc: netdev
In-Reply-To: <20110419221032.GA3573@akhaparde-VBox>
From: Ajit Khaparde <ajit.khaparde@emulex.com>
Date: Tue, 19 Apr 2011 17:10:32 -0500
> Series of 5 patches against net-next-2.6
> Please apply.
All applied, thanks.
^ permalink raw reply
* Re: [PATCH] net:bna: fix compile warning of ‘bfa_ioc_smem_pgoff’ defined but not used
From: David Miller @ 2011-04-20 3:12 UTC (permalink / raw)
To: shanwei; +Cc: netdev
In-Reply-To: <4DAE38FE.1010503@cn.fujitsu.com>
From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Wed, 20 Apr 2011 09:38:06 +0800
> Fix the below compile warning:
>
> drivers/net/bna/bfa_ioc.c:1922: warning: ‘bfa_ioc_smem_pgoff’ defined but not used
>
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Applied.
^ permalink raw reply
* Re: [PATCH] net: forcedeth: fix compile warning of not used nv_set_tso function
From: David Miller @ 2011-04-20 3:11 UTC (permalink / raw)
To: shanwei; +Cc: mirq-linux, netdev
In-Reply-To: <4DAE3768.9030807@cn.fujitsu.com>
From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Wed, 20 Apr 2011 09:31:20 +0800
> Fix the below compile warning:
> drivers/net/forcedeth.c:4266: warning: ‘nv_set_tso’ defined but not used
>
> commit 569e146 converts forcedeth driver to use hw_features.
> So, implement function of .set_tso is abandoned.
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Applied.
^ permalink raw reply
* Re: [PATCH] net:bna: fix compile warning of ‘bfa_ioc_smem_pgoff’ defined but not used
From: Shan Wei @ 2011-04-20 1:42 UTC (permalink / raw)
To: David Miller, netdev
In-Reply-To: <4DAE38FE.1010503@cn.fujitsu.com>
This patch is also against net-next.
Shan Wei wrote, at 04/20/2011 09:38 AM:
> Fix the below compile warning:
>
> drivers/net/bna/bfa_ioc.c:1922: warning: ‘bfa_ioc_smem_pgoff’ defined but not used
>
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
> ---
> drivers/net/bna/bfa_ioc.c | 7 -------
> 1 files changed, 0 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/bna/bfa_ioc.c b/drivers/net/bna/bfa_ioc.c
> index ba2a4e1..fcb9bb3 100644
> --- a/drivers/net/bna/bfa_ioc.c
> +++ b/drivers/net/bna/bfa_ioc.c
> @@ -82,7 +82,6 @@ static void bfa_ioc_pf_fwmismatch(struct bfa_ioc *ioc);
> static void bfa_ioc_boot(struct bfa_ioc *ioc, u32 boot_type,
> u32 boot_param);
> static u32 bfa_ioc_smem_pgnum(struct bfa_ioc *ioc, u32 fmaddr);
> -static u32 bfa_ioc_smem_pgoff(struct bfa_ioc *ioc, u32 fmaddr);
> static void bfa_ioc_get_adapter_serial_num(struct bfa_ioc *ioc,
> char *serial_num);
> static void bfa_ioc_get_adapter_fw_ver(struct bfa_ioc *ioc,
> @@ -1923,12 +1922,6 @@ bfa_ioc_smem_pgnum(struct bfa_ioc *ioc, u32 fmaddr)
> return PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, fmaddr);
> }
>
> -static u32
> -bfa_ioc_smem_pgoff(struct bfa_ioc *ioc, u32 fmaddr)
> -{
> - return PSS_SMEM_PGOFF(fmaddr);
> -}
> -
> /**
> * Register mailbox message handler function, to be called by common modules
> */
--
Best Regards
-----
Shan Wei
^ permalink raw reply
* Re: [PATCH] net: forcedeth: fix compile warning of not used nv_set_tso function
From: Shan Wei @ 2011-04-20 1:42 UTC (permalink / raw)
To: mirq-linux, David Miller, netdev
In-Reply-To: <4DAE3768.9030807@cn.fujitsu.com>
This patch is against net-next.
Shan Wei wrote, at 04/20/2011 09:31 AM:
> Fix the below compile warning:
> drivers/net/forcedeth.c:4266: warning: ‘nv_set_tso’ defined but not used
>
> commit 569e146 converts forcedeth driver to use hw_features.
> So, implement function of .set_tso is abandoned.
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
> ---
> drivers/net/forcedeth.c | 10 ----------
> 1 files changed, 0 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
> index ec9a32d..0e1c76a 100644
> --- a/drivers/net/forcedeth.c
> +++ b/drivers/net/forcedeth.c
> @@ -4263,16 +4263,6 @@ static int nv_nway_reset(struct net_device *dev)
> return ret;
> }
>
> -static int nv_set_tso(struct net_device *dev, u32 value)
> -{
> - struct fe_priv *np = netdev_priv(dev);
> -
> - if ((np->driver_data & DEV_HAS_CHECKSUM))
> - return ethtool_op_set_tso(dev, value);
> - else
> - return -EOPNOTSUPP;
> -}
> -
> static void nv_get_ringparam(struct net_device *dev, struct ethtool_ringparam* ring)
> {
> struct fe_priv *np = netdev_priv(dev);
--
Best Regards
-----
Shan Wei
^ permalink raw reply
* ipqueue allocation failure.
From: Dave Jones @ 2011-04-20 1:42 UTC (permalink / raw)
To: netdev
Not catastrophic, but ipqueue seems to be too trusting of what it gets
passed from userspace, and passes it on down to the page allocator,
where it will spew warnings if the page order is too high.
__ipq_rcv_skb has several checks for lengths too small, but doesn't
seem to have any for oversized ones. I'm not sure what the maximum
we should check for is. I'll code up a diff if anyone has any ideas
on a sane maximum.
Dave
------------[ cut here ]------------
WARNING: at mm/page_alloc.c:2032 __alloc_pages_nodemask+0x17d/0x7e6()
Hardware name: GA-MA78GM-S2H
Modules linked in: rfcomm hidp can_raw can_bcm sctp libcrc32c ip_queue decnet pppoe pppox ppp_generic slhc can ipx p8022 p8023 phonet bluetooth rfkill a]
Pid: 20393, comm: trinity Not tainted 2.6.39-rc4+ #6
Call Trace:
[<ffffffff81056a9c>] warn_slowpath_common+0x83/0x9b
[<ffffffff81056ace>] warn_slowpath_null+0x1a/0x1c
[<ffffffff810ed743>] __alloc_pages_nodemask+0x17d/0x7e6
[<ffffffff811206c9>] ? check_object+0x174/0x1ae
[<ffffffff81120a43>] ? check_slab+0xc7/0xd5
[<ffffffff813f42fe>] ? __alloc_skb+0x40/0x133
[<ffffffff813f42fe>] ? __alloc_skb+0x40/0x133
[<ffffffff814b7487>] kmalloc_large_node+0x56/0x95
[<ffffffff811235c1>] __kmalloc_node_track_caller+0x32/0x139
[<ffffffff81421b68>] ? netlink_ack+0x4a/0xe8
[<ffffffffa0500475>] ? ipq_rcv_skb+0x27/0x340 [ip_queue]
[<ffffffff813f4333>] __alloc_skb+0x75/0x133
[<ffffffff81421b68>] netlink_ack+0x4a/0xe8
[<ffffffffa050076a>] ipq_rcv_skb+0x31c/0x340 [ip_queue]
[<ffffffff8142174a>] netlink_unicast+0xec/0x156
[<ffffffff81421a33>] netlink_sendmsg+0x27f/0x2c0
[<ffffffff813ed76c>] __sock_sendmsg+0x69/0x75
[<ffffffff813ed834>] sock_aio_write+0xbc/0xcc
[<ffffffff8113242b>] do_sync_write+0xbf/0xff
[<ffffffff81206e18>] ? security_file_permission+0x2e/0x33
[<ffffffff81132861>] ? rw_verify_area+0xb6/0xd3
[<ffffffff81132b02>] vfs_write+0xb6/0xf6
[<ffffffff8113400b>] ? fget_light+0x3a/0xa1
[<ffffffff81132cf6>] sys_write+0x4d/0x74
[<ffffffff814c5d82>] system_call_fastpath+0x16/0x1b
---[ end trace cd56dc75cfeab436 ]---
^ permalink raw reply
* [PATCH] net:bna: fix compile warning of ‘bfa_ioc_smem_pgoff’ defined but not used
From: Shan Wei @ 2011-04-20 1:38 UTC (permalink / raw)
To: David Miller, netdev
Fix the below compile warning:
drivers/net/bna/bfa_ioc.c:1922: warning: ‘bfa_ioc_smem_pgoff’ defined but not used
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
---
drivers/net/bna/bfa_ioc.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bna/bfa_ioc.c b/drivers/net/bna/bfa_ioc.c
index ba2a4e1..fcb9bb3 100644
--- a/drivers/net/bna/bfa_ioc.c
+++ b/drivers/net/bna/bfa_ioc.c
@@ -82,7 +82,6 @@ static void bfa_ioc_pf_fwmismatch(struct bfa_ioc *ioc);
static void bfa_ioc_boot(struct bfa_ioc *ioc, u32 boot_type,
u32 boot_param);
static u32 bfa_ioc_smem_pgnum(struct bfa_ioc *ioc, u32 fmaddr);
-static u32 bfa_ioc_smem_pgoff(struct bfa_ioc *ioc, u32 fmaddr);
static void bfa_ioc_get_adapter_serial_num(struct bfa_ioc *ioc,
char *serial_num);
static void bfa_ioc_get_adapter_fw_ver(struct bfa_ioc *ioc,
@@ -1923,12 +1922,6 @@ bfa_ioc_smem_pgnum(struct bfa_ioc *ioc, u32 fmaddr)
return PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, fmaddr);
}
-static u32
-bfa_ioc_smem_pgoff(struct bfa_ioc *ioc, u32 fmaddr)
-{
- return PSS_SMEM_PGOFF(fmaddr);
-}
-
/**
* Register mailbox message handler function, to be called by common modules
*/
--
1.6.3.3
^ permalink raw reply related
* [PATCH] net: forcedeth: fix compile warning of not used nv_set_tso function
From: Shan Wei @ 2011-04-20 1:31 UTC (permalink / raw)
To: mirq-linux, David Miller, netdev
Fix the below compile warning:
drivers/net/forcedeth.c:4266: warning: ‘nv_set_tso’ defined but not used
commit 569e146 converts forcedeth driver to use hw_features.
So, implement function of .set_tso is abandoned.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
---
drivers/net/forcedeth.c | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index ec9a32d..0e1c76a 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -4263,16 +4263,6 @@ static int nv_nway_reset(struct net_device *dev)
return ret;
}
-static int nv_set_tso(struct net_device *dev, u32 value)
-{
- struct fe_priv *np = netdev_priv(dev);
-
- if ((np->driver_data & DEV_HAS_CHECKSUM))
- return ethtool_op_set_tso(dev, value);
- else
- return -EOPNOTSUPP;
-}
-
static void nv_get_ringparam(struct net_device *dev, struct ethtool_ringparam* ring)
{
struct fe_priv *np = netdev_priv(dev);
--
1.6.3.3
^ permalink raw reply related
* Re: [PATCH 3/3] IPVS: init and cleanup restructuring.
From: Julian Anastasov @ 2011-04-19 23:19 UTC (permalink / raw)
To: Hans Schillstrom
Cc: horms, ebiederm, lvs-devel, netdev, netfilter-devel,
hans.schillstrom
In-Reply-To: <1303226705-29178-3-git-send-email-hans@schillstrom.com>
Hello,
On Tue, 19 Apr 2011, Hans Schillstrom wrote:
> This patch tries to restore the initial init and cleanup
> sequences that was before name space patch.
>
> The number of calls to register_pernet_device have been
> reduced to one for the ip_vs.ko
> Schedulers still have their own calls.
>
> This patch adds a function __ip_vs_service_cleanup()
> and a throttle or actually on/off switch for
> the netfilter hooks.
>
> The nf hooks will be enabled when the first service is loaded
> and disabled when the last service is removed or when a
> name space exit starts.
For me using _net suffix is more clear compared
to __ prefix for the pernet methods.
For ip_vs_in: may be we can move the check here:
+ net = skb_net(skb);
+ if (net->ipvs->throttle)
+ return NF_ACCEPT;
ip_vs_fill_iphdr(af, skb_network_header(skb), &iph);
/* Bad... Do not break raw sockets */
It will save such checks later in ICMP funcs. But this
throttle idea looks dangerous for cleanup. It does not use RCU.
The readers can cache the 0 in throttle for long time.
May be by using register_pernet_device we are in list with other
devices and it is still possible some device used by
our dst_cache to be unregistered before IPVS or we to be
unregistered before such device and some race with throttle
to happen. throttle is good when enabling traffic with
the first virtual service, later it can slowly stop the traffic
but we can not rely on it during netns cleanup.
So, there are 2 problems with the devices:
- if we use _device pernet registration we can see packets
in our netns during cleanup. I assume this is possible
when IPVS is unregistered before such devices.
- dests can cache dst and to hold the device after it is
unregistered in netns, obviously for very short time until
IPVS is later unregistered from netns. And for long time
if device is unregistered but netns remains.
Also, in most of the cases svc->refcnt is above 0 because
dests can be in trash list. You should be lucky to delete the
service without any connections, only then ip_vs_svc_unhash can
see refcnt == 0.
So, may be we have to use register_pernet_subsys (not
_device). We need just to register notifier with
register_netdevice_notifier and to catch NETDEV_UNREGISTER,
so that if any dest uses this device we have to release the dst:
- lock mutex
- for every dest (also in trash):
spin_lock_bh(&dest->dst_lock);
if (dest->dst_cache && dest->dst_cache->dev == unregistered_dev)
ip_vs_dst_reset(dest);
spin_unlock_bh(&dest->dst_lock);
There are many examples for this, eg. net/core/fib_rules.c
Then we are sure on cleanup we can not see traffic for our net
because all devices are unregistered before us. We don't have
to rely on throttle to stop the traffic during cleanup. And
we do not hold devices after NETDEV_UNREGISTER.
I can prepare such patch but in next days. We need such
code anyways because the dests can hold such dsts when no
traffic is present and we can see again this "waiting for %s" ...
message.
throttle still can be used but now it can not stop
the traffic if connections exist.
For __ip_vs_service_cleanup: it still has to use mutex.
Or we can avoid it by introducing ip_vs_unlink_service_nolock:
ip_vs_flush will look like your __ip_vs_service_cleanup and
will call ip_vs_unlink_service_nolock. ip_vs_unlink_service_nolock
will be called by ip_vs_flush and by ip_vs_unlink_service.
You can try such changes, if not, I'll prepare some patches
after 2-3 days.
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply
* Re: [PATCH 3/3] IPVS: init and cleanup restructuring.
From: Simon Horman @ 2011-04-19 23:12 UTC (permalink / raw)
To: Hans Schillstrom
Cc: ja, ebiederm, lvs-devel, netdev, netfilter-devel,
hans.schillstrom
In-Reply-To: <1303226705-29178-3-git-send-email-hans@schillstrom.com>
On Tue, Apr 19, 2011 at 05:25:05PM +0200, Hans Schillstrom wrote:
> This patch tries to restore the initial init and cleanup
> sequences that was before name space patch.
>
> The number of calls to register_pernet_device have been
> reduced to one for the ip_vs.ko
> Schedulers still have their own calls.
>
> This patch adds a function __ip_vs_service_cleanup()
> and a throttle or actually on/off switch for
> the netfilter hooks.
>
> The nf hooks will be enabled when the first service is loaded
> and disabled when the last service is removed or when a
> name space exit starts.
>
> Signed-off-by: Hans Schillstrom <hans@schillstrom.com>
> ---
> include/net/ip_vs.h | 17 +++++++
> net/netfilter/ipvs/ip_vs_app.c | 15 +-----
> net/netfilter/ipvs/ip_vs_conn.c | 20 ++++----
> net/netfilter/ipvs/ip_vs_core.c | 86 ++++++++++++++++++++++++++++++++------
> net/netfilter/ipvs/ip_vs_ctl.c | 66 ++++++++++++++++++++++-------
> net/netfilter/ipvs/ip_vs_est.c | 14 +-----
> net/netfilter/ipvs/ip_vs_proto.c | 11 +----
> net/netfilter/ipvs/ip_vs_sync.c | 13 +----
> 8 files changed, 161 insertions(+), 81 deletions(-)
>
> diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
> index d516f00..558e490 100644
> --- a/include/net/ip_vs.h
> +++ b/include/net/ip_vs.h
> @@ -791,6 +791,7 @@ struct ip_vs_app {
> /* IPVS in network namespace */
> struct netns_ipvs {
> int gen; /* Generation */
> + int throttle; /* Instead of nf unreg */
perhaps enable or active would be names that fits better with the
schemantics used. Using a bool might also make things more obvious.
> /*
> * Hash table: for real service lookups
> */
> @@ -1089,6 +1090,22 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)
> atomic_inc(&ctl_cp->n_control);
> }
>
> +/*
> + * IPVS netns init & cleanup functions
> + */
> +extern int __ip_vs_estimator_init(struct net *net);
> +extern int __ip_vs_control_init(struct net *net);
> +extern int __ip_vs_protocol_init(struct net *net);
> +extern int __ip_vs_app_init(struct net *net);
> +extern int __ip_vs_conn_init(struct net *net);
> +extern int __ip_vs_sync_init(struct net *net);
> +extern void __ip_vs_conn_cleanup(struct net *net);
> +extern void __ip_vs_app_cleanup(struct net *net);
> +extern void __ip_vs_protocol_cleanup(struct net *net);
> +extern void __ip_vs_control_cleanup(struct net *net);
> +extern void __ip_vs_estimator_cleanup(struct net *net);
> +extern void __ip_vs_sync_cleanup(struct net *net);
> +extern void __ip_vs_service_cleanup(struct net *net);
>
> /*
> * IPVS application functions
> diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
> index 7e8e769..51f3af7 100644
> --- a/net/netfilter/ipvs/ip_vs_app.c
> +++ b/net/netfilter/ipvs/ip_vs_app.c
> @@ -576,7 +576,7 @@ static const struct file_operations ip_vs_app_fops = {
> };
> #endif
>
> -static int __net_init __ip_vs_app_init(struct net *net)
> +int __net_init __ip_vs_app_init(struct net *net)
> {
> struct netns_ipvs *ipvs = net_ipvs(net);
>
> @@ -585,26 +585,17 @@ static int __net_init __ip_vs_app_init(struct net *net)
> return 0;
> }
>
> -static void __net_exit __ip_vs_app_cleanup(struct net *net)
> +void __net_exit __ip_vs_app_cleanup(struct net *net)
> {
> proc_net_remove(net, "ip_vs_app");
> }
>
> -static struct pernet_operations ip_vs_app_ops = {
> - .init = __ip_vs_app_init,
> - .exit = __ip_vs_app_cleanup,
> -};
> -
> int __init ip_vs_app_init(void)
> {
> - int rv;
> -
> - rv = register_pernet_device(&ip_vs_app_ops);
> - return rv;
> + return 0;
> }
>
>
> void ip_vs_app_cleanup(void)
> {
> - unregister_pernet_device(&ip_vs_app_ops);
> }
Can we just remove ip_vs_app_init() and ip_vs_app_cleanup() as
they no longer do anything? Likewise with other init and cleanup
functions below.
> diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
> index 36cd5ea..f8d6702 100644
> --- a/net/netfilter/ipvs/ip_vs_conn.c
> +++ b/net/netfilter/ipvs/ip_vs_conn.c
> @@ -1251,30 +1251,30 @@ int __net_init __ip_vs_conn_init(struct net *net)
> {
> struct netns_ipvs *ipvs = net_ipvs(net);
>
> + EnterFunction(2);
> atomic_set(&ipvs->conn_count, 0);
>
> proc_net_fops_create(net, "ip_vs_conn", 0, &ip_vs_conn_fops);
> proc_net_fops_create(net, "ip_vs_conn_sync", 0, &ip_vs_conn_sync_fops);
> + LeaveFunction(2);
> return 0;
> }
Does adding these EnterFunction() and LeaveFunction() calls
restore some previous behaviour? If not, I think they should at the very
least be in a separate patch. Likewise for similar changes below.
>
> -static void __net_exit __ip_vs_conn_cleanup(struct net *net)
> +void __net_exit __ip_vs_conn_cleanup(struct net *net)
> {
> + EnterFunction(2);
> /* flush all the connection entries first */
> ip_vs_conn_flush(net);
> proc_net_remove(net, "ip_vs_conn");
> proc_net_remove(net, "ip_vs_conn_sync");
> + LeaveFunction(2);
> }
> -static struct pernet_operations ipvs_conn_ops = {
> - .init = __ip_vs_conn_init,
> - .exit = __ip_vs_conn_cleanup,
> -};
>
> int __init ip_vs_conn_init(void)
> {
> int idx;
> - int retc;
>
> + EnterFunction(2);
> /* Compute size and mask */
> ip_vs_conn_tab_size = 1 << ip_vs_conn_tab_bits;
> ip_vs_conn_tab_mask = ip_vs_conn_tab_size - 1;
> @@ -1309,18 +1309,18 @@ int __init ip_vs_conn_init(void)
> rwlock_init(&__ip_vs_conntbl_lock_array[idx].l);
> }
>
> - retc = register_pernet_device(&ipvs_conn_ops);
> -
> /* calculate the random value for connection hash */
> get_random_bytes(&ip_vs_conn_rnd, sizeof(ip_vs_conn_rnd));
> + LeaveFunction(2);
>
> - return retc;
> + return 0;
> }
>
> void ip_vs_conn_cleanup(void)
> {
> - unregister_pernet_device(&ipvs_conn_ops);
> + EnterFunction(2);
> /* Release the empty cache */
> kmem_cache_destroy(ip_vs_conn_cachep);
> vfree(ip_vs_conn_tab);
> + LeaveFunction(2);
> }
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index a7bb81d..dc27fdf 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -1343,6 +1343,10 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum)
> return NF_ACCEPT; /* The packet looks wrong, ignore */
>
> net = skb_net(skb);
> + /* Name space in use ? */
> + if (net->ipvs->throttle)
> + return NF_ACCEPT;
> +
> pd = ip_vs_proto_data_get(net, cih->protocol);
> if (!pd)
> return NF_ACCEPT;
> @@ -1563,6 +1567,8 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
> }
>
> net = skb_net(skb);
> + if (net->ipvs->throttle)
> + return NF_ACCEPT;
> /* Protocol supported? */
> pd = ip_vs_proto_data_get(net, iph.protocol);
> if (unlikely(!pd))
> @@ -1588,7 +1594,6 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
> }
>
> IP_VS_DBG_PKT(11, af, pp, skb, 0, "Incoming packet");
> - net = skb_net(skb);
> ipvs = net_ipvs(net);
> /* Check the server status */
> if (cp->dest && !(cp->dest->flags & IP_VS_DEST_F_AVAILABLE)) {
> @@ -1879,24 +1884,73 @@ static int __net_init __ip_vs_init(struct net *net)
> {
> struct netns_ipvs *ipvs;
>
> + EnterFunction(2);
> ipvs = net_generic(net, ip_vs_net_id);
> if (ipvs == NULL) {
> pr_err("%s(): no memory.\n", __func__);
> return -ENOMEM;
> }
> + /* Hold the beast until a service is registerd */
> + ipvs->throttle = -1;
> ipvs->net = net;
> /* Counters used for creating unique names */
> ipvs->gen = atomic_read(&ipvs_netns_cnt);
> atomic_inc(&ipvs_netns_cnt);
> net->ipvs = ipvs;
> +
> + if ( __ip_vs_estimator_init(net) < 0)
> + goto estimator_fail;
> +
> + if (__ip_vs_control_init(net) < 0)
> + goto control_fail;
> +
> + if (__ip_vs_protocol_init(net) < 0)
> + goto protocol_fail;
> +
> + if (__ip_vs_app_init(net) < 0)
> + goto app_fail;
> +
> + if (__ip_vs_conn_init(net) < 0)
> + goto conn_fail;
> +
> + if (__ip_vs_sync_init(net) < 0)
> + goto sync_fail;
> +
> + LeaveFunction(2);
> printk(KERN_INFO "IPVS: Creating netns size=%zu id=%d\n",
> sizeof(struct netns_ipvs), ipvs->gen);
> return 0;
> +/*
> + * Error handling
> + */
> +
> +sync_fail:
> + __ip_vs_conn_cleanup(net);
> +conn_fail:
> + __ip_vs_app_cleanup(net);
> +app_fail:
> + __ip_vs_protocol_cleanup(net);
> +protocol_fail:
> + __ip_vs_control_cleanup(net);
> +control_fail:
> + __ip_vs_estimator_cleanup(net);
> +estimator_fail:
> + return -ENOMEM;
> }
>
> static void __net_exit __ip_vs_cleanup(struct net *net)
> {
> - IP_VS_DBG(10, "ipvs netns %d released\n", net_ipvs(net)->gen);
> + net->ipvs->throttle = -1;
> + EnterFunction(2);
> + __ip_vs_sync_cleanup(net);
> + __ip_vs_service_cleanup(net); /* ip_vs_flush() with locks */
> + __ip_vs_conn_cleanup(net);
> + __ip_vs_app_cleanup(net);
> + __ip_vs_protocol_cleanup(net);
> + __ip_vs_control_cleanup(net);
> + __ip_vs_estimator_cleanup(net);
> + LeaveFunction(2);
> + IP_VS_DBG(2, "ipvs netns %d released\n", net_ipvs(net)->gen);
> }
>
> static struct pernet_operations ipvs_core_ops = {
> @@ -1913,10 +1967,7 @@ static int __init ip_vs_init(void)
> {
> int ret;
>
> - ret = register_pernet_device(&ipvs_core_ops); /* Alloc ip_vs struct */
> - if (ret < 0)
> - return ret;
> -
> + EnterFunction(2);
> ip_vs_estimator_init();
> ret = ip_vs_control_init();
> if (ret < 0) {
> @@ -1944,41 +1995,50 @@ static int __init ip_vs_init(void)
> goto cleanup_conn;
> }
>
> + ret = register_pernet_device(&ipvs_core_ops); /* Alloc ip_vs struct */
> + if (ret < 0)
> + goto cleanup_sync;
> +
> ret = nf_register_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
> if (ret < 0) {
> pr_err("can't register hooks.\n");
> - goto cleanup_sync;
> + goto cleanup_net;
> }
>
> pr_info("ipvs loaded.\n");
> + LeaveFunction(2);
> +
> return ret;
>
> +cleanup_net:
> + unregister_pernet_device(&ipvs_core_ops); /* free ip_vs struct */
> cleanup_sync:
> ip_vs_sync_cleanup();
> - cleanup_conn:
> +cleanup_conn:
> ip_vs_conn_cleanup();
> - cleanup_app:
> +cleanup_app:
> ip_vs_app_cleanup();
> - cleanup_protocol:
> +cleanup_protocol:
> ip_vs_protocol_cleanup();
> ip_vs_control_cleanup();
> - cleanup_estimator:
> +cleanup_estimator:
> ip_vs_estimator_cleanup();
> - unregister_pernet_device(&ipvs_core_ops); /* free ip_vs struct */
> return ret;
While I do prefer labels to be in column 0, putting those changes
here is rather a lot of noise. Could you put them in a separate patch?
> }
>
> static void __exit ip_vs_cleanup(void)
> {
> + EnterFunction(2);
> nf_unregister_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
> + unregister_pernet_device(&ipvs_core_ops); /* free ip_vs struct */
> ip_vs_sync_cleanup();
> ip_vs_conn_cleanup();
> ip_vs_app_cleanup();
> ip_vs_protocol_cleanup();
> ip_vs_control_cleanup();
> ip_vs_estimator_cleanup();
> - unregister_pernet_device(&ipvs_core_ops); /* free ip_vs struct */
> pr_info("ipvs unloaded.\n");
> + LeaveFunction(2);
> }
>
> module_init(ip_vs_init);
> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
> index 08715d8..6534ca3 100644
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@ -69,6 +69,11 @@ int ip_vs_get_debug_level(void)
> }
> #endif
>
> +
> +/* Protos */
> +static void __ip_vs_del_service(struct ip_vs_service *svc);
> +
> +
> #ifdef CONFIG_IP_VS_IPV6
> /* Taken from rt6_fill_node() in net/ipv6/route.c, is there a better way? */
> static int __ip_vs_addr_is_local_v6(struct net *net,
> @@ -345,6 +350,9 @@ static int ip_vs_svc_unhash(struct ip_vs_service *svc)
>
> svc->flags &= ~IP_VS_SVC_F_HASHED;
> atomic_dec(&svc->refcnt);
> + /* No more services then no need for input */
> + if (atomic_read(&svc->refcnt) == 0)
> + svc->net->ipvs->throttle = -1;
> return 1;
> }
>
> @@ -480,7 +488,6 @@ __ip_vs_unbind_svc(struct ip_vs_dest *dest)
> }
> }
>
> -
I don't think this hunk is appropriate for this patch.
> /*
> * Returns hash value for real service
> */
> @@ -1214,6 +1221,8 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u,
> write_unlock_bh(&__ip_vs_svc_lock);
>
> *svc_p = svc;
> + /* Now whe have a service - full throttle */
> + ipvs->throttle = 0;
> return 0;
>
>
> @@ -1472,6 +1481,41 @@ static int ip_vs_flush(struct net *net)
> return 0;
> }
>
> +/*
> + * Delete service by {netns} in the service table.
> + * Called by __ip_vs_cleanup()
> + */
> +void __ip_vs_service_cleanup(struct net *net)
> +{
> + unsigned hash;
> + struct ip_vs_service *svc, *tmp;
> +
> + EnterFunction(2);
> + /* Check for "full" addressed entries */
> + for (hash = 0; hash<IP_VS_SVC_TAB_SIZE; hash++) {
A space is needed on either side of '<'
> + write_lock_bh(&__ip_vs_svc_lock);
> + list_for_each_entry_safe(svc, tmp, &ip_vs_svc_table[hash],
> + s_list) {
> + if (net_eq(svc->net, net)) {
> + ip_vs_svc_unhash(svc);
> + /* Wait until all the svc users go away. */
> + IP_VS_WAIT_WHILE(atomic_read(&svc->usecnt) > 0);
> + __ip_vs_del_service(svc);
> + }
> + }
> + list_for_each_entry_safe(svc, tmp, &ip_vs_svc_fwm_table[hash],
> + f_list) {
> + if (net_eq(svc->net, net)) {
> + ip_vs_svc_unhash(svc);
> + /* Wait until all the svc users go away. */
> + IP_VS_WAIT_WHILE(atomic_read(&svc->usecnt) > 0);
> + __ip_vs_del_service(svc);
> + }
> + }
> + write_unlock_bh(&__ip_vs_svc_lock);
> + }
> + LeaveFunction(2);
> +}
>
> /*
> * Zero counters in a service or all services
> @@ -3593,6 +3637,7 @@ int __net_init __ip_vs_control_init(struct net *net)
> int idx;
> struct netns_ipvs *ipvs = net_ipvs(net);
>
> + EnterFunction(2);
> ipvs->rs_lock = __RW_LOCK_UNLOCKED(ipvs->rs_lock);
>
> /* Initialize rs_table */
> @@ -3619,6 +3664,7 @@ int __net_init __ip_vs_control_init(struct net *net)
> if (__ip_vs_control_init_sysctl(net))
> goto err;
>
> + LeaveFunction(2);
> return 0;
>
> err:
> @@ -3626,10 +3672,11 @@ err:
> return -ENOMEM;
> }
>
> -static void __net_exit __ip_vs_control_cleanup(struct net *net)
> +void __net_exit __ip_vs_control_cleanup(struct net *net)
> {
> struct netns_ipvs *ipvs = net_ipvs(net);
>
> + EnterFunction(2);
> ip_vs_trash_cleanup(net);
> ip_vs_stop_estimator(net, &ipvs->tot_stats);
> __ip_vs_control_cleanup_sysctl(net);
> @@ -3637,13 +3684,9 @@ static void __net_exit __ip_vs_control_cleanup(struct net *net)
> proc_net_remove(net, "ip_vs_stats");
> proc_net_remove(net, "ip_vs");
> free_percpu(ipvs->tot_stats.cpustats);
> + LeaveFunction(2);
> }
>
> -static struct pernet_operations ipvs_control_ops = {
> - .init = __ip_vs_control_init,
> - .exit = __ip_vs_control_cleanup,
> -};
> -
> int __init ip_vs_control_init(void)
> {
> int idx;
> @@ -3657,12 +3700,6 @@ int __init ip_vs_control_init(void)
> INIT_LIST_HEAD(&ip_vs_svc_fwm_table[idx]);
> }
>
> - ret = register_pernet_device(&ipvs_control_ops);
> - if (ret) {
> - pr_err("cannot register namespace.\n");
> - goto err;
> - }
> -
> smp_wmb(); /* Do we really need it now ? */
>
> ret = nf_register_sockopt(&ip_vs_sockopts);
> @@ -3682,8 +3719,6 @@ int __init ip_vs_control_init(void)
> return 0;
>
> err_net:
> - unregister_pernet_device(&ipvs_control_ops);
> -err:
> return ret;
> }
>
> @@ -3691,7 +3726,6 @@ err:
> void ip_vs_control_cleanup(void)
> {
> EnterFunction(2);
> - unregister_pernet_device(&ipvs_control_ops);
> ip_vs_genl_unregister();
> nf_unregister_sockopt(&ip_vs_sockopts);
> LeaveFunction(2);
> diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
> index 759163e..508cce9 100644
> --- a/net/netfilter/ipvs/ip_vs_est.c
> +++ b/net/netfilter/ipvs/ip_vs_est.c
> @@ -192,7 +192,7 @@ void ip_vs_read_estimator(struct ip_vs_stats_user *dst,
> dst->outbps = (e->outbps + 0xF) >> 5;
> }
>
> -static int __net_init __ip_vs_estimator_init(struct net *net)
> +int __net_init __ip_vs_estimator_init(struct net *net)
> {
> struct netns_ipvs *ipvs = net_ipvs(net);
>
> @@ -203,24 +203,16 @@ static int __net_init __ip_vs_estimator_init(struct net *net)
> return 0;
> }
>
> -static void __net_exit __ip_vs_estimator_exit(struct net *net)
> +void __net_exit __ip_vs_estimator_cleanup(struct net *net)
> {
> del_timer_sync(&net_ipvs(net)->est_timer);
> }
> -static struct pernet_operations ip_vs_app_ops = {
> - .init = __ip_vs_estimator_init,
> - .exit = __ip_vs_estimator_exit,
> -};
>
> int __init ip_vs_estimator_init(void)
> {
> - int rv;
> -
> - rv = register_pernet_device(&ip_vs_app_ops);
> - return rv;
> + return 0;
> }
>
> void ip_vs_estimator_cleanup(void)
> {
> - unregister_pernet_device(&ip_vs_app_ops);
> }
> diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
> index f7021fc..eb86028 100644
> --- a/net/netfilter/ipvs/ip_vs_proto.c
> +++ b/net/netfilter/ipvs/ip_vs_proto.c
> @@ -316,7 +316,7 @@ ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp,
> /*
> * per network name-space init
> */
> -static int __net_init __ip_vs_protocol_init(struct net *net)
> +int __net_init __ip_vs_protocol_init(struct net *net)
> {
> #ifdef CONFIG_IP_VS_PROTO_TCP
> register_ip_vs_proto_netns(net, &ip_vs_protocol_tcp);
> @@ -336,7 +336,7 @@ static int __net_init __ip_vs_protocol_init(struct net *net)
> return 0;
> }
>
> -static void __net_exit __ip_vs_protocol_cleanup(struct net *net)
> +void __net_exit __ip_vs_protocol_cleanup(struct net *net)
> {
> struct netns_ipvs *ipvs = net_ipvs(net);
> struct ip_vs_proto_data *pd;
> @@ -349,11 +349,6 @@ static void __net_exit __ip_vs_protocol_cleanup(struct net *net)
> }
> }
>
> -static struct pernet_operations ipvs_proto_ops = {
> - .init = __ip_vs_protocol_init,
> - .exit = __ip_vs_protocol_cleanup,
> -};
> -
> int __init ip_vs_protocol_init(void)
> {
> char protocols[64];
> @@ -382,7 +377,6 @@ int __init ip_vs_protocol_init(void)
> REGISTER_PROTOCOL(&ip_vs_protocol_esp);
> #endif
> pr_info("Registered protocols (%s)\n", &protocols[2]);
> - return register_pernet_device(&ipvs_proto_ops);
>
> return 0;
> }
> @@ -393,7 +387,6 @@ void ip_vs_protocol_cleanup(void)
> struct ip_vs_protocol *pp;
> int i;
>
> - unregister_pernet_device(&ipvs_proto_ops);
> /* unregister all the ipvs protocols */
> for (i = 0; i < IP_VS_PROTO_TAB_SIZE; i++) {
> while ((pp = ip_vs_proto_table[i]) != NULL)
> diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
> index 1aeca1d..e911f03 100644
> --- a/net/netfilter/ipvs/ip_vs_sync.c
> +++ b/net/netfilter/ipvs/ip_vs_sync.c
> @@ -1664,7 +1664,7 @@ int stop_sync_thread(struct net *net, int state)
> /*
> * Initialize data struct for each netns
> */
> -static int __net_init __ip_vs_sync_init(struct net *net)
> +int __net_init __ip_vs_sync_init(struct net *net)
> {
> struct netns_ipvs *ipvs = net_ipvs(net);
>
> @@ -1678,24 +1678,17 @@ static int __net_init __ip_vs_sync_init(struct net *net)
> return 0;
> }
>
> -static void __ip_vs_sync_cleanup(struct net *net)
> +void __ip_vs_sync_cleanup(struct net *net)
> {
> stop_sync_thread(net, IP_VS_STATE_MASTER);
> stop_sync_thread(net, IP_VS_STATE_BACKUP);
> }
>
> -static struct pernet_operations ipvs_sync_ops = {
> - .init = __ip_vs_sync_init,
> - .exit = __ip_vs_sync_cleanup,
> -};
> -
> -
> int __init ip_vs_sync_init(void)
> {
> - return register_pernet_device(&ipvs_sync_ops);
> + return 0;
> }
>
> void ip_vs_sync_cleanup(void)
> {
> - unregister_pernet_device(&ipvs_sync_ops);
> }
> --
> 1.7.2.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* [PATCH net-next 4/5] be2net: pass domain id to be_cmd_link_status_query
From: Ajit Khaparde @ 2011-04-19 22:11 UTC (permalink / raw)
To: davem; +Cc: netdev
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
---
drivers/net/benet/be_cmds.c | 2 +-
drivers/net/benet/be_cmds.h | 2 +-
drivers/net/benet/be_ethtool.c | 4 ++--
drivers/net/benet/be_main.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index a94e980..af8cf3d 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1112,7 +1112,7 @@ err:
/* Uses synchronous mcc */
int be_cmd_link_status_query(struct be_adapter *adapter,
- bool *link_up, u8 *mac_speed, u16 *link_speed)
+ bool *link_up, u8 *mac_speed, u16 *link_speed, u32 dom)
{
struct be_mcc_wrb *wrb;
struct be_cmd_req_link_status *req;
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index 3fb6e0a..af4bbff 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -1112,7 +1112,7 @@ extern int be_cmd_rxq_create(struct be_adapter *adapter,
extern int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,
int type);
extern int be_cmd_link_status_query(struct be_adapter *adapter,
- bool *link_up, u8 *mac_speed, u16 *link_speed);
+ bool *link_up, u8 *mac_speed, u16 *link_speed, u32 dom);
extern int be_cmd_reset(struct be_adapter *adapter);
extern int be_cmd_get_stats(struct be_adapter *adapter,
struct be_dma_mem *nonemb_cmd);
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 33c2bec..6565f3e 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -376,7 +376,7 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
if ((adapter->link_speed < 0) || (!(netdev->flags & IFF_UP))) {
status = be_cmd_link_status_query(adapter, &link_up,
- &mac_speed, &link_speed);
+ &mac_speed, &link_speed, 0);
be_link_status_update(adapter, link_up);
/* link_speed is in units of 10 Mbps */
@@ -661,7 +661,7 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
}
if (be_cmd_link_status_query(adapter, &link_up, &mac_speed,
- &qos_link_speed) != 0) {
+ &qos_link_speed, 0) != 0) {
test->flags |= ETH_TEST_FL_FAILED;
data[4] = -1;
} else if (!mac_speed) {
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 1bb763c..77a6e7e 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -2171,7 +2171,7 @@ static int be_open(struct net_device *netdev)
be_async_mcc_enable(adapter);
status = be_cmd_link_status_query(adapter, &link_up, &mac_speed,
- &link_speed);
+ &link_speed, 0);
if (status)
goto err;
be_link_status_update(adapter, link_up);
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 5/5] be2net: add code to display default value of tx rate for VFs
From: Ajit Khaparde @ 2011-04-19 22:11 UTC (permalink / raw)
To: davem; +Cc: netdev
This change will allow the default value of tx rate to be displayed
when ip link show is called on a PF interface.
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
---
drivers/net/benet/be_main.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 77a6e7e..3529400 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -3082,9 +3082,22 @@ static int __devinit be_probe(struct pci_dev *pdev,
netif_carrier_off(netdev);
if (be_physfn(adapter) && adapter->sriov_enabled) {
+ u8 mac_speed;
+ bool link_up;
+ u16 vf, lnk_speed;
+
status = be_vf_eth_addr_config(adapter);
if (status)
goto unreg_netdev;
+
+ for (vf = 0; vf < num_vfs; vf++) {
+ status = be_cmd_link_status_query(adapter, &link_up,
+ &mac_speed, &lnk_speed, vf + 1);
+ if (!status)
+ adapter->vf_cfg[vf].vf_tx_rate = lnk_speed * 10;
+ else
+ goto unreg_netdev;
+ }
}
dev_info(&pdev->dev, "%s port %d\n", nic_name(pdev), adapter->port_num);
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 3/5] be2net: fix be_mcc_compl_process to identify eth_get_stat command
From: Ajit Khaparde @ 2011-04-19 22:11 UTC (permalink / raw)
To: davem; +Cc: netdev
eth_get_statistics and vlan_config command have same opcode.
Use opcode subsystem id to differentiate one from other.
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
---
drivers/net/benet/be_cmds.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 11b774a..a94e980 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -78,7 +78,8 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
}
if (compl_status == MCC_STATUS_SUCCESS) {
- if (compl->tag0 == OPCODE_ETH_GET_STATISTICS) {
+ if ((compl->tag0 == OPCODE_ETH_GET_STATISTICS) &&
+ (compl->tag1 == CMD_SUBSYSTEM_ETH)) {
struct be_cmd_resp_get_stats *resp =
adapter->stats_cmd.va;
be_dws_le_to_cpu(&resp->hw_stats,
@@ -1096,6 +1097,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH,
OPCODE_ETH_GET_STATISTICS, sizeof(*req));
+ wrb->tag1 = CMD_SUBSYSTEM_ETH;
sge->pa_hi = cpu_to_le32(upper_32_bits(nonemb_cmd->dma));
sge->pa_lo = cpu_to_le32(nonemb_cmd->dma & 0xFFFFFFFF);
sge->len = cpu_to_le32(nonemb_cmd->size);
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 2/5] be2net: Add code to display nic speeds other than 1Gbps/10Gbps
From: Ajit Khaparde @ 2011-04-19 22:10 UTC (permalink / raw)
To: davem; +Cc: netdev
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
---
drivers/net/benet/be_ethtool.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 22523b9..33c2bec 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -384,12 +384,21 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
ecmd->speed = link_speed*10;
} else {
switch (mac_speed) {
+ case PHY_LINK_SPEED_10MBPS:
+ ecmd->speed = SPEED_10;
+ break;
+ case PHY_LINK_SPEED_100MBPS:
+ ecmd->speed = SPEED_100;
+ break;
case PHY_LINK_SPEED_1GBPS:
ecmd->speed = SPEED_1000;
break;
case PHY_LINK_SPEED_10GBPS:
ecmd->speed = SPEED_10000;
break;
+ case PHY_LINK_SPEED_ZERO:
+ ecmd->speed = 0;
+ break;
}
}
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 1/5] be2net: allow register dump only for PFs
From: Ajit Khaparde @ 2011-04-19 22:10 UTC (permalink / raw)
To: davem; +Cc: netdev
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
---
drivers/net/benet/be_ethtool.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 28716a6..22523b9 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -161,7 +161,9 @@ be_get_reg_len(struct net_device *netdev)
struct be_adapter *adapter = netdev_priv(netdev);
u32 log_size = 0;
- be_cmd_get_reg_len(adapter, &log_size);
+ if (be_physfn(adapter))
+ be_cmd_get_reg_len(adapter, &log_size);
+
return log_size;
}
@@ -170,8 +172,10 @@ be_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *buf)
{
struct be_adapter *adapter = netdev_priv(netdev);
- memset(buf, 0, regs->len);
- be_cmd_get_regs(adapter, regs->len, buf);
+ if (be_physfn(adapter)) {
+ memset(buf, 0, regs->len);
+ be_cmd_get_regs(adapter, regs->len, buf);
+ }
}
static int
--
1.7.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox