Received: by 2002:ab2:7855:0:b0:1f9:5764:f03e with SMTP id m21csp272076lqp; Wed, 22 May 2024 04:22:58 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCW2++Fe83HsiW3TXlxkMzBPBku6pgj0xnjLHEVipTIT0eKXCZ1aAfg+eztlBrSWJAG2LwK4RgJz8i6+VsP2ISZD16KRhTbqtfj+RN6ycg== X-Google-Smtp-Source: AGHT+IGDemQnGqnA3ZFXXT3PwISaUcCOrAKloMvfHTh/AubJD5kPGqWfH+SPcauIbQk0+XJpyRzz X-Received: by 2002:a19:5f04:0:b0:51d:9ea3:5649 with SMTP id 2adb3069b0e04-526bd0d1b5dmr1127878e87.10.1716376978822; Wed, 22 May 2024 04:22:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716376978; cv=pass; d=google.com; s=arc-20160816; b=uRIeLJq1VGgjEjXBLyZfw+jtGko6kgvJ927txJQbx1uzD5EVvhGt+WL5z3NBkGCboH 5LSyfYocok/TmlrfWwvNYIlxqJ+RPK4kedNP31zJIe4QqCPiJtmyul8wUrGu/IEuDgID 6dyielArKTkjAvpDcTfGdFgXC6hz+WcS6Tmu1r8ypyHrrvCI7IauExF5Mu9T0lMmQfSH sT6T5HPQ9O8UmD9h2X2c4cyzICMfj4WcXzOJC0K/Z9/9MUW3NS1pf1/EmjkCMNQvRzQr ol+Zf6tQxRh+EXHXTAzBBvetypsJFbeqJ9j+FdkuGxd3VfPPdq9Ma4bZGdl2W8VgqcwT 0fPQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id; bh=4Ghv9nh5239RJ9i8liGXQXnSg27NfNgWk8M4Hw9jQRg=; fh=M1AiTh1DN5xWvdd1dgiJK45QnetfuNFdyWv6luiIG8Y=; b=dvI+mUeb45V9ehlsQEYIT3vtQPClMQgwt2PdyijcHpyFmkvbx0ViHk0D6A4iX4B5Y0 pb6pmVsYpj4yJknDQWWzLNRp6e1BnpAu35x1usACFV8bF077sns52xzglSluq+m2pAEh xRe/33xFXpfUU9Q7oL39iL4wW8IZYzMqdsFnAszxmhjM4E9mfrtWFINWTZyDWULNqD8O 9o7DOnZpuAs2HxqIDWSR1WASX08fFBg14F7PcKJ7f4ORlrlxIiD/0cGak4vsNVy/7Rlw kWZVOsJRbTFkinZk0G/b35WnunFjtEK671jLpWuOjYHGfeHp8Fjyp7p3PS8y1tClsaW/ HVhg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=ghiti.fr); spf=pass (google.com: domain of linux-kernel+bounces-186130-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-186130-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-5733beacb7csi15063562a12.81.2024.05.22.04.22.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 04:22:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-186130-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=ghiti.fr); spf=pass (google.com: domain of linux-kernel+bounces-186130-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-186130-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 6152D1F215B8 for ; Wed, 22 May 2024 11:22:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E6A7A82C7E; Wed, 22 May 2024 11:22:42 +0000 (UTC) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 877968289A; Wed, 22 May 2024 11:22:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716376962; cv=none; b=BowvoyVYBTD7O3T5Vkcbi14LvQVQ9uRkX+yF4VCR/prWT5MeSj56L1AyhkAG9vfA01mC2/TmllHnXxPR6anEK84oBpNrF5D6z7UvYWTI1CPq5/Om52nNi5/wax89vG/qceo1SFEDbSb+W9OaDipeKyIUCWQhukfr3G2RNukcshU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716376962; c=relaxed/simple; bh=F+eLMP7vomG4vgGnf2QTGMnK4y1oDm374YCutBXL7wU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=mZStDywAVhFGYMF4ff7lXLFDjIOhRQEaYw9S3dUVJplgBPYajMu/K05U4HaCUDdrqPaf/MJ/enrA2wj44FJsPK7EwCUMvYmdfMCaBGHQqo7WJtfSFCzOyDKWHbPYDiLkt8ga7EC5V7RfDk1a1KClnFfBLOKOuTp7QRoK8213ths= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ghiti.fr; spf=pass smtp.mailfrom=ghiti.fr; arc=none smtp.client-ip=217.70.183.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ghiti.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ghiti.fr Received: by mail.gandi.net (Postfix) with ESMTPSA id E86A61BF207; Wed, 22 May 2024 11:22:32 +0000 (UTC) Message-ID: Date: Wed, 22 May 2024 13:22:31 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] riscv: rewrite __kernel_map_pages() to fix sleeping in invalid context Content-Language: en-US To: Nam Cao , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org References: <1289ecba9606a19917bc12b6c27da8aa23e1e5ae.1715750938.git.namcao@linutronix.de> From: Alexandre Ghiti In-Reply-To: <1289ecba9606a19917bc12b6c27da8aa23e1e5ae.1715750938.git.namcao@linutronix.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-GND-Sasl: alex@ghiti.fr On 15/05/2024 07:50, Nam Cao wrote: > __kernel_map_pages() is a debug function which clears the valid bit in page > table entry for deallocated pages to detect illegal memory accesses to > freed pages. > > This function set/clear the valid bit using __set_memory(). __set_memory() > acquires init_mm's semaphore, and this operation may sleep. This is > problematic, because __kernel_map_pages() can be called in atomic context, > and thus is illegal to sleep. An example warning that this causes: > > BUG: sleeping function called from invalid context at kernel/locking/rwsem.c:1578 > in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2, name: kthreadd > preempt_count: 2, expected: 0 > CPU: 0 PID: 2 Comm: kthreadd Not tainted 6.9.0-g1d4c6d784ef6 #37 > Hardware name: riscv-virtio,qemu (DT) > Call Trace: > [] dump_backtrace+0x1c/0x24 > [] show_stack+0x2c/0x38 > [] dump_stack_lvl+0x5a/0x72 > [] dump_stack+0x14/0x1c > [] __might_resched+0x104/0x10e > [] __might_sleep+0x3e/0x62 > [] down_write+0x20/0x72 > [] __set_memory+0x82/0x2fa > [] __kernel_map_pages+0x5a/0xd4 > [] __alloc_pages_bulk+0x3b2/0x43a > [] __vmalloc_node_range+0x196/0x6ba > [] copy_process+0x72c/0x17ec > [] kernel_clone+0x60/0x2fe > [] kernel_thread+0x82/0xa0 > [] kthreadd+0x14a/0x1be > [] ret_from_fork+0xe/0x1c > > Rewrite this function with apply_to_existing_page_range(). It is fine to > not have any locking, because __kernel_map_pages() works with pages being > allocated/deallocated and those pages are not changed by anyone else in the > meantime. > > Fixes: 5fde3db5eb02 ("riscv: add ARCH_SUPPORTS_DEBUG_PAGEALLOC support") > Signed-off-by: Nam Cao > Cc: stable@vger.kernel.org > --- > arch/riscv/mm/pageattr.c | 28 ++++++++++++++++++++++------ > 1 file changed, 22 insertions(+), 6 deletions(-) > > diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c > index 410056a50aa9..271d01a5ba4d 100644 > --- a/arch/riscv/mm/pageattr.c > +++ b/arch/riscv/mm/pageattr.c > @@ -387,17 +387,33 @@ int set_direct_map_default_noflush(struct page *page) > } > > #ifdef CONFIG_DEBUG_PAGEALLOC > +static int debug_pagealloc_set_page(pte_t *pte, unsigned long addr, void *data) > +{ > + int enable = *(int *)data; > + > + unsigned long val = pte_val(ptep_get(pte)); > + > + if (enable) > + val |= _PAGE_PRESENT; > + else > + val &= ~_PAGE_PRESENT; > + > + set_pte(pte, __pte(val)); > + > + return 0; > +} > + > void __kernel_map_pages(struct page *page, int numpages, int enable) > { > if (!debug_pagealloc_enabled()) > return; > > - if (enable) > - __set_memory((unsigned long)page_address(page), numpages, > - __pgprot(_PAGE_PRESENT), __pgprot(0)); > - else > - __set_memory((unsigned long)page_address(page), numpages, > - __pgprot(0), __pgprot(_PAGE_PRESENT)); > + unsigned long start = (unsigned long)page_address(page); > + unsigned long size = PAGE_SIZE * numpages; > + > + apply_to_existing_page_range(&init_mm, start, size, debug_pagealloc_set_page, &enable); > + > + flush_tlb_kernel_range(start, start + size); > } > #endif > And you can add: Reviewed-by: Alexandre Ghiti Thanks! Alex