From nobody Thu Nov 6 08:29:07 2025 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; 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 1540310710934970.4509504708475; Tue, 23 Oct 2018 09:05:10 -0700 (PDT) Received: from localhost ([::1]:42940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEzB7-0000VJ-PE for importer@patchew.org; Tue, 23 Oct 2018 12:05:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyht-0007NI-M3 for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEyWl-0001P9-WB for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37670) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEyWi-0001LN-CC for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:27 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 369923082143; Tue, 23 Oct 2018 15:23:20 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-206.ams2.redhat.com [10.36.116.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB727604DD; Tue, 23 Oct 2018 15:23:17 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Tue, 23 Oct 2018 17:23:00 +0200 Message-Id: <20181023152306.3123-2-david@redhat.com> In-Reply-To: <20181023152306.3123-1-david@redhat.com> References: <20181023152306.3123-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 23 Oct 2018 15:23:20 +0000 (UTC) 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 v3 1/7] qapi: use qemu_strtoi64() in parse_str 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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Michael Roth , Markus Armbruster , Igor Mammedov , "Dr . David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The qemu api claims to be easier to use, and the resulting code seems to agree. Signed-off-by: David Hildenbrand Reviewed-by: David Gibson --- qapi/string-input-visitor.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index b3fdd0827d..c1454f999f 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -20,6 +20,7 @@ #include "qemu/option.h" #include "qemu/queue.h" #include "qemu/range.h" +#include "qemu/cutils.h" =20 =20 struct StringInputVisitor @@ -46,10 +47,10 @@ static void free_range(void *range, void *dummy) =20 static int parse_str(StringInputVisitor *siv, const char *name, Error **er= rp) { - char *str =3D (char *) siv->string; - long long start, end; + const char *str =3D (char *) siv->string; + const char *endptr; + int64_t start, end; Range *cur; - char *endptr; =20 if (siv->ranges) { return 0; @@ -60,9 +61,7 @@ static int parse_str(StringInputVisitor *siv, const char = *name, Error **errp) } =20 do { - errno =3D 0; - start =3D strtoll(str, &endptr, 0); - if (errno =3D=3D 0 && endptr > str) { + if (!qemu_strtoi64(str, &endptr, 0, &start)) { if (*endptr =3D=3D '\0') { cur =3D g_malloc0(sizeof(*cur)); range_set_bounds(cur, start, start); @@ -71,11 +70,7 @@ static int parse_str(StringInputVisitor *siv, const char= *name, Error **errp) str =3D NULL; } else if (*endptr =3D=3D '-') { str =3D endptr + 1; - errno =3D 0; - end =3D strtoll(str, &endptr, 0); - if (errno =3D=3D 0 && endptr > str && start <=3D end && - (start > INT64_MAX - 65536 || - end < start + 65536)) { + if (!qemu_strtoi64(str, &endptr, 0, &end) && start < end) { if (*endptr =3D=3D '\0') { cur =3D g_malloc0(sizeof(*cur)); range_set_bounds(cur, start, end); --=20 2.17.1 From nobody Thu Nov 6 08:29:07 2025 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; 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 1540309946109482.46916212886686; Tue, 23 Oct 2018 08:52:26 -0700 (PDT) Received: from localhost ([::1]:42822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyyi-0006qq-8f for importer@patchew.org; Tue, 23 Oct 2018 11:52:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyht-0006fy-Lb for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEyWm-0001Pd-Al for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57458) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEyWm-0001Mw-0H for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1F7D1C057E25; Tue, 23 Oct 2018 15:23:23 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-206.ams2.redhat.com [10.36.116.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9582E6031B; Tue, 23 Oct 2018 15:23:20 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Tue, 23 Oct 2018 17:23:01 +0200 Message-Id: <20181023152306.3123-3-david@redhat.com> In-Reply-To: <20181023152306.3123-1-david@redhat.com> References: <20181023152306.3123-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 23 Oct 2018 15:23:23 +0000 (UTC) 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 v3 2/7] qapi: correctly parse uint64_t values from strings 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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Michael Roth , Markus Armbruster , Igor Mammedov , "Dr . David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Right now, we parse uint64_t values just like int64_t values, resulting in negative values getting accepted and certain valid large numbers only being representable as negative numbers. Also, reported errors indicate that an int64_t is expected. Parse uin64_t separately. We don't have to worry about ranges. E.g. we can now also specify -device nvdimm,memdev=3Dmem1,id=3Dnv1,addr=3D0xFFFFFFFFC0000000 Instead of only going via negative values -device nvdimm,memdev=3Dmem1,id=3Dnv1,addr=3D-0x40000000 Resulting in the same values (qemu) info memory-devices Memory device [nvdimm]: "nv1" addr: 0xffffffffc0000000 slot: 0 node: 0 Signed-off-by: David Hildenbrand --- qapi/string-input-visitor.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index c1454f999f..f2df027325 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -247,15 +247,16 @@ error: static void parse_type_uint64(Visitor *v, const char *name, uint64_t *obj, Error **errp) { - /* FIXME: parse_type_int64 mishandles values over INT64_MAX */ - int64_t i; - Error *err =3D NULL; - parse_type_int64(v, name, &i, &err); - if (err) { - error_propagate(errp, err); - } else { - *obj =3D i; + StringInputVisitor *siv =3D to_siv(v); + uint64_t val; + + if (qemu_strtou64(siv->string, NULL, 0, &val)) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null= ", + "an uint64 value"); + return; } + + *obj =3D val; } =20 static void parse_type_size(Visitor *v, const char *name, uint64_t *obj, --=20 2.17.1 From nobody Thu Nov 6 08:29:07 2025 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; 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 1540309955562324.4815172496013; Tue, 23 Oct 2018 08:52:35 -0700 (PDT) Received: from localhost ([::1]:42823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyyw-00075r-6h for importer@patchew.org; Tue, 23 Oct 2018 11:52:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyhs-0007C3-Eo for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEyWt-0001Ti-RZ for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38164) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEyWq-0001Qm-4D for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:34 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 47865308ED5F; Tue, 23 Oct 2018 15:23:30 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-206.ams2.redhat.com [10.36.116.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72876604D8; Tue, 23 Oct 2018 15:23:23 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Tue, 23 Oct 2018 17:23:02 +0200 Message-Id: <20181023152306.3123-4-david@redhat.com> In-Reply-To: <20181023152306.3123-1-david@redhat.com> References: <20181023152306.3123-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 23 Oct 2018 15:23:30 +0000 (UTC) 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 v3 3/7] range: pass const pointer where possible 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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Michael Roth , Markus Armbruster , Igor Mammedov , "Dr . David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If there are no changes, let's use a const pointer. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: David Hildenbrand Reviewed-by: David Gibson --- include/qemu/range.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/qemu/range.h b/include/qemu/range.h index f28f0c1825..7e75f4e655 100644 --- a/include/qemu/range.h +++ b/include/qemu/range.h @@ -39,7 +39,7 @@ struct Range { uint64_t upb; /* inclusive upper bound */ }; =20 -static inline void range_invariant(Range *range) +static inline void range_invariant(const Range *range) { assert(range->lob <=3D range->upb || range->lob =3D=3D range->upb + 1); } @@ -48,14 +48,14 @@ static inline void range_invariant(Range *range) #define range_empty ((Range){ .lob =3D 1, .upb =3D 0 }) =20 /* Is @range empty? */ -static inline bool range_is_empty(Range *range) +static inline bool range_is_empty(const Range *range) { range_invariant(range); return range->lob > range->upb; } =20 /* Does @range contain @val? */ -static inline bool range_contains(Range *range, uint64_t val) +static inline bool range_contains(const Range *range, uint64_t val) { return val >=3D range->lob && val <=3D range->upb; } --=20 2.17.1 From nobody Thu Nov 6 08:29:07 2025 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; 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 1540310144390163.57231141098055; Tue, 23 Oct 2018 08:55:44 -0700 (PDT) Received: from localhost ([::1]:42841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEz1y-00016q-Gb for importer@patchew.org; Tue, 23 Oct 2018 11:55:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyhs-0006fR-0D for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEyX6-0001b4-U9 for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50098) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEyX6-0001aZ-Nc for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:48 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13344308A953; Tue, 23 Oct 2018 15:23:48 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-206.ams2.redhat.com [10.36.116.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99CEE604D7; Tue, 23 Oct 2018 15:23:30 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Tue, 23 Oct 2018 17:23:03 +0200 Message-Id: <20181023152306.3123-5-david@redhat.com> In-Reply-To: <20181023152306.3123-1-david@redhat.com> References: <20181023152306.3123-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 23 Oct 2018 15:23:48 +0000 (UTC) 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 v3 4/7] range: add some more functions 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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Michael Roth , Markus Armbruster , Igor Mammedov , "Dr . David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add some more functions that will be used in memory-device context. range_init(): Init using lower bound and size, check for validity range_init_nofail(): Init using lower bound and size, validity asserted range_size(): Extract the size of a range range_overlaps_range(): Check for overlaps of two ranges range_contains_range(): Check if one range is contained in the other Signed-off-by: David Hildenbrand Reviewed-by: Igor Mammedov --- include/qemu/range.h | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/qemu/range.h b/include/qemu/range.h index 7e75f4e655..ba606c6bc0 100644 --- a/include/qemu/range.h +++ b/include/qemu/range.h @@ -112,6 +112,68 @@ static inline uint64_t range_upb(Range *range) return range->upb; } =20 +/* + * Initialize @range to span the interval [@lob,@lob + @size - 1]. + * @size may be 0. If the range would overflow, returns -ERANGE, otherwise + * 0. + */ +static inline int QEMU_WARN_UNUSED_RESULT range_init(Range *range, uint64_= t lob, + uint64_t size) +{ + if (lob + size < lob) { + return -ERANGE; + } + range->lob =3D lob; + range->upb =3D lob + size - 1; + range_invariant(range); + return 0; +} + +/* + * Initialize @range to span the interval [@lob,@lob + @size - 1]. + * @size may be 0. Range must not overflow. + */ +static inline void range_init_nofail(Range *range, uint64_t lob, uint64_t = size) +{ + range->lob =3D lob; + range->upb =3D lob + size - 1; + range_invariant(range); +} + +/* + * Get the size of @range. + */ +static inline uint64_t range_size(const Range *range) +{ + return range->upb - range->lob + 1; +} + +/* + * Check if @range1 overlaps with @range2. If one of the ranges is empty, + * the result is always "false". + */ +static inline bool range_overlaps_range(const Range *range1, + const Range *range2) +{ + if (range_is_empty(range1) || range_is_empty(range2)) { + return false; + } + return !(range2->upb < range1->lob || range1->upb < range2->lob); +} + +/* + * Check if @range1 contains @range2. If one of the ranges is empty, + * the result is always "false". + */ +static inline bool range_contains_range(const Range *range1, + const Range *range2) +{ + if (range_is_empty(range1) || range_is_empty(range2)) { + return false; + } + return range1->lob <=3D range2->lob && range1->upb >=3D range2->upb; +} + /* * Extend @range to the smallest interval that includes @extend_by, too. */ --=20 2.17.1 From nobody Thu Nov 6 08:29:07 2025 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; 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 1540310532127563.9367022173585; Tue, 23 Oct 2018 09:02:12 -0700 (PDT) Received: from localhost ([::1]:42911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEz8E-0006Qq-IO for importer@patchew.org; Tue, 23 Oct 2018 12:02:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyhr-0007et-Sg for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEyXE-0001ge-ON for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40166) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEyXE-0001eR-Im for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:56 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D69723082B6F; Tue, 23 Oct 2018 15:23:54 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-206.ams2.redhat.com [10.36.116.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DF17604DB; Tue, 23 Oct 2018 15:23:48 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Tue, 23 Oct 2018 17:23:04 +0200 Message-Id: <20181023152306.3123-6-david@redhat.com> In-Reply-To: <20181023152306.3123-1-david@redhat.com> References: <20181023152306.3123-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 23 Oct 2018 15:23:54 +0000 (UTC) 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 v3 5/7] memory-device: use QEMU_IS_ALIGNED 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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Michael Roth , Markus Armbruster , Igor Mammedov , "Dr . David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Shorter and easier to read. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: David Hildenbrand Reviewed-by: David Gibson --- hw/mem/memory-device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 7de1ccd497..996ad1490f 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -120,7 +120,7 @@ static uint64_t memory_device_get_free_addr(MachineStat= e *ms, g_assert(address_space_end >=3D address_space_start); =20 /* address_space_start indicates the maximum alignment we expect */ - if (QEMU_ALIGN_UP(address_space_start, align) !=3D address_space_start= ) { + if (!QEMU_IS_ALIGNED(address_space_start, align)) { error_setg(errp, "the alignment (0x%" PRIx64 ") is not supported", align); return 0; @@ -131,13 +131,13 @@ static uint64_t memory_device_get_free_addr(MachineSt= ate *ms, return 0; } =20 - if (hint && QEMU_ALIGN_UP(*hint, align) !=3D *hint) { + if (hint && !QEMU_IS_ALIGNED(*hint, align)) { error_setg(errp, "address must be aligned to 0x%" PRIx64 " bytes", align); return 0; } =20 - if (QEMU_ALIGN_UP(size, align) !=3D size) { + if (!QEMU_IS_ALIGNED(size, align)) { error_setg(errp, "backend memory size must be multiple of 0x%" PRIx64, align); return 0; --=20 2.17.1 From nobody Thu Nov 6 08:29:07 2025 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; 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 1540311095733893.5263516725705; Tue, 23 Oct 2018 09:11:35 -0700 (PDT) Received: from localhost ([::1]:43060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEzHK-00088L-A0 for importer@patchew.org; Tue, 23 Oct 2018 12:11:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyhr-0007Th-Ew for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEyXL-0001k0-ES for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:24:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57810) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEyXK-0001jC-B8 for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:24:03 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 94916C07014C; Tue, 23 Oct 2018 15:24:01 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-206.ams2.redhat.com [10.36.116.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B572604DB; Tue, 23 Oct 2018 15:23:55 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Tue, 23 Oct 2018 17:23:05 +0200 Message-Id: <20181023152306.3123-7-david@redhat.com> In-Reply-To: <20181023152306.3123-1-david@redhat.com> References: <20181023152306.3123-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 23 Oct 2018 15:24:01 +0000 (UTC) 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 v3 6/7] memory-device: avoid overflows on very huge devices 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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Michael Roth , Markus Armbruster , Igor Mammedov , "Dr . David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Should not be a problem right now, but it could theoretically happen in the future. Signed-off-by: David Hildenbrand Reviewed-by: David Gibson Reviewed-by: Igor Mammedov --- hw/mem/memory-device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 996ad1490f..8be63c8032 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -85,7 +85,8 @@ static void memory_device_check_addable(MachineState *ms,= uint64_t size, =20 /* will we exceed the total amount of memory specified */ memory_device_used_region_size(OBJECT(ms), &used_region_size); - if (used_region_size + size > ms->maxram_size - ms->ram_size) { + if (used_region_size + size < used_region_size || + used_region_size + size > ms->maxram_size - ms->ram_size) { error_setg(errp, "not enough space, currently 0x%" PRIx64 " in use of total space for memory devices 0x" RAM_ADDR= _FMT, used_region_size, ms->maxram_size - ms->ram_size); --=20 2.17.1 From nobody Thu Nov 6 08:29:07 2025 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; 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 15403103138323.8168085519282613; Tue, 23 Oct 2018 08:58:33 -0700 (PDT) Received: from localhost ([::1]:42860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEz4f-0003UF-4I for importer@patchew.org; Tue, 23 Oct 2018 11:58:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyhr-0007I5-8O for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEyXR-0001qo-CS for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:24:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24214) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEyXR-0001pV-37 for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:24:09 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 503F63002072; Tue, 23 Oct 2018 15:24:08 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-206.ams2.redhat.com [10.36.116.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 006FF604D9; Tue, 23 Oct 2018 15:24:01 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Tue, 23 Oct 2018 17:23:06 +0200 Message-Id: <20181023152306.3123-8-david@redhat.com> In-Reply-To: <20181023152306.3123-1-david@redhat.com> References: <20181023152306.3123-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 23 Oct 2018 15:24:08 +0000 (UTC) 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 v3 7/7] memory-device: rewrite address assignment using ranges 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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Michael Roth , Markus Armbruster , Igor Mammedov , "Dr . David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Let's rewrite it properly using ranges. This fixes certain overflows that are right now possible. E.g. qemu-system-x86_64 -m 4G,slots=3D20,maxmem=3D40G -M pc \ -object memory-backend-file,id=3Dmem1,share,mem-path=3D/dev/zero,size= =3D2G -device pc-dimm,memdev=3Dmem1,id=3Ddimm1,addr=3D-0x40000000 Now properly reports an error instead of succeeding. "can't add memory device [0xffffffffc0000000:0x80000000], range overflow" Signed-off-by: David Hildenbrand --- hw/mem/memory-device.c | 53 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 8be63c8032..2fb6fc2145 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -100,9 +100,8 @@ static uint64_t memory_device_get_free_addr(MachineStat= e *ms, uint64_t align, uint64_t size, Error **errp) { - uint64_t address_space_start, address_space_end; GSList *list =3D NULL, *item; - uint64_t new_addr =3D 0; + Range as, new =3D range_empty; =20 if (!ms->device_memory) { error_setg(errp, "memory devices (e.g. for memory hotplug) are not= " @@ -115,13 +114,11 @@ static uint64_t memory_device_get_free_addr(MachineSt= ate *ms, "enabled, please specify the maxmem option"); return 0; } - address_space_start =3D ms->device_memory->base; - address_space_end =3D address_space_start + - memory_region_size(&ms->device_memory->mr); - g_assert(address_space_end >=3D address_space_start); + range_init_nofail(&as, ms->device_memory->base, + memory_region_size(&ms->device_memory->mr)); =20 - /* address_space_start indicates the maximum alignment we expect */ - if (!QEMU_IS_ALIGNED(address_space_start, align)) { + /* start of address space indicates the maximum alignment we expect */ + if (!QEMU_IS_ALIGNED(range_lob(&as), align)) { error_setg(errp, "the alignment (0x%" PRIx64 ") is not supported", align); return 0; @@ -145,20 +142,24 @@ static uint64_t memory_device_get_free_addr(MachineSt= ate *ms, } =20 if (hint) { - new_addr =3D *hint; - if (new_addr < address_space_start) { + if (range_init(&new, *hint, size)) { error_setg(errp, "can't add memory device [0x%" PRIx64 ":0x%" = PRIx64 - "] before 0x%" PRIx64, new_addr, size, - address_space_start); + "], range overflow", *hint, size); return 0; - } else if ((new_addr + size) > address_space_end) { + } + if (!range_contains_range(&as, &new)) { error_setg(errp, "can't add memory device [0x%" PRIx64 ":0x%" = PRIx64 - "] beyond 0x%" PRIx64, new_addr, size, - address_space_end); + "], usable range for memory devices [0x%" PRIx64 ":= 0x%" + PRIx64 "]", range_lob(&new), range_size(&new), + range_lob(&as), range_size(&as)); return 0; } } else { - new_addr =3D address_space_start; + if (range_init(&new, range_lob(&as), size)) { + error_setg(errp, "can't add memory device [0x%" PRIx64 ":0x%" = PRIx64 + "], range overflow", *hint, size); + return 0; + } } =20 /* find address range that will fit new memory device */ @@ -166,30 +167,36 @@ static uint64_t memory_device_get_free_addr(MachineSt= ate *ms, for (item =3D list; item; item =3D g_slist_next(item)) { const MemoryDeviceState *md =3D item->data; const MemoryDeviceClass *mdc =3D MEMORY_DEVICE_GET_CLASS(OBJECT(md= )); - uint64_t md_size, md_addr; + uint64_t next_addr; + Range tmp; =20 - md_addr =3D mdc->get_addr(md); - md_size =3D memory_device_get_region_size(md, &error_abort); + range_init_nofail(&tmp, mdc->get_addr(md), + memory_device_get_region_size(md, &error_abort)); =20 - if (ranges_overlap(md_addr, md_size, new_addr, size)) { + if (range_overlaps_range(&tmp, &new)) { if (hint) { const DeviceState *d =3D DEVICE(md); error_setg(errp, "address range conflicts with memory devi= ce" " id=3D'%s'", d->id ? d->id : "(unnamed)"); goto out; } - new_addr =3D QEMU_ALIGN_UP(md_addr + md_size, align); + + next_addr =3D QEMU_ALIGN_UP(range_upb(&tmp) + 1, align); + if (range_init(&new, next_addr, range_size(&new))) { + range_make_empty(&new); + break; + } } } =20 - if (new_addr + size > address_space_end) { + if (!range_contains_range(&as, &new)) { error_setg(errp, "could not find position in guest address space f= or " "memory device - memory fragmented due to alignments"); goto out; } out: g_slist_free(list); - return new_addr; + return range_lob(&new); } =20 MemoryDeviceInfoList *qmp_memory_device_list(void) --=20 2.17.1