[RFC] virtio-mem: check against memhp_get_pluggable_range() which memory we can hotplug

Commit Message

Anshuman Khandual Jan. 18, 2021, 1:13 p.m. UTC

From: David Hildenbrand <[e-mail]>

Right now, we only check against MAX_PHYSMEM_BITS - but turns out there
are more restrictions of which memory we can actually hotplug, especially
om arm64 or s390x once we support them: we might receive something like
-E2BIG or -ERANGE from add_memory_driver_managed(), stopping device
operation.

So, check right when initializing the device which memory we can add,
warning the user. Try only adding actually pluggable ranges: in the worst
case, no memory provided by our device is pluggable.

In the usual case, we expect all device memory to be pluggable, and in
corner cases only some memory at the end of the device-managed memory
region to not be pluggable.

Cc: "Michael S. Tsirkin" <[e-mail]>
Cc: Jason Wang <[e-mail]>
Cc: Pankaj Gupta <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Oscar Salvador <[e-mail]>
Cc: Wei Yang <[e-mail]>
Cc: Andrew Morton <[e-mail]>
Cc: [e-mail]
Cc: teawater <[e-mail]>
Cc: Anshuman Khandual <[e-mail]>
Cc: Pankaj Gupta <[e-mail]>
Cc: Jonathan Cameron <[e-mail]>
Cc: [e-mail]
Cc: Vasily Gorbik <[e-mail]>
Cc: Will Deacon <[e-mail]>
Cc: Ard Biesheuvel <[e-mail]>
Cc: Mark Rutland <[e-mail]>
Cc: Heiko Carstens <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Signed-off-by: David Hildenbrand <[e-mail]>
Signed-off-by: Anshuman Khandual <[e-mail]>
---
 drivers/virtio/virtio_mem.c | 40 +++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 13 deletions(-)

Comments

Anshuman Khandual Jan. 18, 2021, 1:21 p.m. UTC | #1

On 1/18/21 6:43 PM, Anshuman Khandual wrote:
> From: David Hildenbrand <[e-mail]>
> 
> Right now, we only check against MAX_PHYSMEM_BITS - but turns out there
> are more restrictions of which memory we can actually hotplug, especially
> om arm64 or s390x once we support them: we might receive something like
> -E2BIG or -ERANGE from add_memory_driver_managed(), stopping device
> operation.
> 
> So, check right when initializing the device which memory we can add,
> warning the user. Try only adding actually pluggable ranges: in the worst
> case, no memory provided by our device is pluggable.
> 
> In the usual case, we expect all device memory to be pluggable, and in
> corner cases only some memory at the end of the device-managed memory
> region to not be pluggable.
> 
> Cc: "Michael S. Tsirkin" <[e-mail]>
> Cc: Jason Wang <[e-mail]>
> Cc: Pankaj Gupta <[e-mail]>
> Cc: Michal Hocko <[e-mail]>
> Cc: Oscar Salvador <[e-mail]>
> Cc: Wei Yang <[e-mail]>
> Cc: Andrew Morton <[e-mail]>
> Cc: [e-mail]
> Cc: teawater <[e-mail]>
> Cc: Anshuman Khandual <[e-mail]>
> Cc: Pankaj Gupta <[e-mail]>
> Cc: Jonathan Cameron <[e-mail]>
> Cc: [e-mail]
> Cc: Vasily Gorbik <[e-mail]>
> Cc: Will Deacon <[e-mail]>
> Cc: Ard Biesheuvel <[e-mail]>
> Cc: Mark Rutland <[e-mail]>
> Cc: Heiko Carstens <[e-mail]>
> Cc: Michal Hocko <[e-mail]>
> Signed-off-by: David Hildenbrand <[e-mail]>
> Signed-off-by: Anshuman Khandual <[e-mail]>

Hello David,

As your original patch was in the RFC state, I have just maintained
the same here as well. But once you test this patch along with the
new series, please do let me know if this needs to be converted to
a normal PATCH instead. Thank you.

- Anshuman

David Hildenbrand Jan. 19, 2021, 12:27 p.m. UTC | #2

On 18.01.21 14:21, Anshuman Khandual wrote:
> 
> 
> On 1/18/21 6:43 PM, Anshuman Khandual wrote:
>> From: David Hildenbrand <[e-mail]>
>>
>> Right now, we only check against MAX_PHYSMEM_BITS - but turns out there
>> are more restrictions of which memory we can actually hotplug, especially
>> om arm64 or s390x once we support them: we might receive something like
>> -E2BIG or -ERANGE from add_memory_driver_managed(), stopping device
>> operation.
>>
>> So, check right when initializing the device which memory we can add,
>> warning the user. Try only adding actually pluggable ranges: in the worst
>> case, no memory provided by our device is pluggable.
>>
>> In the usual case, we expect all device memory to be pluggable, and in
>> corner cases only some memory at the end of the device-managed memory
>> region to not be pluggable.
>>
>> Cc: "Michael S. Tsirkin" <[e-mail]>
>> Cc: Jason Wang <[e-mail]>
>> Cc: Pankaj Gupta <[e-mail]>
>> Cc: Michal Hocko <[e-mail]>
>> Cc: Oscar Salvador <[e-mail]>
>> Cc: Wei Yang <[e-mail]>
>> Cc: Andrew Morton <[e-mail]>
>> Cc: [e-mail]
>> Cc: teawater <[e-mail]>
>> Cc: Anshuman Khandual <[e-mail]>
>> Cc: Pankaj Gupta <[e-mail]>
>> Cc: Jonathan Cameron <[e-mail]>
>> Cc: [e-mail]
>> Cc: Vasily Gorbik <[e-mail]>
>> Cc: Will Deacon <[e-mail]>
>> Cc: Ard Biesheuvel <[e-mail]>
>> Cc: Mark Rutland <[e-mail]>
>> Cc: Heiko Carstens <[e-mail]>
>> Cc: Michal Hocko <[e-mail]>
>> Signed-off-by: David Hildenbrand <[e-mail]>
>> Signed-off-by: Anshuman Khandual <[e-mail]>
> 
> Hello David,
> 
> As your original patch was in the RFC state, I have just maintained
> the same here as well. But once you test this patch along with the
> new series, please do let me know if this needs to be converted to
> a normal PATCH instead. Thank you.

I'll give it a churn on x86-64, where not that much should change. It
will be interesting to test with arm64 in such corner cases in the future.

Thanks

David Hildenbrand Jan. 21, 2021, 9:57 a.m. UTC | #3

On 18.01.21 14:21, Anshuman Khandual wrote:
> 
> 
> On 1/18/21 6:43 PM, Anshuman Khandual wrote:
>> From: David Hildenbrand <[e-mail]>
>>
>> Right now, we only check against MAX_PHYSMEM_BITS - but turns out there
>> are more restrictions of which memory we can actually hotplug, especially
>> om arm64 or s390x once we support them: we might receive something like
>> -E2BIG or -ERANGE from add_memory_driver_managed(), stopping device
>> operation.
>>
>> So, check right when initializing the device which memory we can add,
>> warning the user. Try only adding actually pluggable ranges: in the worst
>> case, no memory provided by our device is pluggable.
>>
>> In the usual case, we expect all device memory to be pluggable, and in
>> corner cases only some memory at the end of the device-managed memory
>> region to not be pluggable.
>>
>> Cc: "Michael S. Tsirkin" <[e-mail]>
>> Cc: Jason Wang <[e-mail]>
>> Cc: Pankaj Gupta <[e-mail]>
>> Cc: Michal Hocko <[e-mail]>
>> Cc: Oscar Salvador <[e-mail]>
>> Cc: Wei Yang <[e-mail]>
>> Cc: Andrew Morton <[e-mail]>
>> Cc: [e-mail]
>> Cc: teawater <[e-mail]>
>> Cc: Anshuman Khandual <[e-mail]>
>> Cc: Pankaj Gupta <[e-mail]>
>> Cc: Jonathan Cameron <[e-mail]>
>> Cc: [e-mail]
>> Cc: Vasily Gorbik <[e-mail]>
>> Cc: Will Deacon <[e-mail]>
>> Cc: Ard Biesheuvel <[e-mail]>
>> Cc: Mark Rutland <[e-mail]>
>> Cc: Heiko Carstens <[e-mail]>
>> Cc: Michal Hocko <[e-mail]>
>> Signed-off-by: David Hildenbrand <[e-mail]>
>> Signed-off-by: Anshuman Khandual <[e-mail]>
> 
> Hello David,
> 
> As your original patch was in the RFC state, I have just maintained
> the same here as well. But once you test this patch along with the
> new series, please do let me know if this needs to be converted to
> a normal PATCH instead. Thank you.

