From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754400AbcBWRfA (ORCPT ); Tue, 23 Feb 2016 12:35:00 -0500 Received: from mail-bn1on0065.outbound.protection.outlook.com ([157.56.110.65]:39921 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753551AbcBWRe6 (ORCPT ); Tue, 23 Feb 2016 12:34:58 -0500 Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=caviumnetworks.com; Message-ID: <56CC9820.3010406@caviumnetworks.com> Date: Tue, 23 Feb 2016 09:34:24 -0800 From: David Daney User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Will Deacon CC: David Daney , , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , , Ard Biesheuvel , Frank Rowand , Grant Likely , Catalin Marinas , Matt Fleming , , Ganapatrao Kulkarni , Robert Richter , , David Daney Subject: Re: [PATCH v12 4/5] arm64, numa: Add NUMA support for arm64 platforms. References: <1456192703-2274-1-git-send-email-ddaney.cavm@gmail.com> <1456192703-2274-5-git-send-email-ddaney.cavm@gmail.com> <20160223102610.GD3966@arm.com> In-Reply-To: <20160223102610.GD3966@arm.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [64.2.3.194] X-ClientProxiedBy: BLUPR07CA060.namprd07.prod.outlook.com (25.160.24.15) To CY1PR07MB2134.namprd07.prod.outlook.com (25.164.112.12) X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB2134;2:1sGmFUFJp/Evw/ScL9XC9RBdEM6q8nIqzEyvqo90O2oUxig7EWoIcB5fvdudQILOhm3iYJIf5BF1rRuIV9TQxsEWjz8M+/K4FPsLFYOhzjTzmTyme+2se3HIgfRF4A4dByPI2bEHUJKGT76hWMDQxw==;3:6SJg45iqlcerS8j/R1ZNKs6OWXM0iH+Bli+BNpMzFXwnN0JP83UnTqNRgyLCdhSiZGn2sGVfI8up3PVKRNkVCA5dWihP0SGvyE+deYOk3zlIP41PDYk/JjQLvBhye9YT;25:qHuau1522O9ZqKiY1H5Z2U2IiahxcUym0gJCrVDWPlyuw1XGtTR7u/Xr2LeSgVo249jbRThjwxuHy9KFAK6r8ifj4s8UDAUtbQijKX4LFhvKJappI3fHWkoTesnMVkOWrs07W/C9/YtJ8ZoUEe2paKe/g1CXCJ/h1vB5TQ8FwBGD6bNpxPeOL2jmPtdr01kY4n9GcPObxdl4uG42WJDn3h9cnmwrKDR72dP052xseLaJlSDcpWV0/HSv0+hoHAU+evkHUCP9nr2U7PiSGlRHKZ/1RntgsS3TYAztNrjikvoRBGXtkbeOcoaLhn48bIUBZuZGAJGfRF3py3n3R2fZe8nMO6Oz3CUeGWyQ14NYyvo= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR07MB2134; X-MS-Office365-Filtering-Correlation-Id: 9c22b41a-2334-49fb-79c9-08d33c77a4e2 X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB2134;20:WELcJH3P8o1oP/F5VT0hH61iYMcSfGGbYnua8zBEi5SwCarlW6b2J8RcQDsHwbNqt35PbjoQ2i2VtGdqk7rd6m6qiFYGsep7MW1SPORV3U+V/Chqlrb51tRjN1t1VyBM1fv8lA0cCuiYVhtLCjJOzCnujs3yIVVawJYq9t+wHxZbIyn0RC2At5RyHQnJFdzAmR5sgFu1f8d3wPWAlqVawbf3aLoYuF/iNcJkNgR8vLVqUpwA3+JA6Yilclswdym9uDhPttrMv5lc0M/3Q6PtiyzA7YdbFYKDRwHMlH1hPuMj23uMfMOnhS/6ctFPwe62a8I9gHYcQ80gj/VygLR9zsSe3622uyyjDkVvRtswFHcSXDXjioNrtxY/Fh9oghFM/V9ek6un8b0D6nMZbjExLOCoJL7CoivkdLJAUcR3yQv9/6j/M5I/3bJyPPflHsBlOUr2fmwnpYz5GwvgURtaEU7XzOSKWuoa5u9D2denvd15l31xUQ0HXG6rJhk6tVbwfNZWvZhkveb1iTOcazDL2wk9IUC3TBzLxx5CGj76m0Wlda66AcXFhbqitr2gpk5N7PxKT5PGFiMqbQMpgHYD0mvrjrno0U9MqP8wK03hzhw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001);SRVR:CY1PR07MB2134;BCL:0;PCL:0;RULEID:;SRVR:CY1PR07MB2134; X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB2134;4:sjtNav63v2Ed8H0VPHyv2CrrvENarJ5S3rM51wYsejVQijM0ZobMT9SZfLZf140Fqm/zCTvPAOhWn9Rz/z8tvs0MpOUqnJR2fYtOyzSbeNzH5KmblnUKVOrhGBNpIsMFneCLf2w0NjDgv52YGhV+tZEINNOkvD8fBRCXF7V+IaLajqcF0ynDpd2+G8KqtNDzwfJ0mvegDuQUTL2G9TUhysNrSk5g7gHNegnhpI1KQlUi2vfZPVOY8jQtfXxpIu5mZqHtm+Yg7FlLj38wXTwGWDODuO0NsmxYpwUw8coGjZv9VpxkeK5s0cGhlkNl35EeCYtLp1UCWNVM6blAXYsd5Nfq535MvfsZVUBLkOhMSgnyl7iC1sHCyb567wvBJGNB X-Forefront-PRVS: 08617F610C X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(479174004)(24454002)(377454003)(42186005)(87976001)(53416004)(50986999)(3846002)(87266999)(65816999)(76176999)(54356999)(189998001)(110136002)(5001960100002)(36756003)(5004730100002)(59896002)(5008740100001)(586003)(4326007)(1096002)(65956001)(230700001)(2906002)(6116002)(50466002)(83506001)(92566002)(23756003)(575784001)(64126003)(2950100001)(4001350100001)(122386002)(33656002)(65806001)(80316001)(77096005)(19580405001)(19580395003)(40100003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR07MB2134;H:dl.caveonetworks.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?iso-8859-1?Q?1;CY1PR07MB2134;23:/DNKA01vJwv4L7rUt0Sxl9Q+t8XzPQKrtuQqCNE?= =?iso-8859-1?Q?ZI9b/FBjsFyzqolryYmJwLxpLco+6JEW5V4H8ohQCU+tjGZoOpXRM0RkC+?= =?iso-8859-1?Q?XnMrqsdXbEnTxgXLmFdJ52zbJqj6pgEXI89blF5P7qje7C+z5LW3LVDzKj?= =?iso-8859-1?Q?dnlw2lZVJAxVqt6yxtsuDOU0K+DF0rEJJbDsCXKZ+/QDCvNHd+dPj54FsW?= =?iso-8859-1?Q?GT9gtMy4FdleIEuFlav7LHEJtxRFQb77cbjlmC4k+dS0XzhwiG/IGfGKbD?= =?iso-8859-1?Q?neaosmMg7C4cwu4cRaMGH7Yu6jkLCGoQ/C2mSt9zbANUJg/Whwof030Y9E?= =?iso-8859-1?Q?BKl/UDstaRerD1fAA5HXX+5a+GVzCgcnTPUb0tEckK7AsiJEhyAfV9WbmY?= =?iso-8859-1?Q?g9zgTbkLuxaxFHe8VLMSAseB4z+7TWrXvzxHFE13yZa+zilUUHjPwduWmT?= =?iso-8859-1?Q?k16dJP9tAWweaXLG/t9fqWzV/yVlvyXuosknKmYAxiuBzkgmYsKgL40oQF?= =?iso-8859-1?Q?ZwR/HZ4awM8AGqbAfcSoatbCnZ1exuUDnWT1etyp/rRuoPmxx8jzDqrG3a?= =?iso-8859-1?Q?ZOkl77W3wGE+SwLVoBcxLRQ8ykWBp498FsrnIAFM47V04yRPNYXCAwYY3g?= =?iso-8859-1?Q?IYjsyr2g7IKL3tkprCjbnMZFyUvgE5TNG4GkBuyx3H+cmEFXHfZETVcTur?= =?iso-8859-1?Q?70YxXjsL53aWCnB93YxImjdnMZ9ziVvScUauwFd+ZEO5IS73JFZH1mQlz9?= =?iso-8859-1?Q?Khend7h5WZ6Vf4GyJ/zWMWteZvJIqSPzrfuoT1GdcthagVKGzUIgp1UkXD?= =?iso-8859-1?Q?heZKfUx6pmPYOeb2w/AThQn2DL0vs6AzfSzGonPfCGm0UOQWAvXlKYmU9F?= =?iso-8859-1?Q?gp6ugEBZ0Oiz7BUPANSdZtRZ9nm3Z/akdJwT8l3nQV2UaKoVnZaiZV+sqW?= =?iso-8859-1?Q?ZipvUJxLDMH1PrTODlqsjJd3Rsfe8UKWPPcVouE8Q3abWXHqpVoVP8a1GY?= =?iso-8859-1?Q?wkle931ydk3gL8mGOK/2mIFj83dah+t5T6a09ipGI1FM8pZmmH0i10V4fU?= =?iso-8859-1?Q?NCCQY65KEvwJr77yhtHvDUNiHp9s3q5V9sDM02Ynjd+kI8MgcJzEXEyC1h?= =?iso-8859-1?Q?SGiu1Z3k4tbOnpSh4opw0kxAHy9YWvs4wO68sse9vN9Y0656MuevyQBeQz?= =?iso-8859-1?Q?3fE8mYegcNx4nUypCK/70zdIpQ76LqNbw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB2134;5:VVjv27iBAwMDBH3spFkurS5eTWDoiglbisOMafsXLeDKFL8HLuJgVi/Wc/tZ0iIV8dWxjmLE+n6EUtIID/GycxS5iNtb/F2jGzZ9B6ANGbYyub0wkG+cRQuDUFzQF/2jI6/0uwzI3V2eoJg0yMLNBw==;24:6hopx31Hew7i6sKwpvUDUuHUAPxsVlS+ygcbIrSjKaSny1tB6HrXptoT/ATMUz6CisP+tzPKKia6n/I/qG6cf+6/biSNiqbv0VdWKToTSnw= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2016 17:34:35.1299 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2134 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/23/2016 02:26 AM, Will Deacon wrote: > On Mon, Feb 22, 2016 at 05:58:22PM -0800, David Daney wrote: >> From: Ganapatrao Kulkarni >> >> Attempt to get the memory and CPU NUMA node via of_numa. If that >> fails, default the dummy NUMA node and map all memory and CPUs to node >> 0. >> >> Tested-by: Shannon Zhao >> Reviewed-by: Robert Richter >> Signed-off-by: Ganapatrao Kulkarni >> Signed-off-by: David Daney >> --- >> arch/arm64/Kconfig | 26 +++ >> arch/arm64/include/asm/mmzone.h | 12 ++ >> arch/arm64/include/asm/numa.h | 45 +++++ >> arch/arm64/include/asm/topology.h | 10 + >> arch/arm64/kernel/pci.c | 10 + >> arch/arm64/kernel/setup.c | 4 + >> arch/arm64/kernel/smp.c | 4 + >> arch/arm64/mm/Makefile | 1 + >> arch/arm64/mm/init.c | 34 +++- >> arch/arm64/mm/mmu.c | 1 + >> arch/arm64/mm/numa.c | 403 ++++++++++++++++++++++++++++++++++++++ >> 11 files changed, 545 insertions(+), 5 deletions(-) >> create mode 100644 arch/arm64/include/asm/mmzone.h >> create mode 100644 arch/arm64/include/asm/numa.h >> create mode 100644 arch/arm64/mm/numa.c > > [...] > >> diff --git a/arch/arm64/include/asm/mmzone.h b/arch/arm64/include/asm/mmzone.h >> new file mode 100644 >> index 0000000..a0de9e6 >> --- /dev/null >> +++ b/arch/arm64/include/asm/mmzone.h >> @@ -0,0 +1,12 @@ >> +#ifndef __ASM_MMZONE_H >> +#define __ASM_MMZONE_H >> + >> +#ifdef CONFIG_NUMA >> + >> +#include >> + >> +extern struct pglist_data *node_data[]; >> +#define NODE_DATA(nid) (node_data[(nid)]) >> + >> +#endif /* CONFIG_NUMA */ >> +#endif /* __ASM_MMZONE_H */ > > What happened to the patch cleaning this up in generic code? As per 0/5 : v11: - Dropped cleanup patches for other architectures, they will be submitted as a separate set after more testing. The "cleanup patches" were not building on x86, which is a bit of a problem. I believe I have corrected that issue, but would like to do a little more build testing on all the other architectures that are effected. I probably should have supplied more detail as to my plan of attack for these. To make review more manageable, I would like to consider the arm64 patches separately. The parties interested in getting arm64 NUMA working can proceed without waiting for the cleanups to be fully tested and acknowledged. I am working on testing the cleanups on each architecture touched, and will resubmit them as a separate patch set this week. I think splitting them like this will streamline the process of getting to the eventual goal of having both arm64 NUMA and the cleanups merged. David.