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 CA8A9C02198 for ; Wed, 12 Feb 2025 08:30:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 54436280014; Wed, 12 Feb 2025 03:30:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CCC7280012; Wed, 12 Feb 2025 03:30:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F7BF280014; Wed, 12 Feb 2025 03:30:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 089B2280012 for ; Wed, 12 Feb 2025 03:30:29 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A4AD94BD0B for ; Wed, 12 Feb 2025 08:30:28 +0000 (UTC) X-FDA: 83110620936.16.A50DA65 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 15526100010 for ; Wed, 12 Feb 2025 08:30:25 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=R2eToQi0; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739349026; 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=HySIueFNNrdqyZ9t5cvOG6oajgzigJ0xtnthc9wXE54=; b=1Uve9iOeeMvyVRG94MjY39jfL0CWWl0Y1h8Wmrx0VfQSjq1XM1yisrou4/o/aRgGRDO4hK Ha/cVl5eDxIrU9fzufkMuhWMCdHFIdlG8CJ0Rb1ly8kn4pTJLTZ3TOzCCgiPGIu5L3qROg PErju5IqJQ/vXoUN8vQgccc+CUB4weo= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=R2eToQi0; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739349026; a=rsa-sha256; cv=none; b=KZXU/q8UNZIb2WglLw4HptMnwHNvLMB2CxvlG2fv0rrVULQxgBpVvYnC58va8cUF5NL6h4 Sw1qYbHVPmW4vLSB4bUpjTRfhpXsC3sSxYKwGcTPmfrsjQyfw8wNSNTv++WP0FFjFMfvsO XmoQxduzVrtgVwUcDxvQwHJe0NfjhEs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739349025; 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:autocrypt:autocrypt; bh=HySIueFNNrdqyZ9t5cvOG6oajgzigJ0xtnthc9wXE54=; b=R2eToQi0OXelWC2o48hMFt1Leh8QXURzI3C8ySftdgGfeBeysoXslx9BCUwlEgGWazM30O pIR+EYAf5xoZLAQOXVAMQZ2g8gBELu0IWwLdjd8t18jTlOPdufOyybZZ33qFbcqZjTiadZ vGs2hEMuRLshAFeNLjt00Xn0tuA3ciQ= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-590-kDmCwJ_qP8SUc8T9x7dkGw-1; Wed, 12 Feb 2025 03:30:24 -0500 X-MC-Unique: kDmCwJ_qP8SUc8T9x7dkGw-1 X-Mimecast-MFC-AGG-ID: kDmCwJ_qP8SUc8T9x7dkGw Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38dbdc2926eso512903f8f.2 for ; Wed, 12 Feb 2025 00:30:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739349023; x=1739953823; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=HySIueFNNrdqyZ9t5cvOG6oajgzigJ0xtnthc9wXE54=; b=biHTk5hwO6k0kUDYQ4NwEhsRg80EwnIZcZQsCo6gfCslbf77dYqDBreD1NtBWpDBqc O/tD34o665xqv4okRoDuyBHztVXSvwZRRZ5hVB9Njg2Pr7weCQowVkuzbHdomWU0gDuk YbvdkYDbSdGOflwGO90ZIh6eXpGrvaDQAS3RDZynXv/edXXDMBjoXr8NOvRzl3E2JLdo 2XCV4r0gbfRDXK6MDyqS3tyiLUobbr1LPt55rp+ILVdpslRdxOO2rqkFOMKn9jYiOTbl HhdPDEn/msbuzCiYpn4AAgDwUy6sfJmeXhdhzi8Ks3HnA9UVbvGm6kZSD01dPEz/ZV62 /OBw== X-Forwarded-Encrypted: i=1; AJvYcCWeyQc3jjIRqvtW5x551VI/SpX1ig4FsHDyk2BJd7QFBLXwEDaZoeHrsMMEx/fWSG64PWJeqwIUCA==@kvack.org X-Gm-Message-State: AOJu0YxuguPjQH+i3mlwnZj9tsZXfxjSIi9WHtiGXDSOMET5oLBHyr+d uJTb69yBgSWa1aqU5IrBQlpH0JoLTLKd5/FEBEtckXUp79VQWy0457rX11pxIl6rmkD6vumj2sL JmYcFVMSKugR68WNlj8rhE6W0TShiJ7aK7sY5NBcCA6Q+zbf0 X-Gm-Gg: ASbGncufy11c8TTtzGwDlNibEY/2E17v1HPP3X/yy3fauT4DdPtaR9q/egjn4oScRmw WU/4lCQ6TbdOQVKS/3wQsaXyo7GDffdusV4YEPjQGcAvOfZvOS4HYhkQJWGieI1hyR7GG8oAdEM rDheAZouEqYmKRmgfohlnojOZik6pEQdOtw7X1GyvRBwPpdQq3L4ZLqjrv/rloyC0b/MDQn0KLc BPriS2PQ7mniwGL065gODBxLHqkVuy5PZgNKtZzK+R11dE3YaTvMQ3jAvomBr7A4FueSv0qcCrA YRedbRzM0BtTGkVkoDT/vDk1a79jeEGBKLAFvsNJMzJuLwZAvfnly8GlCt1R6pgcGKUNtvov3iZ btgeX5apXbp/flaPbfUWQEiLijzpHmw== X-Received: by 2002:a5d:6107:0:b0:38d:d3e2:db40 with SMTP id ffacd0b85a97d-38dea271527mr1246846f8f.17.1739349022854; Wed, 12 Feb 2025 00:30:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHXM4Spi0sx5c4IGLUIHF8A1qqqZcsJbmawcndR3hb6ZbF2T223kr192mn2XjxsoZmlUj/XcA== X-Received: by 2002:a5d:6107:0:b0:38d:d3e2:db40 with SMTP id ffacd0b85a97d-38dea271527mr1246814f8f.17.1739349022370; Wed, 12 Feb 2025 00:30:22 -0800 (PST) Received: from ?IPV6:2003:cb:c70c:a600:1e3e:c75:d269:867a? (p200300cbc70ca6001e3e0c75d269867a.dip0.t-ipconnect.de. [2003:cb:c70c:a600:1e3e:c75:d269:867a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f2084ebdesm244867f8f.70.2025.02.12.00.30.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Feb 2025 00:30:21 -0800 (PST) Message-ID: <1399ea09-b53c-4eba-a023-34b8906c9bdd@redhat.com> Date: Wed, 12 Feb 2025 09:30:20 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] arm: pgtable: fix NULL pointer dereference issue To: Qi Zheng 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> <54c30b02-c19e-4e51-8faf-7d6c5560ef6f@bytedance.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <54c30b02-c19e-4e51-8faf-7d6c5560ef6f@bytedance.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: bfu01A5OtlHDWDiSvxUOIdiB5_fCDsdaLe2QoD6wSmw_1739349023 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 15526100010 X-Stat-Signature: tsd4h1945ye74o8hwz1p6ng3fmee7rfc X-HE-Tag: 1739349025-333144 X-HE-Meta: U2FsdGVkX18FFkKIh9HvWa5KtDcaeRikoKRlbTDTDzgLgagha29zJGfc0+XL8qvwDHGqmVKYK1fwPZqjlwrIy0ZFXHDieDoDCv3d6u9HFeEzP9jCH5qB88wwS6O7APc+zrbk352gz93a/+b6ekNk8tAQTJlFDg9CVxzgYMqrHFudIq5XTFXvN3TvFVqB+NWaKyDyZiGm151tgzERVINy2aycH8QMlMK6rUFNk3WaioRag/RyURWadyzCZQSvRz+a9IQjcQPMaai4bMqTRHxv6e766Ccaq4Ah91qVAkD7oDS73edwrxZ5V1pgdSUb3z/O/q5fTEqzLfEnnRZFccqTzIMY/AkUSyfZQfrKhBAIZa11312EwKEJ0uxrpc8+f2sl+BZI2q5scaKunk+Xefz6CZAM+5Y39TbyhwMuVEuahkUqRMC9e2fUcYHANWZb1rgxhWu2VUg4k/Q2+dPtfdLT5aOXYfM7HlqAjG9pq4Ci0AvE49eRe2Wy0irgfW5FKhdjujaKQabTKbDzrqaF3D2Ao1gIXIciY9U0UcaN2A5rqli80e3VZoKyVS7Gp2g5mtKKtTqQbzSVji0ChXT8skGxf/FUXNAoxGsszoA8SdykHWQO8w3YenDSODzKKdtHSI/Z0UFPgezeZcMPiczXXgvCV8yXgbFXkmK7NGLm1NrI+FuleWw3zNCk8H1DsgDE3DkxJZkXaugCxsA+mZJl7S+ZryV/rWUqmW+Ghqsv5ZJPFuWDsh9YA/PE7jWVauKzSbud2u+q1g3DF4GfQtoCuMMTGexd4F1+shLtCoZ+4ILYdhU3o3w7R+Tw+kqsFYLvvdyExibTAzqtrVuzSyzbRxQVceQBrki0GTIJO5PMf5OlFXPZs14EzE5mflwddG/dD6bjQVthsdNrsdwHdT4HbtpDknMCJGYOAivXP15wlBVx9k8XhE+nzT4YLHEU8ZeXWkSWEZlectMUIr13ZZYqLtL 1B+r4gXt FNOQj/qHYnfUdB69YEtEpf15AQC1TCv1GuMSF4Pd6UglMRiMeLIhhWCqxuw9btamiR72iBDWm3MiilHBbLt3zgu5DwwiPW0jXd0qjzwhuhAu2xAVpTqyMphLvi0x25cYfDpFCmxzBxdRNf1hclW6RPl90y/eLVIXO8+rJQULe+2XEY+AHdZuwXq777q/vYqIyEo+VBdJwjoqPJ7CI2cyMKtDrbO3euESEqoPQTuNfQW3hXPUWqkdsfRonL2ERuTJOxU0AWUCcmiZKxmNKNiC0gwdDcT74vLrroKYBKn2mQCGDjD8kYfCd5HYYMOTniUmdKtxKYn7Z+k/KXxVSbwffHdW2ZikMiLd4zRcuXCea9b2/togChCADoYWVkjyAzGSNglYdd+ixXxTFZvh2jvXyN09GS75MzVIIs2YU/kBz9YrLfnNKODLRYb7JQUyQ9tIZOgGyzZNr5YYiKXvQdRqvKFakafirwK+IkG7zfPm2ZsM1TjE= 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 12.02.25 09:28, Qi Zheng wrote: > > > 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? Yes :) >> >>> + >>>           /* >>>            * 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. */ > Agreed. -- Cheers, David / dhildenb