From patchwork Fri Jun 17 10:55:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 582715 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B50DDCCA481 for ; Fri, 17 Jun 2022 11:01:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382116AbiFQLBn (ORCPT ); Fri, 17 Jun 2022 07:01:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233957AbiFQLBk (ORCPT ); Fri, 17 Jun 2022 07:01:40 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56D026C0DF; Fri, 17 Jun 2022 04:01:37 -0700 (PDT) Received: from fraeml714-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4LPbfJ20Xgz6H6l9; Fri, 17 Jun 2022 18:59:52 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml714-chm.china.huawei.com (10.206.15.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 17 Jun 2022 13:01:34 +0200 Received: from localhost.localdomain (10.69.192.58) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 17 Jun 2022 12:01:30 +0100 From: John Garry To: , , , , , , , , , CC: , , , , , , , , , John Garry Subject: [PATCH 0/5] blk-mq: Add a flag for reserved requests series Date: Fri, 17 Jun 2022 18:55:15 +0800 Message-ID: <1655463320-241202-1-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org In [0] I included "blk-mq: Add a flag for reserved requests" to identify if a request is 'reserved' for special handling. Doing this is easier than passing a 'reserved' arg to the blk_mq_ops callbacks. Indeed, only 1x timeout implementation or blk-mq iter function actually uses the 'reserved' arg (or 3x if you count SCSI core and FNIC SCSI driver). So this series drops the 'reserved' arg for these timeout and iter functions. Christoph suggested that I try to upstream now. About the SCSI changes, I can leave them in place if people prefer. Based on following: c13794dbe936 (block/for-5.20/block) block: Directly use ida_alloc()/free() [0] https://lore.kernel.org/linux-scsi/1654770559-101375-1-git-send-email-john.garry@huawei.com/T/#m22aa9f89e55835edc2e650d43f7e3219a3a1a324 John Garry (5): scsi: core: Remove reserved request time-out handling blk-mq: Add a flag for reserved requests blk-mq: Drop blk_mq_ops.timeout 'reserved' arg scsi: fnic: Drop reserved request handling blk-mq: Drop 'reserved' member of busy_tag_iter_fn block/blk-mq-debugfs.c | 2 +- block/blk-mq-tag.c | 13 +++++-------- block/blk-mq.c | 22 +++++++++++++--------- block/bsg-lib.c | 2 +- drivers/block/mtip32xx/mtip32xx.c | 11 +++++------ drivers/block/nbd.c | 5 ++--- drivers/block/null_blk/main.c | 2 +- drivers/infiniband/ulp/srp/ib_srp.c | 3 +-- drivers/mmc/core/queue.c | 3 +-- drivers/nvme/host/apple.c | 3 +-- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/fc.c | 6 ++---- drivers/nvme/host/nvme.h | 2 +- drivers/nvme/host/pci.c | 2 +- drivers/nvme/host/rdma.c | 3 +-- drivers/nvme/host/tcp.c | 3 +-- drivers/s390/block/dasd.c | 2 +- drivers/s390/block/dasd_int.h | 2 +- drivers/scsi/aacraid/comminit.c | 2 +- drivers/scsi/aacraid/linit.c | 2 +- drivers/scsi/fnic/fnic_scsi.c | 14 ++++---------- drivers/scsi/hosts.c | 14 ++++++-------- drivers/scsi/mpi3mr/mpi3mr_os.c | 16 ++++------------ drivers/scsi/scsi_lib.c | 12 ++---------- include/linux/blk-mq.h | 10 ++++++++-- include/scsi/scsi_host.h | 2 +- 26 files changed, 67 insertions(+), 93 deletions(-) Reviewed-by: Bart Van Assche Reviewed-by: Martin K. Petersen