Received: by 2002:ab2:620c:0:b0:1ef:ffd0:ce49 with SMTP id o12csp233594lqt; Mon, 18 Mar 2024 06:35:20 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXaPMUJwZ/Xze5Wnk2ZbftxydLZJkikz4tenUrN9rQZijdKX/V2O+n6icRH0uBv1kAkVZJ3PFgcUuYoIC68+p/LzvujtWppuN/uBK93ng== X-Google-Smtp-Source: AGHT+IF3AdjR3TajWgFPkiKK51C3nwzARka30FfVL5OgxsO2365Rggm5T8iD2Pb3rsaeTLQla5Qw X-Received: by 2002:a05:6871:711:b0:220:cba0:5ae3 with SMTP id f17-20020a056871071100b00220cba05ae3mr13775698oap.0.1710768920342; Mon, 18 Mar 2024 06:35:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710768920; cv=pass; d=google.com; s=arc-20160816; b=AIiLZYzoh928j1wTCox1AanDFIb6g4J1tKwhb0SqZLGqt0SZye+sDBNNxQr2ockOhE 3EJc4bqAExvxCnjIJVGevLb6ybaE/roM+96f3AFae3ZQsK0+4aHipAUyvM7KmWod4TsA jYs31hm/YL/8QaSGgBPWklZo17fbmIdFAmRvZQCN9qcdlK30RWu0C3NiFMP6pqbmd/Ty jDJhARcegwww8JUmEyi7OBAjNzoqKv/VXG7W78Ch+oDfvsDROGSmELos+VfVuZd69vVS iFiTp3TLDseKKUMILpWCbe+s6DW6XVqdHA94q/WnkFC/CmOxrhJumN7wT+0jkTPWamp1 gqNw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=S9rzVavDjYSmNPr6QRmIXwpDOE7Xt/nWQXFmWm2M32I=; fh=y+vgqhL53ZnSJ0mIMqDKTwtkNbEYitl9joXTZY6nBiU=; b=DYZe4phYRXujw5zvLspu9+chH2K92TysaIx5H1DUEjsbolAfOAFld34il2TvufXCiN E6IJAnuAkMNn3fuyp0dVSVd15ZGTHuWQEEjKANOyTiXOmLJSJdlSO+fpakXEO/Pz9RTG V4Hh3O89L3RVCgN9unfvLe/r7ZDA2wbJHIo+gwlCnBQGf7npcoOWyNbdIFkrIq8fugQR EPOwqPKJmQ03kcoSlrdM/7dF7ejD2uO+emm/2QTStNWH1S6I555IXYne+P4iD8q7/lE6 /WOXcIapDT18kP7oX+UIxLJNDNziSG3Ynawho83WGBy4mbb1JLux47zpALe8PkXpTv/p b0eQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-106170-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-106170-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id i6-20020a05620a0a0600b00789dc8edcb6si8296373qka.4.2024.03.18.06.35.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 06:35:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-106170-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-106170-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-106170-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 0E0871C21352 for ; Mon, 18 Mar 2024 13:35:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8D7B34AEF1; Mon, 18 Mar 2024 13:34:59 +0000 (UTC) Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C35762D022; Mon, 18 Mar 2024 13:34:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.191 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710768899; cv=none; b=LTgYsE/2FgjNfUUb6RMAZg8HCi+acYbc7sRnHIWwXn/O2VCAH5dD6a5L/pkNqMejx34ypbc6CO26i/TOhU2gM6CGRWx9CblhLxrZ4fmVha3R9fgD1ulR40Ohsv4cg72WFfQGroHsWj3dZ1tRD9M41a4IPPGT9y8PyKd20XOrGeA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710768899; c=relaxed/simple; bh=HQuG/dTUKUH3xhtdG0QeihBZTQ3pbDtmf87DVi7E7MQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Tevihp2XjNH2Hmt43YWmPdnCdAGKvT/9p5dR7D4txFiktZ4i9j+XVTGNcX6fRWghYPUMPMKBrctVqBd72I72ggTyCUMq4sG2dw4kzNf1ky/PCMLX6fighhI8l+Vknodrru97yjj7wr8zzaLNH/cWswhDDFoBpDb2/sc4SlogacU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.191 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Tywkr2LCtz1h2mf; Mon, 18 Mar 2024 21:32:20 +0800 (CST) Received: from kwepemm600007.china.huawei.com (unknown [7.193.23.208]) by mail.maildlp.com (Postfix) with ESMTPS id DC35B1400CB; Mon, 18 Mar 2024 21:34:51 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemm600007.china.huawei.com (7.193.23.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 18 Mar 2024 21:34:51 +0800 From: Jijie Shao To: , , , , , , , CC: , , , , , Subject: [PATCH V3 net 3/3] net: hns3: mark unexcuted loopback test result as UNEXECUTED Date: Mon, 18 Mar 2024 21:29:48 +0800 Message-ID: <20240318132948.3624333-4-shaojijie@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240318132948.3624333-1-shaojijie@huawei.com> References: <20240318132948.3624333-1-shaojijie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600007.china.huawei.com (7.193.23.208) From: Jian Shen Currently, loopback test may be skipped when resetting, but the test result will still show as 'PASS', because the driver doesn't set ETH_TEST_FL_FAILED flag. Fix it by setting the flag and initializating the value to UNEXECUTED. Fixes: 4c8dab1c709c ("net: hns3: reconstruct function hns3_self_test") Signed-off-by: Jian Shen Signed-off-by: Jijie Shao --- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c index 999a0ee162a6..941cb529d671 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -78,6 +78,9 @@ static const struct hns3_stats hns3_rxq_stats[] = { #define HNS3_NIC_LB_TEST_NO_MEM_ERR 1 #define HNS3_NIC_LB_TEST_TX_CNT_ERR 2 #define HNS3_NIC_LB_TEST_RX_CNT_ERR 3 +#define HNS3_NIC_LB_TEST_UNEXECUTED 4 + +static int hns3_get_sset_count(struct net_device *netdev, int stringset); static int hns3_lp_setup(struct net_device *ndev, enum hnae3_loop loop, bool en) { @@ -418,18 +421,26 @@ static void hns3_do_external_lb(struct net_device *ndev, static void hns3_self_test(struct net_device *ndev, struct ethtool_test *eth_test, u64 *data) { + int cnt = hns3_get_sset_count(ndev, ETH_SS_TEST); struct hns3_nic_priv *priv = netdev_priv(ndev); struct hnae3_handle *h = priv->ae_handle; int st_param[HNAE3_LOOP_NONE][2]; bool if_running = netif_running(ndev); + int i; + + /* initialize the loopback test result, avoid marking an unexcuted + * loopback test as PASS. + */ + for (i = 0; i < cnt; i++) + data[i] = HNS3_NIC_LB_TEST_UNEXECUTED; if (hns3_nic_resetting(ndev)) { netdev_err(ndev, "dev resetting!"); - return; + goto failure; } if (!(eth_test->flags & ETH_TEST_FL_OFFLINE)) - return; + goto failure; if (netif_msg_ifdown(h)) netdev_info(ndev, "self test start\n"); @@ -451,6 +462,10 @@ static void hns3_self_test(struct net_device *ndev, if (netif_msg_ifdown(h)) netdev_info(ndev, "self test end\n"); + return; + +failure: + eth_test->flags |= ETH_TEST_FL_FAILED; } static void hns3_update_limit_promisc_mode(struct net_device *netdev, -- 2.30.0