From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
NeilBrown <neilb@suse.de>,
Dan Williams <dan.j.williams@intel.com>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [41/46] sysfs: Allow sysfs_notify_dirent to be called from interrupt context.
Date: Fri, 16 Oct 2009 10:10:34 -0700 [thread overview]
Message-ID: <20091016171208.369491083@linux.site> (raw)
In-Reply-To: <20091016171422.GA13339@kroah.com>
[-- Attachment #1: sysfs-allow-sysfs_notify_dirent-to-be-called-from-interrupt-context.patch --]
[-- Type: text/plain, Size: 2886 bytes --]
2.6.31-stable review patch. If anyone has any objections, please let us know.
------------------
From: Neil Brown <neilb@suse.de>
commit 83db93f4de2d9ae441a491d1dc61c2204f0195de upstream.
sysfs_notify_dirent is a simple atomic operation that can be used to
alert user-space that new data can be read from a sysfs attribute.
Unfortunately it cannot currently be called from non-process context
because of its use of spin_lock which is sometimes taken with
interrupts enabled.
So change all lockers of sysfs_open_dirent_lock to disable interrupts,
thus making sysfs_notify_dirent safe to be called from non-process
context (as drivers/md does in md_safemode_timeout).
sysfs_get_open_dirent is (documented as being) only called from
process context, so it uses spin_lock_irq. Other places
use spin_lock_irqsave.
The usage for sysfs_notify_dirent in md_safemode_timeout was
introduced in 2.6.28, so this patch is suitable for that and more
recent kernels.
Reported-by: Joel Andres Granados <jgranado@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
fs/sysfs/file.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -268,7 +268,7 @@ static int sysfs_get_open_dirent(struct
struct sysfs_open_dirent *od, *new_od = NULL;
retry:
- spin_lock(&sysfs_open_dirent_lock);
+ spin_lock_irq(&sysfs_open_dirent_lock);
if (!sd->s_attr.open && new_od) {
sd->s_attr.open = new_od;
@@ -281,7 +281,7 @@ static int sysfs_get_open_dirent(struct
list_add_tail(&buffer->list, &od->buffers);
}
- spin_unlock(&sysfs_open_dirent_lock);
+ spin_unlock_irq(&sysfs_open_dirent_lock);
if (od) {
kfree(new_od);
@@ -315,8 +315,9 @@ static void sysfs_put_open_dirent(struct
struct sysfs_buffer *buffer)
{
struct sysfs_open_dirent *od = sd->s_attr.open;
+ unsigned long flags;
- spin_lock(&sysfs_open_dirent_lock);
+ spin_lock_irqsave(&sysfs_open_dirent_lock, flags);
list_del(&buffer->list);
if (atomic_dec_and_test(&od->refcnt))
@@ -324,7 +325,7 @@ static void sysfs_put_open_dirent(struct
else
od = NULL;
- spin_unlock(&sysfs_open_dirent_lock);
+ spin_unlock_irqrestore(&sysfs_open_dirent_lock, flags);
kfree(od);
}
@@ -456,8 +457,9 @@ static unsigned int sysfs_poll(struct fi
void sysfs_notify_dirent(struct sysfs_dirent *sd)
{
struct sysfs_open_dirent *od;
+ unsigned long flags;
- spin_lock(&sysfs_open_dirent_lock);
+ spin_lock_irqsave(&sysfs_open_dirent_lock, flags);
od = sd->s_attr.open;
if (od) {
@@ -465,7 +467,7 @@ void sysfs_notify_dirent(struct sysfs_di
wake_up_interruptible(&od->poll);
}
- spin_unlock(&sysfs_open_dirent_lock);
+ spin_unlock_irqrestore(&sysfs_open_dirent_lock, flags);
}
EXPORT_SYMBOL_GPL(sysfs_notify_dirent);
next prev parent reply other threads:[~2009-10-16 17:18 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20091016170953.128828149@linux.site>
2009-10-16 17:14 ` [00/46] 2.6.31.5-stable review Greg KH
2009-10-16 17:09 ` [01/46] SCSI: Retry ADD_TO_MLQUEUE return value for EH commands Greg KH
2009-10-16 17:09 ` [02/46] SCSI: Fix protection scsi_data_buffer leak Greg KH
2009-10-16 17:09 ` [03/46] SCSI: sg: Free data buffers after calling blk_rq_unmap_user Greg KH
2009-10-16 17:09 ` [04/46] ARM: pxa: workaround errata #37 by not using half turbo switching Greg KH
2009-10-16 17:09 ` [05/46] tracing/filters: Fix memory leak when setting a filter Greg KH
2009-10-16 17:09 ` [06/46] x86/paravirt: Use normal calling sequences for irq enable/disable Greg KH
2009-10-16 17:10 ` [07/46] USB: ftdi_sio: remove tty->low_latency Greg KH
2009-10-16 17:10 ` [08/46] USB: ftdi_sio: remove unused rx_byte counter Greg KH
2009-10-16 17:10 ` [09/46] USB: ftdi_sio: clean up read completion handler Greg KH
2009-10-16 17:10 ` [10/46] USB: ftdi_sio: re-implement read processing Greg KH
2009-10-16 17:10 ` [11/46] USB: pl2303: fix error characters not being reported to ldisc Greg KH
2009-10-16 17:10 ` [12/46] USB: digi_acceleport: Fix broken unthrottle Greg KH
2009-10-16 17:10 ` [13/46] USB: serial: dont call release without attach Greg KH
2009-10-16 17:10 ` [14/46] USB: option: Toshiba G450 device id Greg KH
2009-10-16 17:10 ` [15/46] USB: ipaq: fix oops when device is plugged in Greg KH
2009-10-16 17:10 ` [16/46] USB: cp210x: Add support for the DW700 UART Greg KH
2009-10-16 17:10 ` [17/46] USB: Fix throttling in generic usbserial driver Greg KH
2009-10-16 17:10 ` [18/46] USB: storage: When a device returns no sense data, call it a Hardware Error Greg KH
2009-10-16 17:10 ` [19/46] arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0 Greg KH
2009-10-16 17:10 ` [20/46] intel-iommu: Cope with broken HP DC7900 BIOS Greg KH
2009-10-16 17:10 ` [21/46] futex: Detect mismatched requeue targets Greg KH
2009-10-16 17:10 ` [22/46] futex: Fix wakeup race by setting TASK_INTERRUPTIBLE before queue_me() Greg KH
2009-10-16 17:10 ` [23/46] tpm-fixup-pcrs-sysfs-file-update Greg KH
2009-10-16 17:10 ` [24/46] TPM: fix pcrread Greg KH
2009-10-16 17:10 ` [25/46] Bluetooth: Disconnect HIDRAW devices on disconnect Greg KH
2009-10-16 17:10 ` [26/46] Bluetooth: Add extra device reference counting for connections Greg KH
2009-10-16 17:10 ` [27/46] Bluetooth: Let HIDP grab the device reference " Greg KH
2009-10-16 17:10 ` [28/46] connector: Keep the skb in cn_callback_data Greg KH
2009-10-16 17:10 ` [29/46] connector: Provide the senders credentials to the callback Greg KH
2009-10-16 17:10 ` [30/46] connector: Removed the destruct_data callback since it is always kfree_skb() Greg KH
2009-10-16 17:10 ` [31/46] dm/connector: Only process connector packages from privileged processes Greg KH
2009-10-16 17:10 ` [32/46] dst/connector: Disallow unpliviged users to configure dst Greg KH
2009-10-16 17:10 ` [33/46] pohmelfs/connector: Disallow unpliviged users to configure pohmelfs Greg KH
2009-10-16 17:10 ` [34/46] uvesafb/connector: Disallow unpliviged users to send netlink packets Greg KH
2009-10-16 17:10 ` [35/46] e1000e: swap max hw supported frame size between 82574 and 82583 Greg KH
2009-10-16 17:10 ` [36/46] MAINTAINERS: Fix Riku Voipios address Greg KH
2009-10-16 17:10 ` [37/46] macintosh: Dont assume i2c device probing always succeeds Greg KH
2009-10-16 17:10 ` [38/46] i2c: Hide probe errors caused by ACPI resource conflicts Greg KH
2009-10-16 17:10 ` [39/46] ALSA: Dont assume i2c device probing always succeeds Greg KH
2009-10-16 17:10 ` [40/46] bsdacct: switch credentials for writing to the accounting file Greg KH
2009-10-16 17:10 ` Greg KH [this message]
2009-10-16 17:10 ` [42/46] Staging: rt2860sta: prevent a panic when disabling when associated Greg KH
2009-10-16 17:10 ` [43/46] usb-storage: Workaround devices with bogus sense size Greg KH
2009-10-16 17:10 ` [44/46] iwlwifi: incorrect method used for finding valid OTP blocks Greg KH
2009-10-16 17:10 ` [45/46] mac80211: fix vlan and optimise RX Greg KH
2009-10-16 17:10 ` [46/46] tty: Make flush_to_ldisc() locking more robust Greg KH
2009-10-16 17:57 ` [00/46] 2.6.31.5-stable review Massimo Cetra
2009-10-16 18:03 ` Greg KH
2009-10-17 5:20 ` Massimo Cetra
2009-11-05 23:12 ` Greg KH
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=20091016171208.369491083@linux.site \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=neilb@suse.de \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/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