From patchwork Thu Jun 13 15:34:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13697130 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 2511EC27C4F for ; Thu, 13 Jun 2024 16:39:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E6676B00C6; Thu, 13 Jun 2024 12:38:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76F956B00C7; Thu, 13 Jun 2024 12:38:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C1236B00C8; Thu, 13 Jun 2024 12:38:59 -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 31CC06B00C6 for ; Thu, 13 Jun 2024 12:38:59 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C2D0B1C02CC for ; Thu, 13 Jun 2024 16:38:58 +0000 (UTC) X-FDA: 82226424756.25.AA3E749 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf13.hostedemail.com (Postfix) with ESMTP id 7B25B2000A for ; Thu, 13 Jun 2024 16:38:56 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=TpSsq8cF; spf=pass (imf13.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=1718296735; 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=pcK1rMwKAY+PK8Ytyz/2vRX/RRHh9XTkiYTIv46ktrM=; b=Zbx7tTY4p0AxeMKt/lCBtI/DyBfUFruFn5ky5o8t6tohgXXQ61TDfu3ojHdFp3lE/MO2TJ OfORGRh+ZWw47j9DCiOv/B2Xhy65VaCZA5kTVymHpKM3O+Goe51G91XOu8Etyou9p3libc fvFZNA3ivx+VwLKQHUvSpT92ic//Vnw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718296735; a=rsa-sha256; cv=none; b=pjGiPH9zPW8Fe7nhjYYWrmI0hk2cwk11RW3DAAcH+1j15G/gBikELPJvBItzTCIY9VG6Qq qHDXZRNYfPY3KoI+F5NbpAxLieqVnGVXPR2a2ELQ6EJDTxuD3j3w7vKuzD6DHl6ne1yYoZ p4fwW0K7rrV7sqdnYK0bvAf8VDW47BI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=TpSsq8cF; spf=pass (imf13.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 Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45DEQSMW026603; Thu, 13 Jun 2024 15:39:50 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 :content-transfer-encoding:mime-version; s=pp1; bh=pcK1rMwKAY+PK 8Ytyz/2vRX/RRHh9XTkiYTIv46ktrM=; b=TpSsq8cFzJnwe+u1suk+FoH+lPoVM M0wKWuXfnzK24xPI/asMuY0NJLtc/QQp1E8CuZWPrRfAIxHh7L6vtwUO9WCobLCc KNXiKGdxN5ltwzKdCslukI62H2Gbhtv2hih2dOS4Fc/upBNGBPSKnFsB4UcNYD/m GnamVPbgk676OGVACc7WZ0WdSFjmdCc/P9o5+i/Mev0kxAq/u6yKK0HLzs0feBAK 5s5YgKXZaH+73ir1mf7kp7TYwWfeYek8KacEbuD+IY16WLmBo+BOs6St4lQ1OMHE kFmWgE6lOV31MU2ov/KzIoIPMEnsolHL+WIQ12Z2d3gdXgK1F5hfsr1Yg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yqq4u2373-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:49 +0000 (GMT) Received: from m0360072.ppops.net (m0360072.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 45DFdn8N009704; Thu, 13 Jun 2024 15:39:49 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yqq4u236x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:49 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 45DEAZNn008701; Thu, 13 Jun 2024 15:39:48 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3yn4b3rk19-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:48 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45DFdgpn54854064 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Jun 2024 15:39:45 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CEE4A2006A; Thu, 13 Jun 2024 15:39:42 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5C27C20067; Thu, 13 Jun 2024 15:39:42 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 13 Jun 2024 15:39:42 +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 v4 18/35] lib/zlib: Unpoison DFLTCC output buffers Date: Thu, 13 Jun 2024 17:34:20 +0200 Message-ID: <20240613153924.961511-19-iii@linux.ibm.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240613153924.961511-1-iii@linux.ibm.com> References: <20240613153924.961511-1-iii@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ZkRkVKlaPl-5RHA19x1OqnW-klsEghkh X-Proofpoint-ORIG-GUID: Ftz9VuNKiSSNqeta_DO5F7fudUAWQDRT X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 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-13_08,2024-06-13_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 suspectscore=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 mlxlogscore=999 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2406130109 X-Rspamd-Queue-Id: 7B25B2000A X-Stat-Signature: 6xb5h9uorhf8iaabhj4ncrcwcxqrxnuk X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1718296736-321974 X-HE-Meta: U2FsdGVkX1+RtJuwz/sy8hniku3BNU9iNuAnaVz/S0ysimUEA0LTbMiyhyASBVMLzyxQqdRf/dGSZUeG8GbSEG4oPxqHo3YGmWHA79L7aKn3qrJaaHLWfA+8S3FeEnu64lhuMD0AG3heom4MijNrGVLUJ0oVlw6f1kLEC9VYqgH+lDZo+OMoOklV/C4VEhKF7BKjBb7baIP429tC3nxFQQwJCgHRiwlbJRlKdQk5Nv5UN7kuP2H2EKC6X0GHwmBmAWQqXIlMqtTpa+vBT1qf01jw9xvMN+62IDWXnxxqFchYXHN9O+ppPOm2AppHOb2/aj1VJX4EDFaCDrKyO2bipyB6c99+k4OZGeVaVtyc9AQ6w+WgvTedy4kFYihWImLGn1gMrSmDw5yotnAhTVX1WlRzHuhYf81a/PL8QKKaAQOl1GczvICu//7z0B5l9l4DYvhIfu45nIRAB04sGM7ManJZjQhvY4W74TisV8BswBKQVYCY/gbUee4L+pqyB5joqggu4llnguiokyTT5AAusLkGdUNcrjG4J4j+TrNDEDH7ZZi9zFDvnUoLEJ30T7qH1XKThaHeQVjFRvwg0ZpYHN6I5vCvC3EmtwO0D75kcIQY7HH3u92r3J26IYaWmMCA1g5ic+1Ri2aE1cyHB7Vjx1BN89/1CIOKJoNk2jjTNhYpnL63e0gDyhlTZRe0Wtud64pHNgtSaZ+z0f1qmwWiHPqBu5TpIG9I+maxjQKumCGINgGqh/4n7huGSxECjlCmAnFvZ+0gkzK/jpkvsCHPGHuUXZ/m8nUnlysC8WzbygYD7mG2+LgQ0jtd8vWywLkpSD7Q/9nU6lqHw8M6jQlKITVlglswufCZ+Bn4GmJ+Lqxp77qbnzoFkhKNqBHEENn1b+VWhs18NtJbNfBnckS7us2rnCofLAWkLJmZEcEh3h70qqhg6Q6OusPtoTlazcF6JUPmKMm0oXnFXzr1DpM YjnF2fTT jYwvOIrO2KgHA1DpHh6dFGjAIydT+voQiH+xuqHYlgcSW+Bg+MEojvVTgbCVgeR+ObO8HTtgK+dIrcDDZF7147RGFawulWkA7qJijiuPq/AMEtCE5H1BETfRToemx4ZLIUp6BtiD1VcioIOpFwAVY/XN279Q2T8SsKViyRuG/5iGe9seXKhp/9d+ohqiDKEKBvaL6j/7sGj50lbXNrAl+6eDgqHRe4kFxLwmPzbYOZr9PkoXDzOkeGbPp+1ZBR/27bloHVLWYH5AFa9mnuZkTnwTFy6bZ/PsqNCqikKo6UNdoCW007WZclGQykGC7gXNcQdhkYB3hmMaCrAJlvTE97tynX6UYlQK3ujZ4Hyrb55+m4SjFOAPY0V3kXYIomo66MRRQ 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: The constraints of the DFLTCC inline assembly are not precise: they do not communicate the size of the output buffers to the compiler, so it cannot automatically instrument it. Add the manual kmsan_unpoison_memory() calls for the output buffers. The logic is the same as in [1]. [1] https://github.com/zlib-ng/zlib-ng/commit/1f5ddcc009ac3511e99fc88736a9e1a6381168c5 Reported-by: Alexander Gordeev Reviewed-by: Alexander Potapenko Signed-off-by: Ilya Leoshkevich --- lib/zlib_dfltcc/dfltcc.h | 1 + lib/zlib_dfltcc/dfltcc_util.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/lib/zlib_dfltcc/dfltcc.h b/lib/zlib_dfltcc/dfltcc.h index b96232bdd44d..0f2a16d7a48a 100644 --- a/lib/zlib_dfltcc/dfltcc.h +++ b/lib/zlib_dfltcc/dfltcc.h @@ -80,6 +80,7 @@ struct dfltcc_param_v0 { uint8_t csb[1152]; }; +static_assert(offsetof(struct dfltcc_param_v0, csb) == 384); static_assert(sizeof(struct dfltcc_param_v0) == 1536); #define CVT_CRC32 0 diff --git a/lib/zlib_dfltcc/dfltcc_util.h b/lib/zlib_dfltcc/dfltcc_util.h index 4a46b5009f0d..10509270d822 100644 --- a/lib/zlib_dfltcc/dfltcc_util.h +++ b/lib/zlib_dfltcc/dfltcc_util.h @@ -2,6 +2,8 @@ #ifndef DFLTCC_UTIL_H #define DFLTCC_UTIL_H +#include "dfltcc.h" +#include #include /* @@ -20,6 +22,7 @@ typedef enum { #define DFLTCC_CMPR 2 #define DFLTCC_XPND 4 #define HBT_CIRCULAR (1 << 7) +#define DFLTCC_FN_MASK ((1 << 7) - 1) #define HB_BITS 15 #define HB_SIZE (1 << HB_BITS) @@ -34,6 +37,7 @@ static inline dfltcc_cc dfltcc( ) { Byte *t2 = op1 ? *op1 : NULL; + unsigned char *orig_t2 = t2; size_t t3 = len1 ? *len1 : 0; const Byte *t4 = op2 ? *op2 : NULL; size_t t5 = len2 ? *len2 : 0; @@ -59,6 +63,30 @@ static inline dfltcc_cc dfltcc( : "cc", "memory"); t2 = r2; t3 = r3; t4 = r4; t5 = r5; + /* + * Unpoison the parameter block and the output buffer. + * This is a no-op in non-KMSAN builds. + */ + switch (fn & DFLTCC_FN_MASK) { + case DFLTCC_QAF: + kmsan_unpoison_memory(param, sizeof(struct dfltcc_qaf_param)); + break; + case DFLTCC_GDHT: + kmsan_unpoison_memory(param, offsetof(struct dfltcc_param_v0, csb)); + break; + case DFLTCC_CMPR: + kmsan_unpoison_memory(param, sizeof(struct dfltcc_param_v0)); + kmsan_unpoison_memory( + orig_t2, + t2 - orig_t2 + + (((struct dfltcc_param_v0 *)param)->sbb == 0 ? 0 : 1)); + break; + case DFLTCC_XPND: + kmsan_unpoison_memory(param, sizeof(struct dfltcc_param_v0)); + kmsan_unpoison_memory(orig_t2, t2 - orig_t2); + break; + } + if (op1) *op1 = t2; if (len1)