Files
scst/scripts/generate-kernel-patch
Yan Burman 0d0d959485 Merged revisions 5246-5256,5260,5264,5266-5277,5281-5296,5300-5312,5315-5316,5320 via svnmerge from
svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/trunk

........
  r5246 | vlnb | 2014-01-29 05:30:24 +0200 (Wed, 29 Jan 2014) | 3 lines
  
  Put CDB control byte parsing in one place
........
  r5247 | vlnb | 2014-01-29 06:16:58 +0200 (Wed, 29 Jan 2014) | 3 lines
  
  Better version of the previous patch
........
  r5248 | vlnb | 2014-01-30 03:40:48 +0200 (Thu, 30 Jan 2014) | 7 lines
  
  [PATCH 1/2] scst_sysfs: Make it easier to add new target sysfs attributes
  
  This patch does not change any functionality.
  
  Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
  r5249 | vlnb | 2014-01-30 03:41:54 +0200 (Thu, 30 Jan 2014) | 10 lines
  
  [PATCH 2/2] scst_sysfs: Add I/O statistics per target
  
  Although it is possible to obtain these statistics by iterating over
  all sessions and by computing the sum of the per-target statistics,
  make per-target statistics directly available such that these can be
  retrieved easily.
  
  Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
  r5250 | vlnb | 2014-01-30 04:32:44 +0200 (Thu, 30 Jan 2014) | 3 lines
  
  Update for 3.13 kernels
........
  r5251 | bvassche | 2014-01-30 11:16:27 +0200 (Thu, 30 Jan 2014) | 1 line
  
  nightly build: Add kernel 3.13 build infrastructure
........
  r5252 | bvassche | 2014-01-30 11:30:18 +0200 (Thu, 30 Jan 2014) | 1 line
  
  scripts/kernel-functions: Add a bug fix for the kernel 3.13 series that is not yet present in the kernel 3.13 stable series
........
  r5253 | bvassche | 2014-01-30 11:31:32 +0200 (Thu, 30 Jan 2014) | 1 line
  
  nightly build: Add kernel version 3.13.1
........
  r5254 | vlnb | 2014-01-31 04:32:02 +0200 (Fri, 31 Jan 2014) | 10 lines
  
  scst_pres: Simplify PR locking
  
  Since the time during which a PR read or write lock is held is short,
  use a mutex to implement PR read and write locking. So although this
  patch excludes multiple simultaneous readers that shouldn't affect the
  time needed to process a PR operation measurably.
  
  Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
  r5255 | vlnb | 2014-01-31 04:33:11 +0200 (Fri, 31 Jan 2014) | 5 lines
  
  scst_vdisk: Check that "filename" is specified at most once
  
  Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
  r5256 | vlnb | 2014-01-31 04:35:20 +0200 (Fri, 31 Jan 2014) | 5 lines
  
  scst_vdisk: Sort "add_device_parameters" alphabetically
  
  Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
  r5260 | bvassche | 2014-02-03 11:03:03 +0200 (Mon, 03 Feb 2014) | 1 line
  
  scripts/list-source-files: Handle Mercurial subdirectories properly
........
  r5264 | bvassche | 2014-02-06 14:46:51 +0200 (Thu, 06 Feb 2014) | 9 lines
  
  scst_local: Fix a kernel oops for kernel versions < 2.6.37
  
  Avoid that scst_local triggers "BUG: unable to handle kernel NULL
  pointer dereference" on kernel versions before 2.6.37. This patch
  fixes a regression introduced via patch "scst_local: Avoid
  deadlock during module removal with kernel 3.6" (trunk r4566).
  
  Reported-by: Sebastian Herbszt <herbszt@gmx.de>
........
  r5266 | bvassche | 2014-02-06 15:30:06 +0200 (Thu, 06 Feb 2014) | 14 lines
  
  Hush Coverity warning of scst_ws_push_single_write() uninitialized pointer
  
  Coverity warns that sgv may be used uninitialized. The warning
  applies to WRITE SAME commands with LBDATA == PBDATA == 0 (replicate
  a single block of user data into the specified LBA range).
  
  The warning appears to be spurious - when LBDATA == PBDATA == 0,
  scst_ws_write_cmd_finished() will not use the uninitialized value
  saved by scst_ws_push_single_write().
  
  Move initialization of sgv earlier in the function to quiesce the warning.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
........
  r5267 | bvassche | 2014-02-06 15:38:28 +0200 (Thu, 06 Feb 2014) | 7 lines
  
  qla2x00t: Re-sync help text with the code
  
  The ql2xfdmienable module parameter defaults to 1, but the help text
  claims it defaults to zero.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
........
  r5268 | bvassche | 2014-02-06 16:17:49 +0200 (Thu, 06 Feb 2014) | 6 lines
  
  ib_srpt: Avoid that disabling a target triggers a race condition
  
  Avoid that disabling a target triggers a race condition with
  SRP relogin. At least in theory this race condition could result
  in a kernel crash.
