Home Explore Help
Sign In
RISCI_ATOM
/
libreCMC-next
forked from libreCMC/libreCMC
1
0
Fork 0
Files
Tree: aaeecaa038
Branches Tags
libreCMC-next
/
target
/
linux
/
generic
/
pending-3.18
/
080-21-fib_trie-Fall-back-to-slen-update-on-inflate-halve-f.patch

080-21-fib_trie-Fall-back-to-slen-update-on-inflate-halve-f.patch 1.9 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 
  1. From: Alexander Duyck <alexander.h.duyck@redhat.com>
    2. 

  2. Date: Thu, 22 Jan 2015 15:51:20 -0800
    3. 

  3. Subject: [PATCH] fib_trie: Fall back to slen update on inflate/halve failure
    4. 

  4. 

  5. This change corrects an issue where if inflate or halve fails we were
    6. 

  6. exiting the resize function without at least updating the slen for the
    7. 

  7. node.  To correct this I have moved the update of max_size into the while
    8. 

  8. loop so that it is only decremented on a successful call to either inflate
    9. 

  9. or halve.
    10. 

  10. 

  11. Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
    12. 

  12. Signed-off-by: David S. Miller <davem@davemloft.net>
    13. 

  13. ---
    14. 

  14. 

  15. --- a/net/ipv4/fib_trie.c
    16. 

  16. +++ b/net/ipv4/fib_trie.c
    17. 

  17. @@ -752,7 +752,7 @@ static void resize(struct trie *t, struc
    18. 

  18.  {
    19. 

  19.  	struct tnode *tp = node_parent(tn), *n = NULL;
    20. 

  20.  	struct tnode __rcu **cptr;
    21. 

  21. -	int max_work;
    22. 

  22. +	int max_work = MAX_WORK;
    23. 

  23.  
    24. 

  24.  	pr_debug("In tnode_resize %p inflate_threshold=%d threshold=%d\n",
    25. 

  25.  		 tn, inflate_threshold, halve_threshold);
    26. 

  26. @@ -775,8 +775,7 @@ static void resize(struct trie *t, struc
    27. 

  27.  	/* Double as long as the resulting node has a number of
    28. 

  28.  	 * nonempty nodes that are above the threshold.
    29. 

  29.  	 */
    30. 

  30. -	max_work = MAX_WORK;
    31. 

  31. -	while (should_inflate(tp, tn) && max_work--) {
    32. 

  32. +	while (should_inflate(tp, tn) && max_work) {
    33. 

  33.  		if (inflate(t, tn)) {
    34. 

  34.  #ifdef CONFIG_IP_FIB_TRIE_STATS
    35. 

  35.  			this_cpu_inc(t->stats->resize_node_skipped);
    36. 

  36. @@ -784,6 +783,7 @@ static void resize(struct trie *t, struc
    37. 

  37.  			break;
    38. 

  38.  		}
    39. 

  39.  
    40. 

  40. +		max_work--;
    41. 

  41.  		tn = rtnl_dereference(*cptr);
    42. 

  42.  	}
    43. 

  43.  
    44. 

  44. @@ -794,8 +794,7 @@ static void resize(struct trie *t, struc
    45. 

  45.  	/* Halve as long as the number of empty children in this
    46. 

  46.  	 * node is above threshold.
    47. 

  47.  	 */
    48. 

  48. -	max_work = MAX_WORK;
    49. 

  49. -	while (should_halve(tp, tn) && max_work--) {
    50. 

  50. +	while (should_halve(tp, tn) && max_work) {
    51. 

  51.  		if (halve(t, tn)) {
    52. 

  52.  #ifdef CONFIG_IP_FIB_TRIE_STATS
    53. 

  53.  			this_cpu_inc(t->stats->resize_node_skipped);
    54. 

  54. @@ -803,6 +802,7 @@ static void resize(struct trie *t, struc
    55. 

  55.  			break;
    56. 

  56.  		}
    57. 

  57.  
    58. 

  58. +		max_work--;
    59. 

  59.  		tn = rtnl_dereference(*cptr);
    60. 

  60.  	}
    61. 

  61.  
    62.