From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65497C48BD1 for ; Fri, 11 Jun 2021 11:07:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 11EFD61364 for ; Fri, 11 Jun 2021 11:07:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11EFD61364 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrf0k-0006Pa-8b for qemu-devel@archiver.kernel.org; Fri, 11 Jun 2021 07:07:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrezn-0005YR-Gu for qemu-devel@nongnu.org; Fri, 11 Jun 2021 07:06:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrezh-0002Ob-Ky for qemu-devel@nongnu.org; Fri, 11 Jun 2021 07:06:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623409592; 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=Z0xDiPXFFjStcUvDTfMCQL5J0pVkNoaY5Tg5Foz7DtE=; b=bvtbDvCWHYY6T/pPaVyEcSIYDi5G16g1lWRZEpDTs97PPdj3QHLt/73cEC8UrMwxsY993A vdDlVP99rdjw7CcY/1yIokvDhBGjFEZEERUhtGhCxW+I/OwEy6JKt2UOj+EcTOQMRk/o6O GamryDcLPEwyPV+3y7pdH2HUm+rFNiA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-498-ZBH_YosLPpyYwTgWHCadag-1; Fri, 11 Jun 2021 07:06:30 -0400 X-MC-Unique: ZBH_YosLPpyYwTgWHCadag-1 Received: by mail-wm1-f72.google.com with SMTP id n8-20020a05600c3b88b02901b6e5bcd841so1619082wms.9 for ; Fri, 11 Jun 2021 04:06:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Z0xDiPXFFjStcUvDTfMCQL5J0pVkNoaY5Tg5Foz7DtE=; b=WcHjaXBm7znD6jFIELL8+GR6rOd9HjffUqxAMxBEMeWUoJ03M94QZ6Kn4Mf/FWW/iP 1d6n+FWOmOdM/8GYp+nHbCeX3NCN1BbuIQWSqTYnef5iw1LtZSnfuggymsWbBnTIOgJN ji5WQnuNs4sAbe7cCZtSSCMlBrYe02BFfWU1U7xEuf2lRHymKfe8p54k6/gLTu0VniXU fUcSg009/FaIQoi9ElUKkTf3/QTqdRkRkXVncbBsFbl6uywWcuSwoGndbZ2ba+a1GLyf SWrA3vQbtbHLg/1FwfgOJhKzLzV4LPpE77htlkkD2BbMKqHA8wyLHL+pQ+4mZYmzWltc OBCw== X-Gm-Message-State: AOAM530CdkhtZ1wt52nYIhRvxxOyWrFlbWesLo66qJvRjgVVnrNCqxep +up4BWhFDboEh1neZQsUl8NH0QcWq9wFuXDR+CCOJfUzRiktLZaAQabEftuDRhPokPZwjskJIWy TQqL9VQDlN81Z3zs= X-Received: by 2002:adf:cf02:: with SMTP id o2mr3345396wrj.365.1623409589648; Fri, 11 Jun 2021 04:06:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzreZ59hqPbwc8oqHVLP6i1f51fnLdxV2g7sZ6d2ukGMbyhZO2x7DKrA0mc9wBdbFpIXdMxvg== X-Received: by 2002:adf:cf02:: with SMTP id o2mr3345383wrj.365.1623409589481; Fri, 11 Jun 2021 04:06:29 -0700 (PDT) Received: from [192.168.1.36] (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id q11sm6436675wrx.80.2021.06.11.04.06.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Jun 2021 04:06:29 -0700 (PDT) Subject: Re: [PATCH] util/oslib-win32: Fix fatal assertion in qemu_try_memalign To: Stefan Weil , qemu-devel@nongnu.org References: <20210611105846.347954-1-sw@weilnetz.de> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Fri, 11 Jun 2021 13:06:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210611105846.347954-1-sw@weilnetz.de> 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-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.199, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: qemu-trivial@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 6/11/21 12:58 PM, Stefan Weil wrote: > The function is called with alignment == 0 which caused an assertion. > Use the code from oslib_posix.c to fix that regression (introduced > by commit ed6f53f9ca9). > Oops. Can we replace '(introduced by commit ed6f53f9ca9)' by: Fixes: ed6f53f9ca9 ("util/oslib: Assert qemu_try_memalign() alignment is a power of 2") Reviewed-by: Philippe Mathieu-Daudé > Signed-off-by: Stefan Weil > --- > util/oslib-win32.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/util/oslib-win32.c b/util/oslib-win32.c > index ca99356fdf..7b318ea835 100644 > --- a/util/oslib-win32.c > +++ b/util/oslib-win32.c > @@ -57,7 +57,11 @@ void *qemu_try_memalign(size_t alignment, size_t size) > void *ptr; > > g_assert(size != 0); > - g_assert(is_power_of_2(alignment)); > + if (alignment < sizeof(void *)) { > + alignment = sizeof(void *); > + } else { > + g_assert(is_power_of_2(alignment)); > + } > ptr = _aligned_malloc(size, alignment); > trace_qemu_memalign(alignment, size, ptr); > return ptr; >