From: Greg Kroah-Hartman Date: Sat, 24 Apr 2021 11:24:09 +0000 (+0200) Subject: 5.11-stable patches X-Git-Tag: v4.4.268~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f24450a790581ecb30724bed220ea6c967967985;p=thirdparty%2Fkernel%2Fstable-queue.git 5.11-stable patches added patches: amd-display-allow-non-linear-multi-planar-formats.patch coda-fix-reference-counting-in-coda_file_mmap-error-path.patch ovl-fix-reference-counting-in-ovl_mmap-error-path.patch --- diff --git a/queue-5.11/amd-display-allow-non-linear-multi-planar-formats.patch b/queue-5.11/amd-display-allow-non-linear-multi-planar-formats.patch new file mode 100644 index 00000000000..f5fe9d1c965 --- /dev/null +++ b/queue-5.11/amd-display-allow-non-linear-multi-planar-formats.patch @@ -0,0 +1,54 @@ +From 9ebb6bc0125dfb1e65a53eea4aeecc63d4d6ec2d Mon Sep 17 00:00:00 2001 +From: Simon Ser +Date: Fri, 26 Mar 2021 17:59:44 +0100 +Subject: amd/display: allow non-linear multi-planar formats + +From: Simon Ser + +commit 9ebb6bc0125dfb1e65a53eea4aeecc63d4d6ec2d upstream. + +Accept non-linear buffers which use a multi-planar format, as long +as they don't use DCC. + +Tested on GFX9 with NV12. + +Signed-off-by: Simon Ser +Cc: Alex Deucher +Cc: Harry Wentland +Cc: Nicholas Kazlauskas +Cc: Bas Nieuwenhuizen +Reviewed-by: Bas Nieuwenhuizen +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -3963,13 +3963,6 @@ static bool dm_plane_format_mod_supporte + return true; + + /* +- * The arbitrary tiling support for multiplane formats has not been hooked +- * up. +- */ +- if (info->num_planes > 1) +- return false; +- +- /* + * For D swizzle the canonical modifier depends on the bpp, so check + * it here. + */ +@@ -3987,6 +3980,10 @@ static bool dm_plane_format_mod_supporte + /* Per radeonsi comments 16/64 bpp are more complicated. */ + if (info->cpp[0] != 4) + return false; ++ /* We support multi-planar formats, but not when combined with ++ * additional DCC metadata planes. */ ++ if (info->num_planes > 1) ++ return false; + } + + return true; diff --git a/queue-5.11/coda-fix-reference-counting-in-coda_file_mmap-error-path.patch b/queue-5.11/coda-fix-reference-counting-in-coda_file_mmap-error-path.patch new file mode 100644 index 00000000000..7490a9dac09 --- /dev/null +++ b/queue-5.11/coda-fix-reference-counting-in-coda_file_mmap-error-path.patch @@ -0,0 +1,48 @@ +From 9da29c7f77cd04e5c9150e30f047521b6f20a918 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= +Date: Fri, 23 Apr 2021 14:28:51 -0700 +Subject: coda: fix reference counting in coda_file_mmap error path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Christian König + +commit 9da29c7f77cd04e5c9150e30f047521b6f20a918 upstream. + +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. + +Link: https://lkml.kernel.org/r/20210421132012.82354-1-christian.koenig@amd.com +Fixes: 1527f926fd04 ("mm: mmap: fix fput in error path v2") +Signed-off-by: Christian König +Reviewed-by: Daniel Vetter +Acked-by: Jan Harkes +Cc: Miklos Szeredi +Cc: Jason Gunthorpe +Cc: [5.11+] +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + fs/coda/file.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/fs/coda/file.c ++++ b/fs/coda/file.c +@@ -175,10 +175,10 @@ coda_file_mmap(struct file *coda_file, s + 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 */ diff --git a/queue-5.11/ovl-fix-reference-counting-in-ovl_mmap-error-path.patch b/queue-5.11/ovl-fix-reference-counting-in-ovl_mmap-error-path.patch new file mode 100644 index 00000000000..9800d42cbfb --- /dev/null +++ b/queue-5.11/ovl-fix-reference-counting-in-ovl_mmap-error-path.patch @@ -0,0 +1,56 @@ +From 2896900e22f8212606a1837d89a6bbce314ceeda Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= +Date: Fri, 23 Apr 2021 14:28:54 -0700 +Subject: ovl: fix reference counting in ovl_mmap error path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Christian König + +commit 2896900e22f8212606a1837d89a6bbce314ceeda upstream. + +mmap_region() now calls fput() on the vma->vm_file. + +Fix this by using vma_set_file() so it doesn't need to be handled +manually here any more. + +Link: https://lkml.kernel.org/r/20210421132012.82354-2-christian.koenig@amd.com +Fixes: 1527f926fd04 ("mm: mmap: fix fput in error path v2") +Signed-off-by: Christian König +Reviewed-by: Daniel Vetter +Cc: Jan Harkes +Cc: Miklos Szeredi +Cc: Jason Gunthorpe +Cc: [5.11+] +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + fs/overlayfs/file.c | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +--- a/fs/overlayfs/file.c ++++ b/fs/overlayfs/file.c +@@ -430,20 +430,11 @@ static int ovl_mmap(struct file *file, s + if (WARN_ON(file != vma->vm_file)) + return -EIO; + +- vma->vm_file = get_file(realfile); ++ vma_set_file(vma, realfile); + + old_cred = ovl_override_creds(file_inode(file)->i_sb); + ret = call_mmap(vma->vm_file, vma); + revert_creds(old_cred); +- +- if (ret) { +- /* Drop reference count from new vm_file value */ +- fput(realfile); +- } else { +- /* Drop reference count from previous vm_file value */ +- fput(file); +- } +- + ovl_file_accessed(file); + + return ret; diff --git a/queue-5.11/series b/queue-5.11/series index c1f11fa6a14..37d4616fa2d 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -1 +1,4 @@ vhost-vdpa-protect-concurrent-access-to-vhost-device-iotlb.patch +ovl-fix-reference-counting-in-ovl_mmap-error-path.patch +coda-fix-reference-counting-in-coda_file_mmap-error-path.patch +amd-display-allow-non-linear-multi-planar-formats.patch