X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Ftracefile.c;h=2baecb843ad41323a1c2a206529cc8be9a7d27e2;hp=b7439e9e23c1dcc09081a8349b780824353e9926;hb=53aee2559638e25dd6dc664ceab2b023eaac1cb5;hpb=48d29ff71de18d8d375b072a7287ba9ecdb6cdce diff --git a/libcfs/libcfs/tracefile.c b/libcfs/libcfs/tracefile.c index b7439e9..2baecb8 100644 --- a/libcfs/libcfs/tracefile.c +++ b/libcfs/libcfs/tracefile.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. @@ -28,6 +26,8 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -44,95 +44,96 @@ #define LUSTRE_TRACEFILE_PRIVATE #include "tracefile.h" +#include #include /* XXX move things up to the top, comment */ -union cfs_trace_data_union (*cfs_trace_data[TCD_MAX_TYPES])[CFS_NR_CPUS] __cacheline_aligned; +union cfs_trace_data_union (*cfs_trace_data[TCD_MAX_TYPES])[NR_CPUS] __cacheline_aligned; char cfs_tracefile[TRACEFILE_NAME_SIZE]; long long cfs_tracefile_size = CFS_TRACEFILE_SIZE; static struct tracefiled_ctl trace_tctl; -cfs_semaphore_t cfs_trace_thread_sem; +static DEFINE_MUTEX(cfs_trace_thread_mutex); static int thread_running = 0; -cfs_atomic_t cfs_tage_allocated = CFS_ATOMIC_INIT(0); +static atomic_t cfs_tage_allocated = ATOMIC_INIT(0); static void put_pages_on_tcd_daemon_list(struct page_collection *pc, - struct cfs_trace_cpu_data *tcd); + struct cfs_trace_cpu_data *tcd); static inline struct cfs_trace_page * -cfs_tage_from_list(cfs_list_t *list) +cfs_tage_from_list(struct list_head *list) { - return cfs_list_entry(list, struct cfs_trace_page, linkage); + return list_entry(list, struct cfs_trace_page, linkage); } -static struct cfs_trace_page *cfs_tage_alloc(int gfp) +static struct cfs_trace_page *cfs_tage_alloc(gfp_t gfp) { - cfs_page_t *page; - struct cfs_trace_page *tage; - - /* My caller is trying to free memory */ - if (!cfs_in_interrupt() && cfs_memory_pressure_get()) - return NULL; - - /* - * Don't spam console with allocation failures: they will be reported - * by upper layer anyway. - */ - gfp |= CFS_ALLOC_NOWARN; - page = cfs_alloc_page(gfp); - if (page == NULL) - return NULL; - - tage = cfs_alloc(sizeof(*tage), gfp); - if (tage == NULL) { - cfs_free_page(page); - return NULL; - } - - tage->page = page; - cfs_atomic_inc(&cfs_tage_allocated); - return tage; + struct page *page; + struct cfs_trace_page *tage; + + /* My caller is trying to free memory */ + if (!in_interrupt() && memory_pressure_get()) + return NULL; + + /* + * Don't spam console with allocation failures: they will be reported + * by upper layer anyway. + */ + gfp |= __GFP_NOWARN; + page = alloc_page(gfp); + if (page == NULL) + return NULL; + + tage = kmalloc(sizeof(*tage), gfp); + if (tage == NULL) { + __free_page(page); + return NULL; + } + + tage->page = page; + atomic_inc(&cfs_tage_allocated); + return tage; } static void cfs_tage_free(struct cfs_trace_page *tage) { - __LASSERT(tage != NULL); - __LASSERT(tage->page != NULL); + __LASSERT(tage != NULL); + __LASSERT(tage->page != NULL); - cfs_free_page(tage->page); - cfs_free(tage); - cfs_atomic_dec(&cfs_tage_allocated); + __free_page(tage->page); + kfree(tage); + atomic_dec(&cfs_tage_allocated); } static void cfs_tage_to_tail(struct cfs_trace_page *tage, - cfs_list_t *queue) + struct list_head *queue) { - __LASSERT(tage != NULL); - __LASSERT(queue != NULL); + __LASSERT(tage != NULL); + __LASSERT(queue != NULL); - cfs_list_move_tail(&tage->linkage, queue); + list_move_tail(&tage->linkage, queue); } -int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, int gfp, - cfs_list_t *stock) +int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, gfp_t gfp, + struct list_head *stock) { - int i; - - /* - * XXX nikita: do NOT call portals_debug_msg() (CDEBUG/ENTRY/EXIT) - * from here: this will lead to infinite recursion. - */ - - for (i = 0; i + tcd->tcd_cur_stock_pages < TCD_STOCK_PAGES ; ++ i) { - struct cfs_trace_page *tage; - - tage = cfs_tage_alloc(gfp); - if (tage == NULL) - break; - cfs_list_add_tail(&tage->linkage, stock); - } - return i; + int i; + + /* + * XXX nikita: do NOT call portals_debug_msg() (CDEBUG/ENTRY/EXIT) + * from here: this will lead to infinite recursion. + */ + + for (i = 0; i + tcd->tcd_cur_stock_pages < TCD_STOCK_PAGES ; ++ i) { + struct cfs_trace_page *tage; + + tage = cfs_tage_alloc(gfp); + if (tage == NULL) + break; + list_add_tail(&tage->linkage, stock); + } + return i; } /* return a page that has 'len' bytes left at the end */ @@ -142,75 +143,74 @@ cfs_trace_get_tage_try(struct cfs_trace_cpu_data *tcd, unsigned long len) struct cfs_trace_page *tage; if (tcd->tcd_cur_pages > 0) { - __LASSERT(!cfs_list_empty(&tcd->tcd_pages)); + __LASSERT(!list_empty(&tcd->tcd_pages)); tage = cfs_tage_from_list(tcd->tcd_pages.prev); - if (tage->used + len <= CFS_PAGE_SIZE) + if (tage->used + len <= PAGE_CACHE_SIZE) return tage; } - if (tcd->tcd_cur_pages < tcd->tcd_max_pages) { - if (tcd->tcd_cur_stock_pages > 0) { - tage = cfs_tage_from_list(tcd->tcd_stock_pages.prev); - -- tcd->tcd_cur_stock_pages; - cfs_list_del_init(&tage->linkage); - } else { - tage = cfs_tage_alloc(CFS_ALLOC_ATOMIC); - if (tage == NULL) { - if (printk_ratelimit()) - printk(CFS_KERN_WARNING - "cannot allocate a tage (%ld)\n", - tcd->tcd_cur_pages); - return NULL; - } - } - - tage->used = 0; - tage->cpu = cfs_smp_processor_id(); - tage->type = tcd->tcd_type; - cfs_list_add_tail(&tage->linkage, &tcd->tcd_pages); - tcd->tcd_cur_pages++; - - if (tcd->tcd_cur_pages > 8 && thread_running) { - struct tracefiled_ctl *tctl = &trace_tctl; - /* - * wake up tracefiled to process some pages. - */ - cfs_waitq_signal(&tctl->tctl_waitq); - } - return tage; + if (tcd->tcd_cur_pages < tcd->tcd_max_pages) { + if (tcd->tcd_cur_stock_pages > 0) { + tage = cfs_tage_from_list(tcd->tcd_stock_pages.prev); + --tcd->tcd_cur_stock_pages; + list_del_init(&tage->linkage); + } else { + tage = cfs_tage_alloc(GFP_ATOMIC); + if (unlikely(tage == NULL)) { + if ((!memory_pressure_get() || + in_interrupt()) && printk_ratelimit()) + printk(KERN_WARNING + "cannot allocate a tage (%ld)\n", + tcd->tcd_cur_pages); + return NULL; + } + } + + tage->used = 0; + tage->cpu = smp_processor_id(); + tage->type = tcd->tcd_type; + list_add_tail(&tage->linkage, &tcd->tcd_pages); + tcd->tcd_cur_pages++; + + if (tcd->tcd_cur_pages > 8 && thread_running) { + struct tracefiled_ctl *tctl = &trace_tctl; + /* + * wake up tracefiled to process some pages. + */ + wake_up(&tctl->tctl_waitq); + } + return tage; } return NULL; } static void cfs_tcd_shrink(struct cfs_trace_cpu_data *tcd) { - int pgcount = tcd->tcd_cur_pages / 10; - struct page_collection pc; - struct cfs_trace_page *tage; - struct cfs_trace_page *tmp; - - /* - * XXX nikita: do NOT call portals_debug_msg() (CDEBUG/ENTRY/EXIT) - * from here: this will lead to infinite recursion. - */ - - if (printk_ratelimit()) - printk(CFS_KERN_WARNING "debug daemon buffer overflowed; " - "discarding 10%% of pages (%d of %ld)\n", - pgcount + 1, tcd->tcd_cur_pages); - - CFS_INIT_LIST_HEAD(&pc.pc_pages); - cfs_spin_lock_init(&pc.pc_lock); - - cfs_list_for_each_entry_safe_typed(tage, tmp, &tcd->tcd_pages, - struct cfs_trace_page, linkage) { - if (pgcount-- == 0) - break; - - cfs_list_move_tail(&tage->linkage, &pc.pc_pages); - tcd->tcd_cur_pages--; - } - put_pages_on_tcd_daemon_list(&pc, tcd); + int pgcount = tcd->tcd_cur_pages / 10; + struct page_collection pc; + struct cfs_trace_page *tage; + struct cfs_trace_page *tmp; + + /* + * XXX nikita: do NOT call portals_debug_msg() (CDEBUG/ENTRY/EXIT) + * from here: this will lead to infinite recursion. + */ + + if (printk_ratelimit()) + printk(KERN_WARNING "debug daemon buffer overflowed; " + "discarding 10%% of pages (%d of %ld)\n", + pgcount + 1, tcd->tcd_cur_pages); + + INIT_LIST_HEAD(&pc.pc_pages); + + list_for_each_entry_safe(tage, tmp, &tcd->tcd_pages, linkage) { + if (pgcount-- == 0) + break; + + list_move_tail(&tage->linkage, &pc.pc_pages); + tcd->tcd_cur_pages--; + } + put_pages_on_tcd_daemon_list(&pc, tcd); } /* return a page that has 'len' bytes left at the end */ @@ -224,11 +224,11 @@ static struct cfs_trace_page *cfs_trace_get_tage(struct cfs_trace_cpu_data *tcd, * from here: this will lead to infinite recursion. */ - if (len > CFS_PAGE_SIZE) { - printk(CFS_KERN_ERR - "cowardly refusing to write %lu bytes in a page\n", len); - return NULL; - } + if (len > PAGE_CACHE_SIZE) { + printk(KERN_ERR + "cowardly refusing to write %lu bytes in a page\n", len); + return NULL; + } tage = cfs_trace_get_tage_try(tcd, len); if (tage != NULL) @@ -243,8 +243,21 @@ static struct cfs_trace_page *cfs_trace_get_tage(struct cfs_trace_cpu_data *tcd, return tage; } -int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls, int subsys, int mask, - const char *file, const char *fn, const int line, +int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata, + const char *format, ...) +{ + va_list args; + int rc; + + va_start(args, format); + rc = libcfs_debug_vmsg2(msgdata, format, args, NULL); + va_end(args); + + return rc; +} +EXPORT_SYMBOL(libcfs_debug_msg); + +int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata, const char *format1, va_list args, const char *format2, ...) { @@ -258,9 +271,11 @@ int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls, int subsys, int mask, int needed = 85; /* average message length */ int max_nob; va_list ap; - int depth; int i; int remain; + int mask = msgdata->msg_mask; + char *file = (char *)msgdata->msg_file; + struct cfs_debug_limit_state *cdls = msgdata->msg_cdls; if (strchr(file, '/')) file = strrchr(file, '/') + 1; @@ -270,7 +285,7 @@ int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls, int subsys, int mask, /* cfs_trace_get_tcd() grabs a lock, which disables preemption and * pins us to a particular CPU. This avoids an smp_processor_id() * warning on Linux when debugging is enabled. */ - cfs_set_ptldebug_header(&header, subsys, mask, line, CDEBUG_STACK()); + cfs_set_ptldebug_header(&header, msgdata, CDEBUG_STACK()); if (tcd == NULL) /* arch may not log in IRQ context */ goto console; @@ -284,10 +299,9 @@ int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls, int subsys, int mask, goto console; } - depth = __current_nesting_level(); - known_size = strlen(file) + 1 + depth; - if (fn) - known_size += strlen(fn) + 1; + known_size = strlen(file) + 1; + if (msgdata->msg_fn) + known_size += strlen(msgdata->msg_fn) + 1; if (libcfs_debug_binary) known_size += sizeof(header); @@ -300,7 +314,7 @@ int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls, int subsys, int mask, for (i = 0; i < 2; i++) { tage = cfs_trace_get_tage(tcd, needed + known_size + 1); if (tage == NULL) { - if (needed + known_size > CFS_PAGE_SIZE) + if (needed + known_size > PAGE_CACHE_SIZE) mask |= D_ERROR; cfs_trace_put_tcd(tcd); @@ -308,18 +322,18 @@ int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls, int subsys, int mask, goto console; } - string_buf = (char *)cfs_page_address(tage->page) + + string_buf = (char *)page_address(tage->page) + tage->used + known_size; - max_nob = CFS_PAGE_SIZE - tage->used - known_size; - if (max_nob <= 0) { - printk(CFS_KERN_EMERG "negative max_nob: %d\n", - max_nob); - mask |= D_ERROR; - cfs_trace_put_tcd(tcd); - tcd = NULL; - goto console; - } + max_nob = PAGE_CACHE_SIZE - tage->used - known_size; + if (max_nob <= 0) { + printk(KERN_EMERG "negative max_nob: %d\n", + max_nob); + mask |= D_ERROR; + cfs_trace_put_tcd(tcd); + tcd = NULL; + goto console; + } needed = 0; if (format1) { @@ -343,12 +357,12 @@ int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls, int subsys, int mask, break; } - if (*(string_buf+needed-1) != '\n') - printk(CFS_KERN_INFO "format at %s:%d:%s doesn't end in newline\n", - file, line, fn); + if (*(string_buf+needed-1) != '\n') + printk(KERN_INFO "format at %s:%d:%s doesn't end in " + "newline\n", file, msgdata->msg_line, msgdata->msg_fn); header.ph_len = known_size + needed; - debug_buf = (char *)cfs_page_address(tage->page) + tage->used; + debug_buf = (char *)page_address(tage->page) + tage->used; if (libcfs_debug_binary) { memcpy(debug_buf, &header, sizeof(header)); @@ -356,26 +370,20 @@ int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls, int subsys, int mask, debug_buf += sizeof(header); } - /* indent message according to the nesting level */ - while (depth-- > 0) { - *(debug_buf++) = '.'; - ++ tage->used; - } - strcpy(debug_buf, file); tage->used += strlen(file) + 1; debug_buf += strlen(file) + 1; - if (fn) { - strcpy(debug_buf, fn); - tage->used += strlen(fn) + 1; - debug_buf += strlen(fn) + 1; + if (msgdata->msg_fn) { + strcpy(debug_buf, msgdata->msg_fn); + tage->used += strlen(msgdata->msg_fn) + 1; + debug_buf += strlen(msgdata->msg_fn) + 1; } __LASSERT(debug_buf == string_buf); tage->used += needed; - __LASSERT (tage->used <= CFS_PAGE_SIZE); + __LASSERT(tage->used <= PAGE_CACHE_SIZE); console: if ((mask & libcfs_printk) == 0) { @@ -403,20 +411,20 @@ console: cdls->cdls_delay /= libcfs_console_backoff * 4; } else { cdls->cdls_delay *= libcfs_console_backoff; - - if (cdls->cdls_delay < libcfs_console_min_delay) - cdls->cdls_delay = libcfs_console_min_delay; - else if (cdls->cdls_delay > libcfs_console_max_delay) - cdls->cdls_delay = libcfs_console_max_delay; } + if (cdls->cdls_delay < libcfs_console_min_delay) + cdls->cdls_delay = libcfs_console_min_delay; + else if (cdls->cdls_delay > libcfs_console_max_delay) + cdls->cdls_delay = libcfs_console_max_delay; + /* ensure cdls_next is never zero after it's been seen */ cdls->cdls_next = (cfs_time_current() + cdls->cdls_delay) | 1; } if (tcd != NULL) { cfs_print_to_console(&header, mask, string_buf, needed, file, - fn); + msgdata->msg_fn); cfs_trace_put_tcd(tcd); } else { string_buf = cfs_trace_get_console_buffer(); @@ -433,27 +441,29 @@ console: remain = CFS_TRACE_CONSOLE_BUFFER_SIZE - needed; if (remain > 0) { va_start(ap, format2); - needed += vsnprintf(string_buf+needed, remain, format2, ap); + needed += vsnprintf(string_buf+needed, remain, + format2, ap); va_end(ap); } } cfs_print_to_console(&header, mask, - string_buf, needed, file, fn); + string_buf, needed, file, msgdata->msg_fn); - cfs_trace_put_console_buffer(string_buf); + put_cpu(); } if (cdls != NULL && cdls->cdls_count != 0) { string_buf = cfs_trace_get_console_buffer(); needed = snprintf(string_buf, CFS_TRACE_CONSOLE_BUFFER_SIZE, - "Skipped %d previous similar message%s\n", - cdls->cdls_count, (cdls->cdls_count > 1) ? "s" : ""); + "Skipped %d previous similar message%s\n", + cdls->cdls_count, + (cdls->cdls_count > 1) ? "s" : ""); cfs_print_to_console(&header, mask, - string_buf, needed, file, fn); + string_buf, needed, file, msgdata->msg_fn); - cfs_trace_put_console_buffer(string_buf); + put_cpu(); cdls->cdls_count = 0; } @@ -462,119 +472,102 @@ console: EXPORT_SYMBOL(libcfs_debug_vmsg2); void -libcfs_assertion_failed(const char *expr, const char *file, - const char *func, const int line) -{ - libcfs_debug_msg(NULL, 0, D_EMERG, file, func, line, - "ASSERTION(%s) failed\n", expr); - /* cfs_enter_debugger(); */ - lbug_with_loc(file, func, line); -} -EXPORT_SYMBOL(libcfs_assertion_failed); - -void cfs_trace_assertion_failed(const char *str, - const char *fn, const char *file, int line) + struct libcfs_debug_msg_data *msgdata) { - struct ptldebug_header hdr; + struct ptldebug_header hdr; - libcfs_panic_in_progress = 1; - libcfs_catastrophe = 1; - cfs_mb(); + libcfs_panic_in_progress = 1; + libcfs_catastrophe = 1; + smp_mb(); - cfs_set_ptldebug_header(&hdr, DEBUG_SUBSYSTEM, D_EMERG, line, - CDEBUG_STACK()); + cfs_set_ptldebug_header(&hdr, msgdata, CDEBUG_STACK()); - cfs_print_to_console(&hdr, D_EMERG, str, strlen(str), file, fn); + cfs_print_to_console(&hdr, D_EMERG, str, strlen(str), + msgdata->msg_file, msgdata->msg_fn); - LIBCFS_PANIC("Lustre debug assertion failure\n"); + panic("Lustre debug assertion failure\n"); - /* not reached */ + /* not reached */ } static void panic_collect_pages(struct page_collection *pc) { - /* Do the collect_pages job on a single CPU: assumes that all other - * CPUs have been stopped during a panic. If this isn't true for some - * arch, this will have to be implemented separately in each arch. */ - int i; - int j; - struct cfs_trace_cpu_data *tcd; - - CFS_INIT_LIST_HEAD(&pc->pc_pages); - - cfs_tcd_for_each(tcd, i, j) { - cfs_list_splice_init(&tcd->tcd_pages, &pc->pc_pages); - tcd->tcd_cur_pages = 0; - - if (pc->pc_want_daemon_pages) { - cfs_list_splice_init(&tcd->tcd_daemon_pages, - &pc->pc_pages); - tcd->tcd_cur_daemon_pages = 0; - } - } + /* Do the collect_pages job on a single CPU: assumes that all other + * CPUs have been stopped during a panic. If this isn't true for some + * arch, this will have to be implemented separately in each arch. */ + int i; + int j; + struct cfs_trace_cpu_data *tcd; + + INIT_LIST_HEAD(&pc->pc_pages); + + cfs_tcd_for_each(tcd, i, j) { + list_splice_init(&tcd->tcd_pages, &pc->pc_pages); + tcd->tcd_cur_pages = 0; + + if (pc->pc_want_daemon_pages) { + list_splice_init(&tcd->tcd_daemon_pages, + &pc->pc_pages); + tcd->tcd_cur_daemon_pages = 0; + } + } } static void collect_pages_on_all_cpus(struct page_collection *pc) { - struct cfs_trace_cpu_data *tcd; - int i, cpu; - - cfs_spin_lock(&pc->pc_lock); - cfs_for_each_possible_cpu(cpu) { - cfs_tcd_for_each_type_lock(tcd, i, cpu) { - cfs_list_splice_init(&tcd->tcd_pages, &pc->pc_pages); - tcd->tcd_cur_pages = 0; - if (pc->pc_want_daemon_pages) { - cfs_list_splice_init(&tcd->tcd_daemon_pages, - &pc->pc_pages); - tcd->tcd_cur_daemon_pages = 0; - } - } - } - cfs_spin_unlock(&pc->pc_lock); + struct cfs_trace_cpu_data *tcd; + int i, cpu; + + for_each_possible_cpu(cpu) { + cfs_tcd_for_each_type_lock(tcd, i, cpu) { + list_splice_init(&tcd->tcd_pages, &pc->pc_pages); + tcd->tcd_cur_pages = 0; + if (pc->pc_want_daemon_pages) { + list_splice_init(&tcd->tcd_daemon_pages, + &pc->pc_pages); + tcd->tcd_cur_daemon_pages = 0; + } + } + } } static void collect_pages(struct page_collection *pc) { - CFS_INIT_LIST_HEAD(&pc->pc_pages); + INIT_LIST_HEAD(&pc->pc_pages); - if (libcfs_panic_in_progress) - panic_collect_pages(pc); - else - collect_pages_on_all_cpus(pc); + if (libcfs_panic_in_progress) + panic_collect_pages(pc); + else + collect_pages_on_all_cpus(pc); } static void put_pages_back_on_all_cpus(struct page_collection *pc) { struct cfs_trace_cpu_data *tcd; - cfs_list_t *cur_head; + struct list_head *cur_head; struct cfs_trace_page *tage; struct cfs_trace_page *tmp; int i, cpu; - cfs_spin_lock(&pc->pc_lock); - cfs_for_each_possible_cpu(cpu) { + for_each_possible_cpu(cpu) { cfs_tcd_for_each_type_lock(tcd, i, cpu) { cur_head = tcd->tcd_pages.next; - cfs_list_for_each_entry_safe_typed(tage, tmp, - &pc->pc_pages, - struct cfs_trace_page, - linkage) { + list_for_each_entry_safe(tage, tmp, &pc->pc_pages, + linkage) { - __LASSERT_TAGE_INVARIANT(tage); + __LASSERT_TAGE_INVARIANT(tage); - if (tage->cpu != cpu || tage->type != i) - continue; + if (tage->cpu != cpu || tage->type != i) + continue; - cfs_tage_to_tail(tage, cur_head); - tcd->tcd_cur_pages++; - } - } - } - cfs_spin_unlock(&pc->pc_lock); + cfs_tage_to_tail(tage, cur_head); + tcd->tcd_cur_pages++; + } + } + } } static void put_pages_back(struct page_collection *pc) @@ -588,37 +581,33 @@ static void put_pages_back(struct page_collection *pc) * if we have been steadily writing (and otherwise discarding) pages via the * debug daemon. */ static void put_pages_on_tcd_daemon_list(struct page_collection *pc, - struct cfs_trace_cpu_data *tcd) + struct cfs_trace_cpu_data *tcd) { - struct cfs_trace_page *tage; - struct cfs_trace_page *tmp; + struct cfs_trace_page *tage; + struct cfs_trace_page *tmp; - cfs_spin_lock(&pc->pc_lock); - cfs_list_for_each_entry_safe_typed(tage, tmp, &pc->pc_pages, - struct cfs_trace_page, linkage) { + list_for_each_entry_safe(tage, tmp, &pc->pc_pages, linkage) { + __LASSERT_TAGE_INVARIANT(tage); - __LASSERT_TAGE_INVARIANT(tage); + if (tage->cpu != tcd->tcd_cpu || tage->type != tcd->tcd_type) + continue; - if (tage->cpu != tcd->tcd_cpu || tage->type != tcd->tcd_type) - continue; + cfs_tage_to_tail(tage, &tcd->tcd_daemon_pages); + tcd->tcd_cur_daemon_pages++; - cfs_tage_to_tail(tage, &tcd->tcd_daemon_pages); - tcd->tcd_cur_daemon_pages++; + if (tcd->tcd_cur_daemon_pages > tcd->tcd_max_pages) { + struct cfs_trace_page *victim; - if (tcd->tcd_cur_daemon_pages > tcd->tcd_max_pages) { - struct cfs_trace_page *victim; - - __LASSERT(!cfs_list_empty(&tcd->tcd_daemon_pages)); - victim = cfs_tage_from_list(tcd->tcd_daemon_pages.next); + __LASSERT(!list_empty(&tcd->tcd_daemon_pages)); + victim = cfs_tage_from_list(tcd->tcd_daemon_pages.next); __LASSERT_TAGE_INVARIANT(victim); - cfs_list_del(&victim->linkage); - cfs_tage_free(victim); - tcd->tcd_cur_daemon_pages--; - } - } - cfs_spin_unlock(&pc->pc_lock); + list_del(&victim->linkage); + cfs_tage_free(victim); + tcd->tcd_cur_daemon_pages--; + } + } } static void put_pages_on_daemon_list(struct page_collection *pc) @@ -626,7 +615,7 @@ static void put_pages_on_daemon_list(struct page_collection *pc) struct cfs_trace_cpu_data *tcd; int i, cpu; - cfs_for_each_possible_cpu(cpu) { + for_each_possible_cpu(cpu) { cfs_tcd_for_each_type_lock(tcd, i, cpu) put_pages_on_tcd_daemon_list(pc, tcd); } @@ -634,24 +623,21 @@ static void put_pages_on_daemon_list(struct page_collection *pc) void cfs_trace_debug_print(void) { - struct page_collection pc; - struct cfs_trace_page *tage; - struct cfs_trace_page *tmp; + struct page_collection pc; + struct cfs_trace_page *tage; + struct cfs_trace_page *tmp; - cfs_spin_lock_init(&pc.pc_lock); - - pc.pc_want_daemon_pages = 1; - collect_pages(&pc); - cfs_list_for_each_entry_safe_typed(tage, tmp, &pc.pc_pages, - struct cfs_trace_page, linkage) { - char *p, *file, *fn; - cfs_page_t *page; + pc.pc_want_daemon_pages = 1; + collect_pages(&pc); + list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { + char *p, *file, *fn; + struct page *page; - __LASSERT_TAGE_INVARIANT(tage); + __LASSERT_TAGE_INVARIANT(tage); - page = tage->page; - p = cfs_page_address(page); - while (p < ((char *)cfs_page_address(page) + tage->used)) { + page = tage->page; + p = page_address(page); + while (p < ((char *)page_address(page) + tage->used)) { struct ptldebug_header *hdr; int len; hdr = (void *)p; @@ -667,102 +653,98 @@ void cfs_trace_debug_print(void) p += len; } - cfs_list_del(&tage->linkage); - cfs_tage_free(tage); - } + list_del(&tage->linkage); + cfs_tage_free(tage); + } } int cfs_tracefile_dump_all_pages(char *filename) { - struct page_collection pc; - cfs_file_t *filp; - struct cfs_trace_page *tage; - struct cfs_trace_page *tmp; - int rc; - - CFS_DECL_MMSPACE; + struct page_collection pc; + struct file *filp; + struct cfs_trace_page *tage; + struct cfs_trace_page *tmp; + mm_segment_t __oldfs; + char *buf; + int rc; + + cfs_tracefile_write_lock(); + + filp = filp_open(filename, O_CREAT|O_EXCL|O_WRONLY|O_LARGEFILE, 0600); + if (IS_ERR(filp)) { + rc = PTR_ERR(filp); + filp = NULL; + printk(KERN_ERR "LustreError: can't open %s for dump: rc %d\n", + filename, rc); + goto out; + } - cfs_tracefile_write_lock(); - - filp = cfs_filp_open(filename, - O_CREAT|O_EXCL|O_WRONLY|O_LARGEFILE, 0600, &rc); - if (!filp) { - if (rc != -EEXIST) - printk(CFS_KERN_ERR - "LustreError: can't open %s for dump: rc %d\n", - filename, rc); - goto out; - } - - cfs_spin_lock_init(&pc.pc_lock); pc.pc_want_daemon_pages = 1; collect_pages(&pc); - if (cfs_list_empty(&pc.pc_pages)) { + if (list_empty(&pc.pc_pages)) { rc = 0; goto close; } - - /* ok, for now, just write the pages. in the future we'll be building - * iobufs with the pages and calling generic_direct_IO */ - CFS_MMSPACE_OPEN; - cfs_list_for_each_entry_safe_typed(tage, tmp, &pc.pc_pages, - struct cfs_trace_page, linkage) { - - __LASSERT_TAGE_INVARIANT(tage); - - rc = cfs_filp_write(filp, cfs_page_address(tage->page), - tage->used, cfs_filp_poff(filp)); - if (rc != (int)tage->used) { - printk(CFS_KERN_WARNING "wanted to write %u but wrote " - "%d\n", tage->used, rc); - put_pages_back(&pc); - __LASSERT(cfs_list_empty(&pc.pc_pages)); - break; - } - cfs_list_del(&tage->linkage); + __oldfs = get_fs(); + set_fs(get_ds()); + + /* ok, for now, just write the pages. in the future we'll be building + * iobufs with the pages and calling generic_direct_IO */ + list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { + + __LASSERT_TAGE_INVARIANT(tage); + + buf = kmap(tage->page); + rc = vfs_write(filp, (__force const char __user *)buf, + tage->used, &filp->f_pos); + kunmap(tage->page); + if (rc != (int)tage->used) { + printk(KERN_WARNING "wanted to write %u but wrote " + "%d\n", tage->used, rc); + put_pages_back(&pc); + __LASSERT(list_empty(&pc.pc_pages)); + break; + } + list_del(&tage->linkage); cfs_tage_free(tage); } - CFS_MMSPACE_CLOSE; - rc = cfs_filp_fsync(filp); - if (rc) - printk(CFS_KERN_ERR "sync returns %d\n", rc); - close: - cfs_filp_close(filp); - out: - cfs_tracefile_write_unlock(); - return rc; + set_fs(__oldfs); + rc = ll_vfs_fsync_range(filp, 0, LLONG_MAX, 1); + if (rc) + printk(KERN_ERR "sync returns %d\n", rc); +close: + filp_close(filp, NULL); +out: + cfs_tracefile_write_unlock(); + return rc; } void cfs_trace_flush_pages(void) { - struct page_collection pc; - struct cfs_trace_page *tage; - struct cfs_trace_page *tmp; + struct page_collection pc; + struct cfs_trace_page *tage; + struct cfs_trace_page *tmp; - cfs_spin_lock_init(&pc.pc_lock); - - pc.pc_want_daemon_pages = 1; - collect_pages(&pc); - cfs_list_for_each_entry_safe_typed(tage, tmp, &pc.pc_pages, - struct cfs_trace_page, linkage) { + pc.pc_want_daemon_pages = 1; + collect_pages(&pc); + list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { - __LASSERT_TAGE_INVARIANT(tage); + __LASSERT_TAGE_INVARIANT(tage); - cfs_list_del(&tage->linkage); - cfs_tage_free(tage); - } + list_del(&tage->linkage); + cfs_tage_free(tage); + } } int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob, - const char *usr_buffer, int usr_buffer_nob) + const char __user *usr_buffer, int usr_buffer_nob) { int nob; if (usr_buffer_nob > knl_buffer_nob) return -EOVERFLOW; - if (cfs_copy_from_user((void *)knl_buffer, - (void *)usr_buffer, usr_buffer_nob)) + if (copy_from_user(knl_buffer, usr_buffer, usr_buffer_nob)) return -EFAULT; nob = strnlen(knl_buffer, usr_buffer_nob); @@ -779,8 +761,9 @@ int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob, knl_buffer[nob + 1] = 0; /* terminate */ return 0; } +EXPORT_SYMBOL(cfs_trace_copyin_string); -int cfs_trace_copyout_string(char *usr_buffer, int usr_buffer_nob, +int cfs_trace_copyout_string(char __user *usr_buffer, int usr_buffer_nob, const char *knl_buffer, char *append) { /* NB if 'append' != NULL, it's a single character to append to the @@ -791,11 +774,11 @@ int cfs_trace_copyout_string(char *usr_buffer, int usr_buffer_nob, if (nob > usr_buffer_nob) nob = usr_buffer_nob; - if (cfs_copy_to_user(usr_buffer, knl_buffer, nob)) + if (copy_to_user(usr_buffer, knl_buffer, nob)) return -EFAULT; if (append != NULL && nob < usr_buffer_nob) { - if (cfs_copy_to_user(usr_buffer + nob, append, 1)) + if (copy_to_user(usr_buffer + nob, append, 1)) return -EFAULT; nob++; @@ -807,22 +790,17 @@ EXPORT_SYMBOL(cfs_trace_copyout_string); int cfs_trace_allocate_string_buffer(char **str, int nob) { - if (nob > 2 * CFS_PAGE_SIZE) /* string must be "sensible" */ + if (nob > 2 * PAGE_CACHE_SIZE) /* string must be "sensible" */ return -EINVAL; - *str = cfs_alloc(nob, CFS_ALLOC_STD | CFS_ALLOC_ZERO); + *str = kmalloc(nob, GFP_IOFS | __GFP_ZERO); if (*str == NULL) return -ENOMEM; return 0; } -void cfs_trace_free_string_buffer(char *str, int nob) -{ - cfs_free(str); -} - -int cfs_trace_dump_debug_buffer_usrstr(void *usr_str, int usr_str_nob) +int cfs_trace_dump_debug_buffer_usrstr(void __user *usr_str, int usr_str_nob) { char *str; int rc; @@ -836,15 +814,13 @@ int cfs_trace_dump_debug_buffer_usrstr(void *usr_str, int usr_str_nob) if (rc != 0) goto out; -#if !defined(__WINNT__) if (str[0] != '/') { rc = -EINVAL; goto out; } -#endif rc = cfs_tracefile_dump_all_pages(str); out: - cfs_trace_free_string_buffer(str, usr_str_nob + 1); + kfree(str); return rc; } @@ -869,26 +845,24 @@ int cfs_trace_daemon_command(char *str) } else if (strlen(str) >= sizeof(cfs_tracefile)) { rc = -ENAMETOOLONG; -#ifndef __WINNT__ } else if (str[0] != '/') { rc = -EINVAL; -#endif } else { - strcpy(cfs_tracefile, str); + strcpy(cfs_tracefile, str); - printk(CFS_KERN_INFO - "Lustre: debug daemon will attempt to start writing " - "to %s (%lukB max)\n", cfs_tracefile, - (long)(cfs_tracefile_size >> 10)); + printk(KERN_INFO + "Lustre: debug daemon will attempt to start writing " + "to %s (%lukB max)\n", cfs_tracefile, + (long)(cfs_tracefile_size >> 10)); - cfs_trace_start_thread(); + cfs_trace_start_thread(); } cfs_tracefile_write_unlock(); return rc; } -int cfs_trace_daemon_command_usrstr(void *usr_str, int usr_str_nob) +int cfs_trace_daemon_command_usrstr(void __user *usr_str, int usr_str_nob) { char *str; int rc; @@ -902,44 +876,46 @@ int cfs_trace_daemon_command_usrstr(void *usr_str, int usr_str_nob) if (rc == 0) rc = cfs_trace_daemon_command(str); - cfs_trace_free_string_buffer(str, usr_str_nob + 1); + kfree(str); return rc; } int cfs_trace_set_debug_mb(int mb) { - int i; - int j; - int pages; - int limit = cfs_trace_max_debug_mb(); - struct cfs_trace_cpu_data *tcd; + int i; + int j; + int pages; + int limit = cfs_trace_max_debug_mb(); + struct cfs_trace_cpu_data *tcd; - if (mb < cfs_num_possible_cpus()) { - printk(KERN_ERR "Cannot set debug_mb to %d, the value should be >= %d\n", - mb, cfs_num_possible_cpus()); - return -EINVAL; - } + if (mb < num_possible_cpus()) { + printk(KERN_WARNING + "Lustre: %d MB is too small for debug buffer size, " + "setting it to %d MB.\n", mb, num_possible_cpus()); + mb = num_possible_cpus(); + } - if (mb > limit) { - printk(CFS_KERN_ERR "Lustre: Refusing to set debug buffer size " - "to %dMB - limit is %d\n", mb, limit); - return -EINVAL; - } + if (mb > limit) { + printk(KERN_WARNING + "Lustre: %d MB is too large for debug buffer size, " + "setting it to %d MB.\n", mb, limit); + mb = limit; + } - mb /= cfs_num_possible_cpus(); - pages = mb << (20 - CFS_PAGE_SHIFT); + mb /= num_possible_cpus(); + pages = mb << (20 - PAGE_CACHE_SHIFT); - cfs_tracefile_write_lock(); + cfs_tracefile_write_lock(); - cfs_tcd_for_each(tcd, i, j) - tcd->tcd_max_pages = (pages * tcd->tcd_pages_factor) / 100; + cfs_tcd_for_each(tcd, i, j) + tcd->tcd_max_pages = (pages * tcd->tcd_pages_factor) / 100; - cfs_tracefile_write_unlock(); + cfs_tracefile_write_unlock(); - return 0; + return 0; } -int cfs_trace_set_debug_mb_usrstr(void *usr_str, int usr_str_nob) +int cfs_trace_set_debug_mb_usrstr(void __user *usr_str, int usr_str_nob) { char str[32]; int rc; @@ -965,120 +941,122 @@ int cfs_trace_get_debug_mb(void) cfs_tracefile_read_unlock(); - return (total_pages >> (20 - CFS_PAGE_SHIFT)) + 1; + return (total_pages >> (20 - PAGE_CACHE_SHIFT)) + 1; } static int tracefiled(void *arg) { - struct page_collection pc; - struct tracefiled_ctl *tctl = arg; - struct cfs_trace_page *tage; - struct cfs_trace_page *tmp; - cfs_file_t *filp; - int last_loop = 0; - int rc; - - CFS_DECL_MMSPACE; + struct page_collection pc; + struct tracefiled_ctl *tctl = arg; + struct cfs_trace_page *tage; + struct cfs_trace_page *tmp; + mm_segment_t __oldfs; + struct file *filp; + char *buf; + int last_loop = 0; + int rc; - /* we're started late enough that we pick up init's fs context */ - /* this is so broken in uml? what on earth is going on? */ - cfs_daemonize("ktracefiled"); + /* we're started late enough that we pick up init's fs context */ + /* this is so broken in uml? what on earth is going on? */ - cfs_spin_lock_init(&pc.pc_lock); - cfs_complete(&tctl->tctl_start); + complete(&tctl->tctl_start); - while (1) { - cfs_waitlink_t __wait; + while (1) { + wait_queue_t __wait; pc.pc_want_daemon_pages = 0; collect_pages(&pc); - if (cfs_list_empty(&pc.pc_pages)) + if (list_empty(&pc.pc_pages)) goto end_loop; filp = NULL; cfs_tracefile_read_lock(); if (cfs_tracefile[0] != 0) { - filp = cfs_filp_open(cfs_tracefile, - O_CREAT | O_RDWR | O_LARGEFILE, - 0600, &rc); - if (!(filp)) - printk(CFS_KERN_WARNING "couldn't open %s: " - "%d\n", cfs_tracefile, rc); - } + filp = filp_open(cfs_tracefile, + O_CREAT | O_RDWR | O_LARGEFILE, + 0600); + if (IS_ERR(filp)) { + rc = PTR_ERR(filp); + filp = NULL; + printk(KERN_WARNING "couldn't open %s: " + "%d\n", cfs_tracefile, rc); + } + } cfs_tracefile_read_unlock(); if (filp == NULL) { put_pages_on_daemon_list(&pc); - __LASSERT(cfs_list_empty(&pc.pc_pages)); + __LASSERT(list_empty(&pc.pc_pages)); goto end_loop; } - - CFS_MMSPACE_OPEN; - - cfs_list_for_each_entry_safe_typed(tage, tmp, &pc.pc_pages, - struct cfs_trace_page, - linkage) { - static loff_t f_pos; - - __LASSERT_TAGE_INVARIANT(tage); - - if (f_pos >= (off_t)cfs_tracefile_size) - f_pos = 0; - else if (f_pos > (off_t)cfs_filp_size(filp)) - f_pos = cfs_filp_size(filp); - - rc = cfs_filp_write(filp, cfs_page_address(tage->page), - tage->used, &f_pos); - if (rc != (int)tage->used) { - printk(CFS_KERN_WARNING "wanted to write %u " - "but wrote %d\n", tage->used, rc); - put_pages_back(&pc); - __LASSERT(cfs_list_empty(&pc.pc_pages)); - } + __oldfs = get_fs(); + set_fs(get_ds()); + + list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { + struct dentry *de = filp->f_path.dentry; + static loff_t f_pos; + + __LASSERT_TAGE_INVARIANT(tage); + + if (f_pos >= (off_t)cfs_tracefile_size) + f_pos = 0; + else if (f_pos > i_size_read(de->d_inode)) + f_pos = i_size_read(de->d_inode); + + buf = kmap(tage->page); + rc = vfs_write(filp, (__force const char __user *)buf, + tage->used, &f_pos); + kunmap(tage->page); + if (rc != (int)tage->used) { + printk(KERN_WARNING "wanted to write %u " + "but wrote %d\n", tage->used, rc); + put_pages_back(&pc); + __LASSERT(list_empty(&pc.pc_pages)); + break; + } } - CFS_MMSPACE_CLOSE; + set_fs(__oldfs); - cfs_filp_close(filp); + filp_close(filp, NULL); put_pages_on_daemon_list(&pc); - if (!cfs_list_empty(&pc.pc_pages)) { + if (!list_empty(&pc.pc_pages)) { int i; - printk(CFS_KERN_ALERT "Lustre: trace pages aren't " - " empty\n"); - printk(CFS_KERN_ERR "total cpus(%d): ", - cfs_num_possible_cpus()); - for (i = 0; i < cfs_num_possible_cpus(); i++) - if (cfs_cpu_online(i)) - printk(CFS_KERN_ERR "%d(on) ", i); - else - printk(CFS_KERN_ERR "%d(off) ", i); - printk(CFS_KERN_ERR "\n"); - - i = 0; - cfs_list_for_each_entry_safe(tage, tmp, &pc.pc_pages, - linkage) - printk(CFS_KERN_ERR "page %d belongs to cpu " - "%d\n", ++i, tage->cpu); - printk(CFS_KERN_ERR "There are %d pages unwritten\n", - i); - } - __LASSERT(cfs_list_empty(&pc.pc_pages)); + printk(KERN_ALERT "Lustre: trace pages aren't " + " empty\n"); + printk(KERN_ERR "total cpus(%d): ", + num_possible_cpus()); + for (i = 0; i < num_possible_cpus(); i++) + if (cpu_online(i)) + printk(KERN_ERR "%d(on) ", i); + else + printk(KERN_ERR "%d(off) ", i); + printk(KERN_ERR "\n"); + + i = 0; + list_for_each_entry_safe(tage, tmp, &pc.pc_pages, + linkage) + printk(KERN_ERR "page %d belongs to cpu " + "%d\n", ++i, tage->cpu); + printk(KERN_ERR "There are %d pages unwritten\n", + i); + } + __LASSERT(list_empty(&pc.pc_pages)); end_loop: - if (cfs_atomic_read(&tctl->tctl_shutdown)) { - if (last_loop == 0) { - last_loop = 1; - continue; - } else { - break; - } - } - cfs_waitlink_init(&__wait); - cfs_waitq_add(&tctl->tctl_waitq, &__wait); - cfs_set_current_state(CFS_TASK_INTERRUPTIBLE); - cfs_waitq_timedwait(&__wait, CFS_TASK_INTERRUPTIBLE, - cfs_time_seconds(1)); - cfs_waitq_del(&tctl->tctl_waitq, &__wait); + if (atomic_read(&tctl->tctl_shutdown)) { + if (last_loop == 0) { + last_loop = 1; + continue; + } else { + break; + } + } + init_waitqueue_entry(&__wait, current); + add_wait_queue(&tctl->tctl_waitq, &__wait); + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout(cfs_time_seconds(1)); + remove_wait_queue(&tctl->tctl_waitq, &__wait); } - cfs_complete(&tctl->tctl_stop); + complete(&tctl->tctl_stop); return 0; } @@ -1087,107 +1065,101 @@ int cfs_trace_start_thread(void) struct tracefiled_ctl *tctl = &trace_tctl; int rc = 0; - cfs_mutex_down(&cfs_trace_thread_sem); + mutex_lock(&cfs_trace_thread_mutex); if (thread_running) goto out; - cfs_init_completion(&tctl->tctl_start); - cfs_init_completion(&tctl->tctl_stop); - cfs_waitq_init(&tctl->tctl_waitq); - cfs_atomic_set(&tctl->tctl_shutdown, 0); + init_completion(&tctl->tctl_start); + init_completion(&tctl->tctl_stop); + init_waitqueue_head(&tctl->tctl_waitq); + atomic_set(&tctl->tctl_shutdown, 0); - if (cfs_kernel_thread(tracefiled, tctl, 0) < 0) { - rc = -ECHILD; - goto out; - } + if (IS_ERR(kthread_run(tracefiled, tctl, "ktracefiled"))) { + rc = -ECHILD; + goto out; + } - cfs_wait_for_completion(&tctl->tctl_start); - thread_running = 1; + wait_for_completion(&tctl->tctl_start); + thread_running = 1; out: - cfs_mutex_up(&cfs_trace_thread_sem); + mutex_unlock(&cfs_trace_thread_mutex); return rc; } void cfs_trace_stop_thread(void) { - struct tracefiled_ctl *tctl = &trace_tctl; - - cfs_mutex_down(&cfs_trace_thread_sem); - if (thread_running) { - printk(CFS_KERN_INFO - "Lustre: shutting down debug daemon thread...\n"); - cfs_atomic_set(&tctl->tctl_shutdown, 1); - cfs_wait_for_completion(&tctl->tctl_stop); - thread_running = 0; - } - cfs_mutex_up(&cfs_trace_thread_sem); + struct tracefiled_ctl *tctl = &trace_tctl; + + mutex_lock(&cfs_trace_thread_mutex); + if (thread_running) { + printk(KERN_INFO + "Lustre: shutting down debug daemon thread...\n"); + atomic_set(&tctl->tctl_shutdown, 1); + wait_for_completion(&tctl->tctl_stop); + thread_running = 0; + } + mutex_unlock(&cfs_trace_thread_mutex); } int cfs_tracefile_init(int max_pages) { - struct cfs_trace_cpu_data *tcd; - int i; - int j; - int rc; - int factor; - - rc = cfs_tracefile_init_arch(); - if (rc != 0) - return rc; - - cfs_tcd_for_each(tcd, i, j) { - /* tcd_pages_factor is initialized int tracefile_init_arch. */ - factor = tcd->tcd_pages_factor; - CFS_INIT_LIST_HEAD(&tcd->tcd_pages); - CFS_INIT_LIST_HEAD(&tcd->tcd_stock_pages); - CFS_INIT_LIST_HEAD(&tcd->tcd_daemon_pages); - tcd->tcd_cur_pages = 0; - tcd->tcd_cur_stock_pages = 0; - tcd->tcd_cur_daemon_pages = 0; - tcd->tcd_max_pages = (max_pages * factor) / 100; - LASSERT(tcd->tcd_max_pages > 0); - tcd->tcd_shutting_down = 0; - } - - return 0; + struct cfs_trace_cpu_data *tcd; + int i; + int j; + int rc; + int factor; + + rc = cfs_tracefile_init_arch(); + if (rc != 0) + return rc; + + cfs_tcd_for_each(tcd, i, j) { + /* tcd_pages_factor is initialized int tracefile_init_arch. */ + factor = tcd->tcd_pages_factor; + INIT_LIST_HEAD(&tcd->tcd_pages); + INIT_LIST_HEAD(&tcd->tcd_stock_pages); + INIT_LIST_HEAD(&tcd->tcd_daemon_pages); + tcd->tcd_cur_pages = 0; + tcd->tcd_cur_stock_pages = 0; + tcd->tcd_cur_daemon_pages = 0; + tcd->tcd_max_pages = (max_pages * factor) / 100; + LASSERT(tcd->tcd_max_pages > 0); + tcd->tcd_shutting_down = 0; + } + return 0; } static void trace_cleanup_on_all_cpus(void) { - struct cfs_trace_cpu_data *tcd; - struct cfs_trace_page *tage; - struct cfs_trace_page *tmp; - int i, cpu; - - cfs_for_each_possible_cpu(cpu) { - cfs_tcd_for_each_type_lock(tcd, i, cpu) { - tcd->tcd_shutting_down = 1; - - cfs_list_for_each_entry_safe_typed(tage, tmp, - &tcd->tcd_pages, - struct cfs_trace_page, - linkage) { - __LASSERT_TAGE_INVARIANT(tage); - - cfs_list_del(&tage->linkage); - cfs_tage_free(tage); - } - - tcd->tcd_cur_pages = 0; - } - } + struct cfs_trace_cpu_data *tcd; + struct cfs_trace_page *tage; + struct cfs_trace_page *tmp; + int i, cpu; + + for_each_possible_cpu(cpu) { + cfs_tcd_for_each_type_lock(tcd, i, cpu) { + tcd->tcd_shutting_down = 1; + + list_for_each_entry_safe(tage, tmp, &tcd->tcd_pages, linkage) { + __LASSERT_TAGE_INVARIANT(tage); + + list_del(&tage->linkage); + cfs_tage_free(tage); + } + tcd->tcd_cur_pages = 0; + } + } } static void cfs_trace_cleanup(void) { - struct page_collection pc; + struct page_collection pc; - CFS_INIT_LIST_HEAD(&pc.pc_pages); - cfs_spin_lock_init(&pc.pc_lock); + INIT_LIST_HEAD(&pc.pc_pages); - trace_cleanup_on_all_cpus(); + trace_cleanup_on_all_cpus(); - cfs_tracefile_fini_arch(); + cfs_tracefile_fini_arch(); } void cfs_tracefile_exit(void)