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 33DDFC4332F for ; Wed, 13 Dec 2023 23:36:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0CFD8D0071; Wed, 13 Dec 2023 18:36:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C9FC88D006B; Wed, 13 Dec 2023 18:36:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D5B78D0071; Wed, 13 Dec 2023 18:36:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8725A8D006B for ; Wed, 13 Dec 2023 18:36:52 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 63ED8A1D2F for ; Wed, 13 Dec 2023 23:36:52 +0000 (UTC) X-FDA: 81563407464.04.50AE866 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf09.hostedemail.com (Postfix) with ESMTP id F3B4014002B for ; Wed, 13 Dec 2023 23:36:49 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=sgnQGgAp; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf09.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=1702510610; 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=MKNXtq5ajkWvcQiOoGs4LcPUtQ+3TCO4ZqWbvkFUWVs=; b=ynBL1gsXfllJcExzqMyCkXb06RR0XjmGUn/LcF10ajBmiw9MfFV8bIajCfwgmgC4uUXjZL jhQM4/YJCWOx4nard3JWC/uTfxKrndGEnEBwlRvmvcj4ff2ogajdy/xeG7DKnQvnGHLT5k +afedxgYYUwhycmol0PJ3jGoRcOxhCE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=sgnQGgAp; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf09.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=1702510610; a=rsa-sha256; cv=none; b=GghXkQDV46rOi7B1vCwHUolqcIj6qF+IsDXUnSPYNvB8g7iFeXIedYIciW4QN9C4PuXHB/ I3dT6pFTvihdJeUSwS49mbfDC3JUWhJWfxhuGcThQ95fzPLNQv5+XaEFNgptEBU96XfBvQ rEgtu0dNCGiGnZk3qlfoxZOh/fkPbf8= Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BDMlp9u024703; Wed, 13 Dec 2023 23:36:42 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=MKNXtq5ajkWvcQiOoGs4LcPUtQ+3TCO4ZqWbvkFUWVs=; b=sgnQGgApwtpuxroTLwvxXQZCGez45er18f69eK67E6zjzOgsH5Fag99SunGpcf/5lwEi UZM19s6GsKdADKM9JtOLgo3JStz97isn7/2MJclSec3mxdJIOydW2AqcfcGWgfLOHzpp /2rAq5oLUQt/1NepZJdXkhEm1+eT9QZEsKYqRB3L92iPuFjJUm/0pvMw4EwlVVEwq2Gn R3yNVusaek+/RLSvNIiy6z/EdZUBm0z7ypJ1ifoxd6FJKYEm6EyHRVjaLdgRb3prF7+w fjDaYkn7cOxrY3T2Vt4i3As+hydwiM7KOyM6j9cHNOVNLNNs4JzQSEK9K5zOAx1Vwv+2 3g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uybw52s1h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 23:36:41 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3BDNQLK4030990; Wed, 13 Dec 2023 23:36:40 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 3uybw52s19-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 23:36:40 +0000 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 3BDNQTB3013878; Wed, 13 Dec 2023 23:36:39 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3uw592c4gf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 23:36:39 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3BDNaaJH11797080 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2023 23:36:36 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5FA3720040; Wed, 13 Dec 2023 23:36:36 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EF0802004E; Wed, 13 Dec 2023 23:36:34 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.171.70.156]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 13 Dec 2023 23:36:34 +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 v3 17/34] lib/zlib: Unpoison DFLTCC output buffers Date: Thu, 14 Dec 2023 00:24:37 +0100 Message-ID: <20231213233605.661251-18-iii@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231213233605.661251-1-iii@linux.ibm.com> References: <20231213233605.661251-1-iii@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Um-xt4YHootM37dHUG8hwEcF0DUJln-L X-Proofpoint-ORIG-GUID: -b8YHe7U_CbwRAQmSuApxveyqawrdKVk 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.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_14,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 phishscore=0 spamscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130167 X-Rspamd-Queue-Id: F3B4014002B X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: fdm3qzm9k5oj3e14p1e6hwmirbq8ssdt X-HE-Tag: 1702510609-350875 X-HE-Meta: U2FsdGVkX1+XCoHvRfWp5hrfR0U654Mw8plUK0Fso4h8qKIB21BnamMBBq/lqykJAC6G/oT7CCWtFlMusoVMlYIPv4DpTgD8fvX+AiDdIhLgYhsMK1+HewBRGTnBJk9QbpurykxGJau863DTAoNbVflkxhq8GGG3Zdw/FQX8UlPXUcPnXNzk9FYdmO3ZDFTFJ2umNwHZFdblXYzv6//BXTT4E7Hd9n0lUDirDqJ7MPB5jqi5HEruMsXSx/QaIx6t1pXvFQ7ZC24NM7G9mdeoei+0ppAR0ZY5d4KSYlkQ5CSDrYULpy+Gd/lLSTBlU8vVROCR69OWtUqZJbnLCRHu08LQNCC7geahPwBL3+p6sTTCbqXj2uePMuCyE20B5FmaSHUrhMjeLrmpcBGzHJoECOvzt0pb53Tq7Iqm8ki8VT0RFq2H18PUqRM88ZKbKb3GPKfdftD1bRSOSwscbfy5lltXEtKGOuG6dpkgE41WM7j+JJXvWeVmvA82Ctw9d070UT0iJh6y76yd7nDUgSOZ+6/UTx3FitNhwsc1I7j+7jTrJHqnOsUjuz1pU8P0oe5ExiwMen5AyITThHKCrmheKSkoAvxG/bIt4UWYO9cpgNfsPPJ+l3x6cevfzKccDpL6eHHOKmPwa4HggKfWYrYjhPTgVUR2qBhRTsCLiD1NSPn4/kxmw5zP+FYnP2RSIy++hL6ClTd39AnhclM/6qT7dSoNhTMITyehv3q68RzP8jnmuFUcm3xqfQoyuOchgzgsxLcrG0UxxiWh6X3iM1/OE2BrHcC0MBLvw1PxSNIkFq2iBAvIkDewECJINYmKvivjmO1mNzB78MKn/eMdgM5w5K62L3zZKdBkljtEsAkZF23jqsiY4ndd4vEfTcCMeboNil39m5t4yYZ+mDyYMuy15uFS+PT8W1FTIApOziyQviFAtGbFmz4V5fO7Rib4iPtD7Wl+L+09pVV1WEskFqT R5BvoNpl mBX6AqA7+vrlT+Vi+Rii53FfTDmEH13Hrjj96N4EI0UHWLdN3dkQiD05jJremgRpU143WQ6ouWCr1xjss0GZ51rHgs6TYmdxSXE8FXju/xzjT1SA0x4mx/keTV7n9mIhIEP+NypxzaBJ7ViwovgaeEQIKDP7LZJOtaKRcdnUEHeKA3Z/SxhO4yh2SZqXEY+KUJ//MRfn9g4x/pp0GMD1M0/sb4o7sG1rd/Hvig0H/iTlUBGnCycDznx4c3AF9IqjQDTxy0UuWxt9CBWUA6GqMWOr2EV4mkpyZCoenLw+vZN4xj45TDHlGhLPYwMLceO38cPsris2X/ccKB5s= 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 | 24 ++++++++++++++++++++++++ 2 files changed, 25 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..e481c6ea09b5 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,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.43.0