From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: Re: [PATCH v4 07/24] drm/i915: Create page table allocators Date: Mon, 23 Feb 2015 15:39:37 +0000 Message-ID: <54EB49B9.7070507@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421946106-7921-1-git-send-email-michel.thierry@intel.com> <1421946106-7921-8-git-send-email-michel.thierry@intel.com> <8761awzfv9.fsf@gaia.fi.intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0846371144==" Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 114E46E435 for ; Mon, 23 Feb 2015 07:39:45 -0800 (PST) In-Reply-To: <8761awzfv9.fsf@gaia.fi.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Mika Kuoppala , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org This is a cryptographically signed message in MIME format. --===============0846371144== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms010900030902040401010708" This is a cryptographically signed message in MIME format. --------------ms010900030902040401010708 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: quoted-printable On 2/20/2015 4:50 PM, Mika Kuoppala wrote: > Michel Thierry writes: > >> From: Ben Widawsky >> >> As we move toward dynamic page table allocation, it becomes much easie= r >> to manage our data structures if break do things less coarsely by >> breaking up all of our actions into individual tasks. This makes the >> code easier to write, read, and verify. >> >> Aside from the dissection of the allocation functions, the patch >> statically allocates the page table structures without a page director= y. >> This remains the same for all platforms, >> >> The patch itself should not have much functional difference. The prima= ry >> noticeable difference is the fact that page tables are no longer >> allocated, but rather statically declared as part of the page director= y. >> This has non-zero overhead, but things gain non-trivial complexity as = a >> result. >> >> This patch exists for a few reasons: >> 1. Splitting out the functions allows easily combining GEN6 and GEN8 >> code. Page tables have no difference based on GEN8. As we'll see in a >> future patch when we add the DMA mappings to the allocations, it >> requires only one small change to make work, and error handling should= >> just fall into place. >> >> 2. Unless we always want to allocate all page tables under a given PDE= , >> we'll have to eventually break this up into an array of pointers (or >> pointer to pointer). >> >> 3. Having the discrete functions is easier to review, and understand. >> All allocations and frees now take place in just a couple of locations= =2E >> Reviewing, and catching leaks should be easy. >> >> 4. Less important: the GFP flags are confined to one location, which >> makes playing around with such things trivial. >> >> v2: Updated commit message to explain why this patch exists >> >> v3: For lrc, s/pdp.page_directory[i].daddr/pdp.page_directory[i]->dadd= r/ >> >> v4: Renamed free_pt/pd_single functions to unmap_and_free_pt/pd (Danie= l) >> >> v5: Added additional safety checks in gen8 clear/free/unmap. >> >> Signed-off-by: Ben Widawsky >> Signed-off-by: Michel Thierry (v3, v4, v5) >> --- >> drivers/gpu/drm/i915/i915_gem_gtt.c | 251 ++++++++++++++++++++++++--= ---------- >> drivers/gpu/drm/i915/i915_gem_gtt.h | 4 +- >> drivers/gpu/drm/i915/intel_lrc.c | 16 +-- >> 3 files changed, 179 insertions(+), 92 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i91= 5/i915_gem_gtt.c >> index 0fe5c1e..85ea535 100644 >> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c >> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c >> @@ -275,6 +275,99 @@ static gen6_gtt_pte_t iris_pte_encode(dma_addr_t = addr, >> return pte; >> } >> =20 >> +static void unmap_and_free_pt(struct i915_page_table_entry *pt) >> +{ >> + if (WARN_ON(!pt->page)) >> + return; >> + __free_page(pt->page); >> + kfree(pt); >> +} >> + >> +static struct i915_page_table_entry *alloc_pt_single(void) >> +{ >> + struct i915_page_table_entry *pt; >> + >> + pt =3D kzalloc(sizeof(*pt), GFP_KERNEL); >> + if (!pt) >> + return ERR_PTR(-ENOMEM); >> + >> + pt->page =3D alloc_page(GFP_KERNEL | __GFP_ZERO); >> + if (!pt->page) { >> + kfree(pt); >> + return ERR_PTR(-ENOMEM); >> + } >> + >> + return pt; >> +} >> + >> +/** >> + * alloc_pt_range() - Allocate a multiple page tables >> + * @pd: The page directory which will have at least @count entries >> + * available to point to the allocated page tables. >> + * @pde: First page directory entry for which we are allocating. >> + * @count: Number of pages to allocate. >> + * >> + * Allocates multiple page table pages and sets the appropriate entri= es in the >> + * page table structure within the page directory. Function cleans up= after >> + * itself on any failures. >> + * >> + * Return: 0 if allocation succeeded. >> + */ >> +static int alloc_pt_range(struct i915_page_directory_entry *pd, uint1= 6_t pde, size_t count) >> +{ >> + int i, ret; >> + >> + /* 512 is the max page tables per page_directory on any platform. >> + * TODO: make WARN after patch series is done >> + */ >> + BUG_ON(pde + count > GEN6_PPGTT_PD_ENTRIES); >> + > WARN_ON in here and return -EINVAL. > > -Mika I applied the changes in v6. Thanks for the review. -Michel --------------ms010900030902040401010708 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIRkjCC BOswggPToAMCAQICEFLpAsoR6ESdlGU4L6MaMLswDQYJKoZIhvcNAQEFBQAwbzELMAkGA1UE BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9vdDAeFw0x MzAzMTkwMDAwMDBaFw0yMDA1MzAxMDQ4MzhaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJD QTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSsw KQYDVQQDEyJJbnRlbCBFeHRlcm5hbCBCYXNpYyBJc3N1aW5nIENBIDRBMIIBIjANBgkqhkiG 9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4LDMgJ3YSVX6A9sE+jjH3b+F3Xa86z3LLKu/6WvjIdvU bxnoz2qnvl9UKQI3sE1zURQxrfgvtP0bPgt1uDwAfLc6H5eqnyi+7FrPsTGCR4gwDmq1WkTQ gNDNXUgb71e9/6sfq+WfCDpi8ScaglyLCRp7ph/V60cbitBvnZFelKCDBh332S6KG3bAdnNG B/vk86bwDlY6omDs6/RsfNwzQVwo/M3oPrux6y6zyIoRulfkVENbM0/9RrzQOlyK4W5Vk4EE sfW2jlCV4W83QKqRccAKIUxw2q/HoHVPbbETrrLmE6RRZ/+eWlkGWl+mtx42HOgOmX0BRdTR o9vH7yeBowIDAQABo4IBdzCCAXMwHwYDVR0jBBgwFoAUrb2YejS0Jvf6xCZU7wO94CTLVBow HQYDVR0OBBYEFB5pKrTcKP5HGE4hCz+8rBEv8Jj1MA4GA1UdDwEB/wQEAwIBhjASBgNVHRMB Af8ECDAGAQH/AgEAMDYGA1UdJQQvMC0GCCsGAQUFBwMEBgorBgEEAYI3CgMEBgorBgEEAYI3 CgMMBgkrBgEEAYI3FQUwFwYDVR0gBBAwDjAMBgoqhkiG+E0BBQFpMEkGA1UdHwRCMEAwPqA8 oDqGOGh0dHA6Ly9jcmwudHJ1c3QtcHJvdmlkZXIuY29tL0FkZFRydXN0RXh0ZXJuYWxDQVJv b3QuY3JsMDoGCCsGAQUFBwEBBC4wLDAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AudHJ1c3Qt cHJvdmlkZXIuY29tMDUGA1UdHgQuMCygKjALgQlpbnRlbC5jb20wG6AZBgorBgEEAYI3FAID oAsMCWludGVsLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAKcLNo/2So1Jnoi8G7W5Q6FSPq1fm yKW3sSDf1amvyHkjEgd25n7MKRHGEmRxxoziPKpcmbfXYU+J0g560nCo5gPF78Wd7ZmzcmCc m1UFFfIxfw6QA19bRpTC8bMMaSSEl8y39Pgwa+HENmoPZsM63DdZ6ziDnPqcSbcfYs8qd/m5 d22rpXq5IGVUtX6LX7R/hSSw/3sfATnBLgiJtilVyY7OGGmYKCAS2I04itvSS1WtecXTt9OZ DyNbl7LtObBrgMLhZkpJW+pOR9f3h5VG2S5uKkA7Th9NC9EoScdwQCAIw+UWKbSQ0Isj2UFL 7fHKvmqWKVTL98sRzvI3seNC4DCCBiowggUSoAMCAQICChZNwGIAAAAAT+swDQYJKoZIhvcN AQEFBQAweTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRQwEgYDVQQHEwtTYW50YSBDbGFy YTEaMBgGA1UEChMRSW50ZWwgQ29ycG9yYXRpb24xKzApBgNVBAMTIkludGVsIEV4dGVybmFs IEJhc2ljIElzc3VpbmcgQ0EgNEEwHhcNMTQwNDI4MTIyMzQ3WhcNMTcwNDEyMTIyMzQ3WjBD MRgwFgYDVQQDEw9UaGllcnJ5LCBNaWNoZWwxJzAlBgkqhkiG9w0BCQEWGG1pY2hlbC50aGll cnJ5QGludGVsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKuvwFQqpb2d bD6xItCPUz74nZG7NRczIbUcL8TFaJXQPU+wJhpZBXYhTv+Qme/ZgAlIF/caUKQZ0uYGcYVY yf7dPp+lShl6+CYqz/NDvSb28jxvMgK/3MLQaVQP/82V7nYbe/2JPpAXJVDW/PQk6j+I/tgK zAIxbr1IZB91KecP3p3ksnKuohDkJA4FEK/f9LWo18lSa92yYDhJ6kEV90a2VPA4l6UYngGs OYhVAAsRoba+ROSiuVG5yDyrKwrAhAXdSbpIH1KO91MsCNlUPEtKdunnSL6eoFXfe9cA9+iZ qrvddLWCmDkjsqCsXrBJs87gE8lj733wU+rUiIPnq08CAwEAAaOCAugwggLkMAsGA1UdDwQE AwIHgDA8BgkrBgEEAYI3FQcELzAtBiUrBgEEAYI3FQiGw4x1hJnlUYP9gSiFjp9TgpHACWeB 3r05lfBDAgFkAgEIMB0GA1UdDgQWBBRFUVbAqJvKLf4iKYvg6Gx6sRNhZjAfBgNVHSMEGDAW gBQeaSq03Cj+RxhOIQs/vKwRL/CY9TCByQYDVR0fBIHBMIG+MIG7oIG4oIG1hlRodHRwOi8v d3d3LmludGVsLmNvbS9yZXBvc2l0b3J5L0NSTC9JbnRlbCUyMEV4dGVybmFsJTIwQmFzaWMl MjBJc3N1aW5nJTIwQ0ElMjA0QS5jcmyGXWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuaW50ZWwuY29t L3JlcG9zaXRvcnkvQ1JML0ludGVsJTIwRXh0ZXJuYWwlMjBCYXNpYyUyMElzc3VpbmclMjBD QSUyMDRBLmNybDCB7wYIKwYBBQUHAQEEgeIwgd8waQYIKwYBBQUHMAKGXWh0dHA6Ly93d3cu aW50ZWwuY29tL3JlcG9zaXRvcnkvY2VydGlmaWNhdGVzL0ludGVsJTIwRXh0ZXJuYWwlMjBC YXNpYyUyMElzc3VpbmclMjBDQSUyMDRBLmNydDByBggrBgEFBQcwAoZmaHR0cDovL2NlcnRp ZmljYXRlcy5pbnRlbC5jb20vcmVwb3NpdG9yeS9jZXJ0aWZpY2F0ZXMvSW50ZWwlMjBFeHRl cm5hbCUyMEJhc2ljJTIwSXNzdWluZyUyMENBJTIwNEEuY3J0MB8GA1UdJQQYMBYGCCsGAQUF BwMEBgorBgEEAYI3CgMMMCkGCSsGAQQBgjcVCgQcMBowCgYIKwYBBQUHAwQwDAYKKwYBBAGC NwoDDDBNBgNVHREERjBEoCgGCisGAQQBgjcUAgOgGgwYbWljaGVsLnRoaWVycnlAaW50ZWwu Y29tgRhtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20wDQYJKoZIhvcNAQEFBQADggEBAMYpBdhi VzoxuD58VMj2xc6Zsz7cg0Bpiji7sfDrhswhYwWogsBukXFwhukKmSqRIwvdSIoWfBDA4kIS qvgrMTYPtDl59awxdvn+jWx/P0APyC3tBg4z+1u0waM3smppq5/8f8Hew2S0IWP7tIJeQ+NY IE+iX5NclbuK4mFNJa74Rw7uaWBY+4zBNDaaaCgosmPfP5sBQnJzYL0jnNJTWXZP74JUPj/7 9SXg+C0dSORUqkkIsCy0jPGzT3ypk75JJ80znb0uoO4kgW2hO7dAAEe1GkONG4Ab1Bsk4zJl 1FaFkOf5aAepzm4rwnVtRMpaL8rjce3VOfpCvcIg+WDFXUAwggZxMIIFWaADAgECAgoWTN75 AAAAAE/qMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIG A1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSswKQYDVQQD EyJJbnRlbCBFeHRlcm5hbCBCYXNpYyBJc3N1aW5nIENBIDRBMB4XDTE0MDQyODEyMjI0OVoX DTE3MDQxMjEyMjI0OVowQzEYMBYGA1UEAxMPVGhpZXJyeSwgTWljaGVsMScwJQYJKoZIhvcN AQkBFhhtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw ggEKAoIBAQDECX/a/YWv0J8ABUwU61b73w7YCBE18G1fMdlsadEZUpg0BbpMOu0rx68iUq9x zU575ggweIlkt/qBGnGZvDVP8Iit5hFLmtlPnds0OelpjzE1o9nsgdrGEoT2BgjoTja+yLnv wDldEPqAszih/nCQcqtyH4vEmmnBxsUwMR7oD9U+U8sRLmpqbE1g0OGEh+X5zLrdNBEMZAGu iE2VeqvgS3poayRiJ2nc43ufMDtDlUnozq2H7+CRXU6yFsprpVTx29YHIrJLZxp+rBOlNQAy 8Ba5zyKq/lRRs79YLH8qzCdZJS7PfLpgBn8B8vl+Kp9iMMKdxhIMms46S+Grv+7FAgMBAAGj ggMvMIIDKzALBgNVHQ8EBAMCBDAwPQYJKwYBBAGCNxUHBDAwLgYmKwYBBAGCNxUIhsOMdYSZ 5VGD/YEohY6fU4KRwAlnhLnZQYeE/04CAWQCAQ0wRAYJKoZIhvcNAQkPBDcwNTAOBggqhkiG 9w0DAgICAIAwDgYIKoZIhvcNAwQCAgCAMAcGBSsOAwIHMAoGCCqGSIb3DQMHMB0GA1UdDgQW BBRBzUHVb22UOyhMUTmF2b9/Rh7RMTAfBgNVHSMEGDAWgBQeaSq03Cj+RxhOIQs/vKwRL/CY 9TCByQYDVR0fBIHBMIG+MIG7oIG4oIG1hlRodHRwOi8vd3d3LmludGVsLmNvbS9yZXBvc2l0 b3J5L0NSTC9JbnRlbCUyMEV4dGVybmFsJTIwQmFzaWMlMjBJc3N1aW5nJTIwQ0ElMjA0QS5j cmyGXWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuaW50ZWwuY29tL3JlcG9zaXRvcnkvQ1JML0ludGVs JTIwRXh0ZXJuYWwlMjBCYXNpYyUyMElzc3VpbmclMjBDQSUyMDRBLmNybDCB7wYIKwYBBQUH AQEEgeIwgd8waQYIKwYBBQUHMAKGXWh0dHA6Ly93d3cuaW50ZWwuY29tL3JlcG9zaXRvcnkv Y2VydGlmaWNhdGVzL0ludGVsJTIwRXh0ZXJuYWwlMjBCYXNpYyUyMElzc3VpbmclMjBDQSUy MDRBLmNydDByBggrBgEFBQcwAoZmaHR0cDovL2NlcnRpZmljYXRlcy5pbnRlbC5jb20vcmVw b3NpdG9yeS9jZXJ0aWZpY2F0ZXMvSW50ZWwlMjBFeHRlcm5hbCUyMEJhc2ljJTIwSXNzdWlu ZyUyMENBJTIwNEEuY3J0MB8GA1UdJQQYMBYGCCsGAQUFBwMEBgorBgEEAYI3CgMEMCkGCSsG AQQBgjcVCgQcMBowCgYIKwYBBQUHAwQwDAYKKwYBBAGCNwoDBDBNBgNVHREERjBEoCgGCisG AQQBgjcUAgOgGgwYbWljaGVsLnRoaWVycnlAaW50ZWwuY29tgRhtaWNoZWwudGhpZXJyeUBp bnRlbC5jb20wDQYJKoZIhvcNAQEFBQADggEBAGrtUHqoTWHttQxVewb/Uv6uL0YnPOVyFZs2 UKlnDV8zoUf4enk4FBIOKEqZIZ1Ektx5P1BaIHGfCVBP0Y4FIo2Twi4VHuWzkmECEKvjaur1 YTcuUHT3xQMsRS2CgUb2ttxGr381zG4CDKM9esAv0lDPzH+KgWhK1U+/gpq04AzLOQUHi5cP 1ZCINbo8AnunzRKhzegbQ6nr7frQlCUlrLMstzquhI0t8QjdFO3GKAjXF3wJf3aKnYNeFAWE xwLkdjM+TevhMpiNeBRJoEeUcGRRhe0YlhIoiryD5sZIeWGPBAhwOpZFGRdlXAcfbpwQ3K7a we2yqKeiU606TCcfppgxggO2MIIDsgIBATCBhzB5MQswCQYDVQQGEwJVUzELMAkGA1UECBMC Q0ExFDASBgNVBAcTC1NhbnRhIENsYXJhMRowGAYDVQQKExFJbnRlbCBDb3Jwb3JhdGlvbjEr MCkGA1UEAxMiSW50ZWwgRXh0ZXJuYWwgQmFzaWMgSXNzdWluZyBDQSA0QQIKFk3AYgAAAABP 6zAJBgUrDgMCGgUAoIICAzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJ BTEPFw0xNTAyMjMxNTM5MzdaMCMGCSqGSIb3DQEJBDEWBBQXIkUQ7Iv+DRsLj7M4s4ZVvRTD kTBsBgkqhkiG9w0BCQ8xXzBdMAsGCWCGSAFlAwQBKjALBglghkgBZQMEAQIwCgYIKoZIhvcN AwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMC AgEoMIGYBgkrBgEEAYI3EAQxgYowgYcweTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRQw EgYDVQQHEwtTYW50YSBDbGFyYTEaMBgGA1UEChMRSW50ZWwgQ29ycG9yYXRpb24xKzApBgNV BAMTIkludGVsIEV4dGVybmFsIEJhc2ljIElzc3VpbmcgQ0EgNEECChZM3vkAAAAAT+owgZoG CyqGSIb3DQEJEAILMYGKoIGHMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UE BxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSswKQYDVQQDEyJJ bnRlbCBFeHRlcm5hbCBCYXNpYyBJc3N1aW5nIENBIDRBAgoWTN75AAAAAE/qMA0GCSqGSIb3 DQEBAQUABIIBAARr9+/pGeKMiARVDY/TvYM2woOVXbGsTQUSa6TNU3Pm+XDyhiCEd1R6D2rm BlOr23pl6R6HAZ/H+o7ajhSdEhkzLgCLmXppWPXoIrlp2lGZp5BNZvnzpQcy2mouW9qA6vE2 UvfcVg71E/d7V7Qunx0rzKY8hwsn+yvvARXtMPWsqDlhWG2Wv6cbKUsutjNulu1hSE9IKDNJ 42FPPiU3V1gPJMkhEuG6FJkQNnQzmJdO2iXMEmmfhgA5CGRnUjyBm1Z3Gh0oP7NY5cfad6H7 +OnDRnrZcprRlFVrbMuCHol3RxSAfyPGXZLK+sp/ycqJZiBK0bVXIdo7oyKOzzgl3dMAAAAA AAA= --------------ms010900030902040401010708-- --===============0846371144== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK --===============0846371144==--