diff options
author | Andy Grover <andy.grover@oracle.com> | 2010-01-14 18:08:33 -0500 |
---|---|---|
committer | Andy Grover <andy.grover@oracle.com> | 2010-09-08 21:11:52 -0400 |
commit | 1d34f175712b59ad292ecbbaa8fc05402a1fd8ed (patch) | |
tree | 93a7072243dfc511e8bdbb24516df957db983454 | |
parent | da5a06cef5724737af4315715632f0a07dd5e116 (diff) |
RDS: Remove unsignaled_bytes sysctl
Removed unsignaled_bytes sysctl and code to signal
based on it. I believe unsignaled_wrs is more than
sufficient for our purposes.
Signed-off-by: Andy Grover <andy.grover@oracle.com>
-rw-r--r-- | net/rds/ib.h | 1 | ||||
-rw-r--r-- | net/rds/ib_send.c | 7 | ||||
-rw-r--r-- | net/rds/ib_sysctl.c | 13 |
3 files changed, 0 insertions, 21 deletions
diff --git a/net/rds/ib.h b/net/rds/ib.h index dbf8d6e31493..148818174a04 100644 --- a/net/rds/ib.h +++ b/net/rds/ib.h | |||
@@ -138,7 +138,6 @@ struct rds_ib_connection { | |||
138 | 138 | ||
139 | /* Batched completions */ | 139 | /* Batched completions */ |
140 | unsigned int i_unsignaled_wrs; | 140 | unsigned int i_unsignaled_wrs; |
141 | long i_unsignaled_bytes; | ||
142 | }; | 141 | }; |
143 | 142 | ||
144 | /* This assumes that atomic_t is at least 32 bits */ | 143 | /* This assumes that atomic_t is at least 32 bits */ |
diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c index 06c1d7e032d2..48724b71f26c 100644 --- a/net/rds/ib_send.c +++ b/net/rds/ib_send.c | |||
@@ -518,7 +518,6 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, | |||
518 | } | 518 | } |
519 | 519 | ||
520 | ic->i_unsignaled_wrs = rds_ib_sysctl_max_unsig_wrs; | 520 | ic->i_unsignaled_wrs = rds_ib_sysctl_max_unsig_wrs; |
521 | ic->i_unsignaled_bytes = rds_ib_sysctl_max_unsig_bytes; | ||
522 | rds_message_addref(rm); | 521 | rds_message_addref(rm); |
523 | ic->i_rm = rm; | 522 | ic->i_rm = rm; |
524 | 523 | ||
@@ -617,12 +616,6 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, | |||
617 | send->s_wr.send_flags |= IB_SEND_SIGNALED | IB_SEND_SOLICITED; | 616 | send->s_wr.send_flags |= IB_SEND_SIGNALED | IB_SEND_SOLICITED; |
618 | } | 617 | } |
619 | 618 | ||
620 | ic->i_unsignaled_bytes -= len; | ||
621 | if (ic->i_unsignaled_bytes <= 0) { | ||
622 | ic->i_unsignaled_bytes = rds_ib_sysctl_max_unsig_bytes; | ||
623 | send->s_wr.send_flags |= IB_SEND_SIGNALED | IB_SEND_SOLICITED; | ||
624 | } | ||
625 | |||
626 | /* | 619 | /* |
627 | * Always signal the last one if we're stopping due to flow control. | 620 | * Always signal the last one if we're stopping due to flow control. |
628 | */ | 621 | */ |
diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c index c070524c4d95..b556c5c2a902 100644 --- a/net/rds/ib_sysctl.c +++ b/net/rds/ib_sysctl.c | |||
@@ -49,10 +49,6 @@ unsigned long rds_ib_sysctl_max_unsig_wrs = 16; | |||
49 | static unsigned long rds_ib_sysctl_max_unsig_wr_min = 1; | 49 | static unsigned long rds_ib_sysctl_max_unsig_wr_min = 1; |
50 | static unsigned long rds_ib_sysctl_max_unsig_wr_max = 64; | 50 | static unsigned long rds_ib_sysctl_max_unsig_wr_max = 64; |
51 | 51 | ||
52 | unsigned long rds_ib_sysctl_max_unsig_bytes = (16 << 20); | ||
53 | static unsigned long rds_ib_sysctl_max_unsig_bytes_min = 1; | ||
54 | static unsigned long rds_ib_sysctl_max_unsig_bytes_max = ~0UL; | ||
55 | |||
56 | /* | 52 | /* |
57 | * This sysctl does nothing. | 53 | * This sysctl does nothing. |
58 | * | 54 | * |
@@ -94,15 +90,6 @@ ctl_table rds_ib_sysctl_table[] = { | |||
94 | .extra2 = &rds_ib_sysctl_max_unsig_wr_max, | 90 | .extra2 = &rds_ib_sysctl_max_unsig_wr_max, |
95 | }, | 91 | }, |
96 | { | 92 | { |
97 | .procname = "max_unsignaled_bytes", | ||
98 | .data = &rds_ib_sysctl_max_unsig_bytes, | ||
99 | .maxlen = sizeof(unsigned long), | ||
100 | .mode = 0644, | ||
101 | .proc_handler = proc_doulongvec_minmax, | ||
102 | .extra1 = &rds_ib_sysctl_max_unsig_bytes_min, | ||
103 | .extra2 = &rds_ib_sysctl_max_unsig_bytes_max, | ||
104 | }, | ||
105 | { | ||
106 | .procname = "max_recv_allocation", | 93 | .procname = "max_recv_allocation", |
107 | .data = &rds_ib_sysctl_max_recv_allocation, | 94 | .data = &rds_ib_sysctl_max_recv_allocation, |
108 | .maxlen = sizeof(unsigned long), | 95 | .maxlen = sizeof(unsigned long), |