mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-25 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-11-08 20:09:01 -08:00
parent d80470f6af ac145e1cb6
commit 7dafbdbf51
8 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
scripts/specialize-patch
View File

@@ -117,6 +117,9 @@ function evaluate(stmnt, pattern, arg, op, result) {
gsub("HAVE_RDMA_QUERY_GID",
"(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))", stmnt)
gsub("HAVE_SRP_DATA_DESC_IMM",
"(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 21, 0))", stmnt)
gsub("HAVE_STRUCT_SRP_LOGIN_REQ_RDMA",
"(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0))", stmnt)
@@ -145,6 +148,9 @@ function evaluate(stmnt, pattern, arg, op, result) {
gsub("defined\\(HAVE_IB_DMA_MAP_OPS\\)",
"(LINUX_VERSION_CODE >= KERNEL_VERSION(0, 0, 0))", stmnt)
gsub("defined\\(HAVE_IB_SG_DMA_LEN\\)",
"(LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0))", stmnt)
gsub("defined(ENABLE_NPIV)", 0, stmnt)
gsub("defined(FC_VPORT_CREATE_DEFINED)", 0, stmnt)
@@ -384,42 +390,44 @@ function handle_if(evaluated)
{
# Only act on preprocessor conditional expressions with regard to the Linux
# kernel version, and do not interpret other expressions.
if ($0 ~ "LINUX_VERSION_CODE" \
|| $0 ~ "CONFIG_SCST_PROC" \
|| $0 ~ "CONFIG_SCST_STRICT_SERIALIZING" \
|| $0 ~ "CREATE_SEND_MAD_HAS_BASE_ARG" \
|| $0 ~ "ENABLE_NPIV" \
|| $0 ~ "FC_VPORT_CREATE_DEFINED" \
|| $0 ~ "HAVE_DEV_ATTR_MAX_RECV_SGE" \
|| $0 ~ "HAVE_DEV_ATTR_MAX_SEND_SGE" \
|| $0 ~ "HAVE_IB_DMA_MAP_OPS" \
|| $0 ~ "HAVE_IB_QUERY_DEVICE" \
|| $0 ~ "HAVE_IB_SET_CPI_RESP_TIME" \
|| $0 ~ "HAVE_RDMA_DESTROY_AH" \
|| $0 ~ "HAVE_RDMA_DESTROY_AH_WITH_FLAGS" \
|| $0 ~ "HAVE_RDMA_QUERY_GID" \
|| $0 ~ "HAVE_STRUCT_SRP_LOGIN_REQ_RDMA" \
|| $0 ~ "IB_CLIENT_REMOVE_TAKES_TWO_ARGS" \
|| $0 ~ "IB_CM_LISTEN_TAKES_FOURTH_ARG" \
|| $0 ~ "IB_CREATE_CQ_HAS_INIT_ATTR" \
|| $0 ~ "IB_PD_HAS_LOCAL_DMA_LKEY" \
|| $0 ~ "IB_QUERY_GID_HAS_ATTR_ARG" \
|| $0 ~ "INSIDE_KERNEL_TREE" \
|| $0 ~ "MAD_HANDLER_TAKES_SEND_BUF" \
|| $0 ~ "MOFED_MAJOR" \
|| $0 ~ "MOFED_MINOR" \
|| $0 ~ "RDMA_CREATE_ID_TAKES_NET_ARG" \
|| $0 ~ "REGISTER_MAD_AGENT_HAS_FLAGS_ARG" \
|| $0 ~ "RHEL_MAJOR" \
|| $0 ~ "RHEL_MINOR" \
|| $0 ~ "RHEL_RELEASE_CODE" \
|| $0 ~ "SOCK_RECVMSG_HAS_FOUR_ARGS" \
|| $0 ~ "UEK_KABI_RENAME" \
|| $0 ~ "USE_PRE_440_WR_STRUCTURE" \
|| generating_upstream_patch_defined \
&& $0 ~ "GENERATING_UPSTREAM_PATCH" \
|| $0 ~ "CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION" \
|| ($0 ~ "CONFIG_SCST_PROC" && config_scst_proc_undefined) \
if ($0 ~ "LINUX_VERSION_CODE" \
|| $0 ~ "CONFIG_SCST_PROC" \
|| $0 ~ "CONFIG_SCST_STRICT_SERIALIZING" \
|| $0 ~ "CREATE_SEND_MAD_HAS_BASE_ARG" \
|| $0 ~ "ENABLE_NPIV" \
|| $0 ~ "FC_VPORT_CREATE_DEFINED" \
|| $0 ~ "HAVE_DEV_ATTR_MAX_RECV_SGE" \
|| $0 ~ "HAVE_DEV_ATTR_MAX_SEND_SGE" \
|| $0 ~ "HAVE_IB_DMA_MAP_OPS" \
|| $0 ~ "HAVE_IB_QUERY_DEVICE" \
|| $0 ~ "HAVE_IB_SET_CPI_RESP_TIME" \
|| $0 ~ "HAVE_IB_SG_DMA_LEN" \
|| $0 ~ "HAVE_RDMA_DESTROY_AH" \
|| $0 ~ "HAVE_RDMA_DESTROY_AH_WITH_FLAGS" \
|| $0 ~ "HAVE_RDMA_QUERY_GID" \
|| $0 ~ "HAVE_SRP_DATA_DESC_IMM" \
|| $0 ~ "HAVE_STRUCT_SRP_LOGIN_REQ_RDMA" \
|| $0 ~ "IB_CLIENT_REMOVE_TAKES_TWO_ARGS" \
|| $0 ~ "IB_CM_LISTEN_TAKES_FOURTH_ARG" \
|| $0 ~ "IB_CREATE_CQ_HAS_INIT_ATTR" \
|| $0 ~ "IB_PD_HAS_LOCAL_DMA_LKEY" \
|| $0 ~ "IB_QUERY_GID_HAS_ATTR_ARG" \
|| $0 ~ "INSIDE_KERNEL_TREE" \
|| $0 ~ "MAD_HANDLER_TAKES_SEND_BUF" \
|| $0 ~ "MOFED_MAJOR" \
|| $0 ~ "MOFED_MINOR" \
|| $0 ~ "RDMA_CREATE_ID_TAKES_NET_ARG" \
|| $0 ~ "REGISTER_MAD_AGENT_HAS_FLAGS_ARG" \
|| $0 ~ "RHEL_MAJOR" \
|| $0 ~ "RHEL_MINOR" \
|| $0 ~ "RHEL_RELEASE_CODE" \
|| $0 ~ "SOCK_RECVMSG_HAS_FOUR_ARGS" \
|| $0 ~ "UEK_KABI_RENAME" \
|| $0 ~ "USE_PRE_440_WR_STRUCTURE" \
|| generating_upstream_patch_defined \
&& $0 ~ "GENERATING_UPSTREAM_PATCH" \
|| $0 ~ "CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION" \
|| ($0 ~ "CONFIG_SCST_PROC" && config_scst_proc_undefined) \
|| ($0 ~ "SCSI_EXEC_REQ_FIFO_DEFINED" && SCSI_EXEC_REQ_FIFO_DEFINED!="") \
|| ($0 ~ "SCST_IO_CONTEXT" && SCST_IO_CONTEXT != ""))
{

5
scst/include/backport.h
View File

@@ -1588,11 +1588,6 @@ static inline struct ib_pd *ib_alloc_pd_backport(struct ib_device *device)
})
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
#define ib_sg_dma_len(dev, sg) sg_dma_len(sg)
#define ib_sg_dma_address(dev, sg) sg_dma_address(sg)
#endif
/* <scsi/scsi_cmnd.h> */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) || \

11
srpt/Makefile
View File

@@ -212,6 +212,11 @@ conftest/ib_set_cpi_resp_time/result-$(KVER).txt: \
echo "$(call run_conftest,ib_set_cpi_resp_time, \
-DHAVE_IB_SET_CPI_RESP_TIME)" >"$@"
conftest/ib_sg_dma_len/result-$(KVER).txt: \
conftest/ib_sg_dma_len/ib_sg_dma_len.c \
conftest/ib_sg_dma_len/Makefile
echo "$(call run_conftest_bool,ib_sg_dma_len,HAVE_IB_SG_DMA_LEN)" >"$@"
conftest/mad_handler_takes_send_buf/result-$(KVER).txt: \
conftest/mad_handler_takes_send_buf/mad_handler_takes_send_buf.c\
conftest/mad_handler_takes_send_buf/Makefile
@@ -269,6 +274,12 @@ conftest/register_mad_agent/result-$(KVER).txt: \
echo "$(call run_conftest,register_mad_agent, \
-DREGISTER_MAD_AGENT_HAS_FLAGS_ARG)" >"$@"
conftest/srp_data_desc_imm/result-$(KVER).txt: \
conftest/srp_data_desc_imm/srp_data_desc_imm.c \
conftest/srp_data_desc_imm/Makefile
echo "$(call run_conftest_bool,srp_data_desc_imm, \
HAVE_SRP_DATA_DESC_IMM)" >"$@"
conftest/srp_login_req_rdma/result-$(KVER).txt: \
conftest/srp_login_req_rdma/srp_login_req_rdma.c \
conftest/srp_login_req_rdma/Makefile

3
srpt/conftest/ib_sg_dma_len/Makefile Normal file
View File

@@ -0,0 +1,3 @@
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
obj-m += ib_sg_dma_len.o

11
srpt/conftest/ib_sg_dma_len/ib_sg_dma_len.c Normal file
View File

@@ -0,0 +1,11 @@
#include <linux/module.h>
#include <rdma/ib_verbs.h>
#undef ib_sg_dma_len
static int modinit(void)
{
return ib_sg_dma_len != NULL;
}
module_init(modinit);

3
srpt/conftest/srp_data_desc_imm/Makefile Normal file
View File

@@ -0,0 +1,3 @@
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
obj-m += srp_data_desc_imm.o

9
srpt/conftest/srp_data_desc_imm/srp_data_desc_imm.c Normal file
View File

@@ -0,0 +1,9 @@
#include <linux/module.h>
#include <scsi/srp.h>
static int modinit(void)
{
return SRP_DATA_DESC_IMM;
}
module_init(modinit);

9
srpt/src/ib_srpt.h
View File

@@ -66,7 +66,12 @@
struct srpt_nexus;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 21, 0)
#if !HAVE_IB_SG_DMA_LEN
#define ib_sg_dma_len(dev, sg) sg_dma_len(sg)
#define ib_sg_dma_address(dev, sg) sg_dma_address(sg)
#endif
#if !HAVE_SRP_DATA_DESC_IMM
enum {
SRP_DATA_DESC_IMM = 3,
SRP_IMMED_REQUESTED = 0x80,
@@ -164,7 +169,7 @@ enum {
SRP_CMD_ORDERED_Q = 0x2,
SRP_CMD_ACA = 0x4,
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 21, 0)
#if !HAVE_SRP_DATA_DESC_IMM
SRP_LOGIN_RSP_MULTICHAN_NO_CHAN = 0x0,
SRP_LOGIN_RSP_MULTICHAN_TERMINATED = 0x1,
SRP_LOGIN_RSP_MULTICHAN_MAINTAINED = 0x2,