Mesa (staging/22.1): intel: protect against empty invalidate ranges

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: a15b4f3bdaa24bedaec3f148552669ee9250b060
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a15b4f3bdaa24bedaec3f148552669ee9250b060

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Tue Jul 12 11:20:10 2022 +0300

intel: protect against empty invalidate ranges

It's legal for an application to call vkInvalidateMappedMemoryRanges()
/ vkFlushMappedMemoryRanges() with zero sized ranges.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: b91971c240d3 ("anv: use the right helper to invalidate memory")
Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6852
Reviewed-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17481>
(cherry picked from commit 1aeb11cde1bc610cb23343ab507b1bf3b197b1b4)

---

 .pick_status.json                | 2 +-
 src/intel/common/intel_clflush.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index eea9c182f6a..47b218c4ce4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6286,7 +6286,7 @@
         "description": "intel: protect against empty invalidate ranges",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b91971c240d3b8391f2105337579a0e14116769c"
     },
diff --git a/src/intel/common/intel_clflush.h b/src/intel/common/intel_clflush.h
index 7c6aaf8f2df..e1c3728015f 100644
--- a/src/intel/common/intel_clflush.h
+++ b/src/intel/common/intel_clflush.h
@@ -49,6 +49,9 @@ intel_flush_range(void *start, size_t size)
 static inline void
 intel_invalidate_range(void *start, size_t size)
 {
+   if (size == 0)
+      return;
+
    intel_clflush_range(start, size);
 
    /* Modern Atom CPUs (Baytrail+) have issues with clflush serialization,