Module Name: src
Committed By: joerg
Date: Sat May 30 16:12:34 UTC 2015
Modified Files:
src/distrib/sets/lists/comp: mi
src/sys/dev/iscsi: Makefile files.iscsi iscsi_globals.h iscsi_ioctl.c
iscsi_rcv.c iscsi_send.c iscsi_text.c
src/sys/modules/iscsi: Makefile
Removed Files:
src/sys/dev/iscsi: iscsi_test.c iscsi_test.h iscsi_testlocal.h
Log Message:
Remove ISCSI_TEST_MODE and corresponding dev/iscsi_test.h header.
To generate a diff of this commit:
cvs rdiff -u -r1.1963 -r1.1964 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/iscsi/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/iscsi/files.iscsi
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/iscsi/iscsi_globals.h \
src/sys/dev/iscsi/iscsi_ioctl.c src/sys/dev/iscsi/iscsi_text.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/iscsi/iscsi_rcv.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/iscsi/iscsi_send.c
cvs rdiff -u -r1.4 -r0 src/sys/dev/iscsi/iscsi_test.c
cvs rdiff -u -r1.1 -r0 src/sys/dev/iscsi/iscsi_test.h \
src/sys/dev/iscsi/iscsi_testlocal.h
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/iscsi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1963 src/distrib/sets/lists/comp/mi:1.1964
--- src/distrib/sets/lists/comp/mi:1.1963 Fri May 29 17:40:41 2015
+++ src/distrib/sets/lists/comp/mi Sat May 30 16:12:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1963 2015/05/29 17:40:41 joerg Exp $
+# $NetBSD: mi,v 1.1964 2015/05/30 16:12:33 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -584,7 +584,7 @@
./usr/include/dev/iscsi/iscsi.h comp-c-include iscsi
./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include iscsi
./usr/include/dev/iscsi/iscsi_perf.h comp-c-include iscsi
-./usr/include/dev/iscsi/iscsi_test.h comp-c-include iscsi
+./usr/include/dev/iscsi/iscsi_test.h comp-obsolete obsolete
./usr/include/dev/keylock.h comp-c-include
./usr/include/dev/kttcpio.h comp-c-include
./usr/include/dev/lockstat.h comp-c-include
Index: src/sys/dev/iscsi/Makefile
diff -u src/sys/dev/iscsi/Makefile:1.1 src/sys/dev/iscsi/Makefile:1.2
--- src/sys/dev/iscsi/Makefile:1.1 Sun Oct 23 21:15:02 2011
+++ src/sys/dev/iscsi/Makefile Sat May 30 16:12:34 2015
@@ -2,6 +2,6 @@
INCSDIR= /usr/include/dev/iscsi
-INCS= iscsi.h iscsi_ioctl.h iscsi_test.h iscsi_perf.h
+INCS= iscsi.h iscsi_ioctl.h iscsi_perf.h
.include <bsd.kinc.mk>
Index: src/sys/dev/iscsi/files.iscsi
diff -u src/sys/dev/iscsi/files.iscsi:1.3 src/sys/dev/iscsi/files.iscsi:1.4
--- src/sys/dev/iscsi/files.iscsi:1.3 Sun Apr 12 14:48:32 2015
+++ src/sys/dev/iscsi/files.iscsi Sat May 30 16:12:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.iscsi,v 1.3 2015/04/12 14:48:32 joerg Exp $
+# $NetBSD: files.iscsi,v 1.4 2015/05/30 16:12:34 joerg Exp $
#
# Configuration file for iSCSI initiator
@@ -6,7 +6,6 @@ defpseudodev iscsi : scsi
defparam ISCSI_DEBUG
defflag ISCSI_PERFTEST
-defflag ISCSI_TEST_MODE
file dev/iscsi/base64.c iscsi
file dev/iscsi/iscsi_ioctl.c iscsi
@@ -14,6 +13,5 @@ file dev/iscsi/iscsi_main.c iscsi
file dev/iscsi/iscsi_profile.c iscsi
file dev/iscsi/iscsi_rcv.c iscsi
file dev/iscsi/iscsi_send.c iscsi
-file dev/iscsi/iscsi_test.c iscsi
file dev/iscsi/iscsi_text.c iscsi
file dev/iscsi/iscsi_utils.c iscsi
Index: src/sys/dev/iscsi/iscsi_globals.h
diff -u src/sys/dev/iscsi/iscsi_globals.h:1.8 src/sys/dev/iscsi/iscsi_globals.h:1.9
--- src/sys/dev/iscsi/iscsi_globals.h:1.8 Fri May 15 16:24:30 2015
+++ src/sys/dev/iscsi/iscsi_globals.h Sat May 30 16:12:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_globals.h,v 1.8 2015/05/15 16:24:30 joerg Exp $ */
+/* $NetBSD: iscsi_globals.h,v 1.9 2015/05/30 16:12:34 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,6 @@
/* #define ISCSI_DEBUG 1 */
#include "iscsi_perf.h"
-#include "iscsi_test.h"
/* ------------------------- Global Constants ----------------------------- */
@@ -195,10 +194,6 @@ typedef struct session_s session_t;
typedef struct ccb_s ccb_t;
typedef struct pdu_s pdu_t;
-
-#include "iscsi_testlocal.h"
-
-
/* the serial number management structure (a circular buffer) */
typedef struct {
@@ -240,11 +235,6 @@ struct pdu_s {
connection_t *connection;
/* the connection this PDU belongs to */
-#ifdef ISCSI_TEST_MODE
- pdu_header_t mod_pdu;
- /* Buffer for modified PDU header (test mode) */
-#endif
-
#ifdef ISCSI_PERFTEST
int perf_index;
/* performance counter index */
@@ -398,11 +388,6 @@ struct connection_s {
/* only valid during login */
pdu_t pdu[PDUS_PER_CONNECTION]; /* PDUs */
-
-#ifdef ISCSI_TEST_MODE
- test_pars_t *test_pars;
- /* connection in test mode if non-NULL */
-#endif
};
/* the connection list type */
@@ -674,21 +659,9 @@ sn_a_le_b(uint32_t a, uint32_t b)
/* Version dependencies */
-#ifdef ISCSI_TEST_MODE
-#define SET_CCB_TIMEOUT(conn, ccb, tout) do { \
- if (test_ccb_timeout (conn)) { \
- callout_schedule(&ccb->timeout, tout); \
- } \
-} while (/*CONSTCOND*/ 0)
-#define SET_CONN_TIMEOUT(conn, tout) do { \
- if (test_conn_timeout (conn)) { \
- callout_schedule(&conn->timeout, tout); \
- } \
-} while (/*CONSTCOND*/ 0)
-#else
+/* XXX */
#define SET_CCB_TIMEOUT(conn, ccb, tout) callout_schedule(&ccb->timeout, tout)
#define SET_CONN_TIMEOUT(conn, tout) callout_schedule(&conn->timeout, tout)
-#endif
/* in iscsi_ioctl.c */
Index: src/sys/dev/iscsi/iscsi_ioctl.c
diff -u src/sys/dev/iscsi/iscsi_ioctl.c:1.8 src/sys/dev/iscsi/iscsi_ioctl.c:1.9
--- src/sys/dev/iscsi/iscsi_ioctl.c:1.8 Fri May 15 16:24:30 2015
+++ src/sys/dev/iscsi/iscsi_ioctl.c Sat May 30 16:12:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_ioctl.c,v 1.8 2015/05/15 16:24:30 joerg Exp $ */
+/* $NetBSD: iscsi_ioctl.c,v 1.9 2015/05/30 16:12:34 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -499,10 +499,6 @@ kill_connection(connection_t *conn, uint
}
}
-#ifdef ISCSI_TEST_MODE
- test_remove_connection(conn);
-#endif
-
conn->terminating = status;
conn->state = ST_SETTLING;
@@ -720,10 +716,6 @@ create_connection(iscsi_login_parameters
* increments performed in get_socket().
*/
-#ifdef ISCSI_TEST_MODE
- test_assign_connection(connection);
-#endif
-
if ((rc = send_login(connection)) != 0) {
DEBC(connection, 0, ("Login failed (rc %d)\n", rc));
/* Don't attempt to recover, there seems to be something amiss */
@@ -1679,28 +1671,6 @@ iscsiioctl(dev_t dev, u_long cmd, void *
break;
#endif
-#ifdef ISCSI_TEST_MODE
- case ISCSI_TEST_DEFINE:
- test_define((iscsi_test_define_parameters_t *) addr);
- break;
-
- case ISCSI_TEST_ADD_NEGOTIATION:
- test_add_neg((iscsi_test_add_negotiation_parameters_t *) addr);
- break;
-
- case ISCSI_TEST_ADD_MODIFICATION:
- test_add_mod(l->l_proc, (iscsi_test_add_modification_parameters_t *) addr);
- break;
-
- case ISCSI_TEST_SEND_PDU:
- test_send_pdu(l->l_proc, (iscsi_test_send_pdu_parameters_t *) addr);
- break;
-
- case ISCSI_TEST_CANCEL:
- test_cancel((iscsi_test_cancel_parameters_t *) addr);
- break;
-#endif
-
default:
DEBOUT(("Invalid IO-Control Code\n"));
return ENOTTY;
Index: src/sys/dev/iscsi/iscsi_text.c
diff -u src/sys/dev/iscsi/iscsi_text.c:1.8 src/sys/dev/iscsi/iscsi_text.c:1.9
--- src/sys/dev/iscsi/iscsi_text.c:1.8 Fri May 15 16:25:50 2015
+++ src/sys/dev/iscsi/iscsi_text.c Sat May 30 16:12:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_text.c,v 1.8 2015/05/15 16:25:50 joerg Exp $ */
+/* $NetBSD: iscsi_text.c,v 1.9 2015/05/30 16:12:34 joerg Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -908,29 +908,9 @@ complete_pars(negotiation_state_t *state
{
int len;
uint8_t *bp;
-#ifdef ISCSI_TEST_MODE
- test_pars_t *tp = pdu->connection->test_pars;
- neg_desc_t *nd = NULL;
-#endif
len = total_size(state->pars, state->num_pars);
-#ifdef ISCSI_TEST_MODE
- if (tp != NULL) {
- while ((nd = TAILQ_FIRST(&pdu->connection->test_pars->negs)) != NULL &&
- nd->entry.state < state->auth_state) {
- TAILQ_REMOVE(&tp->negs, nd, link);
- free(nd, M_TEMP);
- }
- if (nd != NULL && nd->entry.state == state->auth_state) {
- if (nd->entry.flags & ISCSITEST_NEGOPT_REPLACE)
- len = 0;
- len += nd->entry.size;
- } else
- nd = NULL;
- }
-#endif
-
DEB(10, ("complete_pars: n=%d, len=%d\n", state->num_pars, len));
if ((bp = malloc(len, M_TEMP, M_WAITOK)) == NULL) {
@@ -939,25 +919,11 @@ complete_pars(negotiation_state_t *state
}
pdu->temp_data = bp;
-#ifdef ISCSI_TEST_MODE
- if (nd == NULL || !(nd->entry.flags & ISCSITEST_NEGOPT_REPLACE))
- if ((bp = put_par_block(pdu->temp_data, len,
- state->pars, state->num_pars)) == NULL) {
- DEBOUT(("Bad parameter in complete_pars\n"));
- return ISCSI_STATUS_PARAMETER_INVALID;
- }
- if (nd != NULL) {
- memcpy(bp, nd->entry.value, nd->entry.size);
- TAILQ_REMOVE(&tp->negs, nd, link);
- free(nd, M_TEMP);
- }
-#else
if (put_par_block(pdu->temp_data, len, state->pars,
state->num_pars) == 0) {
DEBOUT(("Bad parameter in complete_pars\n"));
return ISCSI_STATUS_PARAMETER_INVALID;
}
-#endif
pdu->temp_data_len = len;
return 0;
@@ -1590,30 +1556,6 @@ set_first_opnegs(connection_t *conn, neg
state->FirstBurstLength = entries[K_FirstBurstLength].defval;
state->MaxOutstandingR2T = entries[K_MaxOutstandingR2T].defval;
-#ifdef ISCSI_TEST_MODE
- if (conn->test_pars != NULL) {
- test_pars_t *tp = conn->test_pars;
-
- if (tp->options & ISCSITEST_OVERRIDE_INITIALR2T)
- state->InitialR2T = TRUE;
- if (tp->options & ISCSITEST_OVERRIDE_IMMDATA)
- state->ImmediateData = FALSE;
-
- if (tp->options & ISCSITEST_NEGOTIATE_MAXBURST) {
- state->MaxBurstLength = tp->maxburst_val;
- set_key_n(state, K_MaxBurstLength, state->MaxBurstLength);
- }
- if (tp->options & ISCSITEST_NEGOTIATE_FIRSTBURST) {
- state->FirstBurstLength = tp->firstburst_val;
- set_key_n(state, K_FirstBurstLength, state->FirstBurstLength);
- }
- if (tp->options & ISCSITEST_NEGOTIATE_R2T) {
- state->MaxOutstandingR2T = tp->r2t_val;
- set_key_n(state, K_MaxOutstandingR2T, state->MaxOutstandingR2T);
- }
- }
-#endif
-
set_key_n(state, K_ErrorRecoveryLevel, state->ErrorRecoveryLevel);
set_key_n(state, K_InitialR2T, state->InitialR2T);
set_key_n(state, K_ImmediateData, state->ImmediateData);
Index: src/sys/dev/iscsi/iscsi_rcv.c
diff -u src/sys/dev/iscsi/iscsi_rcv.c:1.7 src/sys/dev/iscsi/iscsi_rcv.c:1.8
--- src/sys/dev/iscsi/iscsi_rcv.c:1.7 Fri May 15 16:24:30 2015
+++ src/sys/dev/iscsi/iscsi_rcv.c Sat May 30 16:12:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_rcv.c,v 1.7 2015/05/15 16:24:30 joerg Exp $ */
+/* $NetBSD: iscsi_rcv.c,v 1.8 2015/05/30 16:12:34 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -210,11 +210,6 @@ read_pdu_data(pdu_t *pdu, uint8_t *data,
pdu->io_vec[i].iov_len = 4;
uio->uio_resid += 4;
}
-#ifdef ISCSI_TEST_MODE
- /* save data pointer and size */
- pdu->save_uio.uio_iov = (struct iovec *) data;
- pdu->save_uio.uio_resid = len;
-#endif
/* get the data */
if (my_soo_read(conn, &pdu->uio, MSG_WAITALL) != 0) {
@@ -546,9 +541,6 @@ receive_logout_pdu(connection_t *conn, p
callout_stop(&conn->timeout);
-#ifdef ISCSI_TEST_MODE
- test_remove_connection(conn);
-#endif
/* let send thread take over next step of cleanup */
wakeup(&conn->pdus_to_send);
}
@@ -1009,9 +1001,6 @@ receive_pdu(connection_t *conn, pdu_t *p
if (digest != pdu->pdu.HeaderDigest) {
DEBOUT(("Header Digest Error: comp = %08x, rx = %08x\n",
digest, pdu->pdu.HeaderDigest));
-#ifdef ISCSI_TEST_MODE
- test_mode_rx(conn, pdu, TEST_INVALID_HEADER_CRC);
-#endif
/* try to skip to next PDU */
try_resynch_receive(conn);
free_pdu(pdu);
@@ -1044,12 +1033,6 @@ receive_pdu(connection_t *conn, pdu_t *p
} else {
rc = read_pdu_data(pdu, NULL, 0);
}
-#ifdef ISCSI_TEST_MODE
- if (test_mode_rx(conn, pdu, rc)) {
- free_pdu(pdu);
- return rc;
- }
-#endif
if (!rc && (conn->state <= ST_WINDING_DOWN ||
(pdu->pdu.Opcode & OPCODE_MASK) == TOP_Logout_Response)) {
Index: src/sys/dev/iscsi/iscsi_send.c
diff -u src/sys/dev/iscsi/iscsi_send.c:1.11 src/sys/dev/iscsi/iscsi_send.c:1.12
--- src/sys/dev/iscsi/iscsi_send.c:1.11 Fri May 15 16:24:30 2015
+++ src/sys/dev/iscsi/iscsi_send.c Sat May 30 16:12:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_send.c,v 1.11 2015/05/15 16:24:30 joerg Exp $ */
+/* $NetBSD: iscsi_send.c,v 1.12 2015/05/30 16:12:34 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -311,25 +311,13 @@ iscsi_send_thread(void *par)
#endif
/*DEB (99,("Send thread woke up, pdu = %x)\n", (int)pdu)); */
-#ifdef ISCSI_TEST_MODE
- if (!test_mode_tx(conn, pdu)) {
- if (!(pdu->flags & PDUF_NOUPDATE)) {
-#endif
- /* update ExpStatSN here to avoid discontinuities */
- /* and delays in updating target */
- pdu->pdu.p.command.ExpStatSN =
- htonl(conn->StatSN_buf.ExpSN);
-
- if (conn->HeaderDigest)
- pdu->pdu.HeaderDigest =
- gen_digest(&pdu->pdu, BHS_SIZE);
-#ifdef ISCSI_TEST_MODE
- }
-#endif
- my_soo_write(conn, &pdu->uio);
-#ifdef ISCSI_TEST_MODE
- }
-#endif
+ /* update ExpStatSN here to avoid discontinuities */
+ /* and delays in updating target */
+ pdu->pdu.p.command.ExpStatSN = htonl(conn->StatSN_buf.ExpSN);
+
+ if (conn->HeaderDigest)
+ pdu->pdu.HeaderDigest = gen_digest(&pdu->pdu, BHS_SIZE);
+ my_soo_write(conn, &pdu->uio);
PERF_PDUSNAPE(pdu);
if (pdu->disp <= PDUDISP_FREE) {
Index: src/sys/modules/iscsi/Makefile
diff -u src/sys/modules/iscsi/Makefile:1.1 src/sys/modules/iscsi/Makefile:1.2
--- src/sys/modules/iscsi/Makefile:1.1 Tue Nov 15 16:50:46 2011
+++ src/sys/modules/iscsi/Makefile Sat May 30 16:12:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/11/15 16:50:46 riz Exp $
+# $NetBSD: Makefile,v 1.2 2015/05/30 16:12:34 joerg Exp $
.include "../Makefile.inc"
@@ -6,6 +6,6 @@
KMOD= iscsi
SRCS= base64.c iscsi_ioctl.c iscsi_main.c iscsi_profile.c iscsi_rcv.c
-SRCS+= iscsi_send.c iscsi_test.c iscsi_text.c iscsi_utils.c
+SRCS+= iscsi_send.c iscsi_text.c iscsi_utils.c
.include <bsd.kmodule.mk>
