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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E231C433EF for ; Mon, 27 Sep 2021 17:27:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E8CA60E08 for ; Mon, 27 Sep 2021 17:27:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238269AbhI0R2k (ORCPT ); Mon, 27 Sep 2021 13:28:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:41120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237660AbhI0RZI (ORCPT ); Mon, 27 Sep 2021 13:25:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6BF166138B; Mon, 27 Sep 2021 17:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632762955; bh=ndZ3P0EuF5SeTY+eoTaPRChv3ubGhicc3zYUPt3zmek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T41S+NqD+V0BESerCKJsXN7jBycLbgVrUmzOu43A9K7VdyffxzrhGAWfoUO+ck8CW Dje1D3ygfo0XjOB1Mw8+lHjbRgJ89CnBXeyK6VrH01H5Icss9/TdpfsAGF8pjmJmXD mKW7ElI4bifzG5CFt6XjfLrRJl3qcXRl1pAlnjuY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hao Xu , Jens Axboe , Sasha Levin Subject: [PATCH 5.14 113/162] io_uring: fix missing set of EPOLLONESHOT for CQ ring overflow Date: Mon, 27 Sep 2021 19:02:39 +0200 Message-Id: <20210927170237.362444454@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927170233.453060397@linuxfoundation.org> References: <20210927170233.453060397@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hao Xu [ Upstream commit a62682f92eedb41c1cd8290fa875a4b85624fb9a ] We should set EPOLLONESHOT if cqring_fill_event() returns false since io_poll_add() decides to put req or not by it. Fixes: 5082620fb2ca ("io_uring: terminate multishot poll for CQ ring overflow") Signed-off-by: Hao Xu Link: https://lore.kernel.org/r/20210922101238.7177-3-haoxu@linux.alibaba.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- fs/io_uring.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 27a1c813f1e1..739e58ccc982 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4968,8 +4968,10 @@ static bool io_poll_complete(struct io_kiocb *req, __poll_t mask) } if (req->poll.events & EPOLLONESHOT) flags = 0; - if (!io_cqring_fill_event(ctx, req->user_data, error, flags)) + if (!io_cqring_fill_event(ctx, req->user_data, error, flags)) { + req->poll.events |= EPOLLONESHOT; flags = 0; + } if (flags & IORING_CQE_F_MORE) ctx->cq_extra++; -- 2.33.0