Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp728597ybn; Tue, 24 Sep 2019 08:36:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqxmfFq+laTtzEFfjQbFnqei14Vq1aq0S9O8yHrZooiONGrYyhWMLQim5pKijUo+ff7Z5WvF X-Received: by 2002:a5d:4744:: with SMTP id o4mr2833640wrs.95.1569339388271; Tue, 24 Sep 2019 08:36:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569339388; cv=none; d=google.com; s=arc-20160816; b=0KTfRKNXXPeBzhE6OAlRp1+1Rs9ZuOOERTfe3nZCpgRGWEUBoE5WTQGxUhXE4+l8aX kTwhoiIejv9R8j2yNNv5NxzabcvBV9ydEat1zltaGhNeSRpfjNOkxEDGJfvWf1R0FkOJ /LPoCJDSMSVbKxkKv6MBFKIRWOidKrQTcE17iJ6Ah3zhwMKMVqrQzudIRtiv5dpClvjN q/PWdHauRPBBvn3tSJ+A2tNGXwhYltuvjjliKlky+cB+deuz/gsRSkL14H9El+PHUS9a vDPBaOB00ouz5rn/dwWz8HAZjhtxgHU+rCz+2n4k7S0Jycps1fQK1S7/8JzKV2lIZA2T 4JbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1/RrCi+0a4XmaeoVSmUHOUsrNtQWofzLNjJeclmpom8=; b=0d9ybGSOO9f61wlUsC/1knUC6JDn4SLxJfzIKct0URULKMq9JEBEmeE9nmDaqVzeyO L9FPZ60xP/Lhsw/3OuOqWNtEqS4KhClikQU7ACUitsGzrvvI9CQxVjikjB1YpUN/YaGF hcsWJtO0JEqAOvpDDTeawdvfFkGieI9lnYscJUIPEBCnQbuDuml+2e8SQfNM2ErkbDWa qiAIxao8uJiQUZLDx9qzED25CMWyvkIuFrz+W0fKDtZ7fQPNDnCQLuJ/zSu/KiG7NooN rsIsEyhIn/PEruXRrZoptO3I5oTTK04jXolelUnywSiW1FA0Y3bP8Hvvl+kA8Bq58nqS M3wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tGIMy4vp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a30si1391147eda.39.2019.09.24.08.36.02; Tue, 24 Sep 2019 08:36:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tGIMy4vp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388572AbfIVTbr (ORCPT + 99 others); Sun, 22 Sep 2019 15:31:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:45678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391571AbfIVSso (ORCPT ); Sun, 22 Sep 2019 14:48:44 -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 899FA21A4C; Sun, 22 Sep 2019 18:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178124; bh=qzhzxhxwZtPw9WUK7gM1IqcV5+m1vRHorMTFT6SbNOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tGIMy4vp4WpJAB9MEtErxkZ3Ahs+R1ynH+rG9KI3sfI80fHNJBKAQZVWs0SpY1JeN YVCe+UBvEXOFtDJrTwjEObMcyMXEWy1TQicdAhAdxbXnomVou3GTsX/ynC4JhAaxX4 LzVUxpnpD9Zo/cw9Hbvx0+STwSnImo3ulYmwUhfk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jackie Liu , Jens Axboe , Sasha Levin , linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 178/203] io_uring: fix wrong sequence setting logic Date: Sun, 22 Sep 2019 14:43:24 -0400 Message-Id: <20190922184350.30563-178-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-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: Jackie Liu [ Upstream commit 8776f3fa15a5cd213c4dfab7ddaf557983374ea6 ] Sqo_thread will get sqring in batches, which will cause ctx->cached_sq_head to be added in batches. if one of these sqes is set with the DRAIN flag, then he will never get a chance to process, and finally sqo_thread will not exit. Fixes: de0617e4671 ("io_uring: add support for marking commands as draining") Signed-off-by: Jackie Liu 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 cfb48bd088e12..06d048341fa41 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -288,6 +288,7 @@ struct io_ring_ctx { struct sqe_submit { const struct io_uring_sqe *sqe; unsigned short index; + u32 sequence; bool has_user; bool needs_lock; bool needs_fixed_file; @@ -2040,7 +2041,7 @@ static int io_req_set_file(struct io_ring_ctx *ctx, const struct sqe_submit *s, if (flags & IOSQE_IO_DRAIN) { req->flags |= REQ_F_IO_DRAIN; - req->sequence = ctx->cached_sq_head - 1; + req->sequence = s->sequence; } if (!io_op_needs_file(s->sqe)) @@ -2247,6 +2248,7 @@ static bool io_get_sqring(struct io_ring_ctx *ctx, struct sqe_submit *s) if (head < ctx->sq_entries) { s->index = head; s->sqe = &ctx->sq_sqes[head]; + s->sequence = ctx->cached_sq_head; ctx->cached_sq_head++; return true; } -- 2.20.1