Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754490AbaJCRJ6 (ORCPT ); Fri, 3 Oct 2014 13:09:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21424 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753979AbaJCRI6 (ORCPT ); Fri, 3 Oct 2014 13:08:58 -0400 From: Andrea Arcangeli To: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-api@vger.kernel.org Cc: Linus Torvalds , Andres Lagar-Cavilla , Dave Hansen , Paolo Bonzini , Rik van Riel , Mel Gorman , Andy Lutomirski , Andrew Morton , Sasha Levin , Hugh Dickins , Peter Feiner , "\\\"Dr. David Alan Gilbert\\\"" , Christopher Covington , Johannes Weiner , Android Kernel Team , Robert Love , Dmitry Adamushko , Neil Brown , Mike Hommey , Taras Glek , Jan Kara , KOSAKI Motohiro , Michel Lespinasse , Minchan Kim , Keith Packard , "Huangpeng (Peter)" , Isaku Yamahata , Anthony Liguori , Stefan Hajnoczi , Wenchao Xia , Andrew Jones , Juan Quintela Subject: [PATCH 15/17] userfaultfd: make userfaultfd_write non blocking Date: Fri, 3 Oct 2014 19:08:05 +0200 Message-Id: <1412356087-16115-16-git-send-email-aarcange@redhat.com> In-Reply-To: <1412356087-16115-1-git-send-email-aarcange@redhat.com> References: <1412356087-16115-1-git-send-email-aarcange@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is generally inefficient to ask the wakeup of userfault ranges where there's not a single userfault address read through userfaultfd_read earlier and in turn waiting a wakeup. However it may come handy to wakeup the same userfault range twice in case of multiple thread faulting on the same address. But we should still return an error so if the application thinks this occurrence can never happen it will know it hit a bug. So just return -ENOENT instead of blocking. Signed-off-by: Andrea Arcangeli --- fs/userfaultfd.c | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 62b827e..2667d0d 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -458,9 +458,7 @@ static ssize_t userfaultfd_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct userfaultfd_ctx *ctx = file->private_data; - ssize_t res; __u64 range[2]; - DECLARE_WAITQUEUE(wait, current); if (ctx->state == USERFAULTFD_STATE_ASK_PROTOCOL) { __u64 protocol; @@ -488,34 +486,12 @@ static ssize_t userfaultfd_write(struct file *file, const char __user *buf, if (range[0] >= range[1]) return -ERANGE; - spin_lock(&ctx->fd_wqh.lock); - __add_wait_queue(&ctx->fd_wqh, &wait); - for (;;) { - set_current_state(TASK_INTERRUPTIBLE); - /* always take the fd_wqh lock before the fault_wqh lock */ - if (find_userfault(ctx, NULL, POLLOUT)) { - if (!wake_userfault(ctx, range)) { - res = sizeof(range); - break; - } - } - if (signal_pending(current)) { - res = -ERESTARTSYS; - break; - } - if (file->f_flags & O_NONBLOCK) { - res = -EAGAIN; - break; - } - spin_unlock(&ctx->fd_wqh.lock); - schedule(); - spin_lock(&ctx->fd_wqh.lock); - } - __remove_wait_queue(&ctx->fd_wqh, &wait); - __set_current_state(TASK_RUNNING); - spin_unlock(&ctx->fd_wqh.lock); + /* always take the fd_wqh lock before the fault_wqh lock */ + if (find_userfault(ctx, NULL, POLLOUT)) + if (!wake_userfault(ctx, range)) + return sizeof(range); - return res; + return -ENOENT; } #ifdef CONFIG_PROC_FS -- 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/