From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
Nick Desaulniers <ndesaulniers@google.com>,
akpm@linux-foundation.org, daniel@ffwll.ch,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-nvdimm@lists.01.org, Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
clang-built-linux@googlegroups.com,
Linux-Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: [PATCH 2/2] mm: simplify follow_pte{,pmd}
Date: Wed, 11 Nov 2020 22:12:54 +1100 [thread overview]
Message-ID: <20201111221254.7f6a3658@canb.auug.org.au> (raw)
In-Reply-To: <20201111082842.GA23677@lst.de>
[-- Attachment #1.1: Type: text/plain, Size: 2211 bytes --]
Hi Christoph,
On Wed, 11 Nov 2020 09:28:42 +0100 Christoph Hellwig <hch@lst.de> wrote:
>
> On Wed, Nov 11, 2020 at 09:26:20AM +0100, Christian Borntraeger wrote:
> >
> > On 11.11.20 09:18, Christoph Hellwig wrote:
> > > On Tue, Nov 10, 2020 at 06:21:22PM -0800, Nick Desaulniers wrote:
> > >> Sorry, I think this patch may be causing a regression for us for s390?
> > >> https://travis-ci.com/github/ClangBuiltLinux/continuous-integration/jobs/432129279#L768
> > >>
> > >> (via https://lore.kernel.org/linux-mm/20201029101432.47011-3-hch@lst.de)
> > >
> > > Hmm, the call to follow_pte_pmd in the s390 code does not actually exist
> > > in my tree.
> >
> > This is a mid-air collision in linux-next between
> >
> > b2ff5796a934 ("mm: simplify follow_pte{,pmd}")
> > a67a88b0b8de ("s390/pci: remove races against pte updates")
>
> Ah. The fixup is trivial: just s/follow_pte_pmd/follow_pte/.
ok, so tomorrow I will add the following to the merge of the
akpm-current tree:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 11 Nov 2020 22:08:32 +1100
Subject: [PATCH] merge fix for "s390/pci: remove races against pte updates"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/s390/pci/pci_mmio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/s390/pci/pci_mmio.c b/arch/s390/pci/pci_mmio.c
index 1a6adbc68ee8..4a4993837413 100644
--- a/arch/s390/pci/pci_mmio.c
+++ b/arch/s390/pci/pci_mmio.c
@@ -173,7 +173,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, unsigned long, mmio_addr,
if (!(vma->vm_flags & VM_WRITE))
goto out_unlock_mmap;
- ret = follow_pte_pmd(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl);
+ ret = follow_pte(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl);
if (ret)
goto out_unlock_mmap;
@@ -317,7 +317,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_read, unsigned long, mmio_addr,
if (!(vma->vm_flags & VM_WRITE))
goto out_unlock_mmap;
- ret = follow_pte_pmd(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl);
+ ret = follow_pte(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl);
if (ret)
goto out_unlock_mmap;
--
2.29.2
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
Nick Desaulniers <ndesaulniers@google.com>,
akpm@linux-foundation.org, dan.j.williams@intel.com,
daniel@ffwll.ch, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, linux-nvdimm@lists.01.org,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
clang-built-linux@googlegroups.com,
Linux-Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: [PATCH 2/2] mm: simplify follow_pte{,pmd}
Date: Wed, 11 Nov 2020 22:12:54 +1100 [thread overview]
Message-ID: <20201111221254.7f6a3658@canb.auug.org.au> (raw)
In-Reply-To: <20201111082842.GA23677@lst.de>
[-- Attachment #1: Type: text/plain, Size: 2211 bytes --]
Hi Christoph,
On Wed, 11 Nov 2020 09:28:42 +0100 Christoph Hellwig <hch@lst.de> wrote:
>
> On Wed, Nov 11, 2020 at 09:26:20AM +0100, Christian Borntraeger wrote:
> >
> > On 11.11.20 09:18, Christoph Hellwig wrote:
> > > On Tue, Nov 10, 2020 at 06:21:22PM -0800, Nick Desaulniers wrote:
> > >> Sorry, I think this patch may be causing a regression for us for s390?
> > >> https://travis-ci.com/github/ClangBuiltLinux/continuous-integration/jobs/432129279#L768
> > >>
> > >> (via https://lore.kernel.org/linux-mm/20201029101432.47011-3-hch@lst.de)
> > >
> > > Hmm, the call to follow_pte_pmd in the s390 code does not actually exist
> > > in my tree.
> >
> > This is a mid-air collision in linux-next between
> >
> > b2ff5796a934 ("mm: simplify follow_pte{,pmd}")
> > a67a88b0b8de ("s390/pci: remove races against pte updates")
>
> Ah. The fixup is trivial: just s/follow_pte_pmd/follow_pte/.
ok, so tomorrow I will add the following to the merge of the
akpm-current tree:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 11 Nov 2020 22:08:32 +1100
Subject: [PATCH] merge fix for "s390/pci: remove races against pte updates"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/s390/pci/pci_mmio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/s390/pci/pci_mmio.c b/arch/s390/pci/pci_mmio.c
index 1a6adbc68ee8..4a4993837413 100644
--- a/arch/s390/pci/pci_mmio.c
+++ b/arch/s390/pci/pci_mmio.c
@@ -173,7 +173,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, unsigned long, mmio_addr,
if (!(vma->vm_flags & VM_WRITE))
goto out_unlock_mmap;
- ret = follow_pte_pmd(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl);
+ ret = follow_pte(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl);
if (ret)
goto out_unlock_mmap;
@@ -317,7 +317,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_read, unsigned long, mmio_addr,
if (!(vma->vm_flags & VM_WRITE))
goto out_unlock_mmap;
- ret = follow_pte_pmd(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl);
+ ret = follow_pte(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl);
if (ret)
goto out_unlock_mmap;
--
2.29.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-11-11 11:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 10:14 simplify follow_pte a bit Christoph Hellwig
2020-10-29 10:14 ` Christoph Hellwig
2020-10-29 10:14 ` [PATCH 1/2] mm: unexport follow_pte_pmd Christoph Hellwig
2020-10-29 10:14 ` Christoph Hellwig
2020-11-10 18:32 ` Matthew Wilcox
2020-11-10 18:32 ` Matthew Wilcox
2020-10-29 10:14 ` [PATCH 2/2] mm: simplify follow_pte{,pmd} Christoph Hellwig
2020-10-29 10:14 ` Christoph Hellwig
2020-11-10 18:42 ` Matthew Wilcox
2020-11-10 18:42 ` Matthew Wilcox
2020-11-11 2:21 ` Nick Desaulniers
2020-11-11 2:21 ` Nick Desaulniers
2020-11-11 2:21 ` Nick Desaulniers
2020-11-11 8:18 ` Christoph Hellwig
2020-11-11 8:18 ` Christoph Hellwig
2020-11-11 8:26 ` Christian Borntraeger
2020-11-11 8:26 ` Christian Borntraeger
2020-11-11 8:28 ` Christoph Hellwig
2020-11-11 8:28 ` Christoph Hellwig
2020-11-11 11:12 ` Stephen Rothwell [this message]
2020-11-11 11:12 ` Stephen Rothwell
2020-11-10 18:26 ` simplify follow_pte a bit Christoph Hellwig
2020-11-10 18:26 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201111221254.7f6a3658@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=borntraeger@de.ibm.com \
--cc=clang-built-linux@googlegroups.com \
--cc=daniel@ffwll.ch \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=ndesaulniers@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.