From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756030AbcAZGds (ORCPT ); Tue, 26 Jan 2016 01:33:48 -0500 Received: from mail-db3on0085.outbound.protection.outlook.com ([157.55.234.85]:16974 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754830AbcAZGdp (ORCPT ); Tue, 26 Jan 2016 01:33:45 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=mika.penttila@nextfour.com; From: To: CC: , , =?UTF-8?q?Mika=20Penttil=C3=A4?= Subject: [PATCH 1/2 v2] arm, arm64: change_memory_common with numpages == 0 should be no-op. Date: Tue, 26 Jan 2016 08:33:08 +0200 Message-ID: <1453789989-13260-2-git-send-email-mika.penttila@nextfour.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453789989-13260-1-git-send-email-mika.penttila@nextfour.com> References: <1453789989-13260-1-git-send-email-mika.penttila@nextfour.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [194.157.170.34] X-ClientProxiedBy: AM3PR07CA0046.eurprd07.prod.outlook.com (10.141.45.174) To DB5PR07MB0903.eurprd07.prod.outlook.com (25.161.196.19) X-Microsoft-Exchange-Diagnostics: 1;DB5PR07MB0903;2:zWdtLQuRF3quzAvRXtpjTPQoS4NVmI37qvMIxPZ+LfklTGi3ZlK3C+5yBk/XZkhoZC5aVDxjwyezdE3CV9EuJVGepTrXw+qRydyIS1pjpkOBvgTtGaxZH7v8/swMclRwLEs0XsgaA2byl+3zANiBCQ==;3:220l/yjKD4lIhVu2Xkoe0rDU1SrfP9070F3Fcp3jEsyWlB+6ddPqOZ2Fmg/Ur/Oz9+gGsnstxM8EiSUNEXSHPftFg8rUMzHiaVyJqt6oBhZOgpmpAYDVBFdkOUk53Ulf;25:0q9U41fUFHTU+8HI1Lb8QXBBkO4Oc4Hky1J7w1gpNWhWF5iNl+IPghEPtk0UZWGSH8J7D1KLKfyv8L0wjwkSs0Jf7acFVhTVkkO62yJEAWp37j5xYGw+G9t9pRV/0SfSBrOlX3tCZ0kBVp0BHtWeTz2HPTD9LFQ0KQrm8iVVIGqUad4KpZqUtA053NdsUqKR4Owu5u1sPRioXDP5KX907HD0YEfYIBCsyGxU5TdyRu/XxP4Vhe7m59JkRthtiRv4;4:/pa8BbDUL8fwRqejv8jAOM2Hdu4MEtoDfJHd2bCFl0ixp3mgPo4eV89Z/ePhmptE81rt/jTF1C8VMGB/wxChhTGE0sivotfTok3ytgYP5V3MkNxiuGRq61pb9TS1NnjCTOgUTbOR2LgL5JYp7zfsMvZqk7mIWMQ+o3JNJ+/kuX1Bw3wzfe78tv+kbQSLT6IBav7p6GjtE/DRZcsSNrHeFLFUsqklO/G//8QEsFZceD83V4f5gt6DdYWCls+m4klEdMLBitfMSbZJJKzQw1eMB14X1B+zlml9+DUJQvjAx0luVujXNeuQ3b1pRWo1IxEcU187I8s6Yc15D4xywCHh8JAgjZd4Cnlznl1SnGlJduVGXshzKvXX27SwM5ANdIdLXi0X9YB1velC7eJgI5011w== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB5PR07MB0903; X-MS-Office365-Filtering-Correlation-Id: 8a74f063-e98c-4758-43a5-08d3261aa2b2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(123027)(601004)(2401047)(8121501046)(5005006)(520078)(3002001)(10201501046);SRVR:DB5PR07MB0903;BCL:0;PCL:0;RULEID:;SRVR:DB5PR07MB0903; X-Forefront-PRVS: 08331F819E X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(189002)(199003)(4326007)(2876002)(86152002)(53416004)(122386002)(2906002)(50466002)(42186005)(19580405001)(86362001)(23676002)(92566002)(69596002)(40100003)(33646002)(36756003)(87976001)(2870700001)(5820100001)(5004730100002)(50226001)(110136002)(77096005)(1096002)(2351001)(107886002)(229853001)(5001960100002)(2950100001)(3846002)(4001430100002)(66066001)(81156007)(19580395003)(101416001)(5008740100001)(6116002)(76176999)(97736004)(47776003)(106356001)(105586002)(50986999)(586003)(189998001);DIR:OUT;SFP:1101;SCL:1;SRVR:DB5PR07MB0903;H:mjp-ThinkCentre-M92p.nextfour.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjVQUjA3TUIwOTAzOzIzOk5iQUQ4eS9lRzhrNVJqbkh0b2prN0RHTGJG?= =?utf-8?B?WVpxR2FaRGduWHJCcWlKRmRZejE3aHlUVWZkUGJ3OEFJRmh5Q1RmKzdhS0VC?= =?utf-8?B?QTJPZzN4Q0ZTdFh4VlovY253MHQ1Rnp3RTgvN1BoM1BXUmZOckFld3pxQ0pw?= =?utf-8?B?V2puRVNiMjg1dVJQZlFuc3l3cThCbU00QnFaSmdNN0R5cUFJUW9BWnp3MTNH?= =?utf-8?B?dVFnQWp6ZllFc2JxNmlwNTJxVXBYd2RsSkUvaEdGWDZwbzNRTkdsV3EyVThD?= =?utf-8?B?Mmk3cVprTStGZVBVVXlVMGcyRXo3cEw1VFM5cFFjMDB2SmtocGVaWWFSRzJj?= =?utf-8?B?Sng2dk1NZXVHNHN0NHltYzZpaFlydE9LNW9UV1hORWlPOVd1dVlYTmZvbjds?= =?utf-8?B?UFdKVnY4MFdsdnk5eVR6N3k1YnU1SEhpS2c3a1pqNTBwWUlMSCs1OW1jMHFt?= =?utf-8?B?U0N1RXlmRG9yMUJKb2VXTmZxVFRmRlg1cjlJaURaR3Yzck5IZ3lnbVkya1NI?= =?utf-8?B?UHhDaUFidXg1aDdwMVZjZkdaYXZEcHNUVWVvQ3A4bUtaaU95L0Q1QzA0VGYw?= =?utf-8?B?NmR0TVJLSG5wdmZoS2JCbVorWXJwTkNvRUU2YlhSSmVPS1AzSkFYYzlPRFdo?= =?utf-8?B?S2JLL2d6SDI4anZOZ2J6VGR6bTFlRVp4YktORks2K3dyLzJCa1IvcWFTdDdI?= =?utf-8?B?TVhJRC82TnVPaWYzMXlwd0ZxRExSYmJRNnNLZjVrc2ZKRlpxQU1wdW5ZcS9V?= =?utf-8?B?M3hXNFJDbWJmeGxoakF3cVFPYVRQdFRiblJ4cGpMUEtpQ002dWoxUll5SlB0?= =?utf-8?B?ZDM2eDMxdTg4RzcvWStYTmQxNDh3WDg0NzluaGl2c0VtNUZ4OXVacElwN1ZO?= =?utf-8?B?RlpEQmJia2daNSsyY25JUVlCQW11Q0hNWVZIblhIVWFYRmtqWHFEUVk1aHNu?= =?utf-8?B?dU5VV1VwS2FuU2lPR3JiMVU5ME5WTlpqbVU1Q1BRSHQ3a3RhSU5LSmNQb0F3?= =?utf-8?B?ZTcwM2JHWjNhajY4TEhKYXUvZ2MzcTcvV2ZPdldyV24rOGdDNFVSU2gvc1pK?= =?utf-8?B?RVROdnlkMGxCeTk1eWkwczFkcXo0MjRGTDJIM3pXZGRVOTRYODlQMlA5UklT?= =?utf-8?B?RG9DK2xybXNtWWJ0NFVJeEhHYklmSG5NS3g3NWVNZ3diMVA3QlA3dkJ2bWxt?= =?utf-8?B?RlNaeUdvSEIvZSsxM3pleUcwVjR6TjNScEE2cGZtS051MHRmdEdXQkFjS1Jy?= =?utf-8?B?RGZkclNDazFXYkNKVUdvU2tmRVFkemJCT1RBU0txMEpGTGZoSGh0WnJQa1ZW?= =?utf-8?B?R01saHpRUDZHaFE0SzZMTkxrSW9rdEg1eHFXcmVRYkRVT2NXUVdac1F0YWlM?= =?utf-8?B?dU5vODNFSTRmc1krbUxVNktrcEEyblZBSVRYN0dDTnZsQnE5S2JGRDMyUWtx?= =?utf-8?B?VzRtT2VKRHZydnVPaGpSa1ZIV2ZYYU84bzlYNGxQRWdJazVNM2VhVGJOTzkx?= =?utf-8?B?RU1aWWFYeUlCa3dEc0lQS2ZHbjd6NFpCakxOcXdacis2REFzb1h0dkRVaEFw?= =?utf-8?B?SmhJa21rTnFMOGVsTExocUNWZGkwRGtyRDlHYVFmY2JwTVBDMXZvcUE2T2dx?= =?utf-8?B?eEF6ZHJOcjRvZWIvaGhRejU1Njh5dmlVTGh4OFlQMndQM3JtazMwNU93PT0=?= X-Microsoft-Exchange-Diagnostics: 1;DB5PR07MB0903;5:TKj3wBHKJm710wvYpMrNyYyLT/IOzb6x03Svb8dmek7TitIrE8FBO7DHnzBqX2VBoo01zyrcVQ4ItsZ6l32nxp1NQLp97EonA7dOHifCdYXixj1DubuPJriFgHGXyDDiOMYZgwT5jcW0ewKevDkLdg==;24:NkJPbTlXPl2/T28XRURwWovQQ5W6CrnHXriBciwDWVQwLetlXcJhGKmiWCMZDjEMZEkJ4JV6ipZqRqH/jupBn4yTn04SJ57f4Qp3LVqaGQU= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nextfour.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2016 06:33:42.6999 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR07MB0903 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mika Penttilä This makes the caller set_memory_xx() consistent with x86. arm64 part is rebased on 4.5.0-rc1 with Ard's patch lkml.kernel.org/g/<1453125665-26627-1-git-send-email-ard.biesheuvel@linaro.org> applied. Signed-off-by: Mika Penttilä mika.penttila@nextfour.com Reviewed-by: Laura Abbott Acked-by: David Rientjes --- arch/arm/mm/pageattr.c | 3 +++ arch/arm64/mm/pageattr.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c index cf30daf..d19b1ad 100644 --- a/arch/arm/mm/pageattr.c +++ b/arch/arm/mm/pageattr.c @@ -49,6 +49,9 @@ static int change_memory_common(unsigned long addr, int numpages, WARN_ON_ONCE(1); } + if (!numpages) + return 0; + if (start < MODULES_VADDR || start >= MODULES_END) return -EINVAL; diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c index 1360a02..b582fc2 100644 --- a/arch/arm64/mm/pageattr.c +++ b/arch/arm64/mm/pageattr.c @@ -53,6 +53,9 @@ static int change_memory_common(unsigned long addr, int numpages, WARN_ON_ONCE(1); } + if (!numpages) + return 0; + /* * Kernel VA mappings are always live, and splitting live section * mappings into page mappings may cause TLB conflicts. This means -- 1.9.1