Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2687130ybg; Mon, 28 Oct 2019 00:14:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7Hr+InWj+bWcdk/kHlvsHKjN0XBL8eeLi5zlWuPl6qXnMeci3UPa+oi1aeEUp4+3KMvAS X-Received: by 2002:a05:6402:120d:: with SMTP id c13mr162459edw.264.1572246866851; Mon, 28 Oct 2019 00:14:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572246866; cv=none; d=google.com; s=arc-20160816; b=fvytwLrtZlfrrKD3jimp/V1Bi9gyfnqw8rv0ytnWmlnruG1zeLYdo3eWCJse0VQS19 Z4Ta/OsT9H4QBnenP3g2ZQ/aaSmK7B3ksMeVDKUD1oQuOb063zXa/i8pzNNlFMICOEPj D9dx+cBJjdIXM0i9h9hg87emJNtNDXO39mzlnqfpjXsmbeO+bTNkvD7X8vxqaw1gJfc3 1RTw0bMrKf5pNemRkU4QL+DQM3otSGke4LsHXtPJQLpQ4ew/fWV9LIUn39VVTcPvnJex eMT2JME/ivlR0EctHNMvbMwveY/NQ1gNZHltCNe98OuV1/Hu4e818SVW3d6hrBpsnzvQ FFjw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2iT4aaKsrl2IApQBj/x0kMArbAjOll0kqBFlaIE5p3Q=; b=mQh6+7npHKdUs4gJih2+H6Kgz+cpvUzpfW5PX/GN0aFtg3vDNexRNh/h/tcOqya2hZ 8lAg/+RQ14j5V7E6XzD96GZwI4teNBmMUxr07O4FaUWpQsW62HV/idG7SncuWpOw+v/O AmjvOkFvVZ9p6rbTaIHpMFr4xexosegGiojNjDUBIh7Psayf2rIjN1gEfeiVCag7nMnD e78pJg1cSwQw2RuuicgR+xHbqruUN3wpSHggX7Q59N/eMJGEdWQMUhAue6SIUtyZXxqE hpOSmT6PDSTv1PI0n+oKZ3S9L1XtrRo0hzk9IFElAYPlj+tRh/daZiaPmrDLhZC+n2P2 PlrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JEGKJ1K1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q7si6917105edi.103.2019.10.28.00.14.03; Mon, 28 Oct 2019 00:14:26 -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=JEGKJ1K1; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731095AbfJ0VRj (ORCPT + 99 others); Sun, 27 Oct 2019 17:17:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:37462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731078AbfJ0VRg (ORCPT ); Sun, 27 Oct 2019 17:17:36 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 96CF9205C9; Sun, 27 Oct 2019 21:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211055; bh=Ii/x99Y43DIXENaiW8bkvF2LMelP892XpD/IMXCT2sI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JEGKJ1K1FBvZTkUYE1FVFNDxkOgxoQ2b0F52WWojhu0IzlU5bMwgnT8TwYJ4oVP84 QCDie05QL4prUaXBFQpk7ZfS2qgLPmFG0yeqVyvTwWCYAqIIIX8xfZi/4qWLP0pTU1 dXyqL0zlx/yjVNHoHgg4SpY4jZPVnLKqnGUuQUq8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Wunderlich , Sagi Grimberg , Sasha Levin Subject: [PATCH 5.3 017/197] nvme-tcp: fix wrong stop condition in io_work Date: Sun, 27 Oct 2019 21:58:55 +0100 Message-Id: <20191027203352.605976499@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wunderlich, Mark [ Upstream commit ddef29578a81a1d4d8f2b26a7adbfe21407ee3ea ] Allow the do/while statement to continue if current time is not after the proposed time 'deadline'. Intent is to allow loop to proceed for a specific time period. Currently the loop, as coded, will exit after first pass. Signed-off-by: Mark Wunderlich Reviewed-by: Sagi Grimberg Signed-off-by: Sagi Grimberg Signed-off-by: Sasha Levin --- drivers/nvme/host/tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 606b13d35d16f..bdadb27b28bbb 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1039,7 +1039,7 @@ static void nvme_tcp_io_work(struct work_struct *w) { struct nvme_tcp_queue *queue = container_of(w, struct nvme_tcp_queue, io_work); - unsigned long start = jiffies + msecs_to_jiffies(1); + unsigned long deadline = jiffies + msecs_to_jiffies(1); do { bool pending = false; @@ -1064,7 +1064,7 @@ static void nvme_tcp_io_work(struct work_struct *w) if (!pending) return; - } while (time_after(jiffies, start)); /* quota is exhausted */ + } while (!time_after(jiffies, deadline)); /* quota is exhausted */ queue_work_on(queue->io_cpu, nvme_tcp_wq, &queue->io_work); } -- 2.20.1