LU-9855 obdclass: Code cleanup

[fs/lustre-release.git] / lustre / obdclass / kernelcomm.c

diff --git a/lustre/obdclass/kernelcomm.c b/lustre/obdclass/kernelcomm.c
index f9763f1..ccd982c 100644 (file)
--- a/lustre/obdclass/kernelcomm.c
+++ b/lustre/obdclass/kernelcomm.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -35,7 +35,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
-#define D_KUC D_OTHER
 
 #include <obd_support.h>
 #include <lustre_kernelcomm.h>
@@ -88,7 +87,7 @@ int libcfs_kkuc_msg_put(struct file *filp, void *payload)
        if (rc < 0)
                CWARN("message send failed (%d)\n", rc);
        else
-               CDEBUG(D_KUC, "Sent message rc=%d, fp=%p\n", rc, filp);
+               CDEBUG(D_HSM, "Sent message rc=%d, fp=%p\n", rc, filp);
 
        return rc;
 }
@@ -102,24 +101,38 @@ struct kkuc_reg {
        struct list_head kr_chain;
        int              kr_uid;
        struct file     *kr_fp;
-       void            *kr_data;
+       char             kr_data[0];
 };
 
-static struct list_head kkuc_groups[KUC_GRP_MAX+1] = {};
+static struct list_head kkuc_groups[KUC_GRP_MAX + 1];
 /* Protect message sending against remove and adds */
 static DECLARE_RWSEM(kg_sem);
 
+static inline bool libcfs_kkuc_group_is_valid(int group)
+{
+       return 0 <= group && group < ARRAY_SIZE(kkuc_groups);
+}
+
+void libcfs_kkuc_init(void)
+{
+       int group;
+
+       for (group = 0; group < ARRAY_SIZE(kkuc_groups); group++)
+               INIT_LIST_HEAD(&kkuc_groups[group]);
+}
+
 /** Add a receiver to a broadcast group
  * @param filp pipe to write into
  * @param uid identifier for this receiver
  * @param group group number
  * @param data user data
  */
-int libcfs_kkuc_group_add(struct file *filp, int uid, int group, void *data)
+int libcfs_kkuc_group_add(struct file *filp, int uid, int group,
+                         void *data, size_t data_len)
 {
        struct kkuc_reg *reg;
 
-       if (group > KUC_GRP_MAX) {
+       if (!libcfs_kkuc_group_is_valid(group)) {
                CDEBUG(D_WARNING, "Kernelcomm: bad group %d\n", group);
                return -EINVAL;
        }
@@ -129,33 +142,33 @@ int libcfs_kkuc_group_add(struct file *filp, int uid, int group, void *data)
                return -EBADF;
 
        /* freed in group_rem */
-       reg = kmalloc(sizeof(*reg), 0);
+       reg = kmalloc(sizeof(*reg) + data_len, 0);
        if (reg == NULL)
                return -ENOMEM;
 
        reg->kr_fp = filp;
        reg->kr_uid = uid;
-       reg->kr_data = data;
+       memcpy(reg->kr_data, data, data_len);
 
        down_write(&kg_sem);
-       if (kkuc_groups[group].next == NULL)
-               INIT_LIST_HEAD(&kkuc_groups[group]);
        list_add(&reg->kr_chain, &kkuc_groups[group]);
        up_write(&kg_sem);
 
-       CDEBUG(D_KUC, "Added uid=%d fp=%p to group %d\n", uid, filp, group);
+       CDEBUG(D_HSM, "Added uid=%d fp=%p to group %d\n", uid, filp, group);
 
        return 0;
 }
 EXPORT_SYMBOL(libcfs_kkuc_group_add);
 
-int libcfs_kkuc_group_rem(int uid, int group, void **pdata)
+int libcfs_kkuc_group_rem(int uid, int group)
 {
        struct kkuc_reg *reg, *next;
        ENTRY;
 
-       if (kkuc_groups[group].next == NULL)
-               RETURN(0);
+       if (!libcfs_kkuc_group_is_valid(group)) {
+               CDEBUG(D_WARNING, "Kernelcomm: bad group %d\n", group);
+               return -EINVAL;
+       }
 
        if (uid == 0) {
                /* Broadcast a shutdown message */
@@ -172,12 +185,10 @@ int libcfs_kkuc_group_rem(int uid, int group, void **pdata)
        list_for_each_entry_safe(reg, next, &kkuc_groups[group], kr_chain) {
                if ((uid == 0) || (uid == reg->kr_uid)) {
                        list_del(&reg->kr_chain);
-                       CDEBUG(D_KUC, "Removed uid=%d fp=%p from group %d\n",
+                       CDEBUG(D_HSM, "Removed uid=%d fp=%p from group %d\n",
                                reg->kr_uid, reg->kr_fp, group);
                        if (reg->kr_fp != NULL)
                                fput(reg->kr_fp);
-                       if (pdata != NULL)
-                               *pdata = reg->kr_data;
                        kfree(reg);
                }
        }
@@ -194,7 +205,20 @@ int libcfs_kkuc_group_put(int group, void *payload)
        int one_success = 0;
        ENTRY;
 
+       if (!libcfs_kkuc_group_is_valid(group)) {
+               CDEBUG(D_WARNING, "Kernelcomm: bad group %d\n", group);
+               return -EINVAL;
+       }
+
        down_write(&kg_sem);
+
+       if (unlikely(list_empty(&kkuc_groups[group])) ||
+           unlikely(OBD_FAIL_CHECK(OBD_FAIL_MDS_HSM_CT_REGISTER_NET))) {
+               /* no agent have fully registered, CDT will retry */
+               up_write(&kg_sem);
+               RETURN(-EAGAIN);
+       }
+
        list_for_each_entry(reg, &kkuc_groups[group], kr_chain) {
                if (reg->kr_fp != NULL) {
                        rc = libcfs_kkuc_msg_put(reg->kr_fp, payload);
@@ -230,15 +254,11 @@ int libcfs_kkuc_group_foreach(int group, libcfs_kkuc_cb_t cb_func,
        int              rc = 0;
        ENTRY;
 
-       if (group > KUC_GRP_MAX) {
+       if (!libcfs_kkuc_group_is_valid(group)) {
                CDEBUG(D_WARNING, "Kernelcomm: bad group %d\n", group);
                RETURN(-EINVAL);
        }
 
-       /* no link for this group */
-       if (kkuc_groups[group].next == NULL)
-               RETURN(0);
-
        down_read(&kg_sem);
        list_for_each_entry(reg, &kkuc_groups[group], kr_chain) {
                if (reg->kr_fp != NULL)