From nobody Fri May 3 20:16:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152701997799790.56086225053411; Tue, 22 May 2018 13:12:57 -0700 (PDT) Received: from localhost ([::1]:57712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLDeS-0002kP-A4 for importer@patchew.org; Tue, 22 May 2018 16:12:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLDcg-0001fP-GX for qemu-devel@nongnu.org; Tue, 22 May 2018 16:11:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLDcf-0002wM-HK for qemu-devel@nongnu.org; Tue, 22 May 2018 16:11:06 -0400 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:38127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fLDcf-0002wD-Ag; Tue, 22 May 2018 16:11:05 -0400 Received: by mail-pg0-x243.google.com with SMTP id n9-v6so8339046pgq.5; Tue, 22 May 2018 13:11:05 -0700 (PDT) Received: from donizetti.event.priv ([72.28.93.232]) by smtp.gmail.com with ESMTPSA id r90-v6sm43926803pfg.122.2018.05.22.13.11.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 13:11:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=3gnKPWhcN1FKZSDlxk7H47MXRQrfVUtLkqEqfKmIs48=; b=C1Y8OkR8PvFSBcGw3lVH3a1eqa+k7EHH5NMoGONrMfIGiCuGnzwv7ckdvGNQZ7Rz2n kLAQ6d8T3Ycdcv1sXYnyBdmrQeytQVsecBuajkGTo19gBRnb0RtGV2+0i9jPRPxCvTQH dy5EeU8GGZGqsakSVs8Ri5pY7LJtFwC/WlzoGr20nViUghF/1mxtzMEkRdb3YH9ntWTm OqKXkFPWHkHDPwt87npQ2GbaMqjazMeN+5NTK5s2vKOuaPeHyR5kmVD2HUcu+/R/mTKF pEaeZ59GRHtjaPtV4LyOGi+AYJU/tSUTHx3ntQXBknAPuPXF60r5oYatdvJTkJWC0OHK /ywA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=3gnKPWhcN1FKZSDlxk7H47MXRQrfVUtLkqEqfKmIs48=; b=MgbvXimWBPev+Qcu4y3QEzLDz7ew2jehsmsCenlFwUU90ehnYCjcEAU9aj8W+ovH8D bZaFa+hreypVht4fypuPaOGAkB4QlB+GUe3QqnSFTROG3ZTeV0eH/anjvVDu5XFZBonZ +jwkhsEEM/DedYBb16cPGMkoTVPwM/l0Q7c8BMIY21m6MgpezmyDektCFj2rZ2WrBl0q 2FXFi4CrXz0mpbkDIMwE4sxESaOkE7BGqt5gk1cM7BG/bfXwRv80t5yRou9teMLPWaQ0 s4HSCW8PcqNOSFmjzkiVgi/pozCaYzN4mpN1Yoodp2ELoffl4it/Dqb9oorTp85UqU8s I+tw== X-Gm-Message-State: ALKqPwfnISm/Br9F+J6XWQAefMnP0AOruS3qKwnNCzF+wezlan9JFoNV 1nk131gcgNB9XUEuV4njnKODmhJt X-Google-Smtp-Source: AB8JxZp+aGF+844Qtxxfz/V6fMYincf/nrHCbTR79XNmp34xdOf/jyYZHoYC1d0SMSxDehsAJdjekQ== X-Received: by 2002:a63:6196:: with SMTP id v144-v6mr20600611pgb.264.1527019863979; Tue, 22 May 2018 13:11:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 22 May 2018 22:10:55 +0200 Message-Id: <20180522201056.1442-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522201056.1442-1-pbonzini@redhat.com> References: <20180522201056.1442-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::243 Subject: [Qemu-devel] [PATCH 1/2] sheepdog: cleanup repeated expression X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The expression "SD_INODE_SIZE - sizeof(inode.data_vdi_id)" already has a ma= cro defined for the same value (though with a nicer definition using offsetof). Replace it. Signed-off-by: Paolo Bonzini Reviewed-by: Fam Zheng Reviewed-by: Jeff Cody Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/sheepdog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 4237132419..23cf5a8430 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2337,7 +2337,7 @@ static int sd_truncate(BlockDriverState *bs, int64_t = offset, } =20 /* we don't need to update entire object */ - datalen =3D SD_INODE_SIZE - sizeof(s->inode.data_vdi_id); + datalen =3D SD_INODE_HEADER_SIZE; s->inode.vdi_size =3D offset; ret =3D write_object(fd, s->bs, (char *)&s->inode, vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies, @@ -2705,7 +2705,7 @@ static int sd_snapshot_create(BlockDriverState *bs, Q= EMUSnapshotInfo *sn_info) */ strncpy(s->inode.tag, sn_info->name, sizeof(s->inode.tag)); /* we don't need to update entire object */ - datalen =3D SD_INODE_SIZE - sizeof(s->inode.data_vdi_id); + datalen =3D SD_INODE_HEADER_SIZE; inode =3D g_malloc(datalen); =20 /* refresh inode. */ @@ -2991,7 +2991,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEM= USnapshotInfo **psn_tab) /* we don't need to read entire object */ ret =3D read_object(fd, s->bs, (char *)&inode, vid_to_vdi_oid(vid), - 0, SD_INODE_SIZE - sizeof(inode.data_vdi_id), 0, + 0, SD_INODE_HEADER_SIZE, 0, s->cache_flags); =20 if (ret) { --=20 2.17.0 From nobody Fri May 3 20:16:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527020123634387.5391127070326; Tue, 22 May 2018 13:15:23 -0700 (PDT) Received: from localhost ([::1]:57727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLDgk-0004tE-S3 for importer@patchew.org; Tue, 22 May 2018 16:15:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLDci-0001gw-Rc for qemu-devel@nongnu.org; Tue, 22 May 2018 16:11:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLDch-0002y0-QM for qemu-devel@nongnu.org; Tue, 22 May 2018 16:11:08 -0400 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:39442) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fLDch-0002wq-KM; Tue, 22 May 2018 16:11:07 -0400 Received: by mail-pl0-x243.google.com with SMTP id c19-v6so11547438pls.6; Tue, 22 May 2018 13:11:07 -0700 (PDT) Received: from donizetti.event.priv ([72.28.93.232]) by smtp.gmail.com with ESMTPSA id r90-v6sm43926803pfg.122.2018.05.22.13.11.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 13:11:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ydnM9u+p1O2JYBmclDANVa19zTRw/1cpjuzYTFqtjkc=; b=ognHCtGXO/ZcPYCHHfq5R7z+JAPmM7IgBlE2oa+w/9yba+PdSR7UybtywCI9i2neO4 ORESH4rHKuwWQjCMCXruFtgUcTvPAtvWEyDG/fZEJFIFgJsh8eiqAgdwwErqeV0KGYaV PawHGlnqa6z/TBItwEd9D/WhZSOEs76gMPc5sILKV0fJS/Ljt1T0pe2h54Gl7wVPUZqU Sex5LagqCJciTFoBAtWh/rY7tx7hRCPjji+LYNmNgVf3UqLa/RxQMAIyD9MAY0MNwCZ1 AQNXCOfUFl5pyWi82CEC+4iLXmjzObYJVPQ1lpkHwcNNhyjuh11JT2MSwD2b76+kpxR9 crfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ydnM9u+p1O2JYBmclDANVa19zTRw/1cpjuzYTFqtjkc=; b=iSCmrQU0I3dfbWseobhzwbftPDxXuHEAFran+Eb7QwgDSGvf2YAmON4cxEhmQ4t9TF 1FVElRL94SnNS93o2f6ExRQPR4XquJra/WVz6QgqfsmvkICej/iGcSQ+g1z49nM5uuew cLy8VznhN/FN86lK/cdhiWgsYdry5bUBF3QbmVnE3fFXNnrmJipIUDo8UKnsmIXDN8u2 bj+Ne9+rBtWZFLIsmH+/IdzrObdJHVajUpx2R+Zmnl7OFYITV2x7cwQ9JkwKWO+l8mR7 btvwFLhfoGndrsV0wKUIwSsCgh4iNsuBRuNzfZIPfwJHNcgBmzI0aMxhi96aCOeePElR vsJw== X-Gm-Message-State: ALKqPwd98xrkMEYh1GwWPi6kJT82ch44DJqNmL9zZRGSbsJFdHWbehoQ RKBDDxfYTMIq69dcSmLC9Lq6vSPd X-Google-Smtp-Source: AB8JxZoO4fyRdXkQr1k5TCSMgCaP8Ib8Trt4l1kuPaf65s2N6e2dWECCG4qUqjvaKvaD7pPMjs11dw== X-Received: by 2002:a17:902:7402:: with SMTP id g2-v6mr26786987pll.246.1527019866456; Tue, 22 May 2018 13:11:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 22 May 2018 22:10:56 +0200 Message-Id: <20180522201056.1442-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522201056.1442-1-pbonzini@redhat.com> References: <20180522201056.1442-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::243 Subject: [Qemu-devel] [PATCH 2/2] sheepdog: remove huge BSS object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/sheepdog.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 23cf5a8430..2068166e3e 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2940,13 +2940,14 @@ static int sd_snapshot_list(BlockDriverState *bs, Q= EMUSnapshotInfo **psn_tab) QEMUSnapshotInfo *sn_tab =3D NULL; unsigned wlen, rlen; int found =3D 0; - static SheepdogInode inode; + SheepdogInode *inode; unsigned long *vdi_inuse; unsigned int start_nr; uint64_t hval; uint32_t vid; =20 vdi_inuse =3D g_malloc(max); + inode =3D g_malloc(SD_INODE_HEADER_SIZE); =20 fd =3D connect_to_sdog(s, &local_err); if (fd < 0) { @@ -2989,7 +2990,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEM= USnapshotInfo **psn_tab) } =20 /* we don't need to read entire object */ - ret =3D read_object(fd, s->bs, (char *)&inode, + ret =3D read_object(fd, s->bs, (char *)inode, vid_to_vdi_oid(vid), 0, SD_INODE_HEADER_SIZE, 0, s->cache_flags); @@ -2998,17 +2999,17 @@ static int sd_snapshot_list(BlockDriverState *bs, Q= EMUSnapshotInfo **psn_tab) continue; } =20 - if (!strcmp(inode.name, s->name) && is_snapshot(&inode)) { - sn_tab[found].date_sec =3D inode.snap_ctime >> 32; - sn_tab[found].date_nsec =3D inode.snap_ctime & 0xffffffff; - sn_tab[found].vm_state_size =3D inode.vm_state_size; - sn_tab[found].vm_clock_nsec =3D inode.vm_clock_nsec; + if (!strcmp(inode->name, s->name) && is_snapshot(inode)) { + sn_tab[found].date_sec =3D inode->snap_ctime >> 32; + sn_tab[found].date_nsec =3D inode->snap_ctime & 0xffffffff; + sn_tab[found].vm_state_size =3D inode->vm_state_size; + sn_tab[found].vm_clock_nsec =3D inode->vm_clock_nsec; =20 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++; } } --=20 2.17.0