From patchwork Mon Dec 10 02:44:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "jianchao.wang" X-Patchwork-Id: 10720523 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F3E4415A6 for ; Mon, 10 Dec 2018 02:45:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E34C529C9C for ; Mon, 10 Dec 2018 02:45:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D778429FB3; Mon, 10 Dec 2018 02:45:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 745C729C9C for ; Mon, 10 Dec 2018 02:45:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726368AbeLJCox (ORCPT ); Sun, 9 Dec 2018 21:44:53 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:41824 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726487AbeLJCow (ORCPT ); Sun, 9 Dec 2018 21:44:52 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id wBA2iBeN117117; Mon, 10 Dec 2018 02:44:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2018-07-02; bh=gv9VVQ7DIyiJLE0zktPPeAelxpwiub+6wt4tG8gdwnU=; b=oKq55HNg6/iGpPp5WOBkY6e5jGfzDl3q6Awk7H8/+icc32Dx0xnL5ieI1YQJV7yVcvrc yoiKtM+Xa6MkYxgvkb6fPHU0lBvcBjthdsQxFloLno860XKIziPC9LtRepkJpvO/INRf 8qUI9sSW8Xk9yC+UdzU8KAA0rbns5rw1SSWRDauJ3QO471SLaSgBZxV08pD1deM2bvLH 4WQJ87hUW7j9aoFXYT6EoUV9sQDQrY04cmmY0XxAumec4ACjE+/E5BEKzyH1ie8Ow4IX 6tMvo2pI3RuufbSwQR3o4U7AyWeP0Hfr5DGl4H9GSU+b+dgJllMqylRT6wp/V7iupVxZ zw== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp2130.oracle.com with ESMTP id 2p83fdukg1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Dec 2018 02:44:47 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id wBA2ikZG021914 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Dec 2018 02:44:47 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id wBA2ikD9018158; Mon, 10 Dec 2018 02:44:46 GMT Received: from will-ThinkCentre-M93p.cn.oracle.com (/10.182.70.234) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 09 Dec 2018 18:44:45 -0800 From: Jianchao Wang To: axboe@kernel.dk Cc: ming.lei@redhat.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V12 0/3] blk-mq: refactor code of issue directly Date: Mon, 10 Dec 2018 10:44:06 +0800 Message-Id: <1544409849-20119-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=9102 signatures=668679 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=972 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1812100024 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Jens Please consider this patchset for 4.21. It refactors the code of issue request directly to unify the interface and make the code clearer and more readable. The 1st patch refactors the code of issue request directly to unify the helper interface which could handle all the cases. The 2nd patch make blk_mq_sched_insert_requests issue requests directly with 'bypass' false, then it needn't to handle the non-issued requests any more. The 3rd patch replace and kill the blk_mq_request_issue_directly. V12: - remove the original 1st patch/ - rebase other 3 patches on newest for-4.21/block - add some comment V11: - insert request to dispatch list when .queue_rq return BLK_STS_RESOURCE/BLK_STS_DEV_RESOURCE. (2/4) - stop to attempt direct-issue and insert the reset when meet non-ok case (3/4). V10: - address Jen's comment. - let blk_mq_try_issue_directly return actual result for case 'bypass == false'. (2/4) - use return value of blk_mq_try_issue_directly to identify whether the request is direct-issued successfully. (3/4) V9: - rebase on recent for-4.21/block - add 1st patch V8: - drop the original 2nd patch which try to insert requests into hctx->dispatch if quiesced or stopped. - remove two wrong 'unlikely' V7: - drop the original 3rd patch which try to ensure hctx to be ran on its mapped cpu in issueing directly path. V6: - drop original 1st patch to address Jen's comment - discard the enum mq_issue_decision and blk_mq_make_decision and use BLK_STS_* return values directly to address Jen's comment. (1/5) - add 'unlikely' in blk_mq_try_issue_directly (1/5) - refactor the 2nd and 3rd patch based on the new 1st patch. - reserve the unused_cookie in 4th and 5th patch V5: - rebase against Jens' for-4.21/block branch - adjust the order of patch04 and patch05 - add patch06 to replace and kill the one line blk_mq_request_bypass_insert - comment changes V4: - split the original patch 1 into two patches, 1st and 2nd patch currently - rename the mq_decision to mq_issue_decision - comment changes V3: - Correct the code about the case bypass_insert is true and io scheduler attached. The request still need to be issued in case above. (1/4) - Refactor the code to make code clearer. blk_mq_make_request is introduced to decide insert, end or just return based on the return value of .queue_rq and bypass_insert (1/4) - Add the 2nd patch. It introduce a new decision result which indicates to insert request with blk_mq_request_bypass_insert. - Modify the code to adapt the new patch 1. V2: - Add 1st and 2nd patch to refactor the code. Jianchao Wang (3) blk-mq: refactor the code of issue request directly blk-mq: issue directly with bypass 'false' in blk-mq: replace and kill blk_mq_request_issue_directly block/blk-core.c | 4 +- block/blk-mq-sched.c | 8 ++-- block/blk-mq.c | 123 +++++++++++++++++++++++++-------------------------- block/blk-mq.h | 6 ++- 4 files changed, 70 insertions(+), 71 deletions(-) Thanks Jianchao