From patchwork Wed Jul 5 21:21:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ram Pai X-Patchwork-Id: 784870 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x2vMZ0vs5z9s5L for ; Thu, 6 Jul 2017 07:36:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MZWPsdkr"; 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 3x2vMY6kfVzDr47 for ; Thu, 6 Jul 2017 07:36:41 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MZWPsdkr"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-qk0-x244.google.com (mail-qk0-x244.google.com [IPv6:2607:f8b0:400d:c09::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 3x2v3T0lZzzDr2f for ; Thu, 6 Jul 2017 07:22:45 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MZWPsdkr"; dkim-atps=neutral Received: by mail-qk0-x244.google.com with SMTP id p21so203438qke.0 for ; Wed, 05 Jul 2017 14:22:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=4bEBB1Id+q4mIjbRyYIqwXbWGtamw4khk59QNTVh2VE=; b=MZWPsdkrdoJlmSCrGoydKtvettdpJDYMzyu4K9PCheAMEWqcJsSic1vmMVrRWruyUL cci9a1iVPiUuPExMiiKfv9Yj+SoTf0ITiW98dfB/6oJMXfw8HcwuZ50owOLHgDnMlTBK 2ltcP+Qnrx1IRtHH65yReSNDN9CRzH04UT3ZBUiJ5U0vodLDO6IkrCAQjDSHeUJTEEJU kq7LfKJJ9Xth91QT+X9GRadFkhzjUjUkxd+qpH+n4bod/CjoSEcR/yZrgXRXqVlJ+mzR 1uEGCqQ8tzG2xJ+r+nBibwu6CBkgt9a9EOtd7LFNGb0MXGvt28JqoZFibmbe09snyg9h jMVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=4bEBB1Id+q4mIjbRyYIqwXbWGtamw4khk59QNTVh2VE=; b=P9UJu9FFV3U2BZU+A+ohBgTkvEQJL0XEX3YQ9K8fQieEJk925Lqij+yu9X2OnD+p4z M4JKGtgLiFRtwElqp9XFDR6Gh2+vmLQGMDQ6USNv7lUUhKwT8sJp/6iNGi5VDxw834cS bSqJlSuhohNL9S5YLiJk/lBDHa17xYnBM3NDeUAOHZ9+dtMVFm4DmVs6TWy0g4GEqjRw VDBenwGuwh+qp3y/IZcwEy/EXPL4s0WLKXkyo5OUgzZgZzUKfMbPENeB0165ZQBSaObq rO2xHF28i6mv2IiMOjlQIp74sNbuaDyihH3zp4G/LdpTAvn3IIDCtc74vDrtECUjRZ1x DYaQ== X-Gm-Message-State: AKS2vOykPogourl4LbB8owA4Au0qKgRdqbzzgLRSE/oG+Wa0Yu6dnHk/ VZzPH2J2Ev4Ok/8b/FE= X-Received: by 10.55.89.67 with SMTP id n64mr58040302qkb.158.1499289763164; Wed, 05 Jul 2017 14:22:43 -0700 (PDT) Received: from localhost.localdomain (50-39-103-96.bvtn.or.frontiernet.net. [50.39.103.96]) by smtp.gmail.com with ESMTPSA id 143sm100776qkf.8.2017.07.05.14.22.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 14:22:42 -0700 (PDT) From: Ram Pai To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC v5 06/38] powerpc: use helper functions in __hash_page_64K() for 64K PTE Date: Wed, 5 Jul 2017 14:21:43 -0700 Message-Id: <1499289735-14220-7-git-send-email-linuxram@us.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1499289735-14220-1-git-send-email-linuxram@us.ibm.com> References: <1499289735-14220-1-git-send-email-linuxram@us.ibm.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: arnd@arndb.de, corbet@lwn.net, linuxram@us.ibm.com, dave.hansen@intel.com, mingo@redhat.com, paulus@samba.org, aneesh.kumar@linux.vnet.ibm.com, akpm@linux-foundation.org, khandual@linux.vnet.ibm.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" replace redundant code in __hash_page_64K() with helper functions pte_get_hash_gslot() and pte_set_hash_slot() Signed-off-by: Ram Pai --- arch/powerpc/mm/hash64_64k.c | 24 ++++-------------------- 1 files changed, 4 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/mm/hash64_64k.c b/arch/powerpc/mm/hash64_64k.c index 0012618..645f621 100644 --- a/arch/powerpc/mm/hash64_64k.c +++ b/arch/powerpc/mm/hash64_64k.c @@ -244,7 +244,6 @@ int __hash_page_64K(unsigned long ea, unsigned long access, unsigned long flags, int ssize) { real_pte_t rpte; - unsigned long *hidxp; unsigned long hpte_group; unsigned long rflags, pa; unsigned long old_pte, new_pte; @@ -289,18 +288,12 @@ int __hash_page_64K(unsigned long ea, unsigned long access, vpn = hpt_vpn(ea, vsid, ssize); if (unlikely(old_pte & H_PAGE_HASHPTE)) { - unsigned long hash, slot, hidx; - - hash = hpt_hash(vpn, shift, ssize); - hidx = __rpte_to_hidx(rpte, 0); - if (hidx & _PTEIDX_SECONDARY) - hash = ~hash; - slot = (hash & htab_hash_mask) * HPTES_PER_GROUP; - slot += hidx & _PTEIDX_GROUP_IX; + unsigned long gslot; /* * There MIGHT be an HPTE for this pte */ - if (mmu_hash_ops.hpte_updatepp(slot, rflags, vpn, MMU_PAGE_64K, + gslot = pte_get_hash_gslot(vpn, shift, ssize, rpte, 0); + if (mmu_hash_ops.hpte_updatepp(gslot, rflags, vpn, MMU_PAGE_64K, MMU_PAGE_64K, ssize, flags) == -1) old_pte &= ~_PAGE_HPTEFLAGS; @@ -350,17 +343,8 @@ int __hash_page_64K(unsigned long ea, unsigned long access, return -1; } - /* - * Insert slot number & secondary bit in PTE second half. - */ - hidxp = (unsigned long *)(ptep + PTRS_PER_PTE); - rpte.hidx &= ~(0xfUL); - *hidxp = rpte.hidx | (slot & 0xfUL); - /* - * check __real_pte for details on matching smp_rmb() - */ - smp_wmb(); new_pte = (new_pte & ~_PAGE_HPTEFLAGS) | H_PAGE_HASHPTE; + new_pte |= pte_set_hash_slot(ptep, rpte, 0, slot); } *ptep = __pte(new_pte & ~H_PAGE_BUSY); return 0;