From patchwork Sun Oct 30 21:30:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13062 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1972983wru; Sun, 30 Oct 2022 14:33:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5JvTEkEUVMzNd6HY9+iCOfdBepTXpKVe7fZpzdwlvVaUjMc+Z6hOV2ZyVVbA6sNtdeFZ2X X-Received: by 2002:a17:90b:782:b0:213:9c2c:d047 with SMTP id l2-20020a17090b078200b002139c2cd047mr11688692pjz.144.1667165628999; Sun, 30 Oct 2022 14:33:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667165628; cv=none; d=google.com; s=arc-20160816; b=EHePtTSLtRNYWZZXUV7eokYFi+4rWcsNDj2ruvi+7eqc59Ti+KFpnyY7ibwFVQynm9 nG/UJLINjskBAb84sjlKdTQuJMHEWBCAjDT6WBy2FGNd3Mn/zWXpHyzkEOgNB/oDghRG QkJjp1yl9m2Bsnzx2eIxZ1fJ4mIIIn9ovQ6bet7oZ2jk/Fdt02ZpFCRA8TrB+vpVAv02 1DMOSjZ8XkNpa/YjEWYTyvjc9ZO5gHnR+C/ejIF76VLjFM8LqBE2dNdoTsxInS7uwZ9f /l64ovEP3hTNhNBy4jTYZqhrvhmzPtK7PIHAunzt2x9wNB5rpUb6btGBCHN8c9KFa/3l AZvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=18dXjMMHISRNlhGaFpCwLJgIneJr5paDcQBCMHn2vKI=; b=LIT9umymbgeDJsPEF3kshaoTVSDUcBWUon8sGNEBdhINI7hwV00nkl7RHHUAyaGnIw 3jD1aKslpGteRPcCFhqBZyJ+DJ0LDtERE6glwwaQwkERwswwj3g+Py10hVmv/xnAA/kJ bgOkXHt3yrv2Bq8eOmJ6cPJXyhsVZc0TpmS1OvfHJZG9SIZCdPW2AOwrn0udHKkUZTgG Wrh1Bwba0EjKLnCJSebwvs2xknKY7u/Vxuh5D2Ao+GF1iE1QQ+NiLuXe+xIT6DBY3+Ht FtNN/+PtUrECRcyb1v9kVjaT7DbsAnVF5yxI5c4IKeMpLIB+HFv/uv1lEsPNMO/zhQng y5iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RPpNh4jE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b6-20020a056a00114600b00563a0453c55si5640141pfm.268.2022.10.30.14.33.36; Sun, 30 Oct 2022 14:33:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RPpNh4jE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229528AbiJ3VcA (ORCPT + 99 others); Sun, 30 Oct 2022 17:32:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229925AbiJ3Vbs (ORCPT ); Sun, 30 Oct 2022 17:31:48 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBE7BBC81 for ; Sun, 30 Oct 2022 14:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667165447; 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=18dXjMMHISRNlhGaFpCwLJgIneJr5paDcQBCMHn2vKI=; b=RPpNh4jEPEssaaPDA/aG59xRNzUMZNX1O+j+TdjkMqX5KZZp+pj+q25cxjNwdoQImZdZuU bl1R+dDKOrCpGLa/t3MfG5JJQkpqrwg4e+2TueDjQkyh7KGjCKJPyC87FgpN/uFz3p/GCr EmGqRHq3u0zyjL8oT4wcopwXxfHkMTw= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-338-IcsO8kabPgyEphmiN16L2A-1; Sun, 30 Oct 2022 17:30:46 -0400 X-MC-Unique: IcsO8kabPgyEphmiN16L2A-1 Received: by mail-qk1-f200.google.com with SMTP id bp10-20020a05620a458a00b006fa29f253dcso1142465qkb.11 for ; Sun, 30 Oct 2022 14:30:46 -0700 (PDT) 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=18dXjMMHISRNlhGaFpCwLJgIneJr5paDcQBCMHn2vKI=; b=EGBVSY7FfPD9nHOGgh9/tKMGMQkqc51AS14waXVwslDUJaqqhusQ+ZqUZT1jrbmv56 Rw3h86SQ/IpbED6pgH0SVZvKvREgwvKfjVafUY20dMT64bt8CrN/sQOMYzxY1h95ywOW bBl096OxQg16HQyDC8b2KGzrAE2ReQ16IDxEIky7bKPnlEO1AnTUnM7+yP6zScQer8yZ 81v8xxbkcR2X2IyPdwTjRQ4blWW/nuQ/k/0mT8SS/QcTP+jH9n/C8aRD/gGjCHI1ZXC6 1e0zujxCd41mhqOG3JgAJxe4oPkbHs034quBpXrvJuzNwhsnqULBW17ysv60Wkp578nw 7bpA== X-Gm-Message-State: ACrzQf0fiJ8n5prZLhfDlhPcNsIlHVE+F6Z35fJ1bvy5+V5bWl4BLdj2 SiYQNi3IRoawEFKXf8V7yHNCntBaC89t/2dicQcRQXp1x1Ld2WuUpn6hQwsdOtqX6faBOuL2X2y D9T8K/bj4dQXw/MmxeqfqytP2 X-Received: by 2002:a05:6214:262f:b0:4b6:89bc:3ba4 with SMTP id gv15-20020a056214262f00b004b689bc3ba4mr8361028qvb.44.1667165445900; Sun, 30 Oct 2022 14:30:45 -0700 (PDT) X-Received: by 2002:a05:6214:262f:b0:4b6:89bc:3ba4 with SMTP id gv15-20020a056214262f00b004b689bc3ba4mr8361010qvb.44.1667165445716; Sun, 30 Oct 2022 14:30:45 -0700 (PDT) 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 i3-20020a05620a248300b006ee9d734479sm3533891qkn.33.2022.10.30.14.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 14:30:45 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: James Houghton , Mike Kravetz , David Hildenbrand , Andrea Arcangeli , Rik van Riel , peterx@redhat.com, Andrew Morton , Muchun Song , Miaohe Lin , Nadav Amit Subject: [PATCH RFC 09/10] mm/hugetlb: Make hugetlb_fault() RCU-safe Date: Sun, 30 Oct 2022 17:30:43 -0400 Message-Id: <20221030213043.335669-1-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221030212929.335473-1-peterx@redhat.com> References: <20221030212929.335473-1-peterx@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748149866998355081?= X-GMAIL-MSGID: =?utf-8?q?1748149866998355081?= RCU makes sure the pte_t* won't go away from under us. Please refer to the comment above huge_pte_offset() for more information. Signed-off-by: Peter Xu --- mm/hugetlb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 5dc87e4e6780..6d336d286394 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5822,6 +5822,8 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, int need_wait_lock = 0; unsigned long haddr = address & huge_page_mask(h); + /* For huge_pte_offset() */ + rcu_read_lock(); ptep = huge_pte_offset(mm, haddr, huge_page_size(h)); if (ptep) { /* @@ -5830,13 +5832,15 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, * not actually modifying content here. */ entry = huge_ptep_get(ptep); + rcu_read_unlock(); if (unlikely(is_hugetlb_entry_migration(entry))) { migration_entry_wait_huge(vma, ptep); return 0; } else if (unlikely(is_hugetlb_entry_hwpoisoned(entry))) return VM_FAULT_HWPOISON_LARGE | VM_FAULT_SET_HINDEX(hstate_index(h)); - } + } else + rcu_read_unlock(); /* * Serialize hugepage allocation and instantiation, so that we don't