From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3F11ECAAA3 for ; Fri, 26 Aug 2022 10:49:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343915AbiHZKtq (ORCPT ); Fri, 26 Aug 2022 06:49:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343909AbiHZKtn (ORCPT ); Fri, 26 Aug 2022 06:49:43 -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 623C6D59BD for ; Fri, 26 Aug 2022 03:49:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661510981; 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=Eg7Ryqgl4/7psa0mDnwJcUX72EbQV3JdNEdy3KuxwWs=; b=DYyOVzpjLVVPZylLy9ru50ISwV1S4uBx25HoJLc6axXa7En9tFAu81unRGyZRt60zIRJLJ SD9Ow9b4+XrbP+NsE9wETFNftDSKWm8mYbuxG7Yt72i1wn1YsAc7VcNKowF7TOs7+0lrDh daDNNinV7PmWDnFdENSW+9t/J3re7Ak= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-194-ZxWdyIM1P4Gy1qPMjnjt8A-1; Fri, 26 Aug 2022 06:49:40 -0400 X-MC-Unique: ZxWdyIM1P4Gy1qPMjnjt8A-1 Received: by mail-wm1-f70.google.com with SMTP id a17-20020a05600c349100b003a545125f6eso3889916wmq.4 for ; Fri, 26 Aug 2022 03:49:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:subject:organization:from :references:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc; bh=Eg7Ryqgl4/7psa0mDnwJcUX72EbQV3JdNEdy3KuxwWs=; b=fUpPx1yEsbHmVkLZD9NivyTtulYr6Om7BR4ZPWiCh3Z0idsUbrEwRrhcrFZHHFc4bN ide0sqD4kuyAmBqYB9qpATpL2hCJVpKqO4BUJ4/VCrxM6+pF+/dguBpC4R5HCCrjY3At j8w35rmX1cTiq1j2ewheapc9RpxO5vQCOmy7zEQqS64V2gTyJ3IkkTViQaioukdNqX0G lodHb7rpgWHdFkhm6ErLedN6H+6ER5QubzjCwoUDL09xEmdiwVhIEzcRnkF0IdKk5X6O 6t3PdO06dsIchJ6JWJLyDPD232ewShOHrah4Qq888tv1E7PZ5x9SZ6dDhnDyGLglkKFz CQ9w== X-Gm-Message-State: ACgBeo08yRwtGukkC88zb7XdBlw19nLD1D8+fa3y0mhFWWjaYIa6PdhF ++GsukvMWqDTdySGfHnNT/WkFvdXbn/CZApVQSf2cmx7PHKC/div8LOue5jP28xXJrQ3Saw8jSt WQWeZ9BK8dJuculIk66/FW5IL X-Received: by 2002:a05:600c:3492:b0:3a5:e1a0:24c9 with SMTP id a18-20020a05600c349200b003a5e1a024c9mr4710879wmq.177.1661510979326; Fri, 26 Aug 2022 03:49:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR7lKeYZ6xCyn0mLHd08b2PAlifcC4FnKecOkajxaZG8pB6eqy4kUx6srY7bQC3bHFZieMGQdg== X-Received: by 2002:a05:600c:3492:b0:3a5:e1a0:24c9 with SMTP id a18-20020a05600c349200b003a5e1a024c9mr4710865wmq.177.1661510979077; Fri, 26 Aug 2022 03:49:39 -0700 (PDT) Received: from ?IPV6:2003:cb:c708:f600:abad:360:c840:33fa? (p200300cbc708f600abad0360c84033fa.dip0.t-ipconnect.de. [2003:cb:c708:f600:abad:360:c840:33fa]) by smtp.gmail.com with ESMTPSA id h9-20020a05600c28c900b003a5dfd7e9eesm2106499wmd.44.2022.08.26.03.49.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Aug 2022 03:49:38 -0700 (PDT) Message-ID: <411d7b8c-f914-875e-b397-856e6a894366@redhat.com> Date: Fri, 26 Aug 2022 12:49:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Content-Language: en-US To: Peter Xu , linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrew Morton , Huang Ying , stable@vger.kernel.org, Yu Zhao References: <20220823221138.45602-1-peterx@redhat.com> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH] mm/mprotect: Only reference swap pfn page if type match In-Reply-To: <20220823221138.45602-1-peterx@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24.08.22 00:11, Peter Xu wrote: > Yu Zhao reported a bug after the commit "mm/swap: Add swp_offset_pfn() to > fetch PFN from swap entry" added a check in swp_offset_pfn() for swap type [1]: > > kernel BUG at include/linux/swapops.h:117! > CPU: 46 PID: 5245 Comm: EventManager_De Tainted: G S O L 6.0.0-dbg-DEV #2 > RIP: 0010:pfn_swap_entry_to_page+0x72/0xf0 > Code: c6 48 8b 36 48 83 fe ff 74 53 48 01 d1 48 83 c1 08 48 8b 09 f6 > c1 01 75 7b 66 90 48 89 c1 48 8b 09 f6 c1 01 74 74 5d c3 eb 9e <0f> 0b > 48 ba ff ff ff ff 03 00 00 00 eb ae a9 ff 0f 00 00 75 13 48 > RSP: 0018:ffffa59e73fabb80 EFLAGS: 00010282 > RAX: 00000000ffffffe8 RBX: 0c00000000000000 RCX: ffffcd5440000000 > RDX: 1ffffffffff7a80a RSI: 0000000000000000 RDI: 0c0000000000042b > RBP: ffffa59e73fabb80 R08: ffff9965ca6e8bb8 R09: 0000000000000000 > R10: ffffffffa5a2f62d R11: 0000030b372e9fff R12: ffff997b79db5738 > R13: 000000000000042b R14: 0c0000000000042b R15: 1ffffffffff7a80a > FS: 00007f549d1bb700(0000) GS:ffff99d3cf680000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 0000440d035b3180 CR3: 0000002243176004 CR4: 00000000003706e0 > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 > Call Trace: > > change_pte_range+0x36e/0x880 > change_p4d_range+0x2e8/0x670 > change_protection_range+0x14e/0x2c0 > mprotect_fixup+0x1ee/0x330 > do_mprotect_pkey+0x34c/0x440 > __x64_sys_mprotect+0x1d/0x30 > > It triggers because pfn_swap_entry_to_page() could be called upon e.g. a > genuine swap entry. > > Fix it by only calling it when it's a write migration entry where the page* > is used. > > [1] https://lore.kernel.org/lkml/CAOUHufaVC2Za-p8m0aiHw6YkheDcrO-C3wRGixwDS32VTS+k1w@mail.gmail.com/ > > Fixes: 6c287605fd56 ("mm: remember exclusively mapped anonymous pages with PG_anon_exclusive") > Cc: David Hildenbrand > Cc: > Reported-by: Yu Zhao > Signed-off-by: Peter Xu > --- > mm/mprotect.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/mm/mprotect.c b/mm/mprotect.c > index f2b9b1da9083..4549f5945ebe 100644 > --- a/mm/mprotect.c > +++ b/mm/mprotect.c > @@ -203,10 +203,11 @@ static unsigned long change_pte_range(struct mmu_gather *tlb, > pages++; > } else if (is_swap_pte(oldpte)) { > swp_entry_t entry = pte_to_swp_entry(oldpte); > - struct page *page = pfn_swap_entry_to_page(entry); > pte_t newpte; > > if (is_writable_migration_entry(entry)) { > + struct page *page = pfn_swap_entry_to_page(entry); > + > /* > * A protection check is difficult so > * just be safe and disable write Stumbling over the THP code, I was wondering if we also want to adjust change_huge_pmd() and hugetlb_change_protection. There are no actual swap entries, so I assume we're fine. diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 482c1826e723..466364e7fc5f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1798,10 +1798,10 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, #ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION if (is_swap_pmd(*pmd)) { swp_entry_t entry = pmd_to_swp_entry(*pmd); - struct page *page = pfn_swap_entry_to_page(entry); VM_BUG_ON(!is_pmd_migration_entry(*pmd)); if (is_writable_migration_entry(entry)) { + struct page *page = pfn_swap_entry_to_page(entry); pmd_t newpmd; /* * A protection check is difficult so diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2480ba627aa5..559465fae5cd 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6370,9 +6370,9 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, } if (unlikely(is_hugetlb_entry_migration(pte))) { swp_entry_t entry = pte_to_swp_entry(pte); - struct page *page = pfn_swap_entry_to_page(entry); if (!is_readable_migration_entry(entry)) { + struct page *page = pfn_swap_entry_to_page(entry); pte_t newpte; if (PageAnon(page)) @Peter, what's your thought? -- Thanks, David / dhildenb