From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: Jan Harkes <jaharkes@cs.cmu.edu>, linux-kernel@vger.kernel.org, linux-unionfs@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: coda@cs.cmu.edu, miklos@szeredi.hu, akpm@linux-foundation.org, jgg@ziepe.ca Subject: Re: [PATCH 1/2] coda: fix reference counting in coda_file_mmap error path Date: Thu, 22 Apr 2021 14:39:41 +0200 [thread overview] Message-ID: <f603f59b-ec52-7ad7-475a-fcf95902e145@gmail.com> (raw) In-Reply-To: <91292A4A-5F97-4FF8-ABAD-42392A0756B5@cs.cmu.edu> Hi Jan, Am 22.04.21 um 14:27 schrieb Jan Harkes: > Looks good to me. > > I'm also maintaining an out of tree coda module build that people sometimes use, which has workarounds for differences between the various kernel versions. > > Do you have a reference to the corresponding mmap_region change? If it is merged already I'll probably be able to find it. Is this mmap_region change expected to be backported to any lts kernels? That is the following upstream commit in Linus tree: commit 1527f926fd04490f648c42f42b45218a04754f87 Author: Christian König <christian.koenig@amd.com> Date: Fri Oct 9 15:08:55 2020 +0200 mm: mmap: fix fput in error path v2 But I don't think we should backport that. And sorry for the noise. We had so many places which expected different behavior that I didn't noticed that two occasions in the fs code actually rely on the current behavior. For your out of tree module you could make the code version independent by setting the vma back to the original file in case of an error. That should work with both behaviors in mmap_region. Thanks, Christian. > > Jan > > On April 21, 2021 9:20:11 AM EDT, "Christian König" <ckoenig.leichtzumerken@gmail.com> wrote: >> mmap_region() now calls fput() on the vma->vm_file. >> >> So we need to drop the extra reference on the coda file instead of the >> host file. >> >> Signed-off-by: Christian König <christian.koenig@amd.com> >> Fixes: 1527f926fd04 ("mm: mmap: fix fput in error path v2") >> CC: stable@vger.kernel.org # 5.11+ >> --- >> fs/coda/file.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/fs/coda/file.c b/fs/coda/file.c >> index 128d63df5bfb..ef5ca22bfb3e 100644 >> --- a/fs/coda/file.c >> +++ b/fs/coda/file.c >> @@ -175,10 +175,10 @@ coda_file_mmap(struct file *coda_file, struct >> vm_area_struct *vma) >> ret = call_mmap(vma->vm_file, vma); >> >> if (ret) { >> - /* if call_mmap fails, our caller will put coda_file so we >> - * should drop the reference to the host_file that we got. >> + /* if call_mmap fails, our caller will put host_file so we >> + * should drop the reference to the coda_file that we got. >> */ >> - fput(host_file); >> + fput(coda_file); >> kfree(cvm_ops); >> } else { >> /* here we add redirects for the open/close vm_operations */
WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: Jan Harkes <jaharkes@cs.cmu.edu>, linux-kernel@vger.kernel.org, linux-unionfs@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: jgg@ziepe.ca, coda@cs.cmu.edu, akpm@linux-foundation.org, miklos@szeredi.hu Subject: Re: [PATCH 1/2] coda: fix reference counting in coda_file_mmap error path Date: Thu, 22 Apr 2021 14:39:41 +0200 [thread overview] Message-ID: <f603f59b-ec52-7ad7-475a-fcf95902e145@gmail.com> (raw) In-Reply-To: <91292A4A-5F97-4FF8-ABAD-42392A0756B5@cs.cmu.edu> Hi Jan, Am 22.04.21 um 14:27 schrieb Jan Harkes: > Looks good to me. > > I'm also maintaining an out of tree coda module build that people sometimes use, which has workarounds for differences between the various kernel versions. > > Do you have a reference to the corresponding mmap_region change? If it is merged already I'll probably be able to find it. Is this mmap_region change expected to be backported to any lts kernels? That is the following upstream commit in Linus tree: commit 1527f926fd04490f648c42f42b45218a04754f87 Author: Christian König <christian.koenig@amd.com> Date: Fri Oct 9 15:08:55 2020 +0200 mm: mmap: fix fput in error path v2 But I don't think we should backport that. And sorry for the noise. We had so many places which expected different behavior that I didn't noticed that two occasions in the fs code actually rely on the current behavior. For your out of tree module you could make the code version independent by setting the vma back to the original file in case of an error. That should work with both behaviors in mmap_region. Thanks, Christian. > > Jan > > On April 21, 2021 9:20:11 AM EDT, "Christian König" <ckoenig.leichtzumerken@gmail.com> wrote: >> mmap_region() now calls fput() on the vma->vm_file. >> >> So we need to drop the extra reference on the coda file instead of the >> host file. >> >> Signed-off-by: Christian König <christian.koenig@amd.com> >> Fixes: 1527f926fd04 ("mm: mmap: fix fput in error path v2") >> CC: stable@vger.kernel.org # 5.11+ >> --- >> fs/coda/file.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/fs/coda/file.c b/fs/coda/file.c >> index 128d63df5bfb..ef5ca22bfb3e 100644 >> --- a/fs/coda/file.c >> +++ b/fs/coda/file.c >> @@ -175,10 +175,10 @@ coda_file_mmap(struct file *coda_file, struct >> vm_area_struct *vma) >> ret = call_mmap(vma->vm_file, vma); >> >> if (ret) { >> - /* if call_mmap fails, our caller will put coda_file so we >> - * should drop the reference to the host_file that we got. >> + /* if call_mmap fails, our caller will put host_file so we >> + * should drop the reference to the coda_file that we got. >> */ >> - fput(host_file); >> + fput(coda_file); >> kfree(cvm_ops); >> } else { >> /* here we add redirects for the open/close vm_operations */ _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-04-22 12:40 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-21 13:20 [PATCH 1/2] coda: fix reference counting in coda_file_mmap error path Christian König 2021-04-21 13:20 ` Christian König 2021-04-21 13:20 ` [PATCH 2/2] ovl: fix reference counting in ovl_mmap " Christian König 2021-04-21 13:20 ` Christian König 2021-04-22 8:13 ` Daniel Vetter 2021-04-22 8:13 ` Daniel Vetter 2021-04-22 8:11 ` [PATCH 1/2] coda: fix reference counting in coda_file_mmap " Daniel Vetter 2021-04-22 8:11 ` Daniel Vetter 2021-04-22 12:27 ` Jan Harkes 2021-04-22 12:27 ` Jan Harkes 2021-04-22 12:39 ` Christian König [this message] 2021-04-22 12:39 ` Christian König 2021-04-22 13:51 ` Jan Harkes 2021-04-22 13:51 ` Jan Harkes 2021-04-23 8:10 ` Christian König 2021-04-23 8:10 ` Christian König
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=f603f59b-ec52-7ad7-475a-fcf95902e145@gmail.com \ --to=ckoenig.leichtzumerken@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=coda@cs.cmu.edu \ --cc=dri-devel@lists.freedesktop.org \ --cc=jaharkes@cs.cmu.edu \ --cc=jgg@ziepe.ca \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-unionfs@vger.kernel.org \ --cc=miklos@szeredi.hu \ /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: linkBe 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.