From patchwork Fri Nov 18 01:10:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13047543 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 D8D07C433FE for ; Fri, 18 Nov 2022 01:10:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 762DC8E000B; Thu, 17 Nov 2022 20:10:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7137B8E0005; Thu, 17 Nov 2022 20:10:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B43F8E000B; Thu, 17 Nov 2022 20:10:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4B0278E0005 for ; Thu, 17 Nov 2022 20:10:50 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1F5B2160669 for ; Fri, 18 Nov 2022 01:10:50 +0000 (UTC) X-FDA: 80144783460.13.E8763EA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 3FE311C0006 for ; Fri, 18 Nov 2022 01:10:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668733847; h=from:from: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; bh=Xhz/Ckbg8bcdF0GpIUPbn4oL7x6YrFJTnL8UpEBPxx4=; b=PkuZEJ3dctm5sHPy0w3qwC0AzBlz0/AQ9WX3wc93hLJEG5SCXOGffUq1Ha3UeEMmECWGuu 2VCWYFqs5VN+nqQzMmsKJrPXt7ZRQpgoTN/6hldrqld9TzgRbIlCoEbb4OCJXm15wQ3VIj xH3e9cLr1Tpc7aqCXWlSWONPCCUZG70= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-608--cmmcWxxNNC1vRCzE1gENA-1; Thu, 17 Nov 2022 20:10:46 -0500 X-MC-Unique: -cmmcWxxNNC1vRCzE1gENA-1 Received: by mail-qk1-f199.google.com with SMTP id q14-20020a05620a0d8e00b006ef0350dae1so4380610qkl.12 for ; Thu, 17 Nov 2022 17:10:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xhz/Ckbg8bcdF0GpIUPbn4oL7x6YrFJTnL8UpEBPxx4=; b=4EV9TEbfjrITR4oOZaEv4d4LBcvurSYEF0eQYuUptJnSCyRddbm91v49lUoIGA9PNj rl/HyzYhhnojyI3CzHIYG8m5EXeyKrAfQ7PP1NO5ttE3GWaUhJqW8nAkUWP2+U6PQQ3B ZEEXq5T/5WKDCVSi6B4XziYu0gzhuq6P/iGZF0IcIjhqrU3yGQ7NvIlX4cVWiOeIdIDf rpOl3hBvphuPH+gekrO4Hwg6GYrtY0bs837It2b95v/IEJGfdfnVJHOdgiKEdiAzI4Dm OVMp+uRGqItvov95dL6aPATCbQGD6/xRk9768idip/68lF3XQBuDU+NBsx95BUeAsTTj 1j6Q== X-Gm-Message-State: ANoB5plMvpX3pYH55L8SGZv8ktMqw0hLePiRNnMfUMyyx2MVFy49pHSX swUAAz+8Dzdm+VfG0UXTSTg9+KgKMMIkFzHoP0rgoaI0o17V+5xvxQDcS5hb1vmBHjIJxXGR7ta v75s+9JnYYOlstLNYBrXStYvUQPUrG0qayJdMAT7jtoA+Lpk2VUtjAy4O8v0e X-Received: by 2002:a05:620a:a10:b0:6fb:a7e6:96e with SMTP id i16-20020a05620a0a1000b006fba7e6096emr3968838qka.675.1668733844123; Thu, 17 Nov 2022 17:10:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf7dJcHqBiR7Zv4m+XJwPOWgqJH93kZp3F2AOeTKPKZTLrUWczK3rZnxkV5Lt7km6veLvhXYzg== X-Received: by 2002:a05:620a:a10:b0:6fb:a7e6:96e with SMTP id i16-20020a05620a0a1000b006fba7e6096emr3968816qka.675.1668733843810; Thu, 17 Nov 2022 17:10:43 -0800 (PST) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id u7-20020a05620a430700b006eed75805a2sm1491342qko.126.2022.11.17.17.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 17:10:43 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Rik van Riel , Muchun Song , Andrew Morton , peterx@redhat.com, James Houghton , Nadav Amit , Andrea Arcangeli , David Hildenbrand , Miaohe Lin , Mike Kravetz Subject: [PATCH RFC v2 10/12] mm/hugetlb: Use hugetlb walker lock in walk_hugetlb_range() Date: Thu, 17 Nov 2022 20:10:23 -0500 Message-Id: <20221118011025.2178986-11-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221118011025.2178986-1-peterx@redhat.com> References: <20221118011025.2178986-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668733849; 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=Xhz/Ckbg8bcdF0GpIUPbn4oL7x6YrFJTnL8UpEBPxx4=; b=6GgEpyR7a+Bl6DTclrZMd4QE4MG42Wn2c5YSXsJpKmtD5QqNU7rLhLcl/laC2/Mi2BHpE/ KaGEqCwUPL4hHhlR8lJcuKy82ElpMrfasPNcMyhPYRF6wLpsOnb/HkcU68QsiNS7pWuycf tZPHtFAoEJYZDLWOpgqckMfr3GVkcPQ= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PkuZEJ3d; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf20.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668733849; a=rsa-sha256; cv=none; b=eI1fCgvanOyPj7miBPDHTGYXL75CS5HJbVHxqKi7GNr9n0Mvm8mtX2MMYxmtZ8PiNMpOph MSps1ur0chxpWPVV3m3RNWLcnJNmPAcUV95h1COdDkKSUlCIwS7G3+zBao+mmQ7fJK4JfI W3ZQ73EyvbC3pqKv9h2BeXUfZi+dK84= X-Rspam-User: X-Stat-Signature: smdn9ipa5u84cx4q67fjt6w8ysfs6b3x X-Rspamd-Queue-Id: 3FE311C0006 Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PkuZEJ3d; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf20.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com X-Rspamd-Server: rspam07 X-HE-Tag: 1668733848-896725 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 walker lock makes sure the pte_t* won't go away from under us. One thing to mention is there're two hugetlb_entry() users that can yield the thread within hugetlb_entry(), that'll need to add unlock/lock pair around the yield, meanwhile document hugetlb_entry() explaining the lock for sleepable hugetlb_entry()s. Signed-off-by: Peter Xu --- arch/s390/mm/gmap.c | 2 ++ fs/proc/task_mmu.c | 2 ++ include/linux/pagewalk.h | 9 ++++++++- mm/pagewalk.c | 2 ++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 02d15c8dc92e..fb2938e8d1c7 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -2644,7 +2644,9 @@ static int __s390_enable_skey_hugetlb(pte_t *pte, unsigned long addr, end = start + HPAGE_SIZE - 1; __storage_key_init_range(start, end); set_bit(PG_arch_1, &page->flags); + hugetlb_walker_unlock(); cond_resched(); + hugetlb_walker_lock(); return 0; } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 89338950afd3..ed750a52e60b 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1612,7 +1612,9 @@ static int pagemap_hugetlb_range(pte_t *ptep, unsigned long hmask, frame++; } + hugetlb_walker_unlock(); cond_resched(); + hugetlb_walker_lock(); return err; } diff --git a/include/linux/pagewalk.h b/include/linux/pagewalk.h index 959f52e5867d..7fa3724c6eb5 100644 --- a/include/linux/pagewalk.h +++ b/include/linux/pagewalk.h @@ -21,7 +21,14 @@ struct mm_walk; * depth is -1 if not known, 0:PGD, 1:P4D, 2:PUD, 3:PMD. * Any folded depths (where PTRS_PER_P?D is equal to 1) * are skipped. - * @hugetlb_entry: if set, called for each hugetlb entry + * @hugetlb_entry: if set, called for each hugetlb entry. Note that + * each pte_t* is protected by hugetlb_walker_lock(), + * and the lock does not allow sleep. If explicit + * sleep in the entry fn needed, the caller needs to + * release the lock (hugetlb_walker_unlock()), then + * relock it (hugetlb_walker_lock()) before return. + * After the unlock, the pte_t* may become invalid + * anytime so cannot be accessed anymore. * @test_walk: caller specific callback function to determine whether * we walk over the current vma or not. Returning 0 means * "do page table walk over the current vma", returning diff --git a/mm/pagewalk.c b/mm/pagewalk.c index 7f1c9b274906..abf310011ab1 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -302,6 +302,7 @@ static int walk_hugetlb_range(unsigned long addr, unsigned long end, const struct mm_walk_ops *ops = walk->ops; int err = 0; + hugetlb_walker_lock(); do { next = hugetlb_entry_end(h, addr, end); pte = huge_pte_offset(walk->mm, addr & hmask, sz); @@ -314,6 +315,7 @@ static int walk_hugetlb_range(unsigned long addr, unsigned long end, if (err) break; } while (addr = next, addr != end); + hugetlb_walker_unlock(); return err; }