Message ID | 1371242153-11262-11-git-send-email-mrhines@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On 06/14/2013 09:35 PM, mrhines@linux.vnet.ibm.com wrote: > From: "Michael R. Hines" <mrhines@us.ibm.com> > > This capability allows you to disable dynamic chunk registration > for better throughput on high-performance links. > > +++ b/qapi-schema.json > @@ -608,10 +608,15 @@ > # This feature allows us to minimize migration traffic for certain work > # loads, by sending compressed difference of the pages > # > +# @x-rdma-pin-all: Controls whether or not the entire VM memory footprint is > +# mlock()'d on demand or all at once. Refer to docs/rdma.txt for usage. > +# Disabled by default. Experimental: may (or may not) be renamed after > +# further testing is complete. (since 1.5) 1.5 is already out. That means this should probably be (since 1.6) now.
On 06/15/2013 05:05 AM, Eric Blake wrote: > On 06/14/2013 09:35 PM, mrhines@linux.vnet.ibm.com wrote: >> From: "Michael R. Hines" <mrhines@us.ibm.com> >> >> This capability allows you to disable dynamic chunk registration >> for better throughput on high-performance links. >> >> +++ b/qapi-schema.json >> @@ -608,10 +608,15 @@ >> # This feature allows us to minimize migration traffic for certain work >> # loads, by sending compressed difference of the pages >> # >> +# @x-rdma-pin-all: Controls whether or not the entire VM memory footprint is >> +# mlock()'d on demand or all at once. Refer to docs/rdma.txt for usage. >> +# Disabled by default. Experimental: may (or may not) be renamed after >> +# further testing is complete. (since 1.5) > 1.5 is already out. That means this should probably be (since 1.6) now. > Good catch again. - Michael
diff --git a/include/migration/migration.h b/include/migration/migration.h index d60c64c..2e6001d 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -125,6 +125,8 @@ void migrate_add_blocker(Error *reason); */ void migrate_del_blocker(Error *reason); +bool migrate_rdma_pin_all(void); + int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, uint8_t *dst, int dlen); int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen); diff --git a/migration.c b/migration.c index 441a3b2..a704d48 100644 --- a/migration.c +++ b/migration.c @@ -476,6 +476,15 @@ void qmp_migrate_set_downtime(double value, Error **errp) max_downtime = (uint64_t)value; } +bool migrate_rdma_pin_all(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_X_RDMA_PIN_ALL]; +} + int migrate_use_xbzrle(void) { MigrationState *s; diff --git a/qapi-schema.json b/qapi-schema.json index b239adb..4e9cd6d 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -608,10 +608,15 @@ # This feature allows us to minimize migration traffic for certain work # loads, by sending compressed difference of the pages # +# @x-rdma-pin-all: Controls whether or not the entire VM memory footprint is +# mlock()'d on demand or all at once. Refer to docs/rdma.txt for usage. +# Disabled by default. Experimental: may (or may not) be renamed after +# further testing is complete. (since 1.5) +# # Since: 1.2 ## { 'enum': 'MigrationCapability', - 'data': ['xbzrle'] } + 'data': ['xbzrle', 'x-rdma-pin-all'] } ## # @MigrationCapabilityStatus