From patchwork Mon Jul 4 16:47:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 9212995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DEA6B60572 for ; Mon, 4 Jul 2016 17:08:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6B572864C for ; Mon, 4 Jul 2016 17:08:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9ADB28749; Mon, 4 Jul 2016 17:08:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 23ED42864C for ; Mon, 4 Jul 2016 17:08:12 +0000 (UTC) Received: from localhost ([::1]:49318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bK7Lv-00033T-VU for patchwork-qemu-devel@patchwork.kernel.org; Mon, 04 Jul 2016 13:08:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bK71a-0001wl-CP for qemu-devel@nongnu.org; Mon, 04 Jul 2016 12:47:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bK71X-0002Ge-6w for qemu-devel@nongnu.org; Mon, 04 Jul 2016 12:47:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bK71W-0002GW-Ua for qemu-devel@nongnu.org; Mon, 04 Jul 2016 12:47:07 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7E0C97F341; Mon, 4 Jul 2016 16:47:06 +0000 (UTC) Received: from redhat.com (vpn1-6-134.ams2.redhat.com [10.36.6.134]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id u64Gl4cY015271; Mon, 4 Jul 2016 12:47:04 -0400 Date: Mon, 4 Jul 2016 19:47:03 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20160704194703-mutt-send-email-mst@redhat.com> References: <1467650742-17580-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1467650742-17580-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 04 Jul 2016 16:47:06 +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] [PULL 15/36] range: Replace internal representation of Range 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: Peter Maydell , Markus Armbruster , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Armbruster Range represents a range as follows. Member @start is the inclusive lower bound, member @end is the exclusive upper bound. Zero @end is special: if @start is also zero, the range is empty, else @end is to be interpreted as 2^64. No other empty ranges may occur. The range [0,2^64-1] cannot be represented. If you try to create it with range_set_bounds1(), you get the empty range instead. If you try to create it with range_set_bounds() or range_extend(), assertions fail. Before range_set_bounds() existed, the open-coded creation usually got you the empty range instead. Open deathtrap. Moreover, the code dealing with the janus-faced @end is too clever by half. Dumb this down to a more pedestrian representation: members @lob and @upb are inclusive lower and upper bounds. The empty range is encoded as @lob = 1, @upb = 0. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/qemu/range.h | 56 +++++++++++++++++++++++++--------------------------- util/range.c | 16 +++++++-------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/include/qemu/range.h b/include/qemu/range.h index c8c46a9..f28f0c1 100644 --- a/include/qemu/range.h +++ b/include/qemu/range.h @@ -26,37 +26,38 @@ /* * Operations on 64 bit address ranges. * Notes: - * - ranges must not wrap around 0, but can include the last byte ~0x0LL. - * - this can not represent a full 0 to ~0x0LL range. + * - Ranges must not wrap around 0, but can include UINT64_MAX. */ -/* A structure representing a range of addresses. */ struct Range { - uint64_t begin; /* First byte of the range, or 0 if empty. */ - uint64_t end; /* 1 + the last byte. 0 if range empty or ends at ~0x0LL. */ + /* + * Do not access members directly, use the functions! + * A non-empty range has @lob <= @upb. + * An empty range has @lob == @upb + 1. + */ + uint64_t lob; /* inclusive lower bound */ + uint64_t upb; /* inclusive upper bound */ }; static inline void range_invariant(Range *range) { - assert((!range->begin && !range->end) /* empty */ - || range->begin <= range->end - 1); /* non-empty */ + assert(range->lob <= range->upb || range->lob == range->upb + 1); } /* Compound literal encoding the empty range */ -#define range_empty ((Range){ .begin = 0, .end = 0 }) +#define range_empty ((Range){ .lob = 1, .upb = 0 }) /* Is @range empty? */ static inline bool range_is_empty(Range *range) { range_invariant(range); - return !range->begin && !range->end; + return range->lob > range->upb; } /* Does @range contain @val? */ static inline bool range_contains(Range *range, uint64_t val) { - return !range_is_empty(range) - && val >= range->begin && val <= range->end - 1; + return val >= range->lob && val <= range->upb; } /* Initialize @range to the empty range */ @@ -71,14 +72,11 @@ static inline void range_make_empty(Range *range) * Both bounds are inclusive. * The interval must not be empty, i.e. @lob must be less than or * equal @upb. - * The interval must not be [0,UINT64_MAX], because Range can't - * represent that. */ static inline void range_set_bounds(Range *range, uint64_t lob, uint64_t upb) { - assert(lob <= upb); - range->begin = lob; - range->end = upb + 1; /* may wrap to zero, that's okay */ + range->lob = lob; + range->upb = upb; assert(!range_is_empty(range)); } @@ -91,8 +89,12 @@ static inline void range_set_bounds(Range *range, uint64_t lob, uint64_t upb) static inline void range_set_bounds1(Range *range, uint64_t lob, uint64_t upb_plus1) { - range->begin = lob; - range->end = upb_plus1; + if (!lob && !upb_plus1) { + *range = range_empty; + } else { + range->lob = lob; + range->upb = upb_plus1 - 1; + } range_invariant(range); } @@ -100,20 +102,18 @@ static inline void range_set_bounds1(Range *range, static inline uint64_t range_lob(Range *range) { assert(!range_is_empty(range)); - return range->begin; + return range->lob; } /* Return @range's upper bound. @range must not be empty. */ static inline uint64_t range_upb(Range *range) { assert(!range_is_empty(range)); - return range->end - 1; + return range->upb; } /* * Extend @range to the smallest interval that includes @extend_by, too. - * This must not extend @range to cover the interval [0,UINT64_MAX], - * because Range can't represent that. */ static inline void range_extend(Range *range, Range *extend_by) { @@ -124,15 +124,13 @@ static inline void range_extend(Range *range, Range *extend_by) *range = *extend_by; return; } - if (range->begin > extend_by->begin) { - range->begin = extend_by->begin; + if (range->lob > extend_by->lob) { + range->lob = extend_by->lob; } - /* Compare last byte in case region ends at ~0x0LL */ - if (range->end - 1 < extend_by->end - 1) { - range->end = extend_by->end; + if (range->upb < extend_by->upb) { + range->upb = extend_by->upb; } - /* Must not extend to { .begin = 0, .end = 0 }: */ - assert(!range_is_empty(range)); + range_invariant(range); } /* Get last byte of a range from offset + length. diff --git a/util/range.c b/util/range.c index e5f2e71..416df7c 100644 --- a/util/range.c +++ b/util/range.c @@ -22,20 +22,18 @@ #include "qemu/range.h" /* - * Operations on 64 bit address ranges. - * Notes: - * - ranges must not wrap around 0, but can include the last byte ~0x0LL. - * - this can not represent a full 0 to ~0x0LL range. + * Return -1 if @a < @b, 1 @a > @b, and 0 if they touch or overlap. + * Both @a and @b must not be empty. */ - -/* Return -1 if @a < @b, 1 if greater, and 0 if they touch or overlap. */ static inline int range_compare(Range *a, Range *b) { - /* Zero a->end is 2**64, and therefore not less than any b->begin */ - if (a->end && a->end < b->begin) { + assert(!range_is_empty(a) && !range_is_empty(b)); + + /* Careful, avoid wraparound */ + if (b->lob && b->lob - 1 > a->upb) { return -1; } - if (b->end && a->begin > b->end) { + if (a->lob && a->lob - 1 > b->upb) { return 1; } return 0;