From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F12B0A04DD for ; Wed, 21 Oct 2020 13:03:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 603D1AC58; Wed, 21 Oct 2020 13:03:36 +0200 (CEST) Received: from nat-hk.nvidia.com (nat-hk.nvidia.com [203.18.50.4]) by dpdk.org (Postfix) with ESMTP id 7975072DB; Wed, 21 Oct 2020 13:03:31 +0200 (CEST) Received: from HKMAIL101.nvidia.com (Not Verified[10.18.92.100]) by nat-hk.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Wed, 21 Oct 2020 19:03:29 +0800 Received: from HKMAIL102.nvidia.com (10.18.16.11) by HKMAIL101.nvidia.com (10.18.16.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 21 Oct 2020 11:03:28 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.169) by HKMAIL102.nvidia.com (10.18.16.11) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Wed, 21 Oct 2020 11:03:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NXA1LFH1mPWkYDj2c7jH9ex2Gf4q/1pwFGKbkN0y7dASl/ODuqDKzriOYBGoCUoWVwvwomIoE5dueuEm1njL25QW5w7P9POIZ7GzNbRB64c6b4wosV1joxyME5ObfeHhiD+7sFD4HMsjXSuGF6/a8Ooxxn8nO6lEYjaWj2mmYhzcXnRwl9Ad/BMI0g5EfxjZgIn5wht9CzvCQzFdMoCD5azfj09TMizGiGgQsGDfjKt8G3jEe4+2k31zWhwP9YUgdZCk5F5FmbJADzW6b4PG0Sc5qxEoHa65eX64c/SAfYHCdUs00OTJ+Nd1w1xY79mLcGzMVQD2EBKIZ2KsOVHzJw== 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=Knc5i5Bm0U1za5BwZpaDREs7wCDxMklZQSEyDyYQbdM=; b=e/4kV+xO6T8zMQwxmD0lGvtzb4Dd2aNMjtXQ0kb1tY8AEawxAjnlP1tobtB+sxRMAT98OvJblBuj/AiEjkDbW6Bw0r2mqqM49YKDKYzWzyWlW1iSaZiGKnrkgjLDBdyJYqJ9hW0i7hvRc0xnsTNNNW/rhpUUpwguha5LR8lNsTcolkY9bASt2pRcR+eOnVP9iG5RYKECkIZvU2D3hSeR/pY8WrLWZDqIZO2OCtHKaHJrEdR8gWQBPj3Cvd2Nw+GmqRpn3hd0Wgq03o+I3L3zmP77XE7cDwehq/HCRdompfpSOZ+mzJFfY808bF6hD7/ZDwG3IC8uqTI1JEL9YTq5wA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none Received: from DM6PR12MB2748.namprd12.prod.outlook.com (2603:10b6:5:43::28) by DM6PR12MB3162.namprd12.prod.outlook.com (2603:10b6:5:15c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.25; Wed, 21 Oct 2020 11:03:26 +0000 Received: from DM6PR12MB2748.namprd12.prod.outlook.com ([fe80::f506:4af8:281b:cdeb]) by DM6PR12MB2748.namprd12.prod.outlook.com ([fe80::f506:4af8:281b:cdeb%7]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 11:03:26 +0000 From: Raslan Darawsheh To: Shiri Kuzin , "dev@dpdk.org" CC: "matan@mellanox.com" , "rasland@mellanox.com" , "viacheslavo@mellanox.com" , "stable@dpdk.org" Thread-Topic: [PATCH] net/mlx5: fix xstats reset reinitialization Thread-Index: AQHWpeJSaQsgIIHdpE2cbfagf3Zpx6mh58Aw Date: Wed, 21 Oct 2020 11:03:26 +0000 Message-ID: References: <1603089410-11248-1-git-send-email-shirik@nvidia.com> In-Reply-To: <1603089410-11248-1-git-send-email-shirik@nvidia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: nvidia.com; dkim=none (message not signed) header.d=none;nvidia.com; dmarc=none action=none header.from=nvidia.com; x-originating-ip: [212.29.221.74] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 21ff71ba-559d-4e57-503a-08d875b0ef44 x-ms-traffictypediagnostic: DM6PR12MB3162: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1148; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: yMHpfjvT/q4G0AufavZT6FssQQPEZ/yZGlupoq2ydKSlqtfjxpSXdbLv3VPg9sWujip5QPF5RKhwR7H+p1flgaHb7gIk1UDbXJ17ClE25goWR4vCMkjg36DFRwDmyMnDGORFGMZtr8yUgDLRS/qel1ShHhXht3236aoxn1uH+thUR6vxM0qWdkjeeo65ZmxZwFQitk5DbdbudYU+yZVrYAYbF/0cwn//+w71C8+n/fuGKTBcZFsU6FQeBq7dl/Rk4Er3A93wLNmFz29ibeotADb+6+yw5Cq6nhpZy6WTk5nHJIuhGLPhl0Dd8SGqjSbG x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR12MB2748.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(136003)(376002)(39860400002)(346002)(396003)(83380400001)(54906003)(86362001)(26005)(7696005)(9686003)(53546011)(478600001)(186003)(316002)(33656002)(55016002)(6506007)(110136005)(8936002)(4326008)(52536014)(450100002)(5660300002)(2906002)(8676002)(66446008)(71200400001)(64756008)(66476007)(66556008)(66946007)(76116006); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: KVoRAkXy1URtbU2KK7RgzUwpqC5wIJ1OJHN+BBKxgdFqKt7jVtvWuW8ZWO8aLAIojtkS0BH2ATUjp/tyTZxeozHHicpEznqZOyxl5wgW/5WumGV/tWa8ZTTbb95tusdYbBk17kyU7mKoTe+sAinRIez/BRNJqsi7n1KOQoK8aIMspJ2Mu5ERhi8gEQnzWpdgsSdhZkbzdDdIJ9CuojZyVeM8YX0gUlUNW3mTiKreKiyUGX1OaK4qbiknn/vYuDcFVvhfu1VkGszhzrHUVYgl9eLDoJZUSK1MdDUOX0742eOCFtv6k+xauAp0Zuuies+hNwCPxWtmHBKf3GyhzMx5LlrInolwB61DI6oiRvAzf5lfRZ3yPpneU2+Cx+2nPd+YUl3BnB+xW2CdnGaftreYVO6c0xBccQa/dObbWauNSpApiHeeLHCAie8fc2dUSavwIxkA+3ZRa3WEfl2u76FxZBLBeUZCaoJ5S3AP5lMvFacWlLimsy8/mTqajhgUv1V7Ah3aZGQFEIJfBSn3z3+lL9Rpv64/8vHXRkvQj9c6YA029DIFZXJYSCwi8GSqZ00JWRcCQkOqretMTA6X4n+Bb63FUPZoL+DVl4Mj6y7bydSuokX6+XNWGyrP23SoCQev94EZ3JEuBPrZZCi3g/ugwQ== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB2748.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21ff71ba-559d-4e57-503a-08d875b0ef44 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Oct 2020 11:03:26.0991 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: opAW7RQu+SefE3dqT05OKRck80u/3s6pRPh1GmEVDSu5uDJLKc+L4QjyEsEAtLhRDSD0oV61nrPNyMyNKqhmuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3162 X-OriginatorOrg: Nvidia.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1603278209; bh=Knc5i5Bm0U1za5BwZpaDREs7wCDxMklZQSEyDyYQbdM=; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To: CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References: In-Reply-To:Accept-Language:Content-Language:X-MS-Has-Attach: X-MS-TNEF-Correlator:authentication-results:x-originating-ip: x-ms-publictraffictype:x-ms-office365-filtering-correlation-id: x-ms-traffictypediagnostic:x-ms-exchange-transport-forked: x-microsoft-antispam-prvs:x-ms-oob-tlc-oobclassifiers: x-ms-exchange-senderadcheck:x-microsoft-antispam: x-microsoft-antispam-message-info:x-forefront-antispam-report: x-ms-exchange-antispam-messagedata:Content-Type: Content-Transfer-Encoding:MIME-Version: X-MS-Exchange-CrossTenant-AuthAs: X-MS-Exchange-CrossTenant-AuthSource: X-MS-Exchange-CrossTenant-Network-Message-Id: X-MS-Exchange-CrossTenant-originalarrivaltime: X-MS-Exchange-CrossTenant-fromentityheader: X-MS-Exchange-CrossTenant-id:X-MS-Exchange-CrossTenant-mailboxtype: X-MS-Exchange-CrossTenant-userprincipalname: X-MS-Exchange-Transport-CrossTenantHeadersStamped:X-OriginatorOrg; b=SUE3Pr0HXXLxhM3QjJ6gRnxOTT1WV01e2oPuDoHYOIzTc0Zp7u0ZyhfDeTRvn+hzf 85xNgd+BtvNsGcn4hoE7oqKF16xv4TiCHIpr1+jLgOZBcDns9kNMktwLAlsLPhydxf zLrt5WDceMtg4uQ/Ue83oDxjoWrIOxyjisAEGq/E5YNTYRhCGDF6oyQ2PcbQuwThls 1l/7h9EmQJvwjqCZr9QSEEr2yWMl1n3DCoi7jS8R1FIh1O+tsboRjYnjMAq7aUpRZn pUjLXFEdVhHVSM3FlioAc/aYfZ6IpMYYJvKVycSsma3H8Xv69xlYAW/Uzp7PDMjQmV hiBnE7iLEnNEg== Subject: Re: [dpdk-stable] [PATCH] net/mlx5: fix xstats reset reinitialization X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, > -----Original Message----- > From: Shiri Kuzin > Sent: Monday, October 19, 2020 9:37 AM > To: dev@dpdk.org > Cc: matan@mellanox.com; rasland@mellanox.com; > viacheslavo@mellanox.com; stable@dpdk.org > Subject: [PATCH] net/mlx5: fix xstats reset reinitialization >=20 > The mlx5_xstats_reset clears the device extended statistics. > In this function the driver may reinitialize the structures > that are used to read device counters. >=20 > In case of reinitialization, the number of counters may > change, which wouldn't be taken into account by the > reset API callback and can cause a segmentation fault. >=20 > This issue is fixed by allocating the counters size after > the reinitialization. >=20 > Fixes: a4193ae3bc4f ("net/mlx5: support extended statistics") > Cc: stable@dpdk.org >=20 > Signed-off-by: Shiri Kuzin > Acked-by: Matan Azrad > --- > drivers/net/mlx5/mlx5_stats.c | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.= c > index e30542e..82d4d4a 100644 > --- a/drivers/net/mlx5/mlx5_stats.c > +++ b/drivers/net/mlx5/mlx5_stats.c > @@ -17,6 +17,7 @@ > #include "mlx5_defs.h" > #include "mlx5.h" > #include "mlx5_rxtx.h" > +#include "mlx5_malloc.h" >=20 > /** > * DPDK callback to get extended device statistics. > @@ -216,8 +217,7 @@ > struct mlx5_xstats_ctrl *xstats_ctrl =3D &priv->xstats_ctrl; > int stats_n; > unsigned int i; > - unsigned int n =3D xstats_ctrl->mlx5_stats_n; > - uint64_t counters[n]; > + uint64_t *counters; > int ret; >=20 > stats_n =3D mlx5_os_get_stats_n(dev); > @@ -228,17 +228,29 @@ > } > if (xstats_ctrl->stats_n !=3D stats_n) > mlx5_os_stats_init(dev); > + counters =3D mlx5_malloc(MLX5_MEM_SYS, sizeof(*counters) * > + xstats_ctrl->mlx5_stats_n, 0, > + SOCKET_ID_ANY); > + if (!counters) { > + DRV_LOG(WARNING, "port %u unable to allocate memory > for xstats " > + "counters", > + dev->data->port_id); > + rte_errno =3D ENOMEM; > + return -rte_errno; > + } > ret =3D mlx5_os_read_dev_counters(dev, counters); > if (ret) { > DRV_LOG(ERR, "port %u cannot read device counters: %s", > dev->data->port_id, strerror(rte_errno)); > + mlx5_free(counters); > return ret; > } > - for (i =3D 0; i !=3D n; ++i) { > + for (i =3D 0; i !=3D xstats_ctrl->mlx5_stats_n; ++i) { > xstats_ctrl->base[i] =3D counters[i]; > xstats_ctrl->hw_stats[i] =3D 0; > } > mlx5_txpp_xstats_reset(dev); > + mlx5_free(counters); > return 0; > } >=20 > -- > 1.8.3.1 Patch applied to next-net-mlx, Kindest regards, Raslan Darawsheh