From nobody Fri May 3 13:12:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565805513; cv=none; d=zoho.com; s=zohoarc; b=efecCMDHA2F+XCC2ZEhCUeB/kKCWOWr6qXBtWv894/C4oRH2ejrSbysn0ydJpxdY4Uk3PcGokHrN+ERt80i3Jq04HawH+YTqrUlffqaL7msXl8fJFmqAbtZA2AwUigQRxAPDrSqqU0tcknqYNuf2BXXstFSO/QMrwFPaLEbi00Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565805513; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=UxBuoyBVUfAxHE9XqQoLmuh4M9eLQDhkNmZaW9x9MKQ=; b=kDE2NIbR1tsxsmsJpbH08GfF3nzLk2XKo9Vw9jv/RTYvVlShFQiuw2QrqNY8YOcKITEV/bLiQ3sFmiHsweODj4GLNKVfTUwXoiisfQ7Aj1d8l9+FlVY/hOQr1h9pt3cpdpB+S9g4+TBKp60bwIEd/jSPxfcr4F7Fn1/O6V6lSwM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565805513453423.57582657652654; Wed, 14 Aug 2019 10:58:33 -0700 (PDT) Received: from localhost ([::1]:34740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxxXc-0002Jk-He for importer@patchew.org; Wed, 14 Aug 2019 13:58:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38397) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxxV1-0007uY-Dr for qemu-devel@nongnu.org; Wed, 14 Aug 2019 13:55:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxxV0-0005Al-Es for qemu-devel@nongnu.org; Wed, 14 Aug 2019 13:55:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6615) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxxV0-0005AS-AE for qemu-devel@nongnu.org; Wed, 14 Aug 2019 13:55:50 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A16DB11A0F; Wed, 14 Aug 2019 17:55:49 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-212.ams2.redhat.com [10.36.117.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B164909EE; Wed, 14 Aug 2019 17:55:48 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, mst@redhat.com Date: Wed, 14 Aug 2019 18:55:33 +0100 Message-Id: <20190814175535.2023-2-dgilbert@redhat.com> In-Reply-To: <20190814175535.2023-1-dgilbert@redhat.com> References: <20190814175535.2023-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 14 Aug 2019 17:55:49 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/3] memory: Align MemoryRegionSections fields X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, maxime.coquelin@redhat.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" MemoryRegionSection includes an Int128 'size' field; on some platforms the compiler causes an alignment of this to a 128bit boundary, leaving 8 bytes of dead space. This deadspace can be filled with junk. Move the size field to the top avoiding unnecessary alignment. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 606250172a..a74a58c289 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -487,10 +487,10 @@ static inline FlatView *address_space_to_flatview(Add= ressSpace *as) * @nonvolatile: this section is non-volatile */ struct MemoryRegionSection { + Int128 size; MemoryRegion *mr; FlatView *fv; hwaddr offset_within_region; - Int128 size; hwaddr offset_within_address_space; bool readonly; bool nonvolatile; --=20 2.21.0 From nobody Fri May 3 13:12:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565805441; cv=none; d=zoho.com; s=zohoarc; b=iMKqLAKsGYGvNhqE4Sx+/7g2XUlMCL3+x6am57i3DVc0tDDe3LQ5qBa6eibuVWESC58iCBrF6KCQm7kRDxuoLQRfv6KKdwk1bBKa//xEI/YICifLiO5BeFa4T3tgqGBQ0ya9XvXbfx20Ay9fYsld5UGArP5jOUF/y56FqCQ4+Mc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565805441; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=nnDwwIZBpR+Lby0Re1PXIIvr+gfSzhq0vBKlJLhnRlI=; b=ofLYkEaV+BA1j/eLmbEGG7XIUFON6SHIx2p4vk98Gcib56n5xfNGeVxfYQ8A2RcHESfZuyt5dtSnLzYeNtO886mgn2+/ZvT6isswG81egeTKf/s4Ix4NRcSepDWtPES5OaZN64//VBDlimKj95cQzsMWiw9FkfZ2uXa1ENLcovc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565805441790184.7866022327313; Wed, 14 Aug 2019 10:57:21 -0700 (PDT) Received: from localhost ([::1]:34730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxxWQ-0000sU-4b for importer@patchew.org; Wed, 14 Aug 2019 13:57:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38408) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxxV3-0007v4-2x for qemu-devel@nongnu.org; Wed, 14 Aug 2019 13:55:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxxV2-0005Bb-6E for qemu-devel@nongnu.org; Wed, 14 Aug 2019 13:55:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxxV2-0005BE-0s for qemu-devel@nongnu.org; Wed, 14 Aug 2019 13:55:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4D89631752BE; Wed, 14 Aug 2019 17:55:51 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-212.ams2.redhat.com [10.36.117.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA47A909F8; Wed, 14 Aug 2019 17:55:49 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, mst@redhat.com Date: Wed, 14 Aug 2019 18:55:34 +0100 Message-Id: <20190814175535.2023-3-dgilbert@redhat.com> In-Reply-To: <20190814175535.2023-1-dgilbert@redhat.com> References: <20190814175535.2023-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 14 Aug 2019 17:55:51 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/3] memory: Provide an equality function for MemoryRegionSections X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, maxime.coquelin@redhat.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Provide a comparison function that checks all the fields are the same. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/memory.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/exec/memory.h b/include/exec/memory.h index a74a58c289..ce62e847bd 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -496,6 +496,18 @@ struct MemoryRegionSection { bool nonvolatile; }; =20 +static inline bool MemoryRegionSection_eq(MemoryRegionSection *a, + MemoryRegionSection *b) +{ + return a->mr =3D=3D b->mr && + a->fv =3D=3D b->fv && + a->offset_within_region =3D=3D b->offset_within_region && + a->offset_within_address_space =3D=3D b->offset_within_address_= space && + int128_eq(a->size, b->size) && + a->readonly =3D=3D b->readonly && + a->nonvolatile =3D=3D b->nonvolatile; +} + /** * memory_region_init: Initialize a memory region * --=20 2.21.0 From nobody Fri May 3 13:12:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565805568; cv=none; d=zoho.com; s=zohoarc; b=fhQis3K2k85OxElUDXKs2dh/rLJlSjhWLigJwO0AF6Ikds09bshopfhlR6GG7tZ7wSDA1fKeKmaOdq740n5OwdvYiKd27Lzsd0cX8v6ZKyrxI4FW5+Uio4C5AFv+DKjVhTJGWWqk/2dvbzbZ9mCI+qfdpzaViVmS+wst+tcS+DM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565805568; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=NIXmHUFCSODLLmSHM2LRxma/tXvi9VfAHLqPFBmvfeQ=; b=mn5bSnY8c9dJvZJDl1cQPz+hzodAp2OWFHSadXUADkzkqPwVOse2Ct7dOOI+qaUUQxJ3Y6U2VRfAHngdLh2+aiJNBkHD3Emg6EagDBn1/yBzVu3T2gAJN0Ta0H3oNyf9F4qzw0U0osqoP50Cib/gvr5a2YTlZ2pNV0v68lIY8KY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565805568000204.30760883227572; Wed, 14 Aug 2019 10:59:28 -0700 (PDT) Received: from localhost ([::1]:34748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxxYV-0003CG-0n for importer@patchew.org; Wed, 14 Aug 2019 13:59:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38422) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxxV7-0007yy-F3 for qemu-devel@nongnu.org; Wed, 14 Aug 2019 13:55:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxxV5-0005DR-Fc for qemu-devel@nongnu.org; Wed, 14 Aug 2019 13:55:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxxV3-0005C6-Mm for qemu-devel@nongnu.org; Wed, 14 Aug 2019 13:55:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC1B16374E; Wed, 14 Aug 2019 17:55:52 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-212.ams2.redhat.com [10.36.117.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97AB6909EA; Wed, 14 Aug 2019 17:55:51 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, mst@redhat.com Date: Wed, 14 Aug 2019 18:55:35 +0100 Message-Id: <20190814175535.2023-4-dgilbert@redhat.com> In-Reply-To: <20190814175535.2023-1-dgilbert@redhat.com> References: <20190814175535.2023-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 14 Aug 2019 17:55:52 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/3] vhost: Fix memory region section comparison X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, maxime.coquelin@redhat.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Using memcmp to compare structures wasn't safe, as I found out on ARM when I was getting falce miscompares. Use the helper function for comparing the MRSs. Fixes: ade6d081fc33948e56e6 Signed-off-by: Dr. David Alan Gilbert --- hw/virtio/vhost.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index bc899fc60e..2ef4bc720f 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -451,8 +451,13 @@ static void vhost_commit(MemoryListener *listener) changed =3D true; } else { /* Same size, lets check the contents */ - changed =3D n_old_sections && memcmp(dev->mem_sections, old_sectio= ns, - n_old_sections * sizeof(old_sections[0])) !=3D 0; + for (int i =3D 0; i < n_old_sections; i++) { + if (!MemoryRegionSection_eq(&old_sections[i], + &dev->mem_sections[i])) { + changed =3D true; + break; + } + } } =20 trace_vhost_commit(dev->started, changed); --=20 2.21.0