From patchwork Tue Nov 21 22:01:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13463627 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 87DD5C61D97 for ; Tue, 21 Nov 2023 22:02:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 163756B04CE; Tue, 21 Nov 2023 17:02:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DE096B04D2; Tue, 21 Nov 2023 17:02:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E4BEB6B04D0; Tue, 21 Nov 2023 17:02:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D2A056B04CE for ; Tue, 21 Nov 2023 17:02:48 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 329DA120C5A for ; Tue, 21 Nov 2023 22:02:48 +0000 (UTC) X-FDA: 81483336816.16.258C189 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf16.hostedemail.com (Postfix) with ESMTP id 76ABE180029 for ; Tue, 21 Nov 2023 22:02:45 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=KOLMzVoP; spf=pass (imf16.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 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=1700604165; 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=QnHpD2/5G8nBf7RYxex7ZCPkjJMh3IfDIUDgzy28hLk=; b=DPJUIYXC6lVz/7x5/Dx9TsG6v8rtAX5CGOVO/XNQl4JiGIa7EPKvLLKrL00+ZtP76Z8ObH KauCFWvxOMKLFzs4FkQdrjsFfWFk5KLoaLo/KsTZshjHrrUVogGQu0+EIHtaZADEv3aTP0 aJmbb6pI6J5ycQHAbihthNQfhezs1Ek= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700604165; a=rsa-sha256; cv=none; b=MQkNHSz0G0D2SqfP2T0dH4wfMAsF9AwGtgbzD9P/5bXeWdqDdWEvZN5jbVG2zl/TNnmK0U mIMwq/n5LSYpZTJHFNW74ZIRpGnCBk5AmPxlADBKhhn8SSIHZpAWstaEt7txH29lIGA8ue hizSu+aEM+cWhyObSwCyHnvWInU2vCY= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=KOLMzVoP; spf=pass (imf16.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=iii@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com Received: from pps.filterd (m0353726.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ALL79FR001860; Tue, 21 Nov 2023 22:02:37 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=QnHpD2/5G8nBf7RYxex7ZCPkjJMh3IfDIUDgzy28hLk=; b=KOLMzVoPdxMpKE/B5PsK8VLy9LhPrARqMDSbblL3jQMXMy2j/yM7yZ9rFSsPwE+IJ0oS joYURlN4eIuAVEThUDhbChMbf4/5JLTL5kCghwaFOyI8b49qr8288xWLh8NGmqPPj9Sm D52A7r0KRp1xBs+YmABGPOjLHcBbXTiKbjlsFuhl3XXozpMvTVY2KYEs5tKl906dSbhk rlcgp2RQBtCEvtIr4wJQfTCeGy/kZadzn7cKtTLZKhCfoeHxFHn6WEpQ2laeIGvXAt6c gZckQOQZdSzwZ10tFvtw3DQOm6VVGSS4QBMIfVo9yO4qKba59zv5uvJXIq2vvhIDYP7P yw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uh46a1a4y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:02:36 +0000 Received: from m0353726.ppops.net (m0353726.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ALLgHKi029220; Tue, 21 Nov 2023 22:02:36 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uh46a1a42-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:02:36 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3ALLnSZD004663; Tue, 21 Nov 2023 22:02:34 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uf7yykvh6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:02:34 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3ALM2V2l14942770 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Nov 2023 22:02:31 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8906F20065; Tue, 21 Nov 2023 22:02:31 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 21D2C2005A; Tue, 21 Nov 2023 22:02:30 +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:30 +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 15/33] kmsan: Use ALIGN_DOWN() in kmsan_get_metadata() Date: Tue, 21 Nov 2023 23:01:09 +0100 Message-ID: <20231121220155.1217090-16-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> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 2TCo5LFGLjvBe_FNuSOp8ISqSS6rfXb4 X-Proofpoint-GUID: PizVCBmrtyUfaXPpBjtJCvjSHdm3Jo8r 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 lowpriorityscore=0 suspectscore=0 impostorscore=0 phishscore=0 priorityscore=1501 bulkscore=0 adultscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311210172 X-Stat-Signature: ybiu8zbp4p8dc64jd1tgm1op38uiqkgr X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 76ABE180029 X-Rspam-User: X-HE-Tag: 1700604165-550966 X-HE-Meta: U2FsdGVkX1+ARXkisW83n/FVhMpaEer9Zjtmjj29hLjiHRnT86x4Mc4Ctri0BbEBjTqMs2UWMQLm98y0OJkhnJhf6u+hgFcy2BtTVvR2U33DRnFhBco2/YqctVux5+z1j0sqSK9dwb34pkFVTYwZa4OvRgeAa+E24BJGPdGo0vU3uHKrjCNHtLRSavyzEB0ZYsB8ca70jn3PiONymjK9x9oa/2a9/B34Qi45549FgFzd3xWs4zIVxGtLBzh533hC4zcoIEd6baRVIKmuDvvC9iHybcDECl+4xYMqP9TKLG/2oRBFjyngSMji+s3EUC9rH92lTfsSu9c69KNXGYPZ/MpjsmghcR1z16pZNbI5itT+QSdv07sE8fgQ3itlbG3f+s98AbWeOdF1KIMre+7caBj3M/EeqwlB1h0v7sOenJE2Tn4ag6IZCmgOy9vZdmG69+Go/eNckbGTMDiFklwU9X1RA+v6TczPU8NV9K5zrLh5yU/MA6TQYJi1HNiZ+f8judiCGWLO15sfx4gm153pzcnWsMvkADA51FgRmPkKGyybwd50IbYH/rpMHzQg4za9BceI+CPCfeMegaXYG1milQbxQXBzHbC+xJTwatk6bsbJKH+mhrTzIyk6p/8dcwtmrKcXcaSLxL1t9CevmdgJQb2doVWvdYuRa3XJYgomIJSwKuXeBe/Qcq5EaolCqjaiGeCE11hjBkMKfukUlGP3faVry6QN2wyqwVq3TitErA/MpFXl3enbWmcT8CtD/QmDkX4cyWV0PLbZ7+hCxsTe2pi3nCqzakrikOSSu1WtYb+JpNTf9OgJ2pYHafdkB/DXqPeNrFI3WDkkB7Y4AzJG61wABxNEWH7bLOXEG/mpsy9c6lscQ7mUGCJ5dSHOHHr/CX9urMk0Ss2GXNjJcEsG8z6bMUh8WNixfQf3kqzfNL3YGhjDjrQVFGXsDmp0FD2zmCS5IhNQ5/4+gNsRt4k lDvQBOKt Qs3eR/7rNOUjuIFCr594K9hjztvqRamxqga5k9fNss2yuCOgmG7xT4JH/oW/4a9Yyh0fjgfKcQIJYZNQVE6RSwePd21dkzgQtqImbLlXiF7B9ui5tKxVRejgKypEjOjNMhwJgpbC43is8e0Scbf6oFAfJh9hy1uJSLZJpn78tGNspk3CKouolQon96eclYaIBfMjhjat5C7dc+FqPJjn0UiclWXNuyHgkZP++W+fB0sLj7TTGBmDnXrxYvPBxWPjtlEzwuSMEOyxQ50sXXFL28F5VQUks6EoBgm1a X-Bogosity: Ham, tests=bogofilter, spamicity=0.000006, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Improve the readability by replacing the custom aligning logic with ALIGN_DOWN(). Unlike other places where a similar sequence is used, there is no size parameter that needs to be adjusted, so the standard macro fits. Reviewed-by: Alexander Potapenko Signed-off-by: Ilya Leoshkevich --- mm/kmsan/shadow.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/kmsan/shadow.c b/mm/kmsan/shadow.c index 2d57408c78ae..9c58f081d84f 100644 --- a/mm/kmsan/shadow.c +++ b/mm/kmsan/shadow.c @@ -123,14 +123,12 @@ struct shadow_origin_ptr kmsan_get_shadow_origin_ptr(void *address, u64 size, */ void *kmsan_get_metadata(void *address, bool is_origin) { - u64 addr = (u64)address, pad, off; + u64 addr = (u64)address, off; struct page *page; void *ret; - if (is_origin && !IS_ALIGNED(addr, KMSAN_ORIGIN_SIZE)) { - pad = addr % KMSAN_ORIGIN_SIZE; - addr -= pad; - } + if (is_origin) + addr = ALIGN_DOWN(addr, KMSAN_ORIGIN_SIZE); address = (void *)addr; if (kmsan_internal_is_vmalloc_addr(address) || kmsan_internal_is_module_addr(address))