From patchwork Thu Jun 7 14:38:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu-cheng Yu X-Patchwork-Id: 10452333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 97ECF60146 for ; Thu, 7 Jun 2018 14:42:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87546294DB for ; Thu, 7 Jun 2018 14:42:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C2FD29508; Thu, 7 Jun 2018 14:42:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D90EE294DF for ; Thu, 7 Jun 2018 14:42:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E735C6B0296; Thu, 7 Jun 2018 10:42:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id BB14D6B029B; Thu, 7 Jun 2018 10:42:32 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B67B6B0299; Thu, 7 Jun 2018 10:42:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f69.google.com (mail-pg0-f69.google.com [74.125.83.69]) by kanga.kvack.org (Postfix) with ESMTP id 3F0B26B0293 for ; Thu, 7 Jun 2018 10:42:32 -0400 (EDT) Received: by mail-pg0-f69.google.com with SMTP id v133-v6so3575091pgb.10 for ; Thu, 07 Jun 2018 07:42:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=/BEUge24OVPCHKV8DERTjfeaHU6rX55XS+TtX6Gkm3o=; b=sMTbiYbohqqQ87s3Qawqt+fWjCyQI3fsEp54lWaX/8h83vhkeb2lB9VIVoC1iwjM5h xK86YMxJNeasWtkv8RQRKyXm7rUfg1JcLuLGc8RJNIyPiF9nwAquXmPQg4vtgfmOpvds pY+3Ut41huy7/rtAt6a9rlx70ztBAWvChAgqMr97q82e4Zr3zUTHwToFf7hPV8ubXfek abJTjmlzdUi0Tl1HEoYu3qb6odyUUSP8R9DTayzinau5CYS99uf8f/0vEu3YhHOcchqn w6YBOvv1tgoMN4ZAP7XPVNuBuzs/lhGGlsPNi0cQImIX+qjYUdfy3pEjVFSLnpin9VB5 emwg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E2OKQBLN698iYNI5fj7s4QQKGBL4en1wtUbh7kVg/zKCiPSlYKG a3D9GAqfg9hKefEsCmRuUcMZQaAQZCiNLKJfiL56XNwRntSrRDwQXckJVbmybP3WFx6VDp5c+7G kcXUNZVM55XdWlkJbmQ5c0b7Mf5wc0EJrYS2XXf5VOhtevDGOFiir29EKv5JyowkCFA== X-Received: by 2002:a62:cc51:: with SMTP id a78-v6mr2026518pfg.219.1528382551933; Thu, 07 Jun 2018 07:42:31 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLPA8UdxDYcYZBRjlcoWPKgNs1Hv0GAb6W4qo+Du6BSMiHk3LNpkhXm3httuZhRg5tqXAUu X-Received: by 2002:a62:cc51:: with SMTP id a78-v6mr2026462pfg.219.1528382550981; Thu, 07 Jun 2018 07:42:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528382550; cv=none; d=google.com; s=arc-20160816; b=tSUzJerxdgzNd+Ui3kaAHaYuj0FEJyzf950kWdp8N9d3jluF5dJTc53g7UFQg9uPcC eOvhZ2vXNwTZk0alvtgFpSHt0BsegT/CyawmX3U9SY08aWQLZAbqC1hvH/jPa0bvPcMA Vh3+XK0hO8dFkrrJmKWVWn52cwz8P50cd3eCKlHWcDNejOIGsuz+F3rOm1xgYo1Kl0Pz vtDA/yagqWrUzWaFj0XAGkszKb6Q5oLuyz36kjl84wylYxtN01bZhyTjU8vY0RnZ8XtL lJtkXUag9l8onob95K4sbxTBFUZpZTYKP/Ry/QGHdD1wT+Q+BJO5KPZLW/lt/T7hoJy/ WIZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=/BEUge24OVPCHKV8DERTjfeaHU6rX55XS+TtX6Gkm3o=; b=lxaSGzH5UJxd01j3TQfy/hr1M0Kag4iRZ+bziegJEvJxtyPYPdpGvF3mE7HCa8D4Y3 HZuidHpQ/Pd7Nh3BxHvQu8Gw7FN0rjWGIUvY8miPFb4tKW+WIu+0+WKn8kXc2l3bvqjF StFIxj3IUXvqKf3yOM4cIoS2J9TujsLVJq3gTtS6cbXx8kXAiQGXD3auoTiqrcFhqttO Mk/8p9Y1YTsokVim0md/Cr7ttPm9jBjRFmGG9hQz3gbNIxN1rAxK/HU2WRx4d9BQ+1nG oSJdwpIkrkfc5aokjiuqbLwfezQnteOnCjzyeeBt5Th3xl5EbRMM0GgSWO5hRn0HOC7s sjUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga03.intel.com (mga03.intel.com. [134.134.136.65]) by mx.google.com with ESMTPS id l22-v6si26243115pgu.353.2018.06.07.07.42.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 07:42:30 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.65 as permitted sender) client-ip=134.134.136.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jun 2018 07:42:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,486,1520924400"; d="scan'208";a="235505944" Received: from 2b52.sc.intel.com ([143.183.136.51]) by fmsmga006.fm.intel.com with ESMTP; 07 Jun 2018 07:42:30 -0700 From: Yu-cheng Yu To: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , "H.J. Lu" , Vedvyas Shanbhogue , "Ravi V. Shankar" , Dave Hansen , Andy Lutomirski , Jonathan Corbet , Oleg Nesterov , Arnd Bergmann , Mike Kravetz Cc: Yu-cheng Yu Subject: [PATCH 3/7] mm/mmap: Add IBT bitmap size to address space limit check Date: Thu, 7 Jun 2018 07:38:51 -0700 Message-Id: <20180607143855.3681-4-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180607143855.3681-1-yu-cheng.yu@intel.com> References: <20180607143855.3681-1-yu-cheng.yu@intel.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP The indirect branch tracking legacy bitmap takes a large address space. This causes may_expand_vm() failure on the address limit check. For a IBT-enabled task, add the bitmap size to the address limit. Signed-off-by: Yu-cheng Yu --- arch/x86/include/uapi/asm/resource.h | 5 +++++ include/uapi/asm-generic/resource.h | 3 +++ mm/mmap.c | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/resource.h b/arch/x86/include/uapi/asm/resource.h index 04bc4db8921b..0741b2a6101a 100644 --- a/arch/x86/include/uapi/asm/resource.h +++ b/arch/x86/include/uapi/asm/resource.h @@ -1 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +#ifdef CONFIG_X86_INTEL_CET +#define rlimit_as_extra() current->thread.cet.ibt_bitmap_size +#endif + #include diff --git a/include/uapi/asm-generic/resource.h b/include/uapi/asm-generic/resource.h index f12db7a0da64..8a7608a09700 100644 --- a/include/uapi/asm-generic/resource.h +++ b/include/uapi/asm-generic/resource.h @@ -58,5 +58,8 @@ # define RLIM_INFINITY (~0UL) #endif +#ifndef rlimit_as_extra +#define rlimit_as_extra() 0 +#endif #endif /* _UAPI_ASM_GENERIC_RESOURCE_H */ diff --git a/mm/mmap.c b/mm/mmap.c index e7d1fcb7ec58..5c07f052bed7 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3255,7 +3255,13 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, */ bool may_expand_vm(struct mm_struct *mm, vm_flags_t flags, unsigned long npages) { - if (mm->total_vm + npages > rlimit(RLIMIT_AS) >> PAGE_SHIFT) + unsigned long as_limit = rlimit(RLIMIT_AS); + unsigned long as_limit_plus = as_limit + rlimit_as_extra(); + + if (as_limit_plus > as_limit) + as_limit = as_limit_plus; + + if (mm->total_vm + npages > as_limit >> PAGE_SHIFT) return false; if (is_data_mapping(flags) &&