From dca84e290bcce44bbe74c6ec2ef19f23ce0ca458 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 1 Dec 2016 16:18:39 +0000 Subject: [PATCH 1/3] ib_srpt: Only complain if immediate data has to be copied if CONFIG_SLUB_DEBUG=n git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7046 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/session-management.txt | 2 +- srpt/src/ib_srpt.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/srpt/session-management.txt b/srpt/session-management.txt index 89147cca8..53dae0f35 100644 --- a/srpt/session-management.txt +++ b/srpt/session-management.txt @@ -8,7 +8,7 @@ The following actions related to SRP sessions can all occur concurrently: * HCA driver invokes the QP async event handler srpt_qp_event(). * HCA transfers data between initiator and target via RDMA. * srpt_compl_thread() polls the QP. -* SCST core invokes one of the callback functions defined in srpt_template(). +* SCST core invokes one of the callback functions defined in srpt_template. The actions that occur over the lifetime of a session are as follows: - A REQ message is received from the initiator. diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index f6bae1923..d3384758d 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -809,8 +809,12 @@ static struct srpt_ioctx *srpt_alloc_ioctx(struct srpt_device *sdev, if (!ioctx->buf) goto err_free_ioctx; - /* Complain if it is not safe to use zero-copy */ - WARN_ON_ONCE(alignment_offset && ((uintptr_t)ioctx->buf & 511)); + if (alignment_offset && ((uintptr_t)ioctx->buf & 511)) { + pr_warn("Disabling zero-copy for immediate data\n"); +#ifndef CONFIG_SLUB_DEBUG + WARN_ON_ONCE(true); +#endif + } ioctx->dma = ib_dma_map_single(sdev->device, ioctx->buf, dma_size + alignment_offset, dir); @@ -3541,6 +3545,10 @@ static int srpt_xfer_data(struct srpt_rdma_ch *ch, unsigned offset = 0, len; uint8_t *buf; + /* + * Copy the immediate data if srpt_get_desc_tbl() + * did not call sg_init_one(). + */ len = scst_get_buf_first(cmd, &buf); while (len > 0) { memcpy(buf, ioctx->imm_data + offset, len); From 7cb08382acd7588493a5af140363729578fc3fa2 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 1 Dec 2016 16:19:14 +0000 Subject: [PATCH 2/3] ib_srpt Makefile: Follow-up for trunk r6138 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7047 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/srpt/Makefile b/srpt/Makefile index cac01ccf1..7edc2eef7 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -113,9 +113,6 @@ src/$(MODULE_SYMVERS): $(SCST_SYMVERS_DIR)/$(MODULE_SYMVERS) \ echo "Error: the OFED package $(OFED_KERNEL_IB_RPM)-devel has" \ "not yet been installed."; \ false; \ - elif [ "$(HAVE_PRE_CFLAGS)" = false ]; then \ - echo "Error: the kernel build system has not yet been patched.";\ - false; \ else \ echo " Building against $(OFED_FLAVOR) $(OFED_KERNEL_IB_RPM)" \ "InfiniBand kernel headers."; \ From b3893277be8c2368d527dd31843f6308db1b3b1a Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 1 Dec 2016 16:19:40 +0000 Subject: [PATCH 3/3] ib_srpt: Reduce build time git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7048 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/Makefile | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/srpt/Makefile b/srpt/Makefile index 7edc2eef7..7d4891c3b 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -66,8 +66,10 @@ ifeq ($(OFED_FLAVOR),MOFED) # , include that header file explicitly. OFED_KERNEL_DIR:=/usr/src/ofa_kernel/default OFED_VERS=$(shell rpm -q --qf '%{version}\n' mlnx-ofa_kernel-devel 2>/dev/null) -OFED_CFLAGS:=-I$(OFED_KERNEL_DIR)/include -include linux/compat-2.6.h +CKVER:=$(shell echo "$(KVER)" | sed 's/^\(\(2\.6\|[3-9]\)\.[0-9]*\).*/\1/') +OFED_CFLAGS:=-I$(OFED_KERNEL_DIR)/include -include "linux/compat-$(CKVER).h" OFED_CFLAGS+=-DMOFED_MAJOR=$(shell echo $(OFED_VERS) | cut -f1 -d.) +OFED_CFLAGS+=-DMOFED_MINOR=$(shell echo $(OFED_VERS) | cut -f2 -d.) else # OFED 1.5 OFED_KERNEL_DIR:=/usr/src/ofa_kernel @@ -79,15 +81,29 @@ endif OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/$(MODULE_SYMVERS) endif -CREATE_CQ_FLAG = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/create_cq PRE_CFLAGS="$(OFED_CFLAGS) -Werror" >/dev/null 2>&1 && echo -DIB_CREATE_CQ_HAS_INIT_ATTR) -CREATE_SEND_MAD_AH_FLAG := $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/create_send_mad_ah PRE_CFLAGS="$(OFED_CFLAGS) -Werror" >/dev/null 2>&1 && echo -DCREATE_SEND_MAD_HAS_AH_ARG) +GOALS:=$(if $(MAKECMDGOALS),$(MAKECMDGOALS),all) +OTHER_GOALS:=$(foreach goal,$(MAKECMDGOALS),$(subst all,,$(goal))) +# echo:=$(shell echo 'GOALS = $(GOALS)' >&2) +# echo:=$(shell echo 'OTHER_GOALS = $(OTHER_GOALS)' >&2) +ifneq ("$(GOALS)","$(OTHER_GOALS)") +run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if $(MAKE) -C $(KDIR) V=$(V) SUBDIRS="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$2"; else echo "$3"; fi) +CREATE_CQ_FLAG := $(call run_conftest,create_cq,-DIB_CREATE_CQ_HAS_INIT_ATTR) +CREATE_SEND_MAD_AH_FLAG := $(call run_conftest,create_send_mad_ah,-DCREATE_SEND_MAD_HAS_AH_ARG) ifeq ($(CREATE_SEND_MAD_AH_FLAG),) - CREATE_SEND_MAD_BASE_FLAG := $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/create_send_mad_base PRE_CFLAGS="$(OFED_CFLAGS) -Werror" >/dev/null 2>&1 && echo -DCREATE_SEND_MAD_HAS_BASE_ARG) + CREATE_SEND_MAD_BASE_FLAG := $(call run_conftest,create_send_mad_base,-DCREATE_SEND_MAD_HAS_BASE_ARG) +endif +GID_CHANGE_FLAG := $(call run_conftest,gid_change,-DHAVE_IB_EVENT_GID_CHANGE) +REGISTER_MAD_AGENT_FLAG := $(call run_conftest,register_mad_agent,-DREGISTER_MAD_AGENT_HAS_FLAGS_ARG) +QUERY_GID_FLAG := $(call run_conftest,query_gid,-DIB_QUERY_GID_HAS_ATTR_ARG) +PRE_CFLAGS=$(OFED_CFLAGS) \ + $(CREATE_CQ_FLAG) \ + $(CREATE_SEND_MAD_AH_FLAG) \ + $(CREATE_SEND_MAD_BASE_FLAG) \ + $(GID_CHANGE_FLAG) \ + $(REGISTER_MAD_AGENT_FLAG) \ + $(QUERY_GID_FLAG) \ + -DOFED_FLAVOR=$(OFED_FLAVOR) endif -GID_CHANGE_FLAG = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/gid_change PRE_CFLAGS="$(OFED_CFLAGS)" >/dev/null 2>&1 && echo -DHAVE_IB_EVENT_GID_CHANGE) -REGISTER_MAD_AGENT_FLAG = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/register_mad_agent PRE_CFLAGS="$(OFED_CFLAGS) -Werror" >/dev/null 2>&1 && echo -DREGISTER_MAD_AGENT_HAS_FLAGS_ARG) -QUERY_GID_FLAG = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/query_gid PRE_CFLAGS="$(OFED_CFLAGS)" >/dev/null 2>&1 && echo -DIB_QUERY_GID_HAS_ATTR_ARG) -PRE_CFLAGS=$(OFED_CFLAGS) $(CREATE_CQ_FLAG) $(CREATE_SEND_MAD_AH_FLAG) $(CREATE_SEND_MAD_BASE_FLAG) $(GID_CHANGE_FLAG) $(REGISTER_MAD_AGENT_FLAG) $(QUERY_GID_FLAG) -DOFED_FLAVOR=$(OFED_FLAVOR) all: src/$(MODULE_SYMVERS) $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \