mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-09-04 07:06:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

ib_srpt: Fix nightly build

Browse Source
This commit is contained in:
Bart Van Assche
2016-12-19 15:15:48 +01:00
parent 6f639f07e2
commit ec4d623028
6 changed files with 76 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
srpt/Makefile
+2
View File
@@ -104,6 +104,7 @@ MAD_HANDLER_TAKES_SEND_BUF := $(call run_conftest,mad_handler_takes_send_buf,-D
HAVE_IB_DMA_MAP_OPS := $(call run_conftest,ib_dma_map_ops,-DHAVE_IB_DMA_MAP_OPS)
HAVE_IB_SET_CPI_RESP_TIME := $(call run_conftest,ib_set_cpi_resp_time,-DHAVE_IB_SET_CPI_RESP_TIME)
GID_CHANGE_FLAG := $(call run_conftest,gid_change,-DHAVE_IB_EVENT_GID_CHANGE)
PD_HAS_LOCAL_DMA_LKEY := $(call run_conftest,pd_has_local_dma_lkey,-DIB_PD_HAS_LOCAL_DMA_LKEY)
RDMA_CREATE_ID := $(call run_conftest,rdma_create_id_net,-DRDMA_CREATE_ID_TAKES_NET_ARG=1,-DRDMA_CREATE_ID_TAKES_NET_ARG=0)
REGISTER_MAD_AGENT_FLAG := $(call run_conftest,register_mad_agent,-DREGISTER_MAD_AGENT_HAS_FLAGS_ARG)
QUERY_DEVICE := $(call run_conftest,query_device,-DHAVE_IB_QUERY_DEVICE)
@@ -121,6 +122,7 @@ PRE_CFLAGS=$(OFED_CFLAGS) \
$(HAVE_IB_DMA_MAP_OPS) \
$(HAVE_IB_SET_CPI_RESP_TIME) \
$(GID_CHANGE_FLAG) \
$(PD_HAS_LOCAL_DMA_LKEY) \
$(RDMA_CREATE_ID) \
$(REGISTER_MAD_AGENT_FLAG) \
$(QUERY_GID_FLAG) \
srpt/conftest/pd_has_local_dma_lkey/Makefile
+3
View File
@@ -0,0 +1,3 @@
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
obj-m += pd_has_local_dma_lkey.o
srpt/conftest/pd_has_local_dma_lkey/pd_has_local_dma_lkey.c
+10
View File
@@ -0,0 +1,10 @@
#include <linux/module.h>
#include <linux/stddef.h>
#include <rdma/ib_verbs.h>
static int modinit(void)
{
return offsetof(struct ib_pd, local_dma_lkey);
}
module_init(modinit);
srpt/src/ib_srpt.c
+7 -12
View File
@@ -625,8 +625,7 @@ static void srpt_mad_recv_handler(struct ib_mad_agent *mad_agent,
#endif
0, IB_MGMT_DEVICE_HDR, IB_MGMT_DEVICE_DATA,
GFP_KERNEL
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) && !defined(MOFED_MAJOR) || \
defined(CREATE_SEND_MAD_HAS_BASE_ARG)
#ifdef CREATE_SEND_MAD_HAS_BASE_ARG
, 0
#endif
);
@@ -701,8 +700,7 @@ static int srpt_refresh_port(struct srpt_port *sport)
sport->lid = port_attr.lid;
ret = ib_query_gid(sport->sdev->device, sport->port, 0, &sport->gid
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) || \
defined(IB_QUERY_GID_HAS_ATTR_ARG)
#ifdef IB_QUERY_GID_HAS_ATTR_ARG
, NULL
#endif
);
@@ -723,8 +721,7 @@ static int srpt_refresh_port(struct srpt_port *sport)
srpt_mad_send_handler,
srpt_mad_recv_handler,
sport
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) || \
defined(REGISTER_MAD_AGENT_HAS_FLAGS_ARG)
#ifdef REGISTER_MAD_AGENT_HAS_FLAGS_ARG
, 0
#endif
);
@@ -2224,9 +2221,7 @@ retry:
!defined(RHEL_RELEASE_CODE)
ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch,
ch->rq_size + sq_size);
#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) || \
defined(MOFED_MAJOR)) && \
!defined(IB_CREATE_CQ_HAS_INIT_ATTR)
#elif !defined(IB_CREATE_CQ_HAS_INIT_ATTR)
ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch,
ch->rq_size + sq_size, ch->comp_vector);
#else
@@ -4357,7 +4352,7 @@ static void srpt_add_one(struct ib_device *device)
goto free_dev;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
#ifndef IB_PD_HAS_LOCAL_DMA_LKEY
sdev->mr = ib_get_dma_mr(sdev->pd, IB_ACCESS_LOCAL_WRITE);
if (IS_ERR(sdev->mr)) {
pr_err("ib_get_dma_mr() failed: %ld\n", PTR_ERR(sdev->mr));
@@ -4492,7 +4487,7 @@ err_ring:
sdev->srq_size, srp_max_req_size,
DMA_FROM_DEVICE);
err_mr:
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
#ifndef IB_PD_HAS_LOCAL_DMA_LKEY
ib_dereg_mr(sdev->mr);
err_pd:
#endif
@@ -4565,7 +4560,7 @@ static void srpt_remove_one(struct ib_device *device, void *client_data)
ib_destroy_srq(sdev->srq);
srpt_free_ioctx_ring((struct srpt_ioctx **)sdev->ioctx_ring, sdev,
sdev->srq_size, srp_max_req_size, DMA_FROM_DEVICE);
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
#ifndef IB_PD_HAS_LOCAL_DMA_LKEY
ib_dereg_mr(sdev->mr);
#endif
ib_dealloc_pd(sdev->pd);
srpt/src/ib_srpt.h
+1 -1
View File
@@ -457,7 +457,7 @@ struct srpt_port {
struct srpt_device {
struct ib_device *device;
struct ib_pd *pd;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
#ifndef IB_PD_HAS_LOCAL_DMA_LKEY
struct ib_mr *mr;
#endif
struct ib_srq *srq;