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 41A66431D5 for ; Sun, 22 Oct 2023 16:25:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B2A340689; Sun, 22 Oct 2023 16:25:03 +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 CAA4240685 for ; Sun, 22 Oct 2023 16:25:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sz+lntaZtiwAF4oQVeYGwF6lHqJ3mvkVLZXBFEzhKUocSk1Ee1/GEfmXfAH15zOadEcsUJ1buvFu+h3o87brc+TlJOasSt0bo1Oa5HvvkppdgMjrTuJSehJsv2yIEBlAod7M9J+KV5oRNbjrvAsfOBFCtHxHIn659LgCSNzlPqgi4p8b1Cuvj1Y/itFO2+EuLa6bWHpU1A29o/HgrEKEnrwkLzKE0AYy9Pufdb9AATgSbiu5LjEC+4btypbeQpN3jxj9b5LOPpSWAesQkcobqB7+f7MnTGGFdJrh4zgTQeG47RK0Mvpsl7vvsHW/sgvkrcrxg9EeciDRwz8VO7Uqgw== 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=Wy9CNgr2pZMkRx7hK0M3JYl5SwyheE0CrlK+PyJdyBg=; b=X2fnGjmMo1ZFdyPDEdGvxYteilpXX3piuROnK3JWSXlNQt+Q8XDLvvZJhTG0iiAUej9HE9R9UlGpWgasn4Od5zl6ZExGhDhc4+7bsk2vcDIy9+eCZP9i4ianFDCRDTmW9bkvySA99tidIspxxJKCDdk6clPP2KbisTvidp23T1iY2bZ64UheBiFqspEHtbzzDHRRzesKV+vB02J2y04p+e5Na5LvFG/sdEI84Bzxe486L4URi9+UPlIIRKDDJODdaxDhEaMpvoU+wkISLyeqb7V6kX5+cLAA//GsPJBKbhEcV53gAXMAcgBifvKAHmMgkZSFZRQooHMBSXAcdrVmYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=gmail.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=Wy9CNgr2pZMkRx7hK0M3JYl5SwyheE0CrlK+PyJdyBg=; b=ZsK7ORlPdDC5Cw1zs1dqKk7e+tANk+cp1fkeGth2+GfkezGaqE1njIQU4mlP3j4GOfGB5GtbItvc8dFYBarACJQzqkqRTQbbWF2Ld1C2drW+q4Z6HTpJaHrPcPkhxo79u9gSXoNRdd+H7mPaj7mHwx7LnOfBZ9x/PPFLaIniXcqkG7ULR2nLSddxzFYJ8DbpaI/Rfhi9fEjJvWcAc3pPZ3ye6TetYyN8yr6p5xoWQowzs7+T6L6RVGWCPVsXduAyYOa+3O2E1G26PjNsTqvUdiYVe2GmDOFakjswmIKwoCmD99RoqEOky/gumYohHP05nq/xLV30hsgkgYvEZKxCqw== Received: from MW4PR04CA0360.namprd04.prod.outlook.com (2603:10b6:303:8a::35) by DM4PR12MB7717.namprd12.prod.outlook.com (2603:10b6:8:103::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:24:58 +0000 Received: from CO1PEPF000044F2.namprd05.prod.outlook.com (2603:10b6:303:8a:cafe::be) by MW4PR04CA0360.outlook.office365.com (2603:10b6:303:8a::35) 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:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044F2.mail.protection.outlook.com (10.167.241.72) 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:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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:57 -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:55 -0700 From: Xueming Li To: Levend Sayar CC: John Romein , Elena Agostini , dpdk stable Subject: patch 'gpu/cuda: fix build with external GDRCopy' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:20:50 +0800 Message-ID: <20231022142250.10324-22-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: CO1PEPF000044F2:EE_|DM4PR12MB7717:EE_ X-MS-Office365-Filtering-Correlation-Id: f4101465-f076-41b6-a6e2-08dbd30aabae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FmclpgF2KxprL7vxMjZHkqD5MLJcn213LDGIHrZe/4w1wK6McqGdahT9oii0/hz9x5fkOnYxvpIa4ysUDx8/ARTPCzySuOW/0a5sgNVQVfPxUb1otE2daXdtWGi39Nbh8V5V64k4zHc622zyPF4ftmfV8KpM3JAI7GdSWta9T4ZX+DmPN7jKJnOWW1LZ0ddnfhIP5NBxikRaF+VGJ+KxnoGfqszNIaFQAYydAaAdb+TiY5t4+ZpA9p3u9JzItHfybjBQx1VIjmtKogDorG2/9eDDgxP94NNzNSaglJargYInk+q9lVv13UsdpEv1mHxQigmwmF8ugODXZ1MYgReTFBkWRXrecpooFhWT4cD07KxgPNGCIDBRDSA1d912ZnDrOjxNc3+bm02yMkgoNfSmIJFrbzprm2088x7JGx2AVySwUkVdCKXkl5iQIlPbMlBc33+or4igFu89fIZnC7Laza/irl5N9i2lO8rWrfIwaUoi2gee6ML51x2W+5UXfksRvevxf3Rn8vTf1GAG7gK3uCZtZDFl/33T6TkM22Za/PIRjCmhHqGj6zGkpJo5K3XkWhfsvRbuBYc2HF9I8AHGQaA6DXOIumUFU9IJXWUugnkRPR4lVs4qpVBfu1HoDxaz1Z0yI8/3pGPbZKzFxselqkx2/0GZH7uuxXFK4EOK+FbfvBjmQ6SWefDh4Xu5rwCJYwwIeS6wDWTnBRQBwWw4+wgx0z/z0PJ0SdIgRvPxWV3wsqiePviHLcSY5+StghUDsmcUTaYmWkGafo8dKE+vMYu3EWu0hPf1vk1jrVCXT6Y= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(136003)(396003)(376002)(39860400002)(230922051799003)(1800799009)(82310400011)(64100799003)(186009)(451199024)(40470700004)(46966006)(36840700001)(478600001)(70586007)(966005)(70206006)(53546011)(6666004)(7696005)(5660300002)(6916009)(316002)(54906003)(55016003)(40480700001)(36860700001)(82740400003)(47076005)(7636003)(1076003)(426003)(36756003)(6286002)(26005)(4001150100001)(40460700003)(2906002)(336012)(41300700001)(356005)(16526019)(2616005)(8676002)(4326008)(8936002)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:24:58.5447 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f4101465-f076-41b6-a6e2-08dbd30aabae 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7717 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=01d3e3c456c9665b9e511bcebd849e85073f7c6b Thanks. Xueming Li --- >From 01d3e3c456c9665b9e511bcebd849e85073f7c6b Mon Sep 17 00:00:00 2001 From: Levend Sayar Date: Thu, 3 Aug 2023 19:25:12 +0300 Subject: [PATCH] gpu/cuda: fix build with external GDRCopy Cc: Xueming Li [ upstream commit cda3d17609c2cb81af67d5babbd0c1702b503fca ] If gdrapi.h is available, meson sets DRIVERS_GPU_CUDA_GDRCOPY_H as 1. This causes gdrcopy.c build to give an error; because compiler can not find signature of getenv. stdlib.h is included for the definition of getenv function. Bugzilla ID: 1133 Fixes: ca12f5e8a7db ("gpu/cuda: mark unused GDRCopy functions parameters") Reported-by: John Romein Signed-off-by: Levend Sayar Acked-by: Elena Agostini --- .mailmap | 1 + drivers/gpu/cuda/gdrcopy.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index bde21e6e3c..e2855454c2 100644 --- a/.mailmap +++ b/.mailmap @@ -646,6 +646,7 @@ John McNamara John Miller John OLoughlin John Ousterhout +John Romein John W. Linville Jonas Pfefferle Jonathan Erb diff --git a/drivers/gpu/cuda/gdrcopy.c b/drivers/gpu/cuda/gdrcopy.c index 322a5dbeb2..bd56b73ce4 100644 --- a/drivers/gpu/cuda/gdrcopy.c +++ b/drivers/gpu/cuda/gdrcopy.c @@ -6,6 +6,8 @@ #ifdef DRIVERS_GPU_CUDA_GDRCOPY_H +#include + static void *gdrclib; static gdr_t (*sym_gdr_open)(void); static int (*sym_gdr_pin_buffer)(gdr_t g, unsigned long addr, size_t size, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:35.219703500 +0800 +++ 0021-gpu-cuda-fix-build-with-external-GDRCopy.patch 2023-10-22 22:17:34.156723700 +0800 @@ -1 +1 @@ -From cda3d17609c2cb81af67d5babbd0c1702b503fca Mon Sep 17 00:00:00 2001 +From 01d3e3c456c9665b9e511bcebd849e85073f7c6b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cda3d17609c2cb81af67d5babbd0c1702b503fca ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 1620455ef2..755a4da2cd 100644 +index bde21e6e3c..e2855454c2 100644 @@ -27 +29 @@ -@@ -664,6 +664,7 @@ John McNamara +@@ -646,6 +646,7 @@ John McNamara