From patchwork Fri Nov 6 00:24:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 7564891 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F391EC05C6 for ; Fri, 6 Nov 2015 00:25:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A9CD207A4 for ; Fri, 6 Nov 2015 00:25:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C84F20784 for ; Fri, 6 Nov 2015 00:25:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965861AbbKFAZA (ORCPT ); Thu, 5 Nov 2015 19:25:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45083 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965779AbbKFAY7 (ORCPT ); Thu, 5 Nov 2015 19:24:59 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 4E7311305; Fri, 6 Nov 2015 00:24:59 +0000 (UTC) Received: from hawk.localdomain.com (ovpn-116-20.ams2.redhat.com [10.36.116.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tA60Olmh016750; Thu, 5 Nov 2015 19:24:57 -0500 From: Andrew Jones To: pbonzini@redhat.com, kvm@vger.kernel.org Cc: alex.bennee@linaro.org, cov@codeaurora.org Subject: [kvm-unit-tests PATCH 03/18] trivial: alloc: don't use 'top' outside spinlock Date: Thu, 5 Nov 2015 18:24:28 -0600 Message-Id: <1446769483-21586-4-git-send-email-drjones@redhat.com> In-Reply-To: <1446769483-21586-1-git-send-email-drjones@redhat.com> References: <1446769483-21586-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a fix just due to being too much of a type-A person. I noticed the issue while reading over the function, and decided to fix it, even though it's unlikely to be a problem ever because top is read-mostly (like written once, then only read, type of mostly). Signed-off-by: Andrew Jones --- lib/alloc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/alloc.c b/lib/alloc.c index ad6761430c965..34f71a337d868 100644 --- a/lib/alloc.c +++ b/lib/alloc.c @@ -61,15 +61,17 @@ 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 = top; + u64 top_safe; + + spin_lock(&lock); + + top_safe = top; if (safe && sizeof(long) == 4) top_safe = MIN(top, 1ULL << 32); align = MAX(align, align_min); - spin_lock(&lock); - addr = ALIGN(base, align); size += addr - base;