Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
From:   Michael Tirado <mtirado418@gmail.com>
Date:   Sun, 21 Oct 2018 16:25:00 +0000
Message-ID: <CAMkWEXP4Mm5x9rdrKn9xRNVm7vxqoL62ftxb+UcJFAiJ+U9X3A@mail.gmail.com>
Subject: 
To:     Airlied@linux.ie, dri-devel@lists.freedesktop.org,
        LKML <linux-kernel@vger.kernel.org>, kraxel@redhat.com,
        alexander.deucher@amd.com, christian.koenig@amd.com,
        David1.zhou@amd.com, Hongbo.He@amd.com
Cc:     seanpaul@chromium.org, Gustavo@padovan.org,
        maarten.lankhorst@linux.intel.com
Content-Type: multipart/mixed; boundary="000000000000176d2a0578c34cfc"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--000000000000176d2a0578c34cfc
Content-Type: text/plain; charset="UTF-8"

Mapping a drm "dumb" buffer fails on 32-bit system (i686) from what
appears to be a truncated memory address that has been copied
throughout several files. The bug manifests as an -EINVAL when calling
mmap with the offset gathered from DRM_IOCTL_MODE_MAP_DUMB <--
DRM_IOCTL_MODE_ADDFB <-- DRM_IOCTL_MODE_CREATE_DUMB.  I can provide
test code if needed.

The following patch will apply to 4.18 though I've only been able to
test through qemu bochs driver and nouveau. Intel driver worked
without any issues.  I'm not sure if everyone is going to want to
share a constant, and the whitespace is screwed up from gmail's awful
javascript client, so let me know if I should resend this with any
specific changes.  I have also attached the file with preserved
whitespace.

--- linux-4.13.8/drivers/gpu/drm/bochs/bochs.h  2017-10-18
07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/bochs/bochs.h 2017-10-20
14:34:50.308633773 +0000
@@ -115,8 +115,6 @@
        return container_of(gem, struct bochs_bo, gem);
 }

-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
 static inline u64 bochs_bo_mmap_offset(struct bochs_bo *bo)
 {
        return drm_vma_node_offset_addr(&bo->bo.vma_node);
--- linux-4.13.8/drivers/gpu/drm/nouveau/nouveau_drv.h  2017-10-18
07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/nouveau/nouveau_drv.h
2017-10-20 14:34:51.581633751 +0000
@@ -57,8 +57,6 @@
 struct nouveau_channel;
 struct platform_device;

-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
 #include "nouveau_fence.h"
 #include "nouveau_bios.h"

--- linux-4.13.8/drivers/gpu/drm/ast/ast_drv.h  2017-10-18
07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/ast/ast_drv.h 2017-10-20
14:34:50.289633773 +0000
@@ -356,8 +356,6 @@
                                uint32_t handle,
                                uint64_t *offset);

-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
 int ast_mm_init(struct ast_private *ast);
 void ast_mm_fini(struct ast_private *ast);

--- linux-4.13.8/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
2017-10-18 07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
 2017-10-20 14:34:50.644633767 +0000
@@ -21,8 +21,6 @@

 #include "hibmc_drm_drv.h"

-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
 static inline struct hibmc_drm_private *
 hibmc_bdev(struct ttm_bo_device *bd)
 {
--- linux-4.13.8/drivers/gpu/drm/virtio/virtgpu_ttm.c   2017-10-18
07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/virtio/virtgpu_ttm.c
2017-10-20 14:34:53.055633725 +0000
@@ -37,8 +37,6 @@

 #include <linux/delay.h>

-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
 static struct
 virtio_gpu_device *virtio_gpu_get_vgdev(struct ttm_bo_device *bdev)
 {
--- linux-4.13.8/drivers/gpu/drm/qxl/qxl_drv.h  2017-10-18
07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/qxl/qxl_drv.h 2017-10-20
14:34:52.072633742 +0000
@@ -88,9 +88,6 @@
                }                                               \
        } while (0)

