public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Jeff Dike <jdike@addtoit.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
	uml-devel <user-mode-linux-devel@lists.sourceforge.net>
Subject: Re: [PATCH] UML - Fix locking in skb alloction failure fix
Date: Fri, 28 Sep 2007 11:26:34 -0700	[thread overview]
Message-ID: <20070928112634.0bef9525.akpm@linux-foundation.org> (raw)
In-Reply-To: <20070928154314.GA7185@c2.user-mode-linux.org>

On Fri, 28 Sep 2007 11:43:14 -0400 Jeff Dike <jdike@addtoit.com> wrote:

> Add _irqsave/_irqrestore to the locking in update_drop_skb to keep
> uml_net_rx out while the drop skb is being messed with.
> 
> Signed-off-by: Jeff Dike <jdike@linux.intel.com>
> ---
>  arch/um/drivers/net_kern.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> Index: linux-2.6.22/arch/um/drivers/net_kern.c
> ===================================================================
> --- linux-2.6.22.orig/arch/um/drivers/net_kern.c	2007-09-28 11:10:19.000000000 -0400
> +++ linux-2.6.22/arch/um/drivers/net_kern.c	2007-09-28 11:13:58.000000000 -0400
> @@ -49,9 +49,10 @@ static int drop_max;
>  static int update_drop_skb(int max)
>  {
>  	struct sk_buff *new;
> +	unsigned long flags;
>  	int err = 0;
>  
> -	spin_lock(&drop_lock);
> +	spin_lock_irqsave(&drop_lock, flags);
>  
>  	if (max <= drop_max)
>  		goto out;
> @@ -68,7 +69,7 @@ static int update_drop_skb(int max)
>  	drop_max = max;
>  	err = 0;
>  out:
> -	spin_unlock(&drop_lock);
> +	spin_unlock_irqrestore(&drop_lock, flags);
>  
>  	return err;
>  }

Doesn't this assume that the arch is only ever uniprocessor, which I don't think is
true on i386 UML??

  reply	other threads:[~2007-09-28 18:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-28 15:43 [PATCH] UML - Fix locking in skb alloction failure fix Jeff Dike
2007-09-28 18:26 ` Andrew Morton [this message]
2007-09-28 19:03   ` Jeff Dike

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=20070928112634.0bef9525.akpm@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=jdike@addtoit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    /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