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=-21.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,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 62E6EC4320A for ; Thu, 12 Aug 2021 17:14:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A34B610A5 for ; Thu, 12 Aug 2021 17:14:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235067AbhHLRPR (ORCPT ); Thu, 12 Aug 2021 13:15:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:41598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235059AbhHLRPR (ORCPT ); Thu, 12 Aug 2021 13:15:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C93B460FD7; Thu, 12 Aug 2021 17:14:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628788492; bh=Gvh4fBP+F/uH4xTr64jCLWfM/w+ffKE+b29Ky3ELn5Y=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=HjqloHROgns+WCePqg/ILzEihQpBYsbjmGWE+k5AdtAy94WB3BrKJYeTqPh8n/9Hs QMhJLUKa8SHaKD4p4f56DJEo7TZnQkirDeSYBvD4uLy+Q9CqDb6o0RR6pz3zIjPkxi 1Q1jqMrFdR4lNTV1EHhpjrRZuqHFn1KR/xW37deZapoGS7l3ByRcIYDzO20BbMkSJk W8mvhS6gkrji4cCJyok77IXVUQ1FXUtcJMP2My0tC6sMfuEJPfRm7YVzlFyd8w0EeF 4sEaRaC+CyXEnJhoTF01ki9VPiM8csDLLIfudO6I44wAALq4ZZVQPX0WGjYItozgcp Dqs0c5M5ItVKQ== Date: Thu, 12 Aug 2021 12:14:50 -0500 From: Bjorn Helgaas To: Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Greg Kroah-Hartman Cc: Bjorn Helgaas , Daniel Vetter , Dan Williams , Sasha Levin , linux-pci@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] PCI/sysfs: Use correct variable for the legacy_mem sysfs object Message-ID: <20210812171450.GA2485383@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210812161710.GA2479934@bjorn-Precision-5520> Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Thu, Aug 12, 2021 at 11:17:12AM -0500, Bjorn Helgaas wrote: > [+to Greg, please update sysfs_defferred_iomem_get_mapping-5.15] Actually, Greg, totally up to you, but if nobody else is depending on the sysfs_defferred_iomem_get_mapping-5.15 branch, another possibility would be for you to drop that branch and for me to merge the two patches on it + Krzysztof's fix below + (hopefully) Krzysztof's PCI static attribute work. That would make my v5.15 pull request easier because I simple-mindedly base all my branches on -rc1 while your branch is based on -rc3. But again, up to you. I put those two patches on a local branch: 94b34bc04c25 ("sysfs: Rename struct bin_attribute member to f_mapping") 97e9dada53f1 ("sysfs: Invoke iomem_get_mapping() from the sysfs open callback") in case that seems better to you. > On Thu, Aug 12, 2021 at 01:21:44PM +0000, Krzysztof Wilczyński wrote: > > Two legacy PCI sysfs objects "legacy_io" and "legacy_mem" were updated > > to use an unified address space in the commit 636b21b50152 ("PCI: Revoke > > mappings like devmem"). This allows for revocations to be managed from > > a single place when drivers want to take over and mmap() a /dev/mem > > range. > > > > Following the update, both of the sysfs objects should leverage the > > iomem_get_mapping() function to get an appropriate address range, but > > only the "legacy_io" has been correctly updated - the second attribute > > seems to be using a wrong variable to pass the iomem_get_mapping() > > function to. > > > > Thus, correct the variable name used so that the "legacy_mem" sysfs > > object would also correctly call the iomem_get_mapping() function. > > > > Fixes: 636b21b50152 ("PCI: Revoke mappings like devmem") > > Signed-off-by: Krzysztof Wilczyński > > Acked-by: Bjorn Helgaas > > Ouch. This needs to be applied to any -stable trees that contain > 636b21b50152, which was merged in v5.12. > > It *also* needs to be applied with the obvious updates to Greg's > sysfs_defferred_iomem_get_mapping-5.15 branch because it was changed > by f06aff924f97 ("sysfs: Rename struct bin_attribute member to > f_mapping") [1] > > [1] https://git.kernel.org/cgit/linux/kernel/git/gregkh/driver-core.git/commit/?id=f06aff924f97 > > > --- > > drivers/pci/pci-sysfs.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > > index 5d63df7c1820..7bbf2673c7f2 100644 > > --- a/drivers/pci/pci-sysfs.c > > +++ b/drivers/pci/pci-sysfs.c > > @@ -978,7 +978,7 @@ void pci_create_legacy_files(struct pci_bus *b) > > b->legacy_mem->size = 1024*1024; > > b->legacy_mem->attr.mode = 0600; > > b->legacy_mem->mmap = pci_mmap_legacy_mem; > > - b->legacy_io->mapping = iomem_get_mapping(); > > + b->legacy_mem->mapping = iomem_get_mapping(); > > pci_adjust_legacy_attr(b, pci_mmap_mem); > > error = device_create_bin_file(&b->dev, b->legacy_mem); > > if (error) > > -- > > 2.32.0 > >