Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.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 640B917578 for ; Sat, 29 Jun 2024 02:31:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719628285; cv=none; b=AltfjITFnRfXqQp6lw1PG9QZX0TROgLLniMLSsBJnfKJfZbGagEeeZuRGc1oQGZ3aoBUe73sjEbmRpnMDnvGFBa3iLvJuaO2yyvjvxFWRnRcZs9JuBVhT+D67F8MY3LyqaAZEEiZjQdmLWDTZRkbhb7bI21Fakjt9itPlnXtNdU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719628285; c=relaxed/simple; bh=VRCkbTJh31vkxykTwr7RAbOPxqv0pxaiKkDz8itvft4=; h=Date:To:From:Subject:Message-Id; b=j7N0yu7X7Bm1SZ+xNfso5Rgr5qxSh/TQ/bl/oPXPHaGQCI1xjNvhu1HnVm2Vj3K+linoht4H9sLn0BN80z8BdKM6X+a3zL9WlDmGzc6tkSStTJKWJuRlYfVUCndoxvjlYlvvOjH1eFgpvLVYkWz8fI5Fzw3CSStcrXBpBTP9H2A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=MD+ee24G; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="MD+ee24G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BEFBC116B1; Sat, 29 Jun 2024 02:31:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1719628285; bh=VRCkbTJh31vkxykTwr7RAbOPxqv0pxaiKkDz8itvft4=; h=Date:To:From:Subject:From; b=MD+ee24GA80SO0cTE/mWFTbl0cWmGvImmy6YYO7CJga4t3glawGj/RKB6ReSR3U0/ RULbodxhTMVdzwCy1tcbz6vDsoh8L2ScDuU5UZd2L4Vovci8OhfrKMyrD9tSw7+A+p AbwuUdCXgiVdkrqzMhPZXYMUVNGV8qOi2jz0ChPU= Date: Fri, 28 Jun 2024 19:31:24 -0700 To: mm-commits@vger.kernel.org,vbabka@suse.cz,svens@linux.ibm.com,rostedt@goodmis.org,roman.gushchin@linux.dev,rientjes@google.com,penberg@kernel.org,mhiramat@kernel.org,mark.rutland@arm.com,kasan-dev@googlegroups.com,iamjoonsoo.kim@lge.com,hca@linux.ibm.com,gor@linux.ibm.com,glider@google.com,elver@google.com,dvyukov@google.com,cl@linux.com,borntraeger@linux.ibm.com,agordeev@linux.ibm.com,42.hyeyoo@gmail.com,iii@linux.ibm.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] s390-kmsan-implement-the-architecture-specific-functions.patch removed from -mm tree Message-Id: <20240629023125.3BEFBC116B1@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: s390/kmsan: implement the architecture-specific functions has been removed from the -mm tree. Its filename was s390-kmsan-implement-the-architecture-specific-functions.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Ilya Leoshkevich Subject: s390/kmsan: implement the architecture-specific functions Date: Fri, 21 Jun 2024 13:35:21 +0200 arch_kmsan_get_meta_or_null() finds the lowcore shadow by querying the prefix and calling kmsan_get_metadata() again. kmsan_virt_addr_valid() delegates to virt_addr_valid(). Link: https://lkml.kernel.org/r/20240621113706.315500-38-iii@linux.ibm.com Signed-off-by: Ilya Leoshkevich Acked-by: Alexander Gordeev Reviewed-by: Alexander Potapenko Cc: Christian Borntraeger Cc: Christoph Lameter Cc: David Rientjes Cc: Dmitry Vyukov Cc: Heiko Carstens Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: Joonsoo Kim Cc: Cc: Marco Elver Cc: Mark Rutland Cc: Masami Hiramatsu (Google) Cc: Pekka Enberg Cc: Roman Gushchin Cc: Steven Rostedt (Google) Cc: Sven Schnelle Cc: Vasily Gorbik Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- arch/s390/include/asm/kmsan.h | 59 ++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) --- /dev/null +++ a/arch/s390/include/asm/kmsan.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_S390_KMSAN_H +#define _ASM_S390_KMSAN_H + +#include +#include +#include +#include +#include + +#ifndef MODULE + +static inline bool is_lowcore_addr(void *addr) +{ + return addr >= (void *)&S390_lowcore && + addr < (void *)(&S390_lowcore + 1); +} + +static inline void *arch_kmsan_get_meta_or_null(void *addr, bool is_origin) +{ + if (is_lowcore_addr(addr)) { + /* + * Different lowcores accessed via S390_lowcore are described + * by the same struct page. Resolve the prefix manually in + * order to get a distinct struct page. + */ + addr += (void *)lowcore_ptr[raw_smp_processor_id()] - + (void *)&S390_lowcore; + if (KMSAN_WARN_ON(is_lowcore_addr(addr))) + return NULL; + return kmsan_get_metadata(addr, is_origin); + } + return NULL; +} + +static inline bool kmsan_virt_addr_valid(void *addr) +{ + bool ret; + + /* + * pfn_valid() relies on RCU, and may call into the scheduler on exiting + * the critical section. However, this would result in recursion with + * KMSAN. Therefore, disable preemption here, and re-enable preemption + * below while suppressing reschedules to avoid recursion. + * + * Note, this sacrifices occasionally breaking scheduling guarantees. + * Although, a kernel compiled with KMSAN has already given up on any + * performance guarantees due to being heavily instrumented. + */ + preempt_disable(); + ret = virt_addr_valid(addr); + preempt_enable_no_resched(); + + return ret; +} + +#endif /* !MODULE */ + +#endif /* _ASM_S390_KMSAN_H */ _ Patches currently in -mm which might be from iii@linux.ibm.com are