OpenVZ Forum: Devel » [PATCH v2 00/15] Lockd: grace period containerization

Home » Mailing lists » Devel » [PATCH v2 00/15] Lockd: grace period containerization

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

[PATCH v2 03/15] LockD: manage garbage collection timeout per networks namespace [message #47248 is a reply to message #47241]

Wed, 25 July 2012 12:56

Stanislav Kinsbursky is currently offline

Stanislav Kinsbursky
Messages: 683
Registered: October 2011

Senior Member

This patch moves next_gc to per-net data.

Note: passed network can be NULL (when Lockd kthread is exiting of Lockd
module is removing).

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
fs/lockd/host.c | 12 +++++++++---
fs/lockd/netns.h | 1 +
2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 991274a..3636734 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -21,6 +21,8 @@

#include <net/ipv6.h>

+#include "netns.h"
+
#define NLMDBG_FACILITY NLMDBG_HOSTCACHE
#define NLM_HOST_NRHASH 32
#define NLM_HOST_REBIND (60 * HZ)
@@ -41,7 +43,6 @@ static struct hlist_head nlm_client_hosts[NLM_HOST_NRHASH];
hlist_for_each_entry_safe((host), (pos), (next), \
(chain), h_hash)

-static unsigned long next_gc;
static unsigned long nrhosts;
static DEFINE_MUTEX(nlm_host_mutex);

@@ -337,6 +338,7 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
.hostname_len = hostname_len,
.net = net,
};
+ struct lockd_net *ln = net_generic(net, lockd_net_id);

dprintk("lockd: %s(host='%*s', vers=%u, proto=%s)\n", __func__,
(int)hostname_len, hostname, rqstp->rq_vers,
@@ -344,7 +346,7 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,

mutex_lock(&nlm_host_mutex);

- if (time_after_eq(jiffies, next_gc))
+ if (time_after_eq(jiffies, ln->next_gc))
nlm_gc_hosts(net);

chain = &nlm_server_hosts[nlm_hash_address(ni.sap)];
@@ -653,5 +655,9 @@ nlm_gc_hosts(struct net *net)
nlm_destroy_host_locked(host);
}

- next_gc = jiffies + NLM_HOST_COLLECT;
+ if (net) {
+ struct lockd_net *ln = net_generic(net, lockd_net_id);
+
+ ln->next_gc = jiffies + NLM_HOST_COLLECT;
+ }
}
diff --git a/fs/lockd/netns.h b/fs/lockd/netns.h
index ce227e0..97c6c77 100644
--- a/fs/lockd/netns.h
+++ b/fs/lockd/netns.h
@@ -5,6 +5,7 @@

struct lockd_net {
unsigned int nlmsvc_users;
+ unsigned long next_gc;
};

extern int lockd_net_id;

Report message to a moderator

[Message index]

		[PATCH v2 00/15] Lockd: grace period containerization By: Stanislav Kinsbursky on Wed, 25 July 2012 12:55
		[PATCH v2 01/15] LockD: mark host per network namespace on garbage collect By: Stanislav Kinsbursky on Wed, 25 July 2012 12:55
		[PATCH v2 07/15] LockD: manage grace period per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 10/15] SUNRPC: service request network namespace helper introduced By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 11/15] LockD: manage grace list per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 02/15] LockD: make garbage collector network namespace aware. By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 06/15] Lockd: add more debug to host shutdown functions By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 03/15] LockD: manage garbage collection timeout per networks namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 05/15] Lockd: host complaining function introduced By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 04/15] LockD: manage used host count per networks namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 08/15] LockD: make lockd manager allocated per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 14/15] NFSd: make grace end flag per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 09/15] NFSd: make nfsd4_manager allocated per network namespace context. By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		Re: [PATCH v2 09/15] NFSd: make nfsd4_manager allocated per network namespace context. By: bfields on Fri, 27 July 2012 21:46
		[PATCH v2 15/15] NFSd: make boot_time variable per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 13/15] Lockd: move grace period management from lockd() to per-net functions By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 12/15] LockD: pass actual network namespace to grace period management functions By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		Re: [PATCH v2 00/15] Lockd: grace period containerization By: bfields on Fri, 27 July 2012 21:54
		Re: [PATCH v2 00/15] Lockd: grace period containerization By: Stanislav Kinsbursky on Mon, 30 July 2012 10:03
		Re: [PATCH v2 00/15] Lockd: grace period containerization By: bfields on Tue, 31 July 2012 14:19
		Re: [PATCH v2 00/15] Lockd: grace period containerization By: Stanislav Kinsbursky on Tue, 31 July 2012 14:26

Previous Topic:	SUNRPC lients: Pipefs mount races
Next Topic:	[PATCH 00/10] memcg kmem limitation - slab.

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

]

Current Time: Sun Jul 20 13:18:56 GMT 2025

Total time taken to generate the page: 0.06682 seconds