mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	Dhaval Giani <dhaval@linux.vnet.ibm.com>,
	Mike Travis <travis@sgi.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org, Yinghai Lu <yhlu.kernel@gmail.com>
Subject: Re: [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2
Date: Sun, 3 Aug 2008 16:14:47 +0100	[thread overview]
Message-ID: <20080803161447.791705bb@lxorguk.ukuu.org.uk> (raw)
In-Reply-To: <1217732365-16595-22-git-send-email-yhlu.kernel@gmail.com>

On Sat,  2 Aug 2008 19:59:21 -0700
Yinghai Lu <yhlu.kernel@gmail.com> wrote:

> use small array with index to handle irq locking for serial port
> hope 32 slot is enough


Untested alternative approach

8250: Remove NR_IRQ usage

From: Alan Cox <alan@redhat.com>


---

 drivers/serial/68328serial.c |   11 ++---------
 drivers/serial/8250.c        |   41 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 36 insertions(+), 16 deletions(-)


diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 381b12a..277b78d 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -66,7 +66,6 @@
 #endif
 
 static struct m68k_serial m68k_soft[NR_PORTS];
-struct m68k_serial *IRQ_ports[NR_IRQS];
 
 static unsigned int uart_irqs[NR_PORTS] = UART_IRQ_DEFNS;
 
@@ -375,15 +374,11 @@ clear_and_return:
  */
 irqreturn_t rs_interrupt(int irq, void *dev_id)
 {
-	struct m68k_serial * info;
+	struct m68k_serial * info = dev_id;
 	m68328_uart *uart;
 	unsigned short rx;
 	unsigned short tx;
 
-	info = IRQ_ports[irq];
-	if(!info)
-	    return IRQ_NONE;
-
 	uart = &uart_addr[info->line];
 	rx = uart->urx.w;
 
@@ -1383,8 +1378,6 @@ rs68328_init(void)
 		   info->port, info->irq);
 	    printk(" is a builtin MC68328 UART\n");
 	    
-	    IRQ_ports[info->irq] = info;	/* waste of space */
-
 #ifdef CONFIG_M68VZ328
 		if (i > 0 )
 			PJSEL &= 0xCF;  /* PSW enable second port output */
@@ -1393,7 +1386,7 @@ rs68328_init(void)
 	    if (request_irq(uart_irqs[i],
 			    rs_interrupt,
 			    IRQF_DISABLED,
-			    "M68328_UART", NULL))
+			    "M68328_UART", info))
                 panic("Unable to attach 68328 serial interrupt\n");
 	}
 	local_irq_restore(flags);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index a97f1ae..7165e88 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -145,11 +145,14 @@ struct uart_8250_port {
 };
 
 struct irq_info {
-	spinlock_t		lock;
+	struct			irq_info *next;
+	int			irq;
+	spinlock_t		lock;	/* Protects list not the hash */
 	struct list_head	*head;
 };
 
