From 95130152bcf7f0c7b00d5b7774ef95342ccd4fce Mon Sep 17 00:00:00 2001 From: Alexey Marchuk Date: Thu, 16 Dec 2021 20:34:14 +0300 Subject: [PATCH] nvmf/rdma: Move definitions of rxe vendor IDs to common rdma.h These definitions will be used in the next patch to check if device is rxe Signed-off-by: Alexey Marchuk Change-Id: Icc073344103991ff24fc3bb88a1ceb9867de6f6a Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10727 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- include/spdk_internal/rdma.h | 5 +++++ lib/nvmf/rdma.c | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/spdk_internal/rdma.h b/include/spdk_internal/rdma.h index ca5fe1905..654e49969 100644 --- a/include/spdk_internal/rdma.h +++ b/include/spdk_internal/rdma.h @@ -3,6 +3,7 @@ * * Copyright (c) Intel Corporation. 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 * modification, are permitted provided that the following conditions @@ -41,6 +42,10 @@ /* Contains hooks definition */ #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 { /* Total number of submitted requests */ uint64_t num_submitted_wrs; diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 162747230..b6eae7100 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -3,6 +3,7 @@ * * Copyright (c) Intel Corporation. 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 * 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 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 = IBV_QP_STATE | IBV_QP_PKEY_INDEX | @@ -2191,8 +2188,8 @@ static int nvmf_rdma_destroy(struct spdk_nvmf_transport *transport, static inline bool nvmf_rdma_is_rxe_device(struct spdk_nvmf_rdma_device *device) { - return device->attr.vendor_id == NVMF_RXE_VENDOR_ID_OLD || - device->attr.vendor_id == NVMF_RXE_VENDOR_ID_NEW; + return device->attr.vendor_id == SPDK_RDMA_RXE_VENDOR_ID_OLD || + device->attr.vendor_id == SPDK_RDMA_RXE_VENDOR_ID_NEW; } static int