Whamcloud - gitweb
LU-3963 libcfs: cleanup list operations
[fs/lustre-release.git] / libcfs / libcfs / lwt.c
index 325785b..39e6743 100644 (file)
@@ -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.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
  * Author: Eric Barton <eeb@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/kmod.h>
-#include <linux/kernel.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/stat.h>
-#include <linux/errno.h>
-#include <linux/smp_lock.h>
-#include <linux/unistd.h>
-#include <linux/interrupt.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
@@ -80,7 +57,7 @@ lwt_lookup_string (int *size, char *knl_ptr,
                    char *user_ptr, int user_size)
 {
         int   maxsize = 128;
-        
+
         /* knl_ptr was retrieved from an LWT snapshot and the caller wants to
          * turn it into a string.  NB we can crash with an access violation
          * trying to determine the string length, so we're trusting our
@@ -94,20 +71,20 @@ lwt_lookup_string (int *size, char *knl_ptr,
                 maxsize = user_size;
 
         *size = strnlen (knl_ptr, maxsize - 1) + 1;
-        
-        if (user_ptr != NULL) {
-                if (user_size < 4)
-                        return (-EINVAL);
-                
-                if (copy_to_user (user_ptr, knl_ptr, *size))
-                        return (-EFAULT);
-
-                /* Did I truncate the string?  */
-                if (knl_ptr[*size - 1] != 0)
-                        copy_to_user (user_ptr + *size - 4, "...", 4);
-        }
-
-        return (0);
+
+       if (user_ptr != NULL) {
+               if (user_size < 4)
+                       return -EINVAL;
+
+               if (copy_to_user(user_ptr, knl_ptr, *size))
+                       return -EFAULT;
+
+               /* Did I truncate the string?  */
+               if (knl_ptr[*size - 1] != 0)
+                       copy_to_user(user_ptr + *size - 4, "...", 4);
+       }
+
+       return 0;
 }
 
 int
@@ -120,16 +97,16 @@ lwt_control (int enable, int clear)
         if (!cfs_capable(CFS_CAP_SYS_ADMIN))
                 return (-EPERM);
 
-        if (!enable) {
-                LWT_EVENT(0,0,0,0);
-                lwt_enabled = 0;
-                mb();
-                /* give people some time to stop adding traces */
-                schedule_timeout(10);
-        }
+       if (!enable) {
+               LWT_EVENT(0,0,0,0);
+               lwt_enabled = 0;
+               smp_mb();
+               /* give people some time to stop adding traces */
+               schedule_timeout(10);
+       }
 
-        for (i = 0; i < num_online_cpus(); i++) {
-                p = lwt_cpus[i].lwtc_current_page;
+       for (i = 0; i < num_online_cpus(); i++) {
+               p = lwt_cpus[i].lwtc_current_page;
 
                 if (p == NULL)
                         return (-ENODATA);
@@ -137,83 +114,80 @@ lwt_control (int enable, int clear)
                 if (!clear)
                         continue;
 
-                for (j = 0; j < lwt_pages_per_cpu; j++) {
-                        memset (p->lwtp_events, 0, CFS_PAGE_SIZE);
+               for (j = 0; j < lwt_pages_per_cpu; j++) {
+                       memset(p->lwtp_events, 0, PAGE_CACHE_SIZE);
 
-                        p = list_entry (p->lwtp_list.next,
-                                        lwt_page_t, lwtp_list);
-                }
-        }
+                       p = list_entry(p->lwtp_list.next,
+                                       lwt_page_t, lwtp_list);
+               }
+       }
 
-        if (enable) {
-                lwt_enabled = 1;
-                mb();
-                LWT_EVENT(0,0,0,0);
-        }
+       if (enable) {
+               lwt_enabled = 1;
+               smp_mb();
+               LWT_EVENT(0,0,0,0);
+       }
 
-        return (0);
+       return (0);
 }
 
 int
-lwt_snapshot (cycles_t *now, int *ncpu, int *total_size, 
-              void *user_ptr, int user_size)
+lwt_snapshot(cfs_cycles_t *now, int *ncpu, int *total_size,
+            void *user_ptr, int user_size)
 {
-        const int    events_per_page = CFS_PAGE_SIZE / sizeof(lwt_event_t);
-        const int    bytes_per_page = events_per_page * sizeof(lwt_event_t);
-        lwt_page_t  *p;
-        int          i;
-        int          j;
+       const int    events_per_page = PAGE_CACHE_SIZE / sizeof(lwt_event_t);
+       const int    bytes_per_page = events_per_page * sizeof(lwt_event_t);
+       lwt_page_t   *p;
+       int          i;
+       int          j;
 
-        if (!cfs_capable(CFS_CAP_SYS_ADMIN))
-                return (-EPERM);
+       if (!cfs_capable(CFS_CAP_SYS_ADMIN))
+               return (-EPERM);
 
-        *ncpu = num_online_cpus();
-        *total_size = num_online_cpus() * lwt_pages_per_cpu * bytes_per_page;
-        *now = get_cycles();
-        
-        if (user_ptr == NULL)
-                return (0);
+       *ncpu = num_online_cpus();
+       *total_size = num_online_cpus() * lwt_pages_per_cpu * bytes_per_page;
+       *now = get_cycles();
 
-        for (i = 0; i < num_online_cpus(); i++) {
-                p = lwt_cpus[i].lwtc_current_page;
+       if (user_ptr == NULL)
+               return (0);
+
+       for (i = 0; i < num_online_cpus(); i++) {
+               p = lwt_cpus[i].lwtc_current_page;
 
                 if (p == NULL)
-                        return (-ENODATA);
-                
-                for (j = 0; j < lwt_pages_per_cpu; j++) {
-                        if (copy_to_user(user_ptr, p->lwtp_events,
-                                         bytes_per_page))
-                                return (-EFAULT);
-
-                        user_ptr = ((char *)user_ptr) + bytes_per_page;
-                        p = list_entry(p->lwtp_list.next,
-                                       lwt_page_t, lwtp_list);
-                        
-                }
-        }
+                       return -ENODATA;
 
-        return (0);
+               for (j = 0; j < lwt_pages_per_cpu; j++) {
+                       if (copy_to_user(user_ptr, p->lwtp_events,
+                                        bytes_per_page))
+                               return -EFAULT;
+
+                       user_ptr = ((char *)user_ptr) + bytes_per_page;
+                       p = list_entry(p->lwtp_list.next,
+                                       lwt_page_t, lwtp_list);
+               }
+       }
+       return (0);
 }
 
