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 4EE72A0C41; Thu, 18 Nov 2021 13:34:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B4F840687; Thu, 18 Nov 2021 13:34:59 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2083.outbound.protection.outlook.com [40.107.220.83]) by mails.dpdk.org (Postfix) with ESMTP id 34EBE40395 for ; Thu, 18 Nov 2021 13:34:57 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AfTjlfYnyHphfSewgQ2fehXwWEjsTE+hoLAAGmbMTXnYK+zTZfqdFP8n7QCpZf7F/O6wqHR8METu/+1ijJVUIfAwNMQyZkmcdd8b86w6UnaYsFuqOq/jFQgAdBw5MdcpTTMIcoETZGM4UYPBjmo+ZANCXQ7jSuzvBL3vPeTtpCQyanLJGHr6QXRInFJUBDsNB8clV3WSzReYFDFHLTMyi+D4OP5eY9iLLDYt8S+X2HRE5le/t71cBC50TyoY7fe57u+X4K1eP+zrAFIrn+APSF+I3UbpGf61nT4A6adYUbxuMhGs7s2A2Eylx9zZSYPoUkrx72+j0gQaw0O0ljR4Fg== 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=/iZ/l6wToydgvUh62+fPRvtahoWnqwWspDJGqvOnyOo=; b=jdTVS3zcSbT5/6mwr/ps/AwxE1rOrn1O9QNqKfXGLibQbFf4GZSCK/IzQvJgdsuLQBJ+gxzINsF56lOZiz9CY1bP0uf+actSb9P3fHCOhQffsrAP1FINiUqzSjntqLKz6SVCziPTyjLWlRUsfXlaFIa6egHJ/EpMdONNFtjNPuaPwaKfSyLXbtRGZSYQyMKaZ0KcPWIavJWUYxWzCUFA4tqKyJVtB0y7jgBNx9noZ0goTN3nPk8pxwY6S1+g2eN4orwWTNN54AGfD3GuDR2CFmP2tlkcYDsju2Dt+lpc+ZJ9I6X7ePWFmKVkCy9TmghovGOfl8nGqBx7ckfYzxe0Jg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=/iZ/l6wToydgvUh62+fPRvtahoWnqwWspDJGqvOnyOo=; b=Ds4NZUy2Fl37KXPyCekiSiAZjFNGwnf7jST6RMDb7ERjC+8OafknoM6dfWIAtta1S9v3jm6PWmQm9DyzKsae7xTpigbYxd8zjyPCcSzKISTqeFzXcMWnQ+zokrP5tuYx/8SzyCVirOy0Q7VCCWdkM5NXTGn6qULyyXJE4a9pedOG5N5A1mB+7vGLlaxGBsMKKDN9q639GIb0izW1GRwLUHJEy/H8FZ413wTL3D0CxnCE2BoPeU2KshODzrp3G3ZOFvDzomkYP/TM9eFVsQz0qapH+Vr0QxBjk46aqUrAGP7AP8c/aLzk5M4lYmAgBMbUqW/30TIFjIRUH1g+kIEqEQ== Received: from CO2PR04CA0086.namprd04.prod.outlook.com (2603:10b6:104:6::12) by DM6PR12MB4418.namprd12.prod.outlook.com (2603:10b6:5:28e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Thu, 18 Nov 2021 12:34:55 +0000 Received: from CO1NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:104:6:cafe::95) by CO2PR04CA0086.outlook.office365.com (2603:10b6:104:6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.21 via Frontend Transport; Thu, 18 Nov 2021 12:34:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT015.mail.protection.outlook.com (10.13.175.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4713.20 via Frontend Transport; Thu, 18 Nov 2021 12:34:54 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 18 Nov 2021 12:34:54 +0000 From: To: CC: Elena Agostini Subject: [PATCH v1] gpu/cuda: properly set rte_errno Date: Thu, 18 Nov 2021 20:45:27 +0000 Message-ID: <20211118204527.26524-1-eagostini@nvidia.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08e6cdaf-a5c9-42c1-bd21-08d9aa8fd30f X-MS-TrafficTypeDiagnostic: DM6PR12MB4418: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:407; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K+3KqXulq6yDLiuWeQjcx8dkFDveGRjv+2+zGowYhE3mnN3xCWg3MZMVyHOIFwA8/VgngWHVZ/Qor8KSFP5reobBfIqg8+2hHcPy280zS0XQl8eBKPSLo7fIGacJmlRfYLDkQIvqIWEgwYquv54b0ZkhE115/mbmGGiHlECidIdyMcyuf3/DBQ1EslG4eCjfuIBnxH3/s3q+zdBgQ3jKBFJiZdnXw+qKpEjBpKyFlTNe9vBgqyX+tm48zH8pVTq6ySbGD5AJyaNr1Xj379gxL5Lv5eARipIwLRY8Dv4leOtbhmtJHFcKfCksBsPvsG5K8SYStsv9Ewbk21JT0yMqZ7FObUPM2zMFY8kgDPoAeto2GXADwBeKLIUZDg/M2rfNcs+GtJRcKgymGVyFaVtIKhWSp62UnVFVrWGHfWfaczYJzARZ3RWxxy5ffp8852EgVIuwo99JJ1A0MmROVNNIg1td4PGF3fU/02HgLw364a1z9cLuYQuhx7dnA6BhakRdxqmP9msVKDTjby4/ckcXwiUZ+50ABIvjoR4Ii185JJWCiQlLlO+abBlCQ+bTxrrXPRumWGepZj4/KwCp5dyPVmKqtt6yt4BjYXpXo216a1MuVgar1gg63hzCo9L0ExTVWGh7/rxfWdNmOEu987qo3U02svWTKprIKnH8hqo3jtvQX/EMKJwVz5dwLXveKf/kDhgDRHUrc99Ln3zNddj4kQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(2906002)(6916009)(7636003)(1076003)(2876002)(86362001)(107886003)(26005)(2616005)(6666004)(70206006)(36756003)(426003)(70586007)(336012)(5660300002)(7696005)(16526019)(508600001)(8676002)(186003)(316002)(36860700001)(8936002)(47076005)(83380400001)(55016002)(6286002)(356005)(30864003)(82310400003)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 12:34:54.6585 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08e6cdaf-a5c9-42c1-bd21-08d9aa8fd30f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4418 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 From: Elena Agostini Signed-off-by: Elena Agostini --- drivers/gpu/cuda/cuda.c | 229 +++++++++++++++++++++++++++------------- 1 file changed, 153 insertions(+), 76 deletions(-) diff --git a/drivers/gpu/cuda/cuda.c b/drivers/gpu/cuda/cuda.c index 24ae630d04..9991f9b9f1 100644 --- a/drivers/gpu/cuda/cuda.c +++ b/drivers/gpu/cuda/cuda.c @@ -464,8 +464,10 @@ cuda_dev_info_get(struct rte_gpu *dev, struct rte_gpu_info *info) CUcontext current_ctx; CUcontext input_ctx; - if (dev == NULL) - return -ENODEV; + if (dev == NULL) { + rte_errno = ENODEV; + return -rte_errno; + } /* Child initialization time probably called by rte_gpu_add_child() */ if (dev->mpshared->info.parent != RTE_GPU_ID_NONE && @@ -476,7 +478,8 @@ cuda_dev_info_get(struct rte_gpu *dev, struct rte_gpu_info *info) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxGetCurrent failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* Set child ctx as current ctx */ @@ -486,7 +489,8 @@ cuda_dev_info_get(struct rte_gpu *dev, struct rte_gpu_info *info) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxSetCurrent input failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* @@ -505,8 +509,10 @@ cuda_dev_info_get(struct rte_gpu *dev, struct rte_gpu_info *info) (uint32_t)affinityPrm.param.smCount.val; ret = rte_gpu_info_get(dev->mpshared->info.parent, &parent_info); - if (ret) - return -ENODEV; + if (ret) { + rte_errno = ENODEV; + return -rte_errno; + } dev->mpshared->info.total_memory = parent_info.total_memory; /* @@ -517,7 +523,8 @@ cuda_dev_info_get(struct rte_gpu *dev, struct rte_gpu_info *info) RTE_CACHE_LINE_SIZE); if (dev->mpshared->dev_private == NULL) { rte_cuda_log(ERR, "Failed to allocate memory for GPU process private"); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } private = (struct cuda_info *)dev->mpshared->dev_private; @@ -527,7 +534,8 @@ cuda_dev_info_get(struct rte_gpu *dev, struct rte_gpu_info *info) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxGetDevice failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } res = pfn_cuDeviceGetName(private->gpu_name, @@ -536,7 +544,8 @@ cuda_dev_info_get(struct rte_gpu *dev, struct rte_gpu_info *info) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuDeviceGetName failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* Restore original ctx as current ctx */ @@ -545,7 +554,8 @@ cuda_dev_info_get(struct rte_gpu *dev, struct rte_gpu_info *info) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxSetCurrent current failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } } @@ -567,10 +577,14 @@ cuda_mem_alloc(struct rte_gpu *dev, size_t size, void **ptr) CUcontext input_ctx; unsigned int flag = 1; - if (dev == NULL) - return -ENODEV; - if (size == 0) - return -EINVAL; + if (dev == NULL) { + rte_errno = ENODEV; + return -rte_errno; + } + if (size == 0) { + rte_errno = EINVAL; + return -rte_errno; + } /* Store current ctx */ res = pfn_cuCtxGetCurrent(¤t_ctx); @@ -578,7 +592,8 @@ cuda_mem_alloc(struct rte_gpu *dev, size_t size, void **ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxGetCurrent failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* Set child ctx as current ctx */ @@ -588,13 +603,16 @@ cuda_mem_alloc(struct rte_gpu *dev, size_t size, void **ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxSetCurrent input failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* Get next memory list item */ mem_alloc_list_tail = mem_list_add_item(); - if (mem_alloc_list_tail == NULL) - return -ENOMEM; + if (mem_alloc_list_tail == NULL) { + rte_errno = EPERM; + return -rte_errno; + } /* Allocate memory */ mem_alloc_list_tail->size = size; @@ -604,7 +622,8 @@ cuda_mem_alloc(struct rte_gpu *dev, size_t size, void **ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxSetCurrent current failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* GPUDirect RDMA attribute required */ @@ -615,7 +634,8 @@ cuda_mem_alloc(struct rte_gpu *dev, size_t size, void **ptr) rte_cuda_log(ERR, "Could not set SYNC MEMOP attribute for " "GPU memory at %"PRIu32", err %d", (uint32_t)mem_alloc_list_tail->ptr_d, res); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } mem_alloc_list_tail->pkey = get_hash_from_ptr((void *)mem_alloc_list_tail->ptr_d); @@ -631,7 +651,8 @@ cuda_mem_alloc(struct rte_gpu *dev, size_t size, void **ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxSetCurrent current failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } *ptr = (void *)mem_alloc_list_tail->ptr_d; @@ -649,11 +670,15 @@ cuda_mem_register(struct rte_gpu *dev, size_t size, void *ptr) unsigned int flag = 1; int use_ptr_h = 0; - if (dev == NULL) - return -ENODEV; + if (dev == NULL) { + rte_errno = ENODEV; + return -rte_errno; + } - if (size == 0 || ptr == NULL) - return -EINVAL; + if (size == 0 || ptr == NULL) { + rte_errno = EINVAL; + return -rte_errno; + } /* Store current ctx */ res = pfn_cuCtxGetCurrent(¤t_ctx); @@ -661,7 +686,8 @@ cuda_mem_register(struct rte_gpu *dev, size_t size, void *ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxGetCurrent failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* Set child ctx as current ctx */ @@ -671,13 +697,16 @@ cuda_mem_register(struct rte_gpu *dev, size_t size, void *ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxSetCurrent input failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* Get next memory list item */ mem_alloc_list_tail = mem_list_add_item(); - if (mem_alloc_list_tail == NULL) - return -ENOMEM; + if (mem_alloc_list_tail == NULL) { + rte_errno = EPERM; + return -rte_errno; + } /* Allocate memory */ mem_alloc_list_tail->size = size; @@ -693,7 +722,8 @@ cuda_mem_register(struct rte_gpu *dev, size_t size, void *ptr) err_string, mem_alloc_list_tail->ptr_h, mem_alloc_list_tail->size); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } res = pfn_cuDeviceGetAttribute(&(use_ptr_h), @@ -703,7 +733,8 @@ cuda_mem_register(struct rte_gpu *dev, size_t size, void *ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuDeviceGetAttribute failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } if (use_ptr_h == 0) { @@ -713,13 +744,15 @@ cuda_mem_register(struct rte_gpu *dev, size_t size, void *ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuMemHostGetDevicePointer failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } if ((uintptr_t)mem_alloc_list_tail->ptr_d != (uintptr_t)mem_alloc_list_tail->ptr_h) { rte_cuda_log(ERR, "Host input pointer is different wrt GPU registered pointer"); - return -ENOTSUP; + rte_errno = ENOTSUP; + return -rte_errno; } } else { mem_alloc_list_tail->ptr_d = (CUdeviceptr)mem_alloc_list_tail->ptr_h; @@ -732,7 +765,8 @@ cuda_mem_register(struct rte_gpu *dev, size_t size, void *ptr) if (res != 0) { rte_cuda_log(ERR, "Could not set SYNC MEMOP attribute for GPU memory at %"PRIu32 ", err %d", (uint32_t)mem_alloc_list_tail->ptr_d, res); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } mem_alloc_list_tail->pkey = get_hash_from_ptr((void *)mem_alloc_list_tail->ptr_h); @@ -747,7 +781,8 @@ cuda_mem_register(struct rte_gpu *dev, size_t size, void *ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxSetCurrent current failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } return 0; @@ -761,8 +796,10 @@ cuda_mem_free(struct rte_gpu *dev, void *ptr) const char *err_string; cuda_ptr_key hk; - if (dev == NULL) - return -ENODEV; + if (dev == NULL) { + rte_errno = ENODEV; + return -rte_errno; + } if (ptr == NULL) return -EINVAL; @@ -772,7 +809,8 @@ cuda_mem_free(struct rte_gpu *dev, void *ptr) mem_item = mem_list_find_item(hk); if (mem_item == NULL) { rte_cuda_log(ERR, "Memory address 0x%p not found in driver memory", ptr); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } if (mem_item->mtype == GPU_MEM) { @@ -781,7 +819,8 @@ cuda_mem_free(struct rte_gpu *dev, void *ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuMemFree current failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } return mem_list_del_item(hk); @@ -789,7 +828,8 @@ cuda_mem_free(struct rte_gpu *dev, void *ptr) rte_cuda_log(ERR, "Memory type %d not supported", mem_item->mtype); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } static int @@ -800,8 +840,10 @@ cuda_mem_unregister(struct rte_gpu *dev, void *ptr) const char *err_string; cuda_ptr_key hk; - if (dev == NULL) - return -ENODEV; + if (dev == NULL) { + rte_errno = ENODEV; + return -rte_errno; + } if (ptr == NULL) return -EINVAL; @@ -811,7 +853,8 @@ cuda_mem_unregister(struct rte_gpu *dev, void *ptr) mem_item = mem_list_find_item(hk); if (mem_item == NULL) { rte_cuda_log(ERR, "Memory address 0x%p not found in driver memory", ptr); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } if (mem_item->mtype == CPU_REGISTERED) { @@ -820,7 +863,8 @@ cuda_mem_unregister(struct rte_gpu *dev, void *ptr) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuMemHostUnregister current failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } return mem_list_del_item(hk); @@ -828,14 +872,17 @@ cuda_mem_unregister(struct rte_gpu *dev, void *ptr) rte_cuda_log(ERR, "Memory type %d not supported", mem_item->mtype); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } static int cuda_dev_close(struct rte_gpu *dev) { - if (dev == NULL) - return -EINVAL; + if (dev == NULL) { + rte_errno = ENODEV; + return -rte_errno; + } rte_free(dev->mpshared->dev_private); @@ -851,8 +898,10 @@ cuda_wmb(struct rte_gpu *dev) CUcontext input_ctx; struct cuda_info *private; - if (dev == NULL) - return -ENODEV; + if (dev == NULL) { + rte_errno = ENODEV; + return -rte_errno; + } private = (struct cuda_info *)dev->mpshared->dev_private; @@ -871,7 +920,9 @@ cuda_wmb(struct rte_gpu *dev) */ rte_cuda_log(WARNING, "Can't flush GDR writes with cuFlushGPUDirectRDMAWrites CUDA function." "Application needs to use alternative methods."); - return -ENOTSUP; + + rte_errno = ENOTSUP; + return -rte_errno; } /* Store current ctx */ @@ -880,7 +931,8 @@ cuda_wmb(struct rte_gpu *dev) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxGetCurrent failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* Set child ctx as current ctx */ @@ -890,7 +942,8 @@ cuda_wmb(struct rte_gpu *dev) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxSetCurrent input failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } res = pfn_cuFlushGPUDirectRDMAWrites(CU_FLUSH_GPU_DIRECT_RDMA_WRITES_TARGET_CURRENT_CTX, @@ -899,7 +952,8 @@ cuda_wmb(struct rte_gpu *dev) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuFlushGPUDirectRDMAWrites current failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* Restore original ctx as current ctx */ @@ -908,7 +962,8 @@ cuda_wmb(struct rte_gpu *dev) pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuCtxSetCurrent current failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } return 0; @@ -928,15 +983,18 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic if (pci_dev == NULL) { rte_cuda_log(ERR, "NULL PCI device"); - return -EINVAL; + rte_errno = ENODEV; + return -rte_errno; } rte_pci_device_name(&pci_dev->addr, dev_name, sizeof(dev_name)); /* Allocate memory to be used privately by drivers */ dev = rte_gpu_allocate(pci_dev->device.name); - if (dev == NULL) - return -ENODEV; + if (dev == NULL) { + rte_errno = ENODEV; + return -rte_errno; + } /* Initialize values only for the first CUDA driver call */ if (dev->mpshared->info.dev_id == 0) { @@ -947,13 +1005,15 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic /* Load libcuda.so library */ if (cuda_loader()) { rte_cuda_log(ERR, "CUDA Driver library not found"); - return -ENOTSUP; + rte_errno = ENOTSUP; + return -rte_errno; } /* Load initial CUDA functions */ if (cuda_sym_func_loader()) { rte_cuda_log(ERR, "CUDA functions not found in library"); - return -ENOTSUP; + rte_errno = ENOTSUP; + return -rte_errno; } /* @@ -966,7 +1026,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic res = sym_cuDriverGetVersion(&cuda_driver_version); if (res != 0) { rte_cuda_log(ERR, "cuDriverGetVersion failed with %d", res); - return -ENOTSUP; + rte_errno = ENOTSUP; + return -rte_errno; } if (cuda_driver_version < CUDA_DRIVER_MIN_VERSION) { @@ -974,12 +1035,14 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic "Minimum requirement is %d", cuda_driver_version, CUDA_DRIVER_MIN_VERSION); - return -ENOTSUP; + rte_errno = ENOTSUP; + return -rte_errno; } if (cuda_pfn_func_loader()) { rte_cuda_log(ERR, "CUDA PFN functions not found in library"); - return -ENOTSUP; + rte_errno = ENOTSUP; + return -rte_errno; } } @@ -993,7 +1056,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuDeviceGetByPCIBusId name %s failed with %d: %s", dev->device->name, res, err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } res = pfn_cuDevicePrimaryCtxRetain(&pctx, cu_dev_id); @@ -1001,19 +1065,22 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuDevicePrimaryCtxRetain name %s failed with %d: %s", dev->device->name, res, err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } res = pfn_cuCtxGetApiVersion(pctx, &cuda_api_version); if (res != 0) { rte_cuda_log(ERR, "cuCtxGetApiVersion failed with %d", res); - return -ENOTSUP; + rte_errno = ENOTSUP; + return -rte_errno; } if (cuda_api_version < CUDA_API_MIN_VERSION) { rte_cuda_log(ERR, "CUDA API version found is %d Minimum requirement is %d", cuda_api_version, CUDA_API_MIN_VERSION); - return -ENOTSUP; + rte_errno = ENOTSUP; + return -rte_errno; } dev->mpshared->info.context = (uint64_t)pctx; @@ -1030,7 +1097,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuDeviceGetAttribute failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } dev->mpshared->info.processor_count = (uint32_t)processor_count; @@ -1040,7 +1108,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuDeviceTotalMem failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } /* @@ -1051,7 +1120,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic RTE_CACHE_LINE_SIZE); if (dev->mpshared->dev_private == NULL) { rte_cuda_log(ERR, "Failed to allocate memory for GPU process private"); - return -ENOMEM; + rte_errno = EPERM; + return -rte_errno; } private = (struct cuda_info *)dev->mpshared->dev_private; @@ -1063,7 +1133,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuDeviceGetName failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } res = pfn_cuDeviceGetAttribute(&(private->gdr_supported), @@ -1073,7 +1144,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuDeviceGetAttribute failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } if (private->gdr_supported == 0) @@ -1088,7 +1160,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic rte_cuda_log(ERR, "cuDeviceGetAttribute failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } if (private->gdr_write_ordering == CU_GPU_DIRECT_RDMA_WRITES_ORDERING_NONE) { @@ -1099,7 +1172,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic pfn_cuGetErrorString(res, &(err_string)); rte_cuda_log(ERR, "cuDeviceGetAttribute failed with %s", err_string); - return -EPERM; + rte_errno = EPERM; + return -rte_errno; } if (private->gdr_flush_type != CU_FLUSH_GPU_DIRECT_RDMA_WRITES_OPTION_HOST) @@ -1129,14 +1203,17 @@ cuda_gpu_remove(struct rte_pci_device *pci_dev) int ret; uint8_t gpu_id; - if (pci_dev == NULL) - return -EINVAL; + if (pci_dev == NULL) { + rte_errno = ENODEV; + return -rte_errno; + } dev = rte_gpu_get_by_name(pci_dev->device.name); if (dev == NULL) { rte_cuda_log(ERR, "Couldn't find HW dev \"%s\" to uninitialise it", pci_dev->device.name); - return -ENODEV; + rte_errno = ENODEV; + return -rte_errno; } gpu_id = dev->mpshared->info.dev_id; -- 2.17.1