From patchwork Fri Apr 19 03:12:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 139517 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 1F39343EA9; Fri, 19 Apr 2024 05:13:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4C314067B; Fri, 19 Apr 2024 05:12:58 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2093.outbound.protection.outlook.com [40.107.237.93]) by mails.dpdk.org (Postfix) with ESMTP id 0C9C9402E1; Fri, 19 Apr 2024 05:12:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZdLKvKCiDMm3G7H7rx2Rr6xDRC6liO+ra8GtplNCBQnGJR67HxeFdC6IvX2X9WFkp1KISyqx0oF1MAcuA/9II6LeAJYCqJkilTLY2SmF11JS7cbGwcDHUmE2tcWLENGuLuFbkooRoy3iqXSaXS+KEbuh79K0rGP415F4/kGaenOyh+ckTBvj6g2psa/xer4tJkzApmpao5fLpH6j5NDwgZWSe9rTHmXeNfsPN5NZQex0ZSF53UEhKxHz0Asj1IYyNvbceZChzKlJJclvz8eeAJPCWQPtMYe8goB4nwYXTzXzLCTkIZMoN3/KtKlq8vVSBv+lMBu9P5idw44lXbJHaQ== 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=+XFsOUIpDJOabUFDJrulPSjJb4fVEk763f6hmQD4NNk=; b=chXq48s8qt7Q+FspX7Rd3gLRXc6BblC2WuOBVEI31cHhCWNS1jQWxheys8eKTlkvUkQH3UykV/GH5lOXlc/31jKd31FuoSWABETYlRNqHc04IiPS3E+JqoDtMthVbjK5R9OfeeXWi3S/iXNSElqU/T0FOa10UintAsVdR9v+hxT+vGBDc5Q6+3zxQdvn0zy/uGYaMcx0wv8Za+S4vx7cZCCJ5TZWyGget/5iE98xvNGAJ6nkuDSpasL7v3VyUsezBEgZszSzUDeieUTNSWrbS/aiNHbnJjlgiiSNGF4+TRe5hpHECP3K2gycmNIGNTYImJ4wDAZ5pFSHzXXQTa1IwA== 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=+XFsOUIpDJOabUFDJrulPSjJb4fVEk763f6hmQD4NNk=; b=sTLZWJ3RZv4jSnsAD2a3TKOe9BqxV3wwGL6Vswdg2y6ALplprp8iKASTQs0YZXDsDEcG+YxX4DLqKulPYDh7FS+ZDm+pDuHcM7r7dvWDc9m3AiVrRBw2JGP2GqNm90M9uXM/d8jhllYpl7sGNAJM0x7ANV5sKUR5kLQOBBjxbOY= 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 BY1PR13MB6310.namprd13.prod.outlook.com (2603:10b6:a03:52e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.38; Fri, 19 Apr 2024 03:12:53 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7472.042; Fri, 19 Apr 2024 03:12:52 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 2/8] net/nfp: fix configuration BAR problem Date: Fri, 19 Apr 2024 11:12:20 +0800 Message-Id: <20240419031226.1191069-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240419031226.1191069-1-chaoyong.he@corigine.com> References: <20240419031226.1191069-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0044.apcprd01.prod.exchangelabs.com (2603:1096:4:193::8) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BY1PR13MB6310:EE_ X-MS-Office365-Filtering-Correlation-Id: 1092ee2f-4874-415d-cbbd-08dc601e99f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w89l5aAYJN5Y3EW7u64A1OXXay0Po/VFUXqpTq3bjkcicF/U8CMCF+g7wPtdBS3MelpEPKxcLiDvYnIa3LZk+//JiCtihgIfOgzba9Mr6l7KHotkdWtgTWAi6CsXECR4+qucd3zBisds2smNGDtb9fz0+OIeqL9BYltoaAieeFwXLPs86ODKn2FsLjAXpCDPFYoIjLkQGFYff846SQWLQcLbXS6g1YeAuggpk39Wi9iUc8qUq8SDlH21kbRZMLWKp1bWAxnPjhrcG86wX3LLf3bKXchFYz+bqRxJYK2p1GXmCFKtOhjfYZLW4c1w2jkSGy0mTt77i1royoB8AuRSV45vlY5iFiKoV7S7fZHYbKRGWvl8dCaDLSLNYR94FeqZJmMpzqxZbfjqU/omGsZpoqK6EgmRjIHtUCqS+abVvnDeEmVutmLIJOfHeHsltEbCx9MO/gBdNfrLCn67zJDlzPrZaTdTcteh+UDP/BtOSRiCBOyoF/UPrkXNIof14y8q8Nw5XkOrBelNqPgrPFeHr+STovGpLMrWs/CQPaF88wVEtkZliESyTEstaec874cdqJwYfLfaJVLDzisDcaQnuQ41y9P0DabxNRJXFE3ccOAoIURhNtDjkCAx0Pw7LTDV+/JKvXRt04+hlt87HIhKRQVcvPJvMSR1b4FgwVsGdS+MHP2dQpdMEKBWl1xWbuOvTJYGcmCVEEdSABFNuMVSzC2FUvPYvd25X+CFBjLG2ZnUU7e93V0eik8H+YQfxvyVUkd8alhrTpJjKbhVuz1q7EmYxqjb0XGyUDd2/i4Fn1HkPOIPDxjo7RMaj1MgxWABDJa1W3R7Pw9jY+mU8bHhAB8oHd4sXoV4s/VgIfbDfb1DxfoJCwC2krmvCI5ZxeayPrShRcC+xvEuCQ3xnf9oPkLsFSKoTSibmB2dTd/23N8nT+4VFx1mj1anKkmEppDdQZzlty2R1VHqTId2mVgQW2jpoz9EZetsOD805NTGgEjUYe7AAfLxy89BjenYInqUMrJuJbQCX4Ngbweovk3IuwZkhXJIw926kVc9z5ybyrRpjUrJenmWaA4xmPb8sxxWAOvi/ZAlV2if8emaWX+GsayGi4W6iMcpXJxp0vo8D7ogtxbL1jsFRk9/JLvvx2ecLuxWSdOWLBVTcIak4+qLXNFYAjyKt/PmrIfmBcuHGycvTw3tffSdZZgC1KIBVK/kgXLM2g6XOk9ERbKSDjmJI+ktkH6Ngt9BmQgYxwG7cpbmsrO1KeZjUweXy7Gevg8Q3uIQ2lYfXmPcl335iRpekVUln8Og08+S69luXHLjgg0aaX9rGYg0bxMnepGyia8UmegKfvWnHPr1iG7135Q3dg== 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)(366007)(52116005)(376005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wiwfEJX2I0QKQaQDdvtzTUEA5GoTuGE7fUUmsCGmSEyBHCQVC3qcB8RtpN7azh5aXcuJ4c8KzC+R/+7g+eY91kuhGNtdE79FvU7za7nbsu4NiNDYi9Jdv47ZFaF/tjgl5fXPcMiXtuy8zFQ9hzAkWTY/p/xgsr54g7tx4uJ5sosG7MAs0aUVfgOVPtE/ncp8I/UM2w9SBEUDe/ZBR7jRJwbLW4XbRbkv2ffHY9vQ6lQGzP3fS8WjbR0PCi9Cd0ii4bB/DgB7OOEJUPZ+I/etiX1DmcMc/js3xPM5oPypq5cgOUUb3yBa32zoeAMLtM2y1IjCAHVXrInZk2q2ep+VhN1a8hJaqbC9bxDGXOQ9bTdQWqcVrJvoTQ0kQb7ZA1cG/cePZjqsPbJQpLoczUZv6BlGW5Yuo43sMaGvaW6bUcF+PQ+bsNxySSx5xJo7m8oZZ62ek9/eASHj5wdkXcA6D5rjtROb/mxgxhJNDNFrxUGs5cxUyzNPnkysvN9n5cVxsdc8zqmYCVIEM0Y7fGctNnUEY7WBXzQxuLieqY4CRluIu4L0/Pypq+Yeh1nATPm6VuFq9BWMit+VwZfTKUOAPvxmI+9Ogjwfs7Tqr6gWEUgr+PXRpttPhad592ZFMW2jHcyavmmZ4RiYUpvEmfQGsaKQvePifGqoNxe2sO1UpkIsJv8fRfzL2oEdp/fCcWBwvchptBLExaMTZe5qjCM/PIa0++7YfqMKnZ90B50pRSjZh4FjtIig2CDnCYbAIGZ8XS8f8zkwHfhYlcFZ+cYspltUBw5wyLLHkQSuVW2cyDU5IzaU6ts3ROYHZkR4sCpOM3pIt1GGPQNp6ClbIV9lvkfJmZFQBAiXSp2LLBSzSq1nb59RTXfBWdYNWGlb8GG6/tvXPNSaiFggkv4xuyP8ZVH0JHLlTsrH7PKiUkqfTw0ykYPdHfxx7CzzR/QJtxWZ47D9x4cePHAyHSc2Z1/hy6S2a+fxWSsIS8aa+NLK4iFAfqxM05A+9AWr8e+BIuTuNLJA8u1uotuCfMziwDlE0OU7vQ737YgRf7XUN2Ygkv/n3G/vu3NS1xJ8y9ZuqVD4jIF4lkovUoqpwpMJT/CNCuO1KxpexLRuuqr+0Z5g5S9ICWEoRAXF9oowLxsv1dPfCNY0i8SbGWl31U/lOG3WeJHTExVIz6BFTRlB/0xzAFtaCt62jaSvSYIQYAXsAyl6FY+e2hnt3sP7XTFmYg5hoTo9+0iYT3IscwJbpTZkH3K5zOH4XSHPP90raEsIkMK265AqWjOXib5oAvmy6g7tmWUwRl9TzpOrMTbQDKw9nbRFmKpB6ZduCyI12Xl+HCOtrf2E/H1S9m/+dhOty9kBKYUH66CBaCCqtmKrM8LSe3GqJ3apP2Y+sChgAy+qUNiIEHVaBcYGSB853wLTyJsHztldaRSJcTDVtYfzUjA/pJb0RezEoMVUEZX78J9TRPAHZ3CDVgUdDudiOAHIDAhAF0BvhpAeLH0FhgDqrM+Azk7U2xQutKhHRRdz7jIOWah8Yk6erGaWyjsJy0RexStUpRygUON+svp9rhcgQAr1qfIncJiaKqjqIJ7i2Nqb1fsWlhMqwziN1TP2Sv6ZLFQRuA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1092ee2f-4874-415d-cbbd-08dc601e99f1 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2024 03:12:52.9091 (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: 71tTtzlNF2e0DqHTVwL9gUdIQuyYSc0gVsPO8rwT6lI35nKOfutl/yHIL4ZjxcQcZ1vHekWb5iBGJxu7kioWvQjHc9EvelC6D7BroUolnSw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR13MB6310 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 All the configuration bars are sit in an array, and the initial logic sort all the configuration BAR from small to large based on size and index, which result all valid bars are behind the invalid bars. But the BAR alloc logic search this array from the very beginning and only try limited times (equal to the valid bars number). It's ok for primary process because which has enough valid bars, and finally it can find one to use. But for secondary process and run with igb_uio driver, the valid bars are very limit, and it can not find one, and the logic will fail. Fix this by drop the sort logic, and search the bar array from the end to begin. Fixes: 1fbe51cd9c3a ("net/nfp: extend usage of BAR from 8 to 24") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfpcore/nfp6000_pcie.c | 34 +++++++++----------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp6000_pcie.c b/drivers/net/nfp/nfpcore/nfp6000_pcie.c index a6fd89b6c8..ef1ffd6d01 100644 --- a/drivers/net/nfp/nfpcore/nfp6000_pcie.c +++ b/drivers/net/nfp/nfpcore/nfp6000_pcie.c @@ -263,19 +263,6 @@ nfp_bitsize_calc(uint64_t mask) return bit_size; } -static int -nfp_cmp_bars(const void *ptr_a, - const void *ptr_b) -{ - const struct nfp_bar *a = ptr_a; - const struct nfp_bar *b = ptr_b; - - if (a->bitsize == b->bitsize) - return a->index - b->index; - else - return a->bitsize - b->bitsize; -} - static bool nfp_bars_for_secondary(uint32_t index) { @@ -383,9 +370,6 @@ nfp_enable_bars(struct nfp_pcie_user *nfp) if (nfp_bar_write(nfp, bar, barcfg_msix_general) < 0) return -EIO; - /* Sort bars by bit size - use the smallest possible first. */ - qsort(&nfp->bar[0], nfp->bars, sizeof(nfp->bar[0]), nfp_cmp_bars); - return 0; } @@ -466,16 +450,18 @@ find_matching_bar(struct nfp_pcie_user *nfp, int width) { uint32_t n; + uint32_t index; - for (n = 0; n < nfp->bars; n++) { - struct nfp_bar *bar = &nfp->bar[n]; + for (n = RTE_DIM(nfp->bar) ; n > 0; n--) { + index = n - 1; + struct nfp_bar *bar = &nfp->bar[index]; if (bar->lock) continue; if (matching_bar_exist(bar, target, action, token, offset, size, width)) - return n; + return index; } return -1; @@ -493,10 +479,12 @@ find_unused_bar_noblock(struct nfp_pcie_user *nfp, { int ret; uint32_t n; + uint32_t index; const struct nfp_bar *bar; - for (n = 0; n < nfp->bars; n++) { - bar = &nfp->bar[n]; + for (n = RTE_DIM(nfp->bar); n > 0; n--) { + index = n - 1; + bar = &nfp->bar[index]; if (bar->bitsize == 0) continue; @@ -508,7 +496,7 @@ find_unused_bar_noblock(struct nfp_pcie_user *nfp, continue; if (!bar->lock) - return n; + return index; } return -EAGAIN; @@ -561,7 +549,7 @@ nfp_disable_bars(struct nfp_pcie_user *nfp) uint32_t i; struct nfp_bar *bar; - for (i = 0; i < nfp->bars; i++) { + for (i = 0; i < RTE_DIM(nfp->bar); i++) { bar = &nfp->bar[i]; if (bar->iomem != NULL) { bar->iomem = NULL;