From patchwork Wed Jun 19 15:44:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13704200 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 74216C27C79 for ; Wed, 19 Jun 2024 15:46:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D99556B02F6; Wed, 19 Jun 2024 11:46:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D49AD6B02F9; Wed, 19 Jun 2024 11:46:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B4CE28D007A; Wed, 19 Jun 2024 11:46:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 942756B02F6 for ; Wed, 19 Jun 2024 11:46:02 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 490601C22F3 for ; Wed, 19 Jun 2024 15:46:02 +0000 (UTC) X-FDA: 82248064164.03.8E3B1EB Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf01.hostedemail.com (Postfix) with ESMTP id 0D2044000F for ; Wed, 19 Jun 2024 15:45:59 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=BtKVmwsW; spf=pass (imf01.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=iii@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718811956; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=twgTpfHCjImRnKDbwT1fFnn3UXy6li/j6Qe1IMbE5zU=; b=SIvCZ4BF5vx+cKx3BHO4rMkPPYlcNd8wUjtKgx7YoxNM8CnolXvzuQPXNz51KIerYXy9qu 3LLRTo52O5zy2kNjdNgrptcm+wR4Ki6qd3RO61LR7TK7VDUOzpTW3UFFWfMJ+TNhbtEEub ZRxt3qpKO+6KpgX3zddwfETqO3UW77I= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=BtKVmwsW; spf=pass (imf01.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=iii@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718811956; a=rsa-sha256; cv=none; b=Omo/7KlqAkjk4kEv0u319RK+/7NS1lQ9TsAlS8fxoKEkQ4wrawbP6XNW0x7G31+23YeXd8 jzTON2bPYQr60NMveV6RwAWQHJvmbFs2Xs1jKv7rDlHWuGYDzmAqtbz2VM/WS3x1LKVZLz 50nKZI7vhFPMxgRPi0sC4AhZiCHt8f4= Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45JETPqE000732; Wed, 19 Jun 2024 15:45:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=pp1; bh=twgTpfHCjImRn KDbwT1fFnn3UXy6li/j6Qe1IMbE5zU=; b=BtKVmwsWd+H7ktTfd4QG3tZLVAhCD 1t4VD4CtXdrsM56AO7hs9HPFxerI54jSWqvSf7q2O/dVHj1SL+jI3iOhjfdKQI1P Yv96n+sDzYZwKyg/WRmXNYAnGoCmXtvkE27QOV12WdtkpPgD2KMZ7QbyJ2yLCgq+ pVWKzdLUl1O6VDIuwvJNsno7ckSxbZeAml7Mo4LuLvLrjhbypPfMP+0Cuk/6UfZ9 BvLkeovw2P2rqT5Wg4fNneiAEheskpfqfqFCtnYrJnF+q2AeMw5aKafTn6pRn+AT LkCYex0/3eSdwJmBO6VuW2uIKMzfS/0TDjWwFL2fe4ZSmZP+JfhmflKFQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yv14tg8cf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 19 Jun 2024 15:45:52 +0000 (GMT) Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 45JFjpu4027917; Wed, 19 Jun 2024 15:45:51 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yv14tg8cc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 19 Jun 2024 15:45:51 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 45JEF4L2011037; Wed, 19 Jun 2024 15:45:50 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3yspsndtnw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 19 Jun 2024 15:45:50 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45JFjiZx32834174 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Jun 2024 15:45:46 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9E7C42006C; Wed, 19 Jun 2024 15:45:44 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4FB1720067; Wed, 19 Jun 2024 15:45:44 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 19 Jun 2024 15:45:44 +0000 (GMT) From: Ilya Leoshkevich To: Alexander Gordeev , Alexander Potapenko , Andrew Morton , Christoph Lameter , David Rientjes , Heiko Carstens , Joonsoo Kim , Marco Elver , Masami Hiramatsu , Pekka Enberg , Steven Rostedt , Vasily Gorbik , Vlastimil Babka Cc: Christian Borntraeger , Dmitry Vyukov , Hyeonggon Yoo <42.hyeyoo@gmail.com>, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-s390@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Mark Rutland , Roman Gushchin , Sven Schnelle , Ilya Leoshkevich Subject: [PATCH v5 31/37] s390/string: Add KMSAN support Date: Wed, 19 Jun 2024 17:44:06 +0200 Message-ID: <20240619154530.163232-32-iii@linux.ibm.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240619154530.163232-1-iii@linux.ibm.com> References: <20240619154530.163232-1-iii@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 1vJnWjP8onhRd1nDUiLNOB821DSsFz-x X-Proofpoint-ORIG-GUID: r5jD2ijdGJxfVZVu2IqQYF5MTuXKfUuS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-19_02,2024-06-19_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 suspectscore=0 mlxscore=0 clxscore=1015 spamscore=0 mlxlogscore=999 impostorscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2406190115 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 0D2044000F X-Stat-Signature: nyxtd69kxgbh7r7abeeos99jokugijkd X-HE-Tag: 1718811959-439933 X-HE-Meta: U2FsdGVkX18tcctPqtmtow9exbkW5ascaF/i/TQeTqf5H0FyQh6HZMeiIWpQ1MnMuj+24D+tEALfnuoybNeQiXmbAhCQB+6TZFibJlyKVU+C9shVZV4Qm1QrXj008LMwzgCgtLHLUm+QJfEe+qk2UWzovq4vUKikzMlHeLJOocN+P7z1W39+vdMVWc9a5/enbT+nVj0SG8kCp+zA80wCcPtJ1FP+Q1h8CR+dYtLYP+T2Az2EyvX/DOpTknZTHESYq9mYiUYJsAwF8jchB1Q3nxWebRPpVZPYL9uKa95wjvlI8lkBbBVi7skrtyyoplEjK4T21VfuUPGS9f4LCtkvilyiNBRCEGW7mHrpz1QZRR49pU1Ol2PM6bTSkQ/Rgtf9tDIF1QG4xTAq2aC0QZU5/x+F4fUjGGc21l/LyZYmVbAKjYp99rpY1cqPvC1GSzhRt2hiZhzwizhUkzfkh+sRhYzRl+2/bYQVeHnwyhTfe21iR3nJDbdsn19Cr6X4oMVG+RIpCvN1mGAxKaVNwY9W5Kw/OVntfZtb8wJxxmoJ/wPBn6Ehg8uM6GJWLqIdmoMwk+/yXA3QlnjAlzBQjURf/5RL11Nk85vmDoyvn8k9HpgeByKSMNW0UQ5NfgJjm3+hIUx4yls/8oix7UrM9+Nz5YwhtVB+DWHn14gnOkTVVgaDEmZ8oApOZv4fH7qO1VuRQySPSq1BQbrUCvK4vYMpXJFxK/Y1uxiL38RDJ896rT8tX62WIQ7S/dRAc14zyfpiGASi5IFVu3j+5l9RLzUWlQW35fZP3lMbWCHTKUqzvZ+JkTgOTXysGnbJ1WoK9qk42njf2aJYsdG+uglWEQL6aPB/CERiQrsb3fqbbHdLotOSRszjWoXm98o5rqLrTDtjQzoZvZFCtNQqTGxfNYJynxOIYmH5aush8a0EHsLPkHM+4TTURz2ZEx5hRIXTDI+FyP23My9ewn9w6bHfmH8 k+PXjSqe p4tWeb0Bbx2cyG17+RMFrvUbp9osGpS1Uw9akpgpC4qoOlf2Q2LXgqN2kTa9v2EeGiUjyDrXwynibHbh3HZfNY8Oslka/2Do11NXkDQryWirhf2hUZv8/mcgDMnZCDeo95w557TMCpWEkb+kSRwCQbFm19u61hhyOHRZqm1yDEGE/lQwvozvatDHARe4hQUK3Qj7bRCwkXFW+d8bZfJ+FPVYbjIlbv5WMxkhV1WdCBHElPsyqeQUxgyMnqJGpzDTVr/DHsfaxa0Sx7z3cohvd0WzEwQ== 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: Add KMSAN support for the s390 implementations of the string functions. Do this similar to how it's already done for KASAN, except that the optimized memset{16,32,64}() functions need to be disabled: it's important for KMSAN to know that they initialized something. The way boot code is built with regard to string functions is problematic, since most files think it's configured with sanitizers, but boot/string.c doesn't. This creates various problems with the memset64() definitions, depending on whether the code is built with sanitizers or fortify. This should probably be streamlined, but in the meantime resolve the issues by introducing the IN_BOOT_STRING_C macro, similar to the existing IN_ARCH_STRING_C macro. Reviewed-by: Alexander Potapenko Acked-by: Heiko Carstens Signed-off-by: Ilya Leoshkevich --- arch/s390/boot/string.c | 16 ++++++++++++++++ arch/s390/include/asm/string.h | 20 +++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/arch/s390/boot/string.c b/arch/s390/boot/string.c index faccb33b462c..f6b9b1df48a8 100644 --- a/arch/s390/boot/string.c +++ b/arch/s390/boot/string.c @@ -1,11 +1,18 @@ // SPDX-License-Identifier: GPL-2.0 +#define IN_BOOT_STRING_C 1 #include #include #include #undef CONFIG_KASAN #undef CONFIG_KASAN_GENERIC +#undef CONFIG_KMSAN #include "../lib/string.c" +/* + * Duplicate some functions from the common lib/string.c + * instead of fully including it. + */ + int strncmp(const char *cs, const char *ct, size_t count) { unsigned char c1, c2; @@ -22,6 +29,15 @@ int strncmp(const char *cs, const char *ct, size_t count) return 0; } +void *memset64(uint64_t *s, uint64_t v, size_t count) +{ + uint64_t *xs = s; + + while (count--) + *xs++ = v; + return s; +} + char *skip_spaces(const char *str) { while (isspace(*str)) diff --git a/arch/s390/include/asm/string.h b/arch/s390/include/asm/string.h index 351685de53d2..2ab868cbae6c 100644 --- a/arch/s390/include/asm/string.h +++ b/arch/s390/include/asm/string.h @@ -15,15 +15,12 @@ #define __HAVE_ARCH_MEMCPY /* gcc builtin & arch function */ #define __HAVE_ARCH_MEMMOVE /* gcc builtin & arch function */ #define __HAVE_ARCH_MEMSET /* gcc builtin & arch function */ -#define __HAVE_ARCH_MEMSET16 /* arch function */ -#define __HAVE_ARCH_MEMSET32 /* arch function */ -#define __HAVE_ARCH_MEMSET64 /* arch function */ void *memcpy(void *dest, const void *src, size_t n); void *memset(void *s, int c, size_t n); void *memmove(void *dest, const void *src, size_t n); -#ifndef CONFIG_KASAN +#if !defined(CONFIG_KASAN) && !defined(CONFIG_KMSAN) #define __HAVE_ARCH_MEMCHR /* inline & arch function */ #define __HAVE_ARCH_MEMCMP /* arch function */ #define __HAVE_ARCH_MEMSCAN /* inline & arch function */ @@ -36,6 +33,9 @@ void *memmove(void *dest, const void *src, size_t n); #define __HAVE_ARCH_STRNCPY /* arch function */ #define __HAVE_ARCH_STRNLEN /* inline & arch function */ #define __HAVE_ARCH_STRSTR /* arch function */ +#define __HAVE_ARCH_MEMSET16 /* arch function */ +#define __HAVE_ARCH_MEMSET32 /* arch function */ +#define __HAVE_ARCH_MEMSET64 /* arch function */ /* Prototypes for non-inlined arch strings functions. */ int memcmp(const void *s1, const void *s2, size_t n); @@ -44,7 +44,7 @@ size_t strlcat(char *dest, const char *src, size_t n); char *strncat(char *dest, const char *src, size_t n); char *strncpy(char *dest, const char *src, size_t n); char *strstr(const char *s1, const char *s2); -#endif /* !CONFIG_KASAN */ +#endif /* !defined(CONFIG_KASAN) && !defined(CONFIG_KMSAN) */ #undef __HAVE_ARCH_STRCHR #undef __HAVE_ARCH_STRNCHR @@ -74,20 +74,30 @@ void *__memset16(uint16_t *s, uint16_t v, size_t count); void *__memset32(uint32_t *s, uint32_t v, size_t count); void *__memset64(uint64_t *s, uint64_t v, size_t count); +#ifdef __HAVE_ARCH_MEMSET16 static inline void *memset16(uint16_t *s, uint16_t v, size_t count) { return __memset16(s, v, count * sizeof(v)); } +#endif +#ifdef __HAVE_ARCH_MEMSET32 static inline void *memset32(uint32_t *s, uint32_t v, size_t count) { return __memset32(s, v, count * sizeof(v)); } +#endif +#ifdef __HAVE_ARCH_MEMSET64 +#ifdef IN_BOOT_STRING_C +void *memset64(uint64_t *s, uint64_t v, size_t count); +#else static inline void *memset64(uint64_t *s, uint64_t v, size_t count) { return __memset64(s, v, count * sizeof(v)); } +#endif +#endif #if !defined(IN_ARCH_STRING_C) && (!defined(CONFIG_FORTIFY_SOURCE) || defined(__NO_FORTIFY))