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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 1929EC433E0 for ; Mon, 15 Mar 2021 19:10:01 +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 A0C0E64F18 for ; Mon, 15 Mar 2021 19:10:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A0C0E64F18 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLsbH-0005md-Mh for qemu-devel@archiver.kernel.org; Mon, 15 Mar 2021 15:09:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLsJJ-0006Di-TZ for qemu-devel@nongnu.org; Mon, 15 Mar 2021 14:51:26 -0400 Received: from mail-ot1-x333.google.com ([2607:f8b0:4864:20::333]:34193) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLsJH-0003ty-Jf for qemu-devel@nongnu.org; Mon, 15 Mar 2021 14:51:25 -0400 Received: by mail-ot1-x333.google.com with SMTP id n23so7502173otq.1 for ; Mon, 15 Mar 2021 11:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fpax1JZXdnmsR5ErV53DVIFB1UmYF9qPM4BRgu/Zhlg=; b=j0ypw3apANpfuiYb1UVHEmMtD8M7JBEKbEJdjHU4DIqTbk1dwj4zgBx1cCgT9IBmxM zDECsXqtmTtoMtlbtop/+BJAXlHBnepniTz7s6OcW6GpWA5Ak9G6hN54F9ovjRYusN5v d4lN1hykdUhxSYDeda8H7C0nXZ+9D4E8lFo2lSkYzRB9OdoTQGD0g56NXNwvhytpK+Ej zwqb7OZIq0ll3XIIKCEexrdtZobZ59/HrjkhnSaToP/oXsc5O1Oi5koJaHrhRkyK6HOT bbiY01MCZMqEv7pOh//sVLsgX5iAUOwKHtDZQKO5HE0ElvSgbQZaNcDBv3pf3XqJuY2L yhlQ== 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=fpax1JZXdnmsR5ErV53DVIFB1UmYF9qPM4BRgu/Zhlg=; b=BQ1FPsAtt4Tt0mmOS1Yt/T1OjxURz4/bmv1dWdQYnIFJhndDEd0yvMWEiO3k1FsUjL z0m5m61DUakjTG63HjpOpvdPR0WwF9MWpwxQkFNDz3Qb6gYOQiQkesxDDqnUFrcDdpAD kJwrkzNIq9AT59vkJbqBCid3fv4RK2KZQ2mZDTDvvlTYIPYab3fIEU8k4zP7jwPhsia7 vB5XmcOFNFt5JizjSsNL0lwdR5NVSK49LyD9u0MwkcwLNNMNg272kE2NJC5sNFU08tWL 5Be1RWqt5CjKxEQw+SongudtDJs/cF6cENE8P8Ra9APTmZsjQX1HfXTfhhMba4L1Hczh 94+g== X-Gm-Message-State: AOAM531aWwotdGPRW44XE4J7nPIFUB8rUISFR0GLfp453OjAvfVIOYVx SBkVtaIVNRa0FavlXcECYy8KE1ffjZpCRaeH X-Google-Smtp-Source: ABdhPJzKBScqXgQLNbGYfNmENUiD1nOL/eYKrrwRbflPtJVX3ngEt6WChoXLDVdOYpHmblm789/TJQ== X-Received: by 2002:a9d:4d8f:: with SMTP id u15mr430688otk.296.1615834282446; Mon, 15 Mar 2021 11:51:22 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id w1sm7152041oop.1.2021.03.15.11.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 11:51:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 1/1] utils: Use fixed-point arithmetic in qemu_strtosz Date: Mon, 15 Mar 2021 12:51:17 -0600 Message-Id: <20210315185117.1986240-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210315185117.1986240-1-richard.henderson@linaro.org> References: <20210315185117.1986240-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::333; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Once we've parsed the fractional value, extract it into an integral 64-bit fraction. Perform the scaling with integer arithmetic, and simplify the overflow detection. Reviewed-by: Eric Blake Message-Id: <20210315155835.1970210-2-richard.henderson@linaro.org> Signed-off-by: Richard Henderson --- tests/unit/test-cutils.c | 2 +- util/cutils.c | 50 ++++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index bad3a60993..e025b54c05 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -2128,7 +2128,7 @@ static void test_qemu_strtosz_float(void) str = "12.345M"; err = qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, (uint64_t) (12.345 * MiB)); + g_assert_cmpint(res, ==, (uint64_t) (12.345 * MiB + 0.5)); g_assert(endptr == str + 7); } diff --git a/util/cutils.c b/util/cutils.c index d89a40a8c3..c442882b88 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -275,10 +275,9 @@ static int do_strtosz(const char *nptr, const char **end, int retval; const char *endptr, *f; unsigned char c; - bool mul_required = false, hex = false; - uint64_t val; + bool hex = false; + uint64_t val, valf = 0; int64_t mul; - double fraction = 0.0; /* Parse integral portion as decimal. */ retval = qemu_strtou64(nptr, &endptr, 10, &val); @@ -308,17 +307,19 @@ static int do_strtosz(const char *nptr, const char **end, * without fractional digits. If we see an exponent, treat * the entire input as invalid instead. */ + double fraction; + f = endptr; retval = qemu_strtod_finite(f, &endptr, &fraction); if (retval) { - fraction = 0.0; endptr++; } else if (memchr(f, 'e', endptr - f) || memchr(f, 'E', endptr - f)) { endptr = nptr; retval = -EINVAL; goto out; - } else if (fraction != 0) { - mul_required = true; + } else { + /* Extract into a 64-bit fixed-point fraction. */ + valf = (uint64_t)(fraction * 0x1p64); } } c = *endptr; @@ -333,16 +334,35 @@ static int do_strtosz(const char *nptr, const char **end, mul = suffix_mul(default_suffix, unit); assert(mul > 0); } - if (mul == 1 && mul_required) { - endptr = nptr; - retval = -EINVAL; - goto out; + if (mul == 1) { + /* When a fraction is present, a scale is required. */ + if (valf != 0) { + endptr = nptr; + retval = -EINVAL; + goto out; + } + } else { + uint64_t valh, tmp; + + /* Compute exact result: 64.64 x 64.0 -> 128.64 fixed point */ + mulu64(&val, &valh, val, mul); + mulu64(&valf, &tmp, valf, mul); + val += tmp; + valh += val < tmp; + + /* Round 0.5 upward. */ + tmp = valf >> 63; + val += tmp; + valh += val < tmp; + + /* Report overflow. */ + if (valh != 0) { + retval = -ERANGE; + goto out; + } } - if (val > (UINT64_MAX - ((uint64_t) (fraction * mul))) / mul) { - retval = -ERANGE; - goto out; - } - *result = val * mul + (uint64_t) (fraction * mul); + + *result = val; retval = 0; out: -- 2.25.1