Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2017-10-20 12:20:33 +0200
committerOlaf Hering <ohering@suse.de>2017-10-20 12:23:27 +0200
commitd3a717f9b19e44afa048af44397ef35d0fce46b7 (patch)
tree513f70797d6651bf1f0fee7ef658e276e17128bf
parent7f834ace2e551f2eac39d139ad1eca42f0d2ca3b (diff)
Drivers: hv: balloon: Show the max dynamic memory assigned
-rw-r--r--patches.suse/msft-hv-1437-Drivers-hv-balloon-Show-the-max-dynamic-memory-assig.patch33
-rw-r--r--series.conf1
2 files changed, 34 insertions, 0 deletions
diff --git a/patches.suse/msft-hv-1437-Drivers-hv-balloon-Show-the-max-dynamic-memory-assig.patch b/patches.suse/msft-hv-1437-Drivers-hv-balloon-Show-the-max-dynamic-memory-assig.patch
new file mode 100644
index 0000000000..d31d96eb96
--- /dev/null
+++ b/patches.suse/msft-hv-1437-Drivers-hv-balloon-Show-the-max-dynamic-memory-assig.patch
@@ -0,0 +1,33 @@
+From: Alex Ng <alexng@messages.microsoft.com>
+Date: Sun, 6 Aug 2017 13:12:54 -0700
+Patch-mainline: v4.14-rc1
+Subject: Drivers: hv: balloon: Show the max dynamic memory assigned
+Git-commit: 7b6e54b524b66b60e4cf49e8aa7c43045ebb987d
+References: fate#323887
+
+Previously we were only showing max number of pages. We should make it
+more clear that this value is the max amount of dynamic memory that the
+Hyper-V host is willing to assign to this guest.
+
+Signed-off-by: Alex Ng <alexng@messages.microsoft.com>
+Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Acked-by: Olaf Hering <ohering@suse.de>
+---
+ drivers/hv/hv_balloon.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
+--- a/drivers/hv/hv_balloon.c
++++ b/drivers/hv/hv_balloon.c
+@@ -1035,8 +1035,8 @@ static void process_info(struct hv_dynmem_device *dm, struct dm_info_msg *msg)
+ if (info_hdr->data_size == sizeof(__u64)) {
+ __u64 *max_page_count = (__u64 *)&info_hdr[1];
+
+- pr_info("INFO_TYPE_MAX_PAGE_CNT = %llu\n",
+- *max_page_count);
++ pr_info("Max. dynamic memory size: %llu MB\n",
++ (*max_page_count) >> (20 - PAGE_SHIFT));
+ }
+
+ break;
diff --git a/series.conf b/series.conf
index afd9ede77d..36d284a027 100644
--- a/series.conf
+++ b/series.conf
@@ -1687,6 +1687,7 @@
patches.suse/msft-hv-1434-netvsc-keep-track-of-some-non-fatal-overload-conditi.patch
patches.suse/msft-hv-1435-Tools-hv-vss-Skip-freezing-filesystems-backed-by-loo.patch
patches.suse/msft-hv-1436-Drivers-hv-balloon-Correctly-update-onlined-page-cou.patch
+ patches.suse/msft-hv-1437-Drivers-hv-balloon-Show-the-max-dynamic-memory-assig.patch
patches.suse/suse-hv-guest-os-id.patch
patches.suse/suse-hv-kvp_on_msg.dbg.patch