From patchwork Mon Nov 21 16:03:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 23933 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1683907wrr; Mon, 21 Nov 2022 08:14:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Hb6gni9WlZRyped1eaRub+WIKuLaln8PX0yu98Mt9wFaTt/S8FkoGLZTqHePLLumiKyl7 X-Received: by 2002:a50:ff08:0:b0:461:dbcc:5176 with SMTP id a8-20020a50ff08000000b00461dbcc5176mr4895293edu.53.1669047276763; Mon, 21 Nov 2022 08:14:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669047276; cv=none; d=google.com; s=arc-20160816; b=FxCvQyamEKatzCTgu6dt0ZBYIQ9vjl13ntUZ3KmN55jeZKmnp9pwAZ/ajHYfiXmqI9 E1ocv1+3aqUYVh2wVUQXbMTn53mnCS8hWamBNgg+JbDzEK8LihNrNZO9B/M2IDetWM7V tGAdt4JHrS9wrY62bt2+NdZKllZ84T/ylXUM5BPsxRQ/YFoQisXj4v6MAcGWjeYbkTIj zUq60SUmkCrJroLWvkaWthKJBas49t2L1hwgBbOXAFH9f30DTUZz35auhSM1baVyb5CD lnWh1lkwdwftzJ/rWdzOtzXB13LvKqwTmKBGtECaR3GjpbA2U7zm54ZU3HhYjiKbpEnN YDfw== 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 :message-id:date:subject:cc:to:from; bh=gyH7irLNUk8ufV4vecK3x8da+AOenYEaQ5ejXXTGdSU=; b=RUxAowU4tlS+hx1YNjBpEq9do0Y8soncGJJTdR+AJhppEemHNPSYIKJq+O+LXTIOdZ wqD4ro1IAW5vwggL5rRjtUDDUcpfzEJFaQc8HH2ZsYKtM0in2PyGsS+uHMYYqcm8/WO5 tcp+Xe3DpyCPoEknn3cjYLnm7xvTkpUR8bC1GIVksEweU5iLRqxa4mjziN+xXYJAY3iB xMTzA0fx2DAWBqx82xBBByJHG0x0nu6O/Ng03xw7kuRBUVEcv01vk0VV17I7vXciLIqi GQqj1bFmiCAVq55Erh1jnGP4JX+eo9yo0rDz3MBZGF4I+3FfP5l0UMucUqrB2xKnv29E M2DA== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q8-20020a056402518800b0046649cd87c2si11046399edd.32.2022.11.21.08.13.42; Mon, 21 Nov 2022 08:14:36 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231685AbiKUQED (ORCPT + 99 others); Mon, 21 Nov 2022 11:04:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231500AbiKUQEA (ORCPT ); Mon, 21 Nov 2022 11:04:00 -0500 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B082D32B6 for ; Mon, 21 Nov 2022 08:03:58 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed10:4821:1ba5:2638:5c3a]) by michel.telenet-ops.be with bizsmtp id n43v2800m5WXlCv0643wZV; Mon, 21 Nov 2022 17:03:56 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1ox9H1-0019H8-Fu; Mon, 21 Nov 2022 17:03:55 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1ox9H0-00BRo0-Td; Mon, 21 Nov 2022 17:03:54 +0100 From: Geert Uytterhoeven To: Bjorn Helgaas , Kai-Heng Feng Cc: Niklas Schnelle , Johannes Berg , linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2] PCI: Fix dropping valid root bus resources with .end = zero Date: Mon, 21 Nov 2022 17:03:51 +0100 Message-Id: <307972d0ea67a62b123120ef10f77c8908d5d851.1669046603.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1750122917252535468?= X-GMAIL-MSGID: =?utf-8?q?1750122917252535468?= On r8a7791/koelsch: kmemleak: 1 new suspected memory leaks (see /sys/kernel/debug/kmemleak) # cat /sys/kernel/debug/kmemleak unreferenced object 0xc3a34e00 (size 64): comm "swapper/0", pid 1, jiffies 4294937460 (age 199.080s) hex dump (first 32 bytes): b4 5d 81 f0 b4 5d 81 f0 c0 b0 a2 c3 00 00 00 00 .]...].......... 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [] __kmalloc+0xf0/0x140 [<34bd6bc0>] resource_list_create_entry+0x18/0x38 [<767046bc>] pci_add_resource_offset+0x20/0x68 [] devm_of_pci_get_host_bridge_resources.constprop.0+0xb0/0x390 When coalescing two resources for a contiguous aperture, the first resource is enlarged to cover the full contiguous range, while the second resource is marked invalid. This invalidation is done by clearing the flags, start, and end members. When adding the initial resources to the bus later, invalid resources are skipped. Unfortunately, the check for an invalid resource considers only the end member, causing false positives. E.g. on r8a7791/koelsch, root bus resource 0 ("bus 00") is skipped, and no longer registered with pci_bus_insert_busn_res() (causing the memory leak), nor printed: pci-rcar-gen2 ee090000.pci: host bridge /soc/pci@ee090000 ranges: pci-rcar-gen2 ee090000.pci: MEM 0x00ee080000..0x00ee08ffff -> 0x00ee080000 pci-rcar-gen2 ee090000.pci: PCI: revision 11 pci-rcar-gen2 ee090000.pci: PCI host bridge to bus 0000:00 -pci_bus 0000:00: root bus resource [bus 00] pci_bus 0000:00: root bus resource [mem 0xee080000-0xee08ffff] Fix this by only skipping resources where all of the flags, start, and end members are zero. Fixes: 7c3855c423b17f6c ("PCI: Coalesce host bridge contiguous apertures") Signed-off-by: Geert Uytterhoeven Tested-by: Niklas Schnelle Acked-by: Kai-Heng Feng --- Is there any side effect of not registering the root bus resource with pci_bus_insert_busn_res()? This is the resource created by of_pci_parse_bus_range(), and thus affects any DT platforms using "bus-range = <0 0>". Perhaps checking for "!res->flags" would be sufficient? I assume this still causes memory leaks on systems where resources are coalesced, as the second resource of a contiguous aperture is no longer referenced? Perhaps instead of clearing the resource, it should be removed from the list (and freed? is it actually safe to do that?)? Apparently Johannes had identified the bug before, but didn't realize the full impact... https://lore.kernel.org/r/5331e942ff28bb191d62bb403b03ceb7d750856c.camel@sipsolutions.net/ v2: - Add Tested-by, Acked-by. --- drivers/pci/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 1e234189aff15891..dccefb308ac60e64 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -998,7 +998,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) resource_list_for_each_entry_safe(window, n, &resources) { offset = window->offset; res = window->res; - if (!res->end) + if (!res->flags && !res->start && !res->end) continue; list_move_tail(&window->node, &bridge->windows);