Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp4823626imm; Tue, 19 Jun 2018 00:00:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLQlfYSev2hBM5yQfjn+Zq0HrLzKKo6iQLj8Uaki2Ps0rVTG1LOlGeI30TKDtC3MA6sBdIV X-Received: by 2002:a65:5106:: with SMTP id f6-v6mr13612148pgq.122.1529391602906; Tue, 19 Jun 2018 00:00:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529391602; cv=none; d=google.com; s=arc-20160816; b=ft1qA2M+954V0XEP++rp1CoNDNSjKJE9Vrv6ThMpfxAD9iYTI2+tMuqQm+LqAkfJSK r8cMcd89Efc8cTr+XKekaamIDhs/LJbY2xDsPl6yWn4MnasJDT2Q7tHAoLeWq629TfsK GnRRaJDj40bt4RVqmLcm/GvSWc+E1q1mFz2bD8JJf3PSRNRgRnKTcEaMLSVe7qPvxbuX hUp3J0sij1OrNQ+izrYxJKkknSMtLIx5qgNG6Jma0cWE7059VVP+xZy+nN5Hg9wn1VZo ehJ9Xoa5Db2iQKNjmt+2gekx/+2oY4Bzf6asdCgpy8dyfyK5z8nZ7QyryXJki2OrAWjB I0lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=tAJbmg5iQtpFOXg4vuQz3a7Z0BLe1ZO/r9cj4495nm0=; b=e44WfEX5UVW5XsnNlIZttmul3OyI7CWuVn5js5ZjxvpPTTT0NuLHBaoxaD8shl3lqa mI0WVu4IhtzrDRyX8sYK77LllzOG5kzh35BzIpw1H+OiS4A4NLaY10ygSVTq+SXFAN0J tZg9817Gdu5wvaVAleLnrUQlSzU62ZV8vJ0G7iQQgEGQ+f5GeZ92aoa4XkJPMi+/pNIQ Gstfja07Uzl2Qvcg8rsoKNZfXxGTGv96PTHAJDwflmOcTfTfDc/ZzikjSbtGVJZxWRyF Pjq9oDXzIvefWz+ZkSaLlCiBRS3ARki9Uu/Rz61xesDuFuFgYn1SUyiYzEQ4bK8I15SH Ozew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=WDk0+lxp; 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 7-v6si16706751plc.179.2018.06.18.23.59.47; Tue, 19 Jun 2018 00:00:02 -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=WDk0+lxp; 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 S937285AbeFSG7I (ORCPT + 99 others); Tue, 19 Jun 2018 02:59:08 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:48454 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935908AbeFSG7G (ORCPT ); Tue, 19 Jun 2018 02:59:06 -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 w5J6x4VV188878; Tue, 19 Jun 2018 06:59:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2017-10-26; bh=tAJbmg5iQtpFOXg4vuQz3a7Z0BLe1ZO/r9cj4495nm0=; b=WDk0+lxpOq7n6DM6yXARR0JfyTCgR1NQ4mPJAFDwq3hfelPZJvv3RM7mnL4lyCTEpNIT ou2arATKdx/vitZ/BdbnZOz6KbQgCnrpan8D3xlnwCV0E1Zv8Smod0d+aEsca3k4n7Xt A8BWESBwVp4A+eI4bJ53Tu7NXs20HEfFOq0Ni2GiCZrIXktkha+uopmOBVyVPDnC6ajS ABUyiQmgzEZW1OXKdapAYOQQwSyPmP/rS9EU/nBSXR/n6iOvcMRY6ToZzDAZR6epFVn2 eM7QlnesM3uZ05wA1D728bLGPXk4a63zeAdnlfhGzMGJcCofz42z5x4EcAYUcGGOZwZc ag== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2jmt01etxr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jun 2018 06:59:04 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w5J6x4jn016783 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jun 2018 06:59:04 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w5J6x3BX010620; Tue, 19 Jun 2018 06:59:04 GMT Received: from will-ThinkCentre-M910s.cn.oracle.com (/10.182.70.254) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 18 Jun 2018 23:59:03 -0700 From: Jianchao Wang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] blk-mq: use blk_mq_timeout_work to limit the max timeout Date: Tue, 19 Jun 2018 15:00:10 +0800 Message-Id: <1529391610-1654-1-git-send-email-jianchao.w.wang@oracle.com> X-Mailer: git-send-email 2.7.4 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8928 signatures=668702 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=831 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806190081 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org blk_rq_timeout is needed to limit the max timeout value, otherwise, a idle hctx cannot be deactivated timely in shared-tag case. Fixes: 12f5b931 (blk-mq: Remove generation seqeunce) Signed-off-by: Jianchao Wang --- block/blk-mq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 70c65bb..ccebe7b 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -868,7 +868,7 @@ static void blk_mq_timeout_work(struct work_struct *work) blk_mq_queue_tag_busy_iter(q, blk_mq_check_expired, &next); if (next != 0) { - mod_timer(&q->timeout, next); + mod_timer(&q->timeout, blk_rq_timeout(round_jiffies_up(next))); } else { /* * Request timeouts are handled as a forward rolling timer. If -- 2.7.4