Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp780986imm; Fri, 21 Sep 2018 08:11:45 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda6/VYCfGYhaJwugKjby2LHsIvJP+rUWEIz+l1KNtZunexz5wir4Pcuyw0QpjMmjPz1186s X-Received: by 2002:a17:902:46a4:: with SMTP id p33-v6mr45226735pld.205.1537542705736; Fri, 21 Sep 2018 08:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537542705; cv=none; d=google.com; s=arc-20160816; b=YyQgmg2rl8ao3ei7+c/YGPiT4Oy8zq3HKMdN+YJ6qJQgAdFwYcKervAAocHhqYiLp1 19fyhS45ojkPNsYSfKCEFWaABLl+MnNRx8a/w17+rym6qNhXVJXakO88AfgthquimrkN Zb6pCAX8YJ8027wPm19lU1V0jjLkzysn3JrckRZC+98jeD7mTX5+1bx0X1KiK4uzZZ6t /QbKIy4ukcxCcMICIyxxc5ZbHsHsvYj1YZgdf92dpAfZUwzxfnmxITsFy4isTSJV/piU oMgX7aUh74DNyI/2TlWuHdNQiOJex/lLsThpVSkKcQtKDkdxB5xf0Jd78qVWq6d9ZpTh K+nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=Tne72t5xNUAu7cmJjXTyttB7FmSRY0YU7pN2zREygVM=; b=y4N4LzQy7a+iYthh7CifCOojVC+vJndFvQoIN8pzSwC4rlEp6SHULkrAy2/aFURPlX L/4F3x6EDq+Y1n/XlL3F2rS2n4IqWUOZxcnqK5E/08gSjdDHSKJSvyNJKLl7/wjOgM2y A4es3SOiCk9B2kubKshoe5kafnin0fP3mTWG9hluUEk64Da4uEsqyEv/ZLoByCi/WKbG d4mtaWQKNKmRd1foODXGLVmQ8qHMeypXPV1cAdShHfiocMYOuzI4v68xErpAuW7PhngD 26gB9Bb6QI1GO2iJym87mtDTM63VZDVuyBKDX9k4Ei3+31LLiST5VZDmFjZHZc03gPgu 5+UQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z71-v6si27488758pff.223.2018.09.21.08.11.30; Fri, 21 Sep 2018 08:11:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390925AbeIUU7t (ORCPT + 99 others); Fri, 21 Sep 2018 16:59:49 -0400 Received: from mga11.intel.com ([192.55.52.93]:13768 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390861AbeIUU7r (ORCPT ); Fri, 21 Sep 2018 16:59:47 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Sep 2018 08:10:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,285,1534834800"; d="scan'208";a="88187971" Received: from 2b52.sc.intel.com ([143.183.136.51]) by fmsmga002.fm.intel.com with ESMTP; 21 Sep 2018 08:10:28 -0700 From: Yu-cheng Yu To: x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Cyrill Gorcunov , Dave Hansen , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [RFC PATCH v4 4/9] mm/mmap: Add IBT bitmap size to address space limit check Date: Fri, 21 Sep 2018 08:05:48 -0700 Message-Id: <20180921150553.21016-5-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180921150553.21016-1-yu-cheng.yu@intel.com> References: <20180921150553.21016-1-yu-cheng.yu@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | 12 +++++++++++- 3 files changed, 19 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 fa581ced3f56..397b8cb0b0af 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3237,7 +3237,17 @@ 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(); + + /* as_limit_plus overflowed */ + if (as_limit_plus < as_limit) + as_limit_plus = RLIM_INFINITY; + + 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) && -- 2.17.1