From patchwork Tue May 23 04:05:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 765727 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wX2884F7dz9sNy for ; Tue, 23 May 2017 14:08:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X18Bmler"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wX2882xYHzDqbk for ; Tue, 23 May 2017 14:08:40 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X18Bmler"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wX24j1218zDqZf for ; Tue, 23 May 2017 14:05:41 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X18Bmler"; dkim-atps=neutral Received: by mail-pf0-x244.google.com with SMTP id f27so24501903pfe.0 for ; Mon, 22 May 2017 21:05:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7HSsYc2fKoa1LMpo8qmLFWdJN2H0/0t95ibFxPOsjFw=; b=X18Bmlerqf+ycx9Nt+CiaitNGbfSopcgFh7I9v8zxXw4Xw4jpEY/f6hc5buRwYFC4+ HSon1xKda1QPF7mB9hWtwmo4+4ZFaOsuPbK/aNMmIvQhMz6zyjXy0kYyzrm0rACJzYGq m3rTVWfOWCRJiE7kSGhpxlVBrWtWmdeHRIAFYzxQ4HRwPP8MCZVyki8oruqc3JIa16Rj qWa0EgCusLNmbe5MOgFnYK3cf0u8B07k4sPpRsbUJobyjCtdWxUJZEKSNTf80Out+o6y d+LfyoQnLxwi4Ynm46OkphgIO0QV+bAWFx0WK7alwKLjrecpANjpSvZUPKES17IaGn2u 4Dtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7HSsYc2fKoa1LMpo8qmLFWdJN2H0/0t95ibFxPOsjFw=; b=OHNbUWiTGKt/GoTyap+jEqsDzQJo9jMNtbvReDd3P4MeNfvPZNyE++bMSiDg7SloU2 eACP4L59cmKgi8eWODfBjsFK70WifCCCB1Q0WV25CFSEg0GSDtoyU05YYNSIiMtXbj9E KpQx0NgJV6vDZIjlbI6gJoGwHHac6boYFz2+H9wdlQ0PUJ/nkJGL7cgicqXKC7O8kjte Kzb8pnlmSFTry9xHv/LGZryje7fwPsKssvZbsv6QOyhEjxIHIYO+NtQjp4gTLkYqXLaf 3Kdk9KhFif7ABmw9VJsip7Nh8b3JFyUxt/fnblcnLxpArK0Q/LD7rthb78X3p5tbwJh/ v3XQ== X-Gm-Message-State: AODbwcBTBr2iJvudt7JE4XDUKltGubGzjBRq16bHSK8dmB0laeb80lVL hvkbxZsIrrvz7g== X-Received: by 10.99.109.9 with SMTP id i9mr29173947pgc.56.1495512339485; Mon, 22 May 2017 21:05:39 -0700 (PDT) Received: from flat-canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id s16sm27908426pgo.39.2017.05.22.21.05.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 21:05:39 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/6] powerpc/vmemmap: Reshuffle vmemmap_free() Date: Tue, 23 May 2017 14:05:20 +1000 Message-Id: <20170523040524.13717-2-oohall@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170523040524.13717-1-oohall@gmail.com> References: <20170523040524.13717-1-oohall@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mm@kvack.org, Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Removes an indentation level and shuffles some code around to make the following patch cleaner. No functional changes. Signed-off-by: Oliver O'Halloran --- v1 -> v2: Remove broken initialiser --- arch/powerpc/mm/init_64.c | 48 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index ec84b31c6c86..8851e4f5dbab 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -234,13 +234,15 @@ static unsigned long vmemmap_list_free(unsigned long start) void __ref vmemmap_free(unsigned long start, unsigned long end) { unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift; + unsigned long page_order = get_order(page_size); start = _ALIGN_DOWN(start, page_size); pr_debug("vmemmap_free %lx...%lx\n", start, end); for (; start < end; start += page_size) { - unsigned long addr; + unsigned long nr_pages, addr; + struct page *page; /* * the section has already be marked as invalid, so @@ -251,29 +253,29 @@ void __ref vmemmap_free(unsigned long start, unsigned long end) continue; addr = vmemmap_list_free(start); - if (addr) { - struct page *page = pfn_to_page(addr >> PAGE_SHIFT); - - if (PageReserved(page)) { - /* allocated from bootmem */ - if (page_size < PAGE_SIZE) { - /* - * this shouldn't happen, but if it is - * the case, leave the memory there - */ - WARN_ON_ONCE(1); - } else { - unsigned int nr_pages = - 1 << get_order(page_size); - while (nr_pages--) - free_reserved_page(page++); - } - } else - free_pages((unsigned long)(__va(addr)), - get_order(page_size)); - - vmemmap_remove_mapping(start, page_size); + if (!addr) + continue; + + page = pfn_to_page(addr >> PAGE_SHIFT); + nr_pages = 1 << page_order; + + if (PageReserved(page)) { + /* allocated from bootmem */ + if (page_size < PAGE_SIZE) { + /* + * this shouldn't happen, but if it is + * the case, leave the memory there + */ + WARN_ON_ONCE(1); + } else { + while (nr_pages--) + free_reserved_page(page++); + } + } else { + free_pages((unsigned long)(__va(addr)), page_order); } + + vmemmap_remove_mapping(start, page_size); } } #endif