LU-9859 libcfs: merge UMP and SMP libcfs cpu header code

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-tracefile.c

diff --git a/libcfs/libcfs/linux/linux-tracefile.c b/libcfs/libcfs/linux/linux-tracefile.c
index da33e01..54f1121 100644 (file)
--- a/libcfs/libcfs/linux/linux-tracefile.c
+++ b/libcfs/libcfs/linux/linux-tracefile.c
@@ -15,11 +15,7 @@
  *
  * 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
  */
@@ -37,6 +33,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 #define LUSTRE_TRACEFILE_PRIVATE
 
+#include <linux/slab.h>
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 
@@ -49,7 +46,7 @@ static unsigned int pages_factor[CFS_TCD_TYPE_MAX] = {
 
 char *cfs_trace_console_buffers[NR_CPUS][CFS_TCD_TYPE_MAX];
 
-struct rw_semaphore cfs_tracefile_sem;
+static DECLARE_RWSEM(cfs_tracefile_sem);
 
 int cfs_tracefile_init_arch()
 {
@@ -57,14 +54,12 @@ int cfs_tracefile_init_arch()
        int    j;
        struct cfs_trace_cpu_data *tcd;
 
-       init_rwsem(&cfs_tracefile_sem);
-
        /* initialize trace_data */
        memset(cfs_trace_data, 0, sizeof(cfs_trace_data));
        for (i = 0; i < CFS_TCD_TYPE_MAX; i++) {
                cfs_trace_data[i] =
                        kmalloc(sizeof(union cfs_trace_data_union) *
-                               cfs_num_possible_cpus(), GFP_KERNEL);
+                               num_possible_cpus(), GFP_KERNEL);
                if (cfs_trace_data[i] == NULL)
                        goto out;
 
@@ -78,7 +73,7 @@ int cfs_tracefile_init_arch()
                tcd->tcd_cpu = j;
        }
 
-       for (i = 0; i < cfs_num_possible_cpus(); i++)
+       for (i = 0; i < num_possible_cpus(); i++)
                for (j = 0; j < 3; j++) {
                        cfs_trace_console_buffers[i][j] =
                                kmalloc(CFS_TRACE_CONSOLE_BUFFER_SIZE,
@@ -101,7 +96,7 @@ void cfs_tracefile_fini_arch()
        int    i;
        int    j;
 
-       for (i = 0; i < cfs_num_possible_cpus(); i++)
+       for (i = 0; i < num_possible_cpus(); i++)
                for (j = 0; j < 3; j++)
                        if (cfs_trace_console_buffers[i][j] != NULL) {
                                kfree(cfs_trace_console_buffers[i][j]);
@@ -112,8 +107,6 @@ void cfs_tracefile_fini_arch()
                kfree(cfs_trace_data[i]);
                cfs_trace_data[i] = NULL;
        }
-
-       fini_rwsem(&cfs_tracefile_sem);
 }
 
 void cfs_tracefile_read_lock()
@@ -136,7 +129,7 @@ void cfs_tracefile_write_unlock()
        up_write(&cfs_tracefile_sem);
 }
 
-cfs_trace_buf_type_t cfs_trace_buf_idx_get()
+enum cfs_trace_buf_type cfs_trace_buf_idx_get()
 {
        if (in_irq())
                return CFS_TCD_TYPE_IRQ;
@@ -153,6 +146,7 @@ cfs_trace_buf_type_t cfs_trace_buf_idx_get()
  * for details.
  */
 int cfs_trace_lock_tcd(struct cfs_trace_cpu_data *tcd, int walking)
+__acquires(&tcd->tcd_lock)
 {
        __LASSERT(tcd->tcd_type < CFS_TCD_TYPE_MAX);
        if (tcd->tcd_type == CFS_TCD_TYPE_IRQ)
@@ -167,6 +161,7 @@ int cfs_trace_lock_tcd(struct cfs_trace_cpu_data *tcd, int walking)
 }
 
 void cfs_trace_unlock_tcd(struct cfs_trace_cpu_data *tcd, int walking)
+__releases(&tcd->tcd_lock)
 {
        __LASSERT(tcd->tcd_type < CFS_TCD_TYPE_MAX);
        if (tcd->tcd_type == CFS_TCD_TYPE_IRQ)
@@ -194,16 +189,19 @@ cfs_set_ptldebug_header(struct ptldebug_header *header,
                         struct libcfs_debug_msg_data *msgdata,
                         unsigned long stack)
 {
-       struct timeval tv;
+       struct timespec64 ts;
 
-       do_gettimeofday(&tv);
+       ktime_get_real_ts64(&ts);
 
        header->ph_subsys = msgdata->msg_subsys;
        header->ph_mask = msgdata->msg_mask;
-       header->ph_cpu_id = cfs_smp_processor_id();
+       header->ph_cpu_id = smp_processor_id();
        header->ph_type = cfs_trace_buf_idx_get();
-       header->ph_sec = (__u32)tv.tv_sec;
-       header->ph_usec = tv.tv_usec;
+       /* y2038 safe since all user space treats this as unsigned, but
+        * will overflow in 2106
+        */
+       header->ph_sec = (u32)ts.tv_sec;
+       header->ph_usec = ts.tv_nsec / NSEC_PER_USEC;
        header->ph_stack = stack;
        header->ph_pid = current->pid;
        header->ph_line_num = msgdata->msg_line;
@@ -269,7 +267,7 @@ void cfs_print_to_console(struct ptldebug_header *hdr, int mask,
 
 int cfs_trace_max_debug_mb(void)
 {
-       int  total_mb = (cfs_num_physpages >> (20 - PAGE_SHIFT));
+       int  total_mb = (totalram_pages >> (20 - PAGE_SHIFT));
 
        return MAX(512, (total_mb * 80)/100);
 }