Commit 0b100c8e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200703a' into staging 



virtiofsd+migration pull 2020-07-03

A couple of small migration fixes, and some capability
rework for virtiofsd.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>

# gpg: Signature made Fri 03 Jul 2020 16:26:35 BST
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20200703a:
  migration: Count new_dirty instead of real_dirty
  migration: postcopy take proper error return
  virtiofsd: Allow addition or removal of capabilities
  virtiofsd: Check capability calls
  virtiofsd: Terminate capability list

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 21d0bafb fb613580

docs/tools/virtiofsd.rst

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,11 @@ Options 
  * flock|no_flock -

    Enable/disable flock.  The default is ``no_flock``.



  * modcaps=CAPLIST

    Modify the list of capabilities allowed; CAPLIST is a colon separated

    list of capabilities, each preceded by either + or -, e.g.

    ''+sys_admin:-chown''.



  * log_level=LEVEL -

    Print only log messages matching LEVEL or more severe.  LEVEL is one of

    ``err``, ``warn``, ``info``, or ``debug``.  The default is ``info``.

include/exec/ram_addr.h

+1 −4
Original line number Diff line number Diff line
@@ -442,8 +442,7 @@ static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start, 
static inline

uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb,

                                               ram_addr_t start,

                                               ram_addr_t length,

                                               uint64_t *real_dirty_pages)

                                               ram_addr_t length)

{

    ram_addr_t addr;

    unsigned long word = BIT_WORD((start + rb->offset) >> TARGET_PAGE_BITS);
@@ -469,7 +468,6 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb, 
            if (src[idx][offset]) {

                unsigned long bits = atomic_xchg(&src[idx][offset], 0);

                unsigned long new_dirty;

                *real_dirty_pages += ctpopl(bits);

                new_dirty = ~dest[k];

                dest[k] |= bits;

                new_dirty &= bits;
@@ -502,7 +500,6 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb, 
                        start + addr + offset,

                        TARGET_PAGE_SIZE,

                        DIRTY_MEMORY_MIGRATION)) {

                *real_dirty_pages += 1;

                long k = (start + addr) >> TARGET_PAGE_BITS;

                if (!test_and_set_bit(k, dest)) {

                    num_dirty++;

migration/postcopy-ram.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis) 
     */

    if (munlockall()) {

        error_report("%s: munlockall: %s", __func__,  strerror(errno));

        return -1;

        goto out;

    }



    /*

migration/ram.c

+5 −3
Original line number Diff line number Diff line
@@ -859,9 +859,11 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs, 
/* Called with RCU critical section */

static void ramblock_sync_dirty_bitmap(RAMState *rs, RAMBlock *rb)

{

    rs->migration_dirty_pages +=

        cpu_physical_memory_sync_dirty_bitmap(rb, 0, rb->used_length,

                                              &rs->num_dirty_pages_period);

    uint64_t new_dirty_pages =

        cpu_physical_memory_sync_dirty_bitmap(rb, 0, rb->used_length);



    rs->migration_dirty_pages += new_dirty_pages;

    rs->num_dirty_pages_period += new_dirty_pages;

}



/**

tools/virtiofsd/helper.c

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ void fuse_cmdline_help(void) 
           "                               default: no_writeback\n"

           "    -o xattr|no_xattr          enable/disable xattr\n"

           "                               default: no_xattr\n"

           "    -o modcaps=CAPLIST         Modify the list of capabilities\n"

           "                               e.g. -o modcaps=+sys_admin:-chown\n"

           "    --rlimit-nofile=<num>      set maximum number of file descriptors\n"

           "                               (0 leaves rlimit unchanged)\n"

           "                               default: min(1000000, fs.file-max - 16384)\n"