lkml.org 
[lkml]   [2006]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [patch 36/61] lock validator: special locking: serial
On Mon, 29 May 2006 23:26:04 +0200
Ingo Molnar <mingo@elte.hu> wrote:

> From: Ingo Molnar <mingo@elte.hu>
>
> teach special (dual-initialized) locking code to the lock validator.
> Has no effect on non-lockdep kernels.
>

This isn't an adequate description of the problem which this patch is
solving, IMO.

I _assume_ the validator is using the instruction pointer of the
spin_lock_init() site (or the file-n-line) as the lock's identifier. Or
something?

>
> Index: linux/drivers/serial/serial_core.c
> ===================================================================
> --- linux.orig/drivers/serial/serial_core.c
> +++ linux/drivers/serial/serial_core.c
> @@ -1849,6 +1849,12 @@ static const struct baud_rates baud_rate
> { 0, B38400 }
> };
>
> +/*
> + * lockdep: port->lock is initialized in two places, but we
> + * want only one lock-type:
> + */
> +static struct lockdep_type_key port_lock_key;
> +
> /**
> * uart_set_options - setup the serial console parameters
> * @port: pointer to the serial ports uart_port structure
> @@ -1869,7 +1875,7 @@ uart_set_options(struct uart_port *port,
> * Ensure that the serial console lock is initialised
> * early.
> */
> - spin_lock_init(&port->lock);
> + spin_lock_init_key(&port->lock, &port_lock_key);
>
> memset(&termios, 0, sizeof(struct termios));
>
> @@ -2255,7 +2261,7 @@ int uart_add_one_port(struct uart_driver
> * initialised.
> */
> if (!(uart_console(port) && (port->cons->flags & CON_ENABLED)))
> - spin_lock_init(&port->lock);
> + spin_lock_init_key(&port->lock, &port_lock_key);
>
> uart_configure_port(drv, state, port);
>

Is there a cleaner way of doing this?

Perhaps write a new helper function which initialises the spinlock, call
that? Rather than open-coding lockdep stuff?

-
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: 2006-05-30 03:38    [W:0.797 / U:0.552 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site