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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07B77C0219E for ; Wed, 12 Feb 2025 08:28:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 78D566B0088; Wed, 12 Feb 2025 03:28:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 715A56B008A; Wed, 12 Feb 2025 03:28:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5904E6B0093; Wed, 12 Feb 2025 03:28:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 36C3F6B0088 for ; Wed, 12 Feb 2025 03:28:57 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D941481271 for ; Wed, 12 Feb 2025 08:28:56 +0000 (UTC) X-FDA: 83110617072.05.8A5B05A Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf28.hostedemail.com (Postfix) with ESMTP id EE516C0004 for ; Wed, 12 Feb 2025 08:28:53 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=D9RF2WiX; spf=pass (imf28.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739348934; a=rsa-sha256; cv=none; b=m056zi8WSH7nF4IQQKioSNSfnO7qgTXWbBRHGkrIxr7iiu9Bm1ju9P5kAzAdKuYDflOGU1 Dl8B3aA/t++0Eu/1GPM84XvKCZLabBiWVjbmckXYJVCMJP5LD9A7fMeIIQRBALsIvAqW85 WGiKQbhptXJ4fiJxgWAljHcAue4DOfM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=D9RF2WiX; spf=pass (imf28.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739348934; 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=612jIvxL1e9qxD4qIQOZLpI6wF7davzI0ud5ar8CQG0=; b=GMbMyRyug4dO118OoF+BeDKPSwcisRiTmnR2X9gJFNvu3mVn5mP9IHH5FchwqjGZobFpvP jPNA9zxeUV0khqRenDMAkTCsF1A+jJTQqtYxMiFuiSaaEyS0rTuOGS/3LsluiRv+rzHBbj AD996eFcsBjD0eGygLNOYTCDEZ5nLkY= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21f5a224544so58430265ad.0 for ; Wed, 12 Feb 2025 00:28:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1739348933; x=1739953733; darn=kvack.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=612jIvxL1e9qxD4qIQOZLpI6wF7davzI0ud5ar8CQG0=; b=D9RF2WiXea+FdRVodPPXZOb9TAu2Z6Tohhk3YwOi3zIriJqRgVgxOt+u3fZ0jGcks5 0bQvwzt00jtUzLvvEhnS2qvNn4zBpTmxRHMEt2IXlbSwM/N7zi4ReSUF6jT4+DxNaRED oMbYs7XBXr79fjfii2kpMUDTNLHyTVYRiwcPs4bw4xfzt350GoP672sEHZMbCADcq/wz xsPoUFmxq0EsFKfu3FOe7Y2w8OFfhb+hlDAb9g15JPtEIcbiChHlI8dHhEbcyTfTzasp NN1NwbUILRX0uSngNRLrSyyRf/soyfemjlTOeslXR9lBe2tyr+FeXROgByZ4o6D2df2Z Bbew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739348933; x=1739953733; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=612jIvxL1e9qxD4qIQOZLpI6wF7davzI0ud5ar8CQG0=; b=drDrQeM93OXBuSPp2igVHk8VL+pX4u3COWBMtfiQ2LB0rIQjITI6Ji1ggOpKOrOSsM BJU4F4ZXI6pQvxu6aVZGOSUlOJ+DrumJ8ZpgDdZjfp9KgXFQF+Ad/q7W24F5aBD1cD1J FgyWFnHOjtnIjFLve2Nm2Q7kiEHkDzSZADe4MkwBGhLCyBh4x4GMuxyQ7tof0QfKH2nw fqGdKXmoWk+wNbFS+HN1/RmOtWDLjJWqmU6Qf1SLgz+iS4FiCgGC/0bfXBS+QMKPi/qK DnW0734F7FDIa2DhLdILw0nFQ7aj4sXNFkx37taIbXck/qExE2lt7HToSmgGuDvVuAp6 JoDg== X-Forwarded-Encrypted: i=1; AJvYcCVr9VcpKALZz61GP1BGV5WGaFsENAM4ra38sGmfRdasTF6R9TWRYFSP0WRh2Pxbt+GUymPrrJNsVg==@kvack.org X-Gm-Message-State: AOJu0YzdoZDrPgntu3yuOeMruWVx3/9fIKG+hnphwcZXwIg/LZCNgIUY gMYHy1LlFgfYV+H0KqnmOXnksQ904tNhW8vlU2ucttzsf888j18SUctuO3PlSko= X-Gm-Gg: ASbGncvDyVvwDD/HMGkSTF6jM2h3lDdXdBnR5NfzeoHzgc1JXWFwAkm7S+hbtJv5SZI Q6xcgHqZWWQrLznGfK9ODLbkh6oqxkfs9CMF3ARkv+gusglgQ+JrBhtb47JrGB4WlGYIkvNJyql d1QZwN6yXJGYYfKBGxrrNaz+GQCjfcDwE2YKqFHDzy2PS87IOgxKy8GMhIAwXLQbxK4rc4hQCHR kxPyyZqv358S3O5JKmJwP7ZcnGVmvwU/rU8AWVZQKK5J4atQEQEllsmJsyVPE4ho6Qfv9jVxcEu ftzn9pEkCF/Gedfy8GxJTYv6epaDLK6yDIf25GC0Ow== X-Google-Smtp-Source: AGHT+IHo8yGkr5oWd5KwlTZvIww/CgYd/mju7TZBIcFxDlPlQYOvlk0NqYOCKf+nhwBq6H3RsyfUFg== X-Received: by 2002:a05:6a21:7a4c:b0:1db:f68a:d943 with SMTP id adf61e73a8af0-1ee5c74731bmr3748745637.17.1739348932670; Wed, 12 Feb 2025 00:28:52 -0800 (PST) Received: from [10.84.150.121] ([203.208.167.154]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad51aeccfc5sm10700388a12.17.2025.02.12.00.28.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Feb 2025 00:28:52 -0800 (PST) Message-ID: <54c30b02-c19e-4e51-8faf-7d6c5560ef6f@bytedance.com> Date: Wed, 12 Feb 2025 16:28:46 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] arm: pgtable: fix NULL pointer dereference issue Content-Language: en-US To: David Hildenbrand Cc: linux@armlinux.org.uk, ezra@easyb.ch, hughd@google.com, ryan.roberts@arm.com, akpm@linux-foundation.org, muchun.song@linux.dev, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20250212064002.55598-1-zhengqi.arch@bytedance.com> From: Qi Zheng In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EE516C0004 X-Stat-Signature: yq1wh4b8ydptxah64fc6zhakoswtpree X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739348933-882994 X-HE-Meta: U2FsdGVkX18+6SBwTQqaoavUfsJv6mJxq8EqHFs2nar7LRmuC6kvSdLAIFrLQZGrUOFz0imhTNJvkSXO3pjAl4MsIekPMDoyPVG6drNC6diyOJZbGCNmMqkZPbq2n6NMIXCvR6q752jnTTXEw7nP5gxchn68wPigruY9nVSHHwiqUrsrrz0EuGvDKESDcq9WO8JlOe7kqOKi+xAJl/EFUbiwowB5pcfvGyWNDDq/4iQX/SvTQh/tJd9aEMEyYRzo9Wr/mahAoWHQSwiw3xNu5pP9cWrMX/gxJLKHqq5/tlHZZOSraN38tcAtKBbWXwUvKLBrwh47WwdAeN1/sSixT6Y2y4mpKMOxOA8BPDS+AFSNDZtInR02Nm3tsu8AmoXjM+wCuzK7zqvo3aqRCQVTLJfbLzQsDm0bKRUdEGqccEhkRkZAqebjV6monOY7L2Lh5x0GCZkci9FUDkvFvXBdS0O18LV3BDswlNybKB/qJWGYnnlNJTVGjTyNP1eL67hQWLE6+St/arz2lkVM99v3/2XshbH6jgz6mtdUYInTScoQvp3Q2+ie6Sep3o/WD/qkwZ1r/M9lbRodmCcYywWXaTP01F+d1l40h7Et6kcHKBHul+WuprcsKOsgYAiAyq6eqXyJxCZiU1kI2T4Cf/Ew7pItpkBmPQcnrsmXXVToZegVXWEN73TfEKLgqBADRQqWVhZfoPPs1PNkh2hAA3+flxlSuL3uJYDTlPiYa/Aw9hA0chbS8IFFDZOU1doGIEPU6qfmD0x9DxYF0QkvMoVx9fkHcHgo4SShT0EgWX2s+hUvygXF4+i1mqfQpn8z/CsZ0RYhrCU0ypozyq6aeveR6GAdMrfHydaRPlZvdUIv56AnwrvqnSm6mvpCpWzKhWMupCDnKQnYqV6n9LJQTUHhFpsSICFNx0/QJo/MjOs/XHEAqAmbS4VUcw/n9hXyT+dl2WBFlmuxoOoSIvnYsj/ QpyEd4yh PVkaehDMIEzwgLP+O+MBYH0gHVumbH1V3ZV1F6XSgGkbH3jUH1OuUOSVWYkA66Z2upSQU8POKBEnmKK2jFCvIjfey+1J5I5eBKlFDmn1aMra2Yvjz7Go5DWq1kcRcsa0L1ebZT4Sf1mUWEvbiJBB+DkcGw0zFHG3F9lWQgsa/yUSWgnbdZHfcuMIqtb/wbl7D4DYcamHw6JarFk4Twua1qWRtFyY7l+kiLwBXES4P+QFO0nqpTpSpbqjycV3KaoydELwYM+sdVPUzIYh1KartzQJ1WSzMc3EFVWYS7YQiPK+bL2JEtEhTlnBNepqMxLsY14zv0uHGvbcfHjYEslsLzExWkvD0c1zmCbAgyUYUgZSrnIpZzvPzCSL99TwMzEAUIBwq+cu94C5dacHhD1tMVJHwMfU2hZN43JEwsdjKDfvqbDgoIfd7+UmTIA== 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: List-Subscribe: List-Unsubscribe: On 2025/2/12 16:20, David Hildenbrand wrote: > On 12.02.25 07:40, Qi Zheng wrote: >> When update_mmu_cache_range() is called by update_mmu_cache(), the vmf >> parameter is NULL, which will cause a NULL pointer dereference issue in >> adjust_pte(): >> >> Unable to handle kernel NULL pointer dereference at virtual address >> 00000030 when read >> Hardware name: Atmel AT91SAM9 >> PC is at update_mmu_cache_range+0x1e0/0x278 >> LR is at pte_offset_map_rw_nolock+0x18/0x2c >> Call trace: >>   update_mmu_cache_range from remove_migration_pte+0x29c/0x2ec >>   remove_migration_pte from rmap_walk_file+0xcc/0x130 >>   rmap_walk_file from remove_migration_ptes+0x90/0xa4 >>   remove_migration_ptes from migrate_pages_batch+0x6d4/0x858 >>   migrate_pages_batch from migrate_pages+0x188/0x488 >>   migrate_pages from compact_zone+0x56c/0x954 >>   compact_zone from compact_node+0x90/0xf0 >>   compact_node from kcompactd+0x1d4/0x204 >>   kcompactd from kthread+0x120/0x12c >>   kthread from ret_from_fork+0x14/0x38 >> Exception stack(0xc0d8bfb0 to 0xc0d8bff8) >> >> To fix it, do not rely on whether 'ptl' is equal to decide whether to >> hold >> the pte lock, but decide it by whether CONFIG_SPLIT_PTE_PTLOCKS is >> enabled. In addition, if two vmas map to the same PTE page, there is no >> need to hold the pte lock again, otherwise a deadlock will occur. Just >> add >> the need_lock parameter to let adjust_pte() know this information. >> >> Reported-by: Ezra Buehler >> Closes: >> https://lore.kernel.org/lkml/CAM1KZSmZ2T_riHvay+7cKEFxoPgeVpHkVFTzVVEQ1BO0cLkHEQ@mail.gmail.com/ >> Fixes: fc9c45b71f43 ("arm: adjust_pte() use pte_offset_map_rw_nolock()") >> Cc: stable@vger.kernel.org >> Signed-off-by: Qi Zheng >> --- >>   arch/arm/mm/fault-armv.c | 40 ++++++++++++++++++++++++++++------------ >>   1 file changed, 28 insertions(+), 12 deletions(-) >> >> diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c >> index 2bec87c3327d2..3627bf0957c75 100644 >> --- a/arch/arm/mm/fault-armv.c >> +++ b/arch/arm/mm/fault-armv.c >> @@ -62,7 +62,7 @@ static int do_adjust_pte(struct vm_area_struct *vma, >> unsigned long address, >>   } >>   static int adjust_pte(struct vm_area_struct *vma, unsigned long >> address, >> -              unsigned long pfn, struct vm_fault *vmf) >> +              unsigned long pfn, bool need_lock) >>   { >>       spinlock_t *ptl; >>       pgd_t *pgd; >> @@ -99,12 +99,11 @@ static int adjust_pte(struct vm_area_struct *vma, >> unsigned long address, >>       if (!pte) >>           return 0; >> -    /* >> -     * If we are using split PTE locks, then we need to take the page >> -     * lock here.  Otherwise we are using shared mm->page_table_lock >> -     * which is already locked, thus cannot take it. >> -     */ >> -    if (ptl != vmf->ptl) { >> +    if (need_lock) { >> +        /* >> +         * Use nested version here to indicate that we are already >> +         * holding one similar spinlock. >> +         */ >>           spin_lock_nested(ptl, SINGLE_DEPTH_NESTING); >>           if (unlikely(!pmd_same(pmdval, pmdp_get_lockless(pmd)))) { >>               pte_unmap_unlock(pte, ptl); >> @@ -114,7 +113,7 @@ static int adjust_pte(struct vm_area_struct *vma, >> unsigned long address, >>       ret = do_adjust_pte(vma, address, pfn, pte); >> -    if (ptl != vmf->ptl) >> +    if (need_lock) >>           spin_unlock(ptl); >>       pte_unmap(pte); >> @@ -123,16 +122,17 @@ static int adjust_pte(struct vm_area_struct >> *vma, unsigned long address, >>   static void >>   make_coherent(struct address_space *mapping, struct vm_area_struct >> *vma, >> -          unsigned long addr, pte_t *ptep, unsigned long pfn, >> -          struct vm_fault *vmf) >> +          unsigned long addr, pte_t *ptep, unsigned long pfn) >>   { >>       struct mm_struct *mm = vma->vm_mm; >>       struct vm_area_struct *mpnt; >>       unsigned long offset; >> +    unsigned long start; >>       pgoff_t pgoff; >>       int aliases = 0; >>       pgoff = vma->vm_pgoff + ((addr - vma->vm_start) >> PAGE_SHIFT); >> +    start = ALIGN_DOWN(addr, PMD_SIZE); > > I assume you can come up with a better name than "start" :) > > aligned_addr ... pmd_start_addr ... > > Maybe simply > > pmd_start_addr = ALIGN_DOWN(addr, PMD_SIZE); > pmd_end_addr = addr + PMD_SIZE; you mean: pmd_end_addr = pmd_start_addr + PMD_SIZE; Right? > > Then the comparison below also becomes easier to read. > >>       /* >>        * If we have any shared mappings that are in the same mm >> @@ -141,6 +141,14 @@ make_coherent(struct address_space *mapping, >> struct vm_area_struct *vma, >>        */ >>       flush_dcache_mmap_lock(mapping); >>       vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) { >> +        unsigned long mpnt_addr; >> +        /* >> +         * If we are using split PTE locks, then we need to take the pte >> +         * lock. Otherwise we are using shared mm->page_table_lock which >> +         * is already locked, thus cannot take it. >> +         */ >> +        bool need_lock = IS_ENABLED(CONFIG_SPLIT_PTE_PTLOCKS); > > Nit: move "unsigned long mpnt_addr;" below this longer variable+init. OK, will do. > >> + >>           /* >>            * If this VMA is not in our MM, we can ignore it. >>            * Note that we intentionally mask out the VMA >> @@ -151,7 +159,15 @@ make_coherent(struct address_space *mapping, >> struct vm_area_struct *vma, >>           if (!(mpnt->vm_flags & VM_MAYSHARE)) >>               continue; >>           offset = (pgoff - mpnt->vm_pgoff) << PAGE_SHIFT; >> -        aliases += adjust_pte(mpnt, mpnt->vm_start + offset, pfn, vmf); >> +        mpnt_addr = mpnt->vm_start + offset; >> +        /* >> +         * If mpnt_addr and addr are mapped to the same PTE page, there >> +         * is no need to hold the pte lock again, otherwise a deadlock >> +         * will occur. > > /* >  * Avoid deadlocks by not grabbing the PTE lock if we already hold the >  * PTE lock of this PTE table in the caller. >  */ Maybe just: /* Avoid deadlocks by not grabbing the same PTE lock again. */ Thanks, Qi > > ? > >> +         */ >> +        if (mpnt_addr >= start && mpnt_addr - start < PMD_SIZE) >> +            need_lock = false; > > >