From: Rob Clark <robdclark@gmail.com> To: dri-devel@lists.freedesktop.org Cc: Jordan Crouse <jordan@cosmicpenguin.net>, Rob Clark <robdclark@chromium.org>, Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM ADRENO GPU), freedreno@lists.freedesktop.org (open list:DRM DRIVER FOR MSM ADRENO GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 7/8] drm/msm: Small msm_gem_purge() fix Date: Mon, 5 Apr 2021 10:45:30 -0700 [thread overview] Message-ID: <20210405174532.1441497-8-robdclark@gmail.com> (raw) In-Reply-To: <20210405174532.1441497-1-robdclark@gmail.com> From: Rob Clark <robdclark@chromium.org> Shoot down any mmap's *first* before put_pages(). Also add a WARN_ON that the object is locked (to make it clear that this doesn't race with msm_gem_fault()) and remove a redundant WARN_ON (since is_purgable() already covers that case). Fixes: 68209390f116 ("drm/msm: shrinker support") Signed-off-by: Rob Clark <robdclark@chromium.org> --- drivers/gpu/drm/msm/msm_gem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 9ac89951080c..163a1d30b5c9 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -729,14 +729,16 @@ void msm_gem_purge(struct drm_gem_object *obj) struct drm_device *dev = obj->dev; struct msm_gem_object *msm_obj = to_msm_bo(obj); + GEM_WARN_ON(!msm_gem_is_locked(obj)); GEM_WARN_ON(!is_purgeable(msm_obj)); - GEM_WARN_ON(obj->import_attach); /* Get rid of any iommu mapping(s): */ put_iova_spaces(obj, true); msm_gem_vunmap(obj); + drm_vma_node_unmap(&obj->vma_node, dev->anon_inode->i_mapping); + put_pages(obj); put_iova_vmas(obj); @@ -744,7 +746,6 @@ void msm_gem_purge(struct drm_gem_object *obj) msm_obj->madv = __MSM_MADV_PURGED; update_inactive(msm_obj); - drm_vma_node_unmap(&obj->vma_node, dev->anon_inode->i_mapping); drm_gem_free_mmap_offset(obj); /* Our goal here is to return as much of the memory as -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Rob Clark <robdclark@gmail.com> To: dri-devel@lists.freedesktop.org Cc: Rob Clark <robdclark@chromium.org>, "open list:DRM DRIVER FOR MSM ADRENO GPU" <freedreno@lists.freedesktop.org>, David Airlie <airlied@linux.ie>, "open list:DRM DRIVER FOR MSM ADRENO GPU" <linux-arm-msm@vger.kernel.org>, open list <linux-kernel@vger.kernel.org>, Jordan Crouse <jordan@cosmicpenguin.net>, Sean Paul <sean@poorly.run> Subject: [PATCH 7/8] drm/msm: Small msm_gem_purge() fix Date: Mon, 5 Apr 2021 10:45:30 -0700 [thread overview] Message-ID: <20210405174532.1441497-8-robdclark@gmail.com> (raw) In-Reply-To: <20210405174532.1441497-1-robdclark@gmail.com> From: Rob Clark <robdclark@chromium.org> Shoot down any mmap's *first* before put_pages(). Also add a WARN_ON that the object is locked (to make it clear that this doesn't race with msm_gem_fault()) and remove a redundant WARN_ON (since is_purgable() already covers that case). Fixes: 68209390f116 ("drm/msm: shrinker support") Signed-off-by: Rob Clark <robdclark@chromium.org> --- drivers/gpu/drm/msm/msm_gem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 9ac89951080c..163a1d30b5c9 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -729,14 +729,16 @@ void msm_gem_purge(struct drm_gem_object *obj) struct drm_device *dev = obj->dev; struct msm_gem_object *msm_obj = to_msm_bo(obj); + GEM_WARN_ON(!msm_gem_is_locked(obj)); GEM_WARN_ON(!is_purgeable(msm_obj)); - GEM_WARN_ON(obj->import_attach); /* Get rid of any iommu mapping(s): */ put_iova_spaces(obj, true); msm_gem_vunmap(obj); + drm_vma_node_unmap(&obj->vma_node, dev->anon_inode->i_mapping); + put_pages(obj); put_iova_vmas(obj); @@ -744,7 +746,6 @@ void msm_gem_purge(struct drm_gem_object *obj) msm_obj->madv = __MSM_MADV_PURGED; update_inactive(msm_obj); - drm_vma_node_unmap(&obj->vma_node, dev->anon_inode->i_mapping); drm_gem_free_mmap_offset(obj); /* Our goal here is to return as much of the memory as -- 2.30.2 _______________________________________________ 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-05 17:42 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-05 17:45 [PATCH 0/8] drm/msm: Swappable GEM objects Rob Clark 2021-04-05 17:45 ` Rob Clark 2021-04-05 17:45 ` [PATCH 1/8] drm/msm: ratelimit GEM related WARN_ON()s Rob Clark 2021-04-05 17:45 ` Rob Clark 2021-04-05 17:45 ` [PATCH 2/8] drm/msm: Reorganize msm_gem_shrinker_scan() Rob Clark 2021-04-05 17:45 ` Rob Clark 2021-04-05 17:45 ` [PATCH 3/8] drm/msm: Clear msm_obj->sgt in put_pages() Rob Clark 2021-04-05 17:45 ` Rob Clark 2021-04-05 17:45 ` [PATCH 4/8] drm/msm: Split iova purge and close Rob Clark 2021-04-05 17:45 ` Rob Clark 2021-04-05 17:45 ` [PATCH 5/8] drm/msm: Add $debugfs/gem stats on resident objects Rob Clark 2021-04-05 17:45 ` Rob Clark 2021-04-05 17:45 ` [PATCH 6/8] drm/msm: Track potentially evictable objects Rob Clark 2021-04-05 17:45 ` Rob Clark 2021-04-05 17:45 ` Rob Clark [this message] 2021-04-05 17:45 ` [PATCH 7/8] drm/msm: Small msm_gem_purge() fix Rob Clark 2021-04-05 17:45 ` [PATCH 8/8] drm/msm: Support evicting GEM objects to swap Rob Clark 2021-04-05 17:45 ` Rob Clark 2021-04-08 11:15 ` [PATCH 0/8] drm/msm: Swappable GEM objects Daniel Vetter 2021-04-08 11:15 ` Daniel Vetter 2021-04-08 15:23 ` Rob Clark 2021-04-08 15:23 ` Rob Clark 2021-04-12 14:28 ` Daniel Vetter 2021-04-12 14:28 ` Daniel Vetter 2021-04-12 15:23 ` Rob Clark 2021-04-12 15:23 ` Rob Clark 2021-04-12 16:36 ` Daniel Vetter 2021-04-12 16:36 ` Daniel Vetter
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=20210405174532.1441497-8-robdclark@gmail.com \ --to=robdclark@gmail.com \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=jordan@cosmicpenguin.net \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=robdclark@chromium.org \ --cc=sean@poorly.run \ /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.