[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 11/41] migration/rdma: Use ram_block_discard_disable()
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 11/41] migration/rdma: Use ram_block_discard_disable() |
Date: |
Sat, 4 Jul 2020 14:29:52 -0400 |
From: David Hildenbrand <david@redhat.com>
RDMA will pin all guest memory (as documented in docs/rdma.txt). We want
to disable RAM block discards - however, to keep it simple use
ram_block_discard_is_required() instead of inhibiting.
Note: It is not sufficient to limit disabling to pin_all. Even when only
conditionally pinning 1 MB chunks, as soon as one page within such a
chunk was discarded and one page not, the discarded pages will be pinned
as well.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Juan Quintela <quintela@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20200626072248.78761-9-david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
migration/rdma.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index ec45d33ba3..bbe6f36627 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -29,6 +29,7 @@
#include "qemu/sockets.h"
#include "qemu/bitmap.h"
#include "qemu/coroutine.h"
+#include "exec/memory.h"
#include <sys/socket.h>
#include <netdb.h>
#include <arpa/inet.h>
@@ -4017,8 +4018,14 @@ void rdma_start_incoming_migration(const char
*host_port, Error **errp)
Error *local_err = NULL;
trace_rdma_start_incoming_migration();
- rdma = qemu_rdma_data_init(host_port, &local_err);
+ /* Avoid ram_block_discard_disable(), cannot change during migration. */
+ if (ram_block_discard_is_required()) {
+ error_setg(errp, "RDMA: cannot disable RAM discard");
+ return;
+ }
+
+ rdma = qemu_rdma_data_init(host_port, &local_err);
if (rdma == NULL) {
goto err;
}
@@ -4067,10 +4074,17 @@ void rdma_start_outgoing_migration(void *opaque,
const char *host_port, Error **errp)
{
MigrationState *s = opaque;
- RDMAContext *rdma = qemu_rdma_data_init(host_port, errp);
RDMAContext *rdma_return_path = NULL;
+ RDMAContext *rdma;
int ret = 0;
+ /* Avoid ram_block_discard_disable(), cannot change during migration. */
+ if (ram_block_discard_is_required()) {
+ error_setg(errp, "RDMA: cannot disable RAM discard");
+ return;
+ }
+
+ rdma = qemu_rdma_data_init(host_port, errp);
if (rdma == NULL) {
goto err;
}
--
MST
- [PULL v2 02/41] Revert "tests/migration: Reduce autoconverge initial bandwidth", (continued)
- [PULL v2 02/41] Revert "tests/migration: Reduce autoconverge initial bandwidth", Michael S. Tsirkin, 2020/07/04
- [PULL v2 03/41] virtio-balloon: always indicate S_DONE when migration fails, Michael S. Tsirkin, 2020/07/04
- [PULL v2 04/41] pc: Support coldplugging of virtio-pmem-pci devices on all buses, Michael S. Tsirkin, 2020/07/04
- [PULL v2 05/41] exec: Introduce ram_block_discard_(disable|require)(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 07/41] accel/kvm: Convert to ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 06/41] vfio: Convert to ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 01/41] tests: disassemble-aml.sh: generate AML in readable format, Michael S. Tsirkin, 2020/07/04
- [PULL v2 10/41] target/i386: sev: Use ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 08/41] s390x/pv: Convert to ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 09/41] virtio-balloon: Rip out qemu_balloon_inhibit(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 11/41] migration/rdma: Use ram_block_discard_disable(),
Michael S. Tsirkin <=
- [PULL v2 12/41] migration/colo: Use ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 13/41] virtio-mem: Paravirtualized memory hot(un)plug, Michael S. Tsirkin, 2020/07/04
- [PULL v2 14/41] virtio-pci: Proxy for virtio-mem, Michael S. Tsirkin, 2020/07/04
- [PULL v2 15/41] MAINTAINERS: Add myself as virtio-mem maintainer, Michael S. Tsirkin, 2020/07/04
- [PULL v2 16/41] hmp: Handle virtio-mem when printing memory device info, Michael S. Tsirkin, 2020/07/04
- [PULL v2 17/41] numa: Handle virtio-mem in NUMA stats, Michael S. Tsirkin, 2020/07/04
- [PULL v2 18/41] pc: Support for virtio-mem-pci, Michael S. Tsirkin, 2020/07/04
- [PULL v2 19/41] virtio-mem: Allow notifiers for size changes, Michael S. Tsirkin, 2020/07/04
- [PULL v2 20/41] virtio-pci: Send qapi events when the virtio-mem size changes, Michael S. Tsirkin, 2020/07/04
- [PULL v2 22/41] virtio-mem: Add trace events, Michael S. Tsirkin, 2020/07/04