From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BDCECA0C55 for ; Wed, 1 Dec 2021 02:44:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 95C244068C; Wed, 1 Dec 2021 02:44:50 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id C326D4068C for ; Wed, 1 Dec 2021 02:44:48 +0100 (CET) X-IronPort-AV: E=McAfee;i="6200,9189,10184"; a="236302929" X-IronPort-AV: E=Sophos;i="5.87,277,1631602800"; d="scan'208";a="236302929" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2021 17:44:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,277,1631602800"; d="scan'208";a="609351528" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga004.jf.intel.com with ESMTP; 30 Nov 2021 17:44:47 -0800 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 17:44:47 -0800 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 17:44:47 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Tue, 30 Nov 2021 17:44:47 -0800 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.46) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Tue, 30 Nov 2021 17:44:46 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c69+GyyGvS/pNd3luTN3UY9obWy68hijItGPDWL1/vVdjG1VHyfOp+uHsHr1CL1LVoQMglZT2REFBGgbM2EYzfVq4qfWnxHey70eX5WS8K1ZF1qrFCZDZq3drLQ5GWZmKmATIKC75il/IRU6s9WnRgbkNEbFSZvlGMSkVod8VF/w52fdd+fACp+ehLyI+hbScMycGN1X/nhYd/v9xOC4y/wnC4XXwQ139tmaCva2GxCd9GdKcmVJCO6aJRr8Jws+5Jo9cqYt2q7ycb3rfWtnP3s67l1bzh8yAQbrdvyEqAEHptcdo7vfz18DbgdN3j90VuFDMHqICWOPbu7Q/+ZdHw== 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=XKDLfmo89zKieVbrKRDGq5X1Xgs2qkmil9mnE+yemJA=; b=Ufqr2Spv9mi0yg0RTcHFRETSRp9CbCBxPflVhhj24SRK388+/EhbM7TXECqDQfkKbCL4mfS8oCpp1ootD4xFT5826srCj1207o77WxqBj0KdDQREPGseGPwd6BoljPm0iACkUVTdike8cf45s46zAFULRBz9afmAvf5M5EaYm7oTgM7uGts9LXQEMbdx13YusxNn0GtRJh4VLdF50cdLUUsgR0+R4s1kmy/1kwWHN4tY6wO5fp72Zum2iSlMgi0VrlVMOJ+ia4l/MPa6YvvDNb0CqHZa0O/NomeCwgMxhljHHTobXCzS5f4OJhbxMawRvOjsMftGCG1k4dq1SoX1MA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XKDLfmo89zKieVbrKRDGq5X1Xgs2qkmil9mnE+yemJA=; b=CO2ZRgdFJ7kL+Wtnrb1wvq8X/Ed3Bk/Q/Da/FPYKyLmrOnvrXUIHzorIbdQztJJuA7QL9cw8oZZIqzYPqBG7VoRO9LNVwu7ja4yHN5MYi6vLJzl0nWkCzxa1I7oqpWCO4JoMESrwsROZoqaWsJDqOAEp+0n/nLGnkPFYKSVW/Ko= Received: from DM8PR11MB5591.namprd11.prod.outlook.com (2603:10b6:8:38::23) by DM4PR11MB5565.namprd11.prod.outlook.com (2603:10b6:5:39a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Wed, 1 Dec 2021 01:44:42 +0000 Received: from DM8PR11MB5591.namprd11.prod.outlook.com ([fe80::3d47:b590:aa2a:d5cc]) by DM8PR11MB5591.namprd11.prod.outlook.com ([fe80::3d47:b590:aa2a:d5cc%9]) with mapi id 15.20.4669.010; Wed, 1 Dec 2021 01:44:42 +0000 From: "Peng, ZhihongX" To: "christian.ehrhardt@canonical.com" CC: "Lin, Xueqin" , "Richardson, Bruce" , dpdk stable Subject: RE: patch 'examples/performance-thread: fix build with ASan' has been queued to stable release 19.11.11 Thread-Topic: patch 'examples/performance-thread: fix build with ASan' has been queued to stable release 19.11.11 Thread-Index: AQHX5gkuPLa0FIf1zUOSTVEQy9szhqwc3a1g Date: Wed, 1 Dec 2021 01:44:42 +0000 Message-ID: References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> <20211130163605.2460997-106-christian.ehrhardt@canonical.com> In-Reply-To: <20211130163605.2460997-106-christian.ehrhardt@canonical.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f86b45f3-492e-4728-6fb3-08d9b46c2574 x-ms-traffictypediagnostic: DM4PR11MB5565: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: fs8b0XpkKf5fSJMN7AeYnEIc+fP/s3Wm/0OwNmVJdzQ3j5V0PyeaTwY/8BKIRQyoEPX2ONS+NzGzqVkg4VeDG7WxONce69zacWl5gltPdKYfkEpcVX2pDoceEVzAjZ9oKxnk30TxR+sAG4YKJFrMpl7Oohp1gauc1j3yAMYJgyKU9wIEYzAfawDRa4cqUpsNHv9ziE3avJbAml63XlNHC318HVPCU3oMKEiBWaeF2bMrh1D0SaqkPUW0nGmRG0qdpimc0ts5ZTddgeFCMpMXriRHU5aYO5KSMpv+vzol7UgmCaqcV5jKHXV6RurEkcyp8p5vBvNB8C/+d/dcm8GzZbkwR2fpRySyb3918JsotAmdZ41HNNz2JESvZwMYHvvkS3SLPaqA5yEftyaR/Ouq2oQeIzTsXB3m1c9crD43vK/s5mbY6uXwH1tz43cXPK8Jydsg1aRTwc4zOS28HOGy8VuGNilZNK8V14oiyiZ+H0WgVKnwgEKfWiz+x61JrayrnzBDiNDmshNazCE1MgZYVPTNO1x74DMy2AQOSyMSxBGcjw6I/GXb/seOGRxcKSnNMgL1NV+umoe2bMCmTO66Aczuxufz56Tmuyf2KX19nHHdOK6rBstOGjmUr8CeyKY4UdoPXM42dT6ya0jd9/fsU1MReis3I/4hCgFkFtiXDXMX/1ihKnvwVGckDjDF8YN0ScsP/V3g8gfTZ4qrdDkhjOkyW2mHrpSfw/lIJAPw3aP/Wxqa4BqjpWZRKAMTH0q5hyEWJhG1qsyD+xWr4Q2woh5TC01sBJ/1zhk9piyf5P3ek7l+DVoYJWwmlsWTEme9T9aibAW5bSMUdc2Bq/8M0w== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM8PR11MB5591.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(966005)(9686003)(6916009)(64756008)(26005)(71200400001)(316002)(186003)(8676002)(4326008)(86362001)(2906002)(508600001)(33656002)(66946007)(38070700005)(82960400001)(54906003)(5660300002)(122000001)(53546011)(66446008)(7696005)(4001150100001)(76116006)(83380400001)(8936002)(52536014)(55016003)(66556008)(66476007)(6506007)(38100700002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?onBL7vgFSfqRYegVzg+YtZxJbJf0B6qNcINhCD6hsd360HwsykAHIZAwH7+T?= =?us-ascii?Q?RtsuhH4lmdFut6tIvdVNwOU8r/1SOw+AX3UvAoQmeo7x0T3Njhxw7LhZmBRH?= =?us-ascii?Q?uGJI+LU7G9thzKEJ6mL0XTC7cnJW3Uhda+K2AlCpFlSn8m6v8Et7B8PurNXS?= =?us-ascii?Q?YqALHMfobZa8wXw7NbVGAAxUtw1R7ACYr5jss8etmFYZyEXUNwN/ly0Dx6eR?= =?us-ascii?Q?7UjW8Y1FIQFq3KXqWxTZU7nTaHz/n2Jh9bCt/aUz4HcmR8Yf3E5BkIVhFkLh?= =?us-ascii?Q?f6nO6x4xyCCYql3hmvxlqmaea2T5r583LxN66/x3WZtwYuXkT9Basi3vTSeZ?= =?us-ascii?Q?nyqpJqRJYwQ1dZr2BOdmKXMQ4JrVHQvZuMHJHI44jstHuBa0W3sIk4NAZmAC?= =?us-ascii?Q?FFxC5tOd7Gcc6VxSTa82Dmd69PrJEggtzvq9hW9eXds7zh2gNSEkNaMJfzMV?= =?us-ascii?Q?jDO2hp+U1/F1b4VvZsVsRleFIxA/JNPXOY2lEgWp4vH2wVHDVEA+Icvs0l54?= =?us-ascii?Q?cvRR/xKSNDWswceQ5kGg8p5T9cTRRqxiDo+v8S7byHucCanOF2KueYOlZsrz?= =?us-ascii?Q?mdsDriq97DoXeqirwqunyXGXsMaaenZInyn8X/VqtgSDSPMPNBEYGXBD6ZXm?= =?us-ascii?Q?eVu/hhqV1QfM/qa7LtbsgI84AzQZXhtR9zcNQjQaBULNP4o/LS4Pa2IuRzla?= =?us-ascii?Q?1MdFLUPP26VKYyKFwgvOHlexB3oyfCsLxuFGxGwQyUEqBXjkQjMIyEFdprLL?= =?us-ascii?Q?kG8nKgRWFvvBe10qbqLHM8TKY60c+0HebOE1fWaR/RZn4fCVGG4AXfjvsO1u?= =?us-ascii?Q?iqz8KSw6hno1JvB8japBQ/+gsVmwYcci4/kksjUYUFA33cMMnXqjUJfAMH0x?= =?us-ascii?Q?9n+fzrTygulUCCULp+3YMW8ihpkWauHjQYwsEVBJMUyaGm5tNViniwV/eYFT?= =?us-ascii?Q?1y68IrdiTat0R5iw7S8HVSpAM56hk4ScW7L3GjNQDcPZmYieDJ1eTZG+x4Af?= =?us-ascii?Q?KCn9KDP0eB/f9LCJ/7v8HSWjqQwmlOLrSz4uJ5LR/Uv5dHKZFGM9PIk/hvO1?= =?us-ascii?Q?K8MymukGG0MtWgGEwTbwHgYR5DbeLXlwy2zwSZ1Ok35coLHfu3aE0csiFo1j?= =?us-ascii?Q?Iqq+SecSLGsKcLS52UYumq13ZDjcYl9mVf0TVPV6titTT7RutcqmHBlZ1izL?= =?us-ascii?Q?KLV5niiGp+9IW8BUvN81zfrzUGH5wAr992YMJfL6TWEX6dnT6zLvmAZEpKmA?= =?us-ascii?Q?bdng1o3yNimtz8OoPBsqvuk3z4TQmRTasPZogvcGJsRRE+Hz3SpwrrFm5pWd?= =?us-ascii?Q?L/XFkTKZnm9EADlnPCGpCN0da2kGWqta2whebhweomvUx/vvDzwNU7O237pN?= =?us-ascii?Q?+4hfzExEUgmsVy9QDRcR6/fsEoGUKeIYw3qiUZiI/XI88gOfjDNdY9vNNYgn?= =?us-ascii?Q?2skurSVG/5VjFXfHNJWhpXal78qEjRJ0uqRP8/i5wDnD2863Su0pV7EHGjhW?= =?us-ascii?Q?1jUv8l0paaZdRSSp6H8Ze+E+YMQ16+V4cRpqOfrP1QWfcQgDBNrma47a1XSe?= =?us-ascii?Q?/xmdOJvNG0YX1hONHkKK8v1N/4MmDc+zI1Ry9oTqe9Zfo4dAb7STbqQgkHsH?= =?us-ascii?Q?4OnZLvPtt3LD3jBmXmfq2uE=3D?= 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: DM8PR11MB5591.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f86b45f3-492e-4728-6fb3-08d9b46c2574 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Dec 2021 01:44:42.6764 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: VPkTYjojaY6kiXRPpxXs4iMFaEDnuUsaMlN5mPJH6BVlIZ6ns/IdywHfPyieIQwKkwbK8l/5xxWwmPdlH5vzPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5565 X-OriginatorOrg: intel.com X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi , ehrhardt This patch is not backward compatible.=20 Regards, Peng,Zhihong > -----Original Message----- > From: christian.ehrhardt@canonical.com > Sent: Wednesday, December 1, 2021 12:35 AM > To: Peng, ZhihongX > Cc: Lin, Xueqin ; Richardson, Bruce > ; dpdk stable > Subject: patch 'examples/performance-thread: fix build with ASan' has bee= n > queued to stable release 19.11.11 >=20 > Hi, >=20 > FYI, your patch has been queued to stable release 19.11.11 >=20 > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before December 10th 2021. So pl= ease > shout if anyone has objections. >=20 > Also note that after the patch there's a diff of the upstream commit vs t= he > patch applied to the branch. This will indicate if there was any rebasing > needed to apply to the stable branch. If there were code changes for > rebasing > (ie: not only metadata diffs), please double check that the rebase was > correctly done. >=20 > Queued patches are on a temporary branch at: > https://github.com/cpaelzer/dpdk-stable-queue >=20 > This queued commit can be viewed at: > https://github.com/cpaelzer/dpdk-stable- > queue/commit/478db9fdd0f6214bd02fce0dfe49723d82b68228 >=20 > Thanks. >=20 > Christian Ehrhardt >=20 > --- > From 478db9fdd0f6214bd02fce0dfe49723d82b68228 Mon Sep 17 00:00:00 > 2001 > From: Zhihong Peng > Date: Wed, 20 Oct 2021 15:46:43 +0800 > Subject: [PATCH] examples/performance-thread: fix build with ASan >=20 > [ upstream commit 4d2d1258151657d69b0be5d118956b7e809f9d47 ] >=20 > Code changes to avoid the following build error: > "strncpy specified bound XX equals destination size". >=20 > Signed-off-by: Xueqin Lin > Signed-off-by: Zhihong Peng > Acked-by: Bruce Richardson > --- > examples/performance-thread/common/lthread.c | 4 ++-- > examples/performance-thread/common/lthread_cond.c | 6 +++--- > examples/performance-thread/common/lthread_mutex.c | 6 +++--- > 3 files changed, 8 insertions(+), 8 deletions(-) >=20 > diff --git a/examples/performance-thread/common/lthread.c > b/examples/performance-thread/common/lthread.c > index 3f1f48db43..190e5874b1 100644 > --- a/examples/performance-thread/common/lthread.c > +++ b/examples/performance-thread/common/lthread.c > @@ -20,6 +20,7 @@ > #include >=20 > #include > +#include > #include > #include >=20 > @@ -463,6 +464,5 @@ void lthread_set_funcname(const char *f) { > struct lthread *lt =3D THIS_LTHREAD; >=20 > - strncpy(lt->funcname, f, sizeof(lt->funcname)); > - lt->funcname[sizeof(lt->funcname)-1] =3D 0; > + strlcpy(lt->funcname, f, sizeof(lt->funcname)); > } > diff --git a/examples/performance-thread/common/lthread_cond.c > b/examples/performance-thread/common/lthread_cond.c > index cdcc7a7b5a..e7be17089a 100644 > --- a/examples/performance-thread/common/lthread_cond.c > +++ b/examples/performance-thread/common/lthread_cond.c > @@ -20,6 +20,7 @@ >=20 > #include > #include > +#include >=20 > #include "lthread_api.h" > #include "lthread_diag_api.h" > @@ -57,10 +58,9 @@ lthread_cond_init(char *name, struct lthread_cond > **cond, > } >=20 > if (name =3D=3D NULL) > - strncpy(c->name, "no name", sizeof(c->name)); > + strlcpy(c->name, "no name", sizeof(c->name)); > else > - strncpy(c->name, name, sizeof(c->name)); > - c->name[sizeof(c->name)-1] =3D 0; > + strlcpy(c->name, name, sizeof(c->name)); >=20 > c->root_sched =3D THIS_SCHED; >=20 > diff --git a/examples/performance-thread/common/lthread_mutex.c > b/examples/performance-thread/common/lthread_mutex.c > index 01da6cad4f..709ab9f553 100644 > --- a/examples/performance-thread/common/lthread_mutex.c > +++ b/examples/performance-thread/common/lthread_mutex.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include >=20 > #include "lthread_api.h" > #include "lthread_int.h" > @@ -52,10 +53,9 @@ lthread_mutex_init(char *name, struct lthread_mutex > **mutex, > } >=20 > if (name =3D=3D NULL) > - strncpy(m->name, "no name", sizeof(m->name)); > + strlcpy(m->name, "no name", sizeof(m->name)); > else > - strncpy(m->name, name, sizeof(m->name)); > - m->name[sizeof(m->name)-1] =3D 0; > + strlcpy(m->name, name, sizeof(m->name)); >=20 > m->root_sched =3D THIS_SCHED; > m->owner =3D NULL; > -- > 2.34.0 >=20 > --- > Diff of the applied patch vs upstream commit (please double-check if no= n- > empty: > --- > --- - 2021-11-30 16:50:11.974298631 +0100 > +++ 0106-examples-performance-thread-fix-build-with-ASan.patch 2021- > 11-30 16:50:05.910874410 +0100 > @@ -1 +1 @@ > -From 4d2d1258151657d69b0be5d118956b7e809f9d47 Mon Sep 17 00:00:00 > 2001 > +From 478db9fdd0f6214bd02fce0dfe49723d82b68228 Mon Sep 17 00:00:00 > 2001 > @@ -5,0 +6,2 @@ > +[ upstream commit 4d2d1258151657d69b0be5d118956b7e809f9d47 ] > + > @@ -19 +21 @@ > -index 98123f34f8..009374a8c3 100644 > +index 3f1f48db43..190e5874b1 100644 > @@ -30 +32 @@ > -@@ -465,6 +466,5 @@ void lthread_set_funcname(const char *f) > +@@ -463,6 +464,5 @@ void lthread_set_funcname(const char *f) > @@ -64 +66 @@ > -index 061fc5c19a..f3ec7c1c60 100644 > +index 01da6cad4f..709ab9f553 100644