From patchwork Wed Nov 15 20:30:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 165574 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2797161vqg; Wed, 15 Nov 2023 12:36:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGlbhNqvEqZj1DR4pn1hqT1Lt0qaWek7CflHksE6U9FzjGUBOjeItaFu5eDZ3Qhkp0Y52Tr X-Received: by 2002:a17:903:32ce:b0:1cc:45d0:470b with SMTP id i14-20020a17090332ce00b001cc45d0470bmr7848506plr.7.1700080607843; Wed, 15 Nov 2023 12:36:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700080607; cv=none; d=google.com; s=arc-20160816; b=iZq3pezRwcEfyO8V4pJjv6SQL5JmfxLlqCW8C5h/2OgYXn2b0rAXxxbQjTUouUDWAY /PxFhXjN6tJBkczRlh54TmUnrRPSpAOgswon/TttiQ9Rd0M/GJWEyU9MTm+J5mygs82I vx+Uw1HqqgIon0YY8VhAxIB0ErLXTNVM7QYBcMbA5xmGE6jcgL0ebL8iHfKa7lsQNMgL 5tQcOw+OPDa7OKjeL8weNGteAl0f7ZXYeN5uI5ppUycM4kkuPJwz1Lnoh0Shn+S4P0Sp qW8upFYhZZ2MBmp91pTes4aGmlcUyuz1ZT6eTpfkooETAfmpDl+hnXc0+XC5xqlfw0Tj Qv/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O6Uyqo5OPYXf2k9vHa7gqaU9xWAA3SvhZTKyHesodmk=; fh=Mk/+hh3KXEiY642GJit3QcoQ60j/OUZTCvigu+jTRuo=; b=AJ1I1lOBquFphTDaG/OoWKJcLFixOa0nPaUel2OByGrKtPBo9dnWi4D/HNXQ/Dgn2M y8hQrNk5GBsnihxzGvrHCSVTLifIAYm9XK6IcZY2wVUs6SRc0I251LVsLrQx1gXCrHIR zlLauFE84pnKgaGZ6fCxdTVMa0Xi54py2Ut+vcNVMfmt26GVitmAMAM5RPCMF2qlWVcJ 2z36Oi9uiPgy+fZCVRuJlWcNh5XWyBtJCoLzLVYGr5BYHY0TXfLWzL5VDkjWb9Qq4NPT UZB+nu9ExrZNt61zIWGJqD9kqMuS7Ykn6clStWQwfi8v1dvik+rXXpPgUFvKQlbUVjdK ywow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=jt5dURUl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id n4-20020a170902f60400b001bdf6eb05f2si11441326plg.227.2023.11.15.12.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:36:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=jt5dURUl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id E590A80A1360; Wed, 15 Nov 2023 12:36:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344582AbjKOUfi (ORCPT + 29 others); Wed, 15 Nov 2023 15:35:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235697AbjKOUfI (ORCPT ); Wed, 15 Nov 2023 15:35:08 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34C4DD50; Wed, 15 Nov 2023 12:34:52 -0800 (PST) Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AFKFbVM001512; Wed, 15 Nov 2023 20:34: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=O6Uyqo5OPYXf2k9vHa7gqaU9xWAA3SvhZTKyHesodmk=; b=jt5dURUlwWkQrRBRoVPYeq6z72+rEfzcjOLWXJZRvsVV8xEKYJwu4hU46wbyVkPfjRPU on5Ic17WN4lUlv5cBiQewJFcIBAg4iNyF3J6rIp1w5OT04Bu3tKnOiU43WjISUKqiJLK 8M21Z/IXGyk+XiTpo5Y4DF5QmSCw6ynrMMIovBD3a/tw3azOiaArr4rxPolSZt3/rabx r+z9UpVJ48I2pVheuI/bTQR9RnCbizSkeY6IA4+Tq8j/2HP/7zWbQpVBMdHyzaSWwYbn FekhNvBcOkqTdaTgQRyF8LzAwE0kEcknCIRw3FkWuhoJC9Mm8HB5+oe66Qc3blHv/KAW og== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ud4v38ctd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Nov 2023 20:34:37 +0000 Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3AFKFm0q002004; Wed, 15 Nov 2023 20:34:36 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 3ud4v38csu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Nov 2023 20:34:36 +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 3AFKItrV010007; Wed, 15 Nov 2023 20:34:35 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3uakxt2du4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Nov 2023 20:34:35 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3AFKYWoV9241144 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Nov 2023 20:34:32 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 91F1A20043; Wed, 15 Nov 2023 20:34:32 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 422CB20040; Wed, 15 Nov 2023 20:34:31 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.179.9.51]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 15 Nov 2023 20:34:31 +0000 (GMT) From: Ilya Leoshkevich To: Alexander Gordeev , Alexander Potapenko , Andrew Morton , Christoph Lameter , David Rientjes , 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 14/32] kmsan: Use ALIGN_DOWN() in kmsan_get_metadata() Date: Wed, 15 Nov 2023 21:30:46 +0100 Message-ID: <20231115203401.2495875-15-iii@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231115203401.2495875-1-iii@linux.ibm.com> References: <20231115203401.2495875-1-iii@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ZYMSZKqeOhwUhd7n4RP9OakG2PdNo3PF X-Proofpoint-ORIG-GUID: hRzHL7ZhRRkdAISReVgZqtBSn0Ah32ec 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-15_20,2023-11-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 suspectscore=0 impostorscore=0 malwarescore=0 adultscore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311150163 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 15 Nov 2023 12:36:34 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782663723568715651 X-GMAIL-MSGID: 1782663723568715651 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. Signed-off-by: Ilya Leoshkevich Reviewed-by: Alexander Potapenko --- 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))