From patchwork Wed Oct 13 16:15:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 250961 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 o9DGGdBQ008472 for ; Wed, 13 Oct 2010 16:16:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751744Ab0JMQPO (ORCPT ); Wed, 13 Oct 2010 12:15:14 -0400 Received: from g1t0029.austin.hp.com ([15.216.28.36]:46703 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751878Ab0JMQPM (ORCPT ); Wed, 13 Oct 2010 12:15:12 -0400 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g1t0029.austin.hp.com (Postfix) with ESMTP id 3967638215; Wed, 13 Oct 2010 16:15:11 +0000 (UTC) Received: from ldl (ldl.usa.hp.com [16.125.112.222]) by g1t0038.austin.hp.com (Postfix) with ESMTP id 0E74830068; Wed, 13 Oct 2010 16:15:11 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id E0A57CF0009; Wed, 13 Oct 2010 10:15:10 -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 zFdMwO+cn-zW; Wed, 13 Oct 2010 10:15:10 -0600 (MDT) Received: from eh.fc.hp.com (bob.lnx.usa.hp.com [16.125.112.218]) by ldl (Postfix) with ESMTP id C3E1FCF0007; Wed, 13 Oct 2010 10:15:10 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id AC182406039; Wed, 13 Oct 2010 10:15:10 -0600 (MDT) Subject: [PATCH v3 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" , linux-kernel@vger.kernel.org, Stefan Becker , "H. Peter Anvin" , Yinghai Lu , Thomas Gleixner , Linus Torvalds , Ingo Molnar Date: Wed, 13 Oct 2010 10:15:10 -0600 Message-ID: <20101013161510.28476.1251.stgit@bob.kio> In-Reply-To: <20101013161359.28476.6050.stgit@bob.kio> References: <20101013161359.28476.6050.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]); Wed, 13 Oct 2010 16:16:40 +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;