From patchwork Wed Dec 26 11:33:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 154518 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5737601ljp; Wed, 26 Dec 2018 03:33:59 -0800 (PST) X-Google-Smtp-Source: AFSGD/U1JhZQvtZFBZr4DwfWc6GUB44apKprtKkmsINaiPYqypXLgZomKQNP63BQc+d+RDEwLSly X-Received: by 2002:a1c:a6c2:: with SMTP id p185mr16424824wme.133.1545824039314; Wed, 26 Dec 2018 03:33:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545824039; cv=none; d=google.com; s=arc-20160816; b=RjEiyGGV7PkiIlTkWnbqCLrSe3KCnw6yfAYISjZ2mxW2C9qveKuGxyT6Qmyjrhf+I+ aP8ChNgj5c55NrI7mb+Z+pTr7nI6RXZQI82xYOwtq7kkoSmYZO6B6WHg8egz7IkiMNO+ ORHj3pcfjx1qcg8QeeLa+mh7uoQvF/2UkLpK4tucxQlDIXo/vSJ2jxGWW+SfNv6gVcsD R+QTE7qOUe4br9LnxUo7PievWUQqQFUZhSeIyNk4lLoKnM06q7N3o/TIm+Y7FwknazMg nmxDe79zNS35eh0awBX2DkYzj/2nS8P9FgfdsTfpgR6SpeAYnh/pbLCumq1M9ABknNU3 r9Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:mime-version :content-transfer-encoding:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:cc:to:from :dkim-signature; bh=54b+Opv9v/MoK6CAIpl5AIznzhFeGWLzbNhPazFiqNI=; b=REESTTN/5fFAqKT19s/8ymJIosKSgXsM9aRC4aqSYdT+brWp0Dd5cvf++CqdIvtzHu mAgrryqGt6/Blfx5X2r2Y+btffz8mFtB7tQE1T6bw5eurPI/n6unW9t2+bMshjOyFuCh cPRmcSbAKaHp2W7gTHja95iWW6b8MNiIvvc69J4BWfNEuhgwmiqV1neGp0QKjVg34XSO rcuamAGsc+ro7CqbPDt8AiozzJIqDX7DwjdQbwEhFzDGvADxQvF3fC9z+nM1UmFnxyPv FN3x2zH6Zy4HEVr/4QTWjo4zODk4LIUqiMubiTgNw2slRgbHYd2pL5w6DhhxN0qFigek JViQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=UcEzZ4x0; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id v84si16346964wma.79.2018.12.26.03.33.59; Wed, 26 Dec 2018 03:33:59 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=UcEzZ4x0; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 66AE55F1D; Wed, 26 Dec 2018 12:33:50 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150077.outbound.protection.outlook.com [40.107.15.77]) by dpdk.org (Postfix) with ESMTP id 6F97F5F1C; Wed, 26 Dec 2018 12:33:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=54b+Opv9v/MoK6CAIpl5AIznzhFeGWLzbNhPazFiqNI=; b=UcEzZ4x0OcbNHBYkWT5DPwulmd9jiZmeL8xb2SPK+si6YyFMy9BIY/0JcqlZzX4+ZJQFN9k3jOius0/Il6XqKAEcqQzJFpmWIr67pFaiu8Lo8W6zDZZaqH1xz2cs/ASZNS4iO2dW5w7qUsGzCP5DN+WZEZ9htR8Z1gDaWj6/vKs= Received: from HE1PR0401MB2539.eurprd04.prod.outlook.com (10.168.147.150) by HE1PR0401MB2569.eurprd04.prod.outlook.com (10.168.148.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1471.20; Wed, 26 Dec 2018 11:33:47 +0000 Received: from HE1PR0401MB2539.eurprd04.prod.outlook.com ([fe80::20ce:2eff:1e7b:9e63]) by HE1PR0401MB2539.eurprd04.prod.outlook.com ([fe80::20ce:2eff:1e7b:9e63%4]) with mapi id 15.20.1446.026; Wed, 26 Dec 2018 11:33:47 +0000 From: Hemant Agrawal To: "dev@dpdk.org" CC: "ferruh.yigit@intel.com" , Shreyansh Jain , Nipun Gupta , "stable@dpdk.org" Thread-Topic: [PATCH 1/4] bus/dpaa: fix the logical to physical core affine logic Thread-Index: AQHUnQ7dxAyq46j08ke7/Y17mXhCpQ== Date: Wed, 26 Dec 2018 11:33:47 +0000 Message-ID: <20181226113321.22279-2-hemant.agrawal@nxp.com> References: <20181226113321.22279-1-hemant.agrawal@nxp.com> In-Reply-To: <20181226113321.22279-1-hemant.agrawal@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [14.143.30.134] x-mailer: git-send-email 2.17.1 x-clientproxiedby: TYAPR01CA0228.jpnprd01.prod.outlook.com (2603:1096:404:11e::24) To HE1PR0401MB2539.eurprd04.prod.outlook.com (2603:10a6:3:83::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1PR0401MB2569; 6:w+2oNkPsRvOodKM1r5el/kzZABMAczSGKEn5lWrjkY+7eKJ7Wjf5AS+9XOf71Xv0zrAv4aQmhaYHoQCUm8v5WANR5nV4FI6+TppZ+r4my7t7tAu2bC1s5fYxW+9H+X5IeodNCflRKP+UWE/qoWpALjQrtrHZbyAVJW3JMYKvWGRMR+cmE6a3uRwtpowE/CIFxPczYRMoGZGBrHZvxbmnMYmxixo1Cpwj8Gwa1exDPCCRELzDtjLbFLeCqFC5hoyBDH8mhWscX0fPbi97Obf+cTKOTLWMn2ufgbtg/KjJgL4gVx7gFFBqY2kZDzZSDz4qYAe/EpEdxdb8N/Z7nP7452EUqv1BJTECOZQuMHxQ0gCkZHHPRjzm8qTuUmR0blLgKpKcYF7PScPAydmDeqxJlUQWrmYetiKLkL0cuZwbcznD35Pxn/klGlEjtmXc6t6uY8Iwox72ib/SRA5mBdes/g==; 5:rCuhHr16W3m3h8SM6uVwHYLyaLLapGGkhX4c6clh/yhfCSYm35dlTF86r7eDEuqmqVALtVokJTHS0lA9+YuXo5tknsMiJmK6WW04MOzjUJrMsTXlCtQHs6TZmH0zn4bGivENlRkSFL9fuE8Dyb7+SdOfAq6zNhPa1AIYpR9Em6Y=; 7:cbHqkj+jhqKeHHNckgV3AL35coojRibJOhr25fIki2SwjbPJQ0NC9f033Pq3Kyi/CX99e2GXnS3c15AaRxHEIzAXsCi7S3RZlGJDUz9NE+IUFBynAhtjdwFVvVG0Rs7rzzmvpKwCM3rq5V0kyOsOxQ== x-ms-office365-filtering-correlation-id: 9a0f5eb0-a554-433a-ce0d-08d66b25fffd x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:HE1PR0401MB2569; x-ms-traffictypediagnostic: HE1PR0401MB2569: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(2401047)(8121501046)(3002001)(3231475)(944501520)(52105112)(93006095)(93001095)(10201501046)(6055026)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:HE1PR0401MB2569; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0401MB2569; x-forefront-prvs: 0898A6E028 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(136003)(366004)(396003)(346002)(39860400002)(199004)(189003)(2501003)(5660300001)(316002)(14454004)(54906003)(25786009)(305945005)(478600001)(53936002)(55236004)(6486002)(256004)(386003)(6436002)(6916009)(68736007)(81156014)(6506007)(6512007)(99286004)(2906002)(5640700003)(106356001)(446003)(1730700003)(11346002)(105586002)(26005)(44832011)(97736004)(81166006)(36756003)(2351001)(486006)(8936002)(1076003)(50226002)(6116002)(186003)(4326008)(86362001)(66066001)(76176011)(8676002)(3846002)(102836004)(78486014)(52116002)(71190400001)(71200400001)(7736002)(476003)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0401MB2569; H:HE1PR0401MB2539.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: v09mtBHcbrZqTjM+GVhPUXqy1CmoGHbODcftMr3polH1IQI+A2LF7MdrsPJi/tlrUOOvHOQwvrhbfgpRVbqBrZS8SMqJbzFmZcIaNVCxXRrg6cyTrR86uYF7jt5c9Wshp0x7OEeiHeIvuV3vDZZRvFtJz35r/VPKzarvye8OzXvzixzzsxPfM993u8HSVBCGXPigeuuw7bVSpLZQQOsk/gsB08m9TM4f9G+EC7cJt1fqXjA+LcwSOnSCGGv6S7xyzmN5rRERT1coBpn9KX1Wt3w5MWqSgK1Up0EWGRX9YVrXrxfwJNUTv6uTFURcFq8n spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a0f5eb0-a554-433a-ce0d-08d66b25fffd X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Dec 2018 11:33:47.7083 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2569 Subject: [dpdk-dev] [PATCH 1/4] bus/dpaa: fix the logical to physical core affine logic 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" The code was treating the lcore id as physical core id. The code is updated to use actual physical core value for any core affinity logic. Note that DPAA devices are single cluster systems. Fixes: 5d944582d028 ("bus/dpaa: check portal presence in the caller function") Cc: Nipun Gupta Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/dpaa_bus.c | 41 +++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 20 deletions(-) -- 2.17.1 diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 203f60dc1..1f9e3ca11 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -250,52 +250,53 @@ dpaa_clean_device_list(void) int rte_dpaa_portal_init(void *arg) { - cpu_set_t cpuset; pthread_t id; - uint32_t cpu = rte_lcore_id(); + unsigned int cpu, lcore = rte_lcore_id(); int ret; struct dpaa_portal *dpaa_io_portal; BUS_INIT_FUNC_TRACE(); - if ((size_t)arg == 1 || cpu == LCORE_ID_ANY) - cpu = rte_get_master_lcore(); - /* if the core id is not supported */ + if ((size_t)arg == 1 || lcore == LCORE_ID_ANY) + lcore = rte_get_master_lcore(); else - if (cpu >= RTE_MAX_LCORE) + if (lcore >= RTE_MAX_LCORE) return -1; - /* Set CPU affinity for this thread */ - CPU_ZERO(&cpuset); - CPU_SET(cpu, &cpuset); + cpu = lcore_config[lcore].core_id; + + /* Set CPU affinity for this thread.*/ id = pthread_self(); - ret = pthread_setaffinity_np(id, sizeof(cpu_set_t), &cpuset); + ret = pthread_setaffinity_np(id, sizeof(cpu_set_t), + &lcore_config[lcore].cpuset); if (ret) { - DPAA_BUS_LOG(ERR, "pthread_setaffinity_np failed on " - "core :%d with ret: %d", cpu, ret); + DPAA_BUS_LOG(ERR, "pthread_setaffinity_np failed on core :%u" + " (lcore=%u) with ret: %d", cpu, lcore, ret); return ret; } /* Initialise bman thread portals */ ret = bman_thread_init(); if (ret) { - DPAA_BUS_LOG(ERR, "bman_thread_init failed on " - "core %d with ret: %d", cpu, ret); + DPAA_BUS_LOG(ERR, "bman_thread_init failed on core %u" + " (lcore=%u) with ret: %d", cpu, lcore, ret); return ret; } - DPAA_BUS_LOG(DEBUG, "BMAN thread initialized"); + DPAA_BUS_LOG(DEBUG, "BMAN thread initialized - CPU=%d lcore=%d", + cpu, lcore); /* Initialise qman thread portals */ ret = qman_thread_init(); if (ret) { - DPAA_BUS_LOG(ERR, "bman_thread_init failed on " - "core %d with ret: %d", cpu, ret); + DPAA_BUS_LOG(ERR, "qman_thread_init failed on core %u" + " (lcore=%u) with ret: %d", cpu, lcore, ret); bman_thread_finish(); return ret; } - DPAA_BUS_LOG(DEBUG, "QMAN thread initialized"); + DPAA_BUS_LOG(DEBUG, "QMAN thread initialized - CPU=%d lcore=%d", + cpu, lcore); dpaa_io_portal = rte_malloc(NULL, sizeof(struct dpaa_portal), RTE_CACHE_LINE_SIZE); @@ -312,8 +313,8 @@ int rte_dpaa_portal_init(void *arg) ret = pthread_setspecific(dpaa_portal_key, (void *)dpaa_io_portal); if (ret) { - DPAA_BUS_LOG(ERR, "pthread_setspecific failed on " - "core %d with ret: %d", cpu, ret); + DPAA_BUS_LOG(ERR, "pthread_setspecific failed on core %u" + " (lcore=%u) with ret: %d", cpu, lcore, ret); dpaa_portal_finish(NULL); return ret;