From patchwork Thu Jun 13 15:34:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13697004 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 93D5BC27C6E for ; Thu, 13 Jun 2024 15:40:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 806676B00B1; Thu, 13 Jun 2024 11:39:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B3DB6B00B2; Thu, 13 Jun 2024 11:39:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62EA56B00B3; Thu, 13 Jun 2024 11:39:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3F1B66B00B1 for ; Thu, 13 Jun 2024 11:39:58 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 00A12C0184 for ; Thu, 13 Jun 2024 15:39:57 +0000 (UTC) X-FDA: 82226276076.09.E8B0C4F Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf27.hostedemail.com (Postfix) with ESMTP id B72F84001C for ; Thu, 13 Jun 2024 15:39:55 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=cWyIHDq1; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf27.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=1718293194; 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=fhyNLk4BgDYNJAsfSc8ftWCxz9OlL/4RiKPE6HJFalY=; b=iYnqRuLg7STuJsq7bNVY3tUiXtzJNjicSyfYaWTfygUW2Kjb7yG2ym5F65KDHvAnUJvfA9 qAs46uo2SWR8nvG+TXMkYiF84+4BJ3Q+BRBNZY3isYPSGIigN0C7HJ80cQc5sqKzhy0bGJ ZB3hAbMiUOD272cMxjSEcWCIcIEMLXM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718293194; a=rsa-sha256; cv=none; b=69il4tEeWHMRsvEmXMbI8/yybG3aaTym/c69wtIiclJMEg/7rBoHtHoczNutK/1nlnoSP7 e44w+W/drA7DSmW2KnOm75lblGnkavUnCSYNND6wXAODxq8eDYXVINZW+tNytpQtD3m+uR Xr0/2bhOnnncHZws2bwrshXrM/TnkYg= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=cWyIHDq1; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf27.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=iii@linux.ibm.com Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45DFRdFr006553; Thu, 13 Jun 2024 15:39:49 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=fhyNLk4BgDYNJ AsfSc8ftWCxz9OlL/4RiKPE6HJFalY=; b=cWyIHDq1RAItpr8T2Zral2xZSc0zm jtsseHWF19RO2x3PrSFtVLi8ZXut+8Dmv3tmY20C8zxzLD+JML9M9wLW2vxdbEsa 50u3Lc7QsgF0q4fMEos0LVe8HD1Ib0l+tc5VPBRPrRx+yTu2XbNpbssvbSksB2Ei 6KlylZq3vo1AcWAlcRtK429x8SS3ue+WWXN+ZRKReTxP0iYS27kJymM6d2F/nquD yOMiy+y8vyEnh+jxqbxM+/2rbS7GzfrdGgo8dNsy9LAIqNO2vqQ3VWY4k4/QGA9P 5XEniWJ85wtYe/bLQZIAPuXhCJes6aI/FD6qqgYy7J6YTSPkltobxKhMw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yqrext122-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:48 +0000 (GMT) Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 45DFbRBs026015; Thu, 13 Jun 2024 15:39:47 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yqrext11v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:47 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 45DF1n5T003878; Thu, 13 Jun 2024 15:39:46 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3yn2mq9174-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:46 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45DFdegR28836448 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Jun 2024 15:39:42 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0DD092006A; Thu, 13 Jun 2024 15:39:40 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8F70720065; Thu, 13 Jun 2024 15:39:39 +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:39 +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 13/35] kmsan: Use ALIGN_DOWN() in kmsan_get_metadata() Date: Thu, 13 Jun 2024 17:34:15 +0200 Message-ID: <20240613153924.961511-14-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> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: VR4XIXc8lKCWS8yjNDEOiQ51qu6t9VNR X-Proofpoint-ORIG-GUID: k0noGJyAWC71kZXWZHDEVVjEwOhT6Aub 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_09,2024-06-13_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 adultscore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 spamscore=0 mlxscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2406130112 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: B72F84001C X-Stat-Signature: pdwtgtrae7cmsgpg45cszckof915td3s X-Rspam-User: X-HE-Tag: 1718293195-408685 X-HE-Meta: U2FsdGVkX191nUSU3+LP4kxaoNvJDsBHMPJ7DeN3cdVND5/2MytYzs8Cg7/VEVPubwa96QuwYa+B+s8Pv/+A7CdP4zg21Pcig8tyWAD1Z8HVy4mymkbAwLzKctZMSfScwylBxwFsKxz2pmlkqNd+rJJblZRmOAlRhQaP66kpnVN4aRNInwP1ktFrh+YTtVIbI8RiwnClJTnAavTmBGWgH58C04qsdb000ZPGtPyPAPjQZIBVAP3LVhiuwoB9jdWS5+nOktg0eBPlH/y8opHQr7HGYQY8rARegcPf22cfF/soWfFUzw/7SKS69Ur2zUcA1m81cz5jgG2mlhlnnVHDry47b9s275Ti/YoRZI6r/OaeUqCa8WrHQ6tFLU1E6OXkDQpI4o4anWqM27MBigmkkE/BDWDkya8HwcL/rOsuogRxmT6Y1DzMGtk8jPWQR2bF4ukdgcZuQdWCn55Q2hSV5tnqvwDtsA27c7QHl5/+sOEfM0X1a8fJHJF9IJhygnO7mpW1u1a/Q0prPkPp8rGC2PwBjkzoUwXW7YgAj9mMT0xHTCsURI3eTLEBAl1gMG2XHLMt349Aw8LcBs/82xEZFGlubzIlcgBdIeNs3DWqtSmBYQY36EmIfPyVpk2cutVyXJdi/GsYmbLZmWGu+2epRCI1blp5CxWzrwE7N4XjWSRuYzlbZRFK9r3lcBfkwnS8+388Fi4COOXuS+4MDO/jbJgYlHdWrtQkQlnPqeuO6DPpKvqzRhqtTirRdTgix6cRnDyJ6j0z/Y16QAVXkcnhT2KMovnuk9czpKOKye+qD1JkY0Km2++ZQUr8tEDr8bWYWL+3C9gY97FSbVz9dbMkXRBjDvUwTUzNjD/GyTqwcaxUbIU1oLA+EF6CkukZYYZE+nfs+GF+eDptsmYc7Zq9g3bOC4DciHQKQzwXd3V8c3eIArM078Kq23S9IRugwGK0KTyLJi7KkhAgTD6BxkL D70m9zDh eG5p+i21gs9C+DFunhnRKxAcFNy60TddRFhwsePytCuFbsjxcMIl8sM9AFw3WjkqFCNUFXasXZR89X1zwnH7RvwRz1fkEO8iD9kv9JD3VpTk/klAFt6He25FsXq4wQRTG2A43L3YswVOe8DqDxOOb27WnirbyOyR0TuVt+R8DHiMQej+N68anzyjhqfL7kUiJjBp8LnyqTxAev81i1AdjhKXuUOeoECqn9AXkBXcslw/9Y/oqCyFqg7Vgmtv+zl5LTFXz/Y/P4mMJojB5/uAFRuM1+f3bzJqbllGr X-Bogosity: Ham, tests=bogofilter, spamicity=0.000010, 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))