Commit 68acc99f authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Jeff Cody
Browse files

sheepdog: remove huge BSS object 



block/sheepdog.o has a 4M static variable that is 90% of QEMU's whole .bss
section.  Replace it with a heap-allocated block, and make it smaller too
since only the inode header is actually being used.

bss size goes down from 4464280 to 269976.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20180523160721.14018-3-pbonzini@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent 03b036cc

block/sheepdog.c

+12 −10
Original line number Diff line number Diff line
@@ -2938,13 +2938,14 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) 
    QEMUSnapshotInfo *sn_tab = NULL;

    unsigned wlen, rlen;

    int found = 0;

    static SheepdogInode inode;

    SheepdogInode *inode;

    unsigned long *vdi_inuse;

    unsigned int start_nr;

    uint64_t hval;

    uint32_t vid;



    vdi_inuse = g_malloc(max);

    inode = g_malloc(SD_INODE_HEADER_SIZE);



    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {
@@ -2987,7 +2988,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) 
        }



        /* we don't need to read entire object */

        ret = read_object(fd, s->bs, (char *)&inode,

        ret = read_object(fd, s->bs, (char *)inode,

                          vid_to_vdi_oid(vid),

                          0, SD_INODE_HEADER_SIZE, 0,

                          s->cache_flags);
@@ -2996,17 +2997,17 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) 
            continue;

        }



        if (!strcmp(inode.name, s->name) && is_snapshot(&inode)) {

            sn_tab[found].date_sec = inode.snap_ctime >> 32;

            sn_tab[found].date_nsec = inode.snap_ctime & 0xffffffff;

            sn_tab[found].vm_state_size = inode.vm_state_size;

            sn_tab[found].vm_clock_nsec = inode.vm_clock_nsec;

        if (!strcmp(inode->name, s->name) && is_snapshot(inode)) {

            sn_tab[found].date_sec = inode->snap_ctime >> 32;

            sn_tab[found].date_nsec = inode->snap_ctime & 0xffffffff;

            sn_tab[found].vm_state_size = inode->vm_state_size;

            sn_tab[found].vm_clock_nsec = inode->vm_clock_nsec;



            snprintf(sn_tab[found].id_str, sizeof(sn_tab[found].id_str),

                     "%" PRIu32, inode.snap_id);

                     "%" PRIu32, inode->snap_id);

            pstrcpy(sn_tab[found].name,

                    MIN(sizeof(sn_tab[found].name), sizeof(inode.tag)),

                    inode.tag);

                    MIN(sizeof(sn_tab[found].name), sizeof(inode->tag)),

                    inode->tag);

            found++;

        }

    }
@@ -3016,6 +3017,7 @@ out: 
    *psn_tab = sn_tab;



    g_free(vdi_inuse);

    g_free(inode);



    if (ret < 0) {

        return ret;