From patchwork Mon Oct 31 18:51:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 9406277 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 9578160722 for ; Mon, 31 Oct 2016 18:51:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AB1028534 for ; Mon, 31 Oct 2016 18:51:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F7E429343; Mon, 31 Oct 2016 18:51:55 +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 vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FFE12930A for ; Mon, 31 Oct 2016 18:51:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S945645AbcJaSvx (ORCPT ); Mon, 31 Oct 2016 14:51:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59888 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S945372AbcJaSvv (ORCPT ); Mon, 31 Oct 2016 14:51:51 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 AA5D13B714 for ; Mon, 31 Oct 2016 18:51:51 +0000 (UTC) Received: from kamzik.brq.redhat.com (kamzik.brq.redhat.com [10.34.1.143]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9VIpmkH008125; Mon, 31 Oct 2016 14:51:50 -0400 From: Andrew Jones To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, lvivier@redhat.com, thuth@redhat.com Subject: [kvm-unit-tests PATCH 1/4] lib/alloc: improve robustness Date: Mon, 31 Oct 2016 19:51:43 +0100 Message-Id: <1477939906-28802-2-git-send-email-drjones@redhat.com> In-Reply-To: <1477939906-28802-1-git-send-email-drjones@redhat.com> References: <1477939906-28802-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 31 Oct 2016 18:51:51 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add some asserts to make sure phys_alloc_init is called only once and before any other alloc calls. Signed-off-by: Andrew Jones --- lib/alloc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/alloc.c b/lib/alloc.c index e1d7b8a380ff..a83c8c5db850 100644 --- a/lib/alloc.c +++ b/lib/alloc.c @@ -42,12 +42,13 @@ void phys_alloc_show(void) void phys_alloc_init(phys_addr_t base_addr, phys_addr_t size) { - spin_lock(&lock); + /* we should only be called once by one processor */ + assert(!top); + assert(size); + base = base_addr; top = base + size; align_min = DEFAULT_MINIMUM_ALIGNMENT; - nr_regions = 0; - spin_unlock(&lock); } void phys_alloc_set_minimum_alignment(phys_addr_t align) @@ -63,14 +64,14 @@ static phys_addr_t phys_alloc_aligned_safe(phys_addr_t size, { static bool warned = false; phys_addr_t addr, size_orig = size; - u64 top_safe; + u64 top_safe = top; - spin_lock(&lock); + if (safe && sizeof(long) == 4) + top_safe = MIN(top, 1ULL << 32); - top_safe = top; + assert(base < top_safe); - if (safe && sizeof(long) == 4) - top_safe = MIN(top_safe, 1ULL << 32); + spin_lock(&lock); align = MAX(align, align_min);