Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp1475157pxu; Thu, 8 Oct 2020 12:23:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyw7lMjSyOuE36ROJPJ8nxTr2dXaX5Ro+zkNTOMkbj/UpWfKxoJPDeIerIuSe5pbQOAYyJ8 X-Received: by 2002:aa7:cb83:: with SMTP id r3mr10540291edt.35.1602184980695; Thu, 08 Oct 2020 12:23:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602184980; cv=none; d=google.com; s=arc-20160816; b=ORX0oQaSxW17rvP4kjlMtCSkyFD9ryusLD4Wr+NzzzJ33SXxGDX96/eYWXZBYP+3mI 5Wz8uBsrnHrwByO7/W+hBwTuz4hdeCFcUxqsbEWz+SeT2QTVDfagCYALFK0vwrTFekbc 3Tmvi0QkMd8dQbyU7/5sFtdiR4foROXJYAqYMpeLeJDmG61egbilv0x5WWI6+MyfMdNO i2SO/z9FHKRy2hfeKAUuMj5RV88KVmYyQFHrZiU1y1OA0v6oH+iBK7dxVz1RpwLFWwQG 9+GeChi+CvesGRPoQc+Wdmr76z7Inv7GBJoYy8EANMvZbZCohvPtvI4JUXBKBjYqIZ2n 3P+A== 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=BDhp551uHTD1519amMkGglxR3RM4R3VbLmm+cJeHR7g=; b=r7Ggut9ViITyvTg84BSsHEOWuzsKZ3e+GAZbz/cMTNs0/Sj/yst1oIrkTkT+WfjkeG 95GNpzAV2xb/OtT/TONl6neP8BIHDSzfD2KDnlIT6iF4k4vq+jh5tDiCf46ciMY5vNMn 24vO1mkZd1baVyEN5hMoeE8koGTjWhLoyV9HsGw4n40jqxc4L/UOBmIKJiErwlRQwCg5 IZ8KLgMymR5jCrXUePqxVrdFm/lqgJCM6dN0fWglsW3OG6QYwLLNoZnp/qZDmBmAhnGk bkxp4aWDo2g4nwvAM782LMo/I7DEEB1jAQJAVAjW1mCS3wPiZbUaySgozaFMwjGxjMv+ Juvw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w22si4380691edx.548.2020.10.08.12.22.37; Thu, 08 Oct 2020 12:23:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729835AbgJHTQd (ORCPT + 99 others); Thu, 8 Oct 2020 15:16:33 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:37660 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728271AbgJHTQ3 (ORCPT ); Thu, 8 Oct 2020 15:16:29 -0400 Received: by mail-qt1-f193.google.com with SMTP id s47so6070550qth.4 for ; Thu, 08 Oct 2020 12:16:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BDhp551uHTD1519amMkGglxR3RM4R3VbLmm+cJeHR7g=; b=SLcXQR/qPj6jcKDaScRkuFsMzCl6kARRPmdFtPMZ9bmwgw3/ZISMayvC9QCz1nYu3z /srBodHVmMumerI6o0P4ybAws2pSXWce+GbhACbpCaG6JBfB6mHUsSysdbsw4K2FLCM8 a/ByyUwf9Deal6Bh/sDnCbhCvyfMDSvZa98qeKSKRz3750Ks20xp8skmJ6VueUzPzvhm uYMKJcZloIyTVZmUxxKDY/ZD2xitwZ3HUOeYhsUdk7fTxkgxeQpsfD1GGLbHZqAZrKNw zlI0I2z76wZg2OlQ73AFbqksB5hc8GVoXivLWbUDu2W5HLT6Mm7mpQXQoFQBu5iQTCzm YyHQ== X-Gm-Message-State: AOAM531BdR4nwBZNl0BL5fFOHFkBmsDcWlIMv9ZV7TSRt/8HLPv9yked gyJhFLeognYbWjqZyPjoKPTiWti4NiEDVA== X-Received: by 2002:ac8:22a1:: with SMTP id f30mr10253397qta.33.1602184588151; Thu, 08 Oct 2020 12:16:28 -0700 (PDT) Received: from rani.riverdale.lan ([2001:470:1f07:5f3::b55f]) by smtp.gmail.com with ESMTPSA id z37sm4726759qtz.67.2020.10.08.12.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 12:16:27 -0700 (PDT) From: Arvind Sankar To: x86@kernel.org, Joerg Roedel , Borislav Petkov Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] x86/boot/64: Show original faulting address in case of error Date: Thu, 8 Oct 2020 15:16:21 -0400 Message-Id: <20201008191623.2881677-4-nivedita@alum.mit.edu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201008191623.2881677-1-nivedita@alum.mit.edu> References: <20201008191623.2881677-1-nivedita@alum.mit.edu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This makes the #PF handler print the original CR2 value in case of error, instead of after aligning to PMD_SIZE. Signed-off-by: Arvind Sankar --- arch/x86/boot/compressed/ident_map_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/boot/compressed/ident_map_64.c b/arch/x86/boot/compressed/ident_map_64.c index 063a60edcf99..fd957b2625e9 100644 --- a/arch/x86/boot/compressed/ident_map_64.c +++ b/arch/x86/boot/compressed/ident_map_64.c @@ -327,9 +327,6 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code) ghcb_fault = sev_es_check_ghcb_fault(address); - address &= PMD_MASK; - end = address + PMD_SIZE; - /* * Check for unexpected error codes. Unexpected are: * - Faults on present pages @@ -345,5 +342,8 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code) * Error code is sane - now identity map the 2M region around * the faulting address. */ + address &= PMD_MASK; + end = address + PMD_SIZE; + add_identity_map(address, end); } -- 2.26.2