Yes, you can drop the RFC part. I assume you'll send another revision,
I'll do another test there, thanks!

Anshuman Khandual Jan. 22, 2021, 3:32 a.m. UTC | #4

On 1/21/21 3:27 PM, David Hildenbrand wrote:
> On 18.01.21 14:21, Anshuman Khandual wrote:
>>
>>
>> On 1/18/21 6:43 PM, Anshuman Khandual wrote:
>>> From: David Hildenbrand <[e-mail]>
>>>
>>> Right now, we only check against MAX_PHYSMEM_BITS - but turns out there
>>> are more restrictions of which memory we can actually hotplug, especially
>>> om arm64 or s390x once we support them: we might receive something like
>>> -E2BIG or -ERANGE from add_memory_driver_managed(), stopping device
>>> operation.
>>>
>>> So, check right when initializing the device which memory we can add,
>>> warning the user. Try only adding actually pluggable ranges: in the worst
>>> case, no memory provided by our device is pluggable.
>>>
>>> In the usual case, we expect all device memory to be pluggable, and in
>>> corner cases only some memory at the end of the device-managed memory
>>> region to not be pluggable.
>>>
>>> Cc: "Michael S. Tsirkin" <[e-mail]>
>>> Cc: Jason Wang <[e-mail]>
>>> Cc: Pankaj Gupta <[e-mail]>
>>> Cc: Michal Hocko <[e-mail]>
>>> Cc: Oscar Salvador <[e-mail]>
>>> Cc: Wei Yang <[e-mail]>
>>> Cc: Andrew Morton <[e-mail]>
>>> Cc: [e-mail]
>>> Cc: teawater <[e-mail]>
>>> Cc: Anshuman Khandual <[e-mail]>
>>> Cc: Pankaj Gupta <[e-mail]>
>>> Cc: Jonathan Cameron <[e-mail]>
>>> Cc: [e-mail]
>>> Cc: Vasily Gorbik <[e-mail]>
>>> Cc: Will Deacon <[e-mail]>
>>> Cc: Ard Biesheuvel <[e-mail]>
>>> Cc: Mark Rutland <[e-mail]>
>>> Cc: Heiko Carstens <[e-mail]>
>>> Cc: Michal Hocko <[e-mail]>
>>> Signed-off-by: David Hildenbrand <[e-mail]>
>>> Signed-off-by: Anshuman Khandual <[e-mail]>
>>
>> Hello David,
>>
>> As your original patch was in the RFC state, I have just maintained
>> the same here as well. But once you test this patch along with the
>> new series, please do let me know if this needs to be converted to
>> a normal PATCH instead. Thank you.
> 
> Yes, you can drop the RFC part. I assume you'll send another revision,
> I'll do another test there, thanks!

Sure, will drop the RFC in next version.

Patch

diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c
index 9fc9ec4a25f5..1fe40b2d7b6d 100644
--- a/drivers/virtio/virtio_mem.c
+++ b/drivers/virtio/virtio_mem.c
@@ -2222,7 +2222,7 @@  static int virtio_mem_unplug_pending_mb(struct virtio_mem *vm)
  */
 static void virtio_mem_refresh_config(struct virtio_mem *vm)
 {
-	const uint64_t phys_limit = 1UL << MAX_PHYSMEM_BITS;
+	const struct range pluggable_range = memhp_get_pluggable_range(true);
 	uint64_t new_plugged_size, usable_region_size, end_addr;
 
 	/* the plugged_size is just a reflection of what _we_ did previously */
@@ -2234,15 +2234,25 @@  static void virtio_mem_refresh_config(struct virtio_mem *vm)
 	/* calculate the last usable memory block id */
 	virtio_cread_le(vm->vdev, struct virtio_mem_config,
 			usable_region_size, &usable_region_size);
-	end_addr = vm->addr + usable_region_size;
-	end_addr = min(end_addr, phys_limit);
+	end_addr = min(vm->addr + usable_region_size - 1,
+		       pluggable_range.end);
 
-	if (vm->in_sbm)
-		vm->sbm.last_usable_mb_id =
-					 virtio_mem_phys_to_mb_id(end_addr) - 1;
-	else
-		vm->bbm.last_usable_bb_id =
-				     virtio_mem_phys_to_bb_id(vm, end_addr) - 1;
+	if (vm->in_sbm) {
+		vm->sbm.last_usable_mb_id = virtio_mem_phys_to_mb_id(end_addr);
+		if (!IS_ALIGNED(end_addr + 1, memory_block_size_bytes()))
+			vm->sbm.last_usable_mb_id--;
+	} else {
+		vm->bbm.last_usable_bb_id = virtio_mem_phys_to_bb_id(vm,
+								     end_addr);
+		if (!IS_ALIGNED(end_addr + 1, vm->bbm.bb_size))
+			vm->bbm.last_usable_bb_id--;
+	}
+	/*
+	 * If we cannot plug any of our device memory (e.g., nothing in the
+	 * usable region is addressable), the last usable memory block id will
+	 * be smaller than the first usable memory block id. We'll stop
+	 * attempting to add memory with -ENOSPC from our main loop.
+	 */
 
 	/* see if there is a request to change the size */
 	virtio_cread_le(vm->vdev, struct virtio_mem_config, requested_size,
@@ -2364,6 +2374,7 @@  static int virtio_mem_init_vq(struct virtio_mem *vm)
 
 static int virtio_mem_init(struct virtio_mem *vm)
 {
+	const struct range pluggable_range = memhp_get_pluggable_range(true);
 	const uint64_t phys_limit = 1UL << MAX_PHYSMEM_BITS;
 	uint64_t sb_size, addr;
 	uint16_t node_id;
@@ -2405,9 +2416,10 @@  static int virtio_mem_init(struct virtio_mem *vm)
 	if (!IS_ALIGNED(vm->addr + vm->region_size, memory_block_size_bytes()))
 		dev_warn(&vm->vdev->dev,
 			 "The alignment of the physical end address can make some memory unusable.\n");
-	if (vm->addr + vm->region_size > phys_limit)
+	if (vm->addr < pluggable_range.start ||
+	    vm->addr + vm->region_size - 1 > pluggable_range.end)
 		dev_warn(&vm->vdev->dev,
-			 "Some memory is not addressable. This can make some memory unusable.\n");
+			 "Some device memory is not addressable/pluggable. This can make some memory unusable.\n");
 
 	/*
 	 * We want subblocks to span at least MAX_ORDER_NR_PAGES and
@@ -2429,7 +2441,8 @@  static int virtio_mem_init(struct virtio_mem *vm)
 				     vm->sbm.sb_size;
 
 		/* Round up to the next full memory block */
-		addr = vm->addr + memory_block_size_bytes() - 1;
+		addr = max_t(uint64_t, vm->addr, pluggable_range.start) +
+		       memory_block_size_bytes() - 1;
 		vm->sbm.first_mb_id = virtio_mem_phys_to_mb_id(addr);
 		vm->sbm.next_mb_id = vm->sbm.first_mb_id;
 	} else {
@@ -2450,7 +2463,8 @@  static int virtio_mem_init(struct virtio_mem *vm)
 		}
 
 		/* Round up to the next aligned big block */
-		addr = vm->addr + vm->bbm.bb_size - 1;
+		addr = max_t(uint64_t, vm->addr, pluggable_range.start) +
+		       vm->bbm.bb_size - 1;
 		vm->bbm.first_bb_id = virtio_mem_phys_to_bb_id(vm, addr);
 		vm->bbm.next_bb_id = vm->bbm.first_bb_id;
 	}