From patchwork Thu Jan 5 10:18:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Houghton X-Patchwork-Id: 13089643 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 D06FBC53210 for ; Thu, 5 Jan 2023 10:19:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D47F900007; Thu, 5 Jan 2023 05:19:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 65ADC8E0001; Thu, 5 Jan 2023 05:19:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AD23900007; Thu, 5 Jan 2023 05:19:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 387408E0001 for ; Thu, 5 Jan 2023 05:19:07 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0D3D7120D2E for ; Thu, 5 Jan 2023 10:19:07 +0000 (UTC) X-FDA: 80320347534.30.D766BBB Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf26.hostedemail.com (Postfix) with ESMTP id 842D4140010 for ; Thu, 5 Jan 2023 10:19:05 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=UFJAvfKJ; spf=pass (imf26.hostedemail.com: domain of 3GaS2YwoKCGAHRFMSEFRMLEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--jthoughton.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3GaS2YwoKCGAHRFMSEFRMLEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672913945; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=GMmONeDZhRsfRYenu3fsdwuxvPajRN7/ApHlNDbguPQ=; b=IYNN35GdhHt6fK9EiPdnlrIGr1h90Mp11PpF78HD+BVKCkb2PZ14Y4r/YX7Oz9ACajX1Gf PtocjbSOyPJHsZlkagFSRzbF07GRLmd2ldQujEgW9A/EFaZKULEahCRUTost7Tb/I3Al4C cwRee5dnvWb0aaEAVRLUbYFaHSgszTI= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=UFJAvfKJ; spf=pass (imf26.hostedemail.com: domain of 3GaS2YwoKCGAHRFMSEFRMLEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--jthoughton.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3GaS2YwoKCGAHRFMSEFRMLEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672913945; a=rsa-sha256; cv=none; b=OZd1sWP65zook6c9qUmutqeh8Y6uBBemfv8G1rKwLoscLGP8ppFmuJZbgjLQuBpmnapCH9 O105xaou4UEDK0htmll2Q1G63z6Pwo8xNMzClOUUDLaPjHzuPWXaw30o+JLca/DbPGtscF PLwGZIFJnmNL7TVOiOSEYlSQmsV86Hw= Received: by mail-yb1-f202.google.com with SMTP id s6-20020a259006000000b00706c8bfd130so36459022ybl.11 for ; Thu, 05 Jan 2023 02:19:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GMmONeDZhRsfRYenu3fsdwuxvPajRN7/ApHlNDbguPQ=; b=UFJAvfKJ0l2l1UPgK2wOxQdo8MGVCU1OiqZoCoIsORlWWBUstNNxYXGaVW7ns6IVpx sWOpSOdqwOmhWrxPIEuTJShy8NWBIxPmZh7CTQVtYZgNAzrkiyxm4tK3EB2cr1fcFG72 NL2UY0HHYPq++cxfnJOWh1PCfM28o2mBsAvAuRNwxLK1h+x7QAsbLSW86Vjev3uMwHMA m4xMKgabvqB+ymtxPfBLgyttxaDC5fCgZB7AtaPYv2QEle4gH4NgP5WxMkQzfjWNUecC PeW8MaipU+W1oEePXDzy12uT9ZIJZoMLhlOKeScuy6DFqn7J8Iqdtb46MwSIbDmz23uA U6Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GMmONeDZhRsfRYenu3fsdwuxvPajRN7/ApHlNDbguPQ=; b=mcMC3GA5rr8mO/9URJTTicjOyWIwZuTmL42j/lk5sZm7B4Suy7V63IoYpi9LjaRyC+ 6+/SJN5tLCcQTbBsVPZrxwdXbYRPaD+DFvMrGXZONGWklLSmGsfFdhuMnqY7J6fM/Ruh TiyRMjLnXUuvTJilo4wdbz7l/RONhidRip2jIMaAu3jP9QJ3/TjmhxLEDA3xs60Rvoe9 TfyVA51z4jg2eCxMjR1frIfLhRvNysd2mkWQgx7pHRfMMXS0fNpp4ECXg/qR86ezkUCE BLe4+Uy08SzC/9Yz81vntHDumqngBc8J0Ruh/QBbKXN6eTJB7YdBE1qxR+31QP3+lrme 4MUw== X-Gm-Message-State: AFqh2kpLyb7gXRR6UoGADnAji8Yacjs2bbtBt3HdHPI6+WOEDbsLbcwv cE8s9naRCSbQI8oFVqEGb4N0mqihL+m2QRa3 X-Google-Smtp-Source: AMrXdXuQ5Q7cd5DOaU1a35I5qFByRezT/TNbnvDB/nPoo5UD/uGnkAVP9cU36gf8YA6RbJ0CrF4M1Z/gEQoDQ92V X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a5b:58f:0:b0:727:6671:ff85 with SMTP id l15-20020a5b058f000000b007276671ff85mr4592846ybp.585.1672913945077; Thu, 05 Jan 2023 02:19:05 -0800 (PST) Date: Thu, 5 Jan 2023 10:18:06 +0000 In-Reply-To: <20230105101844.1893104-1-jthoughton@google.com> Mime-Version: 1.0 References: <20230105101844.1893104-1-jthoughton@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230105101844.1893104-9-jthoughton@google.com> Subject: [PATCH 08/46] hugetlb: add HugeTLB HGM enablement helpers From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu Cc: David Hildenbrand , David Rientjes , Axel Rasmussen , Mina Almasry , "Zach O'Keefe" , Manish Mishra , Naoya Horiguchi , "Dr . David Alan Gilbert" , "Matthew Wilcox (Oracle)" , Vlastimil Babka , Baolin Wang , Miaohe Lin , Yang Shi , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 842D4140010 X-Rspam-User: X-Stat-Signature: qcxf347nyddfqswcfz55cga9eaxccs19 X-HE-Tag: 1672913945-595524 X-HE-Meta: U2FsdGVkX19ydvy3JgNXAKQlGVCZYRQJmXCYX3W9fvVr1AxsfoCMLWHeeGaU78KuNjfWcvnGq3h0y1zj8mlz78TzAtr2k8Hh7RTTlxQPZh02LPXwyehrKYlTDehuvE7rka3OUiDRAgt87QQx/g5KoQPlGlhUsWS7UbeCkySv1E0dmCwhwgKjEbHBCpgXg7aq3+wO3h7vaDD1Pj4AbV6jLUt6G8EDreZ4BfQ4pg1fU013DthTa0/fZo9my/4gd1eM5dUiwrOKn1TBaFMgNZ9MBTPuFP4oTIWvltCj6Re7nMq/9eY19G0e1L30z4dMFlcoY5YFmR85svAnw/PWMCMMPrRihMIyu2Yz/5LSmvJxh4sc+dhtDI82LqxPsYF45qxX6dQ00mgsLg7OR0SXPuKByo7gM+Zv82yujs0G6vMH3eShJfQUwvgF9aZRak/oeCzTrr5dEoPWWuDKwWVp6tcbipOfF5LQD/NL+VQQ2+luv3pe0vz/Fem1tDmAILwcLLtdsxafSMjGS3bCEjlDAXkm+a5kdkB7O4aKP3hFFhIfl/CcRj15LXP+ELaGMKpd8J9LMEEdY7VD8x6O+wcP3w8/4QL2cAdhHd8nC46ER61Z+jGLobyNT9KmthBMozkuKO++TPkyHYhMBUMguPdiDJHS5A1iYdRgWAqyS01UAs+NYvzmOkg/+vV3pt/Ytd0mL6+4tKisukyYIS6Sx40YWqCDloIrWsO74eQ25w3ALSbMunFHdkYaLC9Nj9+3jaYGCzn9TjvZFEtalGSzKxjusLlHAo2gaY0mKga41eNAxTc18u6SPMKc28uDNcat0anH0mSAt5c/DkuyCJI9YLG4Pjlb40ug4xOGjIjFX/rSgmQ2B2jnLP6mGAy84epEbDpncjFRP2wI3E1aV3st67IEJ5E6dqRk0+0AQBb9FI/rdB95ik6tuX7K45dCdRNm7iHNwVdlKTZPZWF6rTxYv2Gkvdq JOE6qy2/ xitr/p5RLU6Q2LnMJkUhTbZNLRjsQgmp2hcbxx3ruWFVsgF3ZbOVZTIQeKjI8rnE8pbxSmyIgsscHYQHnlmtFeKpeho8Oan/ay+i5ukOhkY4PBleN2dl5yCUcB4xjYaxhR6yFEGDh4V2kz5Ba8aTonTWNdHat+XQ8dr8PgIGQ9oZspdcKsbd/itA8kdsjoOMjTWEse80edWbdm2ROkzteh/D+lwF0KQHPTtLf5UIg8mTVz8xVpG6OZ4gOMYuCKP+1XXRTPUjmWhuc+dgSW7gANrl5gzVaJwZhTMKKh82Ah2GIbdjgiPiBkEFaLNSl2jMQA3Kc17DTW94WZy42c/oSRa4Icq3Ez8tmP+1hg43ZGFg2OXWBdWEkA/reIAtxF9ghadhFGJurjMw2fDs= 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: hugetlb_hgm_eligible indicates that a VMA is eligible to have HGM explicitly enabled via MADV_SPLIT, and hugetlb_hgm_enabled indicates that HGM has been enabled. Signed-off-by: James Houghton --- include/linux/hugetlb.h | 14 ++++++++++++++ mm/hugetlb.c | 23 +++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index aa49fd8cb47c..8713d9c4f86c 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -1207,6 +1207,20 @@ static inline void hugetlb_unregister_node(struct node *node) } #endif /* CONFIG_HUGETLB_PAGE */ +#ifdef CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING +bool hugetlb_hgm_enabled(struct vm_area_struct *vma); +bool hugetlb_hgm_eligible(struct vm_area_struct *vma); +#else +static inline bool hugetlb_hgm_enabled(struct vm_area_struct *vma) +{ + return false; +} +static inline bool hugetlb_hgm_eligible(struct vm_area_struct *vma) +{ + return false; +} +#endif + static inline spinlock_t *huge_pte_lock(struct hstate *h, struct mm_struct *mm, pte_t *pte) { diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2f86fedef283..d27fe05d5ef6 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6966,6 +6966,10 @@ static bool pmd_sharing_possible(struct vm_area_struct *vma) #ifdef CONFIG_USERFAULTFD if (uffd_disable_huge_pmd_share(vma)) return false; +#endif +#ifdef CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING + if (hugetlb_hgm_enabled(vma)) + return false; #endif /* * Only shared VMAs can share PMDs. @@ -7229,6 +7233,25 @@ __weak unsigned long hugetlb_mask_last_page(struct hstate *h) #endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */ +#ifdef CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING +bool hugetlb_hgm_eligible(struct vm_area_struct *vma) +{ + /* + * All shared VMAs may have HGM. + * + * HGM requires using the VMA lock, which only exists for shared VMAs. + * To make HGM work for private VMAs, we would need to use another + * scheme to prevent collapsing/splitting from invalidating other + * threads' page table walks. + */ + return vma && (vma->vm_flags & VM_MAYSHARE); +} +bool hugetlb_hgm_enabled(struct vm_area_struct *vma) +{ + return vma && (vma->vm_flags & VM_HUGETLB_HGM); +} +#endif /* CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING */ + /* * These functions are overwritable if your architecture needs its own * behavior.