From patchwork Mon Nov 28 18:02:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jann Horn X-Patchwork-Id: 13057844 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 CA045C4332F for ; Mon, 28 Nov 2022 18:03:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 40A086B0072; Mon, 28 Nov 2022 13:03:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3BA826B0073; Mon, 28 Nov 2022 13:03:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A9FE6B0074; Mon, 28 Nov 2022 13:03:07 -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 1C8406B0072 for ; Mon, 28 Nov 2022 13:03:07 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 9D1131A08A3 for ; Mon, 28 Nov 2022 18:03:06 +0000 (UTC) X-FDA: 80183622372.14.00C0FC1 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by imf19.hostedemail.com (Postfix) with ESMTP id 467281A0028 for ; Mon, 28 Nov 2022 18:03:04 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id g12so18180770wrs.10 for ; Mon, 28 Nov 2022 10:03:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/Fh+crFYr0bdZ0CEDCCytk9X8KD6hynMr1Yq9paj0G4=; b=f8Ck9XrDcaB/E4hGC+FYMlnArzd3Sq82oo1yzaQNVZIBLt+2yTGRY7PB7dZdnKgaE/ /5XnlfYGvyoKSXRlzluNuKc31hOtz6cGxMjxUGm+kXC8IjtorJ39gGjCjfnn0uJaOxj0 V//Q4KL6qSyDcXprZMrHn52tOkCDJS3LAjPJdLsOK94Pbbf1INGO83C6HitBcDp0Tyxl bADOVWR84N4yp17bCUCe7GkV5NBS79AZG4dr++FvDEAW4Iy4PTixlNmXLIS8jcqhjMRL fKJ8YOCkV6miNWCDVcXbxGZdoESFHA1SQMVr0g/xuXhsCioyVU0uuTrx+OR2YBCvBSlO EJ+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/Fh+crFYr0bdZ0CEDCCytk9X8KD6hynMr1Yq9paj0G4=; b=z6zcKGpSs80VswqsNHXWFPKMqYQyESF9OWYTEWAVF0BfbsTJKxg5WXrHPVMdGSrbwa GtPc+H/mgPb7QUFVZiN84PEcB/1nGDmkTv4tlEEa3q1ffslJqYv8wEpGT+zXbqSxaNfv OmCkbSfK+ybbj5sub0MMpF5B7+yLsnX5D6KMm3LPEHqRbhbiBzdW9lJNWyHz+ZcwmK3Y DCtsLDvRJHHmqmXjC9Jpe+u6UPT8MQfHt6PUhEwTjR50q+IBXHzP9Jg45CsMz1n2hpFC B8JQ5EuSGQn7ZwLRcM9cEPz3Q6fF9dn7jVyMnI13g/DjjFhnjLuQSO9MsPS56SznBUwH mKkA== X-Gm-Message-State: ANoB5pk3a9op5PhbYZKl5c14Ne+B/iLLkLuqXRfL2+cBvJ5jDcPhKlM0 eUKU70CwIvGagzNirFr7fbM8ug== X-Google-Smtp-Source: AA0mqf6IfaziHtYUVKo6OfKfp+73RV+bf+8qqF3qBlgEbj4zfCkiNf7nhF/x6uTq/h4ojy4XDpMvrA== X-Received: by 2002:adf:de0e:0:b0:241:6f01:ad47 with SMTP id b14-20020adfde0e000000b002416f01ad47mr24231647wrm.222.1669658583556; Mon, 28 Nov 2022 10:03:03 -0800 (PST) Received: from localhost ([2a00:79e0:9d:4:f4d1:b340:8675:e840]) by smtp.gmail.com with ESMTPSA id m18-20020adffa12000000b00241c6729c2bsm11350836wrr.26.2022.11.28.10.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 10:03:02 -0800 (PST) From: Jann Horn To: security@kernel.org, Andrew Morton Cc: Yang Shi , David Hildenbrand , Peter Xu , John Hubbard , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v4 1/3] mm/khugepaged: Take the right locks for page table retraction Date: Mon, 28 Nov 2022 19:02:50 +0100 Message-Id: <20221128180252.1684965-1-jannh@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669658585; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=/Fh+crFYr0bdZ0CEDCCytk9X8KD6hynMr1Yq9paj0G4=; b=QYpWn6OU7ofCKdOnfE6wSzpdDKdbD1YFfmOwX5PEfQ1P5EXhgfVrVSs6MWuUP/VqkliF+Z pdWEOcM3sTFYf7vmN2J7t9B9/tg98t9ppTp9yfiMSPWNwDMDXsQxOCWZnT+hGBxdpr1ZcZ jnAJcxJ6oX4E5LOBkPn4Lttr+92OWt0= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=f8Ck9XrD; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf19.hostedemail.com: domain of jannh@google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=jannh@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669658585; a=rsa-sha256; cv=none; b=zstO719WzSuluZxEd5/a1Z9EJyBhbTMgUZmyPC+5p2JLNkNJ3GN4U6Rmdyl7z/3QOcJSUW Hptt85t0VhdFJjgDPQVLxO+4WeP8eEGj6IPaWjZij4Ldpx9TAKKC3+Kydzrp32cv3Ine2M TnQNa/9L/gpchdF2U4G99fpbGoy5I9g= X-Rspam-User: Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=f8Ck9XrD; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf19.hostedemail.com: domain of jannh@google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=jannh@google.com X-Stat-Signature: h4g9fjfebw94tx7hrm1o163f8xdceudj X-Rspamd-Queue-Id: 467281A0028 X-Rspamd-Server: rspam08 X-HE-Tag: 1669658584-988962 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: pagetable walks on address ranges mapped by VMAs can be done under the mmap lock, the lock of an anon_vma attached to the VMA, or the lock of the VMA's address_space. Only one of these needs to be held, and it does not need to be held in exclusive mode. Under those circumstances, the rules for concurrent access to page table entries are: - Terminal page table entries (entries that don't point to another page table) can be arbitrarily changed under the page table lock, with the exception that they always need to be consistent for hardware page table walks and lockless_pages_from_mm(). This includes that they can be changed into non-terminal entries. - Non-terminal page table entries (which point to another page table) can not be modified; readers are allowed to READ_ONCE() an entry, verify that it is non-terminal, and then assume that its value will stay as-is. Retracting a page table involves modifying a non-terminal entry, so page-table-level locks are insufficient to protect against concurrent page table traversal; it requires taking all the higher-level locks under which it is possible to start a page walk in the relevant range in exclusive mode. The collapse_huge_page() path for anonymous THP already follows this rule, but the shmem/file THP path was getting it wrong, making it possible for concurrent rmap-based operations to cause corruption. Cc: stable@kernel.org Fixes: 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") Acked-by: David Hildenbrand Signed-off-by: Jann Horn Reviewed-by: Yang Shi --- v4: added ack by David Hildenbrand mm/khugepaged.c | 55 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-) base-commit: eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 4734315f79407..674b111a24fa7 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1384,16 +1384,37 @@ static int set_huge_pmd(struct vm_area_struct *vma, unsigned long addr, return SCAN_SUCCEED; } +/* + * A note about locking: + * Trying to take the page table spinlocks would be useless here because those + * are only used to synchronize: + * + * - modifying terminal entries (ones that point to a data page, not to another + * page table) + * - installing *new* non-terminal entries + * + * Instead, we need roughly the same kind of protection as free_pgtables() or + * mm_take_all_locks() (but only for a single VMA): + * The mmap lock together with this VMA's rmap locks covers all paths towards + * the page table entries we're messing with here, except for hardware page + * table walks and lockless_pages_from_mm(). + */ static void collapse_and_free_pmd(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, pmd_t *pmdp) { - spinlock_t *ptl; pmd_t pmd; mmap_assert_write_locked(mm); - ptl = pmd_lock(vma->vm_mm, pmdp); + if (vma->vm_file) + lockdep_assert_held_write(&vma->vm_file->f_mapping->i_mmap_rwsem); + /* + * All anon_vmas attached to the VMA have the same root and are + * therefore locked by the same lock. + */ + if (vma->anon_vma) + lockdep_assert_held_write(&vma->anon_vma->root->rwsem); + pmd = pmdp_collapse_flush(vma, addr, pmdp); - spin_unlock(ptl); mm_dec_nr_ptes(mm); page_table_check_pte_clear_range(mm, addr, pmd); pte_free(mm, pmd_pgtable(pmd)); @@ -1444,6 +1465,14 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, if (!hugepage_vma_check(vma, vma->vm_flags, false, false, false)) return SCAN_VMA_CHECK; + /* + * Symmetry with retract_page_tables(): Exclude MAP_PRIVATE mappings + * that got written to. Without this, we'd have to also lock the + * anon_vma if one exists. + */ + if (vma->anon_vma) + return SCAN_VMA_CHECK; + /* Keep pmd pgtable for uffd-wp; see comment in retract_page_tables() */ if (userfaultfd_wp(vma)) return SCAN_PTE_UFFD_WP; @@ -1477,6 +1506,20 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, goto drop_hpage; } + /* + * We need to lock the mapping so that from here on, only GUP-fast and + * hardware page walks can access the parts of the page tables that + * we're operating on. + * See collapse_and_free_pmd(). + */ + i_mmap_lock_write(vma->vm_file->f_mapping); + + /* + * This spinlock should be unnecessary: Nobody else should be accessing + * the page tables under spinlock protection here, only + * lockless_pages_from_mm() and the hardware page walker can access page + * tables while all the high-level locks are held in write mode. + */ start_pte = pte_offset_map_lock(mm, pmd, haddr, &ptl); result = SCAN_FAIL; @@ -1531,6 +1574,8 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, /* step 4: remove pte entries */ collapse_and_free_pmd(mm, vma, haddr, pmd); + i_mmap_unlock_write(vma->vm_file->f_mapping); + maybe_install_pmd: /* step 5: install pmd entry */ result = install_pmd @@ -1544,6 +1589,7 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, abort: pte_unmap_unlock(start_pte, ptl); + i_mmap_unlock_write(vma->vm_file->f_mapping); goto drop_hpage; } @@ -1600,7 +1646,8 @@ static int retract_page_tables(struct address_space *mapping, pgoff_t pgoff, * An alternative would be drop the check, but check that page * table is clear before calling pmdp_collapse_flush() under * ptl. It has higher chance to recover THP for the VMA, but - * has higher cost too. + * has higher cost too. It would also probably require locking + * the anon_vma. */ if (vma->anon_vma) { result = SCAN_PAGE_ANON; From patchwork Mon Nov 28 18:02:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jann Horn X-Patchwork-Id: 13057845 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 B44C1C4332F for ; Mon, 28 Nov 2022 18:03:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F07056B0073; Mon, 28 Nov 2022 13:03:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EB6D06B0074; Mon, 28 Nov 2022 13:03:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7E596B0075; Mon, 28 Nov 2022 13:03:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C7FA76B0073 for ; Mon, 28 Nov 2022 13:03:10 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 82A81160E4F for ; Mon, 28 Nov 2022 18:03:10 +0000 (UTC) X-FDA: 80183622540.11.50CA28D Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by imf25.hostedemail.com (Postfix) with ESMTP id 8F2FDA003C for ; Mon, 28 Nov 2022 18:03:08 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id o30so9117189wms.2 for ; Mon, 28 Nov 2022 10:03:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RUow5Vogs/7PnC9nrxFlLM/L16QCcApD5uJXFy4USuY=; b=rU/5WuLN/iM6g1+U2lBomEDv/g6EreorKfHwKtqRkF8SblU0VsIoZV8lMj7la44xOo RFhODdlKSvqR653yK+HRv3a22IBJ7tLBK5Z6ja7TLaM28AE7gzd8hZGHoFRg1XxIlqjJ WzZLuZdJo6sJsyS+ZZSUvjrHnUPfa6Ac26czHLanj7NP3nju9ONX3HUkVJHKHv9yZ1BF xmWKi8CRGLpW4bKOJghlq05QZvrVOUN3iDX+uFzjp2XCnvE1dkTCbY2bZ7loNCgKJ9US 4XoznfiWY3eu0D8pWYcvLjab/VADOYaVOhIRlWOyHDbaAxmQm1iUD8calDDGZ6mT7Dcv kYVg== 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=RUow5Vogs/7PnC9nrxFlLM/L16QCcApD5uJXFy4USuY=; b=sqQaRmQkDpJgN1ywZGRefVJsmhXMKxAwFhBDDSiDb1mDIG7vhRt2XGIgwzG8eGQM3i mX2x3962L11EpsLsEN1Ardhd89YEnXF8FunDcUPpCCJO6nslGKzTkjdDBLWjF1rATwHE rcxpuhYLVzHVjI4aRWzc2F7WLmgPDyzcxYdFf5KJwIkycqxa1CydGWuaIugVW4CcpDuz 6iaBimyk+e1XXeLZB/zYxpA4whX8vXLOaQeuigOxBEU0tyF/kLNLwHBrbgwvivgKOd+k xNbaS1VEB3Oik1FCT5YDdFupnCVcsvY1PzmExMVEYbu9iBRfUxhrTRxLD4mesjqg+kHG wE3g== X-Gm-Message-State: ANoB5pmfPqSm5CbbgasE0vWQYT/rNh0jsENC84jyLMiORh2N3L4RKaWM ctwYt5x2C29QZXSYbN66b79z3w== X-Google-Smtp-Source: AA0mqf55TgU3FF0+HFze1Tgck+4ISKVwlxDQBSJiTP5rct0txTHiKl+xLdG68s5H54ewewN4ONkTvA== X-Received: by 2002:a7b:cd18:0:b0:3cf:a359:de90 with SMTP id f24-20020a7bcd18000000b003cfa359de90mr28732913wmj.122.1669658587158; Mon, 28 Nov 2022 10:03:07 -0800 (PST) Received: from localhost ([2a00:79e0:9d:4:f4d1:b340:8675:e840]) by smtp.gmail.com with ESMTPSA id l11-20020adff48b000000b002420dba6447sm6628727wro.59.2022.11.28.10.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 10:03:05 -0800 (PST) From: Jann Horn To: security@kernel.org, Andrew Morton Cc: Yang Shi , David Hildenbrand , Peter Xu , John Hubbard , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v4 2/3] mm/khugepaged: Fix GUP-fast interaction by sending IPI Date: Mon, 28 Nov 2022 19:02:51 +0100 Message-Id: <20221128180252.1684965-2-jannh@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog In-Reply-To: <20221128180252.1684965-1-jannh@google.com> References: <20221128180252.1684965-1-jannh@google.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669658588; a=rsa-sha256; cv=none; b=5fEdFdoDaM6NPjRbmGcl8gRuAonrmu0cIgcvrpX9xyXTJF/KKZwY3uz6QCpXQW9uC3V3yW 6iTVRKeu0LwXz6OrAj78B5RcWvvl7mbzejGNltDegA86fHCkSlcTnyS5RoKggtqDVAJrIh EtfZ6lExG9dA1B/6jKNc1vuo5UTAYjI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="rU/5WuLN"; spf=pass (imf25.hostedemail.com: domain of jannh@google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=jannh@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=1669658588; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RUow5Vogs/7PnC9nrxFlLM/L16QCcApD5uJXFy4USuY=; b=jtaHauZw1TupnJc0CHET8JdZYwkm4tZPdlruhZruqUT+UorJS6b5o4Eg8IHZi/A6nW0Fa8 Jmd2dwHG/pkLZ654VlgVuGzZ1rv69/JFUKMz6l6xF8xnzd5r7kyfM9nhOsJnBE3AxGaMe1 bf9XFgB0ooRBe/kYaIvAXYi4wT5YsTI= X-Stat-Signature: fmce8mhkkafobbpwj43ps13qp3rxsc88 X-Rspamd-Queue-Id: 8F2FDA003C X-Rspam-User: Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="rU/5WuLN"; spf=pass (imf25.hostedemail.com: domain of jannh@google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=jannh@google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam05 X-HE-Tag: 1669658588-820203 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: Since commit 70cbc3cc78a99 ("mm: gup: fix the fast GUP race against THP collapse"), the lockless_pages_from_mm() fastpath rechecks the pmd_t to ensure that the page table was not removed by khugepaged in between. However, lockless_pages_from_mm() still requires that the page table is not concurrently freed or reused to store non-PTE data. Otherwise, problems can occur because: - deposited page tables can be freed when a THP page somewhere in the mm is removed - some architectures store non-PTE information inside deposited page tables (see radix__pgtable_trans_huge_deposit()) Additionally, lockless_pages_from_mm() is also somewhat brittle with regards to page tables being repeatedly moved back and forth, but that shouldn't be an issue in practice. Fix it by sending IPIs (if the architecture uses semi-RCU-style page table freeing) before freeing/reusing page tables. As noted in mm/gup.c, on configs that define CONFIG_HAVE_FAST_GUP, there are two possible cases: 1. CONFIG_MMU_GATHER_RCU_TABLE_FREE is set, causing tlb_remove_table_sync_one() to send an IPI to synchronize with lockless_pages_from_mm(). 2. CONFIG_MMU_GATHER_RCU_TABLE_FREE is unset, indicating that all TLB flushes are already guaranteed to send IPIs. tlb_remove_table_sync_one() will do nothing, but we've already run pmdp_collapse_flush(), which did a TLB flush, which must have involved IPIs. Cc: stable@kernel.org Fixes: ba76149f47d8 ("thp: khugepaged") Acked-by: David Hildenbrand Signed-off-by: Jann Horn Reviewed-by: Yang Shi --- v4: - added ack from David Hildenbrand - made commit message more verbose include/asm-generic/tlb.h | 4 ++++ mm/khugepaged.c | 2 ++ mm/mmu_gather.c | 4 +--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 492dce43236ea..cab7cfebf40bd 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -222,12 +222,16 @@ extern void tlb_remove_table(struct mmu_gather *tlb, void *table); #define tlb_needs_table_invalidate() (true) #endif +void tlb_remove_table_sync_one(void); + #else #ifdef tlb_needs_table_invalidate #error tlb_needs_table_invalidate() requires MMU_GATHER_RCU_TABLE_FREE #endif +static inline void tlb_remove_table_sync_one(void) { } + #endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */ diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 674b111a24fa7..c3d3ce596bff7 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1057,6 +1057,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, _pmd = pmdp_collapse_flush(vma, address, pmd); spin_unlock(pmd_ptl); mmu_notifier_invalidate_range_end(&range); + tlb_remove_table_sync_one(); spin_lock(pte_ptl); result = __collapse_huge_page_isolate(vma, address, pte, cc, @@ -1415,6 +1416,7 @@ static void collapse_and_free_pmd(struct mm_struct *mm, struct vm_area_struct *v lockdep_assert_held_write(&vma->anon_vma->root->rwsem); pmd = pmdp_collapse_flush(vma, addr, pmdp); + tlb_remove_table_sync_one(); mm_dec_nr_ptes(mm); page_table_check_pte_clear_range(mm, addr, pmd); pte_free(mm, pmd_pgtable(pmd)); diff --git a/mm/mmu_gather.c b/mm/mmu_gather.c index add4244e5790d..3a2c3f8cad2fe 100644 --- a/mm/mmu_gather.c +++ b/mm/mmu_gather.c @@ -153,7 +153,7 @@ static void tlb_remove_table_smp_sync(void *arg) /* Simply deliver the interrupt */ } -static void tlb_remove_table_sync_one(void) +void tlb_remove_table_sync_one(void) { /* * This isn't an RCU grace period and hence the page-tables cannot be @@ -177,8 +177,6 @@ static void tlb_remove_table_free(struct mmu_table_batch *batch) #else /* !CONFIG_MMU_GATHER_RCU_TABLE_FREE */ -static void tlb_remove_table_sync_one(void) { } - static void tlb_remove_table_free(struct mmu_table_batch *batch) { __tlb_remove_table_free(batch); From patchwork Mon Nov 28 18:02:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jann Horn X-Patchwork-Id: 13057846 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 8FCCBC433FE for ; Mon, 28 Nov 2022 18:03:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D1FD6B0074; Mon, 28 Nov 2022 13:03:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2820D6B0075; Mon, 28 Nov 2022 13:03:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1717F6B0078; Mon, 28 Nov 2022 13:03:14 -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 08AD26B0074 for ; Mon, 28 Nov 2022 13:03:14 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C494E4015A for ; Mon, 28 Nov 2022 18:03:13 +0000 (UTC) X-FDA: 80183622666.28.E6BC103 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by imf15.hostedemail.com (Postfix) with ESMTP id 45345A005B for ; Mon, 28 Nov 2022 18:03:10 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id t25-20020a1c7719000000b003cfa34ea516so9867131wmi.1 for ; Mon, 28 Nov 2022 10:03:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l98v59BwmjV3ozOfAPw93XrEkUrol6K2zteQO/pxMQA=; b=e/bGIA0HwGB+g6h3LY4eVczqCQQA7q3lac86AA8ayrG5RmwDmE42BKfG03HoYIQKsz fMIN5YuLApIg7+jeOJkwev91+mwmAodAoBnqKNmf+ZyiCiDkOu2GYqHqzKzhbJWp/ecI vWsg6LX5RDFYedCD530UHz52LBU5F7BC2+HnuTEORVeZrSQlOPbK4fD7O+EJmC+ChSqT 4/QrQNGQYxmjFVHe4CjMFUxzDdcOEnJOVqPakZboLMtfqHUntjEYD8GQnRWIeBPl84lH 7h9OmgR2dU+cq7dQy/wrZmcmqRNiPwgNox6e/naAqPQyFZei0ecGmQ4QHiMSLPBUWKVm BCUw== 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=l98v59BwmjV3ozOfAPw93XrEkUrol6K2zteQO/pxMQA=; b=t3g7N72LkH7hY3vuans0xGrorVwm+08tAjMCqHHeI5TtsIhbbpzWHgZDW3/2lIKo9s VdVRHi+ejd3nz1b63ejZW+Kmn9BvOMexFk5eo7w5aTiya0yZsbacaNNbVE1GNe8bmlcz m6j7ACwloue7DYe9NpiprQnEa3TiVdECG4Hw9hFaYX19oOGpWoMM5LIodYGxy2mSE++L XCkUNZm0X3yFawJkYX43N64NE17r8o1rcUOgwW4NLsJ+GroVzwj6yek90w5NHRYtZHcR F3EKsEmJuEchFJvQl33Iu8pTSCJvI2Ag4+p2EtTf6s9/OYTSMeESoMkwNO4c5qef8VX4 AJPA== X-Gm-Message-State: ANoB5pm5iqrtLOR716tMfENe+GYJtJ5msdyh1FmLyoAgNG9ogrRemonk 8yIThp1LnN5u5Yef0QxVA3f7NA== X-Google-Smtp-Source: AA0mqf5bPnlo2nRCz9Eyg7DCrG+Pr9DR0sbrCKNNE0RnhBm/HPey1JfsWRdDN/GOXPZxYrMjEe4RKA== X-Received: by 2002:a05:600c:4fd0:b0:3cf:70a0:f689 with SMTP id o16-20020a05600c4fd000b003cf70a0f689mr43238540wmq.161.1669658589915; Mon, 28 Nov 2022 10:03:09 -0800 (PST) Received: from localhost ([2a00:79e0:9d:4:f4d1:b340:8675:e840]) by smtp.gmail.com with ESMTPSA id d8-20020a5d6dc8000000b002415dd45320sm11359859wrz.112.2022.11.28.10.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 10:03:09 -0800 (PST) From: Jann Horn To: security@kernel.org, Andrew Morton Cc: Yang Shi , David Hildenbrand , Peter Xu , John Hubbard , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v4 3/3] mm/khugepaged: Invoke MMU notifiers in shmem/file collapse paths Date: Mon, 28 Nov 2022 19:02:52 +0100 Message-Id: <20221128180252.1684965-3-jannh@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog In-Reply-To: <20221128180252.1684965-1-jannh@google.com> References: <20221128180252.1684965-1-jannh@google.com> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="e/bGIA0H"; spf=pass (imf15.hostedemail.com: domain of jannh@google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=jannh@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669658591; a=rsa-sha256; cv=none; b=bO43uiPArS8OVbrAwYAx6u4NavuxTmMgp67pKKkkuvofrxrcKHeyrVHyL/9lG/xO96/D7I 2YLBcHjtr8RsmiUXmmYHCJwnR2kV3EXTRkVQNUSNWi3/2Ec00FNjCsx65/zCdR7IaLvi5b aRFKPLvQ1ZY44hxLnvbuQxWf1kPPt4g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669658591; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=l98v59BwmjV3ozOfAPw93XrEkUrol6K2zteQO/pxMQA=; b=gdncPyx9+96anE1qgQfc/qdJ8lm5IjwUqhQHMXg8saOxnmfPUcHChHbTUVuuy2YNN/VEea pKCmLC4HTtrSYogMJsDrFnPdGDqniLYEFBUw6/gjpuFKbN4OWgSuU+AbURLFggFsCddRjy gGDl3Vcw8/j28CrTyhnrQ8MPjLLqiDc= Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="e/bGIA0H"; spf=pass (imf15.hostedemail.com: domain of jannh@google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=jannh@google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam01 X-Stat-Signature: puddfy84ndgioakscbioujwywte8zbqe X-Rspamd-Queue-Id: 45345A005B X-Rspam-User: X-HE-Tag: 1669658590-701524 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: Any codepath that zaps page table entries must invoke MMU notifiers to ensure that secondary MMUs (like KVM) don't keep accessing pages which aren't mapped anymore. Secondary MMUs don't hold their own references to pages that are mirrored over, so failing to notify them can lead to page use-after-free. I'm marking this as addressing an issue introduced in commit f3f0e1d2150b ("khugepaged: add support of collapse for tmpfs/shmem pages"), but most of the security impact of this only came in commit 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP"), which actually omitted flushes for the removal of present PTEs, not just for the removal of empty page tables. Cc: stable@kernel.org Fixes: f3f0e1d2150b ("khugepaged: add support of collapse for tmpfs/shmem pages") Signed-off-by: Jann Horn Acked-by: David Hildenbrand Reviewed-by: Yang Shi --- v4: no changes mm/khugepaged.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index c3d3ce596bff7..49eb4b4981d88 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1404,6 +1404,7 @@ static void collapse_and_free_pmd(struct mm_struct *mm, struct vm_area_struct *v unsigned long addr, pmd_t *pmdp) { pmd_t pmd; + struct mmu_notifier_range range; mmap_assert_write_locked(mm); if (vma->vm_file) @@ -1415,8 +1416,12 @@ static void collapse_and_free_pmd(struct mm_struct *mm, struct vm_area_struct *v if (vma->anon_vma) lockdep_assert_held_write(&vma->anon_vma->root->rwsem); + mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL, mm, addr, + addr + HPAGE_PMD_SIZE); + mmu_notifier_invalidate_range_start(&range); pmd = pmdp_collapse_flush(vma, addr, pmdp); tlb_remove_table_sync_one(); + mmu_notifier_invalidate_range_end(&range); mm_dec_nr_ptes(mm); page_table_check_pte_clear_range(mm, addr, pmd); pte_free(mm, pmd_pgtable(pmd));