Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp475309rwi; Thu, 27 Oct 2022 03:59:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM74Rl5OTSBAmpgfkb6ZLeE/6vVa0XpUJOBjYxn7LaIvzu3AB0FIcsttMr8fAl9+COcHfprP X-Received: by 2002:a17:903:11c3:b0:178:aec1:189c with SMTP id q3-20020a17090311c300b00178aec1189cmr48309523plh.136.1666868393616; Thu, 27 Oct 2022 03:59:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666868393; cv=none; d=google.com; s=arc-20160816; b=R6v1IUwOP/9A9VOFiTJQkiwKhbumWL62XqPqM2pKgt8jtYIivu5L+UU9DOZJmApyTp bqwsh7KLa3O0wEkT+PgslYmkJ8sNiqqsKymaf2Nl5XR7NyGkv8WkEIeBOygrqkq8fO60 e9rBuJz8gMuUJuAd3oUB36KPciHbSbgLfR2QHynVUtVRrzJSdjy3TdjPWbq2pHqM/k84 kBoZZ0S77DIF4SKZtx5XqPzaZhZEZNeGGFPegyzyVU1Ffw1tWVONJfyK7/tVzyBt4vh8 bCw8WQPNw3DL6r7tR3G0oE9EQthHTCgzJUNQUyPq42M5uc3OFE/uu2ux1M0QtK4RHdkL QP7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:subject:user-agent:mime-version:date:message-id; bh=khKXGyX7hyvE3iQIy6bU8ots5wjVWzBG4HOQS7WwMU0=; b=Xw/eR9RH6nDzPGIIcqh95VmYPwR8iFFwZ1eCJQMDEou/aWLQy9fmTTp5gVpGLJOxAw pfw3Jo4lrTagFX1FJtrFhCwemQfiV+G7FwQiDeAlg54qs2IDBzdtEzFI7r9fFSjwWvS9 yNLBm5PHU9wVW5d6a6IxegMPdfYoMmNhPVsickZXb4fX4DIwIBVoIR1fHhs2l+Po9Y2v eG0dtVLYyXyzbjJr/pNhstMIM7pgpdFVQXDovILIOCFY/EnhTN7V/43yi07qIY8hsnxg 6SAEjPQseKn+oNpIoXz5vNtF/i7tI6dBORNA72vkHO69/JvB1ahF4D1vocmo6FrqBN6y n/RQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f3-20020a63de03000000b0045e00b905cbsi1235199pgg.73.2022.10.27.03.59.41; Thu, 27 Oct 2022 03:59:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235262AbiJ0KpS (ORCPT + 99 others); Thu, 27 Oct 2022 06:45:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235202AbiJ0KpO (ORCPT ); Thu, 27 Oct 2022 06:45:14 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E21DB1AF2F; Thu, 27 Oct 2022 03:45:11 -0700 (PDT) Received: from frapeml500008.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Myj0F0S9Pz67KX2; Thu, 27 Oct 2022 18:41:33 +0800 (CST) Received: from lhrpeml500003.china.huawei.com (7.191.162.67) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 27 Oct 2022 12:45:09 +0200 Received: from [10.195.32.169] (10.195.32.169) by lhrpeml500003.china.huawei.com (7.191.162.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 27 Oct 2022 11:45:08 +0100 Message-ID: <8280ec1c-c274-ba8d-b533-3316865fe5c1@huawei.com> Date: Thu, 27 Oct 2022 11:45:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [PATCH RFC v3 1/7] ata: libata-scsi: Add ata_scsi_queue_internal() To: Damien Le Moal , , , , , , , CC: , , , , , , References: <1666693976-181094-1-git-send-email-john.garry@huawei.com> <1666693976-181094-2-git-send-email-john.garry@huawei.com> <8ed42281-4400-a0ed-92f1-c57b9de726a4@opensource.wdc.com> From: John Garry In-Reply-To: <8ed42281-4400-a0ed-92f1-c57b9de726a4@opensource.wdc.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.195.32.169] X-ClientProxiedBy: lhrpeml100001.china.huawei.com (7.191.160.183) To lhrpeml500003.china.huawei.com (7.191.162.67) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 27/10/2022 02:42, Damien Le Moal wrote: > On 10/25/22 19:32, John Garry wrote: >> Add a function to handle queued ATA internal SCSI cmnds - does much the >> same as ata_exec_internal_sg() does (which will be fixed up later to >> actually queue internal cmnds through this function). >> >> Signed-off-by: John Garry >> --- >> drivers/ata/libata-sata.c | 3 +++ >> drivers/ata/libata-scsi.c | 43 +++++++++++++++++++++++++++++++++++++++ >> drivers/ata/libata.h | 3 ++- >> include/linux/libata.h | 6 ++++++ >> 4 files changed, 54 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c >> index b6806d41a8c5..e8b828c56542 100644 >> --- a/drivers/ata/libata-sata.c >> +++ b/drivers/ata/libata-sata.c >> @@ -1258,6 +1258,9 @@ int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap) >> { >> int rc = 0; >> >> + if (blk_mq_is_reserved_rq(scsi_cmd_to_rq(cmd))) >> + return ata_scsi_queue_internal(cmd, ap->link.device); >> + >> if (likely(ata_dev_enabled(ap->link.device))) >> rc = __ata_scsi_queuecmd(cmd, ap->link.device); >> else { >> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c >> index 476e0ef4bd29..30d7c90b0c35 100644 >> --- a/drivers/ata/libata-scsi.c >> +++ b/drivers/ata/libata-scsi.c >> @@ -3965,6 +3965,49 @@ static inline ata_xlat_func_t ata_get_xlat_func(struct ata_device *dev, u8 cmd) >> return NULL; >> } >> >> +unsigned int ata_scsi_queue_internal(struct scsi_cmnd *scmd, >> + struct ata_device *dev) >> +{ >> + struct ata_link *link = dev->link; >> + struct ata_port *ap = link->ap; >> + struct ata_queued_cmd *qc; >> + >> + /* no internal command while frozen */ >> + if (ap->pflags & ATA_PFLAG_FROZEN) >> + goto did_err; >> + >> + /* initialize internal qc */ >> + qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL); >> + link->preempted_tag = link->active_tag; >> + link->preempted_sactive = link->sactive; >> + ap->preempted_qc_active = ap->qc_active; >> + ap->preempted_nr_active_links = ap->nr_active_links; >> + link->active_tag = ATA_TAG_POISON; >> + link->sactive = 0; >> + ap->qc_active = 0; >> + ap->nr_active_links = 0; >> + >> + if (qc->dma_dir != DMA_NONE) { >> + int n_elem; >> + >> + n_elem = 1; >> + qc->n_elem = n_elem; >> + qc->sg = scsi_sglist(scmd); >> + qc->nbytes = qc->sg->length; >> + ata_sg_init(qc, qc->sg, n_elem); >> + } >> + >> + scmd->submitter = SUBMITTED_BY_BLOCK_LAYER; >> + >> + ata_qc_issue(qc); > > Arg, no ! This potentially mixes NCQ and non-NCQ commands, which is > forbidden by ATA spec. You need to use something like: > > if (ap->ops->qc_defer) { > if ((rc = ap->ops->qc_defer(qc))) > goto defer; > } > > ata_qc_issue(qc); > > which is done in __ata_scsi_queuecmd() -> ata_scsi_translate() > > Unless you guarantee that ata_scsi_queue_internal() is always called > from libata EH context ? This will be called synchronously called from ata_exec_internal_sg(), so the same rules on NCQ vs non-NCQ would apply here. As I see, ata_exec_internal_sg() assumes non-NCQ mode and is not multi-thread safe. Thanks, John > >> + >> + return 0; >> +did_err: >> + scmd->result = (DID_ERROR << 16); >> + scsi_done(scmd); >> + return 0; >> +} >> + >> int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev) >> { >> u8 scsi_op = scmd->cmnd[0]; >> diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h >> index 0c2df1e60768..15cd1cd618b8 100644 >> --- a/drivers/ata/libata.h >> +++ b/drivers/ata/libata.h >> @@ -82,7 +82,6 @@ extern int ata_port_probe(struct ata_port *ap); >> extern void __ata_port_probe(struct ata_port *ap); >> extern unsigned int ata_read_log_page(struct ata_device *dev, u8 log, >> u8 page, void *buf, unsigned int sectors); >> - >> #define to_ata_port(d) container_of(d, struct ata_port, tdev) >> >> /* libata-acpi.c */ >> @@ -130,6 +129,8 @@ extern int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel, >> void ata_scsi_sdev_config(struct scsi_device *sdev); >> int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev); >> int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev); >> +unsigned int ata_scsi_queue_internal(struct scsi_cmnd *scmd, >> + struct ata_device *dev); >> >> /* libata-eh.c */ >> extern unsigned int ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd); >> diff --git a/include/linux/libata.h b/include/linux/libata.h >> index 827d5838cd23..8938b584520f 100644 >> --- a/include/linux/libata.h >> +++ b/include/linux/libata.h >> @@ -764,7 +764,9 @@ struct ata_link { >> >> struct device tdev; >> unsigned int active_tag; /* active tag on this link */ >> + unsigned int preempted_tag; >> u32 sactive; /* active NCQ commands */ >> + u32 preempted_sactive; >> >> unsigned int flags; /* ATA_LFLAG_xxx */ >> >> @@ -857,6 +859,10 @@ struct ata_port { >> #ifdef CONFIG_ATA_ACPI >> struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ >> #endif >> + >> + u64 preempted_qc_active; >> + int preempted_nr_active_links; >> + >> /* owned by EH */ >> u8 sector_buf[ATA_SECT_SIZE] ____cacheline_aligned; >> }; >