LU-3289 gss: Add two additional security flavors for sk

[fs/lustre-release.git] / lustre / ptlrpc / sec.c

diff --git a/lustre/ptlrpc/sec.c b/lustre/ptlrpc/sec.c
index 443daff..a4289d3 100644 (file)
--- a/lustre/ptlrpc/sec.c
+++ b/lustre/ptlrpc/sec.c
@@ -40,10 +40,14 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include <libcfs/libcfs.h>
+#include <linux/user_namespace.h>
+#ifdef HAVE_UIDGID_HEADER
+# include <linux/uidgid.h>
+#endif
 #include <linux/crypto.h>
 #include <linux/key.h>
 
+#include <libcfs/libcfs.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
@@ -167,6 +171,10 @@ __u32 sptlrpc_name2flavor_base(const char *name)
                 return SPTLRPC_FLVR_KRB5I;
         if (!strcmp(name, "krb5p"))
                 return SPTLRPC_FLVR_KRB5P;
+       if (!strcmp(name, "skn"))
+               return SPTLRPC_FLVR_SKN;
+       if (!strcmp(name, "ska"))
+               return SPTLRPC_FLVR_SKA;
        if (!strcmp(name, "ski"))
                return SPTLRPC_FLVR_SKI;
        if (!strcmp(name, "skpi"))
@@ -194,6 +202,10 @@ const char *sptlrpc_flavor2name_base(__u32 flvr)
                 return "krb5i";
         else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5P))
                 return "krb5p";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKN))
+               return "skn";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKA))
+               return "ska";
        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKI))
                return "ski";
        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKPI))
@@ -566,7 +578,7 @@ int sptlrpc_req_replace_dead_ctx(struct ptlrpc_request *req)
         newctx = req->rq_cli_ctx;
         LASSERT(newctx);
 
-        if (unlikely(newctx == oldctx && 
+       if (unlikely(newctx == oldctx &&
                     test_bit(PTLRPC_CTX_DEAD_BIT, &oldctx->cc_flags))) {
                 /*
                  * still get the old dead ctx, usually means system too busy
@@ -575,8 +587,16 @@ int sptlrpc_req_replace_dead_ctx(struct ptlrpc_request *req)
                        "ctx (%p, fl %lx) doesn't switch, relax a little bit\n",
                        newctx, newctx->cc_flags);
 
-               schedule_timeout_and_set_state(TASK_INTERRUPTIBLE,
-                       msecs_to_jiffies(MSEC_PER_SEC));
+               set_current_state(TASK_INTERRUPTIBLE);
+               schedule_timeout(msecs_to_jiffies(MSEC_PER_SEC));
+       } else if (unlikely(test_bit(PTLRPC_CTX_UPTODATE_BIT, &newctx->cc_flags)
+                           == 0)) {
+               /*
+                * new ctx not up to date yet
+                */
+               CDEBUG(D_SEC,
+                      "ctx (%p, fl %lx) doesn't switch, not up to date yet\n",
+                      newctx, newctx->cc_flags);
        } else {
                 /*
                  * it's possible newctx == oldctx if we're switching
@@ -839,7 +859,7 @@ void sptlrpc_req_set_flavor(struct ptlrpc_request *req, int opcode)
         LASSERT(req->rq_cli_ctx->cc_sec);
         LASSERT(req->rq_bulk_read == 0 || req->rq_bulk_write == 0);
 
-        /* special security flags accoding to opcode */
+       /* special security flags according to opcode */
         switch (opcode) {
         case OST_READ:
         case MDS_READPAGE:
@@ -1398,24 +1418,6 @@ void flavor_copy(struct sptlrpc_flavor *dst, struct sptlrpc_flavor *src)
         *dst = *src;
 }
 
-static void sptlrpc_import_sec_adapt_inplace(struct obd_import *imp,
-                                             struct ptlrpc_sec *sec,
-                                             struct sptlrpc_flavor *sf)
-{
-        char    str1[32], str2[32];
-
-        if (sec->ps_flvr.sf_flags != sf->sf_flags)
-                CDEBUG(D_SEC, "changing sec flags: %s -> %s\n",
-                       sptlrpc_secflags2str(sec->ps_flvr.sf_flags,
-                                            str1, sizeof(str1)),
-                       sptlrpc_secflags2str(sf->sf_flags,
-                                            str2, sizeof(str2)));
-
-       spin_lock(&sec->ps_lock);
-       flavor_copy(&sec->ps_flvr, sf);
-       spin_unlock(&sec->ps_lock);
-}
-
 /**
  * To get an appropriate ptlrpc_sec for the \a imp, according to the current
  * configuration. Upon called, imp->imp_sec may or may not be NULL.
@@ -1480,14 +1482,6 @@ int sptlrpc_import_sec_adapt(struct obd_import *imp,
                        obd_uuid2str(&conn->c_remote_uuid),
                        sptlrpc_flavor2name(&sec->ps_flvr, str, sizeof(str)),
                        sptlrpc_flavor2name(&sf, str2, sizeof(str2)));
-
-                if (SPTLRPC_FLVR_POLICY(sf.sf_rpc) ==
-                    SPTLRPC_FLVR_POLICY(sec->ps_flvr.sf_rpc) &&
-                    SPTLRPC_FLVR_MECH(sf.sf_rpc) ==
-                    SPTLRPC_FLVR_MECH(sec->ps_flvr.sf_rpc)) {
-                        sptlrpc_import_sec_adapt_inplace(imp, sec, &sf);
-                        GOTO(out, rc);
-                }
         } else if (SPTLRPC_FLVR_BASE(sf.sf_rpc) !=
                    SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_NULL)) {
                 CDEBUG(D_SEC, "import %s->%s netid %x: select flavor %s\n",