From patchwork Sun Dec 9 15:00:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10720095 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 1DF2C1751 for ; Sun, 9 Dec 2018 15:00:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EAD62A419 for ; Sun, 9 Dec 2018 15:00:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0299D2A426; Sun, 9 Dec 2018 15:00:55 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE 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 896B62A419 for ; Sun, 9 Dec 2018 15:00:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19A288E005B; Sun, 9 Dec 2018 10:00:54 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 12A3F8E005A; Sun, 9 Dec 2018 10:00:54 -0500 (EST) 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 EBFCC8E005B; Sun, 9 Dec 2018 10:00:53 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id A63898E005A for ; Sun, 9 Dec 2018 10:00:53 -0500 (EST) Received: by mail-ed1-f69.google.com with SMTP id y35so4211902edb.5 for ; Sun, 09 Dec 2018 07:00:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=g8CeF6Laocb9gx1NSuPUxT9QoSJjlnP3AnlPKz7kaMU=; b=cZ9euJlUseWnEAfhWGJct/jEvMCgO9QRjVvaqD/pMGoS4IuXEfTdWzWH1ngf8pUwcW V9fBj0vQ/2EjHVzcMkHwCaRKU2wBeIodD2NEXSEmVBdFeFMFBL0SEg4XRRT9KsezT8/h UnSg9fEWUtXxXAF2SvZ1buuOfW3EEiZj+zHs3EwyI+64UdLZV9euSnx7CcY92lHQJPXs esvpxtHBLF23+/dviJSsF54/erFPAd1qNuQBD2CkDKsnc2Cp9jE1+sjveaH42zWRrlLd XVBTqb1f181sdZ2U4TmB/ClHiOxJ+kLaN+KTP6971CGxK4TcD85qNH0gEbbjskWZnIh5 C68Q== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: AA+aEWbZvyhKE6z87e6Ykx8CEw5E28fhtiUvp/JYWO5mGUSlztAhuJKy /ZkKFOWmiCKLYtLRMaGM2S9PiJe6d3/Gt3YAzYWVG3t2CMYm9kCzUOkGlhsgINSQGX/a2AnwtV4 s1bpHQI06FKgOlDLUtBy90HkW8FAAklxZWpnXUPs5HrL7tm9Rn8lWUC1owG/VtumQ3g== X-Received: by 2002:a17:906:6b99:: with SMTP id l25-v6mr7117073ejr.154.1544367653144; Sun, 09 Dec 2018 07:00:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/XExvPwWjgtXIphnNk3etHLgI3XRWNvIfq06GKY3zn+RP2IYwYWOfi7Y7zijdEvGeNKvfrt X-Received: by 2002:a17:906:6b99:: with SMTP id l25-v6mr7117037ejr.154.1544367652033; Sun, 09 Dec 2018 07:00:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544367651; cv=none; d=google.com; s=arc-20160816; b=V+4v/2bT/Cp54xKmxw+Fq1M10t6RCUm0bXvaJLLGIbkFGphZf3J7eT5DXxdw0MI4cP j84QrsomowsMDN8sM7Y5vHEnxqdSFqGgJsOVIxTPp2q7487OVAxAwyqoKn9Ys373Qnxf PIim/F51mdyZ2DclTv23FIUEKRvJ4EE6uZooLy3LAu9l3oprb32FttFpbMsAUHKGxvOn p9kT4BeSjsb4tOauL84cRB1thzNGdEauk6kExwcRn4QdpmmyBg86jCKCBzPY3dEpjCii KrsS3SitcQZMERdFHp+c9kkD8HFwIsRNeytrCBuVe6Wvh9FMoE70lKDEWpP1HpZOkzhX ljsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from; bh=g8CeF6Laocb9gx1NSuPUxT9QoSJjlnP3AnlPKz7kaMU=; b=pUXRf+5T8PRjGIJpTx94Ef7n/ig0iREUwe9ek4jTPt3Ioud54enCZaZIOSEF+L8Zvz ybj3et2o88YIqZa5wyCHGKeWqzpV6FRImGENmeaZcD7HUtFGmbjRaKTYFYUR2IchjM9j 32HOGqu5TRiRPSAH7J9wSW6un4Jcgl7JJD67LLNrgQxrpBmHnVNqdVSRBsjh53zv69b3 JWU/dmanuj9AHfClLE/CSF4WMSd8CoESLvHVCQprWxnEXK6oUuccNaOHGtF5PoqH7SfF TMQipS4eQgGKc8n00erOmD6g9+fN4XpXS6vCbiuJS7IAPbixqlvZiaITLEKD5jT90fEX l9gw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id x5-v6si3131479ejj.55.2018.12.09.07.00.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Dec 2018 07:00:51 -0800 (PST) Received-SPF: pass (google.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wB9ExJF0096447 for ; Sun, 9 Dec 2018 10:00:50 -0500 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 2p8vghp0yn-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 09 Dec 2018 10:00:50 -0500 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 9 Dec 2018 15:00:48 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Sun, 9 Dec 2018 15:00:40 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wB9F0dcr7930170 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Sun, 9 Dec 2018 15:00:39 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B1CFB5204F; Sun, 9 Dec 2018 15:00:39 +0000 (GMT) Received: from rapoport-lnx (unknown [9.148.8.213]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id EBD2252054; Sun, 9 Dec 2018 15:00:36 +0000 (GMT) Received: by rapoport-lnx (sSMTP sendmail emulation); Sun, 09 Dec 2018 17:00:36 +0200 From: Mike Rapoport To: Andrew Morton Cc: Arnd Bergmann , Benjamin Herrenschmidt , "David S. Miller" , Guan Xuetao , Greentime Hu , Jonas Bonn , Michael Ellerman , Michal Hocko , Michal Simek , Mark Salter , Paul Mackerras , Rich Felker , Russell King , Stefan Kristiansson , Stafford Horne , Vincent Chen , Yoshinori Sato , linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-sh@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, Mike Rapoport Subject: [PATCH v3 3/6] sh: prefer memblock APIs returning virtual address Date: Sun, 9 Dec 2018 17:00:21 +0200 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544367624-15376-1-git-send-email-rppt@linux.ibm.com> References: <1544367624-15376-1-git-send-email-rppt@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18120915-0012-0000-0000-000002D6AF4F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18120915-0013-0000-0000-0000210C1EDC Message-Id: <1544367624-15376-4-git-send-email-rppt@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-12-09_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=929 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1812090139 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 Rather than use the memblock_alloc_base that returns a physical address and then convert this address to the virtual one, use appropriate memblock function that returns a virtual address. There is a small functional change in the allocation of then NODE_DATA(). Instead of panicing if the local allocation failed, the non-local allocation attempt will be made. Signed-off-by: Mike Rapoport --- arch/sh/mm/init.c | 18 +++++------------- arch/sh/mm/numa.c | 5 ++--- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index c8c13c77..3576b5f 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -192,24 +192,16 @@ void __init page_table_range_init(unsigned long start, unsigned long end, void __init allocate_pgdat(unsigned int nid) { unsigned long start_pfn, end_pfn; -#ifdef CONFIG_NEED_MULTIPLE_NODES - unsigned long phys; -#endif get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); #ifdef CONFIG_NEED_MULTIPLE_NODES - phys = __memblock_alloc_base(sizeof(struct pglist_data), - SMP_CACHE_BYTES, end_pfn << PAGE_SHIFT); - /* Retry with all of system memory */ - if (!phys) - phys = __memblock_alloc_base(sizeof(struct pglist_data), - SMP_CACHE_BYTES, memblock_end_of_DRAM()); - if (!phys) + NODE_DATA(nid) = memblock_alloc_try_nid_nopanic( + sizeof(struct pglist_data), + SMP_CACHE_BYTES, MEMBLOCK_LOW_LIMIT, + MEMBLOCK_ALLOC_ACCESSIBLE, nid); + if (!NODE_DATA(nid)) panic("Can't allocate pgdat for node %d\n", nid); - - NODE_DATA(nid) = __va(phys); - memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); #endif NODE_DATA(nid)->node_start_pfn = start_pfn; diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c index 830e8b3..c4bde61 100644 --- a/arch/sh/mm/numa.c +++ b/arch/sh/mm/numa.c @@ -41,9 +41,8 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) __add_active_range(nid, start_pfn, end_pfn); /* Node-local pgdat */ - NODE_DATA(nid) = __va(memblock_alloc_base(sizeof(struct pglist_data), - SMP_CACHE_BYTES, end)); - memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); + NODE_DATA(nid) = memblock_alloc_node(sizeof(struct pglist_data), + SMP_CACHE_BYTES, nid); NODE_DATA(nid)->node_start_pfn = start_pfn; NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;