aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hv
diff options
context:
space:
mode:
authorVitaly Kuznetsov <vkuznets@redhat.com>2015-03-27 12:10:12 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-03 10:18:02 -0400
commit7fb0e1a65075a871c58cbcf8c877d1f9ae5cd83c (patch)
tree4aa484c54f35be2d39f46243babe5e03da4a93e0 /drivers/hv
parentd6cbd2c3a3db437708520c66f285c69ef028ac1f (diff)
Drivers: hv: hv_balloon: eliminate jumps in piecewiese linear floor function
Commit 79208c57da53 ("Drivers: hv: hv_balloon: Make adjustments in computing the floor") was inacurate as it introduced a jump in our piecewiese linear 'floor' function: At 2048MB we have: Left limit: 104 + 2048/8 = 360 Right limit: 256 + 2048/16 = 384 (so the right value is 232) We now have to make an adjustment at 8192 boundary: 232 + 8192/16 = 744 512 + 8192/32 = 768 (so the right value is 488) Suggested-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
-rw-r--r--drivers/hv/hv_balloon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
index 99afef9393aa..4f5323cedab3 100644
--- a/drivers/hv/hv_balloon.c
+++ b/drivers/hv/hv_balloon.c
@@ -976,8 +976,8 @@ static unsigned long compute_balloon_floor(void)
976 * 128 72 (1/2) 976 * 128 72 (1/2)
977 * 512 168 (1/4) 977 * 512 168 (1/4)
978 * 2048 360 (1/8) 978 * 2048 360 (1/8)
979 * 8192 768 (1/16) 979 * 8192 744 (1/16)
980 * 32768 1536 (1/32) 980 * 32768 1512 (1/32)
981 */ 981 */
982 if (totalram_pages < MB2PAGES(128)) 982 if (totalram_pages < MB2PAGES(128))
983 min_pages = MB2PAGES(8) + (totalram_pages >> 1); 983 min_pages = MB2PAGES(8) + (totalram_pages >> 1);
@@ -986,9 +986,9 @@ static unsigned long compute_balloon_floor(void)
986 else if (totalram_pages < MB2PAGES(2048)) 986 else if (totalram_pages < MB2PAGES(2048))
987 min_pages = MB2PAGES(104) + (totalram_pages >> 3); 987 min_pages = MB2PAGES(104) + (totalram_pages >> 3);
988 else if (totalram_pages < MB2PAGES(8192)) 988 else if (totalram_pages < MB2PAGES(8192))
989 min_pages = MB2PAGES(256) + (totalram_pages >> 4); 989 min_pages = MB2PAGES(232) + (totalram_pages >> 4);
990 else 990 else
991 min_pages = MB2PAGES(512) + (totalram_pages >> 5); 991 min_pages = MB2PAGES(488) + (totalram_pages >> 5);
992#undef MB2PAGES 992#undef MB2PAGES
993 return min_pages; 993 return min_pages;
994} 994}