X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fgss%2Fgss_svc_upcall.c;h=245e0e7528c64138c05b428821143f0cd40c3683;hb=0c06af45b0c49955a5928eb92f13621919a223d0;hp=44e91da8c19dea9cd9099b6b9c5e014f9dedb438;hpb=1f1d3a376d488d715dd1b0c94d5b66ea05c1e6ca;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/gss/gss_svc_upcall.c b/lustre/ptlrpc/gss/gss_svc_upcall.c index 44e91da..245e0e7 100644 --- a/lustre/ptlrpc/gss/gss_svc_upcall.c +++ b/lustre/ptlrpc/gss/gss_svc_upcall.c @@ -3,7 +3,7 @@ * * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2014, Intel Corporation. * * Author: Eric Mei */ @@ -55,13 +55,15 @@ #include #include #include +#include #include #include #include #include -#include #include +#include +#include #include #include "gss_err.h" @@ -131,7 +133,7 @@ static inline void _cache_unregister_net(struct cache_detail *cd, #endif } /**************************************** - * rsi cache * + * rpc sec init (rsi) cache * ****************************************/ #define RSI_HASHBITS (6) @@ -142,13 +144,18 @@ struct rsi { struct cache_head h; __u32 lustre_svc; __u64 nid; + char nm_name[LUSTRE_NODEMAP_NAME_LENGTH + 1]; wait_queue_head_t waitq; rawobj_t in_handle, in_token; rawobj_t out_handle, out_token; int major_status, minor_status; }; +#ifdef HAVE_CACHE_HEAD_HLIST +static struct hlist_head rsi_table[RSI_HASHMAX]; +#else static struct cache_head *rsi_table[RSI_HASHMAX]; +#endif static struct cache_detail rsi_cache; static struct rsi *rsi_update(struct rsi *new, struct rsi *old); static struct rsi *rsi_lookup(struct rsi *item); @@ -175,6 +182,7 @@ static void rsi_free(struct rsi *rsi) rawobj_free(&rsi->out_token); } +/* See handle_channel_req() userspace for where the upcall data is read */ static void rsi_request(struct cache_detail *cd, struct cache_head *h, char **bpp, int *blen) @@ -190,6 +198,8 @@ static void rsi_request(struct cache_detail *cd, sizeof(rsi->lustre_svc)); qword_addhex(bpp, blen, (char *) &rsi->nid, sizeof(rsi->nid)); qword_addhex(bpp, blen, (char *) &index, sizeof(index)); + qword_addhex(bpp, blen, (char *) rsi->nm_name, + strlen(rsi->nm_name) + 1); qword_addhex(bpp, blen, rsi->in_handle.data, rsi->in_handle.len); qword_addhex(bpp, blen, rsi->in_token.data, rsi->in_token.len); (*bpp)[-1] = '\n'; @@ -220,6 +230,7 @@ static inline void __rsi_init(struct rsi *new, struct rsi *item) new->lustre_svc = item->lustre_svc; new->nid = item->nid; + memcpy(new->nm_name, item->nm_name, sizeof(item->nm_name)); init_waitqueue_head(&new->waitq); } @@ -241,7 +252,11 @@ static void rsi_put(struct kref *ref) { struct rsi *rsi = container_of(ref, struct rsi, h.ref); - LASSERT(rsi->h.next == NULL); +#ifdef HAVE_CACHE_HEAD_HLIST + LASSERT(rsi->h.cache_list.next == NULL); +#else + LASSERT(rsi->h.next == NULL); +#endif rsi_free(rsi); OBD_FREE_PTR(rsi); } @@ -415,7 +430,7 @@ static struct rsi *rsi_update(struct rsi *new, struct rsi *old) } /**************************************** - * rsc cache * + * rpc sec context (rsc) cache * ****************************************/ #define RSC_HASHBITS (10) @@ -429,7 +444,11 @@ struct rsc { struct gss_svc_ctx ctx; }; +#ifdef HAVE_CACHE_HEAD_HLIST +static struct hlist_head rsc_table[RSC_HASHMAX]; +#else static struct cache_head *rsc_table[RSC_HASHMAX]; +#endif static struct cache_detail rsc_cache; static struct rsc *rsc_update(struct rsc *new, struct rsc *old); static struct rsc *rsc_lookup(struct rsc *item); @@ -476,7 +495,11 @@ static void rsc_put(struct kref *ref) { struct rsc *rsci = container_of(ref, struct rsc, h.ref); +#ifdef HAVE_CACHE_HEAD_HLIST + LASSERT(rsci->h.cache_list.next == NULL); +#else LASSERT(rsci->h.next == NULL); +#endif rsc_free(rsci); OBD_FREE_PTR(rsci); } @@ -549,13 +572,13 @@ static int rsc_parse(struct cache_detail *cd, char *mesg, int mlen) } rsci.ctx.gsc_remote = (tmp_int != 0); - /* root user flag */ - rv = get_int(&mesg, &tmp_int); - if (rv) { - CERROR("fail to get oss user flag\n"); - goto out; - } - rsci.ctx.gsc_usr_root = (tmp_int != 0); + /* root user flag */ + rv = get_int(&mesg, &tmp_int); + if (rv) { + CERROR("fail to get root user flag\n"); + goto out; + } + rsci.ctx.gsc_usr_root = (tmp_int != 0); /* mds user flag */ rv = get_int(&mesg, &tmp_int); @@ -692,24 +715,41 @@ typedef int rsc_entry_match(struct rsc *rscp, long data); static void rsc_flush(rsc_entry_match *match, long data) { - struct cache_head **ch; +#ifdef HAVE_CACHE_HEAD_HLIST + struct cache_head *ch = NULL; + struct hlist_head *head; +#else + struct cache_head **ch; +#endif struct rsc *rscp; int n; ENTRY; write_lock(&rsc_cache.hash_lock); for (n = 0; n < RSC_HASHMAX; n++) { - for (ch = &rsc_cache.hash_table[n]; *ch;) { - rscp = container_of(*ch, struct rsc, h); +#ifdef HAVE_CACHE_HEAD_HLIST + head = &rsc_cache.hash_table[n]; + hlist_for_each_entry(ch, head, cache_list) { + rscp = container_of(ch, struct rsc, h); +#else + for (ch = &rsc_cache.hash_table[n]; *ch;) { + rscp = container_of(*ch, struct rsc, h); +#endif if (!match(rscp, data)) { - ch = &((*ch)->next); +#ifndef HAVE_CACHE_HEAD_HLIST + ch = &((*ch)->next); +#endif continue; } /* it seems simply set NEGATIVE doesn't work */ - *ch = (*ch)->next; - rscp->h.next = NULL; +#ifdef HAVE_CACHE_HEAD_HLIST + hlist_del_init(&ch->cache_list); +#else + *ch = (*ch)->next; + rscp->h.next = NULL; +#endif cache_get(&rscp->h); set_bit(CACHE_NEGATIVE, &rscp->h.flags); COMPAT_RSC_PUT(&rscp->h, &rsc_cache); @@ -749,7 +789,6 @@ void gss_secsvc_flush(struct obd_device *target) { rsc_flush_target(target); } -EXPORT_SYMBOL(gss_secsvc_flush); static struct rsc *gss_svc_searchbyctx(rawobj_t *handle) { @@ -814,7 +853,7 @@ int gss_svc_upcall_install_rvs_ctx(struct obd_import *imp, rscp->target = imp->imp_obd; rawobj_dup(&gctx->gc_svc_handle, &rscp->handle); - CWARN("create reverse svc ctx %p to %s: idx "LPX64"\n", + CWARN("create reverse svc ctx %p to %s: idx %#llx\n", &rscp->ctx, obd2cli_tgt(imp->imp_obd), gsec->gs_rvs_hdl); rc = 0; out: @@ -823,7 +862,7 @@ out: rsc_free(&rsci); if (rc) - CERROR("create reverse svc ctx: idx "LPX64", rc %d\n", + CERROR("create reverse svc ctx: idx %#llx, rc %d\n", gsec->gs_rvs_hdl, rc); RETURN(rc); } @@ -890,9 +929,11 @@ int gss_svc_upcall_handle_init(struct ptlrpc_request *req, int rc = SECSVC_DROP; ENTRY; - memset(&rsikey, 0, sizeof(rsikey)); - rsikey.lustre_svc = lustre_svc; - rsikey.nid = (__u64) req->rq_peer.nid; + memset(&rsikey, 0, sizeof(rsikey)); + rsikey.lustre_svc = lustre_svc; + rsikey.nid = (__u64) req->rq_peer.nid; + nodemap_test_nid(req->rq_peer.nid, rsikey.nm_name, + sizeof(rsikey.nm_name)); /* duplicate context handle. for INIT it always 0 */ if (rawobj_dup(&rsikey.in_handle, &gw->gw_handle)) { @@ -919,7 +960,7 @@ int gss_svc_upcall_handle_init(struct ptlrpc_request *req, cache_get(&rsip->h); /* take an extra ref */ init_waitqueue_head(&rsip->waitq); - init_waitqueue_entry_current(&wait); + init_waitqueue_entry(&wait, current); add_wait_queue(&rsip->waitq, &wait); cache_check: @@ -941,10 +982,12 @@ cache_check: set_current_state(TASK_INTERRUPTIBLE); read_unlock(&rsi_cache.hash_lock); - if (valid == 0) - schedule_timeout(GSS_SVC_UPCALL_TIMEOUT * - HZ); - + if (valid == 0) { + unsigned long jiffies; + jiffies = msecs_to_jiffies(MSEC_PER_SEC * + GSS_SVC_UPCALL_TIMEOUT); + schedule_timeout(jiffies); + } cache_get(&rsip->h); goto cache_check; } @@ -974,8 +1017,11 @@ cache_check: if (!rsci) { CERROR("authentication failed\n"); - if (!gss_pack_err_notify(req, GSS_S_FAILURE, 0)) - rc = SECSVC_COMPLETE; + /* gss mechanism returned major and minor code so we return + * those in error message */ + if (!gss_pack_err_notify(req, rsip->major_status, + rsip->minor_status)) + rc = SECSVC_COMPLETE; GOTO(out, rc); } else { @@ -1033,24 +1079,23 @@ cache_check: rc = SECSVC_OK; out: - /* it looks like here we should put rsip also, but this mess up - * with NFS cache mgmt code... FIXME */ -#if 0 - if (rsip) - rsi_put(&rsip->h, &rsi_cache); -#endif - - if (rsci) { - /* if anything went wrong, we don't keep the context too */ - if (rc != SECSVC_OK) + /* it looks like here we should put rsip also, but this mess up + * with NFS cache mgmt code... FIXME + * something like: + * if (rsip) + * rsi_put(&rsip->h, &rsi_cache); */ + + if (rsci) { + /* if anything went wrong, we don't keep the context too */ + if (rc != SECSVC_OK) set_bit(CACHE_NEGATIVE, &rsci->h.flags); - else - CDEBUG(D_SEC, "create rsc with idx "LPX64"\n", - gss_handle_to_u64(&rsci->handle)); + else + CDEBUG(D_SEC, "create rsc with idx %#llx\n", + gss_handle_to_u64(&rsci->handle)); - COMPAT_RSC_PUT(&rsci->h, &rsc_cache); - } - RETURN(rc); + COMPAT_RSC_PUT(&rsci->h, &rsc_cache); + } + RETURN(rc); } struct gss_svc_ctx *gss_svc_upcall_get_ctx(struct ptlrpc_request *req, @@ -1060,7 +1105,7 @@ struct gss_svc_ctx *gss_svc_upcall_get_ctx(struct ptlrpc_request *req, rsc = gss_svc_searchbyctx(&gw->gw_handle); if (!rsc) { - CWARN("Invalid gss ctx idx "LPX64" from %s\n", + CWARN("Invalid gss ctx idx %#llx from %s\n", gss_handle_to_u64(&gw->gw_handle), libcfs_nid2str(req->rq_peer.nid)); return NULL; @@ -1118,8 +1163,8 @@ int __init gss_init_svc_upcall(void) if (atomic_read(&rsi_cache.readers) > 0) break; set_current_state(TASK_UNINTERRUPTIBLE); - LASSERT(HZ >= 4); - schedule_timeout(HZ / 4); + LASSERT(msecs_to_jiffies(MSEC_PER_SEC) >= 4); + schedule_timeout(msecs_to_jiffies(MSEC_PER_SEC / 4)); } if (atomic_read(&rsi_cache.readers) == 0)