From patchwork Thu Nov 14 04:31:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 11243009 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F0851390 for ; Thu, 14 Nov 2019 04:31:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C79F8206D7 for ; Thu, 14 Nov 2019 04:31:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="RLZ3Ddrz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726557AbfKNEbL (ORCPT ); Wed, 13 Nov 2019 23:31:11 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40424 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726489AbfKNEbL (ORCPT ); Wed, 13 Nov 2019 23:31:11 -0500 Received: by mail-pg1-f194.google.com with SMTP id 15so2858170pgt.7 for ; Wed, 13 Nov 2019 20:31:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=ATcCOvPgaDxDdfb/2fmiaxeweoZIFDGlDDkWkjQsyvY=; b=RLZ3DdrzvnlpKn78eg7PLlkgOiwaq/1jGHecsmEGH08sCwiSEyiJIHWQVQosVurRAz 8drBb1+jSOJHM3kkew5ancydBlYeV0wM/r6eafY/ZQn5vBKAG/x4tQ2Gj908mvMXFLCf mqzgpWxUdzpinHuYY/3+Dbkgoq+W2pl/z0E0WHMEdNfu97C2DsJHsJd+sHJMOS4iv8as vzmiveQRoT2t0QgKXq8k3V831DxPctrdOrxZ21uIp+f2pliDtnlLtzuF7EWiHncJZ4sU yzfaBEcmbGsQhQlTV/9RqtpYBQedd6PHhKse6r5k1r60QM9ZnpPJcBdve/Yx+THGQ3SN ZWaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=ATcCOvPgaDxDdfb/2fmiaxeweoZIFDGlDDkWkjQsyvY=; b=Xvs4K5wmrj2+LhNOCBNKSdMHEvppLTuG9nrpUXPSLnl3wYRwTqXisVwrrBwxK//Shp 6jUyk/+agtHn7E2uAOPznG00CoK0dcn7W4/at+veX4AIeiwzBCt6f/qATlyRkatCpu+Z 40QNfljSwKb1Y4ZK7gNkIkdoS6HXvgHaqIUuPCGfKkXYBnhDeIftAEjgLgVZPCWOFoxH JLUBQkcQyMMsDzWufRAYbhZAebURey8zsBRjHDpK5oMrGA1lQc3dWOBela56S8qseP2R YqeIFlef98rIM1YR8LBY9TxYtTe+76j6QOmlG8MNVqzFeu9EJ5bHDGp4dX8yy/XHq99W jevw== X-Gm-Message-State: APjAAAXKUu4A7e/SRLyTnxCMasGNTHzGINfbx8OnFpWKHLbduvJoI0bL n5bl6EOke8qF9gNxMOrC5pDaTQ== X-Google-Smtp-Source: APXvYqxT2qEUiCoLd/ZcoKmq/Ca+QIL1lDVpHdDad0BcRpMCe3PoHcHKGE+wGWSN2EdDOvkKnYqWOQ== X-Received: by 2002:a63:f441:: with SMTP id p1mr7746477pgk.362.1573705869452; Wed, 13 Nov 2019 20:31:09 -0800 (PST) Received: from [192.168.1.188] ([66.219.217.79]) by smtp.gmail.com with ESMTPSA id 129sm3179960pfd.174.2019.11.13.20.31.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Nov 2019 20:31:08 -0800 (PST) To: io-uring@vger.kernel.org, "linux-kernel@vger.kernel.org" Cc: Alexander Viro , Andrew Morton , linux-fsdevel , Christoph Hellwig From: Jens Axboe Subject: [PATCH RFC] io_uring: make signalfd work with io_uring (and aio) POLL Message-ID: <58059c9c-adf9-1683-99f5-7e45280aea87@kernel.dk> Date: Wed, 13 Nov 2019 21:31:05 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 Content-Language: en-US Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This is a case of "I don't really know what I'm doing, but this works for me". Caveat emptor, but I'd love some input on this. I got a bug report that using the poll command with signalfd doesn't work for io_uring. The reporter also noted that it doesn't work with the aio poll implementation either. So I took a look at it. What happens is that the original task issues the poll request, we call ->poll() (which ends up with signalfd for this fd), and find that nothing is pending. Then we wait, and the poll is passed to async context. When the requested signal comes in, that worker is woken up, and proceeds to call ->poll() again, and signalfd unsurprisingly finds no signals pending, since it's the async worker calling it. That's obviously no good. The below allows you to pass in the task in the poll_table, and it does the right thing for me, signal is delivered and the correct mask is checked in signalfd_poll(). Similar patch for aio would be trivial, of course. Not-really-signed-off-by: Jens Axboe diff --git a/fs/io_uring.c b/fs/io_uring.c index d8ea9b4f83a7..d9a4c9aac958 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -299,6 +299,7 @@ struct io_poll_iocb { bool done; bool canceled; struct wait_queue_entry wait; + struct task_struct *task; }; struct io_timeout { @@ -2021,7 +2022,10 @@ static void io_poll_complete_work(struct io_wq_work **workptr) struct io_wq_work *work = *workptr; struct io_kiocb *req = container_of(work, struct io_kiocb, work); struct io_poll_iocb *poll = &req->poll; - struct poll_table_struct pt = { ._key = poll->events }; + struct poll_table_struct pt = { + ._key = poll->events, + .task = poll->task + }; struct io_ring_ctx *ctx = req->ctx; struct io_kiocb *nxt = NULL; __poll_t mask = 0; @@ -2139,9 +2143,11 @@ static int io_poll_add(struct io_kiocb *req, const struct io_uring_sqe *sqe, poll->head = NULL; poll->done = false; poll->canceled = false; + poll->task = current; ipt.pt._qproc = io_poll_queue_proc; ipt.pt._key = poll->events; + ipt.pt.task = poll->task; ipt.req = req; ipt.error = -EINVAL; /* same as no support for IOCB_CMD_POLL */ diff --git a/fs/signalfd.c b/fs/signalfd.c index 44b6845b071c..a7f31758db1a 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c @@ -61,16 +61,17 @@ static int signalfd_release(struct inode *inode, struct file *file) static __poll_t signalfd_poll(struct file *file, poll_table *wait) { struct signalfd_ctx *ctx = file->private_data; + struct task_struct *tsk = wait->task ?: current; __poll_t events = 0; - poll_wait(file, ¤t->sighand->signalfd_wqh, wait); + poll_wait(file, &tsk->sighand->signalfd_wqh, wait); - spin_lock_irq(¤t->sighand->siglock); - if (next_signal(¤t->pending, &ctx->sigmask) || - next_signal(¤t->signal->shared_pending, + spin_lock_irq(&tsk->sighand->siglock); + if (next_signal(&tsk->pending, &ctx->sigmask) || + next_signal(&tsk->signal->shared_pending, &ctx->sigmask)) events |= EPOLLIN; - spin_unlock_irq(¤t->sighand->siglock); + spin_unlock_irq(&tsk->sighand->siglock); return events; } diff --git a/include/linux/poll.h b/include/linux/poll.h index 1cdc32b1f1b0..6d2b6d923b2b 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h @@ -43,6 +43,7 @@ typedef void (*poll_queue_proc)(struct file *, wait_queue_head_t *, struct poll_ typedef struct poll_table_struct { poll_queue_proc _qproc; __poll_t _key; + struct task_struct *task; } poll_table; static inline void poll_wait(struct file * filp, wait_queue_head_t * wait_address, poll_table *p) @@ -76,6 +77,7 @@ static inline void init_poll_funcptr(poll_table *pt, poll_queue_proc qproc) { pt->_qproc = qproc; pt->_key = ~(__poll_t)0; /* all events enabled */ + pt->task = NULL; } static inline bool file_can_poll(struct file *file)