From patchwork Wed Sep 20 02:16:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rik van Riel X-Patchwork-Id: 13392034 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 8A1B8CE79A9 for ; Wed, 20 Sep 2023 02:18:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 137786B00F9; Tue, 19 Sep 2023 22:18:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C2136B00FA; Tue, 19 Sep 2023 22:18:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECB216B00FB; Tue, 19 Sep 2023 22:18:46 -0400 (EDT) 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 DEAAE6B00F9 for ; Tue, 19 Sep 2023 22:18:46 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B70EDA11D4 for ; Wed, 20 Sep 2023 02:18:46 +0000 (UTC) X-FDA: 81255367452.01.AEAF314 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf12.hostedemail.com (Postfix) with ESMTP id 23A224000C for ; Wed, 20 Sep 2023 02:18:43 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; spf=none (imf12.hostedemail.com: domain of riel@shelob.surriel.com has no SPF policy when checking 96.67.55.147) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695176324; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=58vavVNOX5+5S5lqwPODVeP3P8mCoxkLR+A+P+FvD2s=; b=E0NJJkuKvGgWWXrrnBB281xwY2A0BRforTQN21dnzP8UIx4KKG/LLtUFfErwHIMuY61M3s X0oBkaB6f2V9WiyiDosFusWZvUGwnbujDx5biGCP28AFUHAIAH63oJ2n9XIz+Zm+L2Txqd V3zGOsJMC2YuHuYhGAMKM7QBiYSg/uo= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; spf=none (imf12.hostedemail.com: domain of riel@shelob.surriel.com has no SPF policy when checking 96.67.55.147) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695176324; a=rsa-sha256; cv=none; b=rHPeeZXFf6yFrDY7NMjjqiA7bvhZL5RnS0I924WcYOW7yJg87qdI8/Z7QFVdE6FUDrz0WM jJk3z1eqZ1HoczURmeUR/V2ofqA3nYx3uxJveR1QQUBNN3ETQuzxSeq7NxDAcRaiLQBPFH wOnoj0cX9Ss55o2uPnR1Lj4hVJ/LrMo= Received: from imladris.home.surriel.com ([10.0.13.28] helo=imladris.surriel.com) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qimn9-0006me-2e; Tue, 19 Sep 2023 22:18:15 -0400 From: riel@surriel.com To: linux-kernel@vger.kernel.org Cc: kernel-team@meta.com, linux-mm@kvack.org, akpm@linux-foundation.org, muchun.song@linux.dev, mike.kravetz@oracle.com, leit@meta.com, Rik van Riel Subject: [PATCH 1/2] hugetlbfs: extend hugetlb_vma_lock to private VMAs Date: Tue, 19 Sep 2023 22:16:09 -0400 Message-ID: <20230920021811.3095089-2-riel@surriel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230920021811.3095089-1-riel@surriel.com> References: <20230920021811.3095089-1-riel@surriel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 23A224000C X-Rspam-User: X-Stat-Signature: h5ss5sipmkk4fo5jgz9tjhs5ui15s7nf X-Rspamd-Server: rspam01 X-HE-Tag: 1695176323-828042 X-HE-Meta: U2FsdGVkX18Lm6pbBCVIaUazjBJa4NkAmbieWaioENNBHypyyG8ZsJ+dQ8OXXLnkEKV6x5EnB5Pw3/Srmrgp135xL9N/YSpQheCfGqBdp9/uD/dVWw7k/iLNwZgDitIrRDT83tHmRAynvlUgG+8o9KjO8sYZ+GtezMuq/zKlTElwK9a0ObDzEDyeFsl1dVTkRsCUL9S5U9RQ4fS2Sh4XkKcY0jz1rEqvDVijoiWhqaFUYaijwW3rziVpTwwiOdANSSylVdCeATguGgvAY6yWdXtq8b3DxjQqDumKOgTBpJ+gxKUGcRHIzBcwzTEAf9KpmiSMghU5em01YLXeaD43k6o8YT0TFitFjzU/S/HtqvQhPFij5dYmAtggOzQ609DkIV2Vt9W5AJZlji3rypFpyn7YmXysrKmCvDV8E2fqq30zwzyT3XHJ9z18AABCCQRHTL7x5S8nto6HNNnRbOT8o890Uyvt5CZ199M/bG6YhMK2TDt3DO9zFWWGRXnWB5+ci7sPTWFqobXpKMaDwaLC4dJVQKUpOLptayZF1CrSpRDGthqnMdpYD5bnwJIgbf+1RA7vVVZQmRtl63UfNTpQs0N4doXYPEXsQlboKRZq8QD097sCKnTZVasWo7HkxbJI/9DPkrNSMCv4THT+aM3W+kBcEtnUQCajxA5pOp0A3rC8+yHtXXx7uFWS4UAdo1UMXE43Pn7+vlEKeYm+7GWKFqN//i7Z08eaVKrkls5WL5+C9Yedzl054zDk37QvqM//q3SrDYUj9OiFauTi1v1dRl63LMsbGMo+kpTCgzC9TIfBX2e5oI6T0BMnuf7SlEPrOmyzoxvMSA0KJlhLfeYEYWsUeLwiT4UKq8AGrqXjwzVuxnBcujI8t5uvaPMc4IjcsjKheGjbqGSTMb5QHknP/6olTMTSpUXTubTJSd/6RUzdHg8392njBX2AhNCMD2MuVK8inlc4OXaAZM1T57Z UWFuFbXu toE78I+rFVtGLxYOHFROHfkn6Y7Q0yL7hHwxYCaUpl/+n5krcYrBsUfqiV1z1iuZ4kg5p5IgOLq9z+eAjiD4TOuWOAaSWDc3QSQJrDxP78LQsxqK+MVeFF8ZPidxqt/UOdcY314+SmFS26hS02rq8tO4t0P2Q2qqEvIMinHhVxLFjQXWcMVtJNKh3Lwth8+07cj9uODxSOQ25UsZj0KierwKmjHT8j4zGdLnUSgJlmo1fjhSbDNh/rIuaapi1G9C0NcY0kbJs4SAzqmYGWIYslxj5Dg5CREXPLIQuLRVpDstn6GVGFSfEeN+X3FdBKen3FqvKLYba8NZR9M5JXNYrDimZyw== 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: From: Rik van Riel Extend the locking scheme used to protect shared hugetlb mappings from truncate vs page fault races, in order to protect private hugetlb mappings (with resv_map) against MADV_DONTNEED. Add a read-write semaphore to the resv_map data structure, and use that from the hugetlb_vma_(un)lock_* functions, in preparation for closing the race between MADV_DONTNEED and page faults. Signed-off-by: Rik van Riel --- include/linux/hugetlb.h | 6 ++++++ mm/hugetlb.c | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 5b2626063f4f..694928fa06a3 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -60,6 +60,7 @@ struct resv_map { long adds_in_progress; struct list_head region_cache; long region_cache_count; + struct rw_semaphore rw_sema; #ifdef CONFIG_CGROUP_HUGETLB /* * On private mappings, the counter to uncharge reservations is stored @@ -1231,6 +1232,11 @@ static inline bool __vma_shareable_lock(struct vm_area_struct *vma) return (vma->vm_flags & VM_MAYSHARE) && vma->vm_private_data; } +static inline bool __vma_private_lock(struct vm_area_struct *vma) +{ + return (!(vma->vm_flags & VM_MAYSHARE)) && vma->vm_private_data; +} + /* * Safe version of huge_pte_offset() to check the locks. See comments * above huge_pte_offset(). diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ba6d39b71cb1..b99d215d2939 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -97,6 +97,7 @@ static void hugetlb_vma_lock_alloc(struct vm_area_struct *vma); static void __hugetlb_vma_unlock_write_free(struct vm_area_struct *vma); static void hugetlb_unshare_pmds(struct vm_area_struct *vma, unsigned long start, unsigned long end); +static struct resv_map *vma_resv_map(struct vm_area_struct *vma); static inline bool subpool_is_free(struct hugepage_subpool *spool) { @@ -267,6 +268,10 @@ void hugetlb_vma_lock_read(struct vm_area_struct *vma) struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; down_read(&vma_lock->rw_sema); + } else if (__vma_private_lock(vma)) { + struct resv_map *resv_map = vma_resv_map(vma); + + down_read(&resv_map->rw_sema); } } @@ -276,6 +281,10 @@ void hugetlb_vma_unlock_read(struct vm_area_struct *vma) struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; up_read(&vma_lock->rw_sema); + } else if (__vma_private_lock(vma)) { + struct resv_map *resv_map = vma_resv_map(vma); + + up_read(&resv_map->rw_sema); } } @@ -285,6 +294,10 @@ void hugetlb_vma_lock_write(struct vm_area_struct *vma) struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; down_write(&vma_lock->rw_sema); + } else if (__vma_private_lock(vma)) { + struct resv_map *resv_map = vma_resv_map(vma); + + down_write(&resv_map->rw_sema); } } @@ -294,17 +307,27 @@ void hugetlb_vma_unlock_write(struct vm_area_struct *vma) struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; up_write(&vma_lock->rw_sema); + } else if (__vma_private_lock(vma)) { + struct resv_map *resv_map = vma_resv_map(vma); + + up_write(&resv_map->rw_sema); } } int hugetlb_vma_trylock_write(struct vm_area_struct *vma) { - struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; - if (!__vma_shareable_lock(vma)) - return 1; + if (__vma_shareable_lock(vma)) { + struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; + + return down_write_trylock(&vma_lock->rw_sema); + } else if (__vma_private_lock(vma)) { + struct resv_map *resv_map = vma_resv_map(vma); + + return down_write_trylock(&resv_map->rw_sema); + } - return down_write_trylock(&vma_lock->rw_sema); + return 1; } void hugetlb_vma_assert_locked(struct vm_area_struct *vma) @@ -313,6 +336,10 @@ void hugetlb_vma_assert_locked(struct vm_area_struct *vma) struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; lockdep_assert_held(&vma_lock->rw_sema); + } else if (__vma_private_lock(vma)) { + struct resv_map *resv_map = vma_resv_map(vma); + + lockdep_assert_held(&resv_map->rw_sema); } } @@ -1068,6 +1095,7 @@ struct resv_map *resv_map_alloc(void) kref_init(&resv_map->refs); spin_lock_init(&resv_map->lock); INIT_LIST_HEAD(&resv_map->regions); + init_rwsem(&resv_map->rw_sema); resv_map->adds_in_progress = 0; /*