........
  r5269 | bvassche | 2014-02-07 09:31:38 +0200 (Fri, 07 Feb 2014) | 9 lines
  
  scst_sysfs: Fix a build failure on kernels 2.6.2[678]
  
  The sysfs API is supported from kernel 2.6.26 on and uses the swap()
  macro while the swap() macro was introduced in kernel 2.6.29. Hence
  provide a definition of the swap() macro for kernels before 2.6.29.
  
  Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
  [bvanassche: Moved swap() definition a few lines down and added #ifndef/#endif]
........
  r5270 | bvassche | 2014-02-07 09:45:15 +0200 (Fri, 07 Feb 2014) | 2 lines
  
  regression tests: Run the 2.6.26..2.6.32 tests on the sysfs code instead of procfs
........
  r5271 | bvassche | 2014-02-07 10:11:28 +0200 (Fri, 07 Feb 2014) | 1 line
  
  nightly build: Update kernel versions
........
  r5272 | bvassche | 2014-02-07 14:43:25 +0200 (Fri, 07 Feb 2014) | 16 lines
  
  scst_user, rt: Wake command processing thread when needed
  
  In a fully-preemptible realtime kernel (CONFIG_PREEMPT_RT_FULL=y),
  SCSI commands from an initiator time out because the userland target
  application is never woken to process them.
  
  This is because in a fully-preemptible realtime kernel, soft-IRQ
  (tasklet) execution always occurs in a ksoftirqd thread and
  preempt_count is not manipulated on soft-IRQ processing entry/exit.
  This makes in_interrupt() useless for determining whether soft-IRQ
  processing is occurring; instead, in_serving_softirq() should be
  used for that purpose.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
  [bvanassche: Elaborated source code comment]
........
  r5273 | bvassche | 2014-02-07 14:46:39 +0200 (Fri, 07 Feb 2014) | 9 lines
  
  scst_vdisk: Build fix for kernels 2.6.27..2.6.30
  
  add_to_page_cache_lru and __lock_page_killable are exported since
  kernel version 2.6.30. See also patch "Staging: pohmelfs: kconfig/makefile
  and vfs changes" (commit 18bc0bbd162e3eb3e7ea2953c315ad4113a57164;
  included in kernel v2.6.30). 
  
  Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
........
  r5274 | vlnb | 2014-02-08 03:04:27 +0200 (Sat, 08 Feb 2014) | 9 lines
  
  scst_user: Convert sgv_purge_interval to jiffies before use
  
  The sgv_purge_interval from userland is passed down without conversion to
  jiffies. Yet, if it is zero, the default value is (60 * HZ).
  Convert to jiffies before passing down.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
........
  r5275 | vlnb | 2014-02-08 03:52:03 +0200 (Sat, 08 Feb 2014) | 19 lines
  
  Fix spurious BUG when parse_type != SCST_USER_PARSE_STANDARD
  
  Changeset 4224 introduced EXTRACHECKS for valid lba/data_len and state
  at the end of the parsing phase of command processing.
  However, the checks do not account for deferral of parsing to userland,
  as occurs when SCST_USER_PARSE_CALL or SCST_USER_PARSE_EXCEPTION are specified.
  In such cases the checks report errors on commands that userland has not yet
  had an opportunity to parse.
  
  NOTE: this includes a refactoring of the EXTRACHECKS to improve clarity.
        The rework is not exactly equivalent to the original code, but does
        conform to the comments describing the original code.
        Specifically, the original code would not trap an illegal command state
        unless there was also an illegal lba or data_len.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
  with some improvements
........
  r5276 | bvassche | 2014-02-08 10:24:28 +0200 (Sat, 08 Feb 2014) | 1 line
  
  scst: Build fix for kernel versions before 2.6.37
........
  r5277 | bvassche | 2014-02-09 18:50:10 +0200 (Sun, 09 Feb 2014) | 1 line
  
  scst_debug.h: Avoid that the sBUG() and sBUG_ON() definitions confuse the smatch static code checker
........
  r5281 | vlnb | 2014-02-13 06:02:56 +0200 (Thu, 13 Feb 2014) | 8 lines
  
  iscsi-scst: fix offset calculation
  
  Fixed a subtle bug in iSCSI-SCST with incorrectly calculated offsets
  for non-page aligned transfers. Originally discovered, investigated and
  fix suggested by Кирилл Тюшев, then Shahar Salzman tested and proved it.
  See http://sourceforge.net/mailarchive/message.php?msg_id=31924078
........
  r5282 | vlnb | 2014-02-13 06:15:31 +0200 (Thu, 13 Feb 2014) | 3 lines
  
  Web update
........
  r5283 | bvassche | 2014-02-14 15:05:55 +0200 (Fri, 14 Feb 2014) | 7 lines
  
  Makefiles: remove redundant 'depmod' invocations
  
  Running 'make modules_install' already triggers invocation of depmod,
  hence leave it out from those Makefiles that use 'make modules_install'.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
........
  r5284 | bvassche | 2014-02-14 15:48:54 +0200 (Fri, 14 Feb 2014) | 2 lines
  
  Makefiles: Convert from "install" to "make modules_install"
........
  r5285 | bvassche | 2014-02-14 16:46:11 +0200 (Fri, 14 Feb 2014) | 1 line
  
  mvsas_tgt/Makefile: Remove trailing whitespace
........
  r5286 | bvassche | 2014-02-14 17:52:10 +0200 (Fri, 14 Feb 2014) | 18 lines
  
  Makefiles: calculate KVER properly
      
  When deriving the kernel version (KVER) from KDIR, the file
  $(KDIR)/include/config/kernel.release should be preferred over
  'make kernelversion'.
  
  For example, the Ubuntu 3.2.0-23-generic kernel has a kernel.release
  file containing '3.2.0-23-generic', but 'make kernelversion' returns
  3.2.14. Since the modules are stored under /lib/modules/3.2.0-23-generic,
  the value in kernel.release is the correct one to use.
      
  Also:
  - Evaluate KVER only once
  - All depmod commands must include KVER
      
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
  [bvanassche: Split long lines / removed trailing whitespace]
........
  r5287 | bvassche | 2014-02-14 21:27:09 +0200 (Fri, 14 Feb 2014) | 1 line
  
  nightly build: Update kernel versions
