From patchwork Sun Aug 13 01:33:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 800947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AaQcJlnw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xVLrQ3gd8z9t48 for ; Sun, 13 Aug 2017 11:34:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752216AbdHMBea (ORCPT ); Sat, 12 Aug 2017 21:34:30 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35367 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266AbdHMBe3 (ORCPT ); Sat, 12 Aug 2017 21:34:29 -0400 Received: by mail-pf0-f195.google.com with SMTP id j68so6796452pfc.2 for ; Sat, 12 Aug 2017 18:34:29 -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=dPdC+NGdEi3LIyEIGegtCt39vVR6FvkFhLuLrolAmRU=; b=AaQcJlnwbymJ7OV5DjMgU+NkFsH25gLdnzvxi4/lfZnBZytxPp6QcRrcFpVE1Q+Zjs YNm7V2Wr4g/YrX5+UCHVgWhyDfbAdf7z/Ciqd5OlKHE7FJ/5B2xo7rjMJ1Gu1HP0LGzB OJNfa1LPBVim29AQ/Lzj4lgob/FETzA4/5mwzzuixkAnPJVqRORtfhLIOG6M4FxWyegI TRLp+3/MhMtdIvoPlULhd4q7BWjdO6/iwGEIrVil2tENlxPPzF4oRNywljguRGUfrkOF r6kgDJornd9YKzncXbQSYkfvydSPXowojTff3dsLGSAOWbSWD5nGqRf70TPLCeIYw/kp 6fAw== 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=dPdC+NGdEi3LIyEIGegtCt39vVR6FvkFhLuLrolAmRU=; b=XxXwldr754v7neuRIlAz/z7wKzc8ogu6oNd8vg4VlGDxLEEdorGdfYoWM+iH9E7sQW kJNn5InpNmlQSstHJ1WKKnWwk7jHOnEdd3thUcklgdCoKugNXLLO8gxClVqbcMhMU9yC uQLTVqp3dlzo2XFK5gx61Ed4YD42wd3f+FBAMrYx4MT0r4kVarFyfRhFbRaZgjJY9D5x De6Iamyb7wdmMgPsO3U4udD7M+ws1VR5olQ/T5Rc+8l/Ph/dmi5BE0JYtHIXRq+6DzcS n1MYqQ7/dY9DPynnHqVxDDXtdLAtD+hbzc62r3WCs54JxE0IZP1tmavougJGHNamrIYo rLvg== X-Gm-Message-State: AHYfb5gFkrMezDV5BCddm3Aiqn7j7OManblBB5mq1eL0dW1fmqjchjOb 05rc6lcTZkLPcrql X-Received: by 10.84.128.69 with SMTP id 63mr22509415pla.54.1502588068884; Sat, 12 Aug 2017 18:34:28 -0700 (PDT) Received: from roar.local0.net (203-219-56-202.tpgi.com.au. [203.219.56.202]) by smtp.gmail.com with ESMTPSA id u69sm7776237pfa.70.2017.08.12.18.34.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Aug 2017 18:34:28 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin , kvm-ppc@vger.kernel.org Subject: [PATCH v2 6/9] powerpc/64s/radix: Do not allocate SLB shadow structures Date: Sun, 13 Aug 2017 11:33:43 +1000 Message-Id: <20170813013346.14002-6-npiggin@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170812113416.15978-1-npiggin@gmail.com> References: <20170812113416.15978-1-npiggin@gmail.com> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org These are unused in radix mode. Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/paca.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index 64401f551765..354a955ca377 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c @@ -101,18 +101,27 @@ static inline void free_lppacas(void) { } * If you make the number of persistent SLB entries dynamic, please also * update PR KVM to flush and restore them accordingly. */ -static struct slb_shadow *slb_shadow; +static struct slb_shadow * __initdata slb_shadow; static void __init allocate_slb_shadows(int nr_cpus, int limit) { int size = PAGE_ALIGN(sizeof(struct slb_shadow) * nr_cpus); + + if (early_radix_enabled()) + return; + slb_shadow = __va(memblock_alloc_base(size, PAGE_SIZE, limit)); memset(slb_shadow, 0, size); } static struct slb_shadow * __init init_slb_shadow(int cpu) { - struct slb_shadow *s = &slb_shadow[cpu]; + struct slb_shadow *s; + + if (early_radix_enabled()) + return NULL; + + s = &slb_shadow[cpu]; /* * When we come through here to initialise boot_paca, the slb_shadow