From patchwork Thu Sep 5 17:41:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Belous X-Patchwork-Id: 58693 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A02A1F08A; Thu, 5 Sep 2019 19:41:50 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760078.outbound.protection.outlook.com [40.107.76.78]) by dpdk.org (Postfix) with ESMTP id 99AB11F074; Thu, 5 Sep 2019 19:41:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVm391v8bheRkcE830WnnmpIa6+FQ8CKwuvdBtMvUK+lUUXiHKkIrMguMj0jPtqxMeaIPAQ3njcypBpqF8S707m0e7K4h5idRUsFKpUDV7rLts2GITVGgJtkqCGduK1nwR119fXGMco+WTf7aS2t7KpvTzixOlgpPLrYvr6fOW+kfxFoh+gEGyO8hpDNLjYYG4GIoEfVHPTxoGIJHjal/B5I8KKLAK2EAdDqwZD56qU0YjW7cmQxyxsWxjeX6U/KiFf58UDnhulE73KAbwuZXFSmChXUJBMbZ3IrPtVq4PgtQGaOVmcQXitcQnXgaNw6abUwMoXFd7bi9OXFBThfOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ry6RHIEJ1wRo25HcCKoBqcDGv5GZbd4X5Wccr7Fz9as=; b=QGv41HkxjrESr3ZaL6k4TskqjI5Jse8dDhhooGRDDk7Oe26hDCMMgv5Lpdv+d1PSti+REPkGWQ0dO/RNMac5ENjoBs9anI6KJUYbQjV1DZkMAH5uVQ6hLkp2/Qr9HSKqzWUgW1eKUXAZlmYP3Ia+nmrStUiezcSc4MXm77RfbjyWnKyBv43MIDnoIAAQKZDHza5B3OC5ECqcNJMQeoP4X7/hk7gfYjca/7vAOhUraQwYMyHlnQAvVjdljS2kcaG/oTrbieNBqqm1JQYYpK0DvI7YT+wsd4zLeIp8lkgKEsc6GY9K6Ug9UNWjjG/SFsCDr5euP7zG4LUIBwFDZXtxcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=aquantia.com; dmarc=pass action=none header.from=aquantia.com; dkim=pass header.d=aquantia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector2-AQUANTIA1COM-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ry6RHIEJ1wRo25HcCKoBqcDGv5GZbd4X5Wccr7Fz9as=; b=1dP60ZXYGz303aj54MnBHAPplkglEZoBhF0EanYSJpwzQsvpwvkaXgwk45N7qU0qGfmC/oulQ3OUXygpAtj4sA614bpUKP+ReN3eDMU8CUkgEOVuJThvy6Wog1PclkaRJdnvKgJWRJJzPu9A7jda0WROxqVD5QeXRyC6x7E9lG8= Received: from CY4PR1101MB2183.namprd11.prod.outlook.com (10.172.76.20) by CY4SPR00MB057.namprd11.prod.outlook.com (10.173.60.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.14; Thu, 5 Sep 2019 17:41:44 +0000 Received: from CY4PR1101MB2183.namprd11.prod.outlook.com ([fe80::4dee:fb50:cc75:fbde]) by CY4PR1101MB2183.namprd11.prod.outlook.com ([fe80::4dee:fb50:cc75:fbde%6]) with mapi id 15.20.2199.027; Thu, 5 Sep 2019 17:41:44 +0000 From: Pavel Belous To: Ferruh Yigit CC: "dev@dpdk.org" , Igor Russkikh , Corey Melton , Pavel Belous , "stable@dpdk.org" Thread-Topic: [PATCH 1/3] net/atlantic: exclude MACSEC counters from xstats Thread-Index: AQHVZBEvlA2Do9ZnqEOQxoEr3Cw3JA== Date: Thu, 5 Sep 2019 17:41:44 +0000 Message-ID: <1567705278-10558-2-git-send-email-Pavel.Belous@aquantia.com> References: <1567705278-10558-1-git-send-email-Pavel.Belous@aquantia.com> In-Reply-To: <1567705278-10558-1-git-send-email-Pavel.Belous@aquantia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0314.eurprd05.prod.outlook.com (2603:10a6:7:93::45) To CY4PR1101MB2183.namprd11.prod.outlook.com (2603:10b6:910:18::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Pavel.Belous@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 100028ce-360e-42b6-1f43-08d732285183 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:CY4SPR00MB057; x-ms-traffictypediagnostic: CY4SPR00MB057: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:331; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(136003)(346002)(366004)(396003)(39850400004)(199004)(189003)(4326008)(3846002)(66446008)(86362001)(64756008)(66556008)(66476007)(8676002)(305945005)(6916009)(6116002)(2906002)(7736002)(66946007)(6512007)(6436002)(14454004)(6486002)(66066001)(81166006)(8936002)(81156014)(478600001)(50226002)(25786009)(6506007)(256004)(486006)(2616005)(476003)(71200400001)(316002)(54906003)(11346002)(71190400001)(36756003)(26005)(76176011)(446003)(386003)(44832011)(102836004)(186003)(52116002)(53936002)(99286004)(5660300002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4SPR00MB057; H:CY4PR1101MB2183.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: VayVgUqr/ZriqdLmSnznmBPIq6NxNXvHFrLfRV2orslB9oU+rzHuAtm7irMTgJiUFqgAuhDn3ynXBWWUK3+p17dCfM6sVNL2H7pJPI48U12hT87g8Pikd1L2TTwXCc+e2PxoqlhJn6xvfA/oN3yKJdeTnub+oicM++mDFsk9m1nEh3wDQUNDUrdy9Wc8M7Ybguc3Tt2VueRZ1QgK9yjh0Vw6kNVgOxnmJfAd8xCIey8EZPqpNN9FXJBzeNOzsQXMwynTr5NbxJhEcIL7uvq9WGTWHK2vf5smL+oIssHDLmOjYoVmNtyue+feMfeARQJ+XtHWREVLlpeIxUPlFW4GVFpTBC63eYnkgENr4fO9EM4TzBOsTKqF0N2UgF00CUHAvU5KxfZQ1GFlSi1ME+EZA3wzPwx1jfpvKaZwVArAdUc= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 100028ce-360e-42b6-1f43-08d732285183 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 17:41:44.6771 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: b2G13CnwHJIZkp9WbGadf6QYFRRbS+E/86Kmak6PN9Xc8IXNpcDT8NWQMXnI60vwfk5BtNwGKwjmRonut0h38g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4SPR00MB057 Subject: [dpdk-dev] [PATCH 1/3] net/atlantic: exclude MACSEC counters from xstats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Pavel Belous Currently, driver always return full set of xstats counters, including MACSEC counters. But this driver also supports AQC100 chips, which does not have MACSEC feature. This fix adds checking for MACSEC availability (based on FW capability bits) and returns xstats without MACSEC counters if MACSEC feature is not available. Fixes: 09d4dfa85359 ("net/atlantic: implement MACsec statistics") Cc: stable@dpdk.org Signed-off-by: Pavel Belous Signed-off-by: Igor Russkikh --- drivers/net/atlantic/atl_ethdev.c | 52 ++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 3c1b349..178f7db 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -993,20 +993,42 @@ atl_dev_stats_reset(struct rte_eth_dev *dev) } static int +atl_dev_xstats_get_count(struct rte_eth_dev *dev) +{ + struct atl_adapter *adapter = + (struct atl_adapter *)dev->data->dev_private; + + struct aq_hw_s *hw = &adapter->hw; + unsigned int i, count = 0; + + for (i = 0; i < RTE_DIM(atl_xstats_tbl); i++) { + if (atl_xstats_tbl[i].type == XSTATS_TYPE_MACSEC && + ((hw->caps_lo & BIT(CAPS_LO_MACSEC)) == 0)) + continue; + + count++; + } + + return count; +} + +static int atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused, struct rte_eth_xstat_name *xstats_names, unsigned int size) { unsigned int i; + unsigned int count = atl_dev_xstats_get_count(dev); - if (!xstats_names) - return RTE_DIM(atl_xstats_tbl); - - for (i = 0; i < size && i < RTE_DIM(atl_xstats_tbl); i++) - strlcpy(xstats_names[i].name, atl_xstats_tbl[i].name, - RTE_ETH_XSTATS_NAME_SIZE); + if (xstats_names) { + for (i = 0; i < size && i < count; i++) { + snprintf(xstats_names[i].name, + RTE_ETH_XSTATS_NAME_SIZE, "%s", + atl_xstats_tbl[i].name); + } + } - return i; + return count; } static int @@ -1020,9 +1042,10 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, struct macsec_msg_fw_response resp = { 0 }; int err = -1; unsigned int i; + unsigned int count = atl_dev_xstats_get_count(dev); if (!stats) - return 0; + return count; if (hw->aq_fw_ops->send_macsec_req != NULL) { req.ingress_sa_index = 0xff; @@ -1035,7 +1058,7 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, err = hw->aq_fw_ops->send_macsec_req(hw, &msg, &resp); } - for (i = 0; i < n && i < RTE_DIM(atl_xstats_tbl); i++) { + for (i = 0; i < n && i < count; i++) { stats[i].id = i; switch (atl_xstats_tbl[i].type) { @@ -1044,14 +1067,15 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, atl_xstats_tbl[i].offset); break; case XSTATS_TYPE_MACSEC: - if (err) - goto done; - stats[i].value = *(u64 *)((uint8_t *)&resp.stats + - atl_xstats_tbl[i].offset); + if (!err) { + stats[i].value = + *(u64 *)((uint8_t *)&resp.stats + + atl_xstats_tbl[i].offset); + } break; } } -done: + return i; }