Commit 9cea3232 authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Tomasz Zawadzki
Browse files

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: default avatarAlexey 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent de7493e6

include/spdk_internal/rdma.h

+5 −0
Original line number Diff line number Diff line
@@ -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;

lib/nvmf/rdma.c

+3 −6
Original line number Diff line number Diff line
@@ -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