From patchwork Fri Nov 4 18:32:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 15746 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp570911wru; Fri, 4 Nov 2022 11:34:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM659GR+z8oXMIOoKwEP5+MIe+do8I8/hN8Xju/BuUp1MEHYie9dW1qwiF3zq34/eloIVaDU X-Received: by 2002:a17:906:db0c:b0:77b:7d7d:5805 with SMTP id xj12-20020a170906db0c00b0077b7d7d5805mr37069667ejb.726.1667586843876; Fri, 04 Nov 2022 11:34:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667586843; cv=none; d=google.com; s=arc-20160816; b=IcihkJGwwX8f859xYpCSC2piGjTpmiXl8fZYNfvXzi0BboIXD6+7njjjqPUtoEmN/8 fawyBXN753/eFbVvE6z/A5TpOLd2fwQm0V7wr79ughDY7RMUos8Zgzo07aQ1I78H5agN ae8yGtOP8svtyoj/OzeboCBqXXqNvrpgtEATllrUgELSMDWeg/FGZ8C5Y8G5IOdWkSj2 Qn3zGCNqIbiGhwLeK/ukIrzAoKu5wf/xzozJ1sD6KD18v03QCa6dv/TtLGFKAoGxQF9+ 8+Z+PebDiDa5dnBSWHHtL3xE4ObuLTTV/YlOw8IlxuRSTKqP3Dbq9BQ/zVn9No1FdtkE UnSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=NyjCQLTGMZRdycUacwFyAxLckz0Mzvzm9v3NS3Lsp2Q=; b=TyqI2gg7N0qTwaX1Sn7IAg+cfipIBbzUGL/EW8YdNxZVR3MMpVeOeJIo9WYgsWbsVV kzG2QjZtTqH7Ku+dS8lGWWBmOxgv9krKlQJtLTltri0pfIKT8tPyOf956jr19feEp00g eOzt0ZzA2YYCQZQq9UUh1xrr1CNMjvx79iDA/0xWetOdMs7euAiZcC8j4q7rc2doaKNw T2Im0dqESKrENqXjl86MWnUJfh/5XVxFwqhMrcP0scjrO04ikTwKVpaZMICRKGGIfucY +XEoTjo/BGfkxKnx99bXE89KBl7ePitUHOp7hLN7JObbclEMtcWR/5yLWQISI0v2LP5W lGZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=AVNcRZuD; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dt6-20020a170907728600b0078daf101aa1si6473856ejc.813.2022.11.04.11.33.39; Fri, 04 Nov 2022 11:34:03 -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; dkim=pass header.i=@google.com header.s=20210112 header.b=AVNcRZuD; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232142AbiKDSdB (ORCPT + 99 others); Fri, 4 Nov 2022 14:33:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232127AbiKDSc4 (ORCPT ); Fri, 4 Nov 2022 14:32:56 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8F5340471 for ; Fri, 4 Nov 2022 11:32:55 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id u8-20020a17090341c800b0018731b83fe4so4058934ple.16 for ; Fri, 04 Nov 2022 11:32:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=NyjCQLTGMZRdycUacwFyAxLckz0Mzvzm9v3NS3Lsp2Q=; b=AVNcRZuDOXKkWmneCdtvaxaauUn8pnyvuKeXgPpoA7oiOGmi9OxLgYnyUOwCRRGH0K dBh2Xma4Y6oO9Qpgnxutb03h74QM6y3a9XAkRrYXJmzOUURYwqnNKG3gyrT0ihxFkXUT Ddm/MgdwGQ80jg6kUaprBEP+0H85k9a5uTO4ESZJ3QMv9WrjcvA16a07YzdvAb+gWjpJ FjkM0VzCNePqkvGtljKd1aofy2WISvZViliS38XVjz10op33UYWpYXDDiJYIjQONRK+A DhnyIgjNZ3a1RvaF9Surpd+1x+EGiFaw5O0RmRLkVEPx7j+yN6asICDRXmzRI61muClU Tu9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NyjCQLTGMZRdycUacwFyAxLckz0Mzvzm9v3NS3Lsp2Q=; b=01wUey31vaE0ypxsB9xT7ot/53AAL8OyKsplBn62ijlTzak8HraPLfW1P6PM+Ao7dy JSFd8v1x8enUIqEjpdxh4CPbojVDj6O4WeUMCU2bwrQOXA+n2dxvLssWfDAsE9UGIrcG S7VI4NETHjO5nVc8TbGkQt+q9Vo24bEMqNdRCQ6WO6oVNJLWQRbx/AXwsjvNl3mC8SIv f5bLOTtwafUy7TDfsFRrS6zeqr8BO46bq9guIOUWlmKh+lBXHUIxNarG6kYqBt8yAteW q4z0f8dw8Edc8aaVuvxvWWVi4eW5lgQ/sZmFafZZSPpnkQrrTI5TldQTrVkuCvbPsSwI AWVg== X-Gm-Message-State: ACrzQf2gi378uC5sxfczpLPmnkZAlMVDmN5RUohAvK2Hu88cO3krDPEc 1PGsSXvzisl2awefkwuiu9DBlJIGypY= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:79d4:0:b0:561:f3bb:878 with SMTP id u203-20020a6279d4000000b00561f3bb0878mr366882pfc.83.1667586775330; Fri, 04 Nov 2022 11:32:55 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 4 Nov 2022 18:32:46 +0000 In-Reply-To: <20221104183247.834988-1-seanjc@google.com> Mime-Version: 1.0 References: <20221104183247.834988-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Message-ID: <20221104183247.834988-3-seanjc@google.com> Subject: [PATCH 2/3] x86/kasan: Add helpers to align shadow addresses up and down From: Sean Christopherson To: Andrey Ryabinin , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org Cc: Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , "H. Peter Anvin" , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, Sean Christopherson , syzbot+8cdd16fd5a6c0565e227@syzkaller.appspotmail.com X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748591542397921529?= X-GMAIL-MSGID: =?utf-8?q?1748591542397921529?= Add helpers to dedup code for aligning shadow address up/down to page boundaries when translating an address to its shadow. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/mm/kasan_init_64.c | 40 ++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index ad7872ae10ed..afc5e129ca7b 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -316,22 +316,33 @@ void __init kasan_early_init(void) kasan_map_early_shadow(init_top_pgt); } +static unsigned long kasan_mem_to_shadow_align_down(unsigned long va) +{ + unsigned long shadow = (unsigned long)kasan_mem_to_shadow((void *)va); + + return round_down(shadow, PAGE_SIZE); +} + +static unsigned long kasan_mem_to_shadow_align_up(unsigned long va) +{ + unsigned long shadow = (unsigned long)kasan_mem_to_shadow((void *)va); + + return round_up(shadow, PAGE_SIZE); +} + void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid) { unsigned long shadow_start, shadow_end; - shadow_start = (unsigned long)kasan_mem_to_shadow(va); - shadow_start = round_down(shadow_start, PAGE_SIZE); - shadow_end = (unsigned long)kasan_mem_to_shadow(va + size); - shadow_end = round_up(shadow_end, PAGE_SIZE); - + shadow_start = kasan_mem_to_shadow_align_down((unsigned long)va); + shadow_end = kasan_mem_to_shadow_align_up((unsigned long)va + size); kasan_populate_shadow(shadow_start, shadow_end, nid); } void __init kasan_init(void) { + unsigned long shadow_cea_begin, shadow_cea_end; int i; - void *shadow_cea_begin, *shadow_cea_end; memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt)); @@ -372,16 +383,9 @@ void __init kasan_init(void) map_range(&pfn_mapped[i]); } - shadow_cea_begin = (void *)CPU_ENTRY_AREA_BASE; - shadow_cea_begin = kasan_mem_to_shadow(shadow_cea_begin); - shadow_cea_begin = (void *)round_down( - (unsigned long)shadow_cea_begin, PAGE_SIZE); - - shadow_cea_end = (void *)(CPU_ENTRY_AREA_BASE + - CPU_ENTRY_AREA_MAP_SIZE); - shadow_cea_end = kasan_mem_to_shadow(shadow_cea_end); - shadow_cea_end = (void *)round_up( - (unsigned long)shadow_cea_end, PAGE_SIZE); + shadow_cea_begin = kasan_mem_to_shadow_align_down(CPU_ENTRY_AREA_BASE); + shadow_cea_end = kasan_mem_to_shadow_align_up(CPU_ENTRY_AREA_BASE + + CPU_ENTRY_AREA_MAP_SIZE); kasan_populate_early_shadow( kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM), @@ -403,9 +407,9 @@ void __init kasan_init(void) kasan_populate_early_shadow( kasan_mem_to_shadow((void *)VMALLOC_END + 1), - shadow_cea_begin); + (void *)shadow_cea_begin); - kasan_populate_early_shadow(shadow_cea_end, + kasan_populate_early_shadow((void *)shadow_cea_end, kasan_mem_to_shadow((void *)__START_KERNEL_map)); kasan_populate_shadow((unsigned long)kasan_mem_to_shadow(_stext),