From patchwork Thu Jul 27 01:16:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 126581 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp772360vqo; Wed, 26 Jul 2023 18:22:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlFIOMLDFK55RIMZZN2uZl1fFqksiVWI+tLKgOS9vXmB+0qh+rREJ9ZKUUvnbsVODTq+ZZyn X-Received: by 2002:a17:902:f682:b0:1b8:b41e:66b4 with SMTP id l2-20020a170902f68200b001b8b41e66b4mr3720283plg.67.1690420969161; Wed, 26 Jul 2023 18:22:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690420969; cv=none; d=google.com; s=arc-20160816; b=fsqh51gvv1sqDQi5XPcFENUlWdgmZQpTfUUmJ0D7W3n/Y1Ote4Gj9Ehna1TLxBHJlT k6VJjtbQRcJqsSi9pHx5/hJ9oD/VqCv9P/K8FZArZ6Tilh8EbcNvyyAfAahoFu53k35a YwkUZs45fuGWcwmlfg6fgXGWZmJZ0df496loFahyZlmzsW+rPpr/FESgvNHMM/7NVF7v mAnjEIFk5NeiIPVkaQWmlH8hiUmB8EXs8038hrQ8DvXaAGqSfwbSrXiTbWzeKkVqimlS iuQsk4xHlC/gJaxa4SWhr7lgIWR1yIutJawlY/By4LoSdOBf1LwJNtQKii7Ri9OU+ScX +BAA== 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; bh=Qr170MEKVVrnU+3V9UPTmGiI7GCaB3XFhNvWhXebk90=; fh=v9wYe9VT0TbAN61FdyevhEThUjofuva2Dd+9j50U/es=; b=bRmolTnsC3VVqyd+eWkwspSSs1qU5RVt134OjxogW1RYInM+m7DoZugZ47Qc/uMJv5 i6Cmt6suTxbfVK6Wpwq1yr5uF8zMIe99kxH8DAVv8aWYz2txfBIoxMT+xeJdz4o9brSO ZhDH235AlXRQdfIMmm6vHF9DisCt4zCjH5wGPFLkDLpo/RcL5L/rthcl8vSGR7gMwVgt Cv5I4xofkWzlN+HN4jfGfNrUwnzD7IBNifaJb+xaTKsaKWphnaSf2kvQc/jneNAIiElu PfLfrKdLQq9+AX9DlTELzTI8y11tI+QcXUgQX5br3O3FbztEBJJq4byF/kyLlw9hFwWg Fa1Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ka15-20020a170903334f00b001b892a54da5si307576plb.37.2023.07.26.18.22.35; Wed, 26 Jul 2023 18:22:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231296AbjG0BQZ (ORCPT + 99 others); Wed, 26 Jul 2023 21:16:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230072AbjG0BQW (ORCPT ); Wed, 26 Jul 2023 21:16:22 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A168C270D for ; Wed, 26 Jul 2023 18:16:21 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RBCS81PHgzNmcJ; Thu, 27 Jul 2023 09:12:56 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 27 Jul 2023 09:16:18 +0800 From: Peng Zhang To: , CC: , , , , , , , ZhangPeng Subject: [PATCH 1/3] mm: kmsan: use helper function page_size() Date: Thu, 27 Jul 2023 09:16:10 +0800 Message-ID: <20230727011612.2721843-2-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230727011612.2721843-1-zhangpeng362@huawei.com> References: <20230727011612.2721843-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772534858058679050 X-GMAIL-MSGID: 1772534858058679050 From: ZhangPeng Use function page_size() to improve code readability. No functional modification involved. Signed-off-by: ZhangPeng Reviewed-by: Alexander Potapenko --- mm/kmsan/hooks.c | 2 +- mm/kmsan/shadow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c index ec0da72e65aa..4e3c3e60ba97 100644 --- a/mm/kmsan/hooks.c +++ b/mm/kmsan/hooks.c @@ -117,7 +117,7 @@ void kmsan_kfree_large(const void *ptr) page = virt_to_head_page((void *)ptr); KMSAN_WARN_ON(ptr != page_address(page)); kmsan_internal_poison_memory((void *)ptr, - PAGE_SIZE << compound_order(page), + page_size(page), GFP_KERNEL, KMSAN_POISON_CHECK | KMSAN_POISON_FREE); kmsan_leave_runtime(); diff --git a/mm/kmsan/shadow.c b/mm/kmsan/shadow.c index b8bb95eea5e3..c7de991f6d7f 100644 --- a/mm/kmsan/shadow.c +++ b/mm/kmsan/shadow.c @@ -210,7 +210,7 @@ void kmsan_free_page(struct page *page, unsigned int order) return; kmsan_enter_runtime(); kmsan_internal_poison_memory(page_address(page), - PAGE_SIZE << compound_order(page), + page_size(page), GFP_KERNEL, KMSAN_POISON_CHECK | KMSAN_POISON_FREE); kmsan_leave_runtime(); From patchwork Thu Jul 27 01:16:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 126582 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp772400vqo; Wed, 26 Jul 2023 18:22:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlEnUlw14xNj/kR6dWcYy7BbxgYENLeLv4NYvGc3Ppd/+62J/ToXaRxAQIx3EVjfIIzBemJO X-Received: by 2002:a05:6a20:8408:b0:133:96c9:fb3b with SMTP id c8-20020a056a20840800b0013396c9fb3bmr5233756pzd.45.1690420975980; Wed, 26 Jul 2023 18:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690420975; cv=none; d=google.com; s=arc-20160816; b=QqH9rWh1rb2oG5Ngipyh2up2qQlvUO3Wo3PThEbAa4gdkFXNon8NQJgaGSR7cHa3aI 92P00vZ1SLZr8YtGV6swBugxWbbgm3u9JXkQeuF+bxDxDrBx3TGodplkjiG81MdZTEa7 BAYLdaU/O6LkbSfZM4TWlrGu4RnkVC7k8nC3cJ/s64XfkbZ/50RjiezGWc6BQOIjRUC1 CRPgacTI6krnk2kl2M643+zGyqr2ZC0yJ3k9p6H5XdxppdqlsX8SpJonEJBOmMcwqb/0 EqhbPHBjyda7d7WonFrhBw62BK2HU7hlwQMLd3sH8cEBvUwcvhLE3rHpaXlKrM7yx8As H8qA== 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; bh=xYd37JbWctprMIsLniMzviaBXc8Tl5tX0ObDbsc5gGU=; fh=v9wYe9VT0TbAN61FdyevhEThUjofuva2Dd+9j50U/es=; b=SPDRlwoV2HOXQyGVR3RnJhtji5mFdFwwkICDqPNRxPfyB76r5bFOOEOakguecRZJcO L9pL+8iVM9YxuSeWG2e+z88hdxz1mQl/jYVjyuyozVzPF8C4aZzkuS0UptJC2z+o8OKb 5xCsWhkQrCV73bAgGZDelIDtIECRnUFZOb5AI7awBNKzO/ax7IKYxYZb+RtP/GJz8Lpf Uzd/YL97degkA7TN1xoHeyQ+ngt+iCLvvFdguFKol2FnUkJYM0korhIzBttFrPHQVQNs lsGIJCXbQYm6VjDyqSaaws+8ZXZxdBci3VCY7yyP8HpNC1Gz935hLU6VwSnBkcN615PU DbVQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bs5-20020a632805000000b0054ff0049d08si216978pgb.404.2023.07.26.18.22.42; Wed, 26 Jul 2023 18:22:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230072AbjG0BQ2 (ORCPT + 99 others); Wed, 26 Jul 2023 21:16:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230494AbjG0BQW (ORCPT ); Wed, 26 Jul 2023 21:16:22 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2D9E270E for ; Wed, 26 Jul 2023 18:16:21 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RBCVF1DzZzTm6Y; Thu, 27 Jul 2023 09:14:45 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 27 Jul 2023 09:16:19 +0800 From: Peng Zhang To: , CC: , , , , , , , ZhangPeng Subject: [PATCH 2/3] mm: kmsan: use helper macro offset_in_page() Date: Thu, 27 Jul 2023 09:16:11 +0800 Message-ID: <20230727011612.2721843-3-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230727011612.2721843-1-zhangpeng362@huawei.com> References: <20230727011612.2721843-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772534865404841948 X-GMAIL-MSGID: 1772534865404841948 From: ZhangPeng Use helper macro offset_in_page() to improve code readability. No functional modification involved. Signed-off-by: ZhangPeng Reviewed-by: Alexander Potapenko --- mm/kmsan/hooks.c | 2 +- mm/kmsan/shadow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c index 4e3c3e60ba97..5d6e2dee5692 100644 --- a/mm/kmsan/hooks.c +++ b/mm/kmsan/hooks.c @@ -339,7 +339,7 @@ void kmsan_handle_dma(struct page *page, size_t offset, size_t size, * internal KMSAN checks. */ while (size > 0) { - page_offset = addr % PAGE_SIZE; + page_offset = offset_in_page(addr); to_go = min(PAGE_SIZE - page_offset, (u64)size); kmsan_handle_dma_page((void *)addr, to_go, dir); addr += to_go; diff --git a/mm/kmsan/shadow.c b/mm/kmsan/shadow.c index c7de991f6d7f..966994268a01 100644 --- a/mm/kmsan/shadow.c +++ b/mm/kmsan/shadow.c @@ -145,7 +145,7 @@ void *kmsan_get_metadata(void *address, bool is_origin) return NULL; if (!page_has_metadata(page)) return NULL; - off = addr % PAGE_SIZE; + off = offset_in_page(addr); return (is_origin ? origin_ptr_for(page) : shadow_ptr_for(page)) + off; } From patchwork Thu Jul 27 01:16:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 126583 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp772465vqo; Wed, 26 Jul 2023 18:23:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlF/5RHeTnLZRVC4fSTxZFAJKFNIldAXnXZHl9dao3PJ7wm6keVKWzBrM811I1a7oAmwKZ3I X-Received: by 2002:a05:6a20:7490:b0:137:a3c9:aaa2 with SMTP id p16-20020a056a20749000b00137a3c9aaa2mr4274127pzd.30.1690420986853; Wed, 26 Jul 2023 18:23:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690420986; cv=none; d=google.com; s=arc-20160816; b=Ed8DRvDBvA16RBsVdOsx05ekljGeSejjQFbHXpWGO7WEGxGk/Jj3s9FCrDZoxubYTw gp7H5qnhiV8vUNAPYhqOU8ciiLST6jPzF4YcxqVb4g+3UIt6ZJzM5KZiYhO+t+5RAbad K3tfQnCpmMoskNscfVSEBWXBH6ieTQoRA6ZQkrZ4lSEoR+NowBoGkx9BKpWBZoDQZ15V MYWtnmAh7sw3ca1eC/bofKS7vnmhCjbMZ4dVPJIyjalcuoJNJyU0UcVFcEJkH9Jymkj4 qLwgE6/AYG6LwpKieApT4doMu+v6fF2mJOlFAcaRkcuUSJb/warhWwY8kbjDth1SO3VJ yPrA== 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; bh=wdDnXuOYCY6a9cM1iZrK6XAJpPM+qYFvR+jg6Bi7Xzc=; fh=v9wYe9VT0TbAN61FdyevhEThUjofuva2Dd+9j50U/es=; b=zxat1AwRX5LF3dz1tjlfnWR9pxM76BKWCOK7+Dn/IxkSZIjIQ2Vd4o5jmjnY/6f6o2 0NzmgQsraLqsYv/hq0vnSfOTO09x7D/zKTqT/IAnN62NISRrlkhZGiaUNKL8no54wtuG CVGdgXr+s3jslajKzxluqzGlknb6SPtDjjkEH//TMaq0RlysANtSKF1/vZXmMlX1PAIt jvbfMsHx8H/dH2hPAn+0Oo6avr0/flO/983oM9hhf85tSbYaL8UnAMCBbo2iZz6CE7AE XoUExK+APUDjAJIJ5sg0ENbAnnz0ApPYat4MOrL7xiv2swKTttpMHFrEjw70InKgZ5Rv UqcQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k8-20020a056a00168800b0068632b6bc90si373944pfc.114.2023.07.26.18.22.53; Wed, 26 Jul 2023 18:23:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230494AbjG0BQa (ORCPT + 99 others); Wed, 26 Jul 2023 21:16:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231293AbjG0BQX (ORCPT ); Wed, 26 Jul 2023 21:16:23 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12A7C2709 for ; Wed, 26 Jul 2023 18:16:23 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RBCSL0RfCztRjs; Thu, 27 Jul 2023 09:13:06 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 27 Jul 2023 09:16:20 +0800 From: Peng Zhang To: , CC: , , , , , , , ZhangPeng Subject: [PATCH 3/3] mm: kmsan: use helper macros PAGE_ALIGN and PAGE_ALIGN_DOWN Date: Thu, 27 Jul 2023 09:16:12 +0800 Message-ID: <20230727011612.2721843-4-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230727011612.2721843-1-zhangpeng362@huawei.com> References: <20230727011612.2721843-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772534876571633169 X-GMAIL-MSGID: 1772534876571633169 From: ZhangPeng Use helper macros PAGE_ALIGN and PAGE_ALIGN_DOWN to improve code readability. No functional modification involved. Signed-off-by: ZhangPeng Reviewed-by: Alexander Potapenko --- mm/kmsan/shadow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/kmsan/shadow.c b/mm/kmsan/shadow.c index 966994268a01..87318f9170f1 100644 --- a/mm/kmsan/shadow.c +++ b/mm/kmsan/shadow.c @@ -281,8 +281,8 @@ void __init kmsan_init_alloc_meta_for_range(void *start, void *end) struct page *page; u64 size; - start = (void *)ALIGN_DOWN((u64)start, PAGE_SIZE); - size = ALIGN((u64)end - (u64)start, PAGE_SIZE); + start = (void *)PAGE_ALIGN_DOWN((u64)start); + size = PAGE_ALIGN((u64)end - (u64)start); shadow = memblock_alloc(size, PAGE_SIZE); origin = memblock_alloc(size, PAGE_SIZE); for (u64 addr = 0; addr < size; addr += PAGE_SIZE) {