From nobody Sun Feb 8 18:32:34 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9816FC6FD1D for ; Mon, 20 Mar 2023 16:54:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232331AbjCTQyJ (ORCPT ); Mon, 20 Mar 2023 12:54:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233119AbjCTQxf (ORCPT ); Mon, 20 Mar 2023 12:53:35 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ACAE26864; Mon, 20 Mar 2023 09:45:41 -0700 (PDT) Date: Mon, 20 Mar 2023 16:39:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1679330365; h=from:from:sender:sender:reply-to: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; bh=yoZLOt43Nj4HcPAR6MnnHHxjOvqvURzyMrfyzfY3TWk=; b=t4kLOQd0b/+DTYAAZVhw22iJIwtUwcGq9+2OLL4bS++hK1xw3cBJ5kw32n23WKblx5s9co JqpY0Su6/xGH7cWX1Cespmfawka7LTPXckSZHbE8phFWAI8HVDRSZMPKGZoLgWN8abItF6 8H1zRSxmREyzACoJmT/ei97gLOyDoelmaQdAZIkwTRcNr5eSjvn5r6vb3WyVosdc0oyaGU v9DJ+0IaqyaYBy9QwQ/n2i0gBz0yDbYyg/skANq4b7WRZdHBUaKVMpzX+gL9LVsEs+aTvA AirODSfcG/VvZ7ENhY6bToWeuTkiShWlRDLXdBnFNPpWeHydQMXGILh8qFPqoA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1679330365; h=from:from:sender:sender:reply-to: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; bh=yoZLOt43Nj4HcPAR6MnnHHxjOvqvURzyMrfyzfY3TWk=; b=UsNBxfnN8/+KX+Jhufhmpb772ZPQzIBXQ/aMwAX+fUX5/VdAoSpmhehLmizpqfP/HRvmSr rQaQTLh7zNzF5cAg== From: "tip-bot2 for Rick Edgecombe" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/shstk] mm/mmap: Add shadow stack pages to memory accounting Cc: "Yu-cheng Yu" , Rick Edgecombe , Dave Hansen , "Borislav Petkov (AMD)" , Kees Cook , "Mike Rapoport (IBM)" , David Hildenbrand , Pengfei Xu , John Allen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167933036526.5837.17795357929902595060.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/shstk branch of tip: Commit-ID: 4c8e07c3b6db4a514b03f2f2455e81e512d2f785 Gitweb: https://git.kernel.org/tip/4c8e07c3b6db4a514b03f2f2455e81e51= 2d2f785 Author: Rick Edgecombe AuthorDate: Sat, 18 Mar 2023 17:15:17 -07:00 Committer: Dave Hansen CommitterDate: Mon, 20 Mar 2023 09:01:10 -07:00 mm/mmap: Add shadow stack pages to memory accounting The x86 Control-flow Enforcement Technology (CET) feature includes a new type of memory called shadow stack. This shadow stack memory has some unusual properties, which requires some core mm changes to function properly. Co-developed-by: Yu-cheng Yu Signed-off-by: Yu-cheng Yu Signed-off-by: Rick Edgecombe Signed-off-by: Dave Hansen Reviewed-by: Borislav Petkov (AMD) Reviewed-by: Kees Cook Acked-by: Mike Rapoport (IBM) Acked-by: David Hildenbrand Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook Link: https://lore.kernel.org/all/20230319001535.23210-23-rick.p.edgecombe%= 40intel.com --- mm/internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 7920a8b..2e9f313 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -491,14 +491,14 @@ static inline bool is_exec_mapping(vm_flags_t flags) } =20 /* - * Stack area - automatically grows in one direction + * Stack area (including shadow stacks) * * VM_GROWSUP / VM_GROWSDOWN VMAs are always private anonymous: * do_mmap() forbids all other combinations. */ static inline bool is_stack_mapping(vm_flags_t flags) { - return (flags & VM_STACK) =3D=3D VM_STACK; + return ((flags & VM_STACK) =3D=3D VM_STACK) || (flags & VM_SHADOW_STACK); } =20 /*