-int
-lwt_init () 
+int lwt_init ()
 {
        int     i;
-        int     j;
+       int     j;
+
+       for (i = 0; i < num_online_cpus(); i++)
+               if (lwt_cpus[i].lwtc_current_page != NULL)
+                       return (-EALREADY);
 
-        for (i = 0; i < num_online_cpus(); i++)
-                if (lwt_cpus[i].lwtc_current_page != NULL)
-                        return (-EALREADY);
-        
-        LASSERT (!lwt_enabled);
+       LASSERT (!lwt_enabled);
 
        /* NULL pointers, zero scalars */
        memset (lwt_cpus, 0, sizeof (lwt_cpus));
-        lwt_pages_per_cpu = LWT_MEMORY / (num_online_cpus() * CFS_PAGE_SIZE);
+       lwt_pages_per_cpu = LWT_MEMORY / (num_online_cpus() * PAGE_CACHE_SIZE);
 
        for (i = 0; i < num_online_cpus(); i++)
                for (j = 0; j < lwt_pages_per_cpu; j++) {
-                       struct page *page = alloc_page (GFP_KERNEL);
+                       struct page *page = alloc_page(GFP_KERNEL);
                        lwt_page_t  *lwtp;
 
                        if (page == NULL) {
@@ -232,49 +206,46 @@ lwt_init ()
 
                         lwtp->lwtp_page = page;
                         lwtp->lwtp_events = page_address(page);
-                       memset (lwtp->lwtp_events, 0, CFS_PAGE_SIZE);
+                       memset(lwtp->lwtp_events, 0, PAGE_CACHE_SIZE);
 
                        if (j == 0) {
                                INIT_LIST_HEAD (&lwtp->lwtp_list);
                                lwt_cpus[i].lwtc_current_page = lwtp;
                        } else {
-                               list_add (&lwtp->lwtp_list,
-                                   &lwt_cpus[i].lwtc_current_page->lwtp_list);
+                               list_add(&lwtp->lwtp_list,
+                                       &lwt_cpus[i].lwtc_current_page->lwtp_list);
                        }
                 }
 
-        lwt_enabled = 1;
-        mb();
+       lwt_enabled = 1;
+       smp_mb();
 
-        LWT_EVENT(0,0,0,0);
+       LWT_EVENT(0,0,0,0);
 
-        return (0);
+       return (0);
 }
 
-void
-lwt_fini () 
+void lwt_fini ()
 {
-        int    i;
-
-        lwt_control(0, 0);
-        
-        for (i = 0; i < num_online_cpus(); i++)
-                while (lwt_cpus[i].lwtc_current_page != NULL) {
-                        lwt_page_t *lwtp = lwt_cpus[i].lwtc_current_page;
-                        
-                        if (list_empty (&lwtp->lwtp_list)) {
-                                lwt_cpus[i].lwtc_current_page = NULL;
-                        } else {
-                                lwt_cpus[i].lwtc_current_page =
-                                        list_entry (lwtp->lwtp_list.next,
-                                                    lwt_page_t, lwtp_list);
-
-                                list_del (&lwtp->lwtp_list);
-                        }
-                        
-                        __free_page (lwtp->lwtp_page);
-                        LIBCFS_FREE (lwtp, sizeof (*lwtp));
-                }
+       int    i;
+
+       lwt_control(0, 0);
+
+       for (i = 0; i < num_online_cpus(); i++)
+               while (lwt_cpus[i].lwtc_current_page != NULL) {
+                       lwt_page_t *lwtp = lwt_cpus[i].lwtc_current_page;
+
+                       if (list_empty (&lwtp->lwtp_list)) {
+                               lwt_cpus[i].lwtc_current_page = NULL;
+                       } else {
+                               lwt_cpus[i].lwtc_current_page =
+                                       list_entry(lwtp->lwtp_list.next,
+                                                       lwt_page_t, lwtp_list);
+                               list_del (&lwtp->lwtp_list);
+                       }
+                       __free_page (lwtp->lwtp_page);
+                       LIBCFS_FREE (lwtp, sizeof (*lwtp));
+               }
 }
 
 EXPORT_SYMBOL(lwt_enabled);