ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf/rdma: Move definitions of rxe vendor IDs to common rdma.h

Browse Source 
These definitions will be used in the next patch to check if
device is rxe

Signed-off-by: Alexey Marchuk <alexeymar@mellanox.com>
Change-Id: Icc073344103991ff24fc3bb88a1ceb9867de6f6a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10727
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Alexey Marchuk 2021-12-16 20:34:14 +03:00 committed by Tomasz Zawadzki
parent de7493e697
commit 9cea323284
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/spdk_internal/rdma.h
View File

@ -3,6 +3,7 @@
* *
* Copyright (c) Intel Corporation. All rights reserved. * Copyright (c) Intel Corporation. All rights reserved.
* Copyright (c) Mellanox Technologies LTD. All rights reserved. * Copyright (c) Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -41,6 +42,10 @@
/* Contains hooks definition */ /* Contains hooks definition */
#include "spdk/nvme.h" #include "spdk/nvme.h"
/* rxe driver vendor_id has been changed from 0 to 0XFFFFFF in 0184afd15a141d7ce24c32c0d86a1e3ba6bc0eb3 */
#define SPDK_RDMA_RXE_VENDOR_ID_OLD 0
#define SPDK_RDMA_RXE_VENDOR_ID_NEW 0XFFFFFF
struct spdk_rdma_wr_stats { struct spdk_rdma_wr_stats {
/* Total number of submitted requests */ /* Total number of submitted requests */
uint64_t num_submitted_wrs; uint64_t num_submitted_wrs;

9
lib/nvmf/rdma.c
View File

@ -3,6 +3,7 @@
* *
* Copyright (c) Intel Corporation. All rights reserved. * Copyright (c) Intel Corporation. All rights reserved.
* Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -63,10 +64,6 @@ const struct spdk_nvmf_transport_ops spdk_nvmf_transport_rdma;
#define DEFAULT_NVMF_RDMA_CQ_SIZE 4096 #define DEFAULT_NVMF_RDMA_CQ_SIZE 4096
#define MAX_WR_PER_QP(queue_depth) (queue_depth * 3 + 2) #define MAX_WR_PER_QP(queue_depth) (queue_depth * 3 + 2)
/* rxe driver vendor_id has been changed from 0 to 0XFFFFFF in 0184afd15a141d7ce24c32c0d86a1e3ba6bc0eb3 */
#define NVMF_RXE_VENDOR_ID_OLD 0
#define NVMF_RXE_VENDOR_ID_NEW 0XFFFFFF
static int g_spdk_nvmf_ibv_query_mask = static int g_spdk_nvmf_ibv_query_mask =
IBV_QP_STATE | IBV_QP_STATE |
IBV_QP_PKEY_INDEX | IBV_QP_PKEY_INDEX |
@ -2191,8 +2188,8 @@ static int nvmf_rdma_destroy(struct spdk_nvmf_transport *transport,
static inline bool static inline bool
nvmf_rdma_is_rxe_device(struct spdk_nvmf_rdma_device *device) nvmf_rdma_is_rxe_device(struct spdk_nvmf_rdma_device *device)
{ {
return device->attr.vendor_id == NVMF_RXE_VENDOR_ID_OLD || return device->attr.vendor_id == SPDK_RDMA_RXE_VENDOR_ID_OLD ||
device->attr.vendor_id == NVMF_RXE_VENDOR_ID_NEW; device->attr.vendor_id == SPDK_RDMA_RXE_VENDOR_ID_NEW;
} }
static int static int