Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp1620103rdh; Mon, 25 Sep 2023 20:21:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFC48IECprrMIAzvNGIorw0ZCxAJsBD42CnRI6KS8zBuT+TA+71drKD5GWw+2Q3rP4FioIA X-Received: by 2002:a05:6a20:1451:b0:153:63b9:8bf9 with SMTP id a17-20020a056a20145100b0015363b98bf9mr10622055pzi.0.1695698518512; Mon, 25 Sep 2023 20:21:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695698518; cv=none; d=google.com; s=arc-20160816; b=zJYRirVO2DbMRc8mozxkora8/gSscrk+t5ck7ONjuYgd93Y3ZP6yI2taVNAIEZd7bN yczTYavKR2GkU+aQo0MtQj/Atr/eqBgxJvvq4h1xx+Rspi7mMLZyGutreZeH9okrkMIm meRkYGOT3Pcx1UhvIG8a5pnFkXmEw5aNlreh4WGqCl7kwnK3bNUw7+aaJIo8lSznNnhQ 3Kdx9HbqOUba32JVB8CvaCw/CbW/gbExA8CYdwM+ehvCNH7SUEFGGbnIDCFIED/zqTcP fjUWw381nxlCbdWnJjg1Sy0gbMFu/PNi4NLYdGavVm5oETeddjQoFPEbB6dzlQd3laxB BDrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=lo9SBe6E3yZylvB3m0vLKsYs1lYeEqPoJjVl7+P3TSY=; fh=q9SQMO40xEi/EnFYzkYLxDJR2yDm5elEChUbTy2RFH8=; b=r4vscNNmkXfTiU+iEmUXGPdztTtfmiBo73xSlOBHmkSLuXid3voo4mnPhGlz9Rlb9f zK78buGEQbOseqMwpRb2yUSQQCC5MujH4sf9t5ScapdBVpf+khqIXbI1CkEQQATM0+ll t1KUoe5x+WBuyLK0Bh5W57LMKGxnBIpJCW4Rq42NwzqS6tiwNvKgz4QUTTnzK9qyAHsv tpRaG1psmfgb9T2SnZlt6ZR2YRKdWG2fmNbZSWsGyvHMP+Z8BEqGHgKj8MET3HGkpw4x 8Wyc6YiNJDLyiZyDClgIEicbrQElFm4iJ9W6t0UvRTm2TI3WIGf45HE6jm9MqHvyfD4l rVgg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u1-20020a170902e5c100b001bbad3b063bsi12230988plf.345.2023.09.25.20.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 20:21:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 58D1E80E069C; Mon, 25 Sep 2023 20:13:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230120AbjIZDNo (ORCPT + 99 others); Mon, 25 Sep 2023 23:13:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbjIZDNl (ORCPT ); Mon, 25 Sep 2023 23:13:41 -0400 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1B439F for ; Mon, 25 Sep 2023 20:13:33 -0700 (PDT) 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 1qkyVD-00025y-0I; Mon, 25 Sep 2023 23:12:47 -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, willy@infradead.org Subject: [PATCH v4 0/3] hugetlbfs: close race between MADV_DONTNEED and page fault Date: Mon, 25 Sep 2023 23:10:49 -0400 Message-ID: <20230926031245.795759-1-riel@surriel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: riel@surriel.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 25 Sep 2023 20:13:46 -0700 (PDT) v4: fix unmap_vmas locking issue pointed out by Mike Kravetz, and resulting lockdep fallout v3: fix compile error w/ lockdep and test case errors with patch 3 v2: fix the locking bug found with the libhugetlbfs tests. Malloc libraries, like jemalloc and tcalloc, take decisions on when to call madvise independently from the code in the main application. This sometimes results in the application page faulting on an address, right after the malloc library has shot down the backing memory with MADV_DONTNEED. Usually this is harmless, because we always have some 4kB pages sitting around to satisfy a page fault. However, with hugetlbfs systems often allocate only the exact number of huge pages that the application wants. Due to TLB batching, hugetlbfs MADV_DONTNEED will free pages outside of any lock taken on the page fault path, which can open up the following race condition: CPU 1 CPU 2 MADV_DONTNEED unmap page shoot down TLB entry page fault fail to allocate a huge page killed with SIGBUS free page Fix that race by extending the hugetlb_vma_lock locking scheme to also cover private hugetlb mappings (with resv_map), and pulling the locking from __unmap_hugepage_final_range into helper functions called from zap_page_range_single. This ensures page faults stay locked out of the MADV_DONTNEED VMA until the huge pages have actually been freed. The third patch in the series is more of an RFC. Using the invalidate_lock instead of the hugetlb_vma_lock greatly simplifies the code, but at the cost of turning a per-VMA lock into a lock per backing hugetlbfs file, which could slow things down when multiple processes are mapping the same hugetlbfs file.