Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-9019 mdt: use ktime_t for calculating elapsed time
[fs/lustre-release.git] / lustre / mdt / mdt_identity.c
diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c
index f7b1658..e8ec709 100644 (file)
--- a/lustre/mdt/mdt_identity.c
+++ b/lustre/mdt/mdt_identity.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17,17 +15,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  *
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,14 +35,8 @@
  * Author: Fan Yong <fanyong@clusterfs.com>
  */
 
  * Author: Fan Yong <fanyong@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #define DEBUG_SUBSYSTEM S_MDS
 
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -56,7 +46,6 @@
 #include <linux/errno.h>
 #include <linux/version.h>
 #include <linux/unistd.h>
 #include <linux/errno.h>
 #include <linux/version.h>
 #include <linux/unistd.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <asm/uaccess.h>
 #include <linux/fs.h>
 #include <linux/stat.h>
@@ -71,7 +60,6 @@
 #include <lustre_import.h>
 #include <lustre_dlm.h>
 #include <lustre_lib.h>
 #include <lustre_import.h>
 #include <lustre_dlm.h>
 #include <lustre_lib.h>
-#include <lustre_ucache.h>
 
 #include "mdt_internal.h"
 
 
 #include "mdt_internal.h"
 
@@ -82,27 +70,27 @@ static void mdt_identity_entry_init(struct upcall_cache_entry *entry,
 }
 
 static void mdt_identity_entry_free(struct upcall_cache *cache,
 }
 
 static void mdt_identity_entry_free(struct upcall_cache *cache,
-                                    struct upcall_cache_entry *entry)
+                                   struct upcall_cache_entry *entry)
 {
 {
-        struct md_identity *identity = &entry->u.identity;
-
-        if (identity->mi_ginfo) {
-                put_group_info(identity->mi_ginfo);
-                identity->mi_ginfo = NULL;
-        }
-
-        if (identity->mi_nperms) {
-                LASSERT(identity->mi_perms);
-                OBD_FREE(identity->mi_perms,
-                         identity->mi_nperms * sizeof(struct md_perm));
-                identity->mi_nperms = 0;
-        }
+       struct md_identity *identity = &entry->u.identity;
+
+       if (identity->mi_ginfo) {
+               put_group_info(identity->mi_ginfo);
+               identity->mi_ginfo = NULL;
+       }
+
+       if (identity->mi_nperms) {
+               LASSERT(identity->mi_perms);
+               OBD_FREE(identity->mi_perms,
+                        identity->mi_nperms * sizeof(struct md_perm));
+               identity->mi_nperms = 0;
+       }
 }
 
 static int mdt_identity_do_upcall(struct upcall_cache *cache,
                                   struct upcall_cache_entry *entry)
 {
 }
 
 static int mdt_identity_do_upcall(struct upcall_cache *cache,
                                   struct upcall_cache_entry *entry)
 {
-        char *upcall, keystr[16];
+        char keystr[16];
         char *argv[] = {
                   [0] = cache->uc_upcall,
                   [1] = cache->uc_name,
         char *argv[] = {
                   [0] = cache->uc_upcall,
                   [1] = cache->uc_name,
@@ -114,100 +102,97 @@ static int mdt_identity_do_upcall(struct upcall_cache *cache,
                   [1] = "PATH=/sbin:/usr/sbin",
                   [2] = NULL
         };
                   [1] = "PATH=/sbin:/usr/sbin",
                   [2] = NULL
         };
-        int size, rc;
+       ktime_t start, end;
+        int rc;
         ENTRY;
 
         /* There is race condition:
          * "uc_upcall" was changed just after "is_identity_get_disabled" check.
          */
         ENTRY;
 
         /* There is race condition:
          * "uc_upcall" was changed just after "is_identity_get_disabled" check.
          */
-        size = strlen(cache->uc_upcall) + 1;
-        OBD_ALLOC(upcall, size);
-        if (unlikely(!upcall))
-                RETURN(-ENOMEM);
-
-        read_lock(&cache->uc_upcall_rwlock);
-        memcpy(upcall, cache->uc_upcall, size - 1);
-        read_unlock(&cache->uc_upcall_rwlock);
-        upcall[size - 1] = 0;
-        if (unlikely(!strcmp(upcall, "NONE"))) {
+       down_read(&cache->uc_upcall_rwsem);
+        CDEBUG(D_INFO, "The upcall is: '%s'\n", cache->uc_upcall);
+
+        if (unlikely(!strcmp(cache->uc_upcall, "NONE"))) {
                 CERROR("no upcall set\n");
                 GOTO(out, rc = -EREMCHG);
         }
 
                 CERROR("no upcall set\n");
                 GOTO(out, rc = -EREMCHG);
         }
 
-        argv[0] = upcall;
-
-        snprintf(keystr, sizeof(keystr), LPU64, entry->ue_key);
-
-        CDEBUG(D_INFO, "The upcall is: '%s'\n", cache->uc_upcall);
-
-        rc = USERMODEHELPER(argv[0], argv, envp);
-        if (rc < 0) {
-                CERROR("%s: error invoking upcall %s %s %s: rc %d; "
-                       "check /proc/fs/lustre/mdt/%s/identity_upcall\n",
-                       cache->uc_name, argv[0], argv[1], argv[2], rc,
-                       cache->uc_name);
-        } else {
-                CDEBUG(D_HA, "%s: invoked upcall %s %s %s\n", cache->uc_name,
-                       argv[0], argv[1], argv[2]);
-                rc = 0;
-        }
-        EXIT;
+       argv[0] = cache->uc_upcall;
+       snprintf(keystr, sizeof(keystr), "%llu", entry->ue_key);
+
+       start = ktime_get();
+       rc = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
+       end = ktime_get();
+       if (rc < 0) {
+               CERROR("%s: error invoking upcall %s %s %s: rc %d; check /proc/fs/lustre/mdt/%s/identity_upcall, time %ldus\n",
+                      cache->uc_name, argv[0], argv[1], argv[2], rc,
+                      cache->uc_name, (long)ktime_us_delta(end, start));
+       } else {
+               CDEBUG(D_HA, "%s: invoked upcall %s %s %s, time %ldus\n",
+                      cache->uc_name, argv[0], argv[1], argv[2],
+                      (long)ktime_us_delta(end, start));
+               rc = 0;
+       }
+       EXIT;
 out:
 out:
-        OBD_FREE(upcall, size);
-        return rc;
+       up_read(&cache->uc_upcall_rwsem);
+       return rc;
 }
 
 static int mdt_identity_parse_downcall(struct upcall_cache *cache,
 }
 
 static int mdt_identity_parse_downcall(struct upcall_cache *cache,
-                                       struct upcall_cache_entry *entry,
-                                       void *args)
+                                      struct upcall_cache_entry *entry,
+                                      void *args)
 {
 {
-        struct md_identity *identity = &entry->u.identity;
-        struct identity_downcall_data *data = args;
-        struct group_info *ginfo;
-        struct md_perm *perms = NULL;
-        int size, i;
-        ENTRY;
-
-        LASSERT(data);
-        if (data->idd_ngroups > NGROUPS_MAX)
-                RETURN(-E2BIG);
-
-        ginfo = groups_alloc(data->idd_ngroups);
-        if (!ginfo) {
-                CERROR("failed to alloc %d groups\n", data->idd_ngroups);
-                RETURN(-ENOMEM);
-        }
-
-        lustre_groups_from_list(ginfo, data->idd_groups);
-        lustre_groups_sort(ginfo);
-
-        if (data->idd_nperms) {
-                size = data->idd_nperms * sizeof(*perms);
-                OBD_ALLOC(perms, size);
-                if (!perms) {
-                        CERROR("failed to alloc %d permissions\n",
-                               data->idd_nperms);
-                        put_group_info(ginfo);
-                        RETURN(-ENOMEM);
-                }
-
-                for (i = 0; i < data->idd_nperms; i++) {
-                        perms[i].mp_nid = data->idd_perms[i].pdd_nid;
-                        perms[i].mp_perm = data->idd_perms[i].pdd_perm;
-                }
-        }
-
-        identity->mi_uid = data->idd_uid;
-        identity->mi_gid = data->idd_gid;
-        identity->mi_ginfo = ginfo;
-        identity->mi_nperms = data->idd_nperms;
-        identity->mi_perms = perms;
-
-        CDEBUG(D_OTHER, "parse mdt identity@%p: %d:%d, ngroups %u, nperms %u\n",
-               identity, identity->mi_uid, identity->mi_gid,
-               identity->mi_ginfo->ngroups, identity->mi_nperms);
-
-        RETURN(0);
+       struct md_identity *identity = &entry->u.identity;
+       struct identity_downcall_data *data = args;
+       struct group_info *ginfo = NULL;
+       struct md_perm *perms = NULL;
+       int size, i;
+       ENTRY;
+
+       LASSERT(data);
+       if (data->idd_ngroups > NGROUPS_MAX)
+               RETURN(-E2BIG);
+
+       if (data->idd_ngroups > 0) {
+               ginfo = groups_alloc(data->idd_ngroups);
+               if (!ginfo) {
+                       CERROR("failed to alloc %d groups\n", data->idd_ngroups);
+                       RETURN(-ENOMEM);
+               }
+
+               lustre_groups_from_list(ginfo, data->idd_groups);
+               lustre_groups_sort(ginfo);
+       }
+
+       if (data->idd_nperms) {
+               size = data->idd_nperms * sizeof(*perms);
+               OBD_ALLOC(perms, size);
+               if (!perms) {
+                       CERROR("failed to alloc %d permissions\n",
+                              data->idd_nperms);
+                       if (ginfo != NULL)
+                               put_group_info(ginfo);
+                       RETURN(-ENOMEM);
+               }
+
+               for (i = 0; i < data->idd_nperms; i++) {
+                       perms[i].mp_nid = data->idd_perms[i].pdd_nid;
+                       perms[i].mp_perm = data->idd_perms[i].pdd_perm;
+               }
+       }
+
+       identity->mi_uid = data->idd_uid;
+       identity->mi_gid = data->idd_gid;
+       identity->mi_ginfo = ginfo;
+       identity->mi_nperms = data->idd_nperms;
+       identity->mi_perms = perms;
+
+       CDEBUG(D_OTHER, "parse mdt identity@%p: %d:%d, ngroups %u, nperms %u\n",
+              identity, identity->mi_uid, identity->mi_gid,
+              data->idd_ngroups, data->idd_nperms);
+
+       RETURN(0);
 }
 
 struct md_identity *mdt_identity_get(struct upcall_cache *cache, __u32 uid)
 }
 
 struct md_identity *mdt_identity_get(struct upcall_cache *cache, __u32 uid)
@@ -254,16 +239,14 @@ void mdt_flush_identity(struct upcall_cache *cache, int uid)
  * If there is LNET_NID_ANY in perm[i].mp_nid,
  * it must be perm[0].mp_nid, and act as default perm.
  */
  * If there is LNET_NID_ANY in perm[i].mp_nid,
  * it must be perm[0].mp_nid, and act as default perm.
  */
-__u32 mdt_identity_get_perm(struct md_identity *identity,
-                            __u32 is_rmtclient, lnet_nid_t nid)
+__u32 mdt_identity_get_perm(struct md_identity *identity, lnet_nid_t nid)
 {
 {
-        struct md_perm *perm;
-        int i;
 
 
-        if (!identity) {
-                LASSERT(is_rmtclient == 0);
-                return CFS_SETGRP_PERM;
-        }
+       struct md_perm *perm;
+       int i;
+
+       if (!identity)
+               return CFS_SETGRP_PERM;
 
         perm = identity->mi_perms;
         /* check exactly matched nid first */
 
         perm = identity->mi_perms;
         /* check exactly matched nid first */
@@ -279,39 +262,5 @@ __u32 mdt_identity_get_perm(struct md_identity *identity,
                 return perm[0].mp_perm;
 
         /* return default last */
                 return perm[0].mp_perm;
 
         /* return default last */
-        return is_rmtclient ? 0 : CFS_SETGRP_PERM;
-}
-
-int mdt_pack_remote_perm(struct mdt_thread_info *info, struct mdt_object *o,
-                         void *buf)
-{
-        struct md_ucred         *uc = mdt_ucred(info);
-        struct md_object        *next = mdt_object_child(o);
-        struct mdt_remote_perm  *perm = buf;
-
-        ENTRY;
-
-        /* remote client request always pack ptlrpc_user_desc! */
-        LASSERT(perm);
-
-        if (!exp_connect_rmtclient(info->mti_exp))
-                RETURN(-EBADE);
-
-        if ((uc->mu_valid != UCRED_OLD) && (uc->mu_valid != UCRED_NEW))
-                RETURN(-EINVAL);
-
-        perm->rp_uid = uc->mu_o_uid;
-        perm->rp_gid = uc->mu_o_gid;
-        perm->rp_fsuid = uc->mu_o_fsuid;
-        perm->rp_fsgid = uc->mu_o_fsgid;
-
-        perm->rp_access_perm = 0;
-        if (mo_permission(info->mti_env, NULL, next, NULL, MAY_READ) == 0)
-                perm->rp_access_perm |= MAY_READ;
-        if (mo_permission(info->mti_env, NULL, next, NULL, MAY_WRITE) == 0)
-                perm->rp_access_perm |= MAY_WRITE;
-        if (mo_permission(info->mti_env, NULL, next, NULL, MAY_EXEC) == 0)
-                perm->rp_access_perm |= MAY_EXEC;
-
-        RETURN(0);
+       return CFS_SETGRP_PERM;
 }
 }
Lustre primary development and releases