diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2013-03-29 07:36:11 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 08:53:12 -0700 |
| commit | 647965a268fd876781dd9899185482682bf42f6a (patch) | |
| tree | fbcfd05483c368c816ca44b880ba810e8950494c /drivers/hv | |
| parent | 39d791649781f6bb6937a217764a928b660375e2 (diff) | |
| download | linux-647965a268fd876781dd9899185482682bf42f6a.tar.gz linux-647965a268fd876781dd9899185482682bf42f6a.tar.bz2 linux-647965a268fd876781dd9899185482682bf42f6a.zip | |
Drivers: hv: balloon: Permit Linux to specify hot-add alignment requirements
Some Windows hosts permit the guest to specify memory hot-add alignment
requirements (if any). Linux currently requires a 128MB alignment on memory
segments that can be hot-added. Specify this alignment requirement to the
host.
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.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index d5225261ee54..2250bf532bb0 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -117,7 +117,14 @@ union dm_caps { struct { __u64 balloon:1; __u64 hot_add:1; - __u64 reservedz:62; + /* + * To support guests that may have alignment + * limitations on hot-add, the guest can specify + * its alignment requirements; a value of n + * represents an alignment of 2^n in mega bytes. + */ + __u64 hot_add_alignment:4; + __u64 reservedz:58; } cap_bits; __u64 caps; } __packed; @@ -774,7 +781,7 @@ static unsigned long process_hot_add(unsigned long pg_start, * If the host has specified a hot-add range; deal with it first. */ - if ((rg_size != 0) && (!dm_device.host_specified_ha_region)) { + if (rg_size != 0) { ha_region = kzalloc(sizeof(struct hv_hotadd_state), GFP_KERNEL); if (!ha_region) return 0; @@ -1367,6 +1374,12 @@ static int balloon_probe(struct hv_device *dev, cap_msg.caps.cap_bits.hot_add = 1; /* + * Specify our alignment requirements as it relates + * memory hot-add. Specify 128MB alignment. + */ + cap_msg.caps.cap_bits.hot_add_alignment = 7; + + /* * Currently the host does not use these * values and we set them to what is done in the * Windows driver. |