Skip to content

Commit f3f644b

Browse files
Sudhakar Dindukurtigerd-rausch
authored andcommitted
Remove unused active bonding and iwarp code
This patch removes the dead code related to active bonding and iWarp from RDS modules. Orabug: 27905986 Reviewed-by: Avinash Repaka<[email protected]> Signed-off-by: Sudhakar Dindukurti <[email protected]> Signed-off-by: Somasundaram Krishnasamy <[email protected]>
1 parent 3ec7dbb commit f3f644b

File tree

3 files changed

+0
-67
lines changed

3 files changed

+0
-67
lines changed

net/rds/connection.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -928,19 +928,6 @@ static char *conn_drop_reasons[] = {
928928
[DR_IB_ACTIVE_BOND_FAILOVER] = "active bonding failover",
929929
[DR_IB_LOOPBACK_CONN_DROP] = "corresponding loopback conn drop",
930930
[DR_IB_ACTIVE_BOND_FAILBACK] = "active bonding failback",
931-
[DR_IW_QP_EVENT] = "qp_event",
932-
[DR_IW_REQ_WHILE_CONNECTING] = "incoming REQ in connecting state",
933-
[DR_IW_PAS_SETUP_QP_FAIL] = "passive setup_qp failure",
934-
[DR_IW_RDMA_ACCEPT_FAIL] = "rdma_accept failure",
935-
[DR_IW_ACT_SETUP_QP_FAIL] = "active setup_qp failure",
936-
[DR_IW_RDMA_CONNECT_FAIL] = "rdma_connect failure",
937-
[DR_IW_POST_RECV_FAIL] = "post_recv failure",
938-
[DR_IW_SEND_ACK_FAIL] = "send_ack failure",
939-
[DR_IW_HEADER_MISSING] = "no header in incoming msg",
940-
[DR_IW_HEADER_CORRUPTED] = "corrupted header in incoming msg",
941-
[DR_IW_FRAG_HEADER_MISMATCH] = "fragment header mismatch",
942-
[DR_IW_RECV_COMP_ERR] = "recv completion error",
943-
[DR_IW_SEND_COMP_ERR] = "send completion error",
944931
[DR_TCP_STATE_CLOSE] = "sk_state to TCP_CLOSE",
945932
[DR_TCP_SEND_FAIL] = "tcp_send failure",
946933
};

net/rds/ib_sysctl.c

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,8 @@ static unsigned long rds_ib_sysctl_max_unsig_wr_max = 64;
6161
*/
6262

6363
unsigned int rds_ib_sysctl_flow_control = 0;
64-
unsigned int rds_ib_sysctl_active_bonding = 1;
6564
unsigned int rds_ib_sysctl_disable_unmap_fmr_cpu; /* = 0 */
6665

67-
/*
68-
* sysctl to trigger active bonding when set to 1
69-
* by the network startup script *after* all IB
70-
* devices have been configured to trigger asap
71-
* the active bonding.
72-
* If not triggered by this sysctl, a max timeout
73-
* will trigger it!
74-
*/
75-
unsigned int rds_ib_sysctl_trigger_active_bonding; /* = 0 */
76-
77-
unsigned long rds_ib_active_bonding_failback_min_jiffies = HZ;
78-
unsigned long rds_ib_active_bonding_failback_max_jiffies = HZ * 100;
79-
unsigned long rds_ib_sysctl_active_bonding_failback_jiffies = HZ * 10;
80-
8166
static struct ctl_table rds_ib_sysctl_table[] = {
8267
{
8368
.procname = "max_send_wr",
@@ -120,29 +105,6 @@ static struct ctl_table rds_ib_sysctl_table[] = {
120105
.mode = 0644,
121106
.proc_handler = proc_dointvec,
122107
},
123-
{
124-
.procname = "active_bonding",
125-
.data = &rds_ib_sysctl_active_bonding,
126-
.maxlen = sizeof(rds_ib_sysctl_active_bonding),
127-
.mode = 0644,
128-
.proc_handler = &proc_dointvec,
129-
},
130-
{
131-
.procname = "trigger_active_bonding",
132-
.data = &rds_ib_sysctl_trigger_active_bonding,
133-
.maxlen = sizeof(rds_ib_sysctl_trigger_active_bonding),
134-
.mode = 0644,
135-
.proc_handler = &proc_dointvec,
136-
},
137-
{
138-
.procname = "active_bonding_failback_ms",
139-
.data = &rds_ib_sysctl_active_bonding_failback_jiffies,
140-
.maxlen = sizeof(rds_ib_sysctl_active_bonding_failback_jiffies),
141-
.mode = 0644,
142-
.proc_handler = proc_doulongvec_ms_jiffies_minmax,
143-
.extra1 = &rds_ib_active_bonding_failback_min_jiffies,
144-
.extra2 = &rds_ib_active_bonding_failback_max_jiffies,
145-
},
146108
{
147109
.procname = "disable_unmap_fmr_cpu_assignment",
148110
.data = &rds_ib_sysctl_disable_unmap_fmr_cpu,

net/rds/rds.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -203,22 +203,6 @@ enum rds_conn_drop_src {
203203
DR_IB_LOOPBACK_CONN_DROP,
204204
DR_IB_ACTIVE_BOND_FAILBACK,
205205

206-
/* iWARP */
207-
DR_IW_QP_EVENT,
208-
DR_IW_REQ_WHILE_CONNECTING,
209-
DR_IW_PAS_SETUP_QP_FAIL,
210-
DR_IW_RDMA_ACCEPT_FAIL,
211-
DR_IW_ACT_SETUP_QP_FAIL,
212-
DR_IW_RDMA_CONNECT_FAIL,
213-
214-
DR_IW_POST_RECV_FAIL,
215-
DR_IW_SEND_ACK_FAIL,
216-
DR_IW_HEADER_MISSING,
217-
DR_IW_HEADER_CORRUPTED,
218-
DR_IW_FRAG_HEADER_MISMATCH,
219-
DR_IW_RECV_COMP_ERR,
220-
DR_IW_SEND_COMP_ERR,
221-
222206
/* TCP */
223207
DR_TCP_STATE_CLOSE,
224208
DR_TCP_SEND_FAIL,

0 commit comments

Comments
 (0)