From patchwork Tue Sep 8 15:25:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 264281 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFFC9C433E2 for ; Tue, 8 Sep 2020 18:08:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 875072080A for ; Tue, 8 Sep 2020 18:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599588517; bh=bLHFQoqjMw1LqzuW5lIQUHGrICvm3uFWuzg3G89iCmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qUcZO+th6Il6Qg2UiFjfxO4VeG9A7IgbV0iSxE/FC+v08nRs3CA++I+C4tBKRblAP vjcby9kJ3OpQmI/Cn+fIUDtg1G490/xn5P/aytgx6zre4yxafkqEWODEKxIp9XuiH0 t/vUkXETNlPYt8UNhlcYH8K6Orq2756G7kWJo3y0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731894AbgIHSI0 (ORCPT ); Tue, 8 Sep 2020 14:08:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:55370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731316AbgIHQLt (ORCPT ); Tue, 8 Sep 2020 12:11:49 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AFE7D24768; Tue, 8 Sep 2020 15:41:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579710; bh=bLHFQoqjMw1LqzuW5lIQUHGrICvm3uFWuzg3G89iCmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cD+vvQSpDpTcYlPHceoRNtsOfu7TKk/mH8wTZ4Kc70yne4dQjvAUQTeF0TjrxoPo3 PQxGI4/KZ6qzIoDKk2qIQdUHzo2nDRegWgD5YWTs1vZxGS7zRS/PdKAhvf64uuTuP9 l2nBPth6PYr5wz3wmfI8C2LOo88A1rAzGTabtiuk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Norman Maurer , Jens Axboe Subject: [PATCH 5.8 176/186] io_uring: no read/write-retry on -EAGAIN error and O_NONBLOCK marked file Date: Tue, 8 Sep 2020 17:25:18 +0200 Message-Id: <20200908152250.202142288@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152241.646390211@linuxfoundation.org> References: <20200908152241.646390211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jens Axboe commit 355afaeb578abac907217c256a844cfafb0337b2 upstream. Actually two things that need fixing up here: - The io_rw_reissue() -EAGAIN retry is explicit to block devices and regular files, so don't ever attempt to do that on other types of files. - If we hit -EAGAIN on a nonblock marked file, don't arm poll handler for it. It should just complete with -EAGAIN. Cc: stable@vger.kernel.org Reported-by: Norman Maurer Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- fs/io_uring.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2697,8 +2697,15 @@ static int io_read(struct io_kiocb *req, else ret2 = -EINVAL; + /* no retry on NONBLOCK marked file */ + if (ret2 == -EAGAIN && (req->file->f_flags & O_NONBLOCK)) { + ret = 0; + goto done; + } + /* Catch -EAGAIN return for forced non-blocking submission */ if (!force_nonblock || ret2 != -EAGAIN) { + done: kiocb_done(kiocb, ret2); } else { copy_iov: @@ -2823,7 +2830,13 @@ static int io_write(struct io_kiocb *req */ if (ret2 == -EOPNOTSUPP && (kiocb->ki_flags & IOCB_NOWAIT)) ret2 = -EAGAIN; + /* no retry on NONBLOCK marked file */ + if (ret2 == -EAGAIN && (req->file->f_flags & O_NONBLOCK)) { + ret = 0; + goto done; + } if (!force_nonblock || ret2 != -EAGAIN) { +done: kiocb_done(kiocb, ret2); } else { copy_iov: