From: Nadav Amit <namit@vmware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Arnd Bergmann <arnd@arndb.de>
Cc: <linux-kernel@vger.kernel.org>,
Xavier Deguillard <xdeguillard@vmware.com>,
Nadav Amit <namit@vmware.com>
Subject: [PATCH v2 18/20] vmw_balloon: support 64-bit memory limit
Date: Thu, 20 Sep 2018 10:30:24 -0700 [thread overview]
Message-ID: <20180920173026.141333-19-namit@vmware.com> (raw)
In-Reply-To: <20180920173026.141333-1-namit@vmware.com>
From: Xavier Deguillard <xdeguillard@vmware.com>
Currently, the balloon driver would fail to run if memory is greater
than 16TB of vRAM. Previous patches have already converted the balloon
target and size to 64-bit, so all that is left to do add is to avoid
asserting memory is smaller than 16TB if the hypervisor supports 64-bits
target.
The driver advertises a new capability VMW_BALLOON_64_BITS_TARGET.
Hypervisors that support 16TB of memory or more will report that this
capability is enabled.
Signed-off-by: Xavier Deguillard <xdeguillard@vmware.com>
Signed-off-by: Nadav Amit <namit@vmware.com>
---
drivers/misc/vmw_balloon.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index cace823bc68c..9da8b76342fd 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -59,15 +59,26 @@ enum vmwballoon_capabilities {
VMW_BALLOON_BATCHED_CMDS = (1 << 2),
VMW_BALLOON_BATCHED_2M_CMDS = (1 << 3),
VMW_BALLOON_SIGNALLED_WAKEUP_CMD = (1 << 4),
+ VMW_BALLOON_64_BIT_TARGET = (1 << 5)
};
-#define VMW_BALLOON_CAPABILITIES (VMW_BALLOON_BASIC_CMDS \
+#define VMW_BALLOON_CAPABILITIES_COMMON (VMW_BALLOON_BASIC_CMDS \
| VMW_BALLOON_BATCHED_CMDS \
| VMW_BALLOON_BATCHED_2M_CMDS \
| VMW_BALLOON_SIGNALLED_WAKEUP_CMD)
#define VMW_BALLOON_2M_ORDER (PMD_SHIFT - PAGE_SHIFT)
+/*
+ * 64-bit targets are only supported in 64-bit
+ */
+#ifdef CONFIG_64BIT
+#define VMW_BALLOON_CAPABILITIES (VMW_BALLOON_CAPABILITIES_COMMON \
+ | VMW_BALLOON_64_BIT_TARGET)
+#else
+#define VMW_BALLOON_CAPABILITIES VMW_BALLOON_CAPABILITIES_COMMON
+#endif
+
enum vmballoon_page_size_type {
VMW_BALLOON_4K_PAGE,
VMW_BALLOON_2M_PAGE,
@@ -563,8 +574,9 @@ static int vmballoon_send_get_target(struct vmballoon *b)
limit = totalram_pages;
- /* Ensure limit fits in 32-bits */
- if (limit != (u32)limit)
+ /* Ensure limit fits in 32-bits if 64-bit targets are not supported */
+ if (!(b->capabilities & VMW_BALLOON_64_BIT_TARGET) &&
+ limit != (u32)limit)
return -EINVAL;
status = vmballoon_cmd(b, VMW_BALLOON_CMD_GET_TARGET, limit, 0);
--
2.17.1
next prev parent reply other threads:[~2018-09-20 17:32 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-20 17:30 [PATCH v2 00/20] vmw_balloon: compaction, shrinker, 64-bit, etc Nadav Amit
2018-09-20 17:30 ` [PATCH v2 01/20] vmw_balloon: handle commands in a single function Nadav Amit
2018-09-20 17:30 ` [PATCH v2 02/20] vmw_balloon: unify commands tracing and stats Nadav Amit
2018-09-20 17:30 ` [PATCH v2 03/20] vmw_balloon: merge send_lock and send_unlock path Nadav Amit
2018-09-20 17:30 ` [PATCH v2 04/20] vmw_balloon: simplifying batch access Nadav Amit
2018-09-20 17:30 ` [PATCH v2 05/20] vmw_balloon: remove sleeping allocations Nadav Amit
2018-09-20 17:30 ` [PATCH v2 06/20] vmw_balloon: change batch/single lock abstractions Nadav Amit
2018-09-20 17:30 ` [PATCH v2 07/20] vmw_balloon: treat all refused pages equally Nadav Amit
2018-09-20 17:30 ` [PATCH v2 08/20] vmw_balloon: rename VMW_BALLOON_2M_SHIFT to VMW_BALLOON_2M_ORDER Nadav Amit
2018-09-20 17:30 ` [PATCH v2 09/20] vmw_balloon: refactor change size from vmballoon_work Nadav Amit
2018-09-20 17:30 ` [PATCH v2 10/20] vmw_balloon: simplify vmballoon_send_get_target() Nadav Amit
2018-09-20 17:30 ` [PATCH v2 11/20] vmw_balloon: stats rework Nadav Amit
2018-09-20 17:30 ` [PATCH v2 12/20] vmw_balloon: rework the inflate and deflate loops Nadav Amit
2018-09-20 17:30 ` [PATCH v2 13/20] vmw_balloon: general style cleanup Nadav Amit
2018-09-20 17:30 ` [PATCH v2 14/20] vmw_balloon: add reset stat Nadav Amit
2018-09-20 17:30 ` [PATCH v2 15/20] mm/balloon_compaction: suppress allocation warnings Nadav Amit
2018-09-20 17:30 ` [PATCH v2 16/20] mm/balloon_compaction: list interfaces Nadav Amit
2018-09-20 17:30 ` [PATCH v2 17/20] vmw_balloon: compaction support Nadav Amit
2018-09-25 18:15 ` Greg Kroah-Hartman
2018-09-20 17:30 ` Nadav Amit [this message]
2018-09-20 17:30 ` [PATCH v2 19/20] vmw_balloon: memory shrinker Nadav Amit
2018-09-20 17:30 ` [PATCH v2 20/20] vmw_balloon: split refused pages Nadav Amit
2018-09-25 18:15 ` [PATCH v2 00/20] vmw_balloon: compaction, shrinker, 64-bit, etc Greg Kroah-Hartman
2018-09-25 19:55 ` Nadav Amit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180920173026.141333-19-namit@vmware.com \
--to=namit@vmware.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xdeguillard@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).