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=-10.1 required=3.0 tests=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 B4529C32750 for ; Fri, 2 Aug 2019 13:20:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 831AC21850 for ; Fri, 2 Aug 2019 13:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752021; bh=6ZsXPMekXwgsbiMKJ+0VJ5o+h4+7cciKIcWqCQg6f0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=p3R6qEHr0Jz7ZHcAT4jp/XQCGNA2PsPk57x7sU94gZji3z1V9MB6Va2ovlyshcXfT m6NwRWy3bFPDeAxqIc5LSGYTbnfffp+AGoWbNNPbXkB2I6zOhQRV4FqFIK8LxBn/vU HAzmIbZQmj0JKDpkMesSo+JWAToPk9w6h68bSn4c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393339AbfHBNUU (ORCPT ); Fri, 2 Aug 2019 09:20:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:58482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393282AbfHBNUJ (ORCPT ); Fri, 2 Aug 2019 09:20:09 -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 902412189E; Fri, 2 Aug 2019 13:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752007; bh=6ZsXPMekXwgsbiMKJ+0VJ5o+h4+7cciKIcWqCQg6f0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cKUKYSgIQrBqooG715VMyeb84gV4MDe7cjXtCpH4RXGl5nRIUUrPDYgXmK4sU1TdC K75bNGVsI78kZJkodl4jK3Llhy6dni+4iVMWWnoz+wNxXU3jzzW8AJTH0oPT9vR55Q /ZaT7RCtGBENJMNo3Q31pboROrrQLmkh8jFbOD10= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josef Bacik , Oleg Nesterov , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 13/76] rq-qos: set ourself TASK_UNINTERRUPTIBLE after we schedule Date: Fri, 2 Aug 2019 09:18:47 -0400 Message-Id: <20190802131951.11600-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802131951.11600-1-sashal@kernel.org> References: <20190802131951.11600-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: Josef Bacik [ Upstream commit d14a9b389a86a5154b704bc88ce8dd37c701456a ] In case we get a spurious wakeup we need to make sure to re-set ourselves to TASK_UNINTERRUPTIBLE so we don't busy wait. Reviewed-by: Oleg Nesterov Signed-off-by: Josef Bacik Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-rq-qos.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c index e5d75280b431e..e3ab75e4df9ea 100644 --- a/block/blk-rq-qos.c +++ b/block/blk-rq-qos.c @@ -261,6 +261,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data, } io_schedule(); has_sleeper = true; + set_current_state(TASK_UNINTERRUPTIBLE); } while (1); finish_wait(&rqw->wait, &data.wq); } -- 2.20.1