From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4560C04EB9 for ; Mon, 3 Dec 2018 16:31:54 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 546A220661 for ; Mon, 3 Dec 2018 16:31:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 546A220661 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 437r9h5P87zDqSg for ; Tue, 4 Dec 2018 03:31:52 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=rppt@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 437r5w6K0kzDqNR for ; Tue, 4 Dec 2018 03:28:36 +1100 (AEDT) Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wB3GPpp3081312 for ; Mon, 3 Dec 2018 11:28:34 -0500 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2p57n41gg7-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 03 Dec 2018 11:28:34 -0500 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 3 Dec 2018 16:28:28 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 3 Dec 2018 16:28:21 -0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wB3GSKaf25690160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 3 Dec 2018 16:28:20 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 99EB6A4054; Mon, 3 Dec 2018 16:28:20 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 55F64A4060; Mon, 3 Dec 2018 16:28:18 +0000 (GMT) Received: from rapoport-lnx (unknown [9.148.206.196]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 3 Dec 2018 16:28:18 +0000 (GMT) Date: Mon, 3 Dec 2018 18:28:16 +0200 From: Mike Rapoport To: Sam Ravnborg Subject: Re: [PATCH v2 3/6] sh: prefer memblock APIs returning virtual address References: <1543852035-26634-1-git-send-email-rppt@linux.ibm.com> <1543852035-26634-4-git-send-email-rppt@linux.ibm.com> <20181203161052.GA4244@ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181203161052.GA4244@ravnborg.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-TM-AS-GCONF: 00 x-cbid: 18120316-4275-0000-0000-000002EB6519 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18120316-4276-0000-0000-000037F86955 Message-Id: <20181203162816.GA26700@rapoport-lnx> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-12-03_09:, , 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=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1812030154 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: Michal Hocko , linux-sh@vger.kernel.org, linux-mm@kvack.org, Rich Felker , Paul Mackerras , sparclinux@vger.kernel.org, Vincent Chen , Jonas Bonn , linux-c6x-dev@linux-c6x.org, Yoshinori Sato , Russell King , Mark Salter , Arnd Bergmann , Stefan Kristiansson , openrisc@lists.librecores.org, Greentime Hu , Stafford Horne , Guan Xuetao , linux-arm-kernel@lists.infradead.org, Michal Simek , linux-kernel@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Mon, Dec 03, 2018 at 05:10:52PM +0100, Sam Ravnborg wrote: > Hi Mike. > > On Mon, Dec 03, 2018 at 05:47:12PM +0200, Mike Rapoport wrote: > > 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)); > The new code will always assign NODE_DATA(nid), where the old > code only assigned NODE_DATA(nid) in the good case. > I dunno if this is an issue, just noticed the difference and > wanted to point it out. If the allocation fails the NODE_DATA(nid) remains zero anyway and there is a panic() call. So I think there is no actual functional change here. > Sam > -- Sincerely yours, Mike.