From patchwork Wed Jan 11 06:02:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 9509299 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D394160231 for ; Wed, 11 Jan 2017 06:02:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2F1728570 for ; Wed, 11 Jan 2017 06:02:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B416F285D0; Wed, 11 Jan 2017 06:02:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 42A7D28570 for ; Wed, 11 Jan 2017 06:02:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cRBzf-0001j0-HE; Wed, 11 Jan 2017 06:02:43 +0000 Received: from mail-ve1eur01on0050.outbound.protection.outlook.com ([104.47.1.50] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cRBzb-0001Mq-0e for linux-arm-kernel@lists.infradead.org; Wed, 11 Jan 2017 06:02:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=29cbs4zylt0fWkls285XEXd0nOghu/s9TEZ9bIC9llg=; b=di0FDIAPLQqcA/nj9sH9W5SlE2gFjZXHm5E2w+TRReElEHpjCFycePmH2Zysa5UEkJoBndDWCT/uKy90YqPmlkA1herOvdZdtMrS+ODp2FgbXkF1rqbeOnpIws25f/3t38rT/uVtw3ZwDDqYfTxFo6ipnWlTrpVDDG2sxJ6mO8I= Received: from DB3PR08CA0032.eurprd08.prod.outlook.com (10.161.51.170) by HE1PR08MB1017.eurprd08.prod.outlook.com (10.166.125.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.829.7; Wed, 11 Jan 2017 06:02:15 +0000 Received: from DB3FFO11FD027.protection.gbl (2a01:111:f400:7e04::157) by DB3PR08CA0032.outlook.office365.com (2a01:111:e400:503c::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12 via Frontend Transport; Wed, 11 Jan 2017 06:02:15 +0000 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; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 217.140.96.140 as permitted sender) receiver=protection.outlook.com; client-ip=217.140.96.140; helo=nebula.arm.com; Received: from nebula.arm.com (217.140.96.140) by DB3FFO11FD027.mail.protection.outlook.com (10.47.217.58) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.803.8 via Frontend Transport; Wed, 11 Jan 2017 06:02:14 +0000 Received: from sha-win-210.shanghai.arm.com (10.1.2.79) by mail.arm.com (10.1.106.66) with Microsoft SMTP Server id 14.3.294.0; Wed, 11 Jan 2017 06:02:07 +0000 From: Huang Shijie To: Subject: [PATCH v2] arm64: hugetlb: fix the wrong return value for huge_ptep_set_access_flags Date: Wed, 11 Jan 2017 14:02:00 +0800 Message-ID: <1484114520-6168-1-git-send-email-shijie.huang@arm.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 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)(39840400002)(39860400002)(39450400003)(39410400002)(39850400002)(2980300002)(438002)(199003)(189002)(5003940100001)(189998001)(2351001)(26826002)(356003)(2906002)(305945005)(50466002)(104016004)(92566002)(86362001)(575784001)(246002)(626004)(110136003)(38730400001)(5660300001)(8676002)(6666003)(48376002)(77096006)(8936002)(6636002)(50986999)(36756003)(106466001)(50226002)(33646002)(47776003)(54906002)(4326007)(14583001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR08MB1017; H:nebula.arm.com; FPR:; SPF:Pass; PTR:fw-tnat.cambridge.arm.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB3FFO11FD027; 1:IPRHuJtNMsGBv/yyNCaJQ/6gibsT6I6DbXhBVYPZqfLwXbFuVoxzcon/FekcFn5BfYpIlANm/Z6UyrHB3awEE95fc5I8rf35kpwSsVCzAu5YL0n+VVtwTwlRo9HxgSNK+kRT+Fl/CqpaW8IkyA/JNHkzLYFyVvyJZpW7quXgrUU2QSuMX8ENlxDDKOx1CW/7YyzB/S6SPtpTsMu0QkPtKw8e318P0vm5L8JdRrUOfo1BSgJvRT2O1+U2H3Qnu+czazrjL1Yywujx4VOcpTQ54qTjeqRvCytqhTdppWJUf8z1zZvxPPaLbLGU8lpmV6mw6R56ssV9kdr63sg38MplOk60kOe0dP/3zSFaS0CcpJxcnTWZmaI1Xzfiq2qbJB1+wU55QboYdDQ0tAG0HlHEp5Y4CmDakjQKeM1l6rJz14baWoP0g8cGrDfB0+uiiGdw+LynKaHezgLJ9hl5kYe3JSaoaQATT5Ra1xVWX8yDQtrxmycxxK0nu1sA9/0QA/UeOM6a5L4JA5GW1lDwbUBGq832O6jJVt25y7Mxk73VTuIDd/vWLNWM0shM7Kw9gaU8f8oToAIEewiXK3lc8KuDGQ== X-MS-Office365-Filtering-Correlation-Id: a54dce10-f94a-45a5-d32e-08d439e76459 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002); SRVR:HE1PR08MB1017; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 3:FcOg0scRJIBQWRnIXxSbm+obONMWoPx7FF3vuKsW3MTUL0kgncIML1MzDkF3hHs1Lxumu/x2LYhtP9EeCl0oQt1Vx76dknkwnQnNbXjz3+T3p3w8gS2gGDVi5GCAsINttDuGbqRM7Kp/gdW13bwoNEklVJzLtpdwurubwEHOUMyytO3bf6N6mtsWP3P2/YvPqjkecgzR28GYeXOOL17ZP+cWOj7sgNE/PIIn9cTRPIYGiuUhchbAHmfxpCK3uGlltmWxhFViKxaU7PvwbTSB3fZsn7ieebx0YpjdLJkD69/kbNMNtcUS9ngEbABVao0RUDI3T2WS2dS3p3aicPpSzVAvYT/a1BeK/AxVfdA5OnyMstAdVEZhGhyCKLlrfZNguVyn1lcqvSD3ABhNqacxKA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 25:oeYbwzY7xeg0mrvhhGPMNOma3ltce/1VBF41Rw09Ss9aS6r+auA7icO9MMZdQ1182DeakWM8AlrrwFl+ZJzAnL1bnxURt8Q2uvF1+8L1L0AlFzOfV6FW1Y+7Ef9IGRd4NuShjo/IumxNVngQdy3oHMGeGymLuVughQUeF2+4oHnigFZCMmpKXAUNi+8oxJbZNZNu9oMviE/C0Uaxa3WpLizfj06giPIorRh+wQyXtBuzLwGvRKfbrd4qAa4gl/Th6tnaPQtEU4VgK4ZcciPR9/NhVS0msJn8eLLNU3DOc1EKnqRhkMj1KLwIZWmzx06Q1fdUyb+8quGjc+EzUHe30tMIfV2v1b/Me/fKJRfuTCJR21dc07eQHHiLJO1zl1ipZZYUG4iztsgPhxUYogU9aQEHz+VZwQej0PKUSbSjRkey4W7GZNsgKh1G+5/Zi1j2ZJOO12TYmibp6ApSUg+jQjgID7UoqopEQIZ79UjwyzWu/RwpacOSFgAjR687DY/1qu1EHR9H/Vy2gXeud92mFDSSSbj9r4OnEUZW30DMKZRNU8dqjzly/wpLExsUo/1Dj9pwjTxfLQ1fsEPMYlCQWSEpRKFAVmCSA238MBG9Fnbw0Vv8QxLzTsq3nE9O19gV3CpqFXamFzVqipP06AY+BQaXQKiEHzokpIw+war6efbWR/iLxzdEhpTrCooj+ypFzRVBZ0/YyzlYI0tmoYSK4+GbJ/sFuqXxgs+Qy7JCA0bdZQ14FNfA4adrON6bK1NeXn2EVVkzoBscXroAgKsuow== X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 31:T0mnHdrkGZg49LDXt/7fEyqcUrl/HG4+m8ArbD6iZarXGX4ShidTJUrn5UOZeE3akV4SV9vb1IDmgc1CHY/A/LKl/jFuw5feZNNzxY1/5MFv+V7OpCv/gEOtG2wpK7+hOEy1K2ywkI/0sipwqjxjIQzdX641ynqW23n9rnxRTUM05205V9ToCnNiUePgBsMVFWdtq8ZWDRWWf6Y9z7zfi9XirE9v25e7mruTtDfVjJkStPF/DAR+bA5Zi26Z3tbnIfZYSY6Sq92y3aJfDBFdcQ==; 20:pG5+diChjP0KuHHhtd4gcHZjlynjz+yGWXKy5FDCutERvseLONNrObkqQdZbNDFu2UtpUml0l+gxsSqf7RYJF5twdPh887Ml3yluz3PKoSDum9JLM2PjkowoR3aeor/+7629M0f2W8rvlchK1ZCEWazVMTmv0xpR5bJKqnicxewCbYQnsDgFxjxfRIkwplo9iK7sK6LajSUfe86CopL0aenVtagEIRKlE2PQo0RvM9PSMVHzE20zIdB7JyofDJBr NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917)(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13013025)(13023025)(13024025)(13020025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(20161123558021)(20161123555025)(20161123562025)(20161123564025)(6072148); SRVR:HE1PR08MB1017; BCL:0; PCL:0; RULEID:; SRVR:HE1PR08MB1017; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 4:RwaciJ2Fa8nVN3VaZeFE30e+F2OjYSBCQXJxdOUC8KfQaj3dnlwFNNhRulNqjQbJA65O4/dUbNx8ARE1HqB0OVKTDg6L5HJUeZznEP67R0CUw/wgVKQ+MbyW9qzwT929arLsHdogx11WhovKOhtGDZ9YUKLEcCw/sKzXwk1PaNY63M4W0DRQEixJpL6vFxOuzECgjvX/gQ9Xs56x9t9Cej9WCJ5WZUrEbQzClN+iO3uSIwk/8fG+hJ84MKyywQA562IUBJIZ0P7gCfni3DKX+5ZYFt2SXK3RjRytrW8eROxp6vaVqgcdszywCCXLK3Y0QF9M9iusIV/Hu5rqTuAW+msN9eQV66WkNbJoVadzMYy9iCzJCdIkk50BLibktLgdjqsahHN5yRPaYVgoWaOzWFsfi5rmHcC4S1zCWS8rKaT5Zpi3swrWuSvsmetTrnhwgOCA6BdMuvUpo3vB9K4PpWLz3yyNhw3uwDEDgDqfYMqk408yupZpboUd6jqTrzEu8c8tznsrI+7Z8jLKdfA9oSSXoJ8p2fLaqm2kAqa+i4TOEP0mcbBeV43xhfzv9SSHCOFvInUjLSnrL4GOzqaS8wmnfyGaqRRk1E1QYLiC71c3LrrO/tPiFG/jvJ/PHlIozka8ff3Up/YNx7nbejvTchUqU8bWNgVvzV1O+nm1y18djDnCJ8WAsRXoEVu2dfJuQYGeAhD4lt4XA+keITnavVfEbbJi0pN9bmq/euSZcqQ0YJuW7OY8dAfF7OTtmcmEXhR34sDrAP6Tu6n1y72K9Q== X-Forefront-PRVS: 01842C458A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR08MB1017; 23:bmISBCzvEs8HSXZw7WNd8ZL8+2Ksrp8r0+9ZD57jS?= =?us-ascii?Q?KIFkx9J2CdsysYhHiTxbu/Y7cAWjG5wCamu91bhLA03bXMKJSgbfmkZn91ha?= =?us-ascii?Q?tOpL6cnOl+wEwBlMntVbeh7vfm/C0ZJmdjiw5ixdVMDoQdrOq6QCvsu/GJsj?= =?us-ascii?Q?AOPx+lKFMbea55g/Q6+ccrEWV7GOLDP9smI2LUqEqXdZ7m/7Q8IYImccmif6?= =?us-ascii?Q?oGqaUDN3RYadkuSOnaJ80yyMY06Cb04UL7G3RZN55bjls/y1XnZCGFDlN6zW?= =?us-ascii?Q?fntcAtoRvX/XLWKVDSzyY9Ai5CKUStWnT8vUCFE833CKWi/fpk3OfCAapA5O?= =?us-ascii?Q?DW8D3FIZTLXnGC7BhYJX66q+Ikpuq9dCjX7rSeosQw5oB6m083dL2NAiCoSA?= =?us-ascii?Q?/Blz9gv1uQSuqI0sGKzQ6OwlXkfmC3S2cBmcfhQOA6Ua5/ogLym7mrj8HAZZ?= =?us-ascii?Q?fV+JmjhCm1M0t07qRmxoDNMrRyM6a5L04rg/7LVjxk2xG1lCncAvKYMQHXLq?= =?us-ascii?Q?4lT4oFXVecg2wfwQ8Xht8wIHi0jUOGcHnK75TH9mgrVcOv45z45ZWzG+pwY8?= =?us-ascii?Q?YZHWY4hXFwMhOuXlfxzZWkjwdwaoSUlNgq7NAW08T9oU+FE57p4Z0gdcxImy?= =?us-ascii?Q?MNodu+2TrVryYvO+iH+n5Uo0UoqmFTzsbj9YD6HXJNKpMmmabnw9f16tHyK6?= =?us-ascii?Q?bQwVWfCu5+wmR32YqWO2Y9zXeD9I/DwLUv/dTnseuaBJRHWiYAfm947bt2nN?= =?us-ascii?Q?Stv+bfcY9adtwtqiBGx6mOy5FWR7du/h6RVJPf1+DRIy5lLuAXO6F5csaWwa?= =?us-ascii?Q?FMDOhi1unSq7leLMSy2P84S1Y8XusCaijVr/YPtZqXJ3gMHB07s2xlOPYtLP?= =?us-ascii?Q?yhkgEFRYK7bI57P1XdbgrqX7UcrwrjjYkGHydIAJqlRUDqEHdwlkg2VNphCI?= =?us-ascii?Q?kXZrwyl4YHOg8LYyKYYXi1lkKiuuwjlywy6EyvLe4qNCwE9j68UIVGaLQurA?= =?us-ascii?Q?Kgd95jfYy5EKFWdr+uji5NyUA7IAEAw+HzPQ/I+vXwVImFxNXZW8hvN19gpy?= =?us-ascii?Q?LPHm5U=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 6:et2BflHOr15RZeD1a5gFznccf5fIWvz97kJWAeMsnQvZFqOour5j6Ci+WWxO3dTgl++xVvu5c/FOYWCHnEd/VHTxaKgPZpZ9SddNU32iLHFGzK8t8zjzJ8SITT4i8GS94zHYcPalIpd4uEiDbJuGRErJYvdMbbHauhv7FeZOn/3OS2VU8HYdE3kFGK/oK+u0N5rFlVeQFBr2Bwhj9y/YiuRXa5oTo68h6KRGbOWXmhjd8qMcuatctwDqbuq7CIuQ852+Dj/KLo/QCMUamn0HcS87wIQzz0MuDt0zn3ED9a2tFrZDEUWJtq4i2KY8x3rrphC9q25X6idEbH5m4+/Xgf6V7fU38WGw37aXAF3HBR4Q0Q5rrXJTz1BOPsk5gjbqsATteZpFVYglST9cFmL4q4Zggs/IB7Hc4v7fEkQwj9Awt8ZZoppuE5Yu4yGH8iMxvAAOF0vNErjJeRNjiqeEjQ==; 5:fiIcNxtg3r3TxeoIwKecSmdUWfEE9FGjtuXK0T4RhFNtaVoHqraFfDY60LpJuNIczxA4NK8ojHwDrMR2a54pwURg3dW6W5K1jG35gBaMSOqVVPVz1JmdC0YgyQmkHT297KFtZnlRyCo5STrLHCRu/g==; 24:+wFHzGqbMZJOvzthSBJW267dZkLS0t9+v1dstS5JotdB6fxMLXblS4lMEFvWJ8QU4RGtfj62/gOO+/XRRIQ0p6T8/qXKFlobpHo9u7IcfHM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 7:OjEQ8xDjgRAe612GysVT7WvvlETfaOyYxi5cqGTtFvWr7vWI4Yaxf0t5mPve72vx3UK8xSIcRyBqK65SoUrmWRRsZYnEgC54sBRZ9mjZGethu0vr0+dN2QowxRI5PRLJ4TTR44+BLf3jNscmwrqtQPfBfjE/EKzXs3DE/eanDrxSkw6Q3KPTTFmTxidRc8ZucDWuL99lVuDiBa/cHnOXu9BiBF3F+OviGyAspAV2PkzN+xrO7jJ0JYKsYkDU67qg814ZNxvqRNsablT+YRkUOgbH4Ri9hpC5vnVxVAvObehl4rv0UfQeTvXcPg48R7Ljrqek4xv/1gX/Fx1iAgLs52Edliu5md47NFNm8YOXaJ2XCKLqlfEib/dUahjCtJdSDIVYind53kMmA7judTS8p7UEL7yV2jYSJGk6gy+Mp4IU2VywgDZyxG/JULPPBjuP1F5JRXwOsFO8jO72eNi0fg== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2017 06:02:14.7579 (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: HE1PR08MB1017 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170110_220239_431447_6D87DF62 X-CRM114-Status: UNSURE ( 8.33 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: steve.capper@arm.com, will.deacon@arm.com, stable@vger.kernel.org, kaly.xin@arm.com, Huang Shijie , nd@arm.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In current code, the @changed always returns the last one's status for the huge page with the contiguous bit set. This is really not what we want. Even one of the PTEs is changed, we should tell it to the caller. This patch fixes this issue. Fixes: 66b3923a1a0f ("arm64: hugetlb: add support for PTE contiguous bit") Cc: stable@vger.kernel.org Signed-off-by: Huang Shijie --- arch/arm64/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 964b7549af5c..e25584d72396 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -239,7 +239,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, ncontig = find_num_contig(vma->vm_mm, addr, cpte, *cpte, &pgsize); for (i = 0; i < ncontig; ++i, ++cpte, addr += pgsize) { - changed = ptep_set_access_flags(vma, addr, cpte, + changed |= ptep_set_access_flags(vma, addr, cpte, pfn_pte(pfn, hugeprot), dirty);