From patchwork Tue Mar 26 02:16:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 13603266 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 84A5CC54E64 for ; Tue, 26 Mar 2024 02:17:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7FE006B009A; Mon, 25 Mar 2024 22:17:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 789776B009B; Mon, 25 Mar 2024 22:17:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4ED176B009C; Mon, 25 Mar 2024 22:17:27 -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 2071D6B009A for ; Mon, 25 Mar 2024 22:17:27 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id ED555140260 for ; Tue, 26 Mar 2024 02:17:26 +0000 (UTC) X-FDA: 81937578492.23.668F988 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by imf11.hostedemail.com (Postfix) with ESMTP id 1A7E740004 for ; Tue, 26 Mar 2024 02:17:24 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ETk6m2J4; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf11.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 198.175.65.16 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711419445; 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=MRqCejIsFURLPJVKLnwglOlunoBTea4Nf4fl29uF8X4=; b=eoAX5B4sYF0pvnKJ6AuAnRxGmvK9xiuxI3hAvwT5cAtN69eAalbHx4blxVqzFhB3qf14BB kHR5jUEYPT6ILsK1cZ+9e+TdacR9bh8WS4/g2gMOk+AFhCVNDjJ6LIeRqcxQ6o1oob1vcs eYtUjIC++QY2Yo8lGrbDHy5ILk5VBiw= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ETk6m2J4; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf11.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 198.175.65.16 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711419445; a=rsa-sha256; cv=none; b=5cKEh5X6aOnZ0UHvK+bTE9uwBnWJ1iGYoeWLLRSjDX6F1FqNAvAJQiWAuC4okxNeH3gwm4 aD/nkaT22g+wYnV0CJLXEcJhFc2ilKXLKv5P4RmrPCoagIcxf4bePXhEW7YShznMEnaBld Eqw26ZMlsAaLI7mKoNldYyU5xYxSvcE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711419445; x=1742955445; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sxOpaISc6XsCBcTnaTun5GkWeCaUbW+4JANtdWXac9M=; b=ETk6m2J4GpnzWV5nizrWiKss6f6vTKFVdcy9TBlglh45FMosZRFn6EjP BIxIlXdZcOewqb15Qh3wogt7TZK+E+5J9I1EHJPy4NLNU4Xr98/JnTuIg F2dxyJKWly2jwFB4MnquHHmhMqC6zSUFi/Jli6mRhiz2RlcwwxlMjfSjt eV6xe9w5Cl0GwioSYZjfuAdue8XFsYCyDHhHuzefxmPxuZLc2xxwquGk+ qhFJMEsAlc04KW7e6+5q58ZOssjivFf9ibEMZbSSGFkUtHfCeewF+LsTk +vUcdENqIi9YMak817WKTbmZIJRVQWFcoKNEo53cK1yN+lpQYbezCmV5B A==; X-IronPort-AV: E=McAfee;i="6600,9927,11024"; a="6564353" X-IronPort-AV: E=Sophos;i="6.07,154,1708416000"; d="scan'208";a="6564353" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2024 19:17:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,154,1708416000"; d="scan'208";a="20489909" Received: from rpwilson-mobl.amr.corp.intel.com (HELO rpedgeco-desk4.intel.com) ([10.251.11.187]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2024 19:17:17 -0700 From: Rick Edgecombe To: Liam.Howlett@oracle.com, akpm@linux-foundation.org, bp@alien8.de, broonie@kernel.org, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, debug@rivosinc.com, hpa@zytor.com, keescook@chromium.org, kirill.shutemov@linux.intel.com, luto@kernel.org, mingo@redhat.com, peterz@infradead.org, tglx@linutronix.de, x86@kernel.org Cc: rick.p.edgecombe@intel.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v4 11/14] mm: Take placement mappings gap into account Date: Mon, 25 Mar 2024 19:16:53 -0700 Message-Id: <20240326021656.202649-12-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240326021656.202649-1-rick.p.edgecombe@intel.com> References: <20240326021656.202649-1-rick.p.edgecombe@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1A7E740004 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: rgsi9wjecqosw7qeakf7e7jz7rymb1jt X-HE-Tag: 1711419444-124250 X-HE-Meta: U2FsdGVkX18l+nmAKCHjtmJdJprPgFfSja9XuCr6wLolZQN/5qS1ucwABHB98/52SxkFMzkkCaIMIUpK9xzCJcYvKtSFVVio2qhZow/LVYI7r/490GSEpyYLS2pKbsSCFxc4ZAZUb+eeNBqjpwkvnbmFzyMBEgY4/DOni45rdTIewRgyNORxzJRquWbfZKVQSaFcRF/ReK3nP2hKhNhqPMgrNrrycVoEOvEMYbWD8DzGWg5b6Bzn9SeE9vfOLq2D/fZ7/z6sZAdpE2pr4ORBWjfMW4+X/WlK3MD8smUpvCJaiNgQP3aLekn4+6wM0hqGULanXY6Jn28ZAEIUSP+nPcEbs9qsWsT43dfU3nDTDa4E2c04eHq6VMdBqIw0JNY9QAoA52wJn0qOCY9Zlz8pzPPr0XM0n78BtH2wSUXgcB9uWJkYTcDzvH3fZ4OtmBmTghTHG8KkLWn329216nTphynWISJq7s13g5a17EiRIrXeloQMhrHD8yU0hTKLieHJOAc8F8fPFEMRv3Jdk8j1AQjI1WATNEJoPkfwjLPOL21DQhXcCI8AwVIlERMzCpx/2hMW7KdjG/PS4q6TuXiHtTM6zt8Ui+CaTNy31odZyHEsv/L1nbGSZu9kS3MEjvws+r5iP9WtDGvRN+Yq4Kb0B7i4k72r4S6QIV02xFrSmZ+tDKCKbjVjiscKaPCroLmICJUhK4CLwtUpOm80Cx6FVwdgKg9LoXpz7j9rtrSjPmK6N3HyuzuZqPkuo7yxT/FB6rHIyZAzyNgYdiFhI2VdFAPMdKXlTpsweHonEzbMQHyaOKqszSBTRS4Ph0cmLKjONRp//475CtLty/tZuCT8A1O0WwdvyZNw 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: When memory is being placed, mmap() will take care to respect the guard gaps of certain types of memory (VM_SHADOWSTACK, VM_GROWSUP and VM_GROWSDOWN). In order to ensure guard gaps between mappings, mmap() needs to consider two things: 1. That the new mapping isn’t placed in an any existing mappings guard gaps. 2. That the new mapping isn’t placed such that any existing mappings are not in *its* guard gaps. The long standing behavior of mmap() is to ensure 1, but not take any care around 2. So for example, if there is a PAGE_SIZE free area, and a mmap() with a PAGE_SIZE size, and a type that has a guard gap is being placed, mmap() may place the shadow stack in the PAGE_SIZE free area. Then the mapping that is supposed to have a guard gap will not have a gap to the adjacent VMA. For MAP_GROWSDOWN/VM_GROWSDOWN and MAP_GROWSUP/VM_GROWSUP this has not been a problem in practice because applications place these kinds of mappings very early, when there is not many mappings to find a space between. But for shadow stacks, they may be placed throughout the lifetime of the application. Use the start_gap field to find a space that includes the guard gap for the new mapping. Take care to not interfere with the alignment. Signed-off-by: Rick Edgecombe Reviewed-by: Christophe Leroy --- v3: - Spelling fix in comment v2: - Remove VM_UNMAPPED_START_GAP_SET and have struct vm_unmapped_area_info initialized with zeros (in another patch). (Kirill) - Drop unrelated space change (Kirill) - Add comment around interactions of alignment and start gap step (Kirill) --- include/linux/mm.h | 1 + mm/mmap.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 8b13cd891b53..5c7f75edfde1 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3438,6 +3438,7 @@ struct vm_unmapped_area_info { unsigned long high_limit; unsigned long align_mask; unsigned long align_offset; + unsigned long start_gap; }; extern unsigned long vm_unmapped_area(struct vm_unmapped_area_info *info); diff --git a/mm/mmap.c b/mm/mmap.c index 609c087bba8e..2d9e7a999774 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1580,7 +1580,7 @@ static unsigned long unmapped_area(struct vm_unmapped_area_info *info) MA_STATE(mas, ¤t->mm->mm_mt, 0, 0); /* Adjust search length to account for worst case alignment overhead */ - length = info->length + info->align_mask; + length = info->length + info->align_mask + info->start_gap; if (length < info->length) return -ENOMEM; @@ -1592,7 +1592,13 @@ static unsigned long unmapped_area(struct vm_unmapped_area_info *info) if (mas_empty_area(&mas, low_limit, high_limit - 1, length)) return -ENOMEM; - gap = mas.index; + /* + * Adjust for the gap first so it doesn't interfere with the + * later alignment. The first step is the minimum needed to + * fulill the start gap, the next steps is the minimum to align + * that. It is the minimum needed to fulill both. + */ + gap = mas.index + info->start_gap; gap += (info->align_offset - gap) & info->align_mask; tmp = mas_next(&mas, ULONG_MAX); if (tmp && (tmp->vm_flags & VM_STARTGAP_FLAGS)) { /* Avoid prev check if possible */ @@ -1631,7 +1637,7 @@ static unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info) MA_STATE(mas, ¤t->mm->mm_mt, 0, 0); /* Adjust search length to account for worst case alignment overhead */ - length = info->length + info->align_mask; + length = info->length + info->align_mask + info->start_gap; if (length < info->length) return -ENOMEM;