From patchwork Tue Mar 21 18:04:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Punit Agrawal X-Patchwork-Id: 9637363 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 05FDE601E9 for ; Tue, 21 Mar 2017 18:44:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC86728304 for ; Tue, 21 Mar 2017 18:44:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E12B82840E; Tue, 21 Mar 2017 18:44:28 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 81C9E28304 for ; Tue, 21 Mar 2017 18:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=O4iWMONdizs5KEX0eL+iz9xsbIlFhUAVdfG30NofT28=; b=YWe++We3C2Emt5Y5aGf48lV8fN TFK62jyh++Yi4ve/XFoWV4jEv6MlK4bVbDIamAxc8o/lj8rwq8eGc6TLDBqWYmzstcR8KoUGGi0UA HXTSHcHa0MIV5/eTQRjcaod6mVB5IoyU/JFdpWldXKyBCFInWDBbwv7PFRe5ambPznOt2VXBV5EWi ytrKBCIU9Ya4ktzQzIpMN873K1tU5jWpcWle7g3YFhfT0N0hBFE3XiPWnhPewnfOxrhg25O9aSkDb CSIRx/jL0kcLDLPznnHImOs22vdUYQnob1MFWlUt4fzz1C5BN3jbyHlyWSbonpqWgfxi8J6C25A4R /ZACjK0Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqOlb-0005EU-WE; Tue, 21 Mar 2017 18:44:24 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqOlI-0004nX-Cj for linux-arm-kernel@bombadil.infradead.org; Tue, 21 Mar 2017 18:44:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=n/MG/ccWgVlws1ec7/WQ4TNDv1GNYUSURqriUIYhsj8=; b=0br5JXJYDixzUOLjaI1JNlju0 YMcv/20RjVuzRBuU+hYnBhqGlYJCqKubxvbLhDXMfXpnZg8EPr6jlZjCCnw65VRLTHVxIfWP7FB5q UlZ26akup0UL3eOB7v3HZtNaXcuuSqAz7/rzwHYCIJXAv6X+xcpOjiya9Q2BDPYm9nPOnPEXa9QHK AaehMZ8fXjcrFtD42tZtZmHle5n7swQLAYo0P1KZ0nRBcAInCOv4hKeEdSM7+wYI2XGlFrr93OjCR AiRsrnaIRkTXtIpxC7e3LGMkqJLeVZ6faZopN03WEGi/CwhDnDiTpL6AFruRfKmTqdMzR0O77Ff9L nvbWlbTIA==; Received: from foss.arm.com ([217.140.101.70]) by merlin.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqOAS-0004jo-NE for linux-arm-kernel@lists.infradead.org; Tue, 21 Mar 2017 18:06:01 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D6A9B2B; Tue, 21 Mar 2017 11:05:39 -0700 (PDT) Received: from localhost (e105922-lin.cambridge.arm.com [10.1.195.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A82AA3F2E5; Tue, 21 Mar 2017 11:05:39 -0700 (PDT) From: Punit Agrawal To: will.deacon@arm.com, catalin.marinas@arm.com Subject: [PATCH 4/7] arm64: hugetlb: Introduce pte_pgprot helper Date: Tue, 21 Mar 2017 18:04:18 +0000 Message-Id: <20170321180421.18332-5-punit.agrawal@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170321180421.18332-1-punit.agrawal@arm.com> References: <20170321180421.18332-1-punit.agrawal@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170321_140600_855947_47B83940 X-CRM114-Status: UNSURE ( 8.37 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, David Woods , Punit Agrawal , linux-arm-kernel@lists.infradead.org, Steve Capper MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Steve Capper Rather than xor pte bits in various places, use this helper function. Cc: David Woods Signed-off-by: Steve Capper Signed-off-by: Punit Agrawal Reviewed-by: Mark Rutland --- arch/arm64/mm/hugetlbpage.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 81bc6e4cf714..44d637eb32a7 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -41,6 +41,16 @@ int pud_huge(pud_t pud) #endif } +/* + * Select all bits except the pfn + */ +static inline pgprot_t pte_pgprot(pte_t pte) +{ + unsigned long pfn = pte_pfn(pte); + + return __pgprot(pte_val(pfn_pte(pfn, __pgprot(0))) ^ pte_val(pte)); +} + static int find_num_contig(struct mm_struct *mm, unsigned long addr, pte_t *ptep, size_t *pgsize) { @@ -80,7 +90,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, ncontig = find_num_contig(mm, addr, ptep, &pgsize); pfn = pte_pfn(pte); - hugeprot = __pgprot(pte_val(pfn_pte(pfn, __pgprot(0))) ^ pte_val(pte)); + hugeprot = pte_pgprot(pte); for (i = 0; i < ncontig; i++) { pr_debug("%s: set pte %p to 0x%llx\n", __func__, ptep, pte_val(pfn_pte(pfn, hugeprot))); @@ -235,9 +245,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, size_t pgsize = 0; unsigned long pfn = pte_pfn(pte); /* Select all bits except the pfn */ - pgprot_t hugeprot = - __pgprot(pte_val(pfn_pte(pfn, __pgprot(0))) ^ - pte_val(pte)); + pgprot_t hugeprot = pte_pgprot(pte); cpte = huge_pte_offset(vma->vm_mm, addr); pfn = pte_pfn(*cpte);