From patchwork Wed Dec 8 14:32:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 1565241 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J8KQg1Nyfz9ssD for ; Thu, 9 Dec 2021 01:33:15 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4J8KQg0hGBz2ypX for ; Thu, 9 Dec 2021 01:33:15 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=2a01:111:f400:7e19::61c; helo=fra01-mr2-obe.outbound.protection.outlook.com; envelope-from=christophe.leroy@csgroup.eu; receiver=) Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-mr2fra01on061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e19::61c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4J8KQT27hlz308b for ; Thu, 9 Dec 2021 01:33:04 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nkVYPslNDyYETFbMQrrNUioFR7AN7tFI7zxRVZLCRIqOUyP6/jMYIgoyKhhXvvboJcn4mvx3eoud0IJr4s29sOBE4bDmYhFjKUt23EuhzF1Dcy6Osy3CskAomvvpWicjH8mqAAv/+FVOi6RhbGgWhUGDrGrSsIc8G8+rHi1rng4J+tGs51fDg7Gj9U0p5GVsotvGGYPJbEPCNNDv0Wej7t6ihURjWXLJdR614Ny0R2xPhSRoyP2VcxZkR0vC+NYWONE/9uIM4fCsTCDS1EKfqyEPrfPWgNcQ6ydynYumlBPJ67I8H10PPznIVRWrj/euD3gzeblqVPjpg1c/XVEY5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rkfug0VHZPb56GAv7HMSb7giuWTIivrBH1l56pwqUwo=; b=bA4v9CtWE+M0LI9LWxo4Dgyhqpb1AAd9h8I44G7RpIAsyacLEdr3c+g6KB30yNjtUfImoBax3MCffJJIXaB9W7yq3XQq2yAkZzaMy/t9Bc/o/tvvIOqg50zWx00rLwPf+dVy4qovq4UaenXmUYAS0BQkYUnjDtgwiAN2lO4vmII62HH9ga0nws81BOMmtf1uFVStoVw3DtQAe1czJuIwiO2UTsa2ZKDlO/IR4aM9WAiV13/5rApzpd1EPRU2DgrfV4GtuoJARh1hGju6fKMsxKX/U6VlRGPQY9p4en5L0E6N3de4XMkP4R3+QoAYDp1S3QC0di7zXjbWcsXUclycrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=csgroup.eu; dmarc=pass action=none header.from=csgroup.eu; dkim=pass header.d=csgroup.eu; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by MRXP264MB0357.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:18::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 14:32:42 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::fc67:d895:7965:663f]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::fc67:d895:7965:663f%2]) with mapi id 15.20.4755.022; Wed, 8 Dec 2021 14:32:42 +0000 From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH 1/2] sizes.h: Add SZ_1T macro Thread-Topic: [PATCH 1/2] sizes.h: Add SZ_1T macro Thread-Index: AQHX7EB14E671PmylUi/GGPQpSm/KQ== Date: Wed, 8 Dec 2021 14:32:42 +0000 Message-ID: Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=csgroup.eu; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8ff06acd-447e-4821-8ed9-08d9ba579830 x-ms-traffictypediagnostic: MRXP264MB0357:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:639; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: mQbJYUIOTIwGebZ7e9j6pw1b2XHT4HxDrCO15xNiaHKtjoNj5UBD71uctVLvqxtc0jnE2Sm7rgYbVZ/E0JQwL9Vp6ayDLc8QwwFt04ZP/wNCdSouqBID5y4iDE6EqjlxWp4d4qNb6gckh0UAfziQFfFcIMKQkVcPwleofzczfTQIwQJLVB2mnU7e4dsMGOSsPw/3ra42TLUS0bPQ4HU8vW0Y9/3o4Mqo71mb9Oitau+7iMEaVD1qjsc3iE5TYrO3bx1BHtZ/p9lenRVi5QZsys1KPCsLCjeekReOhdKMhjOZJF8vuyUogDyKWQPF+2Y00wLA6tgq6o1iabtsnazUgERFbbLIeIAej7kWwFTbgGqWoSqNvWYhniDM+pCG2HIlQlJjEadXJr2o3uYhe7zJ5YyeedgbiXkwwkVhM+1qycxWvBV89hrrCZTWdJV2yNJ8Isw+m9ftZ5czFg0n+X/bjuHjp4sGzEKtSBEwHQ2RyAYbMw6V4mLr5KmKZMEkZfC2BsPyQXybEOYzQqSvZc2ZzfzGuWD3yzUSsvDxauAl3dY+XjYWgwUHHY6hLt8igfPBtVIbLHc55ZJ91oDXjfsWUL9dcxIYWHdet1A+LhCTPgXsUPGUrbLJbpDcB9c4oZqMotO7dQAFKphajkmUBPlr4gC69NPwVwjs5P+BiSQ92xhho77b2ZhbEctLlGiD3LioerzbsGD3z2qFmEzW8+KVzQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(110136005)(8936002)(36756003)(4326008)(5660300002)(66446008)(38100700002)(122000001)(8676002)(186003)(86362001)(38070700005)(54906003)(83380400001)(66556008)(66946007)(2616005)(316002)(6512007)(64756008)(91956017)(2906002)(76116006)(66476007)(6506007)(44832011)(71200400001)(6486002)(26005)(508600001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?MfUv9wetvW7ULBNWWU1vqIj?= =?iso-8859-1?q?iiW4HtWq1HJQ5e+3XiTcBzh4Ml7jCm1He7K6YabLc90OUIGUfGiK9MkFxpM9?= =?iso-8859-1?q?Ub9QI8nWjMGz6uZVQG5wvGnIUKFV2H+mY6hLdze5zVIYg6kq5xx6rPuvu2CL?= =?iso-8859-1?q?wPzOjoamp3/8c392uLhW16hcuBJjLbXtLS5VzaLHEIVP69iKTsPcngpMoZ0Q?= =?iso-8859-1?q?LvbT7THA3xpvxqvoNUyoaJLJK0w0VjiFWgnqqpVt7YYwFZDwY8VQ1qmn2Enb?= =?iso-8859-1?q?6Q5bIO2Jlt9C67z/5NWNQjho2iC5mhimUZL+NB+Tt189g67U9XklY2bW98/h?= =?iso-8859-1?q?DWcA7q0ZCNeSWJGCmPzThEtUuh7nwcBtAG1XpBpx1TfeJkNAzpxXcmDshApt?= =?iso-8859-1?q?Qs1P332QLAY/r/EluTZEcY6nSo1ajEnyqfVKqF32QvyRwtyZdBci5ZqU4XNG?= =?iso-8859-1?q?s1k1/QeFNnd8PefPN1vydp+FCewjAQ+EEwtt2xH+NAxLLmb5jAiOE8KZqxNK?= =?iso-8859-1?q?9VMk9TkVn4R54Xlr5ICI5X+BfCaZQydtLKsaYAM/373Gba2+U5w3IxnPKgFS?= =?iso-8859-1?q?e4S7jqOfVHA822RTnbu4N17SiutZH5IHh+Jfpo6OIiEpCRD2OT0lGzZYi4El?= =?iso-8859-1?q?s5+jRXTvbVgi/a535yaUMAYUrDS/BZmvsyDbunnDowyQw6xHmejipjJu7yUg?= =?iso-8859-1?q?+xVMkfOxPpDsgCTTC5yb9S/2lxilQDFWgohT/Kj4lZ94jsC3RY1XQ9zzm3ji?= =?iso-8859-1?q?sPeqXIF/C35USfbij+OSKknXjztCIqnx5uIF1VonRZp/AmueO2IaGfTS1BOx?= =?iso-8859-1?q?y445xd1vIojmcgdis5qwjzhV5n567OVp5RiqUWEUcJFnwaLO+uBRH3XXhcAD?= =?iso-8859-1?q?DlfRX0n5E12a2+A49lsu5Wj/+9oU+kDPbsEqNXVmCE042CeOl/ReBZgtbU8u?= =?iso-8859-1?q?MXR1g2Fskr4ejiGg0YL0qhDJqjhOvyq5/B/5JEvqUKqFGR3dnAlSrknbEp/f?= =?iso-8859-1?q?HlW31MQbSPv3VcjK84aoCokcQqu8LUTexyXp3nFqLm9f/92bunoHZqpJpUQ/?= =?iso-8859-1?q?dQoFTA1nNAz3QCRoufkRXMYdN+hzdebtoYhQk6HZ/ZzVL/FkN/wamB3X/dAR?= =?iso-8859-1?q?T4+xX4LfkjhiVDir6QrmWz+RHXveV8jj2LUUZEIXTB9OrmKBG+6QaWcBw2k+?= =?iso-8859-1?q?tcLIVKNGQn/Qut+w796u9hqagtTaibOQAbx9H4eTBBfWzSAtm5iia3Xd1m2q?= =?iso-8859-1?q?3PB7kIgNHgzb89C282c6rjxJnhwVSs3n0/xfar+CxQHeEVbrkKBx8Q5OgI4p?= =?iso-8859-1?q?bmTlyoyxEL8PMTSa1N01YmRIzpvuX9SmEP3yCo+g2PWr4YhD0HXQd8BEvlUy?= =?iso-8859-1?q?+celIkdyMmK9roPwmRQE4IYmf+tA9icqBYpC3Svj9Mlmi0U04EtI6qaX92Je?= =?iso-8859-1?q?NISu2iRDPMZP3m+BRF67IA2UJg5BsslDSTc7QIQoVvJAGx/s0QhPlwKBGqPn?= =?iso-8859-1?q?dt1D+b+JjxeVodIP7jH8fvt9zj8WZ00uUat0rqkp19vb0dKRQTZHIWCA5uDx?= =?iso-8859-1?q?jpMY58eqdcaawNk33iILUVsonTf/zrEEHdG3x+zzPhDgn3+h6AfRJEDFjaEr?= =?iso-8859-1?q?nlBTtphST+WeSzx8qGlIgnSu5yDWAsD2wjsarOqMSWwT87jqzyiPM3Wp3QKu?= =?iso-8859-1?q?I4rmr74sVWNUlVUQCkOyYWgwStDrgdsKTTpRQcamhJkjZd3pTO3dkrWgfZ23?= =?iso-8859-1?q?I524=3D?= MIME-Version: 1.0 X-OriginatorOrg: csgroup.eu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 8ff06acd-447e-4821-8ed9-08d9ba579830 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Dec 2021 14:32:42.6900 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: fyK7QgwRehhbWlgkPgM319lLK7NOS9JcI7e15RUndcfUtMvDvKDIHMtlBsZhoa/cSv1/iooFNO7jTRJ+MtCt88JwZV+gJvTuWHEROb8ZI2I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MRXP264MB0357 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linux-pci@vger.kernel.org" , Toan Le , "linuxppc-dev@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Today drivers/pci/controller/pci-xgene.c defines SZ_1T Move it into linux/sizes.h so that it can be re-used elsewhere. Cc: Toan Le Cc: linux-pci@vger.kernel.org Signed-off-by: Christophe Leroy Reviewed-by: Krzysztof Wilczyński Acked-by: Bjorn Helgaas --- drivers/pci/controller/pci-xgene.c | 1 - include/linux/sizes.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c index 56d0d50338c8..716dcab5ca47 100644 --- a/drivers/pci/controller/pci-xgene.c +++ b/drivers/pci/controller/pci-xgene.c @@ -49,7 +49,6 @@ #define EN_REG 0x00000001 #define OB_LO_IO 0x00000002 #define XGENE_PCIE_DEVICEID 0xE004 -#define SZ_1T (SZ_1G*1024ULL) #define PIPE_PHY_RATE_RD(src) ((0xc000 & (u32)(src)) >> 0xe) #define XGENE_V1_PCI_EXP_CAP 0x40 diff --git a/include/linux/sizes.h b/include/linux/sizes.h index 1ac79bcee2bb..84aa448d8bb3 100644 --- a/include/linux/sizes.h +++ b/include/linux/sizes.h @@ -47,6 +47,8 @@ #define SZ_8G _AC(0x200000000, ULL) #define SZ_16G _AC(0x400000000, ULL) #define SZ_32G _AC(0x800000000, ULL) + +#define SZ_1T _AC(0x10000000000, ULL) #define SZ_64T _AC(0x400000000000, ULL) #endif /* __LINUX_SIZES_H__ */ From patchwork Wed Dec 8 14:32:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 1565245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J8KRB1xv7z9ssD for ; Thu, 9 Dec 2021 01:33:42 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4J8KRB0rYvz30CK for ; Thu, 9 Dec 2021 01:33:42 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=2a01:111:f400:7e19::61c; helo=fra01-mr2-obe.outbound.protection.outlook.com; envelope-from=christophe.leroy@csgroup.eu; receiver=) Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-mr2fra01on061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e19::61c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4J8KQT5f7Yz306s for ; Thu, 9 Dec 2021 01:33:05 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IzQuPnSZ2J84YMXwFSy+HcFjzSEB1/l5U4eGEWee+DCKTJaowVkHbaP18YxSbrRk7RCetA6UVNulIu3/KsTmWX4g9vC0rHKEM2fCb/P0yOqbUseqvQ/X4nWPBollSFO1lsTk6m9AcKloPEYBihY+uLY+FoZgYyKp1unG7NstKXxjbtJlk34Ec3u96IVHbx9hQ/DEaY8fSJY1ZcN+PIK+4mmR7hrwRfW00Znu3O/StIpLiBDQbsVi+5Bxc87+ymsTRjn+8Q541CK73yLhormsH3yTYHVQ+M+mamRBI1/yttiplHjA5dURwxPSAdVyxb8PU3P3nqNLpFCZ6RORO+kIzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+t7OwxadSOpUS5cr1JIEP1Qf4IwcxeL6mx4ZbhZQykc=; b=Y8+06VqY4lrkVvtw7nQkuAbjzAN1C53hbjbFscgreBhp++Wz3X4I7+8r35EHw9wM/a594t4306AvKHF32G69rcUkxVOFWJu00JOG2DQd4hZdGarDYrEd9/JCrHcU1gunf05ZspjiZXiqmiXYrV3rtn3aAJIk07aUSf9dhcIYtX737+0Hln8u/Hfs4Q31zAdK+Y7e5ebZUwrw5VICh1ppVvubQaw913wn5LRTEdqPRxSdVFN14rEDGBil1JfvHIG9iRZqIFu/IhS8q/pFv1qR/wrwQbt2o9jAasbo6YL0tO6mKVAjT66fY3dVepPuADwRMx9KHAtJ1AwHelynrQvoCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=csgroup.eu; dmarc=pass action=none header.from=csgroup.eu; dkim=pass header.d=csgroup.eu; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by MRXP264MB0357.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:18::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 14:32:45 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::fc67:d895:7965:663f]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::fc67:d895:7965:663f%2]) with mapi id 15.20.4755.022; Wed, 8 Dec 2021 14:32:45 +0000 From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH 2/2] powerpc: Simplify and move arch_randomize_brk() Thread-Topic: [PATCH 2/2] powerpc: Simplify and move arch_randomize_brk() Thread-Index: AQHX7EB3EE2L+6Yk1kqjILMiGdDXTA== Date: Wed, 8 Dec 2021 14:32:45 +0000 Message-ID: <3c5ffa5d102c9edbfeec19072416b33b102fdabb.1638973836.git.christophe.leroy@csgroup.eu> References: In-Reply-To: Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=csgroup.eu; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fe428764-f7d8-4670-833e-08d9ba579a13 x-ms-traffictypediagnostic: MRXP264MB0357:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 05Mbc6ItvW1QnVXEQ+v0MkAaD3QUGw769jFq3XKHnTPkTfgFu8nZ1c2/VV8cGVD3msqyFG6W1I2Aexj7GLmvGHwTGp3rjoMw2IDtSwAkEqrdCZYSzGeklFJ6gcdc57NMt8+tsgpFqpcXN/ZBX5YiGkZ6PLWqAtqngCpWBWOCbsAcCOrct2OfDzU4caSvaHqVUwf93UE961jL4xJrW1BrS1j0BzYwrAEW8KvPSrpEfVEVECBAsmIAjsNnUL/oUGSOMVvQY8DeYQcVmEehffGeO3VfsaCKmxuyjJ0KHsmPXi+0+99SBCIBZvTPJo2pytQt0OY+0JnQdvzY6hsPUq/IHLQH3IdNTntQCuXX96CqUWUO39/zDbPN+jZ+qYpA9DDxI4fxKwsnT8bqOyMLJOJ6zwrpd05uAdxQbKT5JwZXJSXUqebvgRoH5urYFVu73kOWmSneejuyfHcHub/ac2kwO/g1R+LvDMHKG0N16R98xVW8WPHQiJPtWodU3mTtP3dI8AZDOoFXqG4ziTT54kHpSyVplDxExz2prAqir3TmJExd5aZjSk5uw3hzqC8Izloi4v30WzH8yhLHboIZYiV+NrcAvIhzHvFWAJzmxuvcgMVzlkImCCBBbEl2yh2ADxNVx/DlatmJPp1hNe+kZR4580SbDGjbF10OeqOK2doXaBC0phfCdqBVwot/GwExcGRJcbnn2ZuUO3fVyopt0vW/8A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(110136005)(8936002)(36756003)(4326008)(5660300002)(66446008)(38100700002)(122000001)(8676002)(186003)(86362001)(38070700005)(54906003)(83380400001)(66556008)(66946007)(2616005)(316002)(6512007)(64756008)(91956017)(2906002)(76116006)(66476007)(6506007)(44832011)(71200400001)(6486002)(26005)(508600001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?7Ubokz1MEtEhkB6nVYVJ5mw?= =?iso-8859-1?q?BwEv5BLkqMhGbgOWS/uhfqnNSDVYjTRH7W0FwOTDnMDslFmLj1RhuR2Nfypd?= =?iso-8859-1?q?zQeU9fKKd9KsgV80v8iqVEvHK6cV64Meq0ekXHdmKzxZLZbJUXW6N8z3Z8/3?= =?iso-8859-1?q?sg9G6MhA44F1zlhyLDIaMx4iLjb7PDFDHPI0z7Gv12+9gqNLPWn3vGAcD0dU?= =?iso-8859-1?q?3c4bdSQYanQvZN1U+dZcL6diaY3UMrVub+p7N/WSmjfPgt04sYPnCzi69CnM?= =?iso-8859-1?q?/q/AYxWTbzKl/q3GF/i6FKVvlsFMjwFHBMtoZVZsmdSAmxKrls9N7xZSw3ZS?= =?iso-8859-1?q?Tvv9HM8mJw+3zrr7gCrEQi0FX+8T+j9fAZpu+PLxLq2SIgF+1eIIP3jqVWxT?= =?iso-8859-1?q?9C1Aj6fpd+RrU7LM3botH1sJ5nRa6JkQWwZK0uUhnlXnLSjdolgqGbRSKAWn?= =?iso-8859-1?q?Ui76Vjm1sZQsAVNDOT6vsEdM28bivxY6UYd2r0vjlnSCnC/Q/C56/ez2+wTw?= =?iso-8859-1?q?ZU21W/e+mOPJ/bQqNtnZXQCmiKCoqCD21zyGUQS1C3Xn1FE4WiGqqX0dV/t4?= =?iso-8859-1?q?W9KrTzz0UuDPMZghhcCtnUH0NfzXNVzgG/cRtRbKvGE54mwrPCgtg/fMW7YE?= =?iso-8859-1?q?VHjCE/LfZTPbGXeD7lx1e8pfIpsnnT/l/HzHPXK9AXXsMd5qPBsbsnLBhI0U?= =?iso-8859-1?q?wRQCzXzCr/Ek4JVbujlzIxUDkU+xehnu1dSgfALCIpfMHXolq9rGWN8eiqtG?= =?iso-8859-1?q?h3HZCvva+LKWoVm5XHQWRfeazalrwmxLBjZczDWmVixTxGK+fi6PfpNz8jjb?= =?iso-8859-1?q?ylu+/Z6LvlSkSwAASmsvKuBvGj04DmMJVPi+p/Y0AKGms+5td2SYb40hKqGa?= =?iso-8859-1?q?SAnTzT62rta+6DAIXi8xWufPWsJ/HaykRtWN9OmJ9GyfVUxJlkkjfxlCaWUd?= =?iso-8859-1?q?5ic3svYvREywWyotHftiDpkFzM+NuYgeEewhgF+SJLDtzF+6hj+5GN5GpAUe?= =?iso-8859-1?q?BWyLAizsnSACbJE34BXNBoonwGO4t0bEZc+0bBHyABq5EX/rNEN8XzRRCl6q?= =?iso-8859-1?q?BeG4kIpkJmvRchPenUHn7SY2qzBfu5RoPambkfusKsM2jks3SfDxoJX8T5Kq?= =?iso-8859-1?q?6uuGFJ4akhmewPfejNaU0rLF8reSu/NEhP+D2ZAzuJ87dWN/UB/nd0juiCq9?= =?iso-8859-1?q?I6BcOEMokRgdVAvPxuwovzMEB4DHM/jOOq3iv+FTXTr/9WPcvkqi8uSlwdZX?= =?iso-8859-1?q?JorAj968bK+WG7F/2OgqCnsdL+/XFeXh9p/Zgvk1GdZYvLNCduHMmN+ddvI1?= =?iso-8859-1?q?fq69KM82cwGGsQFEnvuMaKoLg407IAEVRM3UqrgD4f3L/VLijphpsdrs2yPi?= =?iso-8859-1?q?/NiivZT60VqgzFcJ6dW7abmynKUHhTDytFMH9qvsK/50x0CJYl83IGRCabuF?= =?iso-8859-1?q?85dTrtHEh6jRnUHwQy+Hq1c3+kRmQ3YbclE587b8wArP69sXRMtTpM5Q53qF?= =?iso-8859-1?q?nf0uhLsytIQgBD2MeZHliwENoeryjX7VhWlmW6fzRGMqOyR2fTc9wxK9qoEc?= =?iso-8859-1?q?D1pwuEgaCDLzWuWrkR4DFT4BNP8VNgaw6dgdNFEmC5TiRZh5iAsFW56BgxzP?= =?iso-8859-1?q?jgg2JKGVmNfe+5MVSNqNgZ+rQTvnTL4urXIDzSLZ2aShi/lJT74DCem5rxSZ?= =?iso-8859-1?q?LYltRzDvi8QO6WXPYBl+FyUciJkIQAIaCdt5dsKPVxS5BcCIb2SdaazV2e52?= =?iso-8859-1?q?YBB8=3D?= MIME-Version: 1.0 X-OriginatorOrg: csgroup.eu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: fe428764-f7d8-4670-833e-08d9ba579a13 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Dec 2021 14:32:45.8859 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: eDNezULlxKUM9qMWQTaVnFTGkdbPNYIhl0NWIYjSu/pmwPGzUb1NQ08EQdfQh+u7y6+/+ciXm8gGk6y8QBDVULQS0+Ls1qmpfnVs3bHfLTs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MRXP264MB0357 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linuxppc-dev@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" arch_randomize_brk() is only needed for hash on book3s/64, for other platforms the one provided by the default mmap layout is good enough. Move it to hash_utils.c and use randomize_page() like the generic one. And properly opt out the radix case instead of making an assumption on mmu_highuser_ssize. Also change to a 32M range like most other architectures instead of 8M. Signed-off-by: Christophe Leroy --- Applies on top of series "powerpc: Make hash MMU code build configurable" arch/powerpc/kernel/process.c | 41 --------------------------- arch/powerpc/mm/book3s64/hash_utils.c | 19 +++++++++++++ 2 files changed, 19 insertions(+), 41 deletions(-) diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 984813a4d5dc..e7f809bdd433 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -34,10 +34,8 @@ #include #include #include -#include #include #include -#include #include #include @@ -2313,42 +2311,3 @@ unsigned long arch_align_stack(unsigned long sp) sp -= get_random_int() & ~PAGE_MASK; return sp & ~0xf; } - -static inline unsigned long brk_rnd(void) -{ - unsigned long rnd = 0; - - /* 8MB for 32bit, 1GB for 64bit */ - if (is_32bit_task()) - rnd = (get_random_long() % (1UL<<(23-PAGE_SHIFT))); - else - rnd = (get_random_long() % (1UL<<(30-PAGE_SHIFT))); - - return rnd << PAGE_SHIFT; -} - -unsigned long arch_randomize_brk(struct mm_struct *mm) -{ - unsigned long base = mm->brk; - unsigned long ret; - -#ifdef CONFIG_PPC_BOOK3S_64 - /* - * If we are using 1TB segments and we are allowed to randomise - * the heap, we can put it above 1TB so it is backed by a 1TB - * segment. Otherwise the heap will be in the bottom 1TB - * which always uses 256MB segments and this may result in a - * performance penalty. - */ - if (!radix_enabled() && !is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T)) - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T); -#endif - - ret = PAGE_ALIGN(base + brk_rnd()); - - if (ret < mm->brk) - return mm->brk; - - return ret; -} - diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c index eced266dc5e9..b179a001bfa4 100644 --- a/arch/powerpc/mm/book3s64/hash_utils.c +++ b/arch/powerpc/mm/book3s64/hash_utils.c @@ -37,6 +37,8 @@ #include #include #include +#include +#include #include #include @@ -2185,3 +2187,20 @@ void __init print_system_hash_info(void) if (htab_hash_mask) pr_info("htab_hash_mask = 0x%lx\n", htab_hash_mask); } + +unsigned long arch_randomize_brk(struct mm_struct *mm) +{ + /* + * If we are using 1TB segments and we are allowed to randomise + * the heap, we can put it above 1TB so it is backed by a 1TB + * segment. Otherwise the heap will be in the bottom 1TB + * which always uses 256MB segments and this may result in a + * performance penalty. + */ + if (is_32bit_task()) + return randomize_page(mm->brk, SZ_32M); + else if (!radix_enabled() && mmu_highuser_ssize == MMU_SEGSIZE_1T) + return randomize_page(max_t(unsigned long, mm->brk, SZ_1T), SZ_1G); + else + return randomize_page(mm->brk, SZ_1G); +}