Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp435181pxb; Fri, 3 Sep 2021 05:41:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcIWonFHkV9jfqLPcAVtBZL3v5RhZqkAY+MEtcUmsuwEZWqQaPYlp5eWyYjNsazz8Mut9a X-Received: by 2002:a05:6e02:1074:: with SMTP id q20mr2522610ilj.204.1630672860206; Fri, 03 Sep 2021 05:41:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630672860; cv=none; d=google.com; s=arc-20160816; b=J8hkiQP2m9Dt0kdJmXR4TGorGXG0JStQ1HKx/8r0S2y9CpximaGV4UnNAW/nKozsBr QAqPm4B3C3wTgOyMc324vl7qfzeivtUbY+rFlZonCPUJMghwBPueLPXhto3NJFL7UoUp ebF5odiBsLEpHmXuHIN+zPxvKp85YdTDdsKneN6YmSeZv7NoDsiCv8t3eHg9r3rHgrL+ DbJcpKMsjoXLuo+yFLfkuz2Ge6kslwWx8B1gUKpJCPhQN20pz+6lqge6om9bU6eHCzHQ 8bQcHkL1Nf0G0G0LXl//3//8xUYO/OOr+QVIh/bsbT0ThqpoMNdvwgxQCZlvrbrvLSaX O+Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=jSus6DbAtY3HkLoXjsEZTgxcISPGImC9WN1gRcr83FE=; b=UIhd+eYsGawwkrxgY9mUMSzQCzpU4ZoK1ePvQUxD3viU91CNnrnPRknxzqteMSNpYq PfVtvqiZiMqRARPrc710iBKGb62t459qKE4TPf72qi1nzbHvL8gyhkD5gmBC1JQvhma9 AdoC6VRnb/FixQSvjVoLvaiMZ2dfwzEhM5HrPR7BuKvNnwxut6U0evjS79LvT8dZ5MZm q/gIxfOft1yqYhz+5LVqK4Irix/9S7l6YxQmu4wakm6ZiKT/EEOcvVngqhTMhH1EVW2C Za5t1gZ5/6YbXT6aCG2zWUkZw6GcoJ11IqZNn5X4SjhL+NJcQ0sg9FLRKm0AfWLahENt tk1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="HFP/M1Y3"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 132si4968456jaf.20.2021.09.03.05.40.48; Fri, 03 Sep 2021 05:41:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="HFP/M1Y3"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348802AbhICJpm (ORCPT + 99 others); Fri, 3 Sep 2021 05:45:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45077 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348822AbhICJpl (ORCPT ); Fri, 3 Sep 2021 05:45:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630662281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jSus6DbAtY3HkLoXjsEZTgxcISPGImC9WN1gRcr83FE=; b=HFP/M1Y3wVexWhCTut6LSygbBnVU9f337Wez/K+XwyqH0eFvOO6YKj1aR2LMNXeNz/r8OV tldDCzK2rBTg+boIXojpB1UG/j2Yw0VHZ3TjWiLk90wJdar83MxE/Pd0++g8BYWksCqnoo hKKuagUfVX0I4oJI8hFL1eClYlXsORk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-410-9w-9I0mrP4ugM674ipu7PA-1; Fri, 03 Sep 2021 05:44:41 -0400 X-MC-Unique: 9w-9I0mrP4ugM674ipu7PA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F3D8784A5E9; Fri, 3 Sep 2021 09:44:39 +0000 (UTC) Received: from fedora-t480.rhtw.internal (unknown [10.39.193.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F53A77718; Fri, 3 Sep 2021 09:44:33 +0000 (UTC) From: Kate Hsuan To: Jens Axboe , Hans de Goede , Damien Le Moal Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Kate Hsuan Subject: [PATCH v6] libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD. Date: Fri, 3 Sep 2021 17:44:11 +0800 Message-Id: <20210903094411.58749-1-hpa@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Many users are reporting that the Samsung 860 and 870 SSD are having various issues when combined with AMD/ATI (vendor ID 0x1002) SATA controllers and only completely disabling NCQ helps to avoid these issues. Always disabling NCQ for Samsung 860/870 SSDs regardless of the host SATA adapter vendor will cause I/O performance degradation with well behaved adapters. To limit the performance impact to ATI adapters, introduce the ATA_HORKAGE_NO_NCQ_ON_ATI flag to force disable NCQ only for these adapters. Also, two libata.force parameters (noncqati and ncqati) are introduced to disable and enable the NCQ for the system which equipped with ATI SATA adapter and Samsung 860 and 870 SSDs. The user can determine NCQ function to be enabled or disabled according to the demand. After verifying the chipset from the user reports, the issue appears on AMD/ATI SB7x0/SB8x0/SB9x0 SATA Controllers and does not appear on recent AMD SATA adapters. The vendor ID of ATI should be 0x1002. Therefore, ATA_HORKAGE_NO_NCQ_ON_AMD was modified to ATA_HORKAGE_NO_NCQ_ON_ATI. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=201693 Signed-off-by: Kate Hsuan --- Changes in v6: * The adapter vendor ID check was revised to PCI_VENDOR_ID_ATI. * ATA_HORKAGE_NO_NCQ_ON_AMD was revised to ATA_HORKAGE_NO_NCQ_ON_ATI. * Two libata.force parameters was modified to noncqati and ncqati. Changes in v5: * The libata.force parameters ncqamd and noncqamd are used to enable and disable the NCQ for the systems equiped with AMD SATA adapter and Samsung 860 and 870 SSDs. * The character encoding of the patch comment was fixed. Changes in v4: * A function ata_dev_check_adapter() is added to check the vendor ID of the adapter. * ATA_HORKAGE_NONCQ_ON_AMD was modified to ATA_HORKAGE_NO_NCQ_ON_AMD to align with the naming convention. * Commit messages were improved according to reviewer comments. Changes in v3: * ATA_HORKAGE_NONCQ_ON_ASMEDIA_AMD_MARVELL was modified to ATA_HORKAGE_NONCQ_ON_AMD. * Codes were fixed to completely disable NCQ on AMD controller. --- drivers/ata/libata-core.c | 34 ++++++++++++++++++++++++++++++++-- include/linux/libata.h | 1 + 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 3eda3291952b..85e4e56c0681 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -2199,6 +2199,25 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev) } +static bool ata_dev_check_adapter(struct ata_device *dev, + unsigned short vendor_id) +{ + struct pci_dev *pcidev = NULL; + struct device *parent_dev = NULL; + + for (parent_dev = dev->tdev.parent; parent_dev != NULL; + parent_dev = parent_dev->parent) { + if (dev_is_pci(parent_dev)) { + pcidev = to_pci_dev(parent_dev); + if (pcidev->vendor == vendor_id) + return true; + break; + } + } + + return false; +} + static int ata_dev_config_ncq(struct ata_device *dev, char *desc, size_t desc_sz) { @@ -2217,6 +2236,13 @@ static int ata_dev_config_ncq(struct ata_device *dev, snprintf(desc, desc_sz, "NCQ (not used)"); return 0; } + + if (dev->horkage & ATA_HORKAGE_NO_NCQ_ON_ATI && + ata_dev_check_adapter(dev, PCI_VENDOR_ID_ATI)) { + snprintf(desc, desc_sz, "NCQ (not used)"); + return 0; + } + if (ap->flags & ATA_FLAG_NCQ) { hdepth = min(ap->scsi_host->can_queue, ATA_MAX_QUEUE); dev->flags |= ATA_DFLAG_NCQ; @@ -3951,9 +3977,11 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "Samsung SSD 850*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "Samsung SSD 860*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | - ATA_HORKAGE_ZERO_AFTER_TRIM, }, + ATA_HORKAGE_ZERO_AFTER_TRIM | + ATA_HORKAGE_NO_NCQ_ON_ATI, }, { "Samsung SSD 870*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | - ATA_HORKAGE_ZERO_AFTER_TRIM, }, + ATA_HORKAGE_ZERO_AFTER_TRIM | + ATA_HORKAGE_NO_NCQ_ON_ATI, }, { "FCCT*M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, }, @@ -6108,6 +6136,8 @@ static int __init ata_parse_force_one(char **cur, { "ncq", .horkage_off = ATA_HORKAGE_NONCQ }, { "noncqtrim", .horkage_on = ATA_HORKAGE_NO_NCQ_TRIM }, { "ncqtrim", .horkage_off = ATA_HORKAGE_NO_NCQ_TRIM }, + { "noncqati", .horkage_on = ATA_HORKAGE_NO_NCQ_ON_ATI }, + { "ncqati", .horkage_off = ATA_HORKAGE_NO_NCQ_ON_ATI }, { "dump_id", .horkage_on = ATA_HORKAGE_DUMP_ID }, { "pio0", .xfer_mask = 1 << (ATA_SHIFT_PIO + 0) }, { "pio1", .xfer_mask = 1 << (ATA_SHIFT_PIO + 1) }, diff --git a/include/linux/libata.h b/include/linux/libata.h index 3fcd24236793..cb95d3f3337d 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -422,6 +422,7 @@ enum { ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */ ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */ ATA_HORKAGE_MAX_TRIM_128M = (1 << 26), /* Limit max trim size to 128M */ + ATA_HORKAGE_NO_NCQ_ON_ATI = (1 << 27), /* Disable NCQ on ATI chipset */ /* DMA mask for user DMA control: User visible values; DO NOT renumber */ -- 2.31.1