From patchwork Tue Nov 14 13:46:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yangxingui X-Patchwork-Id: 164909 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1868659vqg; Tue, 14 Nov 2023 05:49:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGUApgCrSx0BjjRiefwWlqRmN31PiCOwz6SKCGDeNID6LZUOXbGItTvVTj+Tftw3ZstaKed X-Received: by 2002:a17:90b:1e47:b0:280:65ed:df9 with SMTP id pi7-20020a17090b1e4700b0028065ed0df9mr10754315pjb.31.1699969776247; Tue, 14 Nov 2023 05:49:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699969776; cv=none; d=google.com; s=arc-20160816; b=exaneLdWzO2WNiwHjnkqU0XTT8B/serep4APEdAOa/VUPmU//ethHE1UKt85u1bwkr 0RtgPLGq7VB3uLNUhi53EhdzJf8xpcIMb81GB7OnoVt8G5Xx2G3B6SAabEAYQ0k1k6mZ pWcAIH0VDaH7mowaTHuTYsziAcdPvPucV327NPeWNT0bFIOS7eRaTSMWUvTgIKf8JMny IumX4is5HIGm5UqnLElaI9N7aohj5UZ77FcLirpPKweIp0y/4PZfU5qrnsn6dq9jPHVI roCv0tAgy1Y8cJvY+5+tTNC37DLoFXKHmWLxpPKKe3GCL+sLBd6FNnnoymaBzQQibyNs IFtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=YItCoBTLy4mbCq1mOGm/DWM7j8ov/EdULcRKtlpE6iA=; fh=v1i5ALTdSFhoG6gracN8Qjox4iTWalJm97Mg20AUzFM=; b=EyhInTVhQcOZe5lpX40wnzXb47vqTK8QBR07PzEH7cl+kFOxFx0lFOHzZ+hw2GDgyY BDPIxQK9V8r7Wegrt922vkudFo2TuGPjuSHWA8XyVtYwsxG7AySNP5Q9XAaC2SeedRJo JF2QRCkOnsCIhSda8AVSbEOt0Vtpm7Ac2dEyV1CBYluzTLF/j/R4YO6QByONpNIBBOp6 0IizgBGa285NM7jH+kVNdGwrOkQECp3cDshbjZ2E9hSsIlA3MQjLHTZK7xOGyQwzrwHv 9QQMv6tXbQCt4Y3nO5oDTEfH48wmkqDinvknVXVwCD6Y7X9ZoG/liJ4/zoNpMpNc89v0 6o8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id rm11-20020a17090b3ecb00b002764fc15dd3si8709932pjb.37.2023.11.14.05.49.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 05:49:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id D0A17802E83B; Tue, 14 Nov 2023 05:49:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229579AbjKNNtV (ORCPT + 29 others); Tue, 14 Nov 2023 08:49:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229556AbjKNNtU (ORCPT ); Tue, 14 Nov 2023 08:49:20 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D981A1A1; Tue, 14 Nov 2023 05:49:16 -0800 (PST) Received: from dggpemd100001.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SV6yC5C9CzmXGY; Tue, 14 Nov 2023 21:45:55 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpemd100001.china.huawei.com (7.185.36.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1258.23; Tue, 14 Nov 2023 21:49:14 +0800 From: Xingui Yang To: , , , , CC: , , , , , , Subject: [PATCH v2] scsi: libsas: Fix set zero-address when device-type != NO_DEVICE Date: Tue, 14 Nov 2023 13:46:32 +0000 Message-ID: <20231114134632.41128-1-yangxingui@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemd100001.china.huawei.com (7.185.36.94) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 14 Nov 2023 05:49:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782547508088806533 X-GMAIL-MSGID: 1782547508088806533 Firstly, when ex_phy is added to the parent port, ex_phy->port is not set. As a result, sas_port_delete_phy() won' t be called in sas_unregister_devs_sas_addr() and it won't be deleted from the parent port's phy_list. Secondly, phy->attached_sas_addr will be set to a zero-address when phy->linkrate < SAS_LINK_RATE_1_5_GBPS and device-type != NO_DEVICE during device registration, such as stp. It will create a new port and all other ex_phys whose addresses are zero will be added to the new port in sas_ex_get_linkrate(), and it may trigger BUG() as follows: [562240.051046] sas: phy19 part of wide port with phy16 [562240.051197] sas: ex 500e004aaaaaaa1f phy19:U:0 attached: 0000000000000000 (no device) [562240.051203] sas: done REVALIDATING DOMAIN on port 0, pid:435909, res 0x0 [562240.062536] sas: ex 500e004aaaaaaa1f phy0 new device attached [562240.062616] sas: ex 500e004aaaaaaa1f phy00:U:5 attached: 0000000000000000 (stp) [562240.062680] port-7:7:0: trying to add phy phy-7:7:19 fails: it's already part of another port [562240.085064] ------------[ cut here ]------------ [562240.096612] kernel BUG at drivers/scsi/scsi_transport_sas.c:1083! [562240.109611] Internal error: Oops - BUG: 0 [#1] SMP [562240.343518] Process kworker/u256:3 (pid: 435909, stack limit = 0x0000000003bcbebf) [562240.421714] Workqueue: 0000:b4:02.0_disco_q sas_revalidate_domain [libsas] [562240.437173] pstate: 40c00009 (nZcv daif +PAN +UAO) [562240.450478] pc : sas_port_add_phy+0x13c/0x168 [scsi_transport_sas] [562240.465283] lr : sas_port_add_phy+0x13c/0x168 [scsi_transport_sas] [562240.479751] sp : ffff0000300cfa70 [562240.674822] Call trace: [562240.682709] sas_port_add_phy+0x13c/0x168 [scsi_transport_sas] [562240.694013] sas_ex_get_linkrate.isra.5+0xcc/0x128 [libsas] [562240.704957] sas_ex_discover_end_dev+0xfc/0x538 [libsas] [562240.715508] sas_ex_discover_dev+0x3cc/0x4b8 [libsas] [562240.725634] sas_ex_discover_devices+0x9c/0x1a8 [libsas] [562240.735855] sas_ex_revalidate_domain+0x2f0/0x450 [libsas] [562240.746123] sas_revalidate_domain+0x158/0x160 [libsas] [562240.756014] process_one_work+0x1b4/0x448 [562240.764548] worker_thread+0x54/0x468 [562240.772562] kthread+0x134/0x138 [562240.779989] ret_from_fork+0x10/0x18 So set ex_phy->port with parent_port when ex_phy is added to the parent port and don't set a zero-address when phy->attached_dev_type != NO_DEVICE. Fixes: 7d1d86518118 ("[SCSI] libsas: fix false positive 'device attached' conditions") Signed-off-by: Xingui Yang --- v2 -> v1: 1. Set ex_phy->port with parent_port when ex_phy is added to the parent port 2. Set ex_phy to NULL when free expander 3. Update the comments --- drivers/scsi/libsas/sas_discover.c | 4 +++- drivers/scsi/libsas/sas_expander.c | 3 +-- drivers/scsi/libsas/sas_internal.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c index 8fb7c41c0962..8eb3888a9e57 100644 --- a/drivers/scsi/libsas/sas_discover.c +++ b/drivers/scsi/libsas/sas_discover.c @@ -296,8 +296,10 @@ void sas_free_device(struct kref *kref) dev->phy = NULL; /* remove the phys and ports, everything else should be gone */ - if (dev_is_expander(dev->dev_type)) + if (dev_is_expander(dev->dev_type)) { kfree(dev->ex_dev.ex_phy); + dev->ex_dev.ex_phy = NULL; + } if (dev_is_sata(dev) && dev->sata_dev.ap) { ata_sas_tport_delete(dev->sata_dev.ap); diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index a2204674b680..5a81754d3768 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -239,8 +239,7 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, /* help some expanders that fail to zero sas_address in the 'no * device' case */ - if (phy->attached_dev_type == SAS_PHY_UNUSED || - phy->linkrate < SAS_LINK_RATE_1_5_GBPS) + if (phy->attached_dev_type == SAS_PHY_UNUSED) memset(phy->attached_sas_addr, 0, SAS_ADDR_SIZE); else memcpy(phy->attached_sas_addr, dr->attached_sas_addr, SAS_ADDR_SIZE); diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h index 3804aef165ad..e860d5b19880 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -202,6 +202,7 @@ static inline void sas_add_parent_port(struct domain_device *dev, int phy_id) sas_port_mark_backlink(ex->parent_port); } sas_port_add_phy(ex->parent_port, ex_phy->phy); + ex_phy->port = ex->parent_port; } static inline struct domain_device *sas_alloc_device(void)