-#define DRM_FILE_OFFSET 0x100000000ULL
-#define DRM_FILE_PAGE_OFFSET (DRM_FILE_OFFSET >> PAGE_SHIFT)
-
 #define QXL_INTERRUPT_MASK (\
        QXL_INTERRUPT_DISPLAY |\
        QXL_INTERRUPT_CURSOR |\
--- linux-4.13.8/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
2017-10-18 07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
 2017-10-20 14:34:43.264633895 +0000
@@ -48,3 +48,1 @@

-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
--- linux-4.13.8/drivers/gpu/drm/mgag200/mgag200_drv.h  2017-10-18
07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/mgag200/mgag200_drv.h
2017-10-20 14:34:51.404633754 +0000
@@ -276,7 +276,6 @@
 struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev);
 void mgag200_i2c_destroy(struct mga_i2c_chan *i2c);

-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
 void mgag200_ttm_placement(struct mgag200_bo *bo, int domain);

 static inline int mgag200_bo_reserve(struct mgag200_bo *bo, bool no_wait)
--- linux-4.13.8/drivers/gpu/drm/radeon/radeon_ttm.c    2017-10-18
07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/radeon/radeon_ttm.c
2017-10-20 14:34:52.588633733 +0000
@@ -45,8 +45,6 @@
 #include "radeon_reg.h"
 #include "radeon.h"

-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
 static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
 static void radeon_ttm_debugfs_fini(struct radeon_device *rdev);

--- linux-4.13.8/drivers/gpu/drm/cirrus/cirrus_drv.h    2017-10-18
07:38:33.000000000 +0000
+++ linux-4.13.8-modified/drivers/gpu/drm/cirrus/cirrus_drv.h
2017-10-20 14:34:50.333633772 +0000
@@ -178,7 +178,6 @@


 #define to_cirrus_obj(x) container_of(x, struct cirrus_gem_object, base)
-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)

                                /* cirrus_mode.c */
 void cirrus_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
--- linux-4.13.8/include/drm/drmP.h     2017-10-18 07:38:33.000000000 +0000
+++ linux-4.13.8-modified/include/drm/drmP.h    2017-10-20
14:35:31.300633060 +0000
@@ -503,4 +503,10 @@
 /* helper for handling conditionals in various for_each macros */
 #define for_each_if(condition) if (!(condition)) {} else

+#if BITS_PER_LONG == 64
+#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
+#else
+#define DRM_FILE_PAGE_OFFSET (0x10000000ULL >> PAGE_SHIFT)
+#endif
+
 #endif

--000000000000176d2a0578c34cfc
Content-Type: application/octet-stream; name="drm_file_offset.patch"
Content-Disposition: attachment; filename="drm_file_offset.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_jnj1vfbu0>
X-Attachment-Id: f_jnj1vfbu0

