From patchwork Thu Oct 14 23:18:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 254921 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9ENKYQ9028850 for ; Thu, 14 Oct 2010 23:20:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755022Ab0JNXSa (ORCPT ); Thu, 14 Oct 2010 19:18:30 -0400 Received: from g1t0028.austin.hp.com ([15.216.28.35]:4964 "EHLO g1t0028.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753506Ab0JNXS2 (ORCPT ); Thu, 14 Oct 2010 19:18:28 -0400 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g1t0028.austin.hp.com (Postfix) with ESMTP id CB3071C353; Thu, 14 Oct 2010 23:18:27 +0000 (UTC) Received: from ldl (ldl.usa.hp.com [16.125.112.222]) by g1t0038.austin.hp.com (Postfix) with ESMTP id 3B2D4301A0; Thu, 14 Oct 2010 23:18:27 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 17E121A7E028; Thu, 14 Oct 2010 17:18:27 -0600 (MDT) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 50xYqsY1c50A; Thu, 14 Oct 2010 17:18:26 -0600 (MDT) Received: from eh.fc.hp.com (bob.lnx.usa.hp.com [16.125.112.218]) by ldl (Postfix) with ESMTP id EF9A41A7E025; Thu, 14 Oct 2010 17:18:26 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id E235226132; Thu, 14 Oct 2010 17:18:26 -0600 (MDT) Subject: [PATCH v4 1/6] resources: ensure alignment callback doesn't allocate below available start To: Jesse Barnes From: Bjorn Helgaas Cc: Bob Picco , Brian Bloniarz , Charles Butterfield , Denys Vlasenko , linux-pci@vger.kernel.org, "Horst H. von Brand" , Ingo Molnar , linux-kernel@vger.kernel.org, Stefan Becker , "H. Peter Anvin" , Yinghai Lu , Leann Ogasawara , Linus Torvalds , Thomas Gleixner Date: Thu, 14 Oct 2010 17:18:26 -0600 Message-ID: <20101014231826.536.51757.stgit@bob.kio> In-Reply-To: <20101014231804.536.62138.stgit@bob.kio> References: <20101014231804.536.62138.stgit@bob.kio> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Oct 2010 23:20:35 +0000 (UTC) diff --git a/kernel/resource.c b/kernel/resource.c index 7b36976..ace2269 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -371,6 +371,7 @@ static int find_resource(struct resource *root, struct resource *new, { struct resource *this = root->child; struct resource tmp = *new; + resource_size_t start; tmp.start = root->start; /* @@ -391,8 +392,13 @@ static int find_resource(struct resource *root, struct resource *new, if (tmp.end > max) tmp.end = max; tmp.start = ALIGN(tmp.start, align); - if (alignf) - tmp.start = alignf(alignf_data, &tmp, size, align); + if (alignf) { + start = alignf(alignf_data, &tmp, size, align); + if (tmp.start <= start && start <= tmp.end) + tmp.start = start; + else + tmp.start = tmp.end; + } if (tmp.start < tmp.end && tmp.end - tmp.start >= size - 1) { new->start = tmp.start; new->end = tmp.start + size - 1;