From patchwork Tue Oct 10 06:09:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132452 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 50A0442348; Tue, 10 Oct 2023 08:10:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 205F64027B; Tue, 10 Oct 2023 08:10:17 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2134.outbound.protection.outlook.com [40.107.101.134]) by mails.dpdk.org (Postfix) with ESMTP id 90F9C40278; Tue, 10 Oct 2023 08:10:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q6iwXj6Ouuv1qInXxztcIrA3/+iT5NvRAexEJ0tHszdNeQMxwSuRu2hJKTKYXgm/g7Vdd+4cyvf7XcZaap7gZ0Qz+F2XIWVBtXONIIQfPVUNI3g0rEi8YJXZeIXBQSfiCQhmYiZFhEPw2hfyJDpzF4mEKzUJoRAFNVgiWMiIR5TNgh+qaqp94JjsLQKDlhjoVcpmXDLJaPCD0ebv52bS1n1IKcL0VZv8DElmEYN+X9oHIq3lOIOWFR0VrLr1e7P+a1fnj1V2YlrrhAGqakf/ZhDwWZ54URR8JbTPuPxBVgz6AMKX34C8JMTIB228nazB9w08+J2g6kw+8liqHz4vcw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LZBNwinXQIk5whJ6YOLnIcvST6r8H+oW8VwF4midkpU=; b=fMdcg+lFa6WIIuUNnZSM5BTTs8RzvKTLLgvW986jnUM66+xE9V7nMEjgURSlVMLSZ8DcaN1aivMXX93fDmDAvPdmA6bXwUhB6KMle5lrsExWlqoraHHB0i1YqVqvk6eLCgnHXA7WgDmSkbioSlYix+MW/1JwNiPm/LLUndYSEcbR4fDz+QKsMlKnz1/rRVFIyBsaEbgBnxK9lpOVxx8AZfL4IL3Om5bhpFEvvwUtF6FNke1+rl9KzzHt/hkw+o0ggXsWQ5sJeChA13ahbCGlycnefw3Omx4jnZWhseDAN43y8XX6l4uTF2uEOrzgAggFv8ZDzhb4AjGAO/kuuTLGwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LZBNwinXQIk5whJ6YOLnIcvST6r8H+oW8VwF4midkpU=; b=mK15+ZcNNrsR8UPleii0jdztHTzSqBnxrTX4k18ug7DBxvrnDJdpvIo7naUwuArxnjcJZEUDsZhBTKGFapqEM6d4ZRPuhKUeb96Jfl6dnbaGjWQNNsVvJ9ctydq0xi/GGEXl2MTMB+3qi04vqEZIhiBWDcI2RHHTwLSBobsQLLo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB6073.namprd13.prod.outlook.com (2603:10b6:a03:4ee::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33; Tue, 10 Oct 2023 06:10:13 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::2d5:f7d6:ecde:c93a]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::2d5:f7d6:ecde:c93a%4]) with mapi id 15.20.6863.032; Tue, 10 Oct 2023 06:10:13 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, James Hershaw , stable@dpdk.org, Peng Zhang , Chaoyong He Subject: [PATCH] net/nfp: update incorrect MAC stats offset Date: Tue, 10 Oct 2023 14:09:53 +0800 Message-Id: <20231010060953.205806-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 X-ClientProxiedBy: BYAPR05CA0065.namprd05.prod.outlook.com (2603:10b6:a03:74::42) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB6073:EE_ X-MS-Office365-Filtering-Correlation-Id: 80c0addb-4beb-4845-059d-08dbc95790df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yVKjAgn66TjXqIaXHQbS9arH2DpyW+kPV9EfIPLyStCHoXmmNFBFKBIIvH7928gN//WUGVKGUDso3p459kjBmchBl8P1ZFlqIBtNt8h4ThGzP+ddMK8GpSrrYVQ9WVa/5v+cuYctnur6PE5otqHgMOsus+2grSK36OEy3XCUUw7xZEj8aVvRXt3xrAbKjyXNhzDx2fjyfvKaUEnUCt3UZXsblCLLMKjJw7bx/p0oPc5X3uwfH8A7E0jUIjM7CfCWVovCUDYDSrGQiBI85yh64RlEJNULrP7Pvq3ZMI+FRfKRPvCaPc4bERa9R5CrVBakuNLsT9jscgoLaSSdaB4PemvxLFxWcGKQP4r3gPykJ1eAWgmPIh/UCiWCrLEQWSJM8X7FKU45eC2maUbKLjHbSZluoXoSL47oVGfeSgzg0BjZw+ueXk7aXhlT/Z6jWBUkZTwuH+hh1aqgnIWq+CUBL2oxKPZAHCmENxBEhzfqwria7pkoHxwASsHobWJqNz5e8uY1qQosPJ+vvbfiZxPIi1wEyGB48eqa1FX79++ex7X+OfFk76sAV1dXox3pB9qFN+k9sm6zFZYi+Rdq+oK273O6sSUZcByJwU+/Z0BMrpLB1o9g5DplyOyoMZeE/27g4G6O2KYMRKONNKUmfGnCuN7C+16r+hxl8Jz41oIzPxg= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(346002)(376002)(396003)(39840400004)(136003)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(26005)(2616005)(107886003)(1076003)(38350700002)(52116002)(6506007)(66476007)(38100700002)(6512007)(54906003)(66556008)(6916009)(66946007)(6666004)(478600001)(6486002)(83380400001)(86362001)(36756003)(4326008)(8676002)(8936002)(2906002)(450100002)(5660300002)(316002)(44832011)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1ByLcGMzlreANM7VWwSj7LdDTljlF4RQORWV2gLVwXbUXebdjwSDfLtoWlH2MSw4UwH/vy5x5CzReWOLGtMlRHVYFBP4d5wwyc7q2aybxgBa9kjARQA1Cc+ypEAUGHEv2PDY31lm9jdlgBVuyydLrycqg7Bi+S368T3/VRvuOW1vW2iRE8bXxCv6WocQjhqN019KpKaXW9I2SH+2VUi9A4iGnoaf+0mSfRYFTfQ33WS42B4QmPAAwbi7ym6Ti9DDlgzi6QG+aj84jd7bD9z5k2DQpc9poLeO14tCXKEQNIu5Gz6lttJwKqUMc86N5ydS7Yd3XNYGtDbvyEz37GZlq2esAOkjPdBNrROFPJRWaLLExCfBxLHWpkmIxecu55hjdEtwD2BORorsLEilOd/rL05ucNjkvKrG7IXuZsEe5CY/1jmX6/C9OFWzCGmark9uG6c0HHCJUxc+EegHQ2qq3OOuWnOXbUXEIWK9/bfV+Ajq/Jlpol1PP/CV3wNW2qRIWEc4qkHjnPC9Y5QKibPn8vTKfY4ay34+98zW9Q55lDIhRizb+mFA6pFn/LLvR3p5HDaSsvvWnkujl00N62IVXMgANNVMq9nRPCGE8an5BT8j08YTu5Qbh6VaZEXU+3VRN9CIYDtQfpU9Nf50kan9NIyqNAuicZyfXY/+8xZZd/pX8ECJb77msi1GvTbaQkrm0GTyV4n1nBxfB6bNXrcXuP/XUWIDeRGoAUB/C/kai0LTA7kDG9qDvr3camNAwLbmatSg/kPltFEXcgTVTQnmZ70/esqSGVQBCa31kEN4Mtz+BBTwQPA9GEWkGjibZCTD6sT6sGyGIaVJ5BNUE/xuwbvVZurlIVBhOjX02JhgHuOZckw0RdSI0ozxxR1FGzEA5u81GUXATAcKJTkDMP7/vY487LE+XYf14Hu6E5c+YxsKjE6hSWQ3QSGmSoZlz5PuLCXFuJ7n+Pi8e9RXUDl3XZKNkJpGzii/yEuPp55TxNsi0371Bi+zxDx7ol58coj+q4cFsPg4w7v879wanprM2T1jGLk9QA2q6hi9VXVWkwqHBnJRJDiEgEDQ2SeNcTs3JTf55eNFpsjLCy/qwReKaIhRSCPbAIH3CHhS8NB6Lmv3R3BLVklYbUn9e1obA+RzyWPXK1lrK1dYk3ZXGauIqXAARAK4kzaBI/ZPvRispTE1JA6mBZywNpN3Zn4KYULiUCcTTCx09IAECfGsEfA+G/H7L32hL39gmikej5oHvUa8OoT1BJqQkXSYZ1bP/KBN64Vopm65C8yDTtCkVoOOWRsgQljROywlu9j1myW8WGLurjmHWhFzcVXlW3AHd0davd6frmv9HnSYZkQREavlLKmNv3fJ9Icm2AVXSoVdgpRtfImbD4PVzkbNXyHA0+MVmyRzJvi0eq8AUPKUy8g8fFDEAD/qZQMgJeAOWjnaqY70VgUp1JrJO9sL9z6Oc10wpdTTO4OdyO0feU+L2N3/6ZljJU4prrDyPoyUIdtw8CILMXmLl6kRVoT5q19RxBUXUuoNJWT9R8o9FN7rwRaiKWJ6EVkU4g5PB04VNMgkjl8S93C4xQr4dwQO+zDsbuDacGjVYcTO2vNofOqqf7euPg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80c0addb-4beb-4845-059d-08dbc95790df X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2023 06:10:13.6049 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: T15CPnGkdO3LdSWbbO9TQNxgE89hoMGocz6BSfd1h2HPy0xGPz57U8Z5nO372oR+MMGPCo6DynQE/7rdj4EwKUPe8GfatFcxXiwiuIXkpGQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB6073 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: James Hershaw The pointer to the beginning of the MAC stats counters for port 1 are incorrectly set as the pointer to the beginning of the port 0 MAC stats counters, plus the size of the MAC stats counters multiplied by the port number. This patch corrects this by setting the multiplier as the eth_table index of the port. Fixes: f26e82397f6d ("net/nfp: implement xstats") Cc: stable@dpdk.org Signed-off-by: James Hershaw Reviewed-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index ebc5538291..0645123c99 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -547,7 +547,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev) return -ENODEV; /* Use port offset in pf ctrl_bar for this ports control bar */ hw->ctrl_bar = pf_dev->ctrl_bar + (port * NFP_PF_CSR_SLICE_SIZE); - hw->mac_stats = app_fw_nic->ports[0]->mac_stats_bar + (port * NFP_MAC_STATS_SIZE); + hw->mac_stats = app_fw_nic->ports[0]->mac_stats_bar + + (hw->nfp_idx * NFP_MAC_STATS_SIZE); } PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar);