From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3757758-1523238027-2-12209067854613764183 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523238027; b=YF5dT92xztKDg7jyVj/6ludD+TdO5GqtAy9FRNX3MD1fi4onM9 KV2b60Ftn5fFrbvG3CT+xBhFkWPPoIyHlAdO/wrUzH4GQyOdBbJ5eAIoH+I4Mge7 Em0BUeif4L42KAMDv1NibIQ9NcS6cBjpH+EAJDgy21bJ5KSWsup/TkTRxghDFeRX dVjFCaBUi6BT0+xvBPdcIAjqSTaaczeQVCTiopnIvAwoC0ewhXWTBYrbHIPqy7yC m/2G5RgY0TGH6xot4sAu/xtC80SAix37N2G5qrDLeVU3Go1BH2HBSswiDoW3RC1u daBMsuuaXK8GPO2h4QP0n7YKQBUbMy1cSJAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=fm2; t=1523238027; bh=eJCr+ENV2x tSuikKtG94QoJhvimjb4qTNrW9jPVmO1w=; b=EKKY16sO4o2j/Yg6tHGrQD3wWi 6kr77GTt8O16j421nbTu6vsUCzwldoChzW0QFlXPfBMTo0hISLIR0r4/fHaprF6m /l3N1S/FTBMWfSHhm+s7ISN+QnGs7m/aExb6e3+1g/Zna3uwpstkmafR1qxn1QSY syDNI5wbnpeIBmnMHGpY2PYw8q74AIbyqKh7vV8RULDgstRBiuqM89SEvNFmtmyz vy6/WfOkBQKGEV9OR1kNbDD8e1WrHxteDRc+PojHdaFa7jc+DwgkHef1dN/ziIxU idSx0BIUEcF0rBRBNyl+IRJumhwztGuS6RvUsF4jVE6FgCqLDypnKV8hOpTA== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=SgyM/2jK x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=SgyM/2jK x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfIESjVFtYjOxeKI4mfSG7lOx2UUBA2i0ldxDwTQYvMMZMbB8oilYNhbNSg2/rQ4nRsxAoQkzOtsrXWFBsj64H+fW8kfT7Cip3VV15QBSKeSpNKhswr49 huEVWqMpQKAxVfS6Trj0J2FsDIeF3IoDhuctJ8L6n73PcHazOyLIzMIrDq8YJ4ZpE17wrgFAyJMPqwnfqG7gHoyEz4yzvbUJNNpyhuuGS6IOrmlYsK6eT19X X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=r_1tXGB3AAAA:8 a=WPyIoOwQAAAA:8 a=yMhMjlubAAAA:8 a=72xZbA8UcqOln83T7vIA:9 a=4zZynRfxn_piIYhw:21 a=IFRIY7OpxCe8iowW:21 a=wPNLvfGTeEIA:10 a=t8nPyN_e6usw4ciXM-Pk:22 a=S-HzPIwwDS8t1QcwSuWs:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756584AbeDIBkM (ORCPT ); Sun, 8 Apr 2018 21:40:12 -0400 Received: from mail-by2nam01on0123.outbound.protection.outlook.com ([104.47.34.123]:51296 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932540AbeDIAfA (ORCPT ); Sun, 8 Apr 2018 20:35:00 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Marcin Nowakowski , "linux-mips@linux-mips.org" , Ralf Baechle , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 004/162] MIPS: mm: fixed mappings: correct initialisation Thread-Topic: [PATCH AUTOSEL for 4.4 004/162] MIPS: mm: fixed mappings: correct initialisation Thread-Index: AQHTz5mUIncaie/cnE+GboGi7TBUeA== Date: Mon, 9 Apr 2018 00:27:46 +0000 Message-ID: <20180409002738.163941-4-alexander.levin@microsoft.com> References: <20180409002738.163941-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002738.163941-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0806;7:Yx9z+JCxgiwzTLG5di5YQGG6vS1dS7/uGHbgySHU7Gu1aPtxpNKFMMz0S8/Nwgd5g+HB1moSJyt002l0n3C2lnwKs/zjCq7SiGGShGML66HapdKR27qRTZ5oVOP5zVVn8d8DeglUpXWuGh9FYlSJy/5xY0RJTSjz8OmWCDLoNo/FnUW9uhJOJ76Dpo1Ma7P2HYlu8k0+i6EjWJ9bIRsyQF4ObSg1lrFf+wg1I5f1le4jDeueuK/G8cs2WvDICDfc;20:BHH3ikTQiiW6EcXw5PL1Vg/YvIgo6EgSDCt5xggJlQxXf1YHPm8pGQN8reHVXph3/3mpCIHEW6lSK0Nk23+f/I3c3hsunUY3xJaqw6YpxIu8GDyiDXkljNbGJn33xDCRHOdFOkK1P4XIXrDx5924Ntav2KeiEtYar4U+U79d3yI= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 1f4af986-9792-4d4e-50a4-08d59db1b521 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0806; x-ms-traffictypediagnostic: DM5PR2101MB0806: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB0806;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0806; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(376002)(396003)(366004)(39380400002)(199004)(189003)(2906002)(25786009)(2501003)(10290500003)(476003)(11346002)(446003)(97736004)(5250100002)(68736007)(2616005)(102836004)(6506007)(3846002)(3660700001)(486006)(3280700002)(305945005)(6666003)(99286004)(5660300001)(76176011)(1076002)(186003)(26005)(7736002)(6116002)(81156014)(81166006)(86612001)(4326008)(105586002)(10090500001)(2900100001)(54906003)(22452003)(316002)(36756003)(110136005)(107886003)(8676002)(6436002)(478600001)(53936002)(66066001)(6486002)(6512007)(6306002)(86362001)(966005)(14454004)(72206003)(8936002)(106356001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0806;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: pTDUWnGGRdP2fzi1cvNimZ8/+fYhQiGTQ5BP0VRDRe5RP3hlD0K7utqme6r0rxh55RVNIPqEr106OOItHPwX7dlmQNV4YYGrcIq4qeEB2PBu/SA4SpmFM35tQMWnC3XyRoQnU4aTTLLQHcdCkb040Qk0TINzDq0gPEQyGG9hRQUex+0gaSPT25IzMRNVY+uBALTkvBLnq/7n79c79EGZJLkYy74moM5YF/SVKXiZ23rMAde281gzZItDk45FRt2IQ+DN9dAF/+yqcs7JIgSjMXUfWThl5cvKTeZyBBnobx93eQOlqRqwqmIbMSf9NVsAfxNGbgRihiFAozeBzMpXGiFbPAjf+pkhs9j2Nmvl6TaUUIwtTnvnm46H6FzsOme8BTO3883VdYZVZy/MnRR6iddYFssjh9N9Ul0BqXENy1U= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f4af986-9792-4d4e-50a4-08d59db1b521 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:27:46.0671 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0806 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Marcin Nowakowski [ Upstream commit 71eb989ab5a110df8bcbb9609bacde73feacbedd ] fixrange_init operates at PMD-granularity and expects the addresses to be PMD-size aligned, but currently that might not be the case for PKMAP_BASE unless it is defined properly, so ensure a correct alignment is used before passing the address to fixrange_init. fixed mappings: only align the start address that is passed to fixrange_init rather than the value before adding the size, as we may end up with uninitialised upper part of the range. Signed-off-by: Marcin Nowakowski Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/15948/ Signed-off-by: Ralf Baechle Signed-off-by: Sasha Levin --- arch/mips/mm/pgtable-32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c index adc6911ba748..b19a3c506b1e 100644 --- a/arch/mips/mm/pgtable-32.c +++ b/arch/mips/mm/pgtable-32.c @@ -51,15 +51,15 @@ void __init pagetable_init(void) /* * Fixed mappings: */ - vaddr =3D __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; - fixrange_init(vaddr, vaddr + FIXADDR_SIZE, pgd_base); + vaddr =3D __fix_to_virt(__end_of_fixed_addresses - 1); + fixrange_init(vaddr & PMD_MASK, vaddr + FIXADDR_SIZE, pgd_base); =20 #ifdef CONFIG_HIGHMEM /* * Permanent kmaps: */ vaddr =3D PKMAP_BASE; - fixrange_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base); + fixrange_init(vaddr & PMD_MASK, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base); =20 pgd =3D swapper_pg_dir + __pgd_offset(vaddr); pud =3D pud_offset(pgd, vaddr); --=20 2.15.1