From patchwork Wed Jul 1 20:28:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 11637241 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AA467739 for ; Wed, 1 Jul 2020 20:31:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 81B0720853 for ; Wed, 1 Jul 2020 20:31:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NQlkX/i5"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="ma1cqrgQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81B0720853 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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=9d0mgdT5F+aWP6Ux5TiXSm9hLR414DsaGbr468krDuU=; b=NQlkX/i5aE+RdQ9e+2+Npdt6j g06hoejh05xmXPlFk+MD91o3uOJIuIP3xUvOZHRNHc6eZMNMFc7OuIi20taTWSNLQ1UBrDS3YI3Px 7RodFBjM+c7ApFIUtxesOPfjQhxu6RFvERP7VUDfM/e7ohGLNURgC0NX/4ofEJOa5dSaMX6TMvQxP 4BrcnhSq+Q1ciV8+7CiqvSdxaP49ZCfXTYx55piQaduYSc7d+ibV0ygb5SmIW8dtzQ+D7Tbatc3Mh IIy6zCXDkob42wtKN06H2IBPiiwzYoVG5jI+xr/gnRuwgbEyITKnPTwT2nFZficT02z7FHdss+Aca Vl/M7tq5w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqjMP-0004bC-7h; Wed, 01 Jul 2020 20:29:37 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqjMH-0004Yr-54 for linux-arm-kernel@lists.infradead.org; Wed, 01 Jul 2020 20:29:30 +0000 Received: from localhost (fw-tnat.cambridge.arm.com [217.140.96.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 06A6C2071A; Wed, 1 Jul 2020 20:29:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593635368; bh=f2DO83/jEIvHQrS/RE/sOu9llWcfanXtvcoRa8Qf8uM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ma1cqrgQ3XOJK+r5c5hu6gZXlaXh9scPF6haj6Heac3HHT+fRHgi/2sKR4XHCBsmt Py/lPp6oI0e30UNqj0nGD5Zy8AnH0ff6OGULYUMjSc4F8V4MSkftQQgxw14UL/ghiy x8HirkBXAYgcpWdOOxHaR2nKH9AoBYCyoZ/QP/Po= From: Mark Brown To: Catalin Marinas , Will Deacon , Marc Zyngier Subject: [PATCH v2 07/11] arm64: vdso: Rename vdso_pages to vdso_text_pages Date: Wed, 1 Jul 2020 21:28:42 +0100 Message-Id: <20200701202846.54648-8-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701202846.54648-1-broonie@kernel.org> References: <20200701202846.54648-1-broonie@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200701_162929_358653_1409933A X-CRM114-Status: GOOD ( 16.02 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Brown , Andrei Vagin , Vincenzo Frascino , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org In preparation for having multiple data pages rename the current vdso_pages to vdso_text_pages. Signed-off-by: Mark Brown --- arch/arm64/kernel/vdso.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 95e69df42141..032249f70460 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -47,7 +47,7 @@ struct vdso_abi_info { const char *name; const char *vdso_code_start; const char *vdso_code_end; - unsigned long vdso_pages; + unsigned long vdso_text_pages; /* Data Mapping */ struct vm_special_mapping *dm; /* Code Mapping */ @@ -108,13 +108,13 @@ static int __vdso_init(enum vdso_abi abi) pr_err("vDSO is not page aligned\n"); return -EINVAL; } - vdso_info[abi].vdso_pages = ( + vdso_info[abi].vdso_text_pages = ( vdso_info[abi].vdso_code_end - vdso_info[abi].vdso_code_start) >> PAGE_SHIFT; /* Allocate the vDSO pagelist, plus a page for the data. */ - vdso_pagelist = kcalloc(vdso_info[abi].vdso_pages + 1, + vdso_pagelist = kcalloc(vdso_info[abi].vdso_text_pages + 1, sizeof(struct page *), GFP_KERNEL); if (vdso_pagelist == NULL) @@ -127,7 +127,7 @@ static int __vdso_init(enum vdso_abi abi) /* Grab the vDSO code pages. */ pfn = sym_to_pfn(vdso_info[abi].vdso_code_start); - for (i = 0; i < vdso_info[abi].vdso_pages; i++) + for (i = 0; i < vdso_info[abi].vdso_text_pages; i++) vdso_pagelist[i + 1] = pfn_to_page(pfn + i); vdso_info[abi].dm->pages = &vdso_pagelist[0]; @@ -145,7 +145,7 @@ static int __setup_additional_pages(enum vdso_abi abi, unsigned long gp_flags = 0; void *ret; - vdso_text_len = vdso_info[abi].vdso_pages << PAGE_SHIFT; + vdso_text_len = vdso_info[abi].vdso_text_pages << PAGE_SHIFT; /* Be sure to map the data page */ vdso_mapping_len = vdso_text_len + PAGE_SIZE;