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 3B62BC433FE for ; Mon, 13 Dec 2021 10:23:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239433AbhLMKXl (ORCPT ); Mon, 13 Dec 2021 05:23:41 -0500 Received: from foss.arm.com ([217.140.110.172]:49042 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239528AbhLMKQj (ORCPT ); Mon, 13 Dec 2021 05:16:39 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E945F1FB; Mon, 13 Dec 2021 02:16:37 -0800 (PST) Received: from [10.163.67.80] (unknown [10.163.67.80]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5325E3F793; Mon, 13 Dec 2021 02:16:34 -0800 (PST) Subject: Re: [PATCH v2] arm64/mm: avoid fixmap race condition when create pud mapping To: Jianyong Wu , catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org Cc: ardb@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, david@redhat.com, gshan@redhat.com, justin.he@arm.com, nd@arm.com References: <20211210095432.51798-1-jianyong.wu@arm.com> From: Anshuman Khandual Message-ID: <1e63e2f7-0563-2866-4665-84fe220b615f@arm.com> Date: Mon, 13 Dec 2021 15:46:31 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20211210095432.51798-1-jianyong.wu@arm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/10/21 3:24 PM, Jianyong Wu wrote: > fixmap is a global resource and is used recursively in create pud mapping. > It may lead to race condition when alloc_init_pud is called concurrently. > > Fox example: > alloc_init_pud is called when kernel_init. If memory hotplug > thread, which will also call alloc_init_pud, happens during > kernel_init, the race for fixmap occurs. > > The race condition flow can be: > > *************** begin ************** > > kerenl_init thread virtio-mem workqueue thread > ================== ======== ================== > alloc_init_pud(...) > pudp = pud_set_fixmap_offset(..) alloc_init_pud(...) > ... ... > READ_ONCE(*pudp) //OK! pudp = pud_set_fixmap_offset( > ... ... > pud_clear_fixmap() //fixmap break > READ_ONCE(*pudp) //CRASH! > > **************** end *************** > > Hence, a spin lock is introduced to protect the fixmap during create pdg > mapping. > > Signed-off-by: Jianyong Wu > --- > arch/arm64/mm/mmu.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index acfae9b41cc8..98ac09ae9588 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -63,6 +63,7 @@ static pmd_t bm_pmd[PTRS_PER_PMD] __page_aligned_bss __maybe_unused; > static pud_t bm_pud[PTRS_PER_PUD] __page_aligned_bss __maybe_unused; > > static DEFINE_SPINLOCK(swapper_pgdir_lock); > +static DEFINE_SPINLOCK(fixmap_lock); > > void set_swapper_pgd(pgd_t *pgdp, pgd_t pgd) > { > @@ -329,6 +330,11 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, > } > BUG_ON(p4d_bad(p4d)); > > + /* > + * fixmap is global resource, thus it needs to be protected by a lock > + * in case of race condition. > + */ Small nit, format and align this comment block. I guess could also be done while merging this patch as well. > + spin_lock(&fixmap_lock); > pudp = pud_set_fixmap_offset(p4dp, addr); > do { > pud_t old_pud = READ_ONCE(*pudp); > @@ -359,6 +365,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, > } while (pudp++, addr = next, addr != end); > > pud_clear_fixmap(); > + spin_unlock(&fixmap_lock); > } > > static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, > Reviewed-by: Anshuman Khandual 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 20B3DC433FE for ; Mon, 13 Dec 2021 10:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=wdaP8fGQlwMDvPJyyA8UjQJkrKeqw8m7zqTvmDy9+VA=; b=A2r6D9bHPX0XcliXc4QvqXW6Yq h/JNOpeX/k8CKBmboR9IckQNpgJ2mZNiFip2y9zNXWVRBPZ/nqr7SjdzjF6yAR6NEQCM1EY2EJkEF jLBSEM4PdDNWG7rxqfwE1OpmSQy7hqb5DsQaWCC+9yXFDZ8d3WNCzpDquA/to6QVbc+Js3XqD/ZmC YL75vTr4ncK0ZxZ1AIbuVIt74mFlCtYpyUqy/eIqfaoheNsGSnB9dU/CJG47NfYiPaJVY4f9Fae80 sBLMvlPOsEtg+NDmc6AFSI84Kv8+Fmjy97R5yqa/6eCYFrm8FrDmkIt2A2VPG+93s30TzWiQ6W3sg ab+f0NWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwibK-0091rC-7y; Mon, 13 Dec 2021 10:30:34 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwiNq-008wRS-MH for linux-arm-kernel@lists.infradead.org; Mon, 13 Dec 2021 10:16:40 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E945F1FB; Mon, 13 Dec 2021 02:16:37 -0800 (PST) Received: from [10.163.67.80] (unknown [10.163.67.80]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5325E3F793; Mon, 13 Dec 2021 02:16:34 -0800 (PST) Subject: Re: [PATCH v2] arm64/mm: avoid fixmap race condition when create pud mapping To: Jianyong Wu , catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org Cc: ardb@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, david@redhat.com, gshan@redhat.com, justin.he@arm.com, nd@arm.com References: <20211210095432.51798-1-jianyong.wu@arm.com> From: Anshuman Khandual Message-ID: <1e63e2f7-0563-2866-4665-84fe220b615f@arm.com> Date: Mon, 13 Dec 2021 15:46:31 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20211210095432.51798-1-jianyong.wu@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211213_021638_840247_595D44B2 X-CRM114-Status: GOOD ( 19.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 12/10/21 3:24 PM, Jianyong Wu wrote: > fixmap is a global resource and is used recursively in create pud mapping. > It may lead to race condition when alloc_init_pud is called concurrently. > > Fox example: > alloc_init_pud is called when kernel_init. If memory hotplug > thread, which will also call alloc_init_pud, happens during > kernel_init, the race for fixmap occurs. > > The race condition flow can be: > > *************** begin ************** > > kerenl_init thread virtio-mem workqueue thread > ================== ======== ================== > alloc_init_pud(...) > pudp = pud_set_fixmap_offset(..) alloc_init_pud(...) > ... ... > READ_ONCE(*pudp) //OK! pudp = pud_set_fixmap_offset( > ... ... > pud_clear_fixmap() //fixmap break > READ_ONCE(*pudp) //CRASH! > > **************** end *************** > > Hence, a spin lock is introduced to protect the fixmap during create pdg > mapping. > > Signed-off-by: Jianyong Wu > --- > arch/arm64/mm/mmu.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index acfae9b41cc8..98ac09ae9588 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -63,6 +63,7 @@ static pmd_t bm_pmd[PTRS_PER_PMD] __page_aligned_bss __maybe_unused; > static pud_t bm_pud[PTRS_PER_PUD] __page_aligned_bss __maybe_unused; > > static DEFINE_SPINLOCK(swapper_pgdir_lock); > +static DEFINE_SPINLOCK(fixmap_lock); > > void set_swapper_pgd(pgd_t *pgdp, pgd_t pgd) > { > @@ -329,6 +330,11 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, > } > BUG_ON(p4d_bad(p4d)); > > + /* > + * fixmap is global resource, thus it needs to be protected by a lock > + * in case of race condition. > + */ Small nit, format and align this comment block. I guess could also be done while merging this patch as well. > + spin_lock(&fixmap_lock); > pudp = pud_set_fixmap_offset(p4dp, addr); > do { > pud_t old_pud = READ_ONCE(*pudp); > @@ -359,6 +365,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, > } while (pudp++, addr = next, addr != end); > > pud_clear_fixmap(); > + spin_unlock(&fixmap_lock); > } > > static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, > Reviewed-by: Anshuman Khandual _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel