X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Fkernel_user_comm.c;h=d834630bc7e2422447377f94d5ce2316fecad33d;hp=a36a3bc65477ad73bc572a9bcbcf914d9394ade7;hb=3a84f1d934e471f2ca6fb4c68a0e674651adf73e;hpb=509fac96e4a40015ff92404153821db2a4a59ca6

diff --git a/libcfs/libcfs/kernel_user_comm.c b/libcfs/libcfs/kernel_user_comm.c
index a36a3bc..d834630 100644
--- a/libcfs/libcfs/kernel_user_comm.c
+++ b/libcfs/libcfs/kernel_user_comm.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.
@@ -40,7 +38,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
-#define D_KUC 0
+#define D_KUC D_OTHER
 
 #include <libcfs/libcfs.h>
 
@@ -59,6 +57,7 @@ int libcfs_ukuc_start(lustre_kernelcomm *link, int group)
         if (pipe(pfd) < 0)
                 return -errno;
 
+        memset(link, 0, sizeof(*link));
         link->lk_rfd = pfd[0];
         link->lk_wfd = pfd[1];
         link->lk_group = group;
@@ -79,7 +78,7 @@ int libcfs_ukuc_stop(lustre_kernelcomm *link)
  * Allocates memory, returns handle
  *
  * @param link Private descriptor for pipe/socket.
- * @param buf Buffer to read into
+ * @param buf Buffer to read into, must include size for kuc_hdr
  * @param maxsize Maximum message size allowed
  * @param transport Only listen to messages on this transport
  *      (and the generic transport)
@@ -104,7 +103,7 @@ int libcfs_ukuc_msg_get(lustre_kernelcomm *link, char *buf, int maxsize,
                 }
                 kuch = (struct kuc_hdr *)buf;
 
-                CDEBUG(D_KUC, " Received message mg=%x t=%d m=%d l=%d\n",
+                CDEBUG(D_KUC, "Received message mg=%x t=%d m=%d l=%d\n",
                        kuch->kuc_magic, kuch->kuc_transport, kuch->kuc_msgtype,
                        kuch->kuc_msglen);
 
@@ -167,7 +166,7 @@ int libcfs_kkuc_msg_put(cfs_file_t *filp, void *payload)
 #ifdef __KERNEL__
         {
                 loff_t offset = 0;
-                rc = cfs_user_write(filp, (char *)payload, kuch->kuc_msglen, 
+                rc = cfs_user_write(filp, (char *)payload, kuch->kuc_msglen,
                                     &offset);
         }
 #endif
@@ -189,17 +188,18 @@ struct kkuc_reg {
         cfs_list_t  kr_chain;
         int         kr_uid;
         cfs_file_t *kr_fp;
+        __u32       kr_data;
 };
 static cfs_list_t kkuc_groups[KUC_GRP_MAX+1] = {};
 /* Protect message sending against remove and adds */
-static CFS_DECLARE_RWSEM(kg_sem);
+static DECLARE_RWSEM(kg_sem);
 
 /** Add a receiver to a broadcast group
  * @param filp pipe to write into
  * @param uid identidier for this receiver
  * @param group group number
  */
-int libcfs_kkuc_group_add(cfs_file_t *filp, int uid, int group)
+int libcfs_kkuc_group_add(cfs_file_t *filp, int uid, int group, __u32 data)
 {
         struct kkuc_reg *reg;
 
@@ -219,12 +219,13 @@ int libcfs_kkuc_group_add(cfs_file_t *filp, int uid, int group)
 
         reg->kr_fp = filp;
         reg->kr_uid = uid;
+        reg->kr_data = data;
 
-        cfs_down_write(&kg_sem);
+	down_write(&kg_sem);
         if (kkuc_groups[group].next == NULL)
                 CFS_INIT_LIST_HEAD(&kkuc_groups[group]);
         cfs_list_add(&reg->kr_chain, &kkuc_groups[group]);
-        cfs_up_write(&kg_sem);
+	up_write(&kg_sem);
 
         CDEBUG(D_KUC, "Added uid=%d fp=%p to group %d\n", uid, filp, group);
 
@@ -251,17 +252,18 @@ int libcfs_kkuc_group_rem(int uid, int group)
                 libcfs_kkuc_group_put(group, &lh);
         }
 
-        cfs_down_write(&kg_sem);
+	down_write(&kg_sem);
         cfs_list_for_each_entry_safe(reg, next, &kkuc_groups[group], kr_chain) {
                 if ((uid == 0) || (uid == reg->kr_uid)) {
                         cfs_list_del(&reg->kr_chain);
                         CDEBUG(D_KUC, "Removed uid=%d fp=%p from group %d\n",
                                reg->kr_uid, reg->kr_fp, group);
-                        cfs_put_file(reg->kr_fp);
+                        if (reg->kr_fp != NULL)
+                                cfs_put_file(reg->kr_fp);
                         cfs_free(reg);
                 }
         }
-        cfs_up_write(&kg_sem);
+	up_write(&kg_sem);
 
         RETURN(0);
 }
@@ -273,15 +275,55 @@ int libcfs_kkuc_group_put(int group, void *payload)
         int rc = 0;
         ENTRY;
 
-        cfs_down_read(&kg_sem);
+	down_read(&kg_sem);
         cfs_list_for_each_entry(reg, &kkuc_groups[group], kr_chain) {
+                if (reg->kr_fp != NULL) {
                 rc = libcfs_kkuc_msg_put(reg->kr_fp, payload);
+                        if (rc == -EPIPE) {
+                                cfs_put_file(reg->kr_fp);
+                                reg->kr_fp = NULL;
+                        }
+                }
         }
-        cfs_up_read(&kg_sem);
+	up_read(&kg_sem);
 
         RETURN(rc);
 }
 CFS_EXPORT_SYMBOL(libcfs_kkuc_group_put);
 
+/**
+ * Calls a callback function for each link of the given kuc group.
+ * @param group the group to call the function on.
+ * @param cb_func the function to be called.
+ * @param cb_arg iextra argument to be passed to the callback function.
+ */
+int libcfs_kkuc_group_foreach(int group, libcfs_kkuc_cb_t cb_func,
+                              void *cb_arg)
+{
+        struct kkuc_reg *reg;
+        int rc = 0;
+        ENTRY;
+
+        if (group > KUC_GRP_MAX) {
+                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);
+        cfs_list_for_each_entry(reg, &kkuc_groups[group], kr_chain) {
+                if (reg->kr_fp != NULL) {
+                        rc = cb_func(reg->kr_data, cb_arg);
+                }
+        }
+	up_read(&kg_sem);
+
+        RETURN(rc);
+}
+CFS_EXPORT_SYMBOL(libcfs_kkuc_group_foreach);
+
 #endif /* LUSTRE_UTILS */