From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,T_DKIMWL_WL_MED, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B4C8C4321D for ; Thu, 23 Aug 2018 19:54:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF2F32147A for ; Thu, 23 Aug 2018 19:54:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.b="R9QBBNU8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF2F32147A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726582AbeHWX0H (ORCPT ); Thu, 23 Aug 2018 19:26:07 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:36959 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726277AbeHWX0G (ORCPT ); Thu, 23 Aug 2018 19:26:06 -0400 Received: by mail-lf1-f65.google.com with SMTP id j8-v6so4995887lfb.4 for ; Thu, 23 Aug 2018 12:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Swq96ULhcq0H/uYaCOT4VB7WTWe/i1opuTe97Dsurr4=; b=R9QBBNU86+JJIxVRmSrHI/rTuK6KYNlKq+Ik2Dbi42adrJfsPYWFKJlBjcLjWFDEaE bypCLOuSQI6JFBTG82gtePo+U4Rcr7sLGuMO3CFryiJz+CocYzSDcXh+0QJ7IMfbCaVU U19r28+XGPmxfpeRJ47PYGiXPt9t9OuWDrvq5rl/Gn3ghsAGSdU9H0gPSA85Amu8goxN xjolztRxrFc1vt+ZKAs16XEySZk8FzhyaE5jwjXs2ry+BlFQIy8WjBnKbegAbv2WLPHa jGeo5tZnseIZ6yBsDw6/Qz8BiXdzbmOZYS4ynRkPxQ9BzlkxQWvrg3IZ6WacfXegfRUl bK9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=Swq96ULhcq0H/uYaCOT4VB7WTWe/i1opuTe97Dsurr4=; b=PRThiJwAuynoIgb78unar6v5VFl4K7pxssZ3JjJIE6WRrsVYtyfCw02/CKA4IivmlR UE9K1YfaSCJGLbrw7Z4VBmEYuF0DfrlshxuM6Jlp3tlvAaWcqcEplQksX9zkMyO+S+2C Wp6DdryuRyaQXGNW2e32L2vkbYKsocTqlVdCnynHDGD8JXLRjNgt6oiEbxyVlH6OdHky yvQwWSB4ltmI/zwvhrWcf5VmOp/wFhWSljiYGNk7zAoiIkG3+SKEjMVIvgFp/tyQLVab IVF9zvFseQ6sXCyjVeBXW8LZUUN1KDqZGOVT754sX0p5pLqhORtDudXbBfgoeANCp8wH VoOw== X-Gm-Message-State: AOUpUlE7PpQiBOPPnTJ/TWGv3OVj7ExrySm9MObGPTXzKPRmF5RD7c7+ 1d71C/RqbKL5nLHlDRLuBiBNAA== X-Google-Smtp-Source: AA+uWPziG34gAUW5gxUkGQ1gZXn1dGXyAJmDUtV4Vddl1+QmEO51Pd8ObeExK/TBCpfxVKQC+jmwvQ== X-Received: by 2002:a19:430d:: with SMTP id q13-v6mr10700257lfa.77.1535054090994; Thu, 23 Aug 2018 12:54:50 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.84.155]) by smtp.gmail.com with ESMTPSA id u86-v6sm989648lfi.90.2018.08.23.12.54.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Aug 2018 12:54:49 -0700 (PDT) Subject: Re: [PATCH 4.14 210/217] PCI: OF: Fix I/O space page leak To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Lorenzo Pieralisi , Bjorn Helgaas , Linus Walleij References: <20180823075505.090246914@linuxfoundation.org> <20180823075515.152259931@linuxfoundation.org> <20180823111728.GA2945@kroah.com> <20180823115628.GA13907@kroah.com> <3128dea4-1b3c-ccf3-3e57-fbb5ea6d3fe5@cogentembedded.com> <20180823152717.GA28242@kroah.com> <20180823154155.GA31967@kroah.com> From: Sergei Shtylyov Organization: Cogent Embedded Message-ID: <4858e841-a329-b97b-62b4-08cbe1761e45@cogentembedded.com> Date: Thu, 23 Aug 2018 22:54:48 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20180823154155.GA31967@kroah.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-MW Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/23/2018 06:41 PM, Greg Kroah-Hartman wrote: >>>>>>>> 4.14-stable review patch. If anyone has any objections, please let me know. >>>>>>>> >>>>>>>> ------------------ >>>>>>>> >>>>>>>> From: Sergei Shtylyov >>>>>>>> >>>>>>>> commit a5fb9fb023a1435f2b42bccd7f547560f3a21dc3 upstream. >>>>>>>> >>>>>>>> When testing the R-Car PCIe driver on the Condor board, if the PCIe PHY >>>>>>>> driver was left disabled, the kernel crashed with this BUG: >>>>>>>> >>>>>>>> kernel BUG at lib/ioremap.c:72! >>>>>>>> Internal error: Oops - BUG: 0 [#1] PREEMPT SMP >>>>>>>> Modules linked in: >>>>>>>> CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092 >>>>>>>> Hardware name: Renesas Condor board based on r8a77980 (DT) >>>>>>>> Workqueue: events deferred_probe_work_func >>>>>>>> pstate: 80000005 (Nzcv daif -PAN -UAO) >>>>>>>> pc : ioremap_page_range+0x370/0x3c8 >>>>>>>> lr : ioremap_page_range+0x40/0x3c8 >>>>>>>> sp : ffff000008da39e0 >>>>>>>> x29: ffff000008da39e0 x28: 00e8000000000f07 >>>>>>>> x27: ffff7dfffee00000 x26: 0140000000000000 >>>>>>>> x25: ffff7dfffef00000 x24: 00000000000fe100 >>>>>>>> x23: ffff80007b906000 x22: ffff000008ab8000 >>>>>>>> x21: ffff000008bb1d58 x20: ffff7dfffef00000 >>>>>>>> x19: ffff800009c30fb8 x18: 0000000000000001 >>>>>>>> x17: 00000000000152d0 x16: 00000000014012d0 >>>>>>>> x15: 0000000000000000 x14: 0720072007200720 >>>>>>>> x13: 0720072007200720 x12: 0720072007200720 >>>>>>>> x11: 0720072007300730 x10: 00000000000000ae >>>>>>>> x9 : 0000000000000000 x8 : ffff7dffff000000 >>>>>>>> x7 : 0000000000000000 x6 : 0000000000000100 >>>>>>>> x5 : 0000000000000000 x4 : 000000007b906000 >>>>>>>> x3 : ffff80007c61a880 x2 : ffff7dfffeefffff >>>>>>>> x1 : 0000000040000000 x0 : 00e80000fe100f07 >>>>>>>> Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval)) >>>>>>>> Call trace: >>>>>>>> ioremap_page_range+0x370/0x3c8 >>>>>>>> pci_remap_iospace+0x7c/0xac >>>>>>>> pci_parse_request_of_pci_ranges+0x13c/0x190 >>>>>>>> rcar_pcie_probe+0x4c/0xb04 >>>>>>>> platform_drv_probe+0x50/0xbc >>>>>>>> driver_probe_device+0x21c/0x308 >>>>>>>> __device_attach_driver+0x98/0xc8 >>>>>>>> bus_for_each_drv+0x54/0x94 >>>>>>>> __device_attach+0xc4/0x12c >>>>>>>> device_initial_probe+0x10/0x18 >>>>>>>> bus_probe_device+0x90/0x98 >>>>>>>> deferred_probe_work_func+0xb0/0x150 >>>>>>>> process_one_work+0x12c/0x29c >>>>>>>> worker_thread+0x200/0x3fc >>>>>>>> kthread+0x108/0x134 >>>>>>>> ret_from_fork+0x10/0x18 >>>>>>>> Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000) >>>>>>>> >>>>>>>> It turned out that pci_remap_iospace() wasn't undone when the driver's >>>>>>>> probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER, >>>>>>>> the probe was retried, finally causing the BUG due to trying to remap >>>>>>>> already remapped pages. >>>>>>>> >>>>>>>> Introduce the devm_pci_remap_iospace() managed API and replace the >>>>>>>> pci_remap_iospace() call with it to fix the bug. >>>>>>>> >>>>>>>> Fixes: dbf9826d5797 ("PCI: generic: Convert to DT resource parsing API") >>>>>>>> Signed-off-by: Sergei Shtylyov >>>>>>>> [lorenzo.pieralisi@arm.com: split commit/updated the commit log] >>>>>>>> Signed-off-by: Lorenzo Pieralisi >>>>>>>> Signed-off-by: Bjorn Helgaas >>>>>>>> Reviewed-by: Linus Walleij >>>>>>>> [Backport just for the new api which other patches need - gregkh] >>>>>>>> Signed-off-by: Greg Kroah-Hartman >>>>>>>> >>>>>>>> --- >>>>>>>> drivers/pci/pci.c | 38 ++++++++++++++++++++++++++++++++++++++ >>>>>>>> include/linux/pci.h | 2 ++ >>>>>>>> 2 files changed, 40 insertions(+) >>>>>>> >>>>>>> You missed a chnage to drivers/pci/host/pci-host-common.c (and >>>>>>> also drivers/pci/host/pcie-rcar.c which wasn't using the generic mode back >>>> >>>> s/mode/code/, of course. :-) >>>> >>>>>>> then)... >>>>>> >>>>>> Yes I totally messed this up, let me fix it... >>>>> >>>>> Ok, below is the patch that I replaced the 4.14 and 4.9 versions with, >>>>> it should now be resolved, but verifying this would be nice :) >>>> >>>> Unfortunately, it doesn't fix anything on R-Car where this bug was originally >>>> encountered and the fix was tested... and you leave no way for it to be fixed. :-( >>> >>> Really? Why not? What is missing here? >> >> You just need to fix drivers/pci/host/pcie-rcar.c in this same patch -- because >> this same *upstream* patch fixed the R-Car PCIe driver in 4.18. That driver started >> using the common "PCI-resource-walker" function factored out from pci-host-common.c >> somewhere around 4.17, IIRC... > > Ok, can you send me a patch that does that please? Otherwise I really > don't know how to exactly "fix" that at the moment. I'd told you I could do it. :-) Sending... > thanks, > > greg k-h MBR, Sergei