LS0tIGxpbnV4LTQuMTMuOC9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHMuaAkyMDE3LTEwLTE4
IDA3OjM4OjMzLjAwMDAwMDAwMCArMDAwMAorKysgbGludXgtNC4xMy44LW1vZGlmaWVkL2RyaXZl
cnMvZ3B1L2RybS9ib2Nocy9ib2Nocy5oCTIwMTctMTAtMjAgMTQ6MzQ6NTAuMzA4NjMzNzczICsw
MDAwCkBAIC0xMTUsOCArMTE1LDYgQEAKIAlyZXR1cm4gY29udGFpbmVyX29mKGdlbSwgc3RydWN0
IGJvY2hzX2JvLCBnZW0pOwogfQogCi0jZGVmaW5lIERSTV9GSUxFX1BBR0VfT0ZGU0VUICgweDEw
MDAwMDAwMFVMTCA+PiBQQUdFX1NISUZUKQotCiBzdGF0aWMgaW5saW5lIHU2NCBib2Noc19ib19t
bWFwX29mZnNldChzdHJ1Y3QgYm9jaHNfYm8gKmJvKQogewogCXJldHVybiBkcm1fdm1hX25vZGVf
b2Zmc2V0X2FkZHIoJmJvLT5iby52bWFfbm9kZSk7Ci0tLSBsaW51eC00LjEzLjgvZHJpdmVycy9n
cHUvZHJtL25vdXZlYXUvbm91dmVhdV9kcnYuaAkyMDE3LTEwLTE4IDA3OjM4OjMzLjAwMDAwMDAw
MCArMDAwMAorKysgbGludXgtNC4xMy44LW1vZGlmaWVkL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1
L25vdXZlYXVfZHJ2LmgJMjAxNy0xMC0yMCAxNDozNDo1MS41ODE2MzM3NTEgKzAwMDAKQEAgLTU3
LDggKzU3LDYgQEAKIHN0cnVjdCBub3V2ZWF1X2NoYW5uZWw7CiBzdHJ1Y3QgcGxhdGZvcm1fZGV2
aWNlOwogCi0jZGVmaW5lIERSTV9GSUxFX1BBR0VfT0ZGU0VUICgweDEwMDAwMDAwMFVMTCA+PiBQ
QUdFX1NISUZUKQotCiAjaW5jbHVkZSAibm91dmVhdV9mZW5jZS5oIgogI2luY2x1ZGUgIm5vdXZl
YXVfYmlvcy5oIgogCi0tLSBsaW51eC00LjEzLjgvZHJpdmVycy9ncHUvZHJtL2FzdC9hc3RfZHJ2
LmgJMjAxNy0xMC0xOCAwNzozODozMy4wMDAwMDAwMDAgKzAwMDAKKysrIGxpbnV4LTQuMTMuOC1t
b2RpZmllZC9kcml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9kcnYuaAkyMDE3LTEwLTIwIDE0OjM0OjUw
LjI4OTYzMzc3MyArMDAwMApAQCAtMzU2LDggKzM1Niw2IEBACiAJCQkJdWludDMyX3QgaGFuZGxl
LAogCQkJCXVpbnQ2NF90ICpvZmZzZXQpOwogCi0jZGVmaW5lIERSTV9GSUxFX1BBR0VfT0ZGU0VU
ICgweDEwMDAwMDAwMFVMTCA+PiBQQUdFX1NISUZUKQotCiBpbnQgYXN0X21tX2luaXQoc3RydWN0
IGFzdF9wcml2YXRlICphc3QpOwogdm9pZCBhc3RfbW1fZmluaShzdHJ1Y3QgYXN0X3ByaXZhdGUg
KmFzdCk7CiAKLS0tIGxpbnV4LTQuMTMuOC9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2hpYm1j
L2hpYm1jX3R0bS5jCTIwMTctMTAtMTggMDc6Mzg6MzMuMDAwMDAwMDAwICswMDAwCisrKyBsaW51
eC00LjEzLjgtbW9kaWZpZWQvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9oaWJtYy9oaWJtY190
dG0uYwkyMDE3LTEwLTIwIDE0OjM0OjUwLjY0NDYzMzc2NyArMDAwMApAQCAtMjEsOCArMjEsNiBA
QAogCiAjaW5jbHVkZSAiaGlibWNfZHJtX2Rydi5oIgogCi0jZGVmaW5lIERSTV9GSUxFX1BBR0Vf
T0ZGU0VUICgweDEwMDAwMDAwMFVMTCA+PiBQQUdFX1NISUZUKQotCiBzdGF0aWMgaW5saW5lIHN0
cnVjdCBoaWJtY19kcm1fcHJpdmF0ZSAqCiBoaWJtY19iZGV2KHN0cnVjdCB0dG1fYm9fZGV2aWNl
ICpiZCkKIHsKLS0tIGxpbnV4LTQuMTMuOC9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVf
dHRtLmMJMjAxNy0xMC0xOCAwNzozODozMy4wMDAwMDAwMDAgKzAwMDAKKysrIGxpbnV4LTQuMTMu
OC1tb2RpZmllZC9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfdHRtLmMJMjAxNy0xMC0y
MCAxNDozNDo1My4wNTU2MzM3MjUgKzAwMDAKQEAgLTM3LDggKzM3LDYgQEAKIAogI2luY2x1ZGUg
PGxpbnV4L2RlbGF5Lmg+CiAKLSNkZWZpbmUgRFJNX0ZJTEVfUEFHRV9PRkZTRVQgKDB4MTAwMDAw
MDAwVUxMID4+IFBBR0VfU0hJRlQpCi0KIHN0YXRpYyBzdHJ1Y3QKIHZpcnRpb19ncHVfZGV2aWNl
ICp2aXJ0aW9fZ3B1X2dldF92Z2RldihzdHJ1Y3QgdHRtX2JvX2RldmljZSAqYmRldikKIHsKLS0t
IGxpbnV4LTQuMTMuOC9kcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF9kcnYuaAkyMDE3LTEwLTE4IDA3
OjM4OjMzLjAwMDAwMDAwMCArMDAwMAorKysgbGludXgtNC4xMy44LW1vZGlmaWVkL2RyaXZlcnMv
Z3B1L2RybS9xeGwvcXhsX2Rydi5oCTIwMTctMTAtMjAgMTQ6MzQ6NTIuMDcyNjMzNzQyICswMDAw
CkBAIC04OCw5ICs4OCw2IEBACiAJCX0JCQkJCQlcCiAJfSB3aGlsZSAoMCkKIAotI2RlZmluZSBE
Uk1fRklMRV9PRkZTRVQgMHgxMDAwMDAwMDBVTEwKLSNkZWZpbmUgRFJNX0ZJTEVfUEFHRV9PRkZT
RVQgKERSTV9GSUxFX09GRlNFVCA+PiBQQUdFX1NISUZUKQotCiAjZGVmaW5lIFFYTF9JTlRFUlJV
UFRfTUFTSyAoXAogCVFYTF9JTlRFUlJVUFRfRElTUExBWSB8XAogCVFYTF9JTlRFUlJVUFRfQ1VS
U09SIHxcCi0tLSBsaW51eC00LjEzLjgvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1
X3R0bS5jCTIwMTctMTAtMTggMDc6Mzg6MzMuMDAwMDAwMDAwICswMDAwCisrKyBsaW51eC00LjEz
LjgtbW9kaWZpZWQvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCTIwMTct
MTAtMjAgMTQ6MzQ6NDMuMjY0NjMzODk1ICswMDAwCkBAIC00OCwzICs0OCwxIEBACiAKLSNkZWZp
bmUgRFJNX0ZJTEVfUEFHRV9PRkZTRVQgKDB4MTAwMDAwMDAwVUxMID4+IFBBR0VfU0hJRlQpCi0K
LS0tIGxpbnV4LTQuMTMuOC9kcml2ZXJzL2dwdS9kcm0vbWdhZzIwMC9tZ2FnMjAwX2Rydi5oCTIw
MTctMTAtMTggMDc6Mzg6MzMuMDAwMDAwMDAwICswMDAwCisrKyBsaW51eC00LjEzLjgtbW9kaWZp
ZWQvZHJpdmVycy9ncHUvZHJtL21nYWcyMDAvbWdhZzIwMF9kcnYuaAkyMDE3LTEwLTIwIDE0OjM0
OjUxLjQwNDYzMzc1NCArMDAwMApAQCAtMjc2LDcgKzI3Niw2IEBACiBzdHJ1Y3QgbWdhX2kyY19j
aGFuICptZ2FnMjAwX2kyY19jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIG1n
YWcyMDBfaTJjX2Rlc3Ryb3koc3RydWN0IG1nYV9pMmNfY2hhbiAqaTJjKTsKIAotI2RlZmluZSBE
Uk1fRklMRV9QQUdFX09GRlNFVCAoMHgxMDAwMDAwMDBVTEwgPj4gUEFHRV9TSElGVCkKIHZvaWQg
bWdhZzIwMF90dG1fcGxhY2VtZW50KHN0cnVjdCBtZ2FnMjAwX2JvICpibywgaW50IGRvbWFpbik7
CiAKIHN0YXRpYyBpbmxpbmUgaW50IG1nYWcyMDBfYm9fcmVzZXJ2ZShzdHJ1Y3QgbWdhZzIwMF9i
byAqYm8sIGJvb2wgbm9fd2FpdCkKLS0tIGxpbnV4LTQuMTMuOC9kcml2ZXJzL2dwdS9kcm0vcmFk
ZW9uL3JhZGVvbl90dG0uYwkyMDE3LTEwLTE4IDA3OjM4OjMzLjAwMDAwMDAwMCArMDAwMAorKysg
bGludXgtNC4xMy44LW1vZGlmaWVkL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3R0bS5j
CTIwMTctMTAtMjAgMTQ6MzQ6NTIuNTg4NjMzNzMzICswMDAwCkBAIC00NSw4ICs0NSw2IEBACiAj
aW5jbHVkZSAicmFkZW9uX3JlZy5oIgogI2luY2x1ZGUgInJhZGVvbi5oIgogCi0jZGVmaW5lIERS
TV9GSUxFX1BBR0VfT0ZGU0VUICgweDEwMDAwMDAwMFVMTCA+PiBQQUdFX1NISUZUKQotCiBzdGF0
aWMgaW50IHJhZGVvbl90dG1fZGVidWdmc19pbml0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2
KTsKIHN0YXRpYyB2b2lkIHJhZGVvbl90dG1fZGVidWdmc19maW5pKHN0cnVjdCByYWRlb25fZGV2
aWNlICpyZGV2KTsKIAotLS0gbGludXgtNC4xMy44L2RyaXZlcnMvZ3B1L2RybS9jaXJydXMvY2ly
cnVzX2Rydi5oCTIwMTctMTAtMTggMDc6Mzg6MzMuMDAwMDAwMDAwICswMDAwCisrKyBsaW51eC00
LjEzLjgtbW9kaWZpZWQvZHJpdmVycy9ncHUvZHJtL2NpcnJ1cy9jaXJydXNfZHJ2LmgJMjAxNy0x
MC0yMCAxNDozNDo1MC4zMzM2MzM3NzIgKzAwMDAKQEAgLTE3OCw3ICsxNzgsNiBAQAogCiAKICNk
ZWZpbmUgdG9fY2lycnVzX29iaih4KSBjb250YWluZXJfb2YoeCwgc3RydWN0IGNpcnJ1c19nZW1f
b2JqZWN0LCBiYXNlKQotI2RlZmluZSBEUk1fRklMRV9QQUdFX09GRlNFVCAoMHgxMDAwMDAwMDBV
TEwgPj4gUEFHRV9TSElGVCkKIAogCQkJCS8qIGNpcnJ1c19tb2RlLmMgKi8KIHZvaWQgY2lycnVz
X2NydGNfZmJfZ2FtbWFfc2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgdTE2IHJlZCwgdTE2IGdy
ZWVuLAotLS0gbGludXgtNC4xMy44L2luY2x1ZGUvZHJtL2RybVAuaAkyMDE3LTEwLTE4IDA3OjM4
OjMzLjAwMDAwMDAwMCArMDAwMAorKysgbGludXgtNC4xMy44LW1vZGlmaWVkL2luY2x1ZGUvZHJt
L2RybVAuaAkyMDE3LTEwLTIwIDE0OjM1OjMxLjMwMDYzMzA2MCArMDAwMApAQCAtNTAzLDQgKzUw
MywxMCBAQAogLyogaGVscGVyIGZvciBoYW5kbGluZyBjb25kaXRpb25hbHMgaW4gdmFyaW91cyBm
b3JfZWFjaCBtYWNyb3MgKi8KICNkZWZpbmUgZm9yX2VhY2hfaWYoY29uZGl0aW9uKSBpZiAoIShj
b25kaXRpb24pKSB7fSBlbHNlCiAKKyNpZiBCSVRTX1BFUl9MT05HID09IDY0CisjZGVmaW5lIERS
TV9GSUxFX1BBR0VfT0ZGU0VUICgweDEwMDAwMDAwMFVMTCA+PiBQQUdFX1NISUZUKQorI2Vsc2UK
KyNkZWZpbmUgRFJNX0ZJTEVfUEFHRV9PRkZTRVQgKDB4MTAwMDAwMDBVTEwgPj4gUEFHRV9TSElG
VCkKKyNlbmRpZgorCiAjZW5kaWYK
--000000000000176d2a0578c34cfc--