Merge v4.14.75 into chromeos-4.14 |
|||||||
Issue descriptionMerge v4.14.75 into chromeos-4.14
,
Oct 12
,
Oct 17
Merge requested for at least the following patches that came in with the v4.14.75 merge: 06f93e40 brijesh.singh@amd.com iommu/amd: Clear memory encryption mask from physical address f7b86faf Mon Sep 10 13:52:55 2018 christian.koenig@amd.com drm/amdgpu: fix error handling in amdgpu_cs_user_fence_chunk
,
Oct 17
,
Oct 17
"at least" is vague. Let's declare that the merge request from #4 is for the two mentioned patches, and nothing else. Additional patches will trigger a separate merge request.
,
Oct 18
Your change meets the bar and is auto-approved for M71. Please go ahead and merge the CL to branch 3578 manually. Please contact milestone owner if you have questions. Owners: benmason@(Android), kariahda@(iOS), kbleicher@(ChromeOS), govind@(Desktop) For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
,
Oct 22
This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible! If all merges have been completed, please remove any remaining Merge-Approved labels from this issue. Thanks for your time! To disable nags, add the Disable-Nags label. For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
,
Oct 22
,
Nov 2
Can we get the patches mentioned in #4 cherry-pick'd onto release-R71-11151.B-chromeos-4.14 branch? Let me know you if i will have to do it manually.
,
Nov 2
#10: Hmm, I thought I did that. Something went wrong. Let me have another look.
,
Nov 3
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/b3cee8d9a02195d8d95c3ca7c9c9e41591564123 commit b3cee8d9a02195d8d95c3ca7c9c9e41591564123 Author: Singh, Brijesh <brijesh.singh@amd.com> Date: Sat Nov 03 01:35:50 2018 UPSTREAM: iommu/amd: Clear memory encryption mask from physical address commit b3e9b515b08e407ab3a026dc2e4d935c48d05f69 upstream. Boris Ostrovsky reported a memory leak with device passthrough when SME is active. The VFIO driver uses iommu_iova_to_phys() to get the physical address for an iova. This physical address is later passed into vfio_unmap_unpin() to unpin the memory. The vfio_unmap_unpin() uses pfn_valid() before unpinning the memory. The pfn_valid() check was failing because encryption mask was part of the physical address returned. This resulted in the memory not being unpinned and therefore leaked after the guest terminates. The memory encryption mask must be cleared from the physical address in iommu_iova_to_phys(). Fixes: 2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to work with memory encryption") Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Tom Lendacky <thomas.lendacky@amd.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: <iommu@lists.linux-foundation.org> Cc: Borislav Petkov <bp@suse.de> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krčmář <rkrcmar@redhat.com> Cc: kvm@vger.kernel.org Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: <stable@vger.kernel.org> # 4.14+ Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> Signed-off-by: Joerg Roedel <jroedel@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> BUG= chromium:894058 TEST=None (cherry picked from commit 06f93e40f939f4df9efa57467f1bf195ce50d138) Signed-off-by: Guenter Roeck <groeck@chromium.org> Change-Id: Iaf49fc3c7eca4837a189c93bf073238cd0b87e2e Reviewed-on: https://chromium-review.googlesource.com/c/1315509 Reviewed-by: Guenter Roeck <groeck@chromium.org> Commit-Queue: Guenter Roeck <groeck@chromium.org> Tested-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/b3cee8d9a02195d8d95c3ca7c9c9e41591564123/drivers/iommu/amd_iommu.c
,
Nov 3
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/1597eb7c5f89bc094d4be74f26f7e3bf98b564f7 commit 1597eb7c5f89bc094d4be74f26f7e3bf98b564f7 Author: Christian König <christian.koenig@amd.com> Date: Sat Nov 03 01:35:54 2018 UPSTREAM: drm/amdgpu: fix error handling in amdgpu_cs_user_fence_chunk [ Upstream commit 0165de983272d1fae0809ed9db47c46a412279bc ] Slowly leaking memory one page at a time :) Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> BUG= chromium:894058 TEST=None (cherry picked from commit f7b86faf0bd11ae44d009d7d68ec8af5491119fe) Signed-off-by: Guenter Roeck <groeck@chromium.org> Change-Id: Ie0ccc5ab381cd4d662d2d3b03330fcb8c257246d Reviewed-on: https://chromium-review.googlesource.com/c/1315510 Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> Commit-Queue: Guenter Roeck <groeck@chromium.org> Tested-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/1597eb7c5f89bc094d4be74f26f7e3bf98b564f7/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c |
|||||||
►
Sign in to add a comment |
|||||||
Comment 1 by bugdroid1@chromium.org
, Oct 12