........
  r5288 | bvassche | 2014-02-18 10:31:44 +0200 (Tue, 18 Feb 2014) | 22 lines
  
  scst, qla2x00t: Prevent inappropriate sleeping with a real-time kernel
  
  With a realtime kernel with full preemption (CONFIG_PREEMPT_RT_FULL),
  spinlocks can sleep, interrupt handlers run in thread context, and
  the standard local_irq functions manipulate preemptibility, not HW
  interruptibility. Under these conditions, most calls to local_irq
  functions should be replaced by no-ops. The CONFIG_PREEMPT_RT patch
  defines _nort versions of local_irq functions that compile away
  under CONFIG_PREEMPT_RT_FULL and compile to their "normal"
  equivalents otherwise.
  
  Define _nort equivalents to support compilation against both
  "normal" and RT-patched kernels, and use the _nort local_irq
  functons in cases where spinlocks are taken within a
  local_irq_save() or local_irq_disable() block.  Without these
  changes, runtime warnings about "sleeping function called from
  invalid context" occur.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
  [bvanassche: Edited patch description and comment in scst_priv.h]
........
  r5289 | bvassche | 2014-02-18 10:40:36 +0200 (Tue, 18 Feb 2014) | 13 lines
  
  Makefiles: respect DESTDIR when specified
  
  Not all SCST components handle DESTDIR properly, or at all.
  
  In particular:
  * INSTALL_MOD_PATH should account for DESTDIR when 'make modules_install'
    is invoked, so the kernel make infrastructure deploys the modules
    and runs depmod against the proper directory tree.
  * depmods must include a '-b' option to reference the proper directory tree.
  * Drop special ISCSI_DESTDIR.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
........
  r5290 | bvassche | 2014-02-18 10:41:30 +0200 (Tue, 18 Feb 2014) | 7 lines
  
  Makefiles: 'uninstall' target fixes
  
  Some components don't have 'uninstall' targets although the top-level
  Makefile references them. Some others don't remove the proper file.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
........
  r5291 | vlnb | 2014-02-19 05:45:48 +0200 (Wed, 19 Feb 2014) | 8 lines
  
  Fix incorrect start and length calculation for issuing block discard requests
  
  Block layer always expects start and length in 512 byte blocks, so they
  should be corrected for non-512b SCST devices.
  
  Original patch from Ken Raeburn <raeburn@permabit.com>
........
  r5292 | vlnb | 2014-02-19 06:06:10 +0200 (Wed, 19 Feb 2014) | 3 lines
  
  Cleanups
........
  r5293 | vlnb | 2014-02-19 06:21:00 +0200 (Wed, 19 Feb 2014) | 12 lines
  
  scst_user: Complete "Preparing" / "finished" symmetry
  
  Add some TRACE statements so events sent to userland are bracketed by
  "Preparing" and "finished". This makes it a little easier to find the
  boundaries between the various stages of command processing in trace output.
  
  Note, this patch does not implement a 'finished' message for TM events;
  there is already a "TM reply" message that can serve that purpose.
  
  Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
........
  r5294 | bvassche | 2014-02-19 09:38:57 +0200 (Wed, 19 Feb 2014) | 1 line
  
  nightly build: Update kernel versions
........
  r5295 | bvassche | 2014-02-19 10:51:35 +0200 (Wed, 19 Feb 2014) | 1 line
  
  scripts/blockdev-perftest: Fix bashisms
........
  r5296 | vlnb | 2014-02-20 07:54:49 +0200 (Thu, 20 Feb 2014) | 3 lines
  
  put_page_callback patch for 3.13.3+ kernels
........
  r5300 | vlnb | 2014-02-21 04:08:05 +0200 (Fri, 21 Feb 2014) | 3 lines
  
  Docs update
........
  r5301 | bvassche | 2014-02-21 09:44:55 +0200 (Fri, 21 Feb 2014) | 1 line
  
  nightly build: Add support for the put_page_callback-3.13.3 patch
........
  r5302 | bvassche | 2014-02-21 09:48:21 +0200 (Fri, 21 Feb 2014) | 1 line
  
  nightly build: Update kernel versions
........
  r5303 | bvassche | 2014-02-21 12:02:11 +0200 (Fri, 21 Feb 2014) | 1 line
  
  nightly build: Update kernel versions
........
  r5304 | bvassche | 2014-02-21 12:09:45 +0200 (Fri, 21 Feb 2014) | 1 line
  
  nightly build: Update kernel versions
........
  r5305 | bvassche | 2014-02-24 08:56:05 +0200 (Mon, 24 Feb 2014) | 1 line
  
  nightly build: Update kernel versions
........
  r5306 | bvassche | 2014-02-24 08:56:44 +0200 (Mon, 24 Feb 2014) | 1 line
  
  Spelling fix: initator -> initiator
........
  r5307 | bvassche | 2014-02-24 09:30:50 +0200 (Mon, 24 Feb 2014) | 1 line
  
  make rpm: Do not remove rpmbuilddir
........
  r5308 | bvassche | 2014-02-24 09:39:45 +0200 (Mon, 24 Feb 2014) | 5 lines
  
  scst_local: Add newline to sysfs output
  
  Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
  [bvanassche: Reduced source code line length to 80 columns]
........
  r5309 | bvassche | 2014-02-25 12:55:36 +0200 (Tue, 25 Feb 2014) | 1 line
  
  put_page_callback-3.12.11.patch: Add
........
  r5310 | bvassche | 2014-02-25 12:57:27 +0200 (Tue, 25 Feb 2014) | 1 line
  
  put_page_callback-3.10.30.patch: Add
........
  r5311 | bvassche | 2014-02-25 12:58:08 +0200 (Tue, 25 Feb 2014) | 1 line
  
  nightly build: Add support for kernels >= 3.10.30 and >= 3.12.11
........
  r5312 | bvassche | 2014-02-25 12:59:54 +0200 (Tue, 25 Feb 2014) | 1 line
  
  nightly build: Update kernel versions
........
  r5315 | vlnb | 2014-02-26 04:32:39 +0200 (Wed, 26 Feb 2014) | 3 lines
  
  Make internal memory layout more cache friendly
