#ifndef __KERNEL__
#include <liblustre.h>
+#else
+#include <libcfs/libcfs.h>
#endif
#include <obd_support.h>
void sptlrpc_gc_add_sec(struct ptlrpc_sec *sec)
{
- if (!list_empty(&sec->ps_gc_list)) {
- CERROR("sec %p(%s) already in gc list\n",
- sec, sec->ps_policy->sp_name);
- return;
- }
+ LASSERT(sec->ps_policy->sp_cops->gc_ctx);
+ LASSERT(sec->ps_gc_interval > 0);
+ LASSERT(list_empty(&sec->ps_gc_list));
+
+ sec->ps_gc_next = cfs_time_current_sec() + sec->ps_gc_interval;
spin_lock(&sec_gc_list_lock);
list_add_tail(&sec_gc_list, &sec->ps_gc_list);
might_sleep();
+ /* signal before list_del to make iteration in gc thread safe */
+ atomic_inc(&sec_gc_wait_del);
+
spin_lock(&sec_gc_list_lock);
list_del_init(&sec->ps_gc_list);
spin_unlock(&sec_gc_list_lock);
/* barrier */
- atomic_inc(&sec_gc_wait_del);
mutex_down(&sec_gc_mutex);
mutex_up(&sec_gc_mutex);
+
atomic_dec(&sec_gc_wait_del);
CDEBUG(D_SEC, "del sec %p(%s)\n", sec, sec->ps_policy->sp_name);
{
struct ptlrpc_cli_ctx *ctx;
-again:
spin_lock(&sec_gc_ctx_list_lock);
- if (!list_empty(&sec_gc_ctx_list)) {
+
+ while (!list_empty(&sec_gc_ctx_list)) {
ctx = list_entry(sec_gc_ctx_list.next,
struct ptlrpc_cli_ctx, cc_gc_chain);
list_del_init(&ctx->cc_gc_chain);
ctx, ctx->cc_vcred.vc_uid, sec2target_str(ctx->cc_sec));
sptlrpc_cli_ctx_put(ctx, 1);
- goto again;
+ spin_lock(&sec_gc_ctx_list_lock);
}
+
spin_unlock(&sec_gc_ctx_list_lock);
}
static void sec_do_gc(struct ptlrpc_sec *sec)
{
- cfs_time_t now = cfs_time_current_sec();
+ LASSERT(sec->ps_policy->sp_cops->gc_ctx);
if (unlikely(sec->ps_gc_next == 0)) {
CWARN("sec %p(%s) has 0 gc time\n",
return;
}
- if (unlikely(sec->ps_policy->sp_cops->gc_ctx == NULL)) {
- CWARN("sec %p(%s) is not prepared for gc\n",
- sec, sec->ps_policy->sp_name);
- return;
- }
-
CDEBUG(D_SEC, "check on sec %p(%s)\n", sec, sec->ps_policy->sp_name);
- if (time_after(sec->ps_gc_next, now))
+ if (cfs_time_after(sec->ps_gc_next, cfs_time_current_sec()))
return;
sec->ps_policy->sp_cops->gc_ctx(sec);
- sec->ps_gc_next = now + sec->ps_gc_interval;
+ sec->ps_gc_next = cfs_time_current_sec() + sec->ps_gc_interval;
}
static int sec_gc_main(void *arg)
struct ptlrpc_thread *thread = (struct ptlrpc_thread *) arg;
struct l_wait_info lwi;
- cfs_daemonize("sptlrpc_ctx_gc");
+ cfs_daemonize("sptlrpc_gc");
/* Record that the thread is running */
thread->t_flags = SVC_RUNNING;
cfs_waitq_signal(&thread->t_ctl_waitq);
while (1) {
- struct ptlrpc_sec *sec, *next;
+ struct ptlrpc_sec *sec;
thread->t_flags &= ~SVC_SIGNAL;
sec_process_ctx_list();
again:
+ /* go through sec list do gc.
+ * FIXME here we iterate through the whole list each time which
+ * is not optimal. we perhaps want to use balanced binary tree
+ * to trace each sec as order of expiry time.
+ * another issue here is we wakeup as fixed interval instead of
+ * according to each sec's expiry time */
mutex_down(&sec_gc_mutex);
- list_for_each_entry_safe(sec, next, &sec_gc_list, ps_gc_list) {
- /*
- * if someone is waiting to be deleted, let it
- * proceed as soon as possible.
- */
+ list_for_each_entry(sec, &sec_gc_list, ps_gc_list) {
+ /* if someone is waiting to be deleted, let it
+ * proceed as soon as possible. */
if (atomic_read(&sec_gc_wait_del)) {
- CWARN("deletion pending, retry\n");
+ CWARN("deletion pending, start over\n");
mutex_up(&sec_gc_mutex);
goto again;
}
}
mutex_up(&sec_gc_mutex);
+ /* check ctx list again before sleep */
+ sec_process_ctx_list();
+
lwi = LWI_TIMEOUT(SEC_GC_INTERVAL * HZ, NULL, NULL);
l_wait_event(thread->t_ctl_waitq,
thread->t_flags & (SVC_STOPPING | SVC_SIGNAL),