From patchwork Thu Aug 22 01:15:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13772314 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB968C52D7C for ; Thu, 22 Aug 2024 01:16:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2DAA26B013D; Wed, 21 Aug 2024 21:16:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 261C36B013E; Wed, 21 Aug 2024 21:16:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12A8A6B0140; Wed, 21 Aug 2024 21:16:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E47CC6B013D for ; Wed, 21 Aug 2024 21:16:56 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 563D4140431 for ; Thu, 22 Aug 2024 01:16:56 +0000 (UTC) X-FDA: 82478117232.19.8CCC1C7 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf17.hostedemail.com (Postfix) with ESMTP id 8166240016 for ; Thu, 22 Aug 2024 01:16:54 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LGNDWsFl; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724289349; a=rsa-sha256; cv=none; b=Fqv4dMbL8MYYDJBMA94eHA8nVPncPEhiBvpUGiDcN5YmJPm8DOF7jU2SlzwRWN/V5WCnyE Uno8+FpOsFYe+yZKJ0Cv9EkdSQTyJHXueiGjNGzQFPEpQX8Ms27LC5N4glfypmQTTwBHWg aa8CA2oaDOX0SGsVcBIhZNdBcJbpyxM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LGNDWsFl; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724289349; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oxtv30NBraWOLLwEL/vWBgxKgs+qGBnLi08ra/C2LTY=; b=m29ux0dgWsxE5d5Krl2vD5eslUObVtOrDjyeyYsphFt/hFFUhiRQTUjGLaEdB8HdXbluHy ULv7BH83zD+05zfxwjvtXwUljgXX7dg2thr7m12Bxhm5to7ZPvrilCUqN0aAXaiIRhGA5u LKCyWWuIFCFKEOckE+7RZHvoIHpAS9w= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 628E9611C2; Thu, 22 Aug 2024 01:16:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6297C32781; Thu, 22 Aug 2024 01:16:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724289413; bh=/QxGsZ7kGu5gcX/2Pir/IdpixOHnIz8YHhHUjvvkxmA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LGNDWsFlzxJpsLAVIpOQEC5kb6i5ctYSjTkS7zqKfYjDO4HeXm79/cVdBPJvmur9S od8xZNlqIyVK5T1bqkMmjcHzbj6a0klUysAlpQi2Yhgih8mzhbij+KdMseAm/FdQaF qZTBLHdveQuXmpCBhljTF9L8u25KyBQ3UkEXKwWG7h9HTFhHMq/8EFjSAASEO69fhU Rha2NJPqhAg6/O6D/yn51jj4yM7pVQ00gtqctq6vmIsGxMeZC4BVUrbCVpCVEvt/v1 72uY1RjlmTcQPUSdvy9x3LJE8vZby6RTH8pn89jlq3aBz6DUaszeHlYh35wZz71MjV TIllZc2KTvXAg== From: Mark Brown Date: Thu, 22 Aug 2024 02:15:07 +0100 Subject: [PATCH v11 04/39] mman: Add map_shadow_stack() flags MIME-Version: 1.0 Message-Id: <20240822-arm64-gcs-v11-4-41b81947ecb5@kernel.org> References: <20240822-arm64-gcs-v11-0-41b81947ecb5@kernel.org> In-Reply-To: <20240822-arm64-gcs-v11-0-41b81947ecb5@kernel.org> To: Catalin Marinas , Will Deacon , Jonathan Corbet , Andrew Morton , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Arnd Bergmann , Oleg Nesterov , Eric Biederman , Shuah Khan , "Rick P. Edgecombe" , Deepak Gupta , Ard Biesheuvel , Szabolcs Nagy , Kees Cook Cc: "H.J. Lu" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Florian Weimer , Christian Brauner , Thiago Jung Bauermann , Ross Burton , Yury Khrustalev , Wilco Dijkstra , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Mark Brown X-Mailer: b4 0.15-dev-37811 X-Developer-Signature: v=1; a=openpgp-sha256; l=1882; i=broonie@kernel.org; h=from:subject:message-id; bh=/QxGsZ7kGu5gcX/2Pir/IdpixOHnIz8YHhHUjvvkxmA=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBmxpEm5kN/wk9/KZfcaloebeKbxKmUlgdTlw1GvdtV QGljy32JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZsaRJgAKCRAk1otyXVSH0G6bB/ 4oIpOZVu8Yo9IDRGCq6U5tCs4LXytwZCRgOuYex97b7Nkcj7jMWi4RhwitRZSfcpV0DbYlyYd+iWWW PXiCwTyXg40ZxbW3FSHAb0/7l1IC7zergq6B7kZ8GwyGAdYoI2VWcL668YXJJoQLkv2B67vBzFAWxA 0aJoPCixyep42bVyjfHhbxUWuUVTm6Azfs8smOLro0yiE3SO1sDbg9IHXUv8KRtBB+liDWGGcGlCR9 8cZ/Ui5XrZeRA2H2ClhqE8XtfVPG0YL24APKug6j9UtK+9QI38fi43WAWS9vEmgkxaxk8WN+QMdAyj N6cNfGTWdiZ/qqkbem1568AQ3f+9wl X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 8166240016 X-Stat-Signature: 9jshi3pfgqzd79x3auxjspg9n89mwhpj X-Rspam-User: X-HE-Tag: 1724289414-468507 X-HE-Meta: U2FsdGVkX1+upBBLb7hXFXraS3itGuQJglv8cFErIlsEV6rZH2FZceOe+MFJz7uJ6UDygaCcf3hshbIomvxGb8M8UhgjDO6xbW4WrBWlW7ZOXGXisNC9RugiMIxugxQ5qIVjrs1E1OjFYYW7jnnsGKxeh5oY3/f0c1aBD4s55XP3xjbFhYRMh6YHVvbNDILRyWf4LTBaU4oV5I6MOK5rvRBcSdtdRb2zb0/iV5VlPKYTWJZBhpIojX0Ckzr7wa3c123W3SPCqekx0l2ako29j9fjA/4nKjmOOFrXwUIkJRBJ2tsZ6SvrB6gg/CW6xydHzxXlfgsjeM6jbSEcFYVCDCqIXWdoLpMPB3F9SDAQEWYjWU3OC1zoV81SvEvBzejrI+9Pltuj/28BoKzKMEmlVKiwUMP707sehQ17N7Pb9zsggbVpwKH/AEzVegp04c/iEAsMHoVQc0so7XbIIXH8BSaa69MG8otB55nmczMxJIOIIFpZCGG4BbKOBknxKsbUdYZyQ1AlKmC2py3936BDvr6K+895i1bzqS2Cy6q6HKm359xV8hJcVL8SdeVwY6t/n9TSsP9ZG4BQGB41ktMO3jrRqsXI89fmvLsxsvOEdkAmRse+FpBlStp6Xn7meBvYDfKVTGT6ZYdt36cguWejW8GjkKuSFDlPzFzsjUYMjWfWQrcWKn50sH9BQ1xzp9oN5Sr4F1SbDgmbJBIHAHekGhr06HGmiAJgOG1K0o9oQFqTBVGwyJxnVfwvrxyKxb0c3bKo4p52wEjF+EcFEIuxt0xQHBtlKgNGL9WiYBo+E5SbbHe97nj3QTuxTiNprTWaoHJJyuS324v3P1TPDWQPpzmTE1gkfnWb9lUboeec+DPwunUTNAUmp46o3kv7HVnIcLRPazX/L4PYMgOtvjYvpPjBhz8fvqCaFPsK8WJjmL9PoOvMpiwWXExdUWS5ijMRZOHsUv7ArejhLfdLMj7 r3MJuhQ8 M0lfGiaPag4FOjQf4I41cELvM+k4qMDZnKxnLw4R+/0rTQ38JAfWx204q6cBMpjPzWxN6z2kgGbV/VeYPETfftjZ5x730P3oIJ+WhXdqZQq3Jc4dikGccFldskhvKZD5RGtweJPSIG1FJspIgJmtkuhb90GRMxVz7QYuh0m7fya8t2rz5pkBynyPxfnhUzpWgPy7VTjXoh9/iKfR8Y65SH4hSMJUL7xv5yT09Awl4QqTKigQpa1ZFMEhVMt4odER+AZ9zIany3p1Wsr06R6QzB3zH3DzHZrBl+Bpqqjq2eHhCIxplNs/C1Wy2yB73iYUIRubtcHoUxaE2ffGq25w4ZNz4m9+IpUkkx1JB3bVJLrn/ikmCTuXKSO8RXu0rTCE+1wh1X2zYkh4QytAxRbDw9gasHSVpR5Awv5EPWDz7LTRpd8cCiRqw/XhsxMw84v4sdyYJj80RE0UVfOAVMFrZZw75X1telxQZIplAW7schaJaBP0NgZ5RU7DpzQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In preparation for adding arm64 GCS support make the map_shadow_stack() SHADOW_STACK_SET_TOKEN flag generic and add _SET_MARKER. The existing flag indicates that a token usable for stack switch should be added to the top of the newly mapped GCS region while the new flag indicates that a top of stack marker suitable for use by unwinders should be added above that. For arm64 the top of stack marker is all bits 0. Reviewed-by: Thiago Jung Bauermann Reviewed-by: Catalin Marinas Signed-off-by: Mark Brown --- arch/x86/include/uapi/asm/mman.h | 3 --- include/uapi/asm-generic/mman.h | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/uapi/asm/mman.h b/arch/x86/include/uapi/asm/mman.h index 46cdc941f958..ac1e6277212b 100644 --- a/arch/x86/include/uapi/asm/mman.h +++ b/arch/x86/include/uapi/asm/mman.h @@ -5,9 +5,6 @@ #define MAP_32BIT 0x40 /* only give out 32bit addresses */ #define MAP_ABOVE4G 0x80 /* only map above 4GB */ -/* Flags for map_shadow_stack(2) */ -#define SHADOW_STACK_SET_TOKEN (1ULL << 0) /* Set up a restore token in the shadow stack */ - #include #endif /* _ASM_X86_MMAN_H */ diff --git a/include/uapi/asm-generic/mman.h b/include/uapi/asm-generic/mman.h index 57e8195d0b53..5e3d61ddbd8c 100644 --- a/include/uapi/asm-generic/mman.h +++ b/include/uapi/asm-generic/mman.h @@ -19,4 +19,8 @@ #define MCL_FUTURE 2 /* lock all future mappings */ #define MCL_ONFAULT 4 /* lock all pages that are faulted in */ +#define SHADOW_STACK_SET_TOKEN (1ULL << 0) /* Set up a restore token in the shadow stack */ +#define SHADOW_STACK_SET_MARKER (1ULL << 1) /* Set up a top of stack marker in the shadow stack */ + + #endif /* __ASM_GENERIC_MMAN_H */