lkml.org 
[lkml]   [2003]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: [PATCH] linux-2.4.23-pre2_proc-interrupts-fix_A1
Date
On 30 Aug 2003 12:20:45 -0700, 
john stultz <johnstul@us.ibm.com> wrote:
> This patch converts /proc/interrupts to use the seq_file interface on
>i386 (thanks to Randy for adding the seq "single" code). This prevents
>memory corruption caused by /proc/interrupts overflowing its page sized
>buffer on systems with high cpu and interrupt counts.


This adds the ia64 equivalent. Marcelo, please apply after John
Stultz's i386 patch. Unless all architectures convert to seq_file for
/proc/interrupts, fs/proc/proc_misc.c is going to be ugly.


diff -ur -x '*orig' -x '*rej' 2.4.23-pre2-i386/arch/ia64/kernel/irq.c 2.4.23-pre2-ia64/arch/ia64/kernel/irq.c
--- 2.4.23-pre2-i386/arch/ia64/kernel/irq.c 2003-09-01 13:48:18.000000000 +1000
+++ 2.4.23-pre2-ia64/arch/ia64/kernel/irq.c 2003-09-01 17:44:28.000000000 +1000
@@ -152,58 +152,48 @@
* Generic, controller-independent functions:
*/

-int get_irq_list(char *buf)
+static int
+show_interrupts(struct seq_file *p, void *v)
{
int i, j;
struct irqaction * action;
irq_desc_t *idesc;
- char *p = buf;

- p += sprintf(p, " ");
+ seq_printf(p, " ");
for (j=0; j<smp_num_cpus; j++)
- p += sprintf(p, "CPU%d ",j);
- *p++ = '\n';
+ seq_printf(p, "CPU%d ",j);
+ seq_putc(p,'\n');

- for (i = 0 ; i < NR_IRQS ; i++) {
- idesc = irq_desc(i);
+ for (i = 0; i < NR_IRQS; i++) {
action = idesc->action;
if (!action)
continue;
- p += sprintf(p, "%3d: ",i);
+ seq_printf(p, "%3d: ",i);
#ifndef CONFIG_SMP
- p += sprintf(p, "%10u ", kstat_irqs(i));
+ seq_printf(p, "%10u ", kstat_irqs(i));
#else
for (j = 0; j < smp_num_cpus; j++)
- p += sprintf(p, "%10u ",
+ seq_printf(p, "%10u ",
kstat.irqs[cpu_logical_map(j)][i]);
#endif
- p += sprintf(p, " %14s", idesc->handler->typename);
- p += sprintf(p, " %s", action->name);
+ seq_printf(p, " %14s", irq_desc[i].handler->typename);
+ seq_printf(p, " %s", action->name);

for (action=action->next; action; action = action->next)
- p += sprintf(p, ", %s", action->name);
- *p++ = '\n';
+ seq_printf(p, ", %s", action->name);
+
+ seq_putc(p, '\n');
}
- p += sprintf(p, "NMI: ");
+ seq_printf(p, "NMI: ");
for (j = 0; j < smp_num_cpus; j++)
- p += sprintf(p, "%10u ",
+ seq_printf(p, "%10u ",
nmi_count(cpu_logical_map(j)));
- p += sprintf(p, "\n");
-#if defined(CONFIG_SMP) && defined(CONFIG_X86)
- p += sprintf(p, "LOC: ");
- for (j = 0; j < smp_num_cpus; j++)
- p += sprintf(p, "%10u ",
- apic_timer_irqs[cpu_logical_map(j)]);
- p += sprintf(p, "\n");
-#endif
- p += sprintf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
-#if defined(CONFIG_X86) && defined(CONFIG_X86_IO_APIC) && defined(APIC_MISMATCH_DEBUG)
- p += sprintf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
-#endif
- return p - buf;
-}
-
+ seq_putc(p, '\n');
+ seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));

+ return 0;
+}
+
/*
* Global interrupt locks for SMP. Allow interrupts to come in on any
* CPU, yet make cli/sti act globally to protect critical regions..
diff -ur -x '*orig' -x '*rej' 2.4.23-pre2-i386/fs/proc/proc_misc.c 2.4.23-pre2-ia64/fs/proc/proc_misc.c
--- 2.4.23-pre2-i386/fs/proc/proc_misc.c 2003-09-01 13:50:19.000000000 +1000
+++ 2.4.23-pre2-ia64/fs/proc/proc_misc.c 2003-09-01 17:51:41.000000000 +1000
@@ -391,7 +391,7 @@
return proc_calc_metrics(page, start, off, count, eof, len);
}

-#ifndef CONFIG_X86
+#if !defined(CONFIG_X86) && !defined(CONFIG_IA64)
#if !defined(CONFIG_ARCH_S390)
static int interrupts_read_proc(char *page, char **start, off_t off,
int count, int *eof, void *data)
@@ -401,9 +401,10 @@
}
#endif

-#else /* !CONFIG_X86 */
+#else /* !CONFIG_X86 && !CONFIG_IA64 */

extern int show_interrupts(struct seq_file *p, void *v);
+
static int interrupts_open(struct inode *inode, struct file *file)
{
unsigned size = PAGE_SIZE * (1 + smp_num_cpus / 8);
@@ -422,13 +423,14 @@
kfree(buf);
return res;
}
+
static struct file_operations proc_interrupts_operations = {
.open = interrupts_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
-#endif /* !CONFIG_X86 */
+#endif /* !CONFIG_X86 && !CONFIG_IA64 */

static int filesystems_read_proc(char *page, char **start, off_t off,
int count, int *eof, void *data)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:48    [W:0.042 / U:0.312 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site