Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1234092

[PATCH v2] net: sctp: Don't use 64 kilobyte lookup table for four elements

Show all headers | View raw

Seemingly innocuous sctp_trans_state_to_prio_map[] array
is way bigger than it looks, since
"[SCTP_UNKNOWN] = 2" expands into "[0xffff] = 2" !

This patch replaces it with switch() statement.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Vlad Yasevich <vyasevich@gmail.com>
CC: Neil Horman <nhorman@tuxdriver.com>
CC: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
CC: linux-sctp@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-kernel@vger.kernel.org
---

Changes since v1: tweaked comments

 net/sctp/associola.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 197c3f5..dae51ac 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -1208,20 +1208,22 @@ void sctp_assoc_update(struct sctp_association *asoc,
  *   within this document.
  *
  * Our basic strategy is to round-robin transports in priorities
- * according to sctp_state_prio_map[] e.g., if no such
+ * according to sctp_trans_score() e.g., if no such
  * transport with state SCTP_ACTIVE exists, round-robin through
  * SCTP_UNKNOWN, etc. You get the picture.
  */
-static const u8 sctp_trans_state_to_prio_map[] = {
-	[SCTP_ACTIVE]	= 3,	/* best case */
-	[SCTP_UNKNOWN]	= 2,
-	[SCTP_PF]	= 1,
-	[SCTP_INACTIVE] = 0,	/* worst case */
-};
-
 static u8 sctp_trans_score(const struct sctp_transport *trans)
 {
-	return sctp_trans_state_to_prio_map[trans->state];
+	switch (trans->state) {
+	case SCTP_ACTIVE:
+		return 3;	/* best case */
+	case SCTP_UNKNOWN:
+		return 2;
+	case SCTP_PF:
+		return 1;
+	default: /* case SCTP_INACTIVE */
+		return 0;	/* worst case */
+	}
 }
 
 static struct sctp_transport *sctp_trans_elect_tie(struct sctp_transport *trans1,
-- 
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] net: sctp: Don't use 64 kilobyte lookup table for four elements Denys Vlasenko <dvlasenk@redhat.com> - 2015-09-28 14:40 +0200
  Re: [PATCH v2] net: sctp: Don't use 64 kilobyte lookup table for  four elements Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> - 2015-09-28 14:50 +0200
  Re: [PATCH v2] net: sctp: Don't use 64 kilobyte lookup table for  four elements Neil Horman <nhorman@tuxdriver.com> - 2015-09-28 16:00 +0200
    RE: [PATCH v2] net: sctp: Don't use 64 kilobyte lookup table for  four elements David Laight <David.Laight@ACULAB.COM> - 2015-09-28 16:20 +0200
      Re: [PATCH v2] net: sctp: Don't use 64 kilobyte lookup table for  four elements Eric Dumazet <eric.dumazet@gmail.com> - 2015-09-28 16:30 +0200
        RE: [PATCH v2] net: sctp: Don't use 64 kilobyte lookup table for  four elements David Laight <David.Laight@ACULAB.COM> - 2015-09-28 17:40 +0200
          Re: [PATCH v2] net: sctp: Don't use 64 kilobyte lookup table for  four elements Denys Vlasenko <dvlasenk@redhat.com> - 2015-09-28 19:30 +0200
  Re: [PATCH v2] net: sctp: Don't use 64 kilobyte lookup table for  four elements David Miller <davem@davemloft.net> - 2015-09-29 08:00 +0200

csiph-web