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 C7542A04B7; Tue, 13 Oct 2020 19:00:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 684A81C241; Tue, 13 Oct 2020 19:00:14 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 2B53F1C225 for ; Tue, 13 Oct 2020 19:00:12 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09DGxf5Z029752; Tue, 13 Oct 2020 10:00:10 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0220; bh=eyvEtYbOjQzSnw978x10wCV76UbxfpcYELeFFojEiO4=; b=az8dI11NIHpp+12TlMZzm4/FqjL0qZK8OtH9lOSxbF0lWcAOeDH2EKYCWqO289pImQJY ue+SlyTWgyrq98rbjG73iqZdi7tzxSTa/0GfHY8GcG/axI3XCOjJ7gBQUWL34rcuHoKM epgV7/F9S8diLA4h7VBBs+aZ4GEZx8phEDBPrhGryQpsJSulB5LYiaECjihhduTcp9i5 T29/xCG1meFR7uAQNRKkwXUMM+SKXmpycEsbMBjUSuGGGqgaOORlICPyaU4O/ZMBJFrG 9/509HrOn7rI2hKiIdBYVlUXCouEmyY6NL7/oKwQRYJdtPtWXOJ/gZiuWFMze8KHmXuK hQ== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 343cfjb5ab-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 13 Oct 2020 10:00:10 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 13 Oct 2020 10:00:08 -0700 Received: from SC-EXCH02.marvell.com (10.93.176.82) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 13 Oct 2020 10:00:07 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.174) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 13 Oct 2020 10:00:07 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lw50OlWrE3F1CXpqTLcBzR/t20p1RQn0p4noTUP/wxwXB8n4jK2gL8gwNA0tz2HGm56d0lMhzN8bzri6ocJhuH1FjlUQKmPeggD6s5oSBAlxS4GCYEtVAPYW/K5OedghTp7IZVENjcL1lW8UNmwFzrw6i4/I4IFkQ1P3jNsMcX8qPBxhQ/42fMhjA9J5zzGB90o3wIr2CZp6TRnuSPZGVHG5mUdiRQ6N0qIISflAoC+/wgzSkY5ChvJp51EQbMzMGuaVXT5rcp0T6FEMMGvTq8haVkwE89yEoxfAkuzBebWoRW24UNUap6retZfRzZYyXPcPtXt8q3/NgWnW6o+Omw== 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=eyvEtYbOjQzSnw978x10wCV76UbxfpcYELeFFojEiO4=; b=KMox1IOv94x+QsNyMUwXduaLBU2wTDz0+w8NAVb6xedAKzqKWn7wJ4RYOxdNbBRlFV3vBuwH1kAYRvBTLqWORXDQYdcnYbB9Bk4z8uhLfX34jVNHn+FSZhA13N0MwNMJO1bruwRRkwrajF0ZAes3m65ChrVTHSM22b+acl44Y7UDgUdjnphXVGAUtppAHYUNRoyHbqAr/uECOx+1lIHukQxrijBEMx4xhRiLGSLkqme5pDtSQw4Upk6+6gU+hvECda8mP8jTvlpc8s96/C6otE3cBQnkR9KemWDTlf+oWdGXG8po6XA+HlbgSKkdI47wcSEwGtxXeLzvjCjPxguqHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eyvEtYbOjQzSnw978x10wCV76UbxfpcYELeFFojEiO4=; b=KBEesfsXhOD0QqMfjGSaYnBGH3tciWilNARjtldzASxoRwmpXyXp2R3DdQ5nibobQgiuoT8b6tbyviAD1VKi1zi23+XVoP8y8AsCUB2BWihHc/KQzsfsp7DC0+ioGJQkZDAp8m8XCIArFkR6uB6Ke2F64SniofeB2C71xm/ATUM= Received: from DM5PR18MB2214.namprd18.prod.outlook.com (2603:10b6:4:b9::21) by DM6PR18MB3586.namprd18.prod.outlook.com (2603:10b6:5:2a1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Tue, 13 Oct 2020 17:00:06 +0000 Received: from DM5PR18MB2214.namprd18.prod.outlook.com ([fe80::48c2:9ca9:3159:368e]) by DM5PR18MB2214.namprd18.prod.outlook.com ([fe80::48c2:9ca9:3159:368e%5]) with mapi id 15.20.3455.031; Tue, 13 Oct 2020 17:00:06 +0000 From: Liron Himi To: Stephen Hemminger , "dev@dpdk.org" CC: Anatoly Burakov , Hemant Agrawal , Sachin Saxena , "Stephen Hemminger" , Long Li , "Nipun Gupta" , Jerin Jacob Kollanukkaran , Harry van Haaren , Ajit Khaparde , Somnath Kotur , Rasesh Mody , Shahed Shaikh , Jasvinder Singh , Cristian Dumitrescu , Liron Himi Thread-Topic: [EXT] [PATCH v5 05/18] drivers: replace master lcore with main lcore Thread-Index: AQHWoXVONUVEPIpjlkSWRdRTrnr6i6mVwImw Date: Tue, 13 Oct 2020 17:00:06 +0000 Message-ID: References: <20200914182002.6750-1-stephen@networkplumber.org> <20201013152610.2589-1-stephen@networkplumber.org> <20201013152610.2589-6-stephen@networkplumber.org> In-Reply-To: <20201013152610.2589-6-stephen@networkplumber.org> Accept-Language: he-IL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: networkplumber.org; dkim=none (message not signed) header.d=none;networkplumber.org; dmarc=none action=none header.from=marvell.com; x-originating-ip: [89.139.26.150] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2fd81047-26f7-4bcb-adf8-08d86f996fa2 x-ms-traffictypediagnostic: DM6PR18MB3586: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:281; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zhAnS4yNls+awVffXulXBwHEixGivt271jIUB6rA2wGuhb4CUQYyT6jqJUblN8u/14x4ZQVQQlqZwbG1B86s6d/rcYP6EJOIjSFEaJMkxSTkSBYcpF5WxjSZU0GQ/YHxhfYUgb3MurtVZs4Q9w52uX080vICo5eRu4V3WMZWFDdB0AWNRa5u75JfpwKQqK1NuoSerPRmnrdEkvSOB2Q8Om0shX1Cmn+K1ZeO7j5BozqVWlELiVTL/6jQY8d68WCeLtRvEKwwMZexzNPmKo1WDAEmJsJVSCuTpJD5CmAOBY3UPzCk7a+YQzp1yjQCL4GYebQrGsEpz21i3UEqHLhUDA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR18MB2214.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(39850400004)(396003)(366004)(346002)(376002)(83380400001)(107886003)(316002)(30864003)(2906002)(478600001)(86362001)(8676002)(8936002)(71200400001)(53546011)(7696005)(26005)(7416002)(66476007)(9686003)(66946007)(5660300002)(64756008)(66446008)(66556008)(55016002)(33656002)(54906003)(6506007)(52536014)(110136005)(186003)(4326008)(76116006); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: siNKMtXigKetXMdub6n1Wu9m5VYRbgvDCqfI5LVtnZC7+VIsJr+OTRjplAmk+8gY8F59rXPJi6krMjdXCWsTcUfS8p9dOFPuAgt+2a4F7CF+cF70bumyVJXneu5i+A5AOUb9q2WgmIvxgHvIBYIo1qgeSQB+zEDz9xFX8mfp1BE47+yEPgMVBKJ6/CFmr6PpiIraB/5its02Fc0nIEctELeBEfFu9aoSsCmmZhrDk+m98NAxkOGwSKEQFL+jjOB6yJZewftJuzgbKn3NfDKjkD6puf+KABzlkHTps0QfFXhbGthnHuCALVUW2qkxfJzol4ILuyXwND1O7lvlK0zJUg33zMP23W6dHlqtkYVw4wOh0JkDHQN975/9xxhO4/vHXNsSH+0yMxCLhMtpSfqb5sRdSGl+0qnIgthhcjDkYhSNfXtK6H5eOzLB0SbSRCQ0YSMy4cvaP0A/VUXA2ulWKbwsVfuTMSNjs/8sqZvZ9EtYWDZLUQK/nsc4FkIMnhwZYdBtPan4ftF3dDWtkahuV+1p4NevijXM3hhT6Y4TOzLhY+3vzaTrGqiuc4eVmnlMGRVCxp0cGc1RyuDh0KHDk2kGau6witfvAeJEALRP94za+WIxwzqpqv8J2OrTFZuVsn/55zydiC63WK1CmRy5GA== 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: DM5PR18MB2214.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fd81047-26f7-4bcb-adf8-08d86f996fa2 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2020 17:00:06.5117 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: S3o5bFeZ4wEfYVbMgmJk9vdJ8xyWSLGIf4LSEHEl3msuz3BL0FWDdK9grE1QesmbgVnCVusOGUyu/FkUPlHNQQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB3586 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-10-13_09:2020-10-13, 2020-10-13 signatures=0 Subject: Re: [dpdk-dev] [EXT] [PATCH v5 05/18] drivers: replace master lcore with main lcore 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" For mvpp2. Reviewed-by: Liron Himi -----Original Message----- From: Stephen Hemminger =20 Sent: Tuesday, 13 October 2020 18:26 To: dev@dpdk.org Cc: Stephen Hemminger ; Anatoly Burakov ; Hemant Agrawal ; Sachin Saxen= a ; Stephen Hemminger ; = Long Li ; Nipun Gupta ; Jerin Ja= cob Kollanukkaran ; Harry van Haaren ; Ajit Khaparde ; Somnath Kotur ; Liron Himi ; Rasesh Mody ; Shahed Shaikh ; Jasvinder Singh ; Cristian Dumitrescu Subject: [EXT] [PATCH v5 05/18] drivers: replace master lcore with main lco= re External Email ---------------------------------------------------------------------- Replace use of deprecated rte_master_lcore with rte_main_lcore. Signed-off-by: Stephen Hemminger Acked-by: Anatoly Burakov --- drivers/bus/dpaa/dpaa_bus.c | 2 +- drivers/bus/pci/pci_common_uio.c | 3 ++- drivers/bus/vmbus/vmbus_common_uio.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 10 +++++----- drivers/event/octeontx/ssovf_evdev_selftest.c | 10 +++++----- drivers/event/sw/sw_evdev_selftest.c | 2 +- drivers/net/bnxt/bnxt_ring.c | 4 ++-- drivers/net/mvpp2/mrvl_ethdev.c | 6 +++--- drivers/net/qede/base/bcm_osal.c | 4 ++-- drivers/net/softnic/rte_eth_softnic_internals.h | 2 +- drivers/net/softnic/rte_eth_softnic_thread.c | 16 ++++++++-------- 11 files changed, 31 insertions(+), 30 deletions(-) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c inde= x 32e872da5209..c94c72106f2c 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -257,7 +257,7 @@ int rte_dpaa_portal_init(void *arg) BUS_INIT_FUNC_TRACE(); =20 if ((size_t)arg =3D=3D 1 || lcore =3D=3D LCORE_ID_ANY) - lcore =3D rte_get_master_lcore(); + lcore =3D rte_get_main_lcore(); else if (lcore >=3D RTE_MAX_LCORE) return -1; diff --git a/drivers/bus/pci/pci_common_uio.c b/drivers/bus/pci/pci_common_= uio.c index 793dfd0a7c9b..318f9a1d550b 100644 --- a/drivers/bus/pci/pci_common_uio.c +++ b/drivers/bus/pci/pci_common_uio.c @@ -51,7 +51,8 @@ pci_uio_map_secondary(struct rte_pci_device *dev) void *mapaddr =3D pci_map_resource(uio_res->maps[i].addr, fd, (off_t)uio_res->maps[i].offset, (size_t)uio_res->maps[i].size, 0); - /* fd is not needed in slave process, close it */ + + /* fd is not needed in secondary process, close it */ close(fd); if (mapaddr !=3D uio_res->maps[i].addr) { RTE_LOG(ERR, EAL, diff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus= _common_uio.c index 8e476f2eaf8b..a689bf11b3f6 100644 --- a/drivers/bus/vmbus/vmbus_common_uio.c +++ b/drivers/bus/vmbus/vmbus_common_uio.c @@ -85,7 +85,7 @@ vmbus_uio_map_secondary(struct rte_vmbus_device *dev) return -1; } =20 - /* fd is not needed in slave process, close it */ + /* fd is not needed in secondary process, close it */ close(fd); =20 dev->primary =3D uio_res->primary; diff --git a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c b/drivers/event/= dpaa2/dpaa2_eventdev_selftest.c index ba4f4bd23447..b1f38914841d 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c +++ b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c @@ -501,8 +501,8 @@ wait_workers_to_join(int lcore, const rte_atomic32_t *c= ount) =20 =20 static int -launch_workers_and_wait(int (*master_worker)(void *), - int (*slave_workers)(void *), uint32_t total_events, +launch_workers_and_wait(int (*main_worker)(void *), + int (*workers)(void *), uint32_t total_events, uint8_t nb_workers, uint8_t sched_type) { uint8_t port =3D 0; @@ -537,9 +537,9 @@ launch_workers_and_wait(int (*master_worker)(void *), =20 w_lcore =3D rte_get_next_lcore( /* start core */ -1, - /* skip master */ 1, + /* skip main */ 1, /* wrap */ 0); - rte_eal_remote_launch(master_worker, ¶m[0], w_lcore); + rte_eal_remote_launch(main_worker, ¶m[0], w_lcore); =20 for (port =3D 1; port < nb_workers; port++) { param[port].total_events =3D &atomic_total_events; @@ -548,7 +548,7 @@ l= aunch_workers_and_wait(int (*master_worker)(void *), param[port].dequeue_tmo_ticks =3D dequeue_tmo_ticks; rte_smp_wmb(); w_lcore =3D rte_get_next_lcore(w_lcore, 1, 0); - rte_eal_remote_launch(slave_workers, ¶m[port], w_lcore); + rte_eal_remote_launch(workers, ¶m[port], w_lcore); } =20 ret =3D wait_workers_to_join(w_lcore, &atomic_total_events); diff --git a= /drivers/event/octeontx/ssovf_evdev_selftest.c b/drivers/event/octeontx/sso= vf_evdev_selftest.c index 239362fcf549..7a2b7ded259c 100644 --- a/drivers/event/octeontx/ssovf_evdev_selftest.c +++ b/drivers/event/octeontx/ssovf_evdev_selftest.c @@ -601,8 +601,8 @@ wait_workers_to_join(int lcore, const rte_atomic32_t *c= ount) =20 =20 static inline int -launch_workers_and_wait(int (*master_worker)(void *), - int (*slave_workers)(void *), uint32_t total_events, +launch_workers_and_wait(int (*main_worker)(void *), + int (*worker)(void *), uint32_t total_events, uint8_t nb_workers, uint8_t sched_type) { uint8_t port =3D 0; @@ -637,9 +637,9 @@ launch_workers_and_wait(int (*master_worker)(void *), =20 w_lcore =3D rte_get_next_lcore( /* start core */ -1, - /* skip master */ 1, + /* skip main */ 1, /* wrap */ 0); - rte_eal_remote_launch(master_worker, ¶m[0], w_lcore); + rte_eal_remote_launch(main_worker, ¶m[0], w_lcore); =20 for (port =3D 1; port < nb_workers; port++) { param[port].total_events =3D &atomic_total_events; @@ -648,7 +648,7 @@ l= aunch_workers_and_wait(int (*master_worker)(void *), param[port].dequeue_tmo_ticks =3D dequeue_tmo_ticks; rte_smp_wmb(); w_lcore =3D rte_get_next_lcore(w_lcore, 1, 0); - rte_eal_remote_launch(slave_workers, ¶m[port], w_lcore); + rte_eal_remote_launch(worker, ¶m[port], w_lcore); } =20 ret =3D wait_workers_to_join(w_lcore, &atomic_total_events); diff --git a= /drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.= c index 38c21fa0fa3d..6dfbdd308310 100644 --- a/drivers/event/sw/sw_evdev_selftest.c +++ b/drivers/event/sw/sw_evdev_selftest.c @@ -3108,7 +3108,7 @@ worker_loopback(struct test *t, uint8_t disable_impli= cit_release) =20 p_lcore =3D rte_get_next_lcore( /* start core */ -1, - /* skip master */ 1, + /* skip main */ 1, /* wrap */ 0); w_lcore =3D rte_get_next_lcore(p_lcore, 1, 0); =20 diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c in= dex f7f6ee804960..aeb6cb6150d8 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -429,7 +429,7 @@ int bnxt_alloc_rxtx_nq_ring(struct bnxt *bp) if (!BNXT_HAS_NQ(bp) || bp->rxtx_nq_ring) return 0; =20 - socket_id =3D rte_lcore_to_socket_id(rte_get_master_lcore()); + socket_id =3D rte_lcore_to_socket_id(rte_get_main_lcore()); =20 nqr =3D rte_zmalloc_socket("nqr", sizeof(struct bnxt_cp_ring_info), @@ -820,7 +820,7 @@ int bnxt_alloc_async_ring_struct(struct bnxt *bp) if (BNXT_NUM_ASYNC_CPR(bp) =3D=3D 0) return 0; =20 - socket_id =3D rte_lcore_to_socket_id(rte_get_master_lcore()); + socket_id =3D rte_lcore_to_socket_id(rte_get_main_lcore()); =20 cpr =3D rte_zmalloc_socket("cpr", sizeof(struct bnxt_cp_ring_info), diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethde= v.c index a230a9684028..8af545d6a2ea 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -814,7 +814,7 @@ mrvl_flush_bpool(struct rte_eth_dev *dev) unsigned int core_id =3D rte_lcore_id(); =20 if (core_id =3D=3D LCORE_ID_ANY) - core_id =3D rte_get_master_lcore(); + core_id =3D rte_get_main_lcore(); =20 hif =3D mrvl_get_hif(priv, core_id); =20 @@ -1623,7 +1623,7 @@ mrvl_fill_bpool(struct mrvl_rxq *rxq, int num) =20 core_id =3D rte_lcore_id(); if (core_id =3D=3D LCORE_ID_ANY) - core_id =3D rte_get_master_lcore(); + core_id =3D rte_get_main_lcore(); =20 hif =3D mrvl_get_hif(rxq->priv, core_id); if (!hif) @@ -1773,7 +1773,7 @@ mrvl_rx_queue_release(void *rxq) unsigned int core_id =3D rte_lcore_id(); =20 if (core_id =3D=3D LCORE_ID_ANY) - core_id =3D rte_get_master_lcore(); + core_id =3D rte_get_main_lcore(); =20 if (!q) return; diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_o= sal.c index 44a8692f5cdc..2c59397e0412 100644 --- a/drivers/net/qede/base/bcm_osal.c +++ b/drivers/net/qede/base/bcm_osal.c @@ -143,7 +143,7 @@ void *osal_dma_alloc_coherent(struct ecore_dev *p_dev, snprintf(mz_name, sizeof(mz_name), "%lx", (unsigned long)rte_get_timer_cycles()); if (core_id =3D=3D (unsigned int)LCORE_ID_ANY) - core_id =3D rte_get_master_lcore(); + core_id =3D rte_get_main_lcore(); socket_id =3D rte_lcore_to_socket_id(core_id); mz =3D rte_memzone_reserve_aligned(mz_name, size, socket_id, RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE); @@ -182,7 +182,7 @@ void= *osal_dma_alloc_coherent_aligned(struct ecore_dev *p_dev, snprintf(mz_name, sizeof(mz_name), "%lx", (unsigned long)rte_get_timer_cycles()); if (core_id =3D=3D (unsigned int)LCORE_ID_ANY) - core_id =3D rte_get_master_lcore(); + core_id =3D rte_get_main_lcore(); socket_id =3D rte_lcore_to_socket_id(core_id); mz =3D rte_memzone_reserve_aligned(mz_name, size, socket_id, RTE_MEMZONE_IOVA_CONTIG, align); diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/= softnic/rte_eth_softnic_internals.h index 6eec43b22b13..fe31be68dca3 100644 --- a/drivers/net/softnic/rte_eth_softnic_internals.h +++ b/drivers/net/softnic/rte_eth_softnic_internals.h @@ -547,7 +547,7 @@ TAILQ_HEAD(pipeline_list, pipeline); #endif =20 /** - * Master thead: data plane thread context + * Main thread: data plane thread context */ struct softnic_thread { struct rte_ring *msgq_req; diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/sof= tnic/rte_eth_softnic_thread.c index dcfb5eb82c18..a8c26a5b2377 100644 --- a/drivers/net/softnic/rte_eth_softnic_thread.c +++ b/drivers/net/softnic/rte_eth_softnic_thread.c @@ -18,14 +18,14 @@ #include "rte_eth_softnic_internals.h" =20 /** - * Master thread: data plane thread init + * Main thread: data plane thread init */ void softnic_thread_free(struct pmd_internals *softnic) { uint32_t i; =20 - RTE_LCORE_FOREACH_SLAVE(i) { + RTE_LCORE_FOREACH_WORKER(i) { struct softnic_thread *t =3D &softnic->thread[i]; =20 /* MSGQs */ @@ -78,7 +78,7 @@ softnic_thread_init(struct pmd_internals *softnic) return -1; } =20 - /* Master thread records */ + /* Main thread records */ t->msgq_req =3D msgq_req; t->msgq_rsp =3D msgq_rsp; t->service_id =3D UINT32_MAX; @@ -99,7 +99,7 @@ softnic_thread_init(struct pmd_internals *softnic) stati= c inline int thread_is_valid(struct pmd_internals *softnic, uint32_t threa= d_id) { - if (thread_id =3D=3D rte_get_master_lcore()) + if (thread_id =3D=3D rte_get_main_lcore()) return 0; /* FALSE */ =20 if (softnic->params.sc && rte_lcore_has_role(thread_id, ROLE_SERVICE)) @@= -209,7 +209,7 @@ pipeline_is_running(struct pipeline *p) } =20 /** - * Master thread & data plane threads: message passing + * Main thread & data plane threads: message passing */ enum thread_req_type { THREAD_REQ_PIPELINE_ENABLE =3D 0, @@ -243,7 +243,7 @@ struct thread_msg_rsp { }; =20 /** - * Master thread + * Main thread */ static struct thread_msg_req * thread_msg_alloc(void) @@ -587,7 +587,7 @@ thread_msg_handle(struct softnic_thread_data *t) } =20 /** - * Master thread & data plane threads: message passing + * Main thread & data plane threads: message passing */ enum pipeline_req_type { /* Port IN */ @@ -753,7 +753,7 @@ struct pipeline_msg_rsp { }; =20 /** - * Master thread + * Main thread */ static struct pipeline_msg_req * pipeline_msg_alloc(void) -- 2.27.0