From patchwork Sat Sep 24 06:29:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 609571 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 A7538C07E9D for ; Sat, 24 Sep 2022 06:29:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233235AbiIXG3P (ORCPT ); Sat, 24 Sep 2022 02:29:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbiIXG3N (ORCPT ); Sat, 24 Sep 2022 02:29:13 -0400 Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0AF214D30F for ; Fri, 23 Sep 2022 23:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1664000950; x=1695536950; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=l3JCm5qSZzb6ujJKtq3kEW3pKkqRShXgolJdPRSTV/o=; b=b6oSyy3iJ1CdhawuvT927poxKpjP+Eboc6GwwJbxzgchefywN+GENW59 BYU83WiDlSCJ2JTuVwXl0euuX1maCp9CfY3yKmRK577ttwtlTC6MM9/hJ oplvs7y2h4Q9R8mLqpQoiM9P51GGjErJ1xVEzV9ZVnqIGLFibdnkb91Gg VXL9sTVq/v8AvqQcqAuZPyeT9bx0XoMZmnZVImYGKt/P/5Oi1mQ64qB2T xlOP6XKDejt3bmj73oB9/g9e17U4jmSAHp3qI0gf+J+Ctmyyoalq6tqde P77PhzxiwvCooLmbeVA6l6/QpmintZ5LCp91+kzW1mAjfA+KXzf+zPIHG w==; X-IronPort-AV: E=Sophos;i="5.93,341,1654531200"; d="scan'208";a="324269415" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2022 14:29:09 +0800 IronPort-SDR: 3M2zzaPNzcN+/wlb3xhMXiiGv+0zjEGQqnMwmfDGNU8cSJ5G3Tf+4MlwL+04aDa6Vo+4zQGVdP ZLF4t+pgS4XuIojpY/aYKfyYh51dsdHWoqmN2z3RSvHTgrhz19VkO0CHbU4OeQkIapLapmDMLR wWR8T9c8dG8KAreYavw2r5jiewClAAHj6gzDPQYT+g99i9xVZjvUKrkNbcgshkNsZIGDN9ioCm fW7YLoaVzfnPZgzbj49TiYgtqZ9pHInab1hBIQOB+KRp6sP93VEBp+XdMefcNJL9dDb8iV4EBn g3X+5KKBjFGq3TwvbWkMkq0p Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Sep 2022 22:49:12 -0700 IronPort-SDR: F+VJU/YUGFBZ/yYN1iIpb2Dpj6uuch9EeerIZORTd06JSf61QAqf184L30KUKbUxjPM5kpbt5n yivuT2f2zbv9u/dYkZ71fdvFi3g0kfYbOPZmzH+lph3rlEunfKemEAL63p0HvIyADmtiBv+iDi JS9LhkV+NBwtw+sJ9pAsveRBa3gXaUu8PbofFJbJnqzT/pN3RsazPs1RLkYCpC6nHvdbsdJenK 9bjyr7/Nypdi8YAb6cvoL0Ly8VzheC7wqZxOhG9I79P6QkhLssLe7AZoVPEQqqIylC4JNUktGb seY= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Sep 2022 23:29:11 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4MZJyG6Y0Hz1Rwrq for ; Fri, 23 Sep 2022 23:29:10 -0700 (PDT) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1664000950; x=1666592951; bh=l3JCm5qSZzb6ujJKtq 3kEW3pKkqRShXgolJdPRSTV/o=; b=jTc6nOKhcqhysPpB9jYB9T/At+qaWA7VIV 4XpUIhfXQRR1kDUrLGPzA4LrUO2TW1fQnzXJ9VWFJjbfrqqjJmnbyPI7aMlTm55y Iqp3r0fPL7Dj/E9eIDVtdl2v6NF/+zSOVbV1p1y9pUMRrZ959nE0lahOxVpLFVB+ d6kB/IScBSYd9TlmL2UFMmGJTi1Fq99nmxv4lvOey2squjhT7tXPawHQwkLMechC XGnuTp1PmbvS6NrsrJ9uTz2/2gtAruJL8MHIOUBt6/oTMSgxPz9NNJtzlBBWLvNY 1CqxcFbPvahTUq6KK4Jff1NAwgPTeNRqqeWzf7CbdTAb/1/2M00w== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 7vnArEzZDkP2 for ; Fri, 23 Sep 2022 23:29:10 -0700 (PDT) Received: from washi.fujisawa.hgst.com (washi.fujisawa.hgst.com [10.149.53.254]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4MZJyF5PLFz1RvTp; Fri, 23 Sep 2022 23:29:09 -0700 (PDT) From: Damien Le Moal To: linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, "Martin K . Petersen" , John Garry Subject: [PATCH 1/2] ata: libata-scsi: Fix initialization of device queue depth Date: Sat, 24 Sep 2022 15:29:06 +0900 Message-Id: <20220924062907.959856-2-damien.lemoal@opensource.wdc.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220924062907.959856-1-damien.lemoal@opensource.wdc.com> References: <20220924062907.959856-1-damien.lemoal@opensource.wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org For SATA devices supporting NCQ, drivers using libsas first initialize a scsi device queue depth based on the controller and device capabilities, leading to the scsi device queue_depth field being 32 (ATA maximum queue depth) for most setup. However, if libata was loaded using the force=[ID]]noncq argument, the default queue depth should be set to 1 to reflect the fact that queuable commands will never be used. This is consistent with manually setting a device queue depth to 1 through sysfs as that disables NCQ use for the device. Fix ata_scsi_dev_config() to honor the noncq parameter by sertting the device queue depth to 1 for devices that do not have the ATA_DFLAG_NCQ flag set. Signed-off-by: Damien Le Moal --- drivers/ata/libata-scsi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 29e2f55c6faa..ff9602a0e54e 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1055,6 +1055,7 @@ EXPORT_SYMBOL_GPL(ata_scsi_dma_need_drain); int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev) { struct request_queue *q = sdev->request_queue; + int depth = 1; if (!ata_id_has_unload(dev->id)) dev->flags |= ATA_DFLAG_NO_UNLOAD; @@ -1100,13 +1101,10 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev) if (dev->flags & ATA_DFLAG_AN) set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); - if (dev->flags & ATA_DFLAG_NCQ) { - int depth; - + if (dev->flags & ATA_DFLAG_NCQ) depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id)); - depth = min(ATA_MAX_QUEUE, depth); - scsi_change_queue_depth(sdev, depth); - } + depth = min(ATA_MAX_QUEUE, depth); + scsi_change_queue_depth(sdev, depth); if (dev->flags & ATA_DFLAG_TRUSTED) sdev->security_supported = 1; From patchwork Sat Sep 24 06:29:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 609071 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 03B04C32771 for ; Sat, 24 Sep 2022 06:29:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232947AbiIXG3S (ORCPT ); Sat, 24 Sep 2022 02:29:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233412AbiIXG3O (ORCPT ); Sat, 24 Sep 2022 02:29:14 -0400 Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F1DE11E5C1 for ; Fri, 23 Sep 2022 23:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1664000951; x=1695536951; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=UrK46OMiqPVktHMv38BtOvMlKQ1EObJa5Sv80Q61LtE=; b=bIbq698HhYbzFlW56tTGrt9tu109yAzlDp8gCDpPPcfVzLQl5oiOchab gpyjfMuMFCKoKdImh6n08iOOe53YQz0Vvz95S+9epFp4qAAJrL1YLWErB y0TN099f0i2T8jQnzKRt5w0edwmoBj+C//yQS9LdIYX/yHPtGnujCfwYk jjYqnwvK5D+guIBN11tIojNDP2BQs7BFr4ge1Uu+JK4Jjg3W6gdXdzTsj EI09MxRRgCv/mvs03kU2SYsqUCy7+tercm1I+VaCqH7b8L+HC7nxramH3 EGHRbvZc9ijgQ1NkaPTLKLt2jc33uZB5NhOMZggrTAAjnT11xqQOjMqic Q==; X-IronPort-AV: E=Sophos;i="5.93,341,1654531200"; d="scan'208";a="324269418" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2022 14:29:10 +0800 IronPort-SDR: f5lB01xAwH+bIlBIhCFvJeRAUFkZtbTltpHkPTHbNUl5CvaIhnhf/LfXj2bEFlegITCMfZywYb imBG/NLtuCufuIahsT+yc0AQPzPUc2tNIrnckxVt2dNx9ZXWnjqy6cKYf7ZA6kuHfyd3YKXxk5 esXKTvPm9b2GigffvPK8SB4t9OMBay7KzPiNSXDiMMfQ8bkyL5HnYN3DB5UB8JuOBiesetNFMd sTYxbBwmxJwZK0CLYL7khW+VF6ccnrQ3/Rm/6xszUppV2sIyK5AGz2SlD7+W516kpo72SbZ3YM DmMTnBxWUL/7i/EF+wtbSZsM Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Sep 2022 22:49:13 -0700 IronPort-SDR: 2LyVls/8AVy/xkP1n0Zh7cQn1lSVSgae6QOken2xDDGyb2dt2bJMOsTcoo0DfBRFrTOFvK7HlX 7WedDP7mrmrQnDR8SVYsKj2M0NLpdz5xeRazzP4nG7rCLtnVpLOdVUkspdA+GyHg68DwYOEdc0 //HpGxHwd9bmO1vfyo754Hq1dIAC9xWIyzoI3tUCzOzwJ0gsgZPyQRn7ZSY+Gmo795+KllAH6Y o/khO795ijw8vGDH3qtDk6Jo18yePlYUr7FBq0NyP/gPk9CAjdIZqWa5eMhJzusmb0Qap4GOq8 v28= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Sep 2022 23:29:12 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4MZJyJ0Zgnz1Rwrq for ; Fri, 23 Sep 2022 23:29:12 -0700 (PDT) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1664000951; x=1666592952; bh=UrK46OMiqPVktHMv38 BtOvMlKQ1EObJa5Sv80Q61LtE=; b=jQ+Uv2qPGwxGXcuxhDY5lqTQUywsASfQJp zqwDnBhyetxuvM1C3O9+HJwSN/7YsAMY8UFMdRtOcyITmuUGJCjkvFXNWBv5Xf7K ebPbQRxMFvz4Yptu4LEvZk795KlzTLQPvNMT84xSVRrUX0kpgjnxnBeYguRBabne /Z5n5JpVMWhsWq796+5QU/RYoc22YZ5Su3DSGKG7SZK/E4QQEUcdEdb1YGgKmr4j yZAX6L0x625pObD6sDraMQGzfhmujDinUrID/JuRx0VXstuybWfY0NMdObVbV9iu PzjxGi6rUMVsqPTdnxeIEe6CO34FnOVHOwKOHncXd6f0jN81m6sA== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 9x1OXpe7sj-j for ; Fri, 23 Sep 2022 23:29:11 -0700 (PDT) Received: from washi.fujisawa.hgst.com (washi.fujisawa.hgst.com [10.149.53.254]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4MZJyG5HQZz1RvLy; Fri, 23 Sep 2022 23:29:10 -0700 (PDT) From: Damien Le Moal To: linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, "Martin K . Petersen" , John Garry Subject: [PATCH 2/2] ata: libata-sata: Fix device queue depth control Date: Sat, 24 Sep 2022 15:29:07 +0900 Message-Id: <20220924062907.959856-3-damien.lemoal@opensource.wdc.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220924062907.959856-1-damien.lemoal@opensource.wdc.com> References: <20220924062907.959856-1-damien.lemoal@opensource.wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The function __ata_change_queue_depth() uses the helper ata_scsi_find_dev() to get the ata_device structure of a scsi device and set that device maximum queue depth. However, when the ata device is managed by libsas, ata_scsi_find_dev() return NULL, turning __ata_change_queue_depth() into a nop, which prevents the user from setting the maximum queue depth of ATA devices used with libsas based HBAs. Fix this by renaming __ata_change_queue_depth() to ata_change_queue_depth() and adding a pointer to the ata_device structure of the target device as argument. This pointer is provided by ata_scsi_change_queue_depth() using ata_scsi_find_dev() in the case ofi a libata managed device and by sas_change_queue_depth() using sas_to_ata_dev() in the case of a libsas managed ata device. Signed-off-by: Damien Le Moal --- drivers/ata/libata-sata.c | 24 ++++++++++++------------ drivers/ata/libata-scsi.c | 5 +++++ drivers/scsi/libsas/sas_scsi_host.c | 3 ++- include/linux/libata.h | 4 ++-- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c index 7a5fe41aa5ae..13b9d0fdd42c 100644 --- a/drivers/ata/libata-sata.c +++ b/drivers/ata/libata-sata.c @@ -1018,26 +1018,25 @@ DEVICE_ATTR(sw_activity, S_IWUSR | S_IRUGO, ata_scsi_activity_show, EXPORT_SYMBOL_GPL(dev_attr_sw_activity); /** - * __ata_change_queue_depth - helper for ata_scsi_change_queue_depth - * @ap: ATA port to which the device change the queue depth + * ata_change_queue_depth - Set a device maximum queue depth + * @ap: ATA port of the target device + * @dev: target ATA device * @sdev: SCSI device to configure queue depth for * @queue_depth: new queue depth * - * libsas and libata have different approaches for associating a sdev to - * its ata_port. + * Helper to set a device maximum queue depth, usable with both libsas + * and libata. * */ -int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev, - int queue_depth) +int ata_change_queue_depth(struct ata_port *ap, struct ata_device *dev, + struct scsi_device *sdev, int queue_depth) { - struct ata_device *dev; unsigned long flags; - if (queue_depth < 1 || queue_depth == sdev->queue_depth) + if (!dev || !ata_dev_enabled(dev)) return sdev->queue_depth; - dev = ata_scsi_find_dev(ap, sdev); - if (!dev || !ata_dev_enabled(dev)) + if (queue_depth < 1 || queue_depth == sdev->queue_depth) return sdev->queue_depth; /* NCQ enabled? */ @@ -1059,7 +1058,7 @@ int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev, return scsi_change_queue_depth(sdev, queue_depth); } -EXPORT_SYMBOL_GPL(__ata_change_queue_depth); +EXPORT_SYMBOL_GPL(ata_change_queue_depth); /** * ata_scsi_change_queue_depth - SCSI callback for queue depth config @@ -1080,7 +1079,8 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth) { struct ata_port *ap = ata_shost_to_port(sdev->host); - return __ata_change_queue_depth(ap, sdev, queue_depth); + return ata_change_queue_depth(ap, ata_scsi_find_dev(ap, sdev), + sdev, queue_depth); } EXPORT_SYMBOL_GPL(ata_scsi_change_queue_depth); diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index ff9602a0e54e..c63bb50323c1 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1101,6 +1101,11 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev) if (dev->flags & ATA_DFLAG_AN) set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); + pr_info("#### can queue %d, ata qd %d, scsi qd %d\n", + sdev->host->can_queue, + ata_id_queue_depth(dev->id), + sdev->queue_depth); + if (dev->flags & ATA_DFLAG_NCQ) depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id)); depth = min(ATA_MAX_QUEUE, depth); diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 9c82e5dc4fcc..a36fa1c128a8 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -872,7 +872,8 @@ int sas_change_queue_depth(struct scsi_device *sdev, int depth) struct domain_device *dev = sdev_to_domain_dev(sdev); if (dev_is_sata(dev)) - return __ata_change_queue_depth(dev->sata_dev.ap, sdev, depth); + return ata_change_queue_depth(dev->sata_dev.ap, + sas_to_ata_dev(dev), sdev, depth); if (!sdev->tagged_supported) depth = 1; diff --git a/include/linux/libata.h b/include/linux/libata.h index 698032e5ef2d..20765d1c5f80 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -1136,8 +1136,8 @@ extern int ata_scsi_slave_config(struct scsi_device *sdev); extern void ata_scsi_slave_destroy(struct scsi_device *sdev); extern int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth); -extern int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev, - int queue_depth); +extern int ata_change_queue_depth(struct ata_port *ap, struct ata_device *dev, + struct scsi_device *sdev, int queue_depth); extern struct ata_device *ata_dev_pair(struct ata_device *adev); extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev); extern void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap);