From nobody Sat May 18 14:10:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603301895; cv=none; d=zohomail.com; s=zohoarc; b=ISELtguo85m85iD+Pwx3R0Hp7sJ5JhGq9pXxRB9v1pYwsg7ukYZPRVnJkkFJyVlQTYLld+n7qqRpFR7Qcxxy5DoMapQWhZjFN5d7AyczRvPgNV+j5c6e0cUkQsACbPAbHMG2hl+OXk38U6/4izXrENpttjws/s2n1WcTC6B2npE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603301895; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=wCTQX4mLqj2f5H121RmQ/r4zkcw4nXTmcR2H90CkbeE=; b=jM1dQKlo6ujpJujbZHpgmjPAPYUXhQSX5+ookcHjxCgQQcpNnKQclcmoHb+zub8mht17+K9Tw9J2UPiSwQKreLAEaE50zcNULjqyKD3QOGqdl3u/QCw0JSeww3uD9UjZMrubb4MZoHcxDUKenbyFpZjFO6VP9J73q0SXX2hMA7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603301895098391.46567966932184; Wed, 21 Oct 2020 10:38:15 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-510-NCIgNCYqOcWNm25wC-ZxCA-1; Wed, 21 Oct 2020 13:38:12 -0400 Received: by mail-wr1-f72.google.com with SMTP id t11so2993294wrv.10 for ; Wed, 21 Oct 2020 10:38:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id x81sm4606765wmb.11.2020.10.21.10.38.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 10:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603301894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wCTQX4mLqj2f5H121RmQ/r4zkcw4nXTmcR2H90CkbeE=; b=GN9uua4Vph1kvPHjpSKdzX7lJciqNh+5ngYDK/oanthrpo1hZr3u8mkVLlzgt79N2WU+wy B1dygeiJ88nSUNUt2FMPyxdpi9lgcqyzRJ2G2RBqoWxjwEqnLh6sd2JXYI6NTRgNv0O1HG /65xatdwri3/5WC+STLWrFnMMKMsH74= X-MC-Unique: NCIgNCYqOcWNm25wC-ZxCA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wCTQX4mLqj2f5H121RmQ/r4zkcw4nXTmcR2H90CkbeE=; b=O6qJ9dl/5izb5jgeyXD5Qm16y1HYWPc2m+tOnY2hGxBruXOELKj0YSNprIaPnejBN2 DaUTAqWjfVuWiJuwC9yBkn+CNOBUW9UeaiPF3qi/hY00aQ6fIPAvH7WWtgBUCWHqlD9T IxUL7HUD4ukRiyabmIClXIoR8u4aESOk1ByeVsPTstm57u1U9mECbNjUSZzWOcz4y5Hh Nutmp8GjwKsDnfKPJul8gfShhi5C8LGdq1RX/qcxNaNSOBACQqb0LxJGeOgup7H/PR9L dxPkAuQpaYaW+tFQrK99YK/fBeYeWISciYhmViP3QK5uDr3oNj9DxyNCD/EjCTDGQxXW hIdA== X-Gm-Message-State: AOAM531TWWQqI/AsA40c21pJBItz21gA5a4COrnLINby4zC2B5pKe10v isXNzJwZXcBbrxWOerfnsK4+Dw0SZvApMx4pGboeMGqvRM4GYv9cQl5uVKs+9z9LVCk8FG4EYOf AHuCSCWNxeM+p3w== X-Received: by 2002:adf:bbc6:: with SMTP id z6mr6011347wrg.298.1603301890709; Wed, 21 Oct 2020 10:38:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+gInbogEgvA5LYqMVO8Vqg0xBxVjoml4Dg59/ixdlEM5N1rJJS542EuRfO8pbKPGigDLclQ== X-Received: by 2002:adf:bbc6:: with SMTP id z6mr6011330wrg.298.1603301890496; Wed, 21 Oct 2020 10:38:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 1/2] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Date: Wed, 21 Oct 2020 19:38:02 +0200 Message-Id: <20201021173803.2619054-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021173803.2619054-1-philmd@redhat.com> References: <20201021173803.2619054-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Richard Henderson We do not need or want to be allocating page sized quanta. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Weil Message-Id: <20201018164836.1149452-1-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- util/oslib-win32.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/util/oslib-win32.c b/util/oslib-win32.c index e99debfb8dd..29dd05d59d7 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -39,6 +39,7 @@ #include "trace.h" #include "qemu/sockets.h" #include "qemu/cutils.h" +#include =20 /* this must come after including "trace.h" */ #include @@ -56,10 +57,8 @@ void *qemu_try_memalign(size_t alignment, size_t size) { void *ptr; =20 - if (!size) { - abort(); - } - ptr =3D VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE); + g_assert(size !=3D 0); + ptr =3D _aligned_malloc(alignment, size); trace_qemu_memalign(alignment, size, ptr); return ptr; } @@ -93,9 +92,7 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, b= ool shared) void qemu_vfree(void *ptr) { trace_qemu_vfree(ptr); - if (ptr) { - VirtualFree(ptr, 0, MEM_RELEASE); - } + _aligned_free(ptr); } =20 void qemu_anon_ram_free(void *ptr, size_t size) --=20 2.26.2 From nobody Sat May 18 14:10:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603301899; cv=none; d=zohomail.com; s=zohoarc; b=Nl4YzhcD+Pgpuj68oeCtzJLHALJHi+Hz6I1p0dAdqbVDzt9fDQGl6rpiHx4l+XG3wtM+jf514pNc6ikj+cS65PdkY72Ww2xSstAZ1tvy1MsukACgSHrZnQnJcwaHwPBJLp//lJDsvT+0VJioiIv/VyImySez5Lds/0sWH6HAlYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603301899; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=WMGo54MOAQhEJMWck8zBqfGUrL7xPSbuYgDgiKKm1lI=; b=izYrENFHhhWO2aTE02RVH9RYuNmfwn+s5tScTKjNrHehG0aiykKWyoOfTyre8DgYPqWMi34RRJ4R1cc1MUIqtql1OyiqJLBPqFoIRhW8taD7iY48+JA8tSbxMdcB5iriltBTu6cRO/ARxmBZI8zR2A0CUfYBcmiu6GtOs1ByNok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603301899517669.8951073843664; Wed, 21 Oct 2020 10:38:19 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-190-PqbennLPP36mPkaL4D7_Mg-1; Wed, 21 Oct 2020 13:38:16 -0400 Received: by mail-wr1-f71.google.com with SMTP id n14so3001163wrp.1 for ; Wed, 21 Oct 2020 10:38:16 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id o5sm4650076wrw.76.2020.10.21.10.38.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 10:38:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603301898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WMGo54MOAQhEJMWck8zBqfGUrL7xPSbuYgDgiKKm1lI=; b=c/cCOY9utAh6TUbIW/K9CMRy3XDo3jKznZx11bYQ4GNImM52PtndpAmrVPxtUL3vlIlzmM d1Q1bbS5cZfWrpAQC2+uM8gJql0vxbb7nLEjSgPX7RZYVKxaDX7/nSbkGR1coC/BOwdaLd XyoNrmE4SVoFOfpdwQH/YqrH25qLyJI= X-MC-Unique: PqbennLPP36mPkaL4D7_Mg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WMGo54MOAQhEJMWck8zBqfGUrL7xPSbuYgDgiKKm1lI=; b=BmH0FYZDHtUy5CzVzlm5+RF9DoOrjgE6zRhu4JaD3Dg0EKbtFbzsVMF1pVpa+/3XUQ tId60Ysxa+tPOFQ4P37Zvt2QhkEyD6nhPXUNZZqy1F5qbKBT2asJ/tAItioP7I4Y/9Jc yehy/2OrCl2HOzxUzqFC2xrZ5e8wCS3lVF1dUELJTFYB8ev0W39/iNTjWXZTQX+HhQdl z+y3rM3LxrzxKUivUtFZY3gVFsowThYNWge4ZEPtY6QK1uWW/NDXWHeFvbMw5T0uffDN XhvSyIiEy1biFdbif8YSmAkA3QYdbsMcia2AGNusBl3lES4E33DfDR04ok41EYQGihGx qwfg== X-Gm-Message-State: AOAM531tbrh40hGeUZXhtLhmR16uVZb1zzgY1omASfKPcg2s+lzdb8zQ dj5Iz9xSSV2cSXfS7WBkTG3pqMaubbJUCGtU3DqCZfREP7Rt/VKFZcLk7nzE/fz5CKgvLBX/uob wFBpFXJq1NOp/lQ== X-Received: by 2002:adf:bbcb:: with SMTP id z11mr5960173wrg.130.1603301895420; Wed, 21 Oct 2020 10:38:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqWwaPMFs9HY/4pT1v+LVeU18l21LHFTPFgJ+N9JgO19NPb9P7gX+ExBtD/x7p9gOZ+Qy8Qw== X-Received: by 2002:adf:bbcb:: with SMTP id z11mr5960158wrg.130.1603301895246; Wed, 21 Oct 2020 10:38:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 2/2] util/oslib: Assert qemu_try_memalign() alignment is a power of 2 Date: Wed, 21 Oct 2020 19:38:03 +0200 Message-Id: <20201021173803.2619054-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021173803.2619054-1-philmd@redhat.com> References: <20201021173803.2619054-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) qemu_try_memalign() expects a power of 2 alignment: - posix_memalign(3): The address of the allocated memory will be a multiple of alignment, which must be a power of two and a multiple of sizeof(void *). - _aligned_malloc() The alignment value, which must be an integer power of 2. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- util/oslib-posix.c | 2 ++ util/oslib-win32.c | 1 + 2 files changed, 3 insertions(+) diff --git a/util/oslib-posix.c b/util/oslib-posix.c index f15234b5c03..3e022d7206b 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -200,6 +200,8 @@ void *qemu_try_memalign(size_t alignment, size_t size) =20 if (alignment < sizeof(void*)) { alignment =3D sizeof(void*); + } else { + g_assert(is_power_of_2(alignment)); } =20 #if defined(CONFIG_POSIX_MEMALIGN) diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 29dd05d59d7..72e4ee910ce 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -58,6 +58,7 @@ void *qemu_try_memalign(size_t alignment, size_t size) void *ptr; =20 g_assert(size !=3D 0); + g_assert(is_power_of_2(alignment)); ptr =3D _aligned_malloc(alignment, size); trace_qemu_memalign(alignment, size, ptr); return ptr; --=20 2.26.2