Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp1455789imm; Wed, 20 Jun 2018 19:11:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLf/k82wW9BWqmOiL+nBpS5ndrdcJ1DNpz23x09I+GYFhTNG6M6s/zTdSDHMrmixCUzivMx X-Received: by 2002:a17:902:1007:: with SMTP id b7-v6mr8517120pla.277.1529547060218; Wed, 20 Jun 2018 19:11:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529547060; cv=none; d=google.com; s=arc-20160816; b=k+L4L1Tb88Dls+6BY7iCTjvCH00/0zj5jngaQ9JTynIfHNWbmelG1Yyyh8nUNhOY7y qJTsk3WEnDivCruwDNfpb8a1Y8xst9FqqhkAyWG4srMhbSVLXYnAy98Olj1TsbVA5RkQ LXu4hK+8TwHmeKo0sPU5AMReUEJCFP6a7NFUCq1RrlsCKRbkn9erd2XPd06X342ssOI/ 3ifFJEUXJZw0r2szHHVWoNbWbQntl3Rdy1Xm1ddVMHV9+YptZE6CpbtW84GLdM7Q7M7L 4hwtJtuJOyn0f8bnoqJYTgztt5LY8mkcQcSjAx75TyeeXdEYzpcq9nZN1cGaxHbHcxwO qLBg== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature :arc-authentication-results; bh=62UuZQUCvTsZldJFUGRDXkct1+vF/UY+BIuwekRbX4w=; b=Mbtv8A7IBPVLW7j89NEyWH+gp9d3/QIJW82GpQkotK4pPiyHCFlysMeGnYteI6ZI4x 8KO4FFXdRG9pjgfOC2C5/LNllXVV4+gPFp2ri9OecqAysNlw29k5SYpNHAryNz68KWrB bR/mnxYXfGf13Eoj4eLomapydZZ9UDsrTBF/jNbmcvRDLZsG95wFLAo9uicpxUF6pB20 CFFVyaik1396DeyDm3yfKTNbKS+EHxaDeiaw1wptYCpd6yJSh9Nr/52zFsExoirKU8uU +gr2Yg+0JEeKUj+z32Kzug3iVElirimBc9J/84x6qvDWYLFZn/DhBebogbOkxj3GndE2 KdnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=tzOkclnd; 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=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p11-v6si3641032plq.33.2018.06.20.19.10.44; Wed, 20 Jun 2018 19:11:00 -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=@oracle.com header.s=corp-2017-10-26 header.b=tzOkclnd; 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=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754501AbeFUCJP (ORCPT + 99 others); Wed, 20 Jun 2018 22:09:15 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:60078 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754290AbeFUCJN (ORCPT ); Wed, 20 Jun 2018 22:09:13 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5L28tNe172702; Thu, 21 Jun 2018 02:09:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=corp-2017-10-26; bh=62UuZQUCvTsZldJFUGRDXkct1+vF/UY+BIuwekRbX4w=; b=tzOkclndad9+z2+Jmc30p/9oj/ejFPdae8cVoyZsBq37X+DZIJUEWeK02b6azuWBnqeR AZcEoQDaX9hEOHgym2d1v0ymjGVH/wOulaBDbFnDZv2wPTS2tuLnTbRQextzoAk4xIWz ZBea692NdAqruuiAWpb7TQBCo72RpiMMC7XIsEonuWIR7MS0V6TshL5I/CF4LkYJ8zxR OW7RMoMDnu5gjLMejZ+yOX+g9q0c++cU3qIhMfN4TWKuaIutrqTyurigkUEW385G+WBn bvURz7PY0uLvMRsMYfQZLK3CZ7n2LHGaDoxjy7911huTVJOVxwJUokP8E9JiVY6N5m6m sw== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2jmt01pw23-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jun 2018 02:09:04 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w5L2938b018541 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jun 2018 02:09:03 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w5L292sr006775; Thu, 21 Jun 2018 02:09:02 GMT Received: from [10.182.70.180] (/10.182.70.180) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 20 Jun 2018 19:09:02 -0700 Subject: Re: [PATCH 5/5] nvme: use __blk_mq_complete_request in timeout path To: Christoph Hellwig Cc: axboe@kernel.dk, martin.petersen@oracle.com, keith.busch@intel.com, josef@toxicpanda.com, ulf.hansson@linaro.org, linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org References: <1529500964-28429-1-git-send-email-jianchao.w.wang@oracle.com> <1529500964-28429-6-git-send-email-jianchao.w.wang@oracle.com> <20180620143956.GA20950@lst.de> From: "jianchao.wang" Message-ID: <42583ee2-fe9d-39da-b82a-38a27b03fdb3@oracle.com> Date: Thu, 21 Jun 2018 10:09:20 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180620143956.GA20950@lst.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8930 signatures=668702 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806210022 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Christoph Thanks for your kindly response. On 06/20/2018 10:39 PM, Christoph Hellwig wrote: >> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c >> index 73a97fc..2a161f6 100644 >> --- a/drivers/nvme/host/pci.c >> +++ b/drivers/nvme/host/pci.c >> @@ -1203,6 +1203,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) >> nvme_warn_reset(dev, csts); >> nvme_dev_disable(dev, false); >> nvme_reset_ctrl(&dev->ctrl); >> + __blk_mq_complete_request(req); >> return BLK_EH_DONE; >> } >> >> @@ -1213,6 +1214,11 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) >> dev_warn(dev->ctrl.device, >> "I/O %d QID %d timeout, completion polled\n", >> req->tag, nvmeq->qid); >> + /* >> + * nvme_end_request will invoke blk_mq_complete_request, >> + * it will do nothing for this timed out request. >> + */ >> + __blk_mq_complete_request(req); > > And this clearly is bogus. We want to iterate over the tagetset > and cancel all requests, not do that manually here. > > That was the whole point of the original change. > For nvme-pci, we indeed have an issue that when nvme_reset_work->nvme_dev_disable returns, timeout path maybe still running and the nvme_dev_disable invoked by timeout path will race with the nvme_reset_work. However, the hole is still there right now w/o my changes, but just narrower. Thanks Jianchao