From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, 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 E7345C433DF for ; Mon, 17 Aug 2020 19:42:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB9AF20674 for ; Mon, 17 Aug 2020 19:42:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597693334; bh=kj5QzK2QJ5tDlUU1DjpaLCU+najP8yUzh2g6eZosa5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V59NcWRCsaGOotlCLHyQWnQcMOChRpcmMm31JsFQV53xWJssmtJv8fm9XWv/g1B/6 aFpEl2MnnAAtSIw/OCC+S+FxT/PP1+DwcnF7Q9w4mO9iavMLQ92AysYqEOpWSeHfnf GO7g4Al1UwFv3pjCZd+7xD2ouh8E1Pc94GH66wv0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729458AbgHQTmN (ORCPT ); Mon, 17 Aug 2020 15:42:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:55050 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729649AbgHQPY1 (ORCPT ); Mon, 17 Aug 2020 11:24:27 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 F3F7723719; Mon, 17 Aug 2020 15:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597677866; bh=kj5QzK2QJ5tDlUU1DjpaLCU+najP8yUzh2g6eZosa5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i992kPiar466vW5AhEMQv7ykkZo3pcF9GjP+n++qrIYs4OpIKwhiu+AdeqNCVadtK 8sIy9YhAN7Fh4nf7uDZsLnDUFpad3lXzcUfz/BuUnhtOHDc+LdCqZqvFdbry3dJNC7 +XDpKDD0TL1cn13YrUVvBuFRglqFv8oSLMwDJiZo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Begunkov , Jens Axboe , Sasha Levin Subject: [PATCH 5.8 137/464] io_uring: fix stalled deferred requests Date: Mon, 17 Aug 2020 17:11:30 +0200 Message-Id: <20200817143840.378805823@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pavel Begunkov [ Upstream commit dd9dfcdf5a603680458f5e7b0d2273c66e5417db ] Always do io_commit_cqring() after completing a request, even if it was accounted as overflowed on the CQ side. Failing to do that may lead to not to pushing deferred requests when needed, and so stalling the whole ring. Signed-off-by: Pavel Begunkov Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- fs/io_uring.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index 1d8761a9f3b88..1619ca74b44d9 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -7538,6 +7538,7 @@ static void io_uring_cancel_files(struct io_ring_ctx *ctx, } WRITE_ONCE(ctx->rings->cq_overflow, atomic_inc_return(&ctx->cached_cq_overflow)); + io_commit_cqring(ctx); spin_unlock_irq(&ctx->completion_lock); /* -- 2.25.1