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 AA58D431D5 for ; Sun, 22 Oct 2023 16:24:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A474F402F1; Sun, 22 Oct 2023 16:24:47 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id 50C91402C4 for ; Sun, 22 Oct 2023 16:24:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ErVlimE9vfCTI15dJEufpGT4wjcdsEqr4s9ZVoSZ9xgBKvPd/k0ocHi/Byvp73F9qN45bVaPBUM7D3y83OvyFSn65TAjqbfq2GClI8dlsyULdTDxCINaWb5zkWHZdBx1XYO2TTTiIJukg3fAReD5F+kUCb+/Wxq9PrUJspsktJ19HtABOx+bPqHH9TyqwVVeqcQZTwweqjnfCySBHsVDOLd5ky1ttjAftgHRURV/5GtoJWegXfVF9oaQ1o71fzCvzy9piHqBGic4dBpKbCDP6Vd3cUk1Kqn973Er0uWEj/+yaJ3tQ3BRs6lvRqH7W6kKbWu3h+t252cmt6fvs2v5fQ== 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=45CIfgqBi5HHfIlPPLEMGqodXn15JLyY6vhvn2Jo2+w=; b=VLMxTNN0L+SYis6/Zq8CgACWO7OWTM0dmpqJ5EDoMObSHYWM78NPYX/jBi9e/XX9A/Ms0Zyj9sGFtVqqUBOF0BMailfOi3QNhhajqJjENN6k1igs9nNiJhJTbDT848E+faPZnuJvIDeXknI1X1cXl68dCL6/IFiKcBsVDBozMvsd41bTtL7byZU7eoh2RAOc3p0eKE8GV3hboFN25iNbH3D3h15w5t3e5yiYf4JgLp20t+98FGi2xCiuPEGY7S657cZVzMn88SsC1xZSNVZQkKVJ+Pvnh4Bpy7GFbI0Zr53L1PajkPVbP12jxhGyblpzPRkVZ8bL52XjbkaqZxc8EA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=microsoft.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=45CIfgqBi5HHfIlPPLEMGqodXn15JLyY6vhvn2Jo2+w=; b=bj3UIh8cM6EyrrsRH8ue63O0Hb9PUAvJjW+aLz3rYd6LwbJaQMbzz3V3ispibeJKC0xOIRsvg9DJ0en/M6HSeEWzf+rlfYXPtOqikWIPwxKG9WZ+eE73ibDgeKipzTHzpg9xFrr4crT8gJL8oVDG4VOPRbFLr6gwa8SOkNBMyg8Y4mO4i8U1GqSImCjgzqu38XW1tMGBpo0e1T02JXYPBh3CbdnusGmfYsLsUpWVz3d864MePt5iOm61LSry3UM1mCUR+fS9lO0NiMhE3hgza9AVis0LWZR+CGuuZaOJQdo1u2cl5fDuQdPqjqxpLRHr7DO4wWBlGEp77VB7goR2+w== Received: from MW4PR04CA0107.namprd04.prod.outlook.com (2603:10b6:303:83::22) by PH8PR12MB6891.namprd12.prod.outlook.com (2603:10b6:510:1cb::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.23; Sun, 22 Oct 2023 14:24:43 +0000 Received: from CO1PEPF000044EF.namprd05.prod.outlook.com (2603:10b6:303:83:cafe::69) by MW4PR04CA0107.outlook.office365.com (2603:10b6:303:83::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Sun, 22 Oct 2023 14:24:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1PEPF000044EF.mail.protection.outlook.com (10.167.241.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:24:42 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:24:30 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:24:28 -0700 From: Xueming Li To: Wei Hu CC: Long Li , dpdk stable Subject: patch 'net/mana: enable 32-bit build' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:20:45 +0800 Message-ID: <20231022142250.10324-17-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EF:EE_|PH8PR12MB6891:EE_ X-MS-Office365-Filtering-Correlation-Id: 39673c64-6fde-4ad9-c772-08dbd30aa262 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /vMWpzLB/9gJrSMpdHT+5HHgf7bb0HrQV84HgfxFAUj0yiIRnSQKj/xa7a83V54alTxjjtUWhvS0at6IIRxBBS7LqYUQsXbkudTPVE5l1TcbZ/IqSIbTHccJR7sIA5k3stdAqlPOYgLRZQg3kRKQWXWO1t+3R6pLvu/Vb4yvG+QgFJbA1qO5dUFhl1I7rL8F7dtlhP4y2H+bZtuXtOZUcIndmEt3HOTSrH7nuERwLYvprA3XAA0WJ7pnVqwGVpj9QykmBx61bXgb1Zt2qmB0N4uKegz93SIwjYEaDLBjf2NIuHwmQPSrgTktnKAuJER4sCqhAyooh0cNQvgw80M8m99KyWsmUUbFFrbpoAjAB0TrK7OmQ3s+KkahNMrC97djynsIsUYPn9SJn3eODVDH1OGlPhkYGfIpo9d0fvhDcIBku2Zz3sLBp0pzOHdnnIoAueSiqeAxiUNv27M11nYYdyMXS1u7zr0Q3w4ACKBfbZ9ZSRwmX97mjGobOv/z4446sLihUZldRU3aGNNnSJV9sW7FCthnxvBHYvIEyZcHIj2XHWaWHBeJa+GJy1X6zzrVUvyaXpINfhXtsgy72bzwoFRaszuQzUdbcQXF8rSCFZbSy8X739BI+9J538rGBJ8ozzKqJbmXx1WvQByzhascjzSRcn783vcUVtsORovnpvbUfAU1y4ISRukNPnT6pO4fFdoCSCCYkx1xYmlptRmNpv3IZnxz7FXfvP2s5veiaLRYkZjeap1lgpMwSmo9MtDSqKI6eZhzNyR10dmcSic5iO8275z5CeNhpIG/Qhnh2Kk= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(396003)(346002)(136003)(39860400002)(230922051799003)(186009)(1800799009)(82310400011)(64100799003)(451199024)(40470700004)(46966006)(36840700001)(36756003)(40480700001)(55016003)(316002)(40460700003)(6916009)(1076003)(86362001)(26005)(53546011)(356005)(82740400003)(7636003)(36860700001)(70206006)(83380400001)(4001150100001)(7696005)(2616005)(6666004)(336012)(426003)(6286002)(16526019)(966005)(54906003)(70586007)(41300700001)(47076005)(4326008)(5660300002)(8936002)(45080400002)(8676002)(2906002)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:24:42.9010 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39673c64-6fde-4ad9-c772-08dbd30aa262 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6891 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, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the 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. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=e9ead33c9da6f7ebc0bab4bf8aa2954059fe9e0e Thanks. Xueming Li --- >From e9ead33c9da6f7ebc0bab4bf8aa2954059fe9e0e Mon Sep 17 00:00:00 2001 From: Wei Hu Date: Thu, 21 Sep 2023 08:34:41 +0000 Subject: [PATCH] net/mana: enable 32-bit build Cc: Xueming Li [ upstream commit 74decf3bf03cdd5a42e85085f2980e8d058c299c ] Enable 32-bit build on x86 Linux. Fixed build warnings and errors when building in 32-bit. With this patch, mana will be able to build into 32-bit. However, another patch for mana short doorbell support is needed to make mana fully functional for 32-bit applications. Signed-off-by: Wei Hu Acked-by: Long Li --- drivers/net/mana/mana.c | 2 +- drivers/net/mana/meson.build | 4 ++-- drivers/net/mana/mr.c | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c index 7630118d4f..896b53ed35 100644 --- a/drivers/net/mana/mana.c +++ b/drivers/net/mana/mana.c @@ -1260,7 +1260,7 @@ mana_probe_port(struct ibv_device *ibdev, struct ibv_device_attr_ex *dev_attr, /* Create a parent domain with the port number */ attr.pd = priv->ib_pd; attr.comp_mask = IBV_PARENT_DOMAIN_INIT_ATTR_PD_CONTEXT; - attr.pd_context = (void *)(uint64_t)port; + attr.pd_context = (void *)(uintptr_t)port; priv->ib_parent_pd = ibv_alloc_parent_domain(ctx, &attr); if (!priv->ib_parent_pd) { DRV_LOG(ERR, "ibv_alloc_parent_domain failed port %d", port); diff --git a/drivers/net/mana/meson.build b/drivers/net/mana/meson.build index 493f0d26d4..2d72eca5a8 100644 --- a/drivers/net/mana/meson.build +++ b/drivers/net/mana/meson.build @@ -1,9 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2022 Microsoft Corporation -if not is_linux or not dpdk_conf.has('RTE_ARCH_X86_64') +if not is_linux or not dpdk_conf.has('RTE_ARCH_X86') build = false - reason = 'only supported on x86_64 Linux' + reason = 'only supported on x86 Linux' subdir_done() endif diff --git a/drivers/net/mana/mr.c b/drivers/net/mana/mr.c index fec0dc961c..b8e6ea0bbf 100644 --- a/drivers/net/mana/mr.c +++ b/drivers/net/mana/mr.c @@ -53,7 +53,7 @@ mana_new_pmd_mr(struct mana_mr_btree *local_tree, struct mana_priv *priv, } DP_LOG(DEBUG, - "registering memory chunk start 0x%" PRIx64 " len %u", + "registering memory chunk start 0x%" PRIxPTR " len %u", ranges[i].start, ranges[i].len); if (rte_eal_process_type() == RTE_PROC_SECONDARY) { @@ -62,7 +62,7 @@ mana_new_pmd_mr(struct mana_mr_btree *local_tree, struct mana_priv *priv, ranges[i].len); if (ret) { DP_LOG(ERR, - "MR failed start 0x%" PRIx64 " len %u", + "MR failed start 0x%" PRIxPTR " len %u", ranges[i].start, ranges[i].len); return ret; } @@ -72,7 +72,7 @@ mana_new_pmd_mr(struct mana_mr_btree *local_tree, struct mana_priv *priv, ibv_mr = ibv_reg_mr(priv->ib_pd, (void *)ranges[i].start, ranges[i].len, IBV_ACCESS_LOCAL_WRITE); if (ibv_mr) { - DP_LOG(DEBUG, "MR lkey %u addr %p len %" PRIu64, + DP_LOG(DEBUG, "MR lkey %u addr %p len %zu", ibv_mr->lkey, ibv_mr->addr, ibv_mr->length); mr = rte_calloc("MANA MR", 1, sizeof(*mr), 0); @@ -99,7 +99,7 @@ mana_new_pmd_mr(struct mana_mr_btree *local_tree, struct mana_priv *priv, return ret; } } else { - DP_LOG(ERR, "MR failed at 0x%" PRIx64 " len %u", + DP_LOG(ERR, "MR failed at 0x%" PRIxPTR " len %u", ranges[i].start, ranges[i].len); return -errno; } @@ -141,7 +141,7 @@ try_again: mr = mana_mr_btree_lookup(local_mr_btree, &idx, (uintptr_t)mbuf->buf_addr, mbuf->buf_len); if (mr) { - DP_LOG(DEBUG, "Local mr lkey %u addr 0x%" PRIx64 " len %" PRIu64, + DP_LOG(DEBUG, "Local mr lkey %u addr 0x%" PRIxPTR " len %zu", mr->lkey, mr->addr, mr->len); return mr; } @@ -162,7 +162,7 @@ try_again: } DP_LOG(DEBUG, - "Added local MR key %u addr 0x%" PRIx64 " len %" PRIu64, + "Added local MR key %u addr 0x%" PRIxPTR " len %zu", mr->lkey, mr->addr, mr->len); return mr; } @@ -266,7 +266,7 @@ mana_mr_btree_lookup(struct mana_mr_btree *bt, uint16_t *idx, return &table[base]; DP_LOG(DEBUG, - "addr 0x%" PRIx64 " len %zu idx %u sum 0x%" PRIx64 " not found", + "addr 0x%" PRIxPTR " len %zu idx %u sum 0x%" PRIxPTR " not found", addr, len, *idx, addr + len); return NULL; @@ -316,7 +316,7 @@ mana_mr_btree_insert(struct mana_mr_btree *bt, struct mana_mr_cache *entry) uint16_t shift; if (mana_mr_btree_lookup(bt, &idx, entry->addr, entry->len)) { - DP_LOG(DEBUG, "Addr 0x%" PRIx64 " len %zu exists in btree", + DP_LOG(DEBUG, "Addr 0x%" PRIxPTR " len %zu exists in btree", entry->addr, entry->len); return 0; } @@ -340,7 +340,7 @@ mana_mr_btree_insert(struct mana_mr_btree *bt, struct mana_mr_cache *entry) bt->len++; DP_LOG(DEBUG, - "Inserted MR b-tree table %p idx %d addr 0x%" PRIx64 " len %zu", + "Inserted MR b-tree table %p idx %d addr 0x%" PRIxPTR " len %zu", table, idx, entry->addr, entry->len); return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:35.048700300 +0800 +++ 0016-net-mana-enable-32-bit-build.patch 2023-10-22 22:17:34.146723700 +0800 @@ -1 +1 @@ -From 74decf3bf03cdd5a42e85085f2980e8d058c299c Mon Sep 17 00:00:00 2001 +From e9ead33c9da6f7ebc0bab4bf8aa2954059fe9e0e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 74decf3bf03cdd5a42e85085f2980e8d058c299c ] @@ -12,2 +14,0 @@ - -Cc: stable@dpdk.org