From patchwork Fri Dec 2 21:18:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 29110 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1075567wrr; Fri, 2 Dec 2022 13:21:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf5/gV020SKw3nSkCc8Hny//yKObKY24RQhIAu5URvM8BechKEa3LmFIe4uwP1QxgAL/yFRL X-Received: by 2002:a17:906:a884:b0:7bd:15a6:27e8 with SMTP id ha4-20020a170906a88400b007bd15a627e8mr31030958ejb.78.1670016067131; Fri, 02 Dec 2022 13:21:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670016067; cv=none; d=google.com; s=arc-20160816; b=dEtvhtOCdRmScE2C/OaoN0DhK6S/64oIg3Gt6voHjFCAC891LdDz+AKXuiDLAnzVEu EKLBUQnkIRpaSJI9i/6QDCTctTYqObYq4umpwk1kcmx3lmc8Pe6+17TUhrxOPPl1nXGZ E26OUl3XO1hwaFW0g73BxsC9AXnfqav079v29zj2kvcSzp8mDhuDRoXNYtf2diQ7j9aa RojBd2G6yW3fLws1MVKGXLR2Bx79w2MroTMg6KPMJnNUT4sSPAeCGlDpKOaWnk74WpOo 5U0IyQEMVAu3wC0CYoTvGzUY7uu7pL6rBW/+F+1URABqf1Y2HdPKrBFcLZiJzaNKwj7T ictg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9WazVplZm+CbwNaBBYCws2T/gqk97rNj1pd2P62vJGo=; b=gcU+lg8Ii7lSuYEbTS93U/P9t5DioUMBbIcyc14KJijh+fdrPlbYTG3lchm/yQ+MlA /ygW28Lh94MG/YPpJ6zdgMeFf1kFR5BEogAvXLsw0k0cmBpeBiHddhNChxyj1i8JzViQ U3c5kXtPcm9PR1UvVxDbgYme0JEcNdBbAosAn5VKlbs3P6OBku0zoc7dwIbvNExyTmCi UftuuIHltfeMHL0mqtvdA7qocrPZmpIWtT/uJZn0iiGvFBnnQqrePMHO78XPghJHFMMj qXLJTgPI5mShRFa/C060a25ooaScCNQ6Ra8u4Xks6hQ0hBQW7CGMQbPovb9kfr29qUoZ kSaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hHcSTLEU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m17-20020a056402511100b0046b9c536fa7si7155437edd.286.2022.12.02.13.20.42; Fri, 02 Dec 2022 13:21:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hHcSTLEU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234409AbiLBVS5 (ORCPT + 99 others); Fri, 2 Dec 2022 16:18:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234041AbiLBVSv (ORCPT ); Fri, 2 Dec 2022 16:18:51 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B33E97046F; Fri, 2 Dec 2022 13:18:49 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 505F6623C0; Fri, 2 Dec 2022 21:18:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 809A1C433D7; Fri, 2 Dec 2022 21:18:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670015928; bh=jsOes6lsRyJazCweN98/1MgbRRFwiPjB2+BoIczXWYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hHcSTLEU0se8MLHfKx412OkDrWWRGjN1mwbgjdtwhjAg9ONVOxHbB5dUE1EoK2VCG uUWJmcgCzJU6WmOFB9UZR8u0mN+Ptaqs0AbVVQ03qEBUXb6LMmrt0pz31DzlNfoaCB JTCtFbZDVp3Kp1BFCQ77CEfhK61B4ufWOuCvdKcFXqlSOwE3k3PUlR98fOLiwYh36m ZJetJFy3D2FBjUzjyajNfGq47D5CAW7D6RrXQlXC0SaBfLMwXGE4KRzFv9qfq9uDWZ NMmLqx4mCX8rNUxlWIf8mr1Ov1knSLExOVf2e9W9jHMPWGoLH3ErzySppAjn+sSHCy 3cg562HdjPOeg== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Hans de Goede , Florent DELAHAYE , Konrad J Hambrick , Matt Hansen <2lprbe78@duck.com>, =?utf-8?q?Benoit_Gr=C3=A9goire?= , Nicholas Johnson , Mika Westerberg , Werner Sembach , mumblingdrunkard@protonmail.com, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 2/4] PCI: Skip allocate_resource() if too little space available Date: Fri, 2 Dec 2022 15:18:36 -0600 Message-Id: <20221202211838.1061278-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221202211838.1061278-1-helgaas@kernel.org> References: <20221202211838.1061278-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751138767655823011?= X-GMAIL-MSGID: =?utf-8?q?1751138767655823011?= From: Bjorn Helgaas pci_bus_alloc_from_region() allocates MMIO space by iterating through all the resources available on the bus. The available resource might be reduced if the caller requires 32-bit space or we're avoiding BIOS or E820 areas. Don't bother calling allocate_resource() if we need more space than is available in this resource. This prevents some pointless and annoying messages about avoided areas. Signed-off-by: Bjorn Helgaas Cc: Hans de Goede --- drivers/pci/bus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 3cef835b375f..83ae838ceb5f 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -197,6 +197,10 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, max = avail.end; + /* Don't bother if available space isn't large enough */ + if (size > max - min_used + 1) + continue; + /* Ok, try it out.. */ ret = allocate_resource(r, res, size, min_used, max, align, alignf, alignf_data);