From patchwork Fri Nov 4 18:32:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 15745 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp570896wru; Fri, 4 Nov 2022 11:34:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7VLlszB+npa4cHQ//IKalvw4bA6py5WK3xoZjZl7So50fdx7L7ekKGHjtAKlsfe2I0Ny8F X-Received: by 2002:a17:907:2dab:b0:78d:fc4b:7e31 with SMTP id gt43-20020a1709072dab00b0078dfc4b7e31mr34051568ejc.531.1667586842567; Fri, 04 Nov 2022 11:34:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667586842; cv=none; d=google.com; s=arc-20160816; b=BN336MG9Nfj4EaE+QbcdZ8S7C177OT0ujziRQn6sIDlimo0q+1cpXr7tJik3JBhS35 +eF/dyq0nAm5+73+POZ7AmJuUcHFHMF0sZ+RLAVFctY9itD7d4fH3XhkNmaEQLFcgcDz wHTrGVENGDLId60Oe9gFSZ6F0W+yQX78jD6F8dpTKypIA2oYVn/pkfC6POEqwyhUx+Fq BGbFF0rtGmQdEToB3al6HRc3OzjI686MtYgA9xNsR8ddxku1y2jfwckMhrKiCS79f59C 6wtgsDOjuzCotvNuwGXkDMmMsrcWor5KZkiAcV0k1+o9sExI3ZEKhY8fB6LLarMpfQSQ t2kg== 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=XS7y2dqHGNcxgJtQwV0riGq39Rt6nVME96ygRYhND24=; b=Ot4BluCHaK+v8fiMABcc2mggSixRnTsETmEg8BzsCWh0RrGrjzR5TDcRa4qbNOQc26 Ikw8n5epcq56GtkH+I1hGy/cR8tCxYXxoEofhb+GZHtQSor6E+Ffft+cBE5G+vtRkVd1 ZNV+yztkw8oGigGNS/fdcslB8Hpgdb7DEa8sKaAbqyIt4cLkp3O3bqExco0QYEusDGrU EdLZ5YgiyErtN7ZogLcxD3gIwauQ6XQJywaATabq9G9XhK3Jy7UVcPuBtn5PG8eQ5QcA 04r0ejqkbVk6cH0guwlqMRrkHyEq8cApEuqu4NSoclbU65WTXPKUIgrKa2Yv02ZHN5ck KxKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=oN6YQDqk; 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 n26-20020aa7c45a000000b00461aa80dfa8si174334edr.429.2022.11.04.11.33.38; Fri, 04 Nov 2022 11:34:02 -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=oN6YQDqk; 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 S232129AbiKDSc5 (ORCPT + 99 others); Fri, 4 Nov 2022 14:32:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232112AbiKDScy (ORCPT ); Fri, 4 Nov 2022 14:32:54 -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 2E06A40918 for ; Fri, 4 Nov 2022 11:32:54 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id n12-20020a170902e54c00b00188515e81a6so4126621plf.23 for ; Fri, 04 Nov 2022 11:32:54 -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=XS7y2dqHGNcxgJtQwV0riGq39Rt6nVME96ygRYhND24=; b=oN6YQDqk6ql/yuJpP2UHc5AJeq/0ASHaTsGwHNuH0ViA1j3iC6PG06JEXvHvu2Zbm/ Mo8YEDWCn2wPXsZ8oYKUa9/1Nor0gac9QNs/GUXtA+mK7eRoaRSnVehZBrhJSDqPMWjb p73JoT41qN6YwQNuOHWvDEkGb4XNQTaPkaUVY/adqR1MoTAMN2OJ/3xR+yEAPhkF1iaK XmDC09ZwkPcj/dlWtOizwlMnqqe+rVYLgREo5yJpcmOuMdsODCZq2MttWV4wmy7xKFR8 8HFFEUDjIKncdnXQ9XTvZAZHHi7Mmywz351zvd6tXPhK5EO5gNq1Wvr8SXN0wg2poWdg z7gg== 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=XS7y2dqHGNcxgJtQwV0riGq39Rt6nVME96ygRYhND24=; b=SgNyp/n69zwutwAlElIzVirCLUyI10Px2WAeQSNzrh8VUDgSY8/+uDKZUHeLZvyO3q OD5bVnVfVkwOnVgexkIQA66iPl8iuR8mvAHbfn6LX5LOXb1Pt//AtByKXtMhWS67T7Gk N846uoHq56EnrZ1lFkGTRGFMPNY2F6mStBpAuhF0SgFR5awXJkX3BZNz7hJ14HL7u140 OaL1yUxx5V/nt7y69NB9x9k8Z3CaMccfsdpIXDwmxnEjXDJ9QzVJa3EF6vlaMY4jJD/H gjdqrjMcc27x2Ha0Z6vpD8euCTuI6KUFbK8jC0aPiHJYcSVXPkE6xwpPDvbBHQZmsRcQ s9cw== X-Gm-Message-State: ACrzQf1d7hisF9B2XrqV4BzrYw42kFp0t0QX7WDmWcsI+aooVj8cJ1rT 7jwWJwM+3+HE/YKPwpKyoAGhEzjj55w= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:aa7:9527:0:b0:563:b1bc:7f98 with SMTP id c7-20020aa79527000000b00563b1bc7f98mr367586pfp.29.1667586773676; Fri, 04 Nov 2022 11:32:53 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 4 Nov 2022 18:32:45 +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-2-seanjc@google.com> Subject: [PATCH 1/3] x86/kasan: Rename local CPU_ENTRY_AREA variables to shorten names 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?1748591541068478134?= X-GMAIL-MSGID: =?utf-8?q?1748591541068478134?= Rename the CPU entry area variables in kasan_init() to shorten their names, a future fix will reference the beginning of the per-CPU portion of the CPU entry area, and shadow_cpu_entry_per_cpu_begin is a bit much. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/mm/kasan_init_64.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index d1416926ad52..ad7872ae10ed 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -331,7 +331,7 @@ void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid) void __init kasan_init(void) { int i; - void *shadow_cpu_entry_begin, *shadow_cpu_entry_end; + void *shadow_cea_begin, *shadow_cea_end; memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt)); @@ -372,16 +372,16 @@ void __init kasan_init(void) map_range(&pfn_mapped[i]); } - shadow_cpu_entry_begin = (void *)CPU_ENTRY_AREA_BASE; - shadow_cpu_entry_begin = kasan_mem_to_shadow(shadow_cpu_entry_begin); - shadow_cpu_entry_begin = (void *)round_down( - (unsigned long)shadow_cpu_entry_begin, PAGE_SIZE); + 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_cpu_entry_end = (void *)(CPU_ENTRY_AREA_BASE + + shadow_cea_end = (void *)(CPU_ENTRY_AREA_BASE + CPU_ENTRY_AREA_MAP_SIZE); - shadow_cpu_entry_end = kasan_mem_to_shadow(shadow_cpu_entry_end); - shadow_cpu_entry_end = (void *)round_up( - (unsigned long)shadow_cpu_entry_end, PAGE_SIZE); + shadow_cea_end = kasan_mem_to_shadow(shadow_cea_end); + shadow_cea_end = (void *)round_up( + (unsigned long)shadow_cea_end, PAGE_SIZE); kasan_populate_early_shadow( kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM), @@ -403,9 +403,9 @@ void __init kasan_init(void) kasan_populate_early_shadow( kasan_mem_to_shadow((void *)VMALLOC_END + 1), - shadow_cpu_entry_begin); + shadow_cea_begin); - kasan_populate_early_shadow(shadow_cpu_entry_end, + kasan_populate_early_shadow(shadow_cea_end, kasan_mem_to_shadow((void *)__START_KERNEL_map)); kasan_populate_shadow((unsigned long)kasan_mem_to_shadow(_stext), 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), From patchwork Fri Nov 4 18:32:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 15747 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp571135wru; Fri, 4 Nov 2022 11:34:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7qOWWVj3KNYWdUMGItbW/hzZuYj//j2S594X1ngVMczNCuQrfs4xsK6TLgxPLFH/HqPjzr X-Received: by 2002:a17:907:a04c:b0:7ae:2eb5:8bd1 with SMTP id gz12-20020a170907a04c00b007ae2eb58bd1mr5122555ejc.571.1667586867874; Fri, 04 Nov 2022 11:34:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667586867; cv=none; d=google.com; s=arc-20160816; b=TGSkyRZP9cwJEH6qS/0wMQDMAtiTi/vTDeU/mBSO/ybsJvwVJs0senGGJQrGSghrDP Ixlw/CQroXDY37fwYOzLIvHLc4xfEDI5i8B7xp6Ms0bO/kEle3C1pZO3Z6PQOhMl5C2z quiTbhroWg7LcmVy8IOv4oaomMNHebou091ILrYQKNvLBEsnulCT/UBZM1r3Ywfc38vD nzPsjzSFsJsBYSOUs459295Jay/lMwvRjUUnafcHrxqJ8wquLPU8qZoplbVYZ9t+QRVq WhgNHgH8/DS2f8VYa5LAXUONSBb/C6oeo9RsKqDghQKtuvA+4XOCcqfyhTTMPuqXMl7m f5rQ== 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=YYBJ31ou5Rwg5LoGtjJ6FG68fLUfYn1uUGIk9MyRKGY=; b=yZhK6RYYu5lDSke2TAGuvHnGDkswzlGTvXmrW//YhIWqvhOaU5xazYhdn5/wZPWV3G E15rosUhn2GF3TRfefy078l+HRmFlasJ4OhwxKH5mrPLmdY8FhwoiAgREPChx2SL1A+u 3TEuQ0voYSZ5dgnFRkozvt9hikqg1TmxtTfYtZk0fIfz6OZ8FZoLroJdRlRgf4OxDWLJ FqvE8f7bIhsTF4jal92183Aiy4Ns/TEwIfVglD6JUbK0652O7m5oIFM50rE0I7hwmMay qzjShzzKaGcTbbmUhCewAxhN1YB2Kk2jsIqqzu74uZt3mtYg+KNxmrze36mvHAY6cOtq v5Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=lSOSZi+k; 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 ht11-20020a170907608b00b0077fc66b581esi6746074ejc.688.2022.11.04.11.34.04; Fri, 04 Nov 2022 11:34:27 -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=lSOSZi+k; 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 S232127AbiKDSdI (ORCPT + 99 others); Fri, 4 Nov 2022 14:33:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232138AbiKDSdA (ORCPT ); Fri, 4 Nov 2022 14:33:00 -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 DC00440919 for ; Fri, 4 Nov 2022 11:32:57 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id q3-20020a17090311c300b0017898180dddso4120501plh.0 for ; Fri, 04 Nov 2022 11:32:57 -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=YYBJ31ou5Rwg5LoGtjJ6FG68fLUfYn1uUGIk9MyRKGY=; b=lSOSZi+kphdHFzsfDzuxPltgdYT52XM9vY5sOjBzYtVo0p2a1WGY/nTF11dzy8Qbx8 ez1v5pmtsDrjYrir1duKzoEcT0qcI0g4kWaXGKHs4w1r3UM3X3tUgQ8qOZioUqbgqyeb 7RrYIa7XhuH5JbZ1TLX3yoZ5EQafu4N/7G108aQOf3w0N6ZtRs6rsuQxxcbzzUyV4ANi k6JFOVVConNg+UlCWbyXqapxwbpAty/FwQEd6zOf5bWeiAad6+ZqYsyIYEaa4vkYu6hX Baa0w3EULQ5pVyq6f0u6UOAP+cI3sAwFz9DtPeHjV3OyccRoR8qPsYvul2C9eMIqzZvr Sopw== 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=YYBJ31ou5Rwg5LoGtjJ6FG68fLUfYn1uUGIk9MyRKGY=; b=IIQLy2fOzY7/DV6yYfGA1YS1QXo99p3Y0I1dct5Uoeb1YbbJDFqu5CzDJz8nbVteV+ S7OgmAVq3YRD7UuxiKYCNuVKt+ZSU4Esy4cEcLBeNFjDl/WBlqdHXay7ImFz8guzMfId LJCD4P+u1N72i7JSd4CHyI3Ux2vTZkyj8sYK09J1Apz3U5jPJezmV87aJeQkQa8rcnDc 1lyuOPA/mHCCkgNSII+jMrJlS7pCX/tg5C9aA+PxxI9PsqotjZLExN4ScHk6REFZOAsj hd3m/J6WLbKpGmZn8oVLZ5Kb2BJwEkvxMNYqbGhLKRSCKCcOPp5y3F/soTPFGZ62ekdb tr4g== X-Gm-Message-State: ACrzQf1k5EB2PGGJlQc+oXTiJoomp+ihyJhiRE1DKj10jMxwwJPkdIay duoUNMLigzTdrO4YIDcy+9Y048p7x5U= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:2886:b0:565:c4e2:2634 with SMTP id ch6-20020a056a00288600b00565c4e22634mr366477pfb.0.1667586777418; Fri, 04 Nov 2022 11:32:57 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 4 Nov 2022 18:32:47 +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-4-seanjc@google.com> Subject: [PATCH 3/3] x86/kasan: Populate shadow for shared chunk of the CPU entry area 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?1748591567455439151?= X-GMAIL-MSGID: =?utf-8?q?1748591567455439151?= Popuplate the shadow for the shared portion of the CPU entry area, i.e. the read-only IDT mapping, during KASAN initialization. A recent change modified KASAN to map the per-CPU areas on-demand, but forgot to keep a shadow for the common area that is shared amongst all CPUs. Map the common area in KASAN init instead of letting idt_map_in_cea() do the dirty work so that it Just Works in the unlikely event more shared data is shoved into the CPU entry area. The bug manifests as a not-present #PF when software attempts to lookup an IDT entry, e.g. when KVM is handling IRQs on Intel CPUs (KVM performs direct CALL to the IRQ handler to avoid the overhead of INTn): BUG: unable to handle page fault for address: fffffbc0000001d8 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 16c03a067 P4D 16c03a067 PUD 0 Oops: 0000 [#1] PREEMPT SMP KASAN CPU: 5 PID: 901 Comm: repro Tainted: G W 6.1.0-rc3+ #410 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 RIP: 0010:kasan_check_range+0xdf/0x190 vmx_handle_exit_irqoff+0x152/0x290 [kvm_intel] vcpu_run+0x1d89/0x2bd0 [kvm] kvm_arch_vcpu_ioctl_run+0x3ce/0xa70 [kvm] kvm_vcpu_ioctl+0x349/0x900 [kvm] __x64_sys_ioctl+0xb8/0xf0 do_syscall_64+0x2b/0x50 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Fixes: 9fd429c28073 ("x86/kasan: Map shadow for percpu pages on demand") Reported-by: syzbot+8cdd16fd5a6c0565e227@syzkaller.appspotmail.com Cc: Andrey Ryabinin Signed-off-by: Sean Christopherson --- arch/x86/mm/kasan_init_64.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index afc5e129ca7b..0302491d799d 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -341,7 +341,7 @@ void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid) void __init kasan_init(void) { - unsigned long shadow_cea_begin, shadow_cea_end; + unsigned long shadow_cea_begin, shadow_cea_per_cpu_begin, shadow_cea_end; int i; memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt)); @@ -384,6 +384,7 @@ void __init kasan_init(void) } shadow_cea_begin = kasan_mem_to_shadow_align_down(CPU_ENTRY_AREA_BASE); + shadow_cea_per_cpu_begin = kasan_mem_to_shadow_align_up(CPU_ENTRY_AREA_PER_CPU); shadow_cea_end = kasan_mem_to_shadow_align_up(CPU_ENTRY_AREA_BASE + CPU_ENTRY_AREA_MAP_SIZE); @@ -409,6 +410,15 @@ void __init kasan_init(void) kasan_mem_to_shadow((void *)VMALLOC_END + 1), (void *)shadow_cea_begin); + /* + * Populate the shadow for the shared portion of the CPU entry area. + * Shadows for the per-CPU areas are mapped on-demand, as each CPU's + * area is randomly placed somewhere in the 512GiB range and mapping + * the entire 512GiB range is prohibitively expensive. + */ + kasan_populate_shadow(shadow_cea_begin, + shadow_cea_per_cpu_begin, 0); + kasan_populate_early_shadow((void *)shadow_cea_end, kasan_mem_to_shadow((void *)__START_KERNEL_map));