diff options
| -rw-r--r-- | drivers/xen/balloon.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 6cd2530f2330..77e6ad38c0b9 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
| @@ -199,15 +199,10 @@ static enum bp_state update_schedule(enum bp_state state) | |||
| 199 | return BP_DONE; | 199 | return BP_DONE; |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | pr_info("xen_balloon: Retry count: %lu/%lu\n", balloon_stats.retry_count, | ||
| 203 | balloon_stats.max_retry_count); | ||
| 204 | |||
| 205 | ++balloon_stats.retry_count; | 202 | ++balloon_stats.retry_count; |
| 206 | 203 | ||
| 207 | if (balloon_stats.max_retry_count != RETRY_UNLIMITED && | 204 | if (balloon_stats.max_retry_count != RETRY_UNLIMITED && |
| 208 | balloon_stats.retry_count > balloon_stats.max_retry_count) { | 205 | balloon_stats.retry_count > balloon_stats.max_retry_count) { |
| 209 | pr_info("xen_balloon: Retry count limit exceeded\n" | ||
| 210 | "xen_balloon: Balloon operation canceled\n"); | ||
| 211 | balloon_stats.schedule_delay = 1; | 206 | balloon_stats.schedule_delay = 1; |
| 212 | balloon_stats.retry_count = 1; | 207 | balloon_stats.retry_count = 1; |
| 213 | return BP_ECANCELED; | 208 | return BP_ECANCELED; |
| @@ -260,10 +255,8 @@ static enum bp_state increase_reservation(unsigned long nr_pages) | |||
| 260 | set_xen_guest_handle(reservation.extent_start, frame_list); | 255 | set_xen_guest_handle(reservation.extent_start, frame_list); |
| 261 | reservation.nr_extents = nr_pages; | 256 | reservation.nr_extents = nr_pages; |
| 262 | rc = HYPERVISOR_memory_op(XENMEM_populate_physmap, &reservation); | 257 | rc = HYPERVISOR_memory_op(XENMEM_populate_physmap, &reservation); |
| 263 | if (rc <= 0) { | 258 | if (rc <= 0) |
| 264 | pr_info("xen_balloon: %s: Cannot allocate memory\n", __func__); | ||
| 265 | return BP_EAGAIN; | 259 | return BP_EAGAIN; |
| 266 | } | ||
| 267 | 260 | ||
| 268 | for (i = 0; i < rc; i++) { | 261 | for (i = 0; i < rc; i++) { |
| 269 | page = balloon_retrieve(); | 262 | page = balloon_retrieve(); |
| @@ -313,7 +306,6 @@ static enum bp_state decrease_reservation(unsigned long nr_pages) | |||
| 313 | 306 | ||
| 314 | for (i = 0; i < nr_pages; i++) { | 307 | for (i = 0; i < nr_pages; i++) { |
| 315 | if ((page = alloc_page(GFP_BALLOON)) == NULL) { | 308 | if ((page = alloc_page(GFP_BALLOON)) == NULL) { |
| 316 | pr_info("xen_balloon: %s: Cannot allocate memory\n", __func__); | ||
| 317 | nr_pages = i; | 309 | nr_pages = i; |
| 318 | state = BP_EAGAIN; | 310 | state = BP_EAGAIN; |
| 319 | break; | 311 | break; |
| @@ -456,7 +448,7 @@ static int __init balloon_init(void) | |||
| 456 | balloon_stats.schedule_delay = 1; | 448 | balloon_stats.schedule_delay = 1; |
| 457 | balloon_stats.max_schedule_delay = 32; | 449 | balloon_stats.max_schedule_delay = 32; |
| 458 | balloon_stats.retry_count = 1; | 450 | balloon_stats.retry_count = 1; |
| 459 | balloon_stats.max_retry_count = 16; | 451 | balloon_stats.max_retry_count = RETRY_UNLIMITED; |
| 460 | 452 | ||
| 461 | register_balloon(&balloon_sysdev); | 453 | register_balloon(&balloon_sysdev); |
| 462 | 454 | ||
