From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753949AbcKHRTD (ORCPT ); Tue, 8 Nov 2016 12:19:03 -0500 Received: from mail-db5eur01on0046.outbound.protection.outlook.com ([104.47.2.46]:11219 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751618AbcKHRTA (ORCPT ); Tue, 8 Nov 2016 12:19:00 -0500 Authentication-Results: spf=pass (sender IP is 217.140.96.140) smtp.mailfrom=arm.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=arm.com; X-IncomingTopHeaderMarker: OriginalChecksum:;UpperCasedChecksum:;SizeAsReceived:938;Count:13 From: Huang Shijie To: CC: , , , , , , , , Huang Shijie Subject: [PATCH v2 2/2] arm64: hugetlb: fix the wrong address for several functions Date: Tue, 8 Nov 2016 13:44:39 +0800 Message-ID: <1478583879-14654-3-git-send-email-shijie.huang@arm.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1478583879-14654-1-git-send-email-shijie.huang@arm.com> References: <1478583879-14654-1-git-send-email-shijie.huang@arm.com> MIME-Version: 1.0 Content-Type: text/plain X-IncomingHeaderCount: 13 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:217.140.96.140;IPV:CAL;SCL:-1;CTRY:GB;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(438002)(199003)(189002)(6666003)(6636002)(110136003)(2950100002)(47776003)(189998001)(5003940100001)(48376002)(626004)(8936002)(5660300001)(50466002)(8676002)(50226002)(2906002)(586003)(305945005)(4326007)(36756003)(7846002)(106466001)(229853001)(246002)(2351001)(50986999)(356003)(104016004)(76176999)(575784001)(77096005)(26826002)(92566002)(33646002)(86362001)(87936001);DIR:OUT;SFP:1101;SCL:1;SRVR:DB5PR08MB0565;H:nebula.arm.com;FPR:;SPF:Pass;PTR:fw-tnat.cambridge.arm.com;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;AM1FFO11FD029;1:AjP4RyJiwGLAGfMxhkyCd9Pq5fuRPSsGstkIcNvF33VGfspLI0dv7vy2glMkuXKuMJg1CNr8H5Tkm386keg/+db4gI97mf6o6kng9KqiP6/d7H382jBXOVt0fafqvEFPsLwfF6jR9n3KhzDDKXqcPANyXVJRKo3OBKRb6DGznrC59qYMm3Cp7AcTc5hI1IopfusBlA2dkcYvEEo46dlKvawDUq/WLrSTcGI+H2eoXD/hOYTYz7PEucHUn2vh+lBxV4GoC811+U1JPXAGUzvVbky7RDKkHLuKrL641IxXVLMl9QAL7GP2+f/qs70LV1Erz9yflncvAMQBioTzBgMrm7BcEm35qyDD1FhMBBFNOdIXs0j+WqYUrDRPhUsH7iOCmxfJFfUfZZeHSbG0HaNe/1RIMxJL8KuHD17i6sOQXeEnXDV26E6Wm8LIigJFepSOsT7W7VmFyCo/gkiiV1mzEVm3OuksfjS8fEA0MTHYMvqr8DgNpctCUEXZtYUUunyTUOJAbk5tFJZA7IV/O0LJOw7u0z6h9leaiM/7EIq71l8xmfjCKoh6whWfIgpW+/68OnPIrj4QKTGk2IQeGpcOxVneK0o5Um4lB+glhpJwjrVYTG4NyUbBhU69ySrlDqnJ+WtYETJCKAHX/UnbBBrlyw== X-MS-Office365-Filtering-Correlation-Id: 8bc4899a-e2d2-4e10-7bfe-08d4079a9980 X-Microsoft-Exchange-Diagnostics: 1;DB5PR08MB0565;2:WPjHYl+G9wdi1CKypYfWqgvvBpK/gQQCvI0/fH0iTjMSEgonAm/dZsRRDqIEmEOs2s2PXSfXXrzA3chrpRchoHVs6l6J0KL7yc3XBqyqFWC/SOtdH6gclIKxy/vX276fD2TXxIXn1sm7ijaNAqz3JGmnuRtPWIagHmMYyzo8I7/YsY+QWg19GYAH96rjtjlM9D98KWzaMh/17DYtGRqhng==;3:Se0bSqyz7rg7Ol5oa95GRam6YDnu9ysKviy38jW4kl2NFAZGX/um1v2VAJeYDbv2E4wGAswRNr0vVJiWvSSsvnQzmzyA/al8DxTh7dqVjsPBIBhgEcxMKQ/rUThjCnr9tPrubRNdnlBNuN9wjFeGQSU9B1kyGG3auWu4pcH21LBLQWIB0USXuTIwwIrK4PT9YZJd9YJ7oU6ia6F1DNVAtDc8nrw9F//oAZ3BtQ3ArWhbS9YtlZ/dCpDmZNOqSaD5T8h7ne/9ryIvjPBmfSEjNfsDR//tIyVdT7txD/qW/EU= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(8251501002);SRVR:DB5PR08MB0565; X-Microsoft-Exchange-Diagnostics: 1;DB5PR08MB0565;25:63S2GvNZMeRQbC7GkDLJm2tWLJXEollbmqpYMrPfvTDIw47o6d/sOQw2wKY+Xs+ZTDWM5wCc/i1vU+K4RIv2yFDBtnJ6E67I0EMFXE94XDnISZSsmbOjRCw3Pmo/3C4QfnxkFA9GQO2msYeLJLhCQjHxrZOevvLMfUnwJT00qqqoFiZwm9rRYmeoK/0LhkFOv3a2JTqdr3yfUzYH3htaAp9TQMGrAVgq9e/bpKxQLtWad2qZJBF4tV7WeNAOxl2I2F8q939VrGCUBiJQwCiWe0FmIefeXKgDXGPi2y7+o6Ft5rYTZ7jTwWM22KRUhviNi7PCIYs2B4uq15HklPdxM8422MfOVBXgzc3IB5yZdE2knBAMaWOU0vzj9X6YDJ4CqQcFBXuv98tN5up6q4t7i/KGdneFAhffdR3XSnp/Ebv9OGTy+vo/zJcp1QH5MaotKnYV0gPuXiqJNoK6axyJL99ItZAX8wnf2hTtbuR8cQ24UsLj3vdksoHKM0P0bcTAYc5/rdAJl6PFwajxmTM6e/EU2lBL/h3C3ek8JlGK59C6XKKZu4Fy5hxHnQZYjAOleGM9QK24bolOgdhRh+e6BtaU639ysFYS08YeLF3naEv/O4mQ77ulGsG3cvPThwipmd/gDNQePQGrVbY7lcFftYFR9L6HLHA/4bHXw0rLjlGLaRFwRrRbkwXPSCg/3rWgxeynUD/JK8urZEmkOZ8cGd5DXTUYkskm/pjACE0gGHhIYkOUBpJR1YJyUwHUIw7K X-Microsoft-Exchange-Diagnostics: 1;DB5PR08MB0565;31:6zi5RGChJQ3DVgCX0JDkaboWAHBDNL4lmOek0YRja2A6qBu99vLCaH9GXGQX/wDJfaDFqutv52p7qpRaDeDkswFzwEp444klL3b2o3rX29PcKIEcHZLdeKOCgzVx2O5i0XNLxiCgPLG8MKPZHDhem8M4QLOW1pGVPJm8M03AzpErd77tTu+fQcZ1XDApeNlFYxsBusHNV5lJJXqQAKkhJECQbz0l78DyN0LHK4+mvrOGur764e4pYOgq+z+MHvKC;20:T5i6xzpQyl5HtjP5mMDmhcBLs7zlr+/eDCUAGBNSKUbTXs+PwjZc2YLlM5um4CS3odnZo132isFuiSns40IYBWp5oc6YEnrMfMDeBf/1YqzzNVH8zI8UuaJCxg4BhOVPeyf8FaJmO7y4c1j1jsgGat76aHSETTvaDd04oLQaLRiBcdTl5vnN3JWohNtZ37tyZbUVwQ5E66+DwR5olmIBTJQ8uK/5/l01ieTmNGJ3+h8QuqcuKa5JyVkH0+HZ+/1R NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(5005006)(13024025)(13023025)(13020025)(13013025)(8121501046)(10201501046)(3002001)(6055026);SRVR:DB5PR08MB0565;BCL:0;PCL:0;RULEID:;SRVR:DB5PR08MB0565; X-Microsoft-Exchange-Diagnostics: 1;DB5PR08MB0565;4:oI7Ju/qdW/jCbxBiF5hvl8tliDRfjwgoKUKAr2z+TwKim6XwvgJqEiphfTZoivC6J8BRuwHm9GyV7HZlI2m2FM+4r0Q0k7sbf8PG8KagtVL1QTWNmOXmjMMKP+YTnOly0Snffp4n69WsM8l6vcsSDSB9al6Rk/b7pFwvFA9jGr0PUVH2bPAf+7FRPXOBq6WhXOjeGayVDLcA/SCSX5x+eGPfSQyFQD2uj5A9VMqeU6VGjlI3uDZ5tB6ScIT40xIB7C4qvL005dyrtnQB3JADbT0XXdgCrTcGOM0o5maEEsVol2S1zbXikh+TOXJoKGl3ZwpH4hHCjrDj73bRe+puHWVkQlim5xhpUSMLqBjih3zAwfc8dprOFv1fhEQ7KYZFCM36UDwwaFjoDNZM7yn6HM9ApUylIHamC5PjLghJzB0RgdR0Yk+KgmUd4dV15thNh5nFFgh5GwfuSltDVyI6cAlnCkE5p+u2Ye0KkD6x1eg9tYolzhs/4LGPKltbzmovjmDiLnEy3J1iyNhBrKYQp0apZsP/sicTHYoeLmFLOOk= X-Forefront-PRVS: 01208B1E18 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DB5PR08MB0565;23:xZ+gbeDRVfRbYyGSUOydZM73Y6v9KKUEZydwLoYmN?= =?us-ascii?Q?ZndtY2U60xpsFaTMutwOc6GGQwdTGbEVHMWOFCj9JiLeBJ7PlE5yXibZJkFd?= =?us-ascii?Q?V8fEJmVFJ/XaWz18PorXVwd7nQuhGDBEQM7mLiaOR0YOLhbJG7Mi9vpRxJC+?= =?us-ascii?Q?kTti3jChnuRnzHfjmSMAbSpgPl+RdQAGSRSME3367o6TH3+REyCQTg8w2/8m?= =?us-ascii?Q?hqlFb0xQYMPqRUDqFpwDYh1Nwk25pmDYzhhrBK8PnLWdR7+Fhx8h7fg2VSbT?= =?us-ascii?Q?kO0wtpRnydDCInVTYDukDImms31Cy7XNFMxaZ1g0IPUVQ5xzZIVDUM5BxShf?= =?us-ascii?Q?hje7XWYm3OZ3ayQ0QwVy0uxsaYsrFtPs3ztgHyuQrdFs5zoFekSAoHcl8QVS?= =?us-ascii?Q?qOwaOs4wQDLQaU7zl+TdS5xJ4uQcROyVMwxKvexNvpMXHHGcdcmEp9yEKas6?= =?us-ascii?Q?7H45E0TyAAIw+4QcTgNILPuRmLwEEKrVm9HD2CREWqDJt2X17tuVcETfgOKg?= =?us-ascii?Q?t4+AhuObtzUtFi6OFhq/nH9Jj2tPvDEgROqwQbsBpYrX1xeqIqyM1dgkj/uo?= =?us-ascii?Q?QTuJ7z/84m4jEVuF3UB+T2fnEuW3wujBPeKDGP9AlztC4R6usi4jRXZBfSoB?= =?us-ascii?Q?+Od1EBtJ27lIKuVlyt81G5lo21FaUZrnKYiby7vPAh+426QgrADdAGBcaL3v?= =?us-ascii?Q?sg33OwM0yIDFHf9Iymx+eg7I/8ytEM15Kfz1+oStxGXrW8/TLfADvCYP0szO?= =?us-ascii?Q?jlHd/kvk75Gz6ZLGMNmabbv/NKIAWuUpWjB48jJ9AawVdIrqG3yS8PDx8hX1?= =?us-ascii?Q?tOfqslrkJV1q494fyoeUFU/iBrBHopgpdUIaIfp2K8YEgmAsBdqeE5IK8jAE?= =?us-ascii?Q?6neNOF7zqA5cozkapCr3r77J4myhNQFdUcB0oOO/vAPxtcw1E+veIQ9METZQ?= =?us-ascii?Q?X2jrp+FT1qoQSMOdJ8lLh9HhDMgWS26VTf9NHQzBk2epBFzciLar9Fg4GXa0?= =?us-ascii?Q?O6HAwiUdrnsN5wGsgAOCUGk?= X-Microsoft-Exchange-Diagnostics: 1;DB5PR08MB0565;6:VuSywIggf0Ek3yR+6GbZGv+hzcH344cyOClHcU8tgJlR8aMnQKkupggHUMwQu498cA/yNY2duZFXMnEIfkK+HivbZJodbBUcVTfl+yPxe81YI/qKLFvxvp8fQzcdKTzvjaskbXWI7yrUXDNxg+KSvMjArZmb+zNu+tXueEL6CJYu7M5Zm9U1YcFutrPBZwkiXtIGq6y+o9Ssmdf6GpDt4/I60fBnTyrh9xtF9EwAcvAwmCZ0Js6aE8PpJY/69sy5rNmGwSjZZd67yDhuYoCXbfjZ5wswHsD721c9s5mLTFHAaZJ11ZdJOgLmV74YdyPhOGPuuI16/kK8H8g/P55vcA==;5:MF8RKDm4H+dEOjQ+jBndvC7sqC1YxXyJ8y/JUNvyNPCV2q+hV0irqDnX7+++oyZeT9FudRiOuxn+4MrfydLlNzrBHzpUTQq8++wXGFaHMMaHAmfVkWUikt1F2s9G3eOmTX/KXnsb0lcpoG+iqpKimw==;24:e9UWgiOyMRNgv8KOY5sRqC+gEb1mhX3Xlck/3AU2kGgiPZ580Wa5X4BvWaRqg9tW1bwoOSG44ECeckfX2aZvuGCfTovArMNkmtH3ViRFsXQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB5PR08MB0565;7:QGpouyP/2TrtQLyo/spaoBAaaPkAiK2bZf9/7WXOyu64RTDjIoQlGISNaz/mQlq/CxekonmNXwR1pHNlBnoTSPU5Jg2FeExSuBsVVUQ2fAG+cIzIkmxUmoc7sd67rozxbYNlsjoRTqFW/qx8YE1Ll/XBsJglnDCNOsHDQZ7yKvI9UclSvrGzLTinKj6APqaxMx1JaLTc1E23RRvCszg4gq2SgtClu49ioK1a0X0z2+4yR2K2DJSo/VXq6/lrByaIMOif54FMqzD1unjpNBrlq/rLRaMbDUs6xhGB5QFA5f5lZ48c47+B4hzbyT9XT7JWSnS8Vt6pPh07cm/9FL2sdTsl2PiAQj+qCnbOBX4IrD4= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2016 05:46:34.5434 (UTC) X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[217.140.96.140];Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR08MB0565 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The libhugetlbfs meets several failures since the following functions do not use the correct address: huge_ptep_get_and_clear() huge_ptep_set_access_flags() huge_ptep_set_wrprotect() huge_ptep_clear_flush() This patch fixes the wrong address for them. Signed-off-by: Huang Shijie --- arch/arm64/mm/hugetlbpage.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index b0d3f8b..fd96ba7 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -200,7 +200,7 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, ncontig = find_num_contig(mm, addr, cpte, *cpte, &pgsize); /* save the 1st pte to return */ pte = ptep_get_and_clear(mm, addr, cpte); - for (i = 1; i < ncontig; ++i) { + for (i = 1, addr += pgsize; i < ncontig; ++i, addr += pgsize) { /* * If HW_AFDBM is enabled, then the HW could * turn on the dirty bit for any of the page @@ -238,7 +238,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, pfn = pte_pfn(*cpte); ncontig = find_num_contig(vma->vm_mm, addr, cpte, *cpte, &pgsize); - for (i = 0; i < ncontig; ++i, ++cpte) { + for (i = 0; i < ncontig; ++i, ++cpte, addr += pgsize) { changed = ptep_set_access_flags(vma, addr, cpte, pfn_pte(pfn, hugeprot), @@ -261,7 +261,7 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm, cpte = huge_pte_offset(mm, addr); ncontig = find_num_contig(mm, addr, cpte, *cpte, &pgsize); - for (i = 0; i < ncontig; ++i, ++cpte) + for (i = 0; i < ncontig; ++i, ++cpte, addr += pgsize) ptep_set_wrprotect(mm, addr, cpte); } else { ptep_set_wrprotect(mm, addr, ptep); @@ -279,7 +279,7 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma, cpte = huge_pte_offset(vma->vm_mm, addr); ncontig = find_num_contig(vma->vm_mm, addr, cpte, *cpte, &pgsize); - for (i = 0; i < ncontig; ++i, ++cpte) + for (i = 0; i < ncontig; ++i, ++cpte, addr += pgsize) ptep_clear_flush(vma, addr, cpte); } else { ptep_clear_flush(vma, addr, ptep); -- 2.5.5