........
  r5316 | vlnb | 2014-02-26 04:49:38 +0200 (Wed, 26 Feb 2014) | 5 lines
  
  scst_vdisk: Make vendor, product ID and related fields configurable via sysfs
  
  Signed-off-by: Bart Van Assche <bvanassche@acm.org>
........
  r5320 | bvassche | 2014-03-02 10:49:50 +0200 (Sun, 02 Mar 2014) | 1 line
  
  Documentation spelling fix: change INQUERY into INQUIRY
........


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5321 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-03-03 08:18:19 +00:00

771 lines
24 KiB
Bash
Executable File

#!/bin/bash
############################################################################
#
# Script for converting the SCST source tree as it exists in the Subversion
# repository to a Linux kernel patch.
#
# Copyright (C) 2008-2009 Bart Van Assche <bvanassche@acm.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation, version 2
# of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
############################################################################
########################
# Function definitions #
########################
source $(dirname $0)/kernel-functions
function usage {
echo "Usage: $0 [-d] [-h] [-m] [-n] [-p <dir>] [-s] [-u] <kernel version>"
echo "where: "
echo " -d - enable patch specialization debugging"
echo " -h - show this text"
echo " -m - add mpt target driver"
echo " -n - do not delete code disabled via preprocessor statements"
echo " -p - generate multiple patches instead of one big patch into"\
"the specified directory."
echo " -s - disable patch specialization."
echo " -u - enables #define GENERATING_UPSTREAM_PATCH."
}
# Convert an existing patch.
# $1: path of patch to be added.
# $2: path in kernel tree of file to be patched.
function add_patch {
if [ ! -e "$1" ]; then
echo "Error: could not find $1." >&2
exit 1
fi
sed -e "s:^--- [^ ]*:--- orig/linux-${kver}/$2:" \
-e "s:^+++ [^ ]*:+++ linux-${kver}/$2:" \
< "$1"
}
# Generate a patch for a file to be added to the kernel source tree, and strip
# trailing whitespace from C source files while converting the file to patch
# format.
# $1: path of file to be added.
# $2: path in kernel tree where file should be added.
function add_file {
local a b
if [ ! -e "$1" ]; then
echo "Error: could not find $1." >&2
exit 1
fi
# Only include files that were not generated by the build process
# -- skip *.mod.c.
if [ "$1" = "${1%.mod.c}" -a "$1" ]; then
cat <<EOF
diff -uprN orig/linux-${kver}/$2 linux-${kver}/$2
--- orig/linux-${kver}/$2
+++ linux-${kver}/$2
@@ -0,0 +1,$(wc -l "$1" | { read a b; echo $a; }) @@
EOF
# Insert a '+'-sign at the start of each line.
sed -e 's/^/+/' < "$1" | \
if [ "${replace_sbug_by_bug}" = "true" ]; then
sed -e 's/sBUG(\([^)]*\)/BUG(\1/g' -e 's/sBUG_ON(\([^)]*\)/BUG_ON(\1/g'
else
cat
fi \
| \
if [ "${2%.[ch]}" != "$2" ]; then
# Make sure that labels (goto-targets) are left-aligned.
sed -e 's/^ \([^ ]*:\)$/\1/'
else
cat
fi
fi
}
function add_empty_file {
local a b
cat <<EOF
diff -uprN orig/linux-${kver}/$1 linux-${kver}/$1
--- orig/linux-${kver}/$1
+++ linux-${kver}/$1
@@ -0,0 +1,1 @@
+
EOF
}
# Run the script specialize_patch with appropriate options on the patch
# passed via stdin and send the specialized patch to stdout.
function specialize_patch {
if [ "${enable_specialize}" = "true" ]; then
"$(dirname $0)/specialize-patch" \
${specialize_patch_options} \
-v kernel_version="${kver3}" \
-v SCSI_EXEC_REQ_FIFO_DEFINED="${scsi_exec_req_fifo_defined}" \
-v SCST_IO_CONTEXT="${scst_io_context}" \
| if [ "${generating_upstream_patch}" = "true" ]; then
scripts/filter-trace-entry-exit
else
cat
fi
else
cat
fi
}
# Read a patch from stdin, specialize it for kernel version ${kver}
# and write the output either to stdout or to the file $1 (if not empty),
# depending on the value of the variable ${multiple_patches}.
function process_patch {
local tmppatch
if [ "${multiple_patches}" = "true" ]; then
if [ "$1" != "" ]; then
if [ -e "${patchdir}/$1" ]; then
echo "Warning: overwriting ${patchdir}/$1"
fi
tmppatch="$(/bin/mktemp)"
(
specialize_patch
) >"${tmppatch}"
touch "${tmppatch}"
{
if [ -e /usr/bin/diffstat ]; then
awk 'BEGIN{h=1}/^diff/{h=0}/^---/{h=0}h!=0{print}' < "${tmppatch}"
echo "---"
diffstat "${tmppatch}"
echo ""
awk 'BEGIN{h=1}/^diff/{h=0}/^---/{h=0}h==0{print}' < "${tmppatch}"
fi
} \
> "${patchdir}/$(basename $1)"
rm -f "${tmppatch}"
else
# echo "Discarded $(wc -l) lines."
true
fi
else
specialize_patch
fi
}
# Returns 0 (true) if SCST core file "$1" should be added in a separate patch,
# and 1 (false) if not.
function in_separate_patch {
echo "${source_files_in_separate_patch}" | grep -qE "^$1 | $1 | $1\$|^$1\$"
}
#########################
# Argument verification #
#########################
debug_specialize="false"
enable_specialize="true"
generating_upstream_patch="false"
mpt_scst="false"
multiple_patches="false"
patchdir=""
qla2x00t="true"
replace_sbug_by_bug="true"
specialize_patch_options="-v delete_disabled_code=1"
srpt="true"
if [ ! -e scst -o ! -e iscsi-scst -o ! -e srpt -o ! -e scst_local ]; then
echo "Please run this script from inside the SCST subversion source tree."
exit 1
fi
set -- $(/usr/bin/getopt dhlmnp:su "$@")
while [ "$1" != "${1#-}" ]
do
case "$1" in
'-d') debug_specialize="true"; shift;;
'-h') usage; exit 1;;
'-l') shift;;
'-m') mpt_scst="true"; shift;;
'-n') specialize_patch_options="-v blank_deleted_code=1"
shift
;;
'-p') multiple_patches="true"; patchdir="$2"; shift; shift;;
'-s') enable_specialize="false"; shift;;
'-u') generating_upstream_patch="true"; shift;;
'--') shift;;
*) usage; exit 1;;
esac
done
if [ $# != 1 ]; then
usage
exit 1
fi
# Strip patch level from the kernel version number.
kver="$(kernel_version "$1")"
# kver3: first three components of the version number.
if [ "${1#2.}" != "$1" ]; then
kver3="$kver"
else
kver3="$1"
fi
# Include fcst in the patch for kernel versions 2.6.33 and later.
if [ "${kver}" ">" "2.6.32" ]; then
include_fcst="true"
else
include_fcst="false"
fi
# Make sure that for kernel 2.6.26 and later the line
# "#define CONFIG_SCST_PROC" is removed from scst/include/scst.h.
if grep -qw scst_sysfs scst/kernel/in-tree/Makefile.scst-${kver} \
|| [ "${generating_upstream_patch}" = "true" ];
then
specialize_patch_options="${specialize_patch_options} -v config_scst_proc_undefined=1"
else
include_proc_impl="true"
fi
if [ "${debug_specialize}" = "true" ]; then
specialize_patch_options="${specialize_patch_options} -v debug=1"
fi
if [ "${generating_upstream_patch}" = "true" ]; then
specialize_patch_options="${specialize_patch_options} -v generating_upstream_patch_defined=1 -v config_tcp_zero_copy_transfer_completion_notification_undefined=1"
fi
if [ "${multiple_patches}" = "true" ]; then
if [ -e "${patchdir}" ]; then
echo "Patch output directory ${patchdir} already exists."
fi
mkdir -p "${patchdir}"
if [ ! -d "${patchdir}" ]; then
echo "Error: ${patchdir} is not a directory."
fi
fi
####################
# Patch Generation #
####################
for f in fcst/linux-patches/series-${kver}*
do
if [ -e "$f" ]; then
fcst_patch_series="$f"
fi
done
# General kernel patches.
scsi_exec_req_fifo_defined=0
scst_io_context=0
for p in scst/kernel/*-${kver}.patch \
$(if [ ${kver} = 3.7 ] && [ "${1#3.7.}" -ge 10 ]; then
echo iscsi-scst/kernel/patches/*-3.7.10.patch;
elif [ ${kver} = 3.10 ] && [ "${1#3.10.}" -ge 30 ]; then
echo iscsi-scst/kernel/patches/*-3.10.30.patch;
elif [ ${kver} = 3.12 ] && [ "${1#3.12.}" -ge 11 ]; then
echo iscsi-scst/kernel/patches/*-3.12.11.patch;
elif [ ${kver} = 3.13 ] && [ "${1#3.13.}" -ge 3 ]; then
echo iscsi-scst/kernel/patches/*-3.13.3.patch;
else
echo iscsi-scst/kernel/patches/*-${kver}.patch;
fi)
do
# Exclude the put_page_callback patch when command-line option -u has been
# specified since the current approach is not considered acceptable for
# upstream kernel inclusion. See also http://lkml.org/lkml/2008/12/11/213.
if [ "${generating_upstream_patch}" = "false" \
-o "${p#iscsi-scst/kernel/patches/put_page_callback}" = "$p" ]
then
if grep -q '^\+#define SCSI_EXEC_REQ_FIFO_DEFINED$' "${p}"; then
scsi_exec_req_fifo_defined=1
fi
if grep -q '^\+#define SCST_IO_CONTEXT$' "${p}"; then
scst_io_context=1
fi
diffname="${p#scst/kernel/}"
diffname="${p%-${kver}.patch}.diff"
process_patch < "$p" "${diffname}"
fi
done
scst_03_public_headers="scst/include/scst.h scst/include/scst_const.h"
scst_04_main="scst/src/scst_main.c scst/src/scst_module.c scst/src/scst_priv.h"
scst_05_targ="scst/src/scst_targ.c"
scst_06_lib="scst/src/scst_lib.c"
scst_07_pres="scst/src/scst_pres.h scst/src/scst_pres.c"
scst_08_sysfs="scst/src/scst_sysfs.c"
scst_09_debug="scst/include/scst_debug.h scst/src/scst_debug.c"
scst_proc="scst/src/scst_proc.c"
scst_10_sgv="scst/include/scst_sgv.h scst/src/scst_mem.h scst/src/scst_mem.c doc/sgv_cache.sgml"
scst_user="scst/include/scst_user.h scst/src/dev_handlers/scst_user.c"
scst_13_vdisk="scst/src/dev_handlers/scst_vdisk.c"
scst_14_tg="scst/src/scst_tg.c"
separate_patches="scst_03_public_headers scst_04_main scst_05_targ scst_06_lib scst_07_pres scst_08_sysfs scst_09_debug scst_10_sgv scst_user scst_13_vdisk scst_14_tg"
if [ "$include_proc_impl" = "true" ]; then
separate_patches+=" scst_proc"
fi
source_files_in_separate_patch=""
for s in ${separate_patches}
do
source_files_in_separate_patch+=" $(set | \
sed -n -e "s/^$s='\(.*\)'$/\1/p" -e "s/^$s=\(.*\)$/\1/p")"
done
# Directory drivers/
(
add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" \
"drivers/Kconfig"
add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kver}.patch"\
"drivers/Makefile"
) \
| process_patch "scst_01_drivers_kbuild.diff"
# Directory drivers/scst/
(
tmpdir="/tmp/scst-$$"
mkdir -p "${tmpdir}"
tmp_Kconfig="${tmpdir}/Kconfig.scst-${kver}"
cat "scst/kernel/in-tree/Kconfig.scst" | \
if [ "${include_fcst}" ]; then
cat
else
grep -v '^source "drivers/scst/fcst/Kconfig"$'
fi >"${tmp_Kconfig}"
add_file "${tmp_Kconfig}" "drivers/scst/Kconfig"
tmp_Makefile="${tmpdir}/Makefile.scst-${kver}"
cat "scst/kernel/in-tree/Makefile.scst-${kver}" | \
if [ "$include_proc_impl" != "true" ]; then
grep -v 'scst_proc'
else
cat
fi | \
if [ "${include_fcst}" -a "${kver}" != "2.6.37" -a "${kver}" != "2.6.38" ]; then
cat
else
sed -e 's: fcst/* : :'
fi >"$tmp_Makefile"
add_file "$tmp_Makefile" "drivers/scst/Makefile"
rm -rf "${tmpdir}"
) \
| process_patch "scst_02_scst_kbuild.diff"
for s in ${separate_patches}
do
fileset=$s
for f in $(set | grep "^$s=" | sed -e "s/^$s='\(.*\)'\$/\1/" -e "s/^$s=\(.*\)\$/\1/")
do
if [ "${f#scst/include}" != "${f}" ]; then
add_file "${f}" "include/scst/${f#scst/include/}"
elif [ "${f#doc}" != "${f}" ]; then
add_file "${f}" "Documentation/scst/${f#doc/}"
else
add_file "${f}" "drivers/scst/${f#scst/src/}"
fi
done \
| process_patch "${s}.diff"
done
{
add_file "scst/README_in-tree" "Documentation/scst/README.scst"
add_file "scst/SysfsRules" "Documentation/scst/SysfsRules"
} | process_patch "scst_11_core_doc.diff"
# Directory drivers/scst/dev_handlers/
add_file "scst/kernel/in-tree/Makefile.dev_handlers-${kver}" \
"drivers/scst/dev_handlers/Makefile" \
| process_patch "scst_11_dev_handlers_makefile.diff"
for f in $(ls scst/src/dev_handlers/*.[ch] 2>/dev/null)
do
if ! in_separate_patch "${f}"; then
add_file "${f}" "drivers/scst/dev_handlers/${f#scst/src/dev_handlers/}"
fi
done \
| process_patch "scst_14_passthrough.diff"
# Directory drivers/scst/fcst/
{
if [ -e "${fcst_patch_series}" ]; then
for f in $(grep -v '^#' "${fcst_patch_series}")
do
cat "fcst/linux-patches/${f}"
done
fi
add_file "fcst/Makefile_in-tree" \
"drivers/scst/fcst/Makefile"
add_file "fcst/Kconfig" "drivers/scst/fcst/Kconfig"
for f in $(ls fcst/*.[ch] 2>/dev/null)
do
add_file "${f}" "drivers/scst/fcst/${f#fcst/}"
done
} \
| process_patch "fcst.diff"
add_file "fcst/README" "Documentation/scst/README.fcst" \
| process_patch "fcst-doc.diff"
# Directory drivers/scst/iscsi-scst/
# Make sure the file iscsi-scst/iscsi_scst_itf_ver.h is up to date.
make -s -C iscsi-scst include/iscsi_scst_itf_ver.h
(
for f in $(ls iscsi-scst/include/*h 2>/dev/null)
do
if [ "${f}" != "iscsi-scst/include/iscsi_scst_itf_ver.h" ]; then
add_file "${f}" "include/scst/${f#iscsi-scst/include/}"
fi
done
add_file "iscsi-scst/include/iscsi_scst_itf_ver.h" "include/scst/iscsi_scst_itf_ver.h"
add_file "iscsi-scst/kernel/Makefile.in-kernel" \
"drivers/scst/iscsi-scst/Makefile"
add_file "iscsi-scst/kernel/Kconfig" "drivers/scst/iscsi-scst/Kconfig"
for f in $(ls iscsi-scst/kernel/*.[ch] 2>/dev/null)
do
add_file "${f}" "drivers/scst/iscsi-scst/${f#iscsi-scst/kernel/}"
done
) \
| process_patch "iscsi-scst.diff"
add_file "iscsi-scst/README_in-tree" "Documentation/scst/README.iscsi" \
| process_patch "iscsi-scst-doc.diff"
# Directory drivers/scst/qla2x00-target/
if [ "${qla2x00t}" = "true" ]; then
( cd qla2x00t && ./generate-in-tree-patches "$1" )
for f in $(ls qla2x00t/in-tree-patches/"$1"/*.patch 2>/dev/null)
do
g="${f#qla2x00t/in-tree-patches/$1/}"
g="${g%.patch}"
add_patch "${f}" "drivers/scsi/qla2xxx/${g}"
done
add_file "qla2x00t/qla2x_tgt.h" \
"drivers/scsi/qla2xxx/qla2x_tgt.h"
add_file "qla2x00t/qla2x_tgt_def.h" \
"drivers/scsi/qla2xxx/qla2x_tgt_def.h"
add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" \
"drivers/scst/qla2xxx-target/Makefile"
add_file "qla2x00t/qla2x00-target/Kconfig" \
"drivers/scst/qla2xxx-target/Kconfig"
for f in $(ls qla2x00t/qla2x00-target/*.[ch] 2>/dev/null)
do
add_file "${f}" "drivers/scst/qla2xxx-target/${f#qla2x00t/qla2x00-target/}"
done
add_file "qla2x00t/qla2x00-target/README" \
"Documentation/scst/README.qla2x00t" \
| process_patch "qla2x00t-doc.diff"
else
add_empty_file "drivers/scst/qla2xxx-target/Makefile"
add_empty_file "drivers/scst/qla2xxx-target/Kconfig"
fi \
| process_patch "qla2x00t.diff"
# Directory drivers/scst/srpt
{
cat <<EOF
This patch adds the kernel module ib_srpt, which is a SCSI RDMA Protocol (SRP)
target implementation. This driver uses the InfiniBand stack and the SCST core.
It is a high performance driver capable of handling 600K+ 4K random write
IOPS by a single target as well as 2.5+ GB/s sequential throughput over
a single QDR IB port.
It was originally developed by Vu Pham (Mellanox) and has been optimized by
Bart Van Assche.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Vu Pham <vu@mellanox.com>
Cc: Roland Dreier <rdreier@cisco.com>
Cc: David Dillow <dillowda@ornl.gov>
EOF
if [ "$srpt" = "true" ]; then
add_file "srpt/README_in-tree" "Documentation/scst/README.srpt"
add_file "srpt/src/Kconfig" "drivers/scst/srpt/Kconfig"
add_file "srpt/src/Makefile.in_kernel" "drivers/scst/srpt/Makefile"
for f in $(ls srpt/src/*.[ch] 2>/dev/null)
do
add_file "${f}" "drivers/scst/srpt/${f#srpt/src/}"
done
else
add_empty_file "drivers/scst/srpt/Kconfig"
add_empty_file "drivers/scst/srpt/Makefile"
fi \
} | process_patch "scst_17_srpt.diff"
# Directory drivers/message/fusion/mpt_scst
if [ "$mpt_scst" = "true" ]; then
(
add_patch "mpt/in-tree/Kconfig-2.6.24.diff" "drivers/message/fusion/Kconfig"
add_patch "mpt/in-tree/Makefile.diff" "drivers/message/fusion/Makefile"
add_file "mpt/in-tree/Makefile" "drivers/message/fusion/mpt_scst/Makefile"
add_file "mpt/in-tree/Kconfig" "drivers/message/fusion/mpt_scst/Kconfig"
for f in $(ls mpt/*.[ch] 2>/dev/null)
do
add_file "${f}" "drivers/message/fusion/mpt_scst/${f#mpt/}"
done
) \
| process_patch "mpt_scst.diff"
fi
# Directory drivers/scst/scst_local
(
add_file "scst_local/README" "Documentation/scst/README.scst_local"
add_file "scst_local/in-tree/Kconfig" "drivers/scst/scst_local/Kconfig"
add_file "scst_local/in-tree/Makefile-${kver}" "drivers/scst/scst_local/Makefile"
add_file "scst_local/scst_local.c" "drivers/scst/scst_local/scst_local.c"
) \
| process_patch "scst_16_local.diff"
# Directory drivers/scsi/ibmvstgt
{
( cd ibmvstgt && ./generate-in-tree-patches "${kver}" )
if [ -e "ibmvstgt/in-tree-patches/${kver}" ]; then
if [ "${multiple_patches}" = "true" ]; then
cat <<EOF
[SCSI] ibmvstgt: Port from tgt to SCST
The ibmvstgt and libsrp kernel modules as included in the 2.6.37 kernel are
based on the tgt SCSI target framework. Both kernel modules need the scsi_tgt
kernel module and the tgtd user space process in order to function
properly. This patch modifies the ibmvstgt and libsrp kernel modules such that
both use the SCST storage target framework instead of tgt. As a result,
neither the scsi_tgt kernel module nor the tgtd user space process are any
more necessary when using the ibmvstgt driver.
This patch introduces one backwards-incompatible change, namely that the path
of the ibmvstgt sysfs attributes is modified. This change is unavoidable
because this patch dissociates ibmvstgt SRP sessions from a SCSI host
instance. Since the user space STGT driver ibmvio was the only user of
these attributes, that shouldn't be an issue.
Changes in ibmvstgt compared to kernel 2.6.36:
- Increased maximum data size for a single SRP command from 128 KB to 64 MB
such that an initiator is not forced to split large transfers into
multiple SCSI commands.
- The maximum RDMA transfer size supported by a single H_COPY_RDMA call is
queried at driver initialization time from the open firmware tree / larger
transfers than 128 KB are now supported too.
- If DMA mapping fails while handling a READ or WRITE command, the offending
command is retried until the associated data has been transferred instead of
reporting to the ibmvscsi client that the SCSI command failed.
- VSCSI command/response queue: one element has been reserved for management
datagrams since these fall outside the SRP credit mechanism. Added a compile-
time check whether the size of this queue is a power of two.
- Fixed a race condition which in theory could have caused the VSCSI receive
queue to overflow: srp_iu_put() is now invoked before a response is sent back
to the initiator instead of after.
- Moved enum iue_flags from libsrp to ibmvstgt because it is ibmvstgt-specific.
- Removed a variable that was modified but never read from ibmvstgt_rdma().
- ibmvstgt_probe(): changed the datatype of the variable "dma" from
unsigned * into const unsigned * such that a cast could be removed.
- Fixed all compiler and sparse warnings (C=2 CF=-D__CHECK_ENDIAN__).
Changes in libsrp compared to kernel 2.6.36:
- Renamed vscsis_data_length() into srp_data_length() and exported
this function.
- All error messages reported via printk() do now have prefix KERN_ERR.
- modified srp_target_alloc() and srp_target_free() such that the
driver-private data reflects whether or not target data has been allocated.
This change was necessary to avoid that ibmvstgt_remove() triggers a
NULL-pointer dereference if ibmvstgt_probe() failed.
- srp_transfer_data(): All three return statements related to DMA mapping
failure do now return -ENOMEM instead of 0, -EIO and -ENOMEM.
- srp_direct_data(): Removed the ext_desc argument since not used.
- srp_direct_data() and srp_indirect_data(): Use DMA_TO/FROM_DEVICE
instead of DMA_BIDIRECTIONAL for the buffers mapped for transferring data
via DMA.
- struct srp_target: eliminated the information unit linked list and also the
V_FLYING flag since both were duplicating information managed by the SCST
core.
- Fixed all compiler and sparse warnings (C=2 CF=-D__CHECK_ENDIAN__).
Tests performed on a backport to kernel version 2.6.18 of this driver with a
Linux initiator system:
- Verified that the kernel module ibmvstgt loads and initializes successfully
and also that the client connects after loading.
- Verified that all virtual disks configured in scst_vdisk were discovered by
the client after rescanning the SCSI bus.
- Verified that after unloading and reloading ibmvstgt and after client
recovery that the initiator devices were functioning normally.
- Verified that after a client reboot ibmvscsic reconnected with the target
and that the target devices were again usable.
- Performed IO stress testing on the device.
- Verified that SCSI task abortion works correctly.
- Performed basic I/O performance testing. With a RAM disk as target linear
direct I/O throughput was above 2 GB/s and a random I/O test resulted in
about 30000 IOPS for all block sizes between 512 bytes and 16 KB.
Both initiator and target were dual core POWER6 LPAR systems.
Note: ibmvstgt is the only user of libsrp.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Brian King <brking@linux.vnet.ibm.com>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
EOF
fi
for f in \
drivers/scsi/ibmvscsi/ibmvstgt.c \
drivers/scsi/libsrp.c \
include/scsi/libsrp.h \
include/scsi/srp.h
do
patch="ibmvstgt/in-tree-patches/${kver}/$(basename $f).patch"
if [ -e "${patch}" ]; then
add_patch "${patch}" $f
fi
done
add_file "ibmvstgt/README.sysfs" "Documentation/powerpc/ibmvstgt.txt"
fi
} \
| process_patch "scst_18_ibmvstgt.diff"
{
( cd ibmvstgt && ./generate-in-tree-patches "${kver}" )
if [ -e "ibmvstgt/in-tree-patches/${kver}" ]; then
if [ "${multiple_patches}" = "true" ]; then
cat <<EOF
[SCSI] tgt: Removal
Because of the conversion of the ibmvstgt driver from tgt to SCST, and because
the ibmvstgt driver was the only user of scsi_tgt, the scsi_tgt kernel module,
the CONFIG_SCSI_TGT, CONFIG_SCSI_SRP_TGT_ATTRS and CONFIG_SCSI_FC_TGT_ATTRS
kbuild variable, the scsi_host_template member variables transfer_response,
supportedmode and active_mode and the constants MODE_UNKNOWN, MODE_INITIATOR
and MODE_TARGET are no longer needed.
Note: this patch applies cleanly on a 2.6.35 kernel tree. The patch tool
however complains about the defconfig changes when trying to apply this patch
on a 2.6.36 kernel tree.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
EOF
fi
for f in \
arch/arm/configs/at572d940hfek_defconfig \
arch/arm/configs/cam60_defconfig \
arch/arm/configs/s3c2410_defconfig \
arch/m68k/configs/amiga_defconfig \
arch/m68k/configs/apollo_defconfig \
arch/m68k/configs/atari_defconfig \
arch/m68k/configs/bvme6000_defconfig \
arch/m68k/configs/hp300_defconfig \
arch/m68k/configs/mac_defconfig \
arch/m68k/configs/multi_defconfig \
arch/m68k/configs/mvme147_defconfig \
arch/m68k/configs/mvme16x_defconfig \
arch/m68k/configs/q40_defconfig \
arch/m68k/configs/sun3_defconfig \
arch/m68k/configs/sun3x_defconfig \
arch/mips/configs/bcm47xx_defconfig \
arch/mips/configs/decstation_defconfig \
arch/mips/configs/ip22_defconfig \
arch/mips/configs/ip27_defconfig \
arch/mips/configs/ip32_defconfig \
arch/mips/configs/jazz_defconfig \
arch/mips/configs/malta_defconfig \
arch/mips/configs/markeins_defconfig \
arch/mips/configs/pnx8550-jbs_defconfig \
arch/mips/configs/pnx8550-stb810_defconfig \
arch/mips/configs/rm200_defconfig \
arch/mips/configs/tb0226_defconfig \
arch/mips/configs/tb0287_defconfig \
arch/powerpc/configs/52xx/motionpro_defconfig \
arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig \
arch/powerpc/configs/mpc5200_defconfig \
drivers/scsi/Kconfig \
drivers/scsi/Makefile \
drivers/scsi/hosts.c \
drivers/scsi/scsi_sysfs.c \
drivers/scsi/scsi_tgt_if.c \
drivers/scsi/scsi_tgt_lib.c \
drivers/scsi/scsi_tgt_priv.h \
drivers/scsi/scsi_transport_fc.c \
drivers/scsi/scsi_transport_fc_internal.h \
drivers/scsi/scsi_transport_srp.c \
drivers/scsi/scsi_transport_srp_internal.h \
include/scsi/scsi_host.h \
include/scsi/scsi_tgt.h \
include/scsi/scsi_tgt_if.h
do
add_patch "ibmvstgt/in-tree-patches/${kver}/$(basename $f).patch" $f
done
fi
} \
| process_patch "scst_19_scsi_tgt.diff"