X-Git-Url: http://rtime.felk.cvut.cz/gitweb/socketcan-devel.git/blobdiff_plain/9ffbf57c82baa234cdc90f393e93f9e49594eda4..cb42c174307d6fe15f5602716966dd9f6142cc57:/kernel/2.6/net/can/proc.c diff --git a/kernel/2.6/net/can/proc.c b/kernel/2.6/net/can/proc.c index 99b4e21..9c785c0 100644 --- a/kernel/2.6/net/can/proc.c +++ b/kernel/2.6/net/can/proc.c @@ -1,15 +1,14 @@ /* - * af_can_proc.c + * proc.c - procfs support for Protocol family CAN core module * - * Copyright (c) 2002-2005 Volkswagen Group Electronic Research + * Copyright (c) 2002-2007 Volkswagen Group Electronic Research * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, the following disclaimer and - * the referenced file 'COPYING'. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. @@ -19,8 +18,8 @@ * * Alternatively, provided that this notice is retained in full, this * software may be distributed under the terms of the GNU General - * Public License ("GPL") version 2 as distributed in the 'COPYING' - * file from the main directory of the linux kernel source. + * Public License ("GPL") version 2, in which case the provisions of the + * GPL apply INSTEAD OF those given above. * * The provided data structures and external interfaces from this code * are not restricted to be used by modules with a GPL compatible license. @@ -43,18 +42,23 @@ */ #include +#include #include #include #include - -#include +#include #include "af_can.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) +#include "compat.h" +#endif - +#include /* for RCSID. Removed by mkpatch script */ RCSID("$Id$"); -/* proc filenames */ +/* + * proc filenames for the PF_CAN core + */ #define CAN_PROC_VERSION "version" #define CAN_PROC_STATS "stats" @@ -66,158 +70,394 @@ RCSID("$Id$"); #define CAN_PROC_RCVLIST_EFF "rcvlist_eff" #define CAN_PROC_RCVLIST_ERR "rcvlist_err" -static void can_init_stats(int caller); -static void can_stat_update(unsigned long data); +static struct proc_dir_entry *can_dir; +static struct proc_dir_entry *pde_version; +static struct proc_dir_entry *pde_stats; +static struct proc_dir_entry *pde_reset_stats; +static struct proc_dir_entry *pde_rcvlist_all; +static struct proc_dir_entry *pde_rcvlist_fil; +static struct proc_dir_entry *pde_rcvlist_inv; +static struct proc_dir_entry *pde_rcvlist_sff; +static struct proc_dir_entry *pde_rcvlist_eff; +static struct proc_dir_entry *pde_rcvlist_err; + +static int user_reset; + +static const char rx_list_name[][8] = { + [RX_ERR] = "rx_err", + [RX_ALL] = "rx_all", + [RX_FIL] = "rx_fil", + [RX_INV] = "rx_inv", + [RX_EFF] = "rx_eff", +}; + +/* + * af_can statistics stuff + */ + +static void can_init_stats(void) +{ + /* + * This memset function is called from a timer context (when + * can_stattimer is active which is the default) OR in a process + * context (reading the proc_fs when can_stattimer is disabled). + */ + memset(&can_stats, 0, sizeof(can_stats)); + can_stats.jiffies_init = jiffies; + + can_pstats.stats_reset++; + + if (user_reset) { + user_reset = 0; + can_pstats.user_reset++; + } +} -static struct proc_dir_entry *can_create_proc_read_entry(const char *name, - mode_t mode, read_proc_t* read_proc, void *data); -static void can_remove_proc_entry(const char *name); static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif, - unsigned long count); + unsigned long count) +{ + unsigned long rate; -static int can_proc_read_version(char *page, char **start, off_t off, - int count, int *eof, void *data); -static int can_proc_read_stats(char *page, char **start, off_t off, - int count, int *eof, void *data); -static int can_proc_read_reset_stats(char *page, char **start, off_t off, - int count, int *eof, void *data); -static int can_proc_read_rcvlist_all(char *page, char **start, off_t off, - int count, int *eof, void *data); -static int can_proc_read_rcvlist_fil(char *page, char **start, off_t off, - int count, int *eof, void *data); -static int can_proc_read_rcvlist_inv(char *page, char **start, off_t off, - int count, int *eof, void *data); -static int can_proc_read_rcvlist_sff(char *page, char **start, off_t off, - int count, int *eof, void *data); -static int can_proc_read_rcvlist_eff(char *page, char **start, off_t off, - int count, int *eof, void *data); -static int can_proc_read_rcvlist_err(char *page, char **start, off_t off, - int count, int *eof, void *data); - -static struct proc_dir_entry *can_dir = NULL; -static struct proc_dir_entry *pde_version = NULL; -static struct proc_dir_entry *pde_stats = NULL; -static struct proc_dir_entry *pde_reset_stats = NULL; -static struct proc_dir_entry *pde_rcvlist_all = NULL; -static struct proc_dir_entry *pde_rcvlist_fil = NULL; -static struct proc_dir_entry *pde_rcvlist_inv = NULL; -static struct proc_dir_entry *pde_rcvlist_sff = NULL; -static struct proc_dir_entry *pde_rcvlist_eff = NULL; -static struct proc_dir_entry *pde_rcvlist_err = NULL; - -struct timer_list stattimer; /* timer for statistics update */ - -struct s_stats stats; /* statistics */ -struct s_pstats pstats; - -extern struct hlist_head rx_dev_list; /* rx dispatcher structures */ -extern int stats_timer; /* module parameter. default: on */ - -/**************************************************/ -/* procfs init / remove */ -/**************************************************/ + if (oldjif == newjif) + return 0; -void can_init_proc(void) + /* see can_stat_update() - this should NEVER happen! */ + if (count > (ULONG_MAX / HZ)) { + printk(KERN_ERR "can: calc_rate: count exceeded! %ld\n", + count); + return 99999999; + } + + rate = (count * HZ) / (newjif - oldjif); + + return rate; +} + +void can_stat_update(unsigned long data) { + unsigned long j = jiffies; /* snapshot */ - /* procfs init */ + /* restart counting in timer context on user request */ + if (user_reset) + can_init_stats(); - /* create /proc/can directory */ - can_dir = proc_mkdir(CAN_PROC_DIR, NULL); + /* restart counting on jiffies overflow */ + if (j < can_stats.jiffies_init) + can_init_stats(); - if (!can_dir) { - printk(KERN_INFO "af_can: failed to create CAN_PROC_DIR. " - "CONFIG_PROC_FS missing?\n"); - return; + /* prevent overflow in calc_rate() */ + if (can_stats.rx_frames > (ULONG_MAX / HZ)) + can_init_stats(); + + /* prevent overflow in calc_rate() */ + if (can_stats.tx_frames > (ULONG_MAX / HZ)) + can_init_stats(); + + /* matches overflow - very improbable */ + if (can_stats.matches > (ULONG_MAX / 100)) + can_init_stats(); + + /* calc total values */ + if (can_stats.rx_frames) + can_stats.total_rx_match_ratio = (can_stats.matches * 100) / + can_stats.rx_frames; + + can_stats.total_tx_rate = calc_rate(can_stats.jiffies_init, j, + can_stats.tx_frames); + can_stats.total_rx_rate = calc_rate(can_stats.jiffies_init, j, + can_stats.rx_frames); + + /* calc current values */ + if (can_stats.rx_frames_delta) + can_stats.current_rx_match_ratio = + (can_stats.matches_delta * 100) / + can_stats.rx_frames_delta; + + can_stats.current_tx_rate = calc_rate(0, HZ, can_stats.tx_frames_delta); + can_stats.current_rx_rate = calc_rate(0, HZ, can_stats.rx_frames_delta); + + /* check / update maximum values */ + if (can_stats.max_tx_rate < can_stats.current_tx_rate) + can_stats.max_tx_rate = can_stats.current_tx_rate; + + if (can_stats.max_rx_rate < can_stats.current_rx_rate) + can_stats.max_rx_rate = can_stats.current_rx_rate; + + if (can_stats.max_rx_match_ratio < can_stats.current_rx_match_ratio) + can_stats.max_rx_match_ratio = can_stats.current_rx_match_ratio; + + /* clear values for 'current rate' calculation */ + can_stats.tx_frames_delta = 0; + can_stats.rx_frames_delta = 0; + can_stats.matches_delta = 0; + + /* restart timer (one second) */ + mod_timer(&can_stattimer, round_jiffies(jiffies + HZ)); +} + +/* + * proc read functions + * + * From known use-cases we expect about 10 entries in a receive list to be + * printed in the proc_fs. So PAGE_SIZE is definitely enough space here. + * + */ + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) +static void can_print_rcvlist(struct seq_file *m, struct hlist_head *rx_list, + struct net_device *dev) +{ + struct receiver *r; + struct hlist_node *n; + + hlist_for_each_entry_rcu(r, n, rx_list, list) { + char *fmt = (r->can_id & CAN_EFF_FLAG)? +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + " %-5s %08x %08x %p %p %8ld %s\n" : + " %-5s %03x %08x %p %p %8ld %s\n"; +#else + " %-5s %08x %08x %pK %pK %8ld %s\n" : + " %-5s %03x %08x %pK %pK %8ld %s\n"; +#endif + + seq_printf(m, fmt, DNAME(dev), r->can_id, r->mask, + r->func, r->data, r->matches, r->ident); } +} - can_dir->owner = THIS_MODULE; +static void can_print_recv_banner(struct seq_file *m) +{ + /* + * can1. 00000000 00000000 00000000 + * ....... 0 tp20 + */ + seq_puts(m, " device can_id can_mask function" + " userdata matches ident\n"); +} - /* own procfs entries from the AF_CAN core */ - pde_version = can_create_proc_read_entry( - CAN_PROC_VERSION, 0644, can_proc_read_version, NULL); - pde_stats = can_create_proc_read_entry( - CAN_PROC_STATS, 0644, can_proc_read_stats, NULL); - pde_reset_stats = can_create_proc_read_entry( - CAN_PROC_RESET_STATS, 0644, can_proc_read_reset_stats, NULL); - pde_rcvlist_all = can_create_proc_read_entry( - CAN_PROC_RCVLIST_ALL, 0644, can_proc_read_rcvlist_all, NULL); - pde_rcvlist_fil = can_create_proc_read_entry( - CAN_PROC_RCVLIST_FIL, 0644, can_proc_read_rcvlist_fil, NULL); - pde_rcvlist_inv = can_create_proc_read_entry( - CAN_PROC_RCVLIST_INV, 0644, can_proc_read_rcvlist_inv, NULL); - pde_rcvlist_sff = can_create_proc_read_entry( - CAN_PROC_RCVLIST_SFF, 0644, can_proc_read_rcvlist_sff, NULL); - pde_rcvlist_eff = can_create_proc_read_entry( - CAN_PROC_RCVLIST_EFF, 0644, can_proc_read_rcvlist_eff, NULL); - pde_rcvlist_err = can_create_proc_read_entry( - CAN_PROC_RCVLIST_ERR, 0644, can_proc_read_rcvlist_err, NULL); - - if (stats_timer) { - /* the statistics are updated every second (timer triggered) */ - stattimer.function = can_stat_update; - stattimer.data = 0; - stattimer.expires = jiffies + HZ; /* every second */ - add_timer(&stattimer); /* start statistics timer */ +static int can_stats_proc_show(struct seq_file *m, void *v) +{ + seq_putc(m, '\n'); + seq_printf(m, " %8ld transmitted frames (TXF)\n", can_stats.tx_frames); + seq_printf(m, " %8ld received frames (RXF)\n", can_stats.rx_frames); + seq_printf(m, " %8ld matched frames (RXMF)\n", can_stats.matches); + + seq_putc(m, '\n'); + + if (can_stattimer.function == can_stat_update) { + seq_printf(m, " %8ld %% total match ratio (RXMR)\n", + can_stats.total_rx_match_ratio); + + seq_printf(m, " %8ld frames/s total tx rate (TXR)\n", + can_stats.total_tx_rate); + seq_printf(m, " %8ld frames/s total rx rate (RXR)\n", + can_stats.total_rx_rate); + + seq_putc(m, '\n'); + + seq_printf(m, " %8ld %% current match ratio (CRXMR)\n", + can_stats.current_rx_match_ratio); + + seq_printf(m, " %8ld frames/s current tx rate (CTXR)\n", + can_stats.current_tx_rate); + seq_printf(m, " %8ld frames/s current rx rate (CRXR)\n", + can_stats.current_rx_rate); + + seq_putc(m, '\n'); + + seq_printf(m, " %8ld %% max match ratio (MRXMR)\n", + can_stats.max_rx_match_ratio); + + seq_printf(m, " %8ld frames/s max tx rate (MTXR)\n", + can_stats.max_tx_rate); + seq_printf(m, " %8ld frames/s max rx rate (MRXR)\n", + can_stats.max_rx_rate); + + seq_putc(m, '\n'); } + + seq_printf(m, " %8ld current receive list entries (CRCV)\n", + can_pstats.rcv_entries); + seq_printf(m, " %8ld maximum receive list entries (MRCV)\n", + can_pstats.rcv_entries_max); + + if (can_pstats.stats_reset) + seq_printf(m, "\n %8ld statistic resets (STR)\n", + can_pstats.stats_reset); + + if (can_pstats.user_reset) + seq_printf(m, " %8ld user statistic resets (USTR)\n", + can_pstats.user_reset); + + seq_putc(m, '\n'); + return 0; } -void can_remove_proc(void) +static int can_stats_proc_open(struct inode *inode, struct file *file) { - /* procfs remove */ - if (pde_version) - can_remove_proc_entry(CAN_PROC_VERSION); + return single_open(file, can_stats_proc_show, NULL); +} - if (pde_stats) - can_remove_proc_entry(CAN_PROC_STATS); +static const struct file_operations can_stats_proc_fops = { + .owner = THIS_MODULE, + .open = can_stats_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; - if (pde_reset_stats) - can_remove_proc_entry(CAN_PROC_RESET_STATS); +static int can_reset_stats_proc_show(struct seq_file *m, void *v) +{ + user_reset = 1; - if (pde_rcvlist_all) - can_remove_proc_entry(CAN_PROC_RCVLIST_ALL); + if (can_stattimer.function == can_stat_update) { + seq_printf(m, "Scheduled statistic reset #%ld.\n", + can_pstats.stats_reset + 1); - if (pde_rcvlist_fil) - can_remove_proc_entry(CAN_PROC_RCVLIST_FIL); + } else { + if (can_stats.jiffies_init != jiffies) + can_init_stats(); - if (pde_rcvlist_inv) - can_remove_proc_entry(CAN_PROC_RCVLIST_INV); + seq_printf(m, "Performed statistic reset #%ld.\n", + can_pstats.stats_reset); + } + return 0; +} - if (pde_rcvlist_sff) - can_remove_proc_entry(CAN_PROC_RCVLIST_SFF); +static int can_reset_stats_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, can_reset_stats_proc_show, NULL); +} - if (pde_rcvlist_eff) - can_remove_proc_entry(CAN_PROC_RCVLIST_EFF); +static const struct file_operations can_reset_stats_proc_fops = { + .owner = THIS_MODULE, + .open = can_reset_stats_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; - if (pde_rcvlist_err) - can_remove_proc_entry(CAN_PROC_RCVLIST_ERR); +static int can_version_proc_show(struct seq_file *m, void *v) +{ + seq_printf(m, "%s\n", CAN_VERSION_STRING); + return 0; +} - if (can_dir) - remove_proc_entry(CAN_PROC_DIR, NULL); +static int can_version_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, can_version_proc_show, NULL); } -/**************************************************/ -/* proc read functions */ -/**************************************************/ +static const struct file_operations can_version_proc_fops = { + .owner = THIS_MODULE, + .open = can_version_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; -static int can_print_recv_list(char *page, int len, struct hlist_head *rx_list, - struct net_device *dev) +static int can_rcvlist_proc_show(struct seq_file *m, void *v) { - struct receiver *r; + /* double cast to prevent GCC warning */ + int idx = (int)(long)m->private; + struct dev_rcv_lists *d; struct hlist_node *n; + seq_printf(m, "\nreceive list '%s':\n", rx_list_name[idx]); + rcu_read_lock(); + hlist_for_each_entry_rcu(d, n, &can_rx_dev_list, list) { + + if (!hlist_empty(&d->rx[idx])) { + can_print_recv_banner(m); + can_print_rcvlist(m, &d->rx[idx], d->dev); + } else + seq_printf(m, " (%s: no entry)\n", DNAME(d->dev)); + } + rcu_read_unlock(); + + seq_putc(m, '\n'); + return 0; +} + +static int can_rcvlist_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, can_rcvlist_proc_show, PDE(inode)->data); +} + +static const struct file_operations can_rcvlist_proc_fops = { + .owner = THIS_MODULE, + .open = can_rcvlist_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v) +{ + struct dev_rcv_lists *d; + struct hlist_node *n; + + /* RX_SFF */ + seq_puts(m, "\nreceive list 'rx_sff':\n"); + + rcu_read_lock(); + hlist_for_each_entry_rcu(d, n, &can_rx_dev_list, list) { + int i, all_empty = 1; + /* check wether at least one list is non-empty */ + for (i = 0; i < 0x800; i++) + if (!hlist_empty(&d->rx_sff[i])) { + all_empty = 0; + break; + } + + if (!all_empty) { + can_print_recv_banner(m); + for (i = 0; i < 0x800; i++) { + if (!hlist_empty(&d->rx_sff[i])) + can_print_rcvlist(m, &d->rx_sff[i], + d->dev); + } + } else + seq_printf(m, " (%s: no entry)\n", DNAME(d->dev)); + } + rcu_read_unlock(); + + seq_putc(m, '\n'); + return 0; +} + +static int can_rcvlist_sff_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, can_rcvlist_sff_proc_show, NULL); +} + +static const struct file_operations can_rcvlist_sff_proc_fops = { + .owner = THIS_MODULE, + .open = can_rcvlist_sff_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +#else +static int can_print_rcvlist(char *page, int len, struct hlist_head *rx_list, + struct net_device *dev) +{ + struct receiver *r; + struct hlist_node *n; + hlist_for_each_entry_rcu(r, n, rx_list, list) { - char *fmt = r->can_id & CAN_EFF_FLAG ? /* EFF & CAN_ID_ALL */ + char *fmt = (r->can_id & CAN_EFF_FLAG)? " %-5s %08X %08x %08x %08x %8ld %s\n" : - " %-5s %03X %08x %08x %08x %8ld %s\n"; + " %-5s %03X %08x %08lx %08lx %8ld %s\n"; len += snprintf(page + len, PAGE_SIZE - len, fmt, - dev->name, r->can_id, r->mask, - (unsigned int)r->func, (unsigned int)r->data, + DNAME(dev), r->can_id, r->mask, + (unsigned long)r->func, (unsigned long)r->data, r->matches, r->ident); /* does a typical line fit into the current buffer? */ + /* 100 Bytes before end of buffer */ if (len > PAGE_SIZE - 100) { /* mark output cut off */ @@ -226,15 +466,16 @@ static int can_print_recv_list(char *page, int len, struct hlist_head *rx_list, break; } } - rcu_read_unlock(); return len; } static int can_print_recv_banner(char *page, int len) { - /* can1. 00000000 00000000 00000000 - ....... 0 tp20 */ + /* + * can1. 00000000 00000000 00000000 + * ....... 0 tp20 + */ len += snprintf(page + len, PAGE_SIZE - len, " device can_id can_mask function" " userdata matches ident\n"); @@ -249,64 +490,72 @@ static int can_proc_read_stats(char *page, char **start, off_t off, len += snprintf(page + len, PAGE_SIZE - len, "\n"); len += snprintf(page + len, PAGE_SIZE - len, - " %8ld transmitted frames (TXF)\n", stats.tx_frames); + " %8ld transmitted frames (TXF)\n", + can_stats.tx_frames); len += snprintf(page + len, PAGE_SIZE - len, - " %8ld received frames (RXF)\n", stats.rx_frames); + " %8ld received frames (RXF)\n", can_stats.rx_frames); len += snprintf(page + len, PAGE_SIZE - len, - " %8ld matched frames (RXMF)\n", stats.matches); + " %8ld matched frames (RXMF)\n", can_stats.matches); len += snprintf(page + len, PAGE_SIZE - len, "\n"); - len += snprintf(page + len, PAGE_SIZE - len, - " %8ld %% total match ratio (RXMR)\n", - stats.total_rx_match_ratio); + if (can_stattimer.function == can_stat_update) { + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld %% total match ratio (RXMR)\n", + can_stats.total_rx_match_ratio); - len += snprintf(page + len, PAGE_SIZE - len, - " %8ld frames/s total tx rate (TXR)\n", - stats.total_tx_rate); - len += snprintf(page + len, PAGE_SIZE - len, - " %8ld frames/s total rx rate (RXR)\n", - stats.total_rx_rate); + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld frames/s total tx rate (TXR)\n", + can_stats.total_tx_rate); + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld frames/s total rx rate (RXR)\n", + can_stats.total_rx_rate); - len += snprintf(page + len, PAGE_SIZE - len, "\n"); + len += snprintf(page + len, PAGE_SIZE - len, "\n"); - len += snprintf(page + len, PAGE_SIZE - len, - " %8ld %% current match ratio (CRXMR)\n", - stats.current_rx_match_ratio); + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld %% current match ratio (CRXMR)\n", + can_stats.current_rx_match_ratio); - len += snprintf(page + len, PAGE_SIZE - len, - " %8ld frames/s current tx rate (CTXR)\n", - stats.current_tx_rate); - len += snprintf(page + len, PAGE_SIZE - len, - " %8ld frames/s current rx rate (CRXR)\n", - stats.current_rx_rate); + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld frames/s current tx rate (CTXR)\n", + can_stats.current_tx_rate); + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld frames/s current rx rate (CRXR)\n", + can_stats.current_rx_rate); - len += snprintf(page + len, PAGE_SIZE - len, "\n"); + len += snprintf(page + len, PAGE_SIZE - len, "\n"); - len += snprintf(page + len, PAGE_SIZE - len, - " %8ld %% max match ratio (MRXMR)\n", - stats.max_rx_match_ratio); + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld %% max match ratio (MRXMR)\n", + can_stats.max_rx_match_ratio); - len += snprintf(page + len, PAGE_SIZE - len, - " %8ld frames/s max tx rate (MTXR)\n", - stats.max_tx_rate); - len += snprintf(page + len, PAGE_SIZE - len, - " %8ld frames/s max rx rate (MRXR)\n", - stats.max_rx_rate); + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld frames/s max tx rate (MTXR)\n", + can_stats.max_tx_rate); + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld frames/s max rx rate (MRXR)\n", + can_stats.max_rx_rate); - len += snprintf(page + len, PAGE_SIZE - len, "\n"); + len += snprintf(page + len, PAGE_SIZE - len, "\n"); + } len += snprintf(page + len, PAGE_SIZE - len, " %8ld current receive list entries (CRCV)\n", - pstats.rcv_entries); + can_pstats.rcv_entries); len += snprintf(page + len, PAGE_SIZE - len, " %8ld maximum receive list entries (MRCV)\n", - pstats.rcv_entries_max); + can_pstats.rcv_entries_max); - if (pstats.stats_reset) + if (can_pstats.stats_reset) len += snprintf(page + len, PAGE_SIZE - len, "\n %8ld statistic resets (STR)\n", - pstats.stats_reset); + can_pstats.stats_reset); + + if (can_pstats.user_reset) + len += snprintf(page + len, PAGE_SIZE - len, + " %8ld user statistic resets (USTR)\n", + can_pstats.user_reset); len += snprintf(page + len, PAGE_SIZE - len, "\n"); @@ -319,109 +568,62 @@ static int can_proc_read_reset_stats(char *page, char **start, off_t off, { int len = 0; - can_init_stats(1); + user_reset = 1; - len += snprintf(page + len, PAGE_SIZE - len, - "CAN statistic reset #%ld done.\n", pstats.stats_reset); - - *eof = 1; - return len; -} - -static int can_proc_read_version(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = 0; - - len += snprintf(page + len, PAGE_SIZE - len, - "%06X [ Volkswagen AG - Low Level CAN Framework (LLCF) v%s ]\n", - LLCF_VERSION_CODE, VERSION); - - *eof = 1; - return len; -} - -static int can_proc_read_rcvlist_all(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = 0; - struct dev_rcv_lists *d; - struct hlist_node *n; - - /* RX_ALL */ - len += snprintf(page + len, PAGE_SIZE - len, - "\nreceive list 'rx_all':\n"); + if (can_stattimer.function == can_stat_update) { + len += snprintf(page + len, PAGE_SIZE - len, + "Scheduled statistic reset #%ld.\n", + can_pstats.stats_reset + 1); - /* find receive list for this device */ - rcu_read_lock(); - hlist_for_each_entry_rcu(d, n, &rx_dev_list, list) { + } else { + if (can_stats.jiffies_init != jiffies) + can_init_stats(); - if (!hlist_empty(&d->rx_all)) { - len = can_print_recv_banner(page, len); - len = can_print_recv_list(page, len, &d->rx_all, d->dev); - } else if (d->dev) - len += snprintf(page + len, PAGE_SIZE - len, - " (%s: no entry)\n", d->dev->name); + len += snprintf(page + len, PAGE_SIZE - len, + "Performed statistic reset #%ld.\n", + can_pstats.stats_reset); } - rcu_read_unlock(); - - len += snprintf(page + len, PAGE_SIZE - len, "\n"); *eof = 1; return len; } -static int can_proc_read_rcvlist_fil(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int can_proc_read_version(char *page, char **start, off_t off, + int count, int *eof, void *data) { int len = 0; - struct dev_rcv_lists *d; - struct hlist_node *n; - - /* RX_FIL */ - len += snprintf(page + len, PAGE_SIZE - len, - "\nreceive list 'rx_fil':\n"); - - /* find receive list for this device */ - rcu_read_lock(); - hlist_for_each_entry_rcu(d, n, &rx_dev_list, list) { - - if (!hlist_empty(&d->rx_fil)) { - len = can_print_recv_banner(page, len); - len = can_print_recv_list(page, len, &d->rx_fil, d->dev); - } else if (d->dev) - len += snprintf(page + len, PAGE_SIZE - len, - " (%s: no entry)\n", d->dev->name); - } - rcu_read_unlock(); - - len += snprintf(page + len, PAGE_SIZE - len, "\n"); + len += snprintf(page + len, PAGE_SIZE - len, "%s\n", + CAN_VERSION_STRING); *eof = 1; return len; } -static int can_proc_read_rcvlist_inv(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int can_proc_read_rcvlist(char *page, char **start, off_t off, + int count, int *eof, void *data) { + /* double cast to prevent GCC warning */ + int idx = (int)(long)data; int len = 0; struct dev_rcv_lists *d; struct hlist_node *n; - /* RX_INV */ len += snprintf(page + len, PAGE_SIZE - len, - "\nreceive list 'rx_inv':\n"); + "\nreceive list '%s':\n", rx_list_name[idx]); - /* find receive list for this device */ rcu_read_lock(); - hlist_for_each_entry_rcu(d, n, &rx_dev_list, list) { + hlist_for_each_entry_rcu(d, n, &can_rx_dev_list, list) { - if (!hlist_empty(&d->rx_inv)) { + if (!hlist_empty(&d->rx[idx])) { len = can_print_recv_banner(page, len); - len = can_print_recv_list(page, len, &d->rx_inv, d->dev); - } else if (d->dev) + len = can_print_rcvlist(page, len, &d->rx[idx], d->dev); + } else len += snprintf(page + len, PAGE_SIZE - len, - " (%s: no entry)\n", d->dev->name); + " (%s: no entry)\n", DNAME(d->dev)); + + /* exit on end of buffer? */ + if (len > PAGE_SIZE - 100) + break; } rcu_read_unlock(); @@ -442,9 +644,8 @@ static int can_proc_read_rcvlist_sff(char *page, char **start, off_t off, len += snprintf(page + len, PAGE_SIZE - len, "\nreceive list 'rx_sff':\n"); - /* find receive list for this device */ rcu_read_lock(); - hlist_for_each_entry_rcu(d, n, &rx_dev_list, list) { + hlist_for_each_entry_rcu(d, n, &can_rx_dev_list, list) { int i, all_empty = 1; /* check wether at least one list is non-empty */ for (i = 0; i < 0x800; i++) @@ -455,73 +656,20 @@ static int can_proc_read_rcvlist_sff(char *page, char **start, off_t off, if (!all_empty) { len = can_print_recv_banner(page, len); - for(i = 0; i < 0x800; i++) { - if (!hlist_empty(&d->rx_sff[i]) && len < PAGE_SIZE - 100) - len = can_print_recv_list(page, len, &d->rx_sff[i], d->dev); + for (i = 0; i < 0x800; i++) { + if (!hlist_empty(&d->rx_sff[i]) && + len < PAGE_SIZE - 100) + len = can_print_rcvlist(page, len, + &d->rx_sff[i], + d->dev); } - } else if (d->dev) + } else len += snprintf(page + len, PAGE_SIZE - len, - " (%s: no entry)\n", d->dev->name); - } - rcu_read_unlock(); + " (%s: no entry)\n", DNAME(d->dev)); - len += snprintf(page + len, PAGE_SIZE - len, "\n"); - - *eof = 1; - return len; -} - -static int can_proc_read_rcvlist_eff(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = 0; - struct dev_rcv_lists *d; - struct hlist_node *n; - - /* RX_EFF */ - len += snprintf(page + len, PAGE_SIZE - len, - "\nreceive list 'rx_eff':\n"); - - /* find receive list for this device */ - rcu_read_lock(); - hlist_for_each_entry_rcu(d, n, &rx_dev_list, list) { - - if (!hlist_empty(&d->rx_eff)) { - len = can_print_recv_banner(page, len); - len = can_print_recv_list(page, len, &d->rx_eff, d->dev); - } else if (d->dev) - len += snprintf(page + len, PAGE_SIZE - len, - " (%s: no entry)\n", d->dev->name); - } - rcu_read_unlock(); - - len += snprintf(page + len, PAGE_SIZE - len, "\n"); - - *eof = 1; - return len; -} - -static int can_proc_read_rcvlist_err(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = 0; - struct dev_rcv_lists *d; - struct hlist_node *n; - - /* RX_ERR */ - len += snprintf(page + len, PAGE_SIZE - len, - "\nreceive list 'rx_err':\n"); - - /* find receive list for this device */ - rcu_read_lock(); - hlist_for_each_entry_rcu(d, n, &rx_dev_list, list) { - - if (!hlist_empty(&d->rx_err)) { - len = can_print_recv_banner(page, len); - len = can_print_recv_list(page, len, &d->rx_err, d->dev); - } else if (d->dev) - len += snprintf(page + len, PAGE_SIZE - len, - " (%s: no entry)\n", d->dev->name); + /* exit on end of buffer? */ + if (len > PAGE_SIZE - 100) + break; } rcu_read_unlock(); @@ -530,105 +678,132 @@ static int can_proc_read_rcvlist_err(char *page, char **start, off_t off, *eof = 1; return len; } +#endif -/**************************************************/ -/* proc utility functions */ -/**************************************************/ +/* + * proc utility functions + */ -static struct proc_dir_entry *can_create_proc_read_entry(const char *name, mode_t mode, read_proc_t* read_proc, void *data) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) +static struct proc_dir_entry *can_create_proc_readentry(const char *name, + mode_t mode, + read_proc_t *read_proc, + void *data) { if (can_dir) - return create_proc_read_entry(name, mode, can_dir, read_proc, data); + return create_proc_read_entry(name, mode, can_dir, read_proc, + data); else return NULL; } +#endif -static void can_remove_proc_entry(const char *name) +static void can_remove_proc_readentry(const char *name) { if (can_dir) remove_proc_entry(name, can_dir); } -static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif, - unsigned long count) +/* + * can_init_proc - create main CAN proc directory and procfs entries + */ +void can_init_proc(void) { - unsigned long ret = 0; + /* create /proc/net/can directory */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) + can_dir = proc_mkdir("can", init_net.proc_net); +#else + can_dir = proc_mkdir("can", proc_net); +#endif - if (oldjif == newjif) - return 0; - - /* see can_rcv() - this should NEVER happen! */ - if (count > (ULONG_MAX / HZ)) { - printk(KERN_ERR "af_can: calc_rate: count exceeded! %ld\n", count); - return 99999999; + if (!can_dir) { + printk(KERN_INFO "can: failed to create /proc/net/can . " + "CONFIG_PROC_FS missing?\n"); + return; } - ret = (count * HZ) / (newjif - oldjif); - - return ret; -} - -/**************************************************/ -/* af_can statistics stuff */ -/**************************************************/ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) + can_dir->owner = THIS_MODULE; +#endif -static void can_init_stats(int caller) -{ - memset(&stats, 0, sizeof(stats)); - stats.jiffies_init = jiffies; - pstats.stats_reset++; + /* own procfs entries from the AF_CAN core */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) + pde_version = proc_create(CAN_PROC_VERSION, 0644, can_dir, + &can_version_proc_fops); + pde_stats = proc_create(CAN_PROC_STATS, 0644, can_dir, + &can_stats_proc_fops); + pde_reset_stats = proc_create(CAN_PROC_RESET_STATS, 0644, can_dir, + &can_reset_stats_proc_fops); + pde_rcvlist_err = proc_create_data(CAN_PROC_RCVLIST_ERR, 0644, can_dir, + &can_rcvlist_proc_fops, (void *)RX_ERR); + pde_rcvlist_all = proc_create_data(CAN_PROC_RCVLIST_ALL, 0644, can_dir, + &can_rcvlist_proc_fops, (void *)RX_ALL); + pde_rcvlist_fil = proc_create_data(CAN_PROC_RCVLIST_FIL, 0644, can_dir, + &can_rcvlist_proc_fops, (void *)RX_FIL); + pde_rcvlist_inv = proc_create_data(CAN_PROC_RCVLIST_INV, 0644, can_dir, + &can_rcvlist_proc_fops, (void *)RX_INV); + pde_rcvlist_eff = proc_create_data(CAN_PROC_RCVLIST_EFF, 0644, can_dir, + &can_rcvlist_proc_fops, (void *)RX_EFF); + pde_rcvlist_sff = proc_create(CAN_PROC_RCVLIST_SFF, 0644, can_dir, + &can_rcvlist_sff_proc_fops); +#else + pde_version = can_create_proc_readentry(CAN_PROC_VERSION, 0644, + can_proc_read_version, NULL); + pde_stats = can_create_proc_readentry(CAN_PROC_STATS, 0644, + can_proc_read_stats, NULL); + pde_reset_stats = can_create_proc_readentry(CAN_PROC_RESET_STATS, 0644, + can_proc_read_reset_stats, NULL); + pde_rcvlist_err = can_create_proc_readentry(CAN_PROC_RCVLIST_ERR, 0644, + can_proc_read_rcvlist, (void *)RX_ERR); + pde_rcvlist_all = can_create_proc_readentry(CAN_PROC_RCVLIST_ALL, 0644, + can_proc_read_rcvlist, (void *)RX_ALL); + pde_rcvlist_fil = can_create_proc_readentry(CAN_PROC_RCVLIST_FIL, 0644, + can_proc_read_rcvlist, (void *)RX_FIL); + pde_rcvlist_inv = can_create_proc_readentry(CAN_PROC_RCVLIST_INV, 0644, + can_proc_read_rcvlist, (void *)RX_INV); + pde_rcvlist_eff = can_create_proc_readentry(CAN_PROC_RCVLIST_EFF, 0644, + can_proc_read_rcvlist, (void *)RX_EFF); + pde_rcvlist_sff = can_create_proc_readentry(CAN_PROC_RCVLIST_SFF, 0644, + can_proc_read_rcvlist_sff, NULL); +#endif } -static void can_stat_update(unsigned long data) +/* + * can_remove_proc - remove procfs entries and main CAN proc directory + */ +void can_remove_proc(void) { - unsigned long j = jiffies; /* snapshot */ - - //DBG("af_can: can_stat_update() jiffies = %ld\n", j); - - if (j < stats.jiffies_init) /* jiffies overflow */ - can_init_stats(2); - - /* stats.rx_frames is the definitively max. statistic value */ - - /* prevent overflow in calc_rate() */ - if (stats.rx_frames > (ULONG_MAX / HZ)) - can_init_stats(3); /* restart */ - - /* matches overflow - very improbable */ - if (stats.matches > (ULONG_MAX / 100)) - can_init_stats(4); + if (pde_version) + can_remove_proc_readentry(CAN_PROC_VERSION); - /* calc total values */ - if (stats.rx_frames) - stats.total_rx_match_ratio = (stats.matches * 100) / stats.rx_frames; + if (pde_stats) + can_remove_proc_readentry(CAN_PROC_STATS); - stats.total_tx_rate = calc_rate(stats.jiffies_init, j, stats.tx_frames); - stats.total_rx_rate = calc_rate(stats.jiffies_init, j, stats.rx_frames); + if (pde_reset_stats) + can_remove_proc_readentry(CAN_PROC_RESET_STATS); - /* calc current values */ - if (stats.rx_frames_delta) - stats.current_rx_match_ratio = - (stats.matches_delta * 100) / stats.rx_frames_delta; + if (pde_rcvlist_err) + can_remove_proc_readentry(CAN_PROC_RCVLIST_ERR); - stats.current_tx_rate = calc_rate(0, HZ, stats.tx_frames_delta); - stats.current_rx_rate = calc_rate(0, HZ, stats.rx_frames_delta); + if (pde_rcvlist_all) + can_remove_proc_readentry(CAN_PROC_RCVLIST_ALL); - /* check / update maximum values */ - if (stats.max_tx_rate < stats.current_tx_rate) - stats.max_tx_rate = stats.current_tx_rate; + if (pde_rcvlist_fil) + can_remove_proc_readentry(CAN_PROC_RCVLIST_FIL); - if (stats.max_rx_rate < stats.current_rx_rate) - stats.max_rx_rate = stats.current_rx_rate; + if (pde_rcvlist_inv) + can_remove_proc_readentry(CAN_PROC_RCVLIST_INV); - if (stats.max_rx_match_ratio < stats.current_rx_match_ratio) - stats.max_rx_match_ratio = stats.current_rx_match_ratio; + if (pde_rcvlist_eff) + can_remove_proc_readentry(CAN_PROC_RCVLIST_EFF); - /* clear values for 'current rate' calculation */ - stats.tx_frames_delta = 0; - stats.rx_frames_delta = 0; - stats.matches_delta = 0; + if (pde_rcvlist_sff) + can_remove_proc_readentry(CAN_PROC_RCVLIST_SFF); - /* restart timer */ - stattimer.expires = jiffies + HZ; /* every second */ - add_timer(&stattimer); + if (can_dir) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) + proc_net_remove(&init_net, "can"); +#else + proc_net_remove("can"); +#endif }