From patchwork Thu Jul 26 19:35:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Tatashin X-Patchwork-Id: 10546337 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C09A5112B for ; Thu, 26 Jul 2018 19:35:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE1D22B685 for ; Thu, 26 Jul 2018 19:35:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A07D22BCDA; Thu, 26 Jul 2018 19:35:33 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 828142B685 for ; Thu, 26 Jul 2018 19:35:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 982216B000C; Thu, 26 Jul 2018 15:35:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 930146B000D; Thu, 26 Jul 2018 15:35:31 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 820A76B000E; Thu, 26 Jul 2018 15:35:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f197.google.com (mail-qt0-f197.google.com [209.85.216.197]) by kanga.kvack.org (Postfix) with ESMTP id 568F56B000C for ; Thu, 26 Jul 2018 15:35:31 -0400 (EDT) Received: by mail-qt0-f197.google.com with SMTP id g7-v6so2121338qtp.19 for ; Thu, 26 Jul 2018 12:35:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:subject:date:message-id :in-reply-to:references; bh=4zEpFMlFhWgE0aXlCk/41YZX98c+jpFomxA+EUOlTjk=; b=T9c3ewhQjaGpjEVUED1AQUynluwg3bWFnJOY9TLpvkIRh4AMadcgGz8bbPSSqdP5z3 cKN2o/7BQ0L9DsWu36BpssQnO5gbydw2Xd8xtxUh2Cz5miEZp1XYw8mKU523yILh5Xrw okx94x+wJLRKEYR41zLXc7c80kN7Q/mCh5IzxuQBuUR/IbLX54ycmKlz74EUG2SIbwUu IodAf1m/S7A5je1kRgYvBVjMVZGlyYU2MW2mGSZyYrbdu1eTKoRST1HPxq5wVOV2lmvk D3iBPpMKa7ZEQFdB0VzzpQgkyTMzEpA8xZ4nRKoZ2YfOuKwjmYrqAlU6Swz3aIds89wD Jyfg== X-Gm-Message-State: AOUpUlHqs3mhogVKxD7nrejhdUAW8lINj/+8ObHKVPPhImHEBslqa489 kiTzq+F2V40fw+Bxb67jh+roZwb7xh7rHk/GK156FbXjtMEXQXrKDhntUPYpKxNSNKsV9gHDCNx usFpcHscwuOoJ7tr3/9BV7NFuGvvN26cyAyb0405XYx94uumEipWhon07o+t8sb5uxw== X-Received: by 2002:a37:aa86:: with SMTP id t128-v6mr3124939qke.135.1532633731076; Thu, 26 Jul 2018 12:35:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdKj7QHm5ZWGTcrs3lfys+VO9e+nYpsnNW/TspI2rH/ygn+cMqxSfZa894beB615qd8OFBg X-Received: by 2002:a37:aa86:: with SMTP id t128-v6mr3124893qke.135.1532633730397; Thu, 26 Jul 2018 12:35:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532633730; cv=none; d=google.com; s=arc-20160816; b=FkMyReaotZF7N6maSNwjZvzpAOlglw/INy2i/886tBosMHLMqcmoWYifFKyBvNAFuV NiZkVkLVpno2qKZEy+/5pxkf1CQwoMhcJJ1ShPJUV+sR/YqsvX0vg3eXqVWxOTCSYIRg LkprScXCHpZBfHHGqSzMidEzRdY0jygW2pAkShJ8QqgO/KVgq5hDtaRw4rvbMinur4ab bABlvYo3n+EGaX+0sWFqYez1BCm01GXUF+obyGM2Z1i8pnQS3G6EMwMy4Vq90IJpZrv6 0XMh9m2iYpGvJTU5jza0N5ZnXiJDcQMWHlS8NOMUrKv/CL4feIlRMBVoV/9JqqN4OeNm 29pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:arc-authentication-results; bh=4zEpFMlFhWgE0aXlCk/41YZX98c+jpFomxA+EUOlTjk=; b=qCAbm4WJOCJmVFDq5e3M7SkLy9Ofl4VBbYNWNZjZv9oOQ8VZ8P8zbc+1KUn//tKFJz YnXdOKj1cO2Fhv3LWV2xjCLl7+6YANwU4YYZAbmKeSEZthRNf2AQt0J332SyBF9CIrUo 0+R35FxE3T1zKxDiSmcTYxlhX6ThrwYmhNfdrsPN0DpTQjPSAnBVXYLXJ1j9ezRhH+JT rzMh0U7m66oHgbo8vj3w1U9FGZnmySxHkzdpaQgBGZR+Xc3LKSdKdusvqFbmk+nuN5Pu Km6QYzqTtpm0OhJDhtcWAfAoCtpgnV5hbekcocZ8IBCjUomFXDJWwz5HO2xbCs2X2w2W p8Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=cXN2QuUK; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 141.146.126.78 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from aserp2120.oracle.com (aserp2120.oracle.com. [141.146.126.78]) by mx.google.com with ESMTPS id m54-v6si2148909qtk.122.2018.07.26.12.35.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 12:35:30 -0700 (PDT) Received-SPF: pass (google.com: domain of pasha.tatashin@oracle.com designates 141.146.126.78 as permitted sender) client-ip=141.146.126.78; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=cXN2QuUK; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 141.146.126.78 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w6QJSRF9153802; Thu, 26 Jul 2018 19:35:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=4zEpFMlFhWgE0aXlCk/41YZX98c+jpFomxA+EUOlTjk=; b=cXN2QuUK5ZauhLNe8IWHTOXd8UAqgieEgcrnvX3AxCV/K/BstspmXbQ8CaHwUUxAuBQn f6llF1STawbFSDPnu0m1FudEQQLpWh4OmJLwyKgxlL8R15KcYY2dSqRtSy8ApsCOSu0V ygay7XUBu9uzRG2Zc4ZkYSMVZbSEViH6ahGluNBD3iAjrWIJ7lsiq8oFddabRo0C2Ekt mXu31ITcw7QB6p/PIMdjzzbcJ/8R+dCkh8U1uhCEXBZP41cf8n4DODYeYJOCel19o1cH mXTp+DiO+LuGvufMVobzoWDy2yul9MfFwWGW+W+MUSUCW9XoRLYzR0XVQXMNozga9KYP Zg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp2120.oracle.com with ESMTP id 2kbvsp4hpe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Jul 2018 19:35:21 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w6QJZKJ0021229 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Jul 2018 19:35:20 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w6QJZIjM000784; Thu, 26 Jul 2018 19:35:18 GMT Received: from localhost.localdomain (/73.69.118.222) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 26 Jul 2018 12:35:18 -0700 From: Pavel Tatashin To: steven.sistare@oracle.com, daniel.m.jordan@oracle.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, mhocko@suse.com, linux-mm@kvack.org, dan.j.williams@intel.com, jack@suse.cz, jglisse@redhat.com, jrdr.linux@gmail.com, bhe@redhat.com, gregkh@linuxfoundation.org, vbabka@suse.cz, richard.weiyang@gmail.com, dave.hansen@intel.com, rientjes@google.com, mingo@kernel.org, osalvador@techadventures.net, pasha.tatashin@oracle.com, abdhalee@linux.vnet.ibm.com, mpe@ellerman.id.au Subject: [PATCH v2 1/3] mm: make memmap_init a proper function Date: Thu, 26 Jul 2018 15:35:07 -0400 Message-Id: <20180726193509.3326-2-pasha.tatashin@oracle.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180726193509.3326-1-pasha.tatashin@oracle.com> References: <20180726193509.3326-1-pasha.tatashin@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8966 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=687 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807260200 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP memmap_init is sometimes a macro sometimes a function based on __HAVE_ARCH_MEMMAP_INIT. It is only a function on ia64. Make memmap_init a weak function instead, and let ia64 redefine it. Signed-off-by: Pavel Tatashin Reviewed-by: Andrew Morton Reviewed-by: Oscar Salvador --- arch/ia64/include/asm/pgtable.h | 1 - mm/page_alloc.c | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index 165827774bea..b1e7468eb65a 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -544,7 +544,6 @@ extern struct page *zero_page_memmap_ptr; # ifdef CONFIG_VIRTUAL_MEM_MAP /* arch mem_map init routine is needed due to holes in a virtual mem_map */ -# define __HAVE_ARCH_MEMMAP_INIT extern void memmap_init (unsigned long size, int nid, unsigned long zone, unsigned long start_pfn); # endif /* CONFIG_VIRTUAL_MEM_MAP */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2dec8056a091..6796dacd46ac 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5554,10 +5554,11 @@ static void __meminit zone_init_free_lists(struct zone *zone) } } -#ifndef __HAVE_ARCH_MEMMAP_INIT -#define memmap_init(size, nid, zone, start_pfn) \ - memmap_init_zone((size), (nid), (zone), (start_pfn), MEMMAP_EARLY, NULL) -#endif +void __meminit __weak memmap_init(unsigned long size, int nid, + unsigned long zone, unsigned long start_pfn) +{ + memmap_init_zone(size, nid, zone, start_pfn, MEMMAP_EARLY, NULL); +} static int zone_batchsize(struct zone *zone) { From patchwork Thu Jul 26 19:35:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Tatashin X-Patchwork-Id: 10546341 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4E2414E2 for ; Thu, 26 Jul 2018 19:35:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB9D02B685 for ; Thu, 26 Jul 2018 19:35:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFB052BCDA; Thu, 26 Jul 2018 19:35:37 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38D182B685 for ; Thu, 26 Jul 2018 19:35:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7CB06B0010; Thu, 26 Jul 2018 15:35:34 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CE1606B0266; Thu, 26 Jul 2018 15:35:34 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE4DA6B026A; Thu, 26 Jul 2018 15:35:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ua0-f198.google.com (mail-ua0-f198.google.com [209.85.217.198]) by kanga.kvack.org (Postfix) with ESMTP id 72CC56B0010 for ; Thu, 26 Jul 2018 15:35:34 -0400 (EDT) Received: by mail-ua0-f198.google.com with SMTP id j12-v6so830420uaq.16 for ; Thu, 26 Jul 2018 12:35:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:subject:date:message-id :in-reply-to:references; bh=HsscRZRuyWCD3fYHB04D+mmajsGAkMaKwj+qJalzQ1o=; b=fKdFwMJD6tSi5L3uNctZkY/xWsOvSn4oPJoh2KUucc4dTlXiuy+b64yFFRZhmxbZpB OvTluweqxsg2lB+yDixvgObPpas+HGpD0CvEQwFLcIg/5O8dQrrlbFV3hYywm99cMlgL 8TwxX+GRY7efJDB6jU55RlHtLxni8bgQYYG+HygtVN85Iqrr4y2EG/LzHrljw2SKnvoW 3qqaceN+BQY5S9xSNN99qDFVMrmGnLVbFlfaQLXI3rw7FiHtb+0Rz1qGZbnix35g6ayW yVtCudMn6x/YPiCt3+X1CrYH0ZtFti3x0N2jftnoPCOwNpA0dDa0zTE5XFK5bi1u0BqT MUhA== X-Gm-Message-State: AOUpUlFbU+llP+qVjvjKPAueg/Lxh3xtiaAK3wS6jcfN0Np9KOHjUe0I Yjry1up1OqyPn2PYYilIyQpgKK2IIW+y9Z/v2qyNxM/L4qvbXNH6YNVwhYQ2Nw/UHSnoXcr2H5Z TQbfWB+M1hSQG3EudTfJwi2Uo20QTGMErH1LdCsHohu40PpQThjHIs/Kpcf6cixR57Q== X-Received: by 2002:a1f:26ce:: with SMTP id m197-v6mr2067934vkm.115.1532633734137; Thu, 26 Jul 2018 12:35:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeGXYVWOVhs6myX6MY0lZdqNGhZ2fJzDblUFq2icOxhv/t9Yx9j+6mIJLlM8M1eOFGneLKR X-Received: by 2002:a1f:26ce:: with SMTP id m197-v6mr2067911vkm.115.1532633733443; Thu, 26 Jul 2018 12:35:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532633733; cv=none; d=google.com; s=arc-20160816; b=0X3wCm3L9C+NxEqebk5bDr1KD3R+A7FRGQhfgke2JRb9NOfleFI3hLIpZcyrbsJySB BVH6b1yyejUR83d6LeW4O6cN3JefN8jkPBNHyjkmy4opQZvv0Qqc/KlUnvOKoCdXCJ4B wiBbhkRKGTexmaUTt9tMAethmjOF1ieshzt+EELNCAqnSNh3QrxwC4phL6/20qDiKfhY HWLVX1WjBbtD6elBg9srcZCIHh0srvJvY4OWSsYsupsbR2UQ1v44mB4beXRE3o0coXZV 9CGhPCnitEtnFBlJtRvrCqzGPiTJo9Mh7mrjdrRV6O1D7TIF+dNQ3/hdAQrWTbHHLHm0 37YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:arc-authentication-results; bh=HsscRZRuyWCD3fYHB04D+mmajsGAkMaKwj+qJalzQ1o=; b=KvOxv/qRxASNy2aOm+HdgvDzwWcEyDArmA/Pk2ugxr6A5iYX/TyAnHpwUyr1tQ5Rw6 yZIvdiPuHT/WTUbtUn0gimqwdrVQqhfQEaiicprpIkxo9OnUOLhRU60shQsRX7YV4VI8 CKaJvGEGwHV7s29BFTcx/v24dysXFfZhnZJy1YQERK/asSXq6WNjRohFj+JlGYRhGDgI Ng7qR8YtVGL0ysZuvmyYDtUwlJmAokqMXEjsnmJFOF6z1QcdxUBuv3kWBVGv8/3Mb3HH T5absh+gIHCPcBY/0awkEOIks8gXAOdUTfDs6Tqd2Zf5g9TuzjniWaR6x7NDRNEuNWAO MMwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=OFwqRlbJ; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from userp2120.oracle.com (userp2120.oracle.com. [156.151.31.85]) by mx.google.com with ESMTPS id x72-v6si748474vkd.96.2018.07.26.12.35.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 12:35:33 -0700 (PDT) Received-SPF: pass (google.com: domain of pasha.tatashin@oracle.com designates 156.151.31.85 as permitted sender) client-ip=156.151.31.85; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=OFwqRlbJ; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w6QJShvs123843; Thu, 26 Jul 2018 19:35:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=HsscRZRuyWCD3fYHB04D+mmajsGAkMaKwj+qJalzQ1o=; b=OFwqRlbJZGibVEo8iNrxqt9Hk0uyW9IHoWSVLchAflSSa6ipqJQTtrGWCjVAlRIFWuHZ IASOKaVrQAX3IL2LsD4VIIxP4dipVTIZs/FVdyZVVnXxdRwkS0+DdfVNzgqikIdTtlzm gSIbdvpP5eKy6heI/IQZQi1cFQn3c5aOBjsMogbOzbekorBJm6VrI0rRxDwpVhR6vSCh r0Sc+lp0fa1Lu8HAFahRzzOsNkQQa77WjMaLllrz0Z7aFoLVWVbVhzh6s3n43Qku0li9 gqtoSCjIeB+Yogihv2vyk4OLkUnbXrEWbpIPvy+DLrOWP3zoascrKqaTEkb0QRyJtOi0 gg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2kbwfq4h5b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Jul 2018 19:35:22 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w6QJZLoE021292 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Jul 2018 19:35:21 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w6QJZKvi002890; Thu, 26 Jul 2018 19:35:20 GMT Received: from localhost.localdomain (/73.69.118.222) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 26 Jul 2018 12:35:20 -0700 From: Pavel Tatashin To: steven.sistare@oracle.com, daniel.m.jordan@oracle.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, mhocko@suse.com, linux-mm@kvack.org, dan.j.williams@intel.com, jack@suse.cz, jglisse@redhat.com, jrdr.linux@gmail.com, bhe@redhat.com, gregkh@linuxfoundation.org, vbabka@suse.cz, richard.weiyang@gmail.com, dave.hansen@intel.com, rientjes@google.com, mingo@kernel.org, osalvador@techadventures.net, pasha.tatashin@oracle.com, abdhalee@linux.vnet.ibm.com, mpe@ellerman.id.au Subject: [PATCH v2 2/3] mm: calculate deferred pages after skipping mirrored memory Date: Thu, 26 Jul 2018 15:35:08 -0400 Message-Id: <20180726193509.3326-3-pasha.tatashin@oracle.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180726193509.3326-1-pasha.tatashin@oracle.com> References: <20180726193509.3326-1-pasha.tatashin@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8966 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807260200 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP update_defer_init() should be called only when struct page is about to be initialized. Because it counts number of initialized struct pages, but there we may skip struct pages if there is some mirrored memory. So move, update_defer_init() after checking for mirrored memory. Also, rename update_defer_init() to defer_init() and reverse the return boolean to emphasize that this is a boolean function, that tells that the reset of memmap initialization should be deferred. Make this function self-contained: do not pass number of already initialized pages in this zone by using static counters. Signed-off-by: Pavel Tatashin Reviewed-by: Oscar Salvador --- mm/page_alloc.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6796dacd46ac..4946c73e549b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -306,24 +306,33 @@ static inline bool __meminit early_page_uninitialised(unsigned long pfn) } /* - * Returns false when the remaining initialisation should be deferred until + * Returns true when the remaining initialisation should be deferred until * later in the boot cycle when it can be parallelised. */ -static inline bool update_defer_init(pg_data_t *pgdat, - unsigned long pfn, unsigned long zone_end, - unsigned long *nr_initialised) +static bool __meminit +defer_init(int nid, unsigned long pfn, unsigned long end_pfn) { + static unsigned long prev_end_pfn, nr_initialised; + + /* + * prev_end_pfn static that contains the end of previous zone + * No need to protect because called very early in boot before smp_init. + */ + if (prev_end_pfn != end_pfn) { + prev_end_pfn = end_pfn; + nr_initialised = 0; + } + /* Always populate low zones for address-constrained allocations */ - if (zone_end < pgdat_end_pfn(pgdat)) - return true; - (*nr_initialised)++; - if ((*nr_initialised > pgdat->static_init_pgcnt) && - (pfn & (PAGES_PER_SECTION - 1)) == 0) { - pgdat->first_deferred_pfn = pfn; + if (end_pfn < pgdat_end_pfn(NODE_DATA(nid))) return false; + nr_initialised++; + if ((nr_initialised > NODE_DATA(nid)->static_init_pgcnt) && + (pfn & (PAGES_PER_SECTION - 1)) == 0) { + NODE_DATA(nid)->first_deferred_pfn = pfn; + return true; } - - return true; + return false; } #else static inline bool early_page_uninitialised(unsigned long pfn) @@ -331,11 +340,9 @@ static inline bool early_page_uninitialised(unsigned long pfn) return false; } -static inline bool update_defer_init(pg_data_t *pgdat, - unsigned long pfn, unsigned long zone_end, - unsigned long *nr_initialised) +static inline bool defer_init(int nid, unsigned long pfn, unsigned long end_pfn) { - return true; + return false; } #endif @@ -5459,9 +5466,7 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, struct vmem_altmap *altmap) { unsigned long end_pfn = start_pfn + size; - pg_data_t *pgdat = NODE_DATA(nid); unsigned long pfn; - unsigned long nr_initialised = 0; struct page *page; #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP struct memblock_region *r = NULL, *tmp; @@ -5492,8 +5497,6 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, if (!early_pfn_in_nid(pfn, nid)) continue; - if (!update_defer_init(pgdat, pfn, end_pfn, &nr_initialised)) - break; #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP /* @@ -5516,6 +5519,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, } } #endif + if (defer_init(nid, pfn, end_pfn)) + break; not_early: page = pfn_to_page(pfn); From patchwork Thu Jul 26 19:35:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Tatashin X-Patchwork-Id: 10546343 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5743C112B for ; Thu, 26 Jul 2018 19:35:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 505362B685 for ; Thu, 26 Jul 2018 19:35:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 447002BCDA; Thu, 26 Jul 2018 19:35:40 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A28EC2B685 for ; Thu, 26 Jul 2018 19:35:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 38FE96B026A; Thu, 26 Jul 2018 15:35:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 347436B026B; Thu, 26 Jul 2018 15:35:36 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16E266B026C; Thu, 26 Jul 2018 15:35:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk0-f198.google.com (mail-qk0-f198.google.com [209.85.220.198]) by kanga.kvack.org (Postfix) with ESMTP id E34E26B026A for ; Thu, 26 Jul 2018 15:35:35 -0400 (EDT) Received: by mail-qk0-f198.google.com with SMTP id c27-v6so2285704qkj.3 for ; Thu, 26 Jul 2018 12:35:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:subject:date:message-id :in-reply-to:references; bh=LoPUYfIjyFLnqtBz3bvdJXWWeJYIZbn3cn69IuFQuIE=; b=KEgnqw3Fr6x1nAQM6cS7c4EmgfPhA20ORWWi4sxz9DZqe88apCDy17srhRtD1OYNmB XpVRvvSdXKMSwxQvTXijotkc/ytGEwD+fTH8Z06ZjNWhSL8tWmYzTf7lzlE5JwldFDvs QiJtZC2Kgfpc6uHBekVci23g5sgfrnXF9sLw+XOsw0PKZCp+ngQmB7UeWk/EqCr5lwOL ewTrwed27IfA5syttV9NL0WVN6raq6DBD3MPax4rj6LHR/DMkPafZRa2bkn2Zh8I4G0p AUr46G4XkkgvAVBgqWdbjqalrtBrjV04ZoPdhx4B4ntZccLNR82LLUTtSbJ322hxIJ5I 9aZQ== X-Gm-Message-State: AOUpUlEWvcWu1LE+hMs4lW/YM2lKoXy+maUenaocNPjcgt8kRWbl+ak6 4wSLurdgGAxqGY+x3PIr05xxQCG2pOWQB6MtD3N72DAGJd88ncchxoRc4n3lRQXA4McfdHugLtN 8KAtCNbDzvlXvQC9KsrAyVsq/C16vUD32zHdqLw+dKBznA3MUZNc8gRV0R0zpArKdxg== X-Received: by 2002:a37:318b:: with SMTP id x133-v6mr3157486qkx.16.1532633735615; Thu, 26 Jul 2018 12:35:35 -0700 (PDT) X-Google-Smtp-Source: AAOMgpehskp+lXfe0eFX0KLryAt202x1Z5RZR/KCq6HlRleN/Ens+EFpIsiOkEfOtdI0jOkv9cwW X-Received: by 2002:a37:318b:: with SMTP id x133-v6mr3157420qkx.16.1532633734689; Thu, 26 Jul 2018 12:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532633734; cv=none; d=google.com; s=arc-20160816; b=sSzEE87H0KPyqan8gzQoph9etKJk5skavBeotFVBkqJFlvvNhiFfPTzi7kUJzqeZWL FgULdJ+Jkbj8iztJhu4SDPySyNvSY2708ffFKFMk9mX4CJ1DEl/WtMnanhArznl6fgu9 N/awRGpG8qNkJ+xIyBNVj8q/tq2yflCBVvTxxrLmhH928nHiclMKf7Ylu4unbYKZoy4j 4TKskEX1GzbBAsXLq5YvAGZjPgRhYoIiuQAerMhVEEMn/WgiwZUdybESGBsginW04c81 bzXSTk1yFKnqiCHencoW4JHrzXdGyUglAEifpSVBFXseW1q3cGymc4/yjOCCxaIrxprC VwtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:arc-authentication-results; bh=LoPUYfIjyFLnqtBz3bvdJXWWeJYIZbn3cn69IuFQuIE=; b=rPLHzTbh+th+8m1YhIFFQZcil3Xb+KKE38o8KopNh/AABBtm0lP6nqPCbBOEpzsxzM zYJVuv9O9OHaput1zfm+Wm5djfNnpC6fiEGFTLUasHzLr8fTwAHJ+BhgUBv1ayVio1WY iWrcGtqLAAslylAGDCFuxBRqwWE6QQuMPv8ju6kBCOnaBn/QCKakJlWDE+tyohAH+Nem 3UdZhFnWAQjD1SLqkDofNE/9nNEsnb1Scdel96Pd3pRmefyoESItk1JYK8OgU0qzKW9A Oqmv6SofDV+2lhpPZkfrfxyHHyHjzWSUHvJusWICDhhnnAY5Cxb6aXIawPt+YIdFpDAi U6xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=d+piAmcR; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from userp2120.oracle.com (userp2120.oracle.com. [156.151.31.85]) by mx.google.com with ESMTPS id d17-v6si2189644qtd.64.2018.07.26.12.35.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 12:35:34 -0700 (PDT) Received-SPF: pass (google.com: domain of pasha.tatashin@oracle.com designates 156.151.31.85 as permitted sender) client-ip=156.151.31.85; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=d+piAmcR; spf=pass (google.com: domain of pasha.tatashin@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=pasha.tatashin@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w6QJSYNG123769; Thu, 26 Jul 2018 19:35:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=LoPUYfIjyFLnqtBz3bvdJXWWeJYIZbn3cn69IuFQuIE=; b=d+piAmcR6t83bgMnCl+V6bsuA3UBC62vqZJcfX6MPU8NfO7b0NiBoflTsk9IsrS8Quwf Yyv3nYX4ar4D8BXrOGPS22UwY5RmQGXea5kYPPITkOLJzZFEO82jMshxVX3M/V76o+3K ghaitlK0JZcb3+CG+3SGRiAIQCpEYVpwPWUjvCiXI+Kf6kR2+/vXGuGqX4WSyqueqrUR M4aW9bef3PuaV53WWD8ysSvaZIvayEFmjmwysu1QU72ukL37EhtT0kiTXIWXioFCOoAK KMq4f2tzdReZvdJrNaQPXQRMvCx+Ot/LoFdwuhoD5O3o1tc/nZbkxr2Z1PgsFhHAjzP8 eQ== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2kbwfq4h5f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Jul 2018 19:35:25 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w6QJZOrI013410 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Jul 2018 19:35:24 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w6QJZNbT000822; Thu, 26 Jul 2018 19:35:23 GMT Received: from localhost.localdomain (/73.69.118.222) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 26 Jul 2018 12:35:22 -0700 From: Pavel Tatashin To: steven.sistare@oracle.com, daniel.m.jordan@oracle.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, mhocko@suse.com, linux-mm@kvack.org, dan.j.williams@intel.com, jack@suse.cz, jglisse@redhat.com, jrdr.linux@gmail.com, bhe@redhat.com, gregkh@linuxfoundation.org, vbabka@suse.cz, richard.weiyang@gmail.com, dave.hansen@intel.com, rientjes@google.com, mingo@kernel.org, osalvador@techadventures.net, pasha.tatashin@oracle.com, abdhalee@linux.vnet.ibm.com, mpe@ellerman.id.au Subject: [PATCH v2 3/3] mm: move mirrored memory specific code outside of memmap_init_zone Date: Thu, 26 Jul 2018 15:35:09 -0400 Message-Id: <20180726193509.3326-4-pasha.tatashin@oracle.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180726193509.3326-1-pasha.tatashin@oracle.com> References: <20180726193509.3326-1-pasha.tatashin@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8966 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807260200 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP memmap_init_zone, is getting complex, because it is called from different contexts: hotplug, and during boot, and also because it must handle some architecture quirks. One of them is mirroed memory. Move the code that decides whether to skip mirrored memory outside of memmap_init_zone, into a separate function. Signed-off-by: Pavel Tatashin Reviewed-by: Oscar Salvador --- mm/page_alloc.c | 74 +++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 40 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4946c73e549b..02e4b84038f8 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5456,6 +5456,30 @@ void __ref build_all_zonelists(pg_data_t *pgdat) #endif } +/* If zone is ZONE_MOVABLE but memory is mirrored, it is an overlapped init */ +static bool __meminit +overlap_memmap_init(unsigned long zone, unsigned long *pfn) +{ +#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP + static struct memblock_region *r; + + if (mirrored_kernelcore && zone == ZONE_MOVABLE) { + if (!r || *pfn >= memblock_region_memory_end_pfn(r)) { + for_each_memblock(memory, r) { + if (*pfn < memblock_region_memory_end_pfn(r)) + break; + } + } + if (*pfn >= memblock_region_memory_base_pfn(r) && + memblock_is_mirror(r)) { + *pfn = memblock_region_memory_end_pfn(r); + return true; + } + } +#endif + return false; +} + /* * Initially all pages are reserved - free ones are freed * up by free_all_bootmem() once the early boot process is @@ -5465,12 +5489,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, unsigned long start_pfn, enum memmap_context context, struct vmem_altmap *altmap) { - unsigned long end_pfn = start_pfn + size; - unsigned long pfn; + unsigned long pfn, end_pfn = start_pfn + size; struct page *page; -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP - struct memblock_region *r = NULL, *tmp; -#endif if (highest_memmap_pfn < end_pfn - 1) highest_memmap_pfn = end_pfn - 1; @@ -5487,42 +5507,19 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, * There can be holes in boot-time mem_map[]s handed to this * function. They do not exist on hotplugged memory. */ - if (context != MEMMAP_EARLY) - goto not_early; - - if (!early_pfn_valid(pfn)) { - pfn = next_valid_pfn(pfn) - 1; - continue; - } - - if (!early_pfn_in_nid(pfn, nid)) - continue; - -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP - /* - * Check given memblock attribute by firmware which can affect - * kernel memory layout. If zone==ZONE_MOVABLE but memory is - * mirrored, it's an overlapped memmap init. skip it. - */ - if (mirrored_kernelcore && zone == ZONE_MOVABLE) { - if (!r || pfn >= memblock_region_memory_end_pfn(r)) { - for_each_memblock(memory, tmp) - if (pfn < memblock_region_memory_end_pfn(tmp)) - break; - r = tmp; - } - if (pfn >= memblock_region_memory_base_pfn(r) && - memblock_is_mirror(r)) { - /* already initialized as NORMAL */ - pfn = memblock_region_memory_end_pfn(r); + if (context == MEMMAP_EARLY) { + if (!early_pfn_valid(pfn)) { + pfn = next_valid_pfn(pfn) - 1; continue; } + if (!early_pfn_in_nid(pfn, nid)) + continue; + if (overlap_memmap_init(zone, &pfn)) + continue; + if (defer_init(nid, pfn, end_pfn)) + break; } -#endif - if (defer_init(nid, pfn, end_pfn)) - break; -not_early: page = pfn_to_page(pfn); __init_single_page(page, pfn, zone, nid); if (context == MEMMAP_HOTPLUG) @@ -5539,9 +5536,6 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, * can be created for invalid pages (for alignment) * check here not to call set_pageblock_migratetype() against * pfn out of zone. - * - * Please note that MEMMAP_HOTPLUG path doesn't clear memmap - * because this is done early in sparse_add_one_section */ if (!(pfn & (pageblock_nr_pages - 1))) { set_pageblock_migratetype(page, MIGRATE_MOVABLE);