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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D9207C433DF for ; Mon, 10 Aug 2020 19:30:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B679622B4B for ; Mon, 10 Aug 2020 19:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597087831; bh=ykiEy8HpZNwiqBDjKTD4vYL3gmZa6nUXJE0IRzyYAT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bsiZWapYWZdldz9K97z723351z2aoxbFcfHJTbSogSg+lMZX0wY+VNWfrcxtfJHF6 bwsF+SGsDygmlUmA0KjzlAWj9dsqLTI9HaLOd2pcq6o4Iqz3Y3GJ1QWrYg0SdP5SGD cky7EFi+9IxwN/ykmJGK6VT+J9+5PBDiJLPJWNOw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728334AbgHJTa1 (ORCPT ); Mon, 10 Aug 2020 15:30:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:37660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728934AbgHJTKY (ORCPT ); Mon, 10 Aug 2020 15:10:24 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 449B922B45; Mon, 10 Aug 2020 19:10:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597086624; bh=ykiEy8HpZNwiqBDjKTD4vYL3gmZa6nUXJE0IRzyYAT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rGe73gt0Ny15ZSR8o9sH9kfiG5KrP2ZO47sWvStEO9Y0Z7IArvf3Xy5iBAW0o+zkI TbGBkEdFr591t9PPNkkBBx6IZDpQ1t5X3g2iuHpbWmy3YYMazv/2FDOaeX1XJH2hOG WDxx/sDDJcYqx+bFwxLDk+MMyB3WGgCbfeDHvA48= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pavel Begunkov , Jens Axboe , Sasha Levin , linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 62/64] io_uring: fix stalled deferred requests Date: Mon, 10 Aug 2020 15:08:57 -0400 Message-Id: <20200810190859.3793319-62-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200810190859.3793319-1-sashal@kernel.org> References: <20200810190859.3793319-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 73f5e0a9bf2bd..be790f3f13b5c 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -7531,6 +7531,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