-static struct irq_info irq_lists[NR_IRQS];
+static struct irq_info *irq_lists[NR_IRQ_HASH];
+static DEFINE_SPINLOCK(hash_lock);	/* Used to walk the hash */
 
 /*
  * Here we define the default xmit fifo size used for each type of UART.
@@ -1541,9 +1544,28 @@ static void serial_do_unlink(struct irq_info *i, struct uart_8250_port *up)
 
 static int serial_link_irq_chain(struct uart_8250_port *up)
 {
-	struct irq_info *i = irq_lists + up->port.irq;
+	struct irq_info **list, *i; 
 	int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? IRQF_SHARED : 0;
 
+	spin_lock(&hash_lock);
+
+	list = &irq_lists[up->port.irq % NR_IRQ_HASH];
+	i = * list;
+
+	while(i != NULL && i->irq != up->port.irq)
+		i = i->next;
+	if (i == NULL) {
+		i = kzalloc(sizeof(struct irq_info), GFP_KERNEL);
+		if (i == NULL) {
+			spin_unlock(&hash_lock);
+			return -ENOMEM;
+		}
+		spin_lock_init(&i->lock);
+		i->next = *list;
+		*list = i;
+	}
+	spin_unlock(&hash_lock);
+
 	spin_lock_irq(&i->lock);
 
 	if (i->head) {
@@ -1567,8 +1589,16 @@ static int serial_link_irq_chain(struct uart_8250_port *up)
 
 static void serial_unlink_irq_chain(struct uart_8250_port *up)
 {
-	struct irq_info *i = irq_lists + up->port.irq;
+	struct irq_info *i;
+
+	spin_lock(&hash_lock);
 
+	i = irq_lists[up->port.irq % NR_IRQ_HASH];
+	while(i != NULL && i->irq != up->port.irq)
+		i = i->next;
+	spin_unlock(&hash_lock);
+
+	BUG_ON(i == NULL);
 	BUG_ON(i->head == NULL);
 
 	if (list_empty(i->head))
@@ -2951,9 +2981,6 @@ static int __init serial8250_init(void)
 		"%d ports, IRQ sharing %sabled\n", nr_uarts,
 		share_irqs ? "en" : "dis");
 
-	for (i = 0; i < NR_IRQS; i++)
-		spin_lock_init(&irq_lists[i].lock);
-
 	ret = uart_register_driver(&serial8250_reg);
 	if (ret)
 		goto out;

  parent reply	other threads:[~2008-08-03 15:33 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-03  2:59 [PATCH 00/25] dyn_array and nr_irqs support v3 Yinghai Lu
2008-08-03  2:59 ` [PATCH 01/25] x86: 64bit support more than 256 irq v2 Yinghai Lu
2008-08-03  2:59   ` [PATCH 02/25] x86: remove irq_vectors_limits Yinghai Lu
2008-08-03  2:59     ` [PATCH 03/25] add dyn_array support Yinghai Lu
2008-08-03  2:59       ` [PATCH 04/25] add per_cpu_dyn_array support Yinghai Lu
2008-08-03  2:59         ` [PATCH 05/25] x86: alloc dyn_array all alltogether Yinghai Lu
2008-08-03  2:59           ` [PATCH 06/25] x86: enable dyn_array support Yinghai Lu
2008-08-03  2:59             ` [PATCH 07/25] introduce nr_irqs Yinghai Lu
2008-08-03  2:59               ` [PATCH 08/25] x86: using nr_irqs Yinghai Lu
2008-08-03  2:59                 ` [PATCH 09/25] drivers/char to use nr_irqs Yinghai Lu
2008-08-03  2:59                   ` [PATCH 10/25] drivers/net " Yinghai Lu
2008-08-03  2:59                     ` [PATCH 11/25] drivers intr remapping " Yinghai Lu
2008-08-03  2:59                       ` [PATCH 12/25] drivers/pcmcia " Yinghai Lu
2008-08-03  2:59                         ` [PATCH 13/25] drivers/rtc " Yinghai Lu
2008-08-03  2:59                           ` [PATCH 14/25] drivers/scsi " Yinghai Lu
2008-08-03  2:59                             ` [PATCH 15/25] drivers/serial " Yinghai Lu
2008-08-03  2:59                               ` [PATCH 16/25] drivers proc " Yinghai Lu
2008-08-03  2:59                                 ` [PATCH 17/25] drivers xen events " Yinghai Lu
2008-08-03  2:59                                   ` [PATCH 18/25] make irq_timer_state to use dyn_array Yinghai Lu
2008-08-03  2:59                                     ` [PATCH 19/25] make irq2_iommu " Yinghai Lu
2008-08-03  2:59                                       ` [PATCH 20/25] make irq_desc " Yinghai Lu
2008-08-03  2:59                                         ` [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2 Yinghai Lu
2008-08-03  2:59                                           ` [PATCH 22/25] irq: make irqs in kernel stat use per_cpu_dyn_array Yinghai Lu
2008-08-03  2:59                                             ` [PATCH 23/25] x86: use dyn_array in io_apic_xx.c Yinghai Lu
2008-08-03  2:59                                               ` [PATCH 24/25] x86: get mp_irqs from madt Yinghai Lu
2008-08-03  2:59                                                 ` [PATCH 25/25] x86: remove nr_irq_vectors Yinghai Lu
2008-08-03 13:03                                           ` [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2 Alan Cox
2008-08-03 15:14                                           ` Alan Cox [this message]
2008-08-03 19:57                                             ` Eric W. Biederman
2008-08-04 14:17                                               ` Alan Cox
2008-08-04 18:13                                                 ` Yinghai Lu
2008-08-04 18:51                                                 ` Eric W. Biederman
2008-08-06 13:09                                                   ` [PATCH] serial: Remove NR_IRQS usage Alan Cox
2008-08-06 16:10                                                     ` Eric W. Biederman
2008-08-03 13:02                               ` [PATCH 15/25] drivers/serial to use nr_irqs Alan Cox
2008-08-03 17:43                                 ` Yinghai Lu
2008-08-03  4:16           ` [PATCH 05/25] x86: alloc dyn_array all alltogether Johannes Weiner
2008-08-03  4:03       ` [PATCH 03/25] add dyn_array support Johannes Weiner
2008-08-03  4:21         ` Yinghai Lu
2008-08-03  4:55           ` Johannes Weiner
2008-08-03  5:04             ` Yinghai Lu
2008-08-03  5:31               ` Johannes Weiner
2008-08-03  5:39                 ` Yinghai Lu
2008-08-03  5:40                   ` Yinghai Lu
2008-08-03  5:47                   ` Johannes Weiner
2008-08-03  5:48                     ` Yinghai Lu
2008-08-03  5:51 ` [PATCH 00/25] dyn_array and nr_irqs support v3 Eric W. Biederman
2008-08-03  6:04   ` Yinghai Lu
2008-08-03  6:39     ` Eric W. Biederman
2008-08-03  8:25       ` Yinghai Lu
2008-08-03  9:15         ` Eric W. Biederman
2008-08-03 17:54           ` Yinghai Lu
2008-08-03 19:20             ` Yinghai Lu
2008-08-04  1:59               ` Yinghai Lu
2008-08-04 14:31       ` Mike Travis
2008-08-05 23:01 ` H. Peter Anvin
2008-08-05 23:15   ` Yinghai Lu
2008-08-05 23:26     ` H. Peter Anvin
2008-08-05 23:53       ` Yinghai Lu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080803161447.791705bb@lxorguk.ukuu.org.uk \
    --to=alan@lxorguk.ukuu.org.uk \
    --cc=akpm@linux-foundation.org \
    --cc=dhaval@linux.vnet.ibm.com \
    --cc=ebiederm@xmission.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --cc=travis@sgi.com \
    --cc=yhlu.kernel@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®