From d5d2065ecad7c9eeac5a3732b7902531fad254ce Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Sat, 2 Mar 2013 04:36:53 +0000 Subject: [PATCH] Post r4779 safety measure to ensure that SCST core and target drivers see the same size of SCST structures. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4781 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/README | 8 ++++---- scst/README_in-tree | 2 +- scst/include/scst.h | 5 +++++ scst/src/Makefile | 3 --- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scst/README b/scst/README index 02acef03a..1d06d30e4 100644 --- a/scst/README +++ b/scst/README @@ -248,7 +248,7 @@ Compilation options ------------------- There are the following compilation options, that could be commented -in/out in Makefile: +in/out in Makefile and scst.h: - CONFIG_SCST_DEBUG - if defined, turns on some debugging code, including some logging. Makes the driver considerably bigger and slower, @@ -1688,9 +1688,9 @@ In order to get the maximum performance you should: 1. For SCST: - - Disable in Makefile CONFIG_SCST_STRICT_SERIALIZING, CONFIG_SCST_EXTRACHECKS, - CONFIG_SCST_TRACING, CONFIG_SCST_DEBUG*, CONFIG_SCST_STRICT_SECURITY, - CONFIG_SCST_MEASURE_LATENCY + - Disable in Makefile and scst.h CONFIG_SCST_STRICT_SERIALIZING, + CONFIG_SCST_EXTRACHECKS, CONFIG_SCST_TRACING, CONFIG_SCST_DEBUG*, + CONFIG_SCST_STRICT_SECURITY, CONFIG_SCST_MEASURE_LATENCY 2. For target drivers: diff --git a/scst/README_in-tree b/scst/README_in-tree index 530e3c18f..f6555627b 100644 --- a/scst/README_in-tree +++ b/scst/README_in-tree @@ -1208,7 +1208,7 @@ In order to get the maximum performance you should: 1. For SCST: - - Disable in Makefile CONFIG_SCST_STRICT_SERIALIZING, CONFIG_SCST_EXTRACHECKS, + - Disable CONFIG_SCST_STRICT_SERIALIZING, CONFIG_SCST_EXTRACHECKS, CONFIG_SCST_TRACING, CONFIG_SCST_DEBUG*, CONFIG_SCST_STRICT_SECURITY, CONFIG_SCST_MEASURE_LATENCY diff --git a/scst/include/scst.h b/scst/include/scst.h index 5e7b57054..9af3ce9a3 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -40,6 +40,11 @@ #define CONFIG_SCST_PER_DEVICE_CMD_COUNT_LIMIT #endif +/* #define CONFIG_SCST_MEASURE_LATENCY */ + +/* #define CONFIG_SCST_DEBUG_TM */ +/* #define CONFIG_SCST_TM_DBG_GO_OFFLINE */ + /* #define CONFIG_SCST_PROC */ #ifdef CONFIG_SCST_PROC diff --git a/scst/src/Makefile b/scst/src/Makefile index fca29a63f..6e81e007b 100644 --- a/scst/src/Makefile +++ b/scst/src/Makefile @@ -138,14 +138,11 @@ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -fno-inline -fno-inline-functions -#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_TM -DCONFIG_SCST_TM_DBG_GO_OFFLINE #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_RETRY #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_OOM #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_SN #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_SYSFS_EAGAIN -#EXTRA_CFLAGS += -DCONFIG_SCST_MEASURE_LATENCY - # If defined, makes SCST zero allocated data buffers. # Undefining it considerably improves performance and eases CPU load, # but could create a security hole (information leakage), so