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,
Roland Dreier <roland@purestorage.com>
Subject: [11/35] aio: wake all waiters when destroying ctx
Date: Fri, 25 Mar 2011 17:03:43 -0700 [thread overview]
Message-ID: <20110326000456.974450742@clark.kroah.org> (raw)
In-Reply-To: <20110326000509.GA29736@kroah.com>
2.6.33-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Roland Dreier <roland@purestorage.com>
commit e91f90bb0bb10be9cc8efd09a3cf4ecffcad0db1 upstream.
The test program below will hang because io_getevents() uses
add_wait_queue_exclusive(), which means the wake_up() in io_destroy() only
wakes up one of the threads. Fix this by using wake_up_all() in the aio
code paths where we want to make sure no one gets stuck.
// t.c -- compile with gcc -lpthread -laio t.c
#include <libaio.h>
#include <pthread.h>
#include <stdio.h>
#include <unistd.h>
static const int nthr = 2;
void *getev(void *ctx)
{
struct io_event ev;
io_getevents(ctx, 1, 1, &ev, NULL);
printf("io_getevents returned\n");
return NULL;
}
int main(int argc, char *argv[])
{
io_context_t ctx = 0;
pthread_t thread[nthr];
int i;
io_setup(1024, &ctx);
for (i = 0; i < nthr; ++i)
pthread_create(&thread[i], NULL, getev, ctx);
sleep(1);
io_destroy(ctx);
for (i = 0; i < nthr; ++i)
pthread_join(thread[i], NULL);
return 0;
}
Signed-off-by: Roland Dreier <roland@purestorage.com>
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
fs/aio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -511,7 +511,7 @@ static inline void really_put_req(struct
ctx->reqs_active--;
if (unlikely(!ctx->reqs_active && ctx->dead))
- wake_up(&ctx->wait);
+ wake_up_all(&ctx->wait);
}
static void aio_fput_routine(struct work_struct *data)
@@ -1224,7 +1224,7 @@ static void io_destroy(struct kioctx *io
* by other CPUs at this point. Right now, we rely on the
* locking done by the above calls to ensure this consistency.
*/
- wake_up(&ioctx->wait);
+ wake_up_all(&ioctx->wait);
put_ioctx(ioctx); /* once for the lookup */
}
next prev parent reply other threads:[~2011-03-26 0:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-26 0:05 [00/35] 2.6.33.9-longterm review Greg KH
2011-03-26 0:03 ` [01/35] smp_call_function_many: handle concurrent clearing of mask Greg KH
2011-03-26 0:03 ` [02/35] [PARISC] fix per-cpu flag problem in the cpu affinity checkers Greg KH
2011-03-26 0:03 ` [03/35] i2c: Fix typo in instantiating-devices document Greg KH
2011-03-26 0:03 ` [04/35] mmc: sdio: remember new card RCA when redetecting card Greg KH
2011-03-26 0:03 ` [05/35] powerpc/kdump: Fix race in kdump shutdown Greg KH
2011-03-30 23:27 ` Paul Gortmaker
2011-04-11 22:57 ` [stable] " Greg KH
2011-03-26 0:03 ` [06/35] powerpc: rtas_flash needs to use rtas_data_buf Greg KH
2011-03-26 0:03 ` [07/35] x86, binutils, xen: Fix another wrong size directive Greg KH
2011-03-26 0:03 ` [08/35] hwmon: (sht15) Fix integer overflow in humidity calculation Greg KH
2011-03-26 0:03 ` [09/35] ALSA: hda - VIA: Fix stereo mixer recording no sound issue Greg KH
2011-03-26 0:03 ` [10/35] ALSA: hda - VIA: Add missing support for VT1718S in A-A path Greg KH
2011-03-26 0:03 ` Greg KH [this message]
2011-03-26 0:03 ` [12/35] shmem: let shared anonymous be nonlinear again Greg KH
2011-03-26 0:03 ` [13/35] PCI hotplug: acpiphp: set current_state to D0 in register_slot Greg KH
2011-03-26 0:03 ` [14/35] xen: set max_pfn_mapped to the last pfn mapped Greg KH
2011-03-26 0:03 ` [15/35] PCI: return correct value when writing to the "reset" attribute Greg KH
2011-03-26 0:03 ` [16/35] [PATCH] Revert "intel_idle: PCI quirk to prevent Lenovo Ideapad s10-3 boot hang" Greg KH
2011-03-26 0:03 ` [17/35] Prevent rt_sigqueueinfo and rt_tgsigqueueinfo from spoofing the signal code Greg KH
2011-03-26 0:03 ` [18/35] ext3: skip orphan cleanup on rocompat fs Greg KH
2011-03-26 0:03 ` [19/35] procfs: fix /proc/<pid>/maps heap check Greg KH
2011-03-26 0:03 ` [20/35] proc: protect mm start_code/end_code in /proc/pid/stat Greg KH
2011-03-26 0:03 ` [21/35] fbcon: Bugfix soft cursor detection in Tile Blitting Greg KH
2011-03-26 0:03 ` [22/35] nfsd41: modify the members value of nfsd4_op_flags Greg KH
2011-03-26 0:03 ` [23/35] nfsd: wrong index used in inner loop Greg KH
2011-03-26 0:03 ` [24/35] [media] uvcvideo: Fix uvc_fixup_video_ctrl() format search Greg KH
2011-03-26 0:03 ` [25/35] [media] uvcvideo: Fix descriptor parsing for video output devices Greg KH
2011-03-26 0:03 ` [26/35] ehci-hcd: Bug fix: dont set a QHs Halt bit Greg KH
2011-03-26 0:03 ` [27/35] USB: uss720 fixup refcount position Greg KH
2011-03-26 0:04 ` [28/35] USB: cdc-acm: fix memory corruption / panic Greg KH
2011-03-26 0:04 ` [29/35] USB: cdc-acm: fix potential null-pointer dereference Greg KH
2011-03-26 0:04 ` [30/35] USB: cdc-acm: fix potential null-pointer dereference on disconnect Greg KH
2011-03-26 0:04 ` [31/35] Input: xen-kbdfront - advertise either absolute or relative coordinates Greg KH
2011-03-26 0:04 ` [32/35] x86: Cleanup highmap after brk is concluded Greg KH
2011-03-26 0:04 ` [33/35] SUNRPC: Never reuse the socket port after an xs_close() Greg KH
2011-03-26 0:04 ` [34/35] fs: call security_d_instantiate in d_obtain_alias V2 Greg KH
2011-03-26 0:24 ` Casey Schaufler
2011-03-26 16:11 ` Josef Bacik
2011-03-26 0:04 ` [35/35] dcdbas: force SMI to happen when expected 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=20110326000456.974450742@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=roland@purestorage.com \
--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
all inboxes | Powered by JetHome®