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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D333DC61D85 for ; Tue, 21 Nov 2023 22:07:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9944E8D0029; Tue, 21 Nov 2023 17:07:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 948C38D0001; Tue, 21 Nov 2023 17:07:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E4408D002A; Tue, 21 Nov 2023 17:07:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 63A0A8D0029 for ; Tue, 21 Nov 2023 17:07:45 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3DF18C01D6 for ; Tue, 21 Nov 2023 22:07:45 +0000 (UTC) X-FDA: 81483349290.13.4242FBE Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf05.hostedemail.com (Postfix) with ESMTP id DFAC7100002 for ; Tue, 21 Nov 2023 22:07:42 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=fjfJvzVH; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf05.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=iii@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700604463; 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=JR4hU8usmRDdin50s82nkAgu6ZMVd3+rhBewhZJH1Ks=; b=eNuVldJoGhimcYy1HyZNoxl+cF58hllyEg/t1Rg9nSfFzxj68C1TOlYP2AeI/2H8P2pro6 QG+sVY3ip84u+mnTcaYHHQvq+ARLPnufnRpfKjgxjs7eoG/qtxNrf68jGQybJ5n1sVS9IC 7PbCpEWFcTq1IsWhuB/57CY6xaNM2cU= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=fjfJvzVH; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf05.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=iii@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700604463; a=rsa-sha256; cv=none; b=IQYM9G8tyN92eh2CeLbiKlExLyoOY/KSfXy0pqqtYhAXfifStJste74PZuq9ZRTGCylHSU TysGoe9RYYiOYOzGKMLF/KjBqADbVqGZDEATlqMp4JiVLnKf2esiA1hUwJo9QYt1O1IaUJ dfSVJVw9R08/T3zSkwuivx8fydMhdJE= Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ALLgdjh032016; Tue, 21 Nov 2023 22:07:36 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=JR4hU8usmRDdin50s82nkAgu6ZMVd3+rhBewhZJH1Ks=; b=fjfJvzVHIMBI8eVfnfCg6cOekF4f4bLVPhyjRXTpF0k95mtX2DsfbS8ZNhLAtDKuul1K rfJ4aAO1m+svQaxSTgy9829fo8UM/vEBtnfvUBOgl8fOTncZ0HzAQYq6J6bzB4pjUMLV r7BYANU4pw6uUhOGm/LYGIftOU/Az+M3oXX11N0kNhYwxiMWhooCla0ZS1uiDTygfchQ V6yBg3u0VvrpzaGXd9w5GIzY4gIApeywHtcKjQGk8KKsI6nuIznPD6ZklIevPJenHzjF dtHUkiCh0lPdSQUBgm+M4PkMqVHzbH1WFEcTRF4CEnHhcpZuWvK5P8mYL4lNj5Z0vy3w ag== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uh4pw8n01-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:07:36 +0000 Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ALLrw9W029168; Tue, 21 Nov 2023 22:07:35 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uh4pw8mwk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:07:35 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3ALLnQTH022903; Tue, 21 Nov 2023 22:02:42 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3uf7kt402m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:02:42 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3ALM2dYD27197992 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Nov 2023 22:02:39 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2955320067; Tue, 21 Nov 2023 22:02:39 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AB05F20063; Tue, 21 Nov 2023 22:02:37 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.179.23.98]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 21 Nov 2023 22:02:37 +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 v2 19/33] lib/zlib: Unpoison DFLTCC output buffers Date: Tue, 21 Nov 2023 23:01:13 +0100 Message-ID: <20231121220155.1217090-20-iii@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231121220155.1217090-1-iii@linux.ibm.com> References: <20231121220155.1217090-1-iii@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ruTC5AuaPKwZQpHq948qdO8nDc1ULPad X-Proofpoint-ORIG-GUID: JcaizAaJdkvAFfBmibrb_MXa3cUIbOnh Content-Transfer-Encoding: 8bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-21_12,2023-11-21_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 impostorscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 adultscore=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311210172 X-Rspamd-Queue-Id: DFAC7100002 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: qxq5gaus8ci3dygzdg3gkn1sj435ryxn X-HE-Tag: 1700604462-206764 X-HE-Meta: U2FsdGVkX1/wK75AQZti2RN4/LqHuiQCuQpyAoP6QBq51y12+AevkwEtUvkw+Bj1zCq/db/JJM6loBW3mZcggjkP0DlmroL9lNrE67Y9eKvc6h5tXF1JhKJzmW0BHJUJo3db5VXwKQHrkq3V+W+D2W4sCq4WXzBkKxeAPYq8nGCPGfmmHezaYbuZo6v1AGHAl3DKwoOZmc16Fd5QsTl2Dk3aiv7548OUOcB7dUWLnDxbkvyyaklZ2jQZZpsY3nQ7QZTggUT41R/O2mATNp/3j9C/adGjkJ9zo7RkRi73Yv0RGBzdCQzyFgN8jFSGKlOOfIj7OAcnpsAvHyzzFYs5+Mo2ZAP7s+0x3+InRFBOMpsF6Py8PS2+TsfCU5/VzvsdVwUz4O3GvzFtchA5W3YaBoxGHArncnVVz24X1d2iZS0uzk1fy4OfTqx+H2UMr40i1/l24KsSTcB2YGUpJsrriwg1hdW5aT1BgOAJMB9E9a4RyYheLx9+1Ww33S6vIlYVMHx8Yhdo7adf62D+k40gu5m6O0H6GGn0aoDyRPnPXjGRxgivUPwjteQaoHBwGS/115Viuvu5Bl6fPbe5ClzmYI2KcOwlk0UdWJwzHsgVl6J3vwE3wzjKJw3jJMkOI3cQSfEye6xpYp7GYpxApoKvwfXZy2z9lhi4E7shYKbmdQXjz4wrhojWRrZsBXnaTt1eyzsy/+B8AgMm5UmGIMXnc7ylWoG7YSB5odO4HXPD+TnHmW27YSmrG5xPGZYftWq4tqqRLbUjzFTTX5Zdyn66MGZgppat54QRcSD/3S4D5rAE4n3pw/diakbNYx7WTSrqdA8ouZZB1JQ0+C8w7AwrRLtZiorQeXu1S35KeujQymKEF/xTxbAxjn90oADJxIqYDq8GfQuI0NKZ2cq1Dw5O3zPBcsoRrt5V5xpdKCqDRRoTh3RWCw0PiVBAHM2eoO4a6r3kwUInWRiCvqepMHv gofkPqrj gwBSTKjjGGlI7f4LivvDAsKclaQEAJdnLOxTEQGflM4CqxYnCwMLfD9gJSMODurETop3HW69B6qzdt9J9zQ21bMurb8DPlYRMRzQX5xasv0V4kQAz30z3RA/L+JkXUaf6YPcducKzOH58V0o466XqGf2v4WsHxNIgyT6++BTqzahdTOlRifIhzoWBZuj/iburNK/odO6s+uwVa6pzDLYhfa0p4iDmgHatd3k5L0T60pA5KVnQDI89+y03YAK7yQ8ld3467DG03hqzK1k1DlIjlqcFj1mdWIhwjPRiUScrCumOEWGUrkLDYqJyJDsMK4paaTLTQ3ZQChWZbe0= 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 Signed-off-by: Ilya Leoshkevich --- lib/zlib_dfltcc/dfltcc.h | 1 + lib/zlib_dfltcc/dfltcc_util.h | 23 +++++++++++++++++++++++ 2 files changed, 24 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..ce2e039a55b5 100644 --- a/lib/zlib_dfltcc/dfltcc_util.h +++ b/lib/zlib_dfltcc/dfltcc_util.h @@ -2,6 +2,7 @@ #ifndef DFLTCC_UTIL_H #define DFLTCC_UTIL_H +#include "dfltcc.h" #include /* @@ -20,6 +21,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 +36,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 +62,26 @@ static inline dfltcc_cc dfltcc( : "cc", "memory"); t2 = r2; t3 = r3; t4 = r4; t5 = r5; + 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) -- 2.41.0