From nobody Tue Feb 10 18:55:47 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1577999710; cv=none; d=zohomail.com; s=zohoarc; b=duBFBgs5GJJLTEM6djn6PM4bYt+rdlrjSU2KnpFZLVh5TY5QHUTW/mg21NiMtrWvrEM/eeelspDYgU+pUFr1bau+wOX6urAXGgQN16n4tT+X48ck+RigqYN75mqInJ8X7XYNMBqyMQHIpwfkW41THGeM4Me80n9MrMwOxJwZuKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577999710; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bzvB+E9U3hFrQP6e/l7jQ8baePgP6yZkBrwXNLzfUwc=; b=EF5ptDkuXVmSIFTXJ85NrLIkXwc7DA2ottg78d2QQO9YoluvTuadlh3xerctzCsjllCWVblQxrExueW72RAm8qHRdt0CwAkh2l965ayquHX8wRPFPZEdwk8730uXj8B3SOl/fyPUSGb62AHLUxFxC5kEwMTD4a+4Qac7bKZKcIg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1577999710078909.942723515589; Thu, 2 Jan 2020 13:15:10 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1in7nc-0001GG-LN; Thu, 02 Jan 2020 21:14:32 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1in7nb-0001Fe-Oi for xen-devel@lists.xenproject.org; Thu, 02 Jan 2020 21:14:31 +0000 Received: from mail-qk1-x742.google.com (unknown [2607:f8b0:4864:20::742]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d2194854-2da4-11ea-b6f1-bc764e2007e4; Thu, 02 Jan 2020 21:14:11 +0000 (UTC) Received: by mail-qk1-x742.google.com with SMTP id j9so32754893qkk.1 for ; Thu, 02 Jan 2020 13:14:11 -0800 (PST) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id f97sm17384185qtb.18.2020.01.02.13.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jan 2020 13:14:10 -0800 (PST) X-Inumbo-ID: d2194854-2da4-11ea-b6f1-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=vcAi4jpZuXqxsymJRhcTmUP89Pm8zBz3SLJl2tKqcvk=; b=o3ZObMYhXtvrAXFBuiimHF58oho45Oa8/3yjhZ6oN/b6AUvDLpKzIXRdF08Xnit9XU 72cNR4U2fas6McjxkAw+VGmGv+XgczWhIjiArDmtsyq2N1lPhw4XgQdcqAnxbvxjlulf +gjIu/cx29/8FGLuspkJAmwwatGlWdR+IN2FAQcUCpnNhr3KPV9Zx3wTpTRTS8owuOHk daip3BprTbtdETeFiHpE34cFzl0t80TlSYF1Dn3l83twhJOtkmmCDvBIFKoumf8cdmVP SsSuCZksu1BNhIRIJCz81QxW5J65ifrHFkfcT/urkCZXe7ss5x1LnSyamPFgFQo7Ojrh oD3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=vcAi4jpZuXqxsymJRhcTmUP89Pm8zBz3SLJl2tKqcvk=; b=IY1lG7GCSGQDTYXSrAokJScyu5Pki8N94nST8IWO4RWzTTfxoK1g4WFuVZwMZ+pzGY fKmLaob77+iEMMfiFZQjdIihYEI0YSctJBFaVh9asv6cRHgittVx8PF4tHG9uh1DcSZn Scj221ZyKPI4ujTAcAyGr4RuZMXY2WidZE3kTSgdFj2EhT17n0lihQBVw23r0CKgnHhs FS80jg/Id4DATb1UzFXGJ52U3Q+TgfNFaLQkbCNWsOW3FgQlxI+9t+Ew4qXjxHkg/olQ 7oWbFwD2zLgT35xKMDqEIyuxF0FZc6YeS99TU3c9bH+0KgPa0QBmQ4rYIwSXhwF89sxd UnnQ== X-Gm-Message-State: APjAAAXCcE71dikRC1qC+2zE09XVtjp8IynXpRQTomscC/pCSvBl6Xb8 o5gqN8/duGa6DP9v4FpvMh2JUQ== X-Google-Smtp-Source: APXvYqwQoaid7neQj+jpsaNlNQHeoqFyLpx0/RXZ/4pXiOFNmUHUkHkif8incxTD8U4TREMgsis14g== X-Received: by 2002:a37:27cf:: with SMTP id n198mr68418016qkn.188.1577999650801; Thu, 02 Jan 2020 13:14:10 -0800 (PST) From: Pavel Tatashin To: pasha.tatashin@soleen.com, jmorris@namei.org, sashal@kernel.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, steve.capper@arm.com, linux-arm-kernel@lists.infradead.org, maz@kernel.org, james.morse@arm.com, vladimir.murzin@arm.com, mark.rutland@arm.com, tglx@linutronix.de, gregkh@linuxfoundation.org, allison@lohutok.net, info@metux.net, alexios.zavras@intel.com, sstabellini@kernel.org, boris.ostrovsky@oracle.com, jgross@suse.com, stefan@agner.ch, yamada.masahiro@socionext.com, xen-devel@lists.xenproject.org, linux@armlinux.org.uk, andrew.cooper3@citrix.com, julien@xen.org Date: Thu, 2 Jan 2020 16:13:57 -0500 Message-Id: <20200102211357.8042-7-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200102211357.8042-1-pasha.tatashin@soleen.com> References: <20200102211357.8042-1-pasha.tatashin@soleen.com> Subject: [Xen-devel] [PATCH v5 6/6] arm64: remove the rest of asm-uaccess.h X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The __uaccess_ttbr0_disable and __uaccess_ttbr0_enable, are the last two macros defined in asm-uaccess.h. For now move them to entry.S where they are used. Eventually, these macros should be replaced with C wrappers to reduce the maintenance burden. Also, once these macros are unified with the C counterparts, it is a good idea to check that PAN is in correct state on every enable/disable calls. Signed-off-by: Pavel Tatashin --- arch/arm64/include/asm/asm-uaccess.h | 39 ---------------------------- arch/arm64/kernel/entry.S | 27 ++++++++++++++++++- arch/arm64/lib/clear_user.S | 2 +- arch/arm64/lib/copy_from_user.S | 2 +- arch/arm64/lib/copy_in_user.S | 2 +- arch/arm64/lib/copy_to_user.S | 2 +- arch/arm64/mm/cache.S | 1 - 7 files changed, 30 insertions(+), 45 deletions(-) delete mode 100644 arch/arm64/include/asm/asm-uaccess.h diff --git a/arch/arm64/include/asm/asm-uaccess.h b/arch/arm64/include/asm/= asm-uaccess.h deleted file mode 100644 index fba2a69f7fef..000000000000 --- a/arch/arm64/include/asm/asm-uaccess.h +++ /dev/null @@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_ASM_UACCESS_H -#define __ASM_ASM_UACCESS_H - -#include -#include -#include -#include -#include - -/* - * User access enabling/disabling macros. - */ -#ifdef CONFIG_ARM64_SW_TTBR0_PAN - .macro __uaccess_ttbr0_disable, tmp1 - mrs \tmp1, ttbr1_el1 // swapper_pg_dir - bic \tmp1, \tmp1, #TTBR_ASID_MASK - sub \tmp1, \tmp1, #RESERVED_TTBR0_SIZE // reserved_ttbr0 just before swap= per_pg_dir - msr ttbr0_el1, \tmp1 // set reserved TTBR0_EL1 - isb - add \tmp1, \tmp1, #RESERVED_TTBR0_SIZE - msr ttbr1_el1, \tmp1 // set reserved ASID - isb - .endm - - .macro __uaccess_ttbr0_enable, tmp1, tmp2 - get_current_task \tmp1 - ldr \tmp1, [\tmp1, #TSK_TI_TTBR0] // load saved TTBR0_EL1 - mrs \tmp2, ttbr1_el1 - extr \tmp2, \tmp2, \tmp1, #48 - ror \tmp2, \tmp2, #16 - msr ttbr1_el1, \tmp2 // set the active ASID - isb - msr ttbr0_el1, \tmp1 // set the non-PAN TTBR0_EL1 - isb - .endm -#endif - -#endif diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 7c6a0a41676f..cc6c0dbb7734 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -22,8 +22,8 @@ #include #include #include +#include #include -#include #include =20 /* @@ -144,6 +144,31 @@ alternative_cb_end #endif .endm =20 +#ifdef CONFIG_ARM64_SW_TTBR0_PAN + .macro __uaccess_ttbr0_disable, tmp1 + mrs \tmp1, ttbr1_el1 // swapper_pg_dir + bic \tmp1, \tmp1, #TTBR_ASID_MASK + sub \tmp1, \tmp1, #RESERVED_TTBR0_SIZE // reserved_ttbr0 just before swap= per_pg_dir + msr ttbr0_el1, \tmp1 // set reserved TTBR0_EL1 + isb + add \tmp1, \tmp1, #RESERVED_TTBR0_SIZE + msr ttbr1_el1, \tmp1 // set reserved ASID + isb + .endm + + .macro __uaccess_ttbr0_enable, tmp1, tmp2 + get_current_task \tmp1 + ldr \tmp1, [\tmp1, #TSK_TI_TTBR0] // load saved TTBR0_EL1 + mrs \tmp2, ttbr1_el1 + extr \tmp2, \tmp2, \tmp1, #48 + ror \tmp2, \tmp2, #16 + msr ttbr1_el1, \tmp2 // set the active ASID + isb + msr ttbr0_el1, \tmp1 // set the non-PAN TTBR0_EL1 + isb + .endm +#endif + .macro kernel_entry, el, regsize =3D 64 .if \regsize =3D=3D 32 mov w0, w0 // zero upper 32 bits of x0 diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S index aeafc03e961a..b0b4a86a09e2 100644 --- a/arch/arm64/lib/clear_user.S +++ b/arch/arm64/lib/clear_user.S @@ -6,7 +6,7 @@ */ #include =20 -#include +#include #include =20 .text diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_use= r.S index ebb3c06cbb5d..142bc7505518 100644 --- a/arch/arm64/lib/copy_from_user.S +++ b/arch/arm64/lib/copy_from_user.S @@ -5,7 +5,7 @@ =20 #include =20 -#include +#include #include #include =20 diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S index 3d8153a1ebce..04dc48ca26f7 100644 --- a/arch/arm64/lib/copy_in_user.S +++ b/arch/arm64/lib/copy_in_user.S @@ -7,7 +7,7 @@ =20 #include =20 -#include +#include #include #include =20 diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S index 357eae2c18eb..8f3218ae88ab 100644 --- a/arch/arm64/lib/copy_to_user.S +++ b/arch/arm64/lib/copy_to_user.S @@ -5,7 +5,7 @@ =20 #include =20 -#include +#include #include #include =20 diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 0093bb9fcd12..627be857b8d0 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -12,7 +12,6 @@ #include #include #include -#include =20 /* * __asm_flush_cache_user_range(start,end) --=20 2.17.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel