From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B84AC531DF for ; Tue, 20 Aug 2024 11:57:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 79AB86B0083; Tue, 20 Aug 2024 07:57:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74B1F6B0085; Tue, 20 Aug 2024 07:57:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 612456B0088; Tue, 20 Aug 2024 07:57:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 41D3C6B0083 for ; Tue, 20 Aug 2024 07:57:40 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E4A438185F for ; Tue, 20 Aug 2024 11:57:39 +0000 (UTC) X-FDA: 82472474238.15.E905AE0 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by imf01.hostedemail.com (Postfix) with ESMTP id 33E3940003 for ; Tue, 20 Aug 2024 11:57:37 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=Q3Hw2uYM; dkim=pass header.d=linutronix.de header.s=2020e header.b=NZgfua+t; dmarc=pass (policy=none) header.from=linutronix.de; spf=pass (imf01.hostedemail.com: domain of tglx@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=tglx@linutronix.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724155000; a=rsa-sha256; cv=none; b=nI8H+7iIAD6u2kzVmIwaQ43uCOj3mEADtN4mZ+JgxSlDuUF1q3og3K8SbN4+hvxlDHVtXu rn+gH1MSUIejA0CuRUFijgQZA4BhA97F+8I5zfbH0orPbMLFuScVLpVPwWn9MHVL4+/vlQ 0rsZ5a2qfDggmR5V+E2c1XPNoCFmKkk= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=Q3Hw2uYM; dkim=pass header.d=linutronix.de header.s=2020e header.b=NZgfua+t; dmarc=pass (policy=none) header.from=linutronix.de; spf=pass (imf01.hostedemail.com: domain of tglx@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=tglx@linutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724155000; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pO1a18E6F09njbFdSQ5xNkVGv9dmU6QzgLJ8X2t+ljk=; b=RCyYCvlbfcbebHJWr6T+ZE1dFNRAWbPiclC8iZ1pzC9mSN/shKnhg/nNtaTAcruZiOQ6Gr ZepZwxQSEjt5jttyZToRcTUXLquJcMifZLNqKcfOqwJJQZxgC/Shg5WmNlzYcFgCOIA5bc XVyaF5sCiMyra/A3p6OxNuH9E5T6otI= From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1724155055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pO1a18E6F09njbFdSQ5xNkVGv9dmU6QzgLJ8X2t+ljk=; b=Q3Hw2uYMeYhrLcGo7umkEmm845iQ87d3/HYsen4+E2boc4bKvywZP8YKWR5UmJ/OPCD5Ci wQAcyN8eHx9OUnQ8Ugpb3zTcahEN7MIbVrj1ohRgdKval9c48dYTAASnEks1M69yrAn6Lp aqmwbc0TaeG+LPeWZTlcVxa09bGHEdixz4/iA6ZI1ApEndHxVuJHpFs+yTMUsmpqllC6iW OOEGHWZCaEHs+wYoo+dawxnsKVm/uxA2FWT9XXbaVbZ2SgmkZDDpo2zWYWP7KF1Hu1bbgC XZhRwrBzWbDrW8RtULHgPeCXZtF12ruL3TkdjYcJ9fGiX5WHgREAdUyNaWMR5w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1724155055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pO1a18E6F09njbFdSQ5xNkVGv9dmU6QzgLJ8X2t+ljk=; b=NZgfua+tGqYUXKPAgV3xbQQE9kTLm2JtDPNj0cCDgPzutR2Qk9cFoaXk2h20v7njeDZUnC 0k1aiGbzu2HGFtDA== To: kernel test robot Cc: oe-lkp@lists.linux.dev, lkp@intel.com, linux-kernel@vger.kernel.org, x86@kernel.org, Max Ramanouski , Alistair Popple , Dan Williams , Kees Cook , linux-mm@kvack.org, oliver.sang@intel.com Subject: Re: [tip:x86/urgent] [x86/kaslr] dfb3911c36: kernel_BUG_at_arch/x86/mm/physaddr.c In-Reply-To: <202408201529.498d4d4d-lkp@intel.com> References: <202408201529.498d4d4d-lkp@intel.com> Date: Tue, 20 Aug 2024 13:57:35 +0200 Message-ID: <877ccbl840.ffs@tglx> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 33E3940003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 754hd83ciyzhtbqrwpq1bxpx7jp3163b X-HE-Tag: 1724155057-384182 X-HE-Meta: U2FsdGVkX18px4aUOKnLUpcOaAnHK/QDRJaOm8I6zr7kGuNGmkDHc15kpFJQOgiKqdHFE1SZQO3Lti8HsSV096XhlLNquKD1b3l0YrD7bA1/du/1FJ7FB51HAMtjL8c5jGwBD196ovwjhjOPjdRFZMNcnIDOi6TQHkvNPNLKHXTKZ+ithuWheIvoT+FHdZCplHAu4e1WY28nxOIf3dSV/NyGCVbzpMIpKIwjUsPxPhKaijtKZD1AaLqN0p5eNfdUAG86hxbq6AD2PmupiuVsNWicbYABpOa+Oa/Q11ZWIcixbtBT+h8zvL6MkRyxdLboA9G//y81sWU+e75CuuVv1HIYpYxYAWhxQAMU0uCHotpT7ZVNxpDCDxDetmdDA1JdCAF/mFZZkUuIjoAvHl4n3U/2D7lWDMmP16xfcf0De1ah/P22fwaxKSHE6xUiGhLIWbjkvRr4NxIFPbE9Nsegp6S7Bth+mnweHbNDSG2Z++ec4uNZUthi7qUhJkicTS7M09XEPbtAAgIpf4cNgyhEbGSoQquc2fuh5deokREwxsv9RBWGJ5JYIsS5KwoVoNmY5hsrx1E+SLdMVNMCYhEqMz2pmK7gWN0N1kx4pYGQ9wmMj+sz1Jnf1RxEUWH9WvdYfE41y9vQmNW64xCYpEohqOhbRrGDdlaIPyVHRcr1oZ26246IAeyMIrZTzII8P20XSztc8Pq5Qk7yOhS+tWbfptfOSxESam5gNuvWxofJc/3Q6LTnu6lBVt5bwz0u+pUVmfSbUyVVhDh7AqM6QNX0y1jGLfaW2gFkPe5Umwg6yeRTWfiienVJ2AYHbc6PhNjuuMFvOFNjNlXRnwSv9UuukooCYccCVOsgWoHgd0dstop34jiPj9VGzurdXHPFl/PaaS0ZOPjFne0+tVXnlhL9FUgy5gO9fyHmZfrPeC73mJsRi2unB0Ee7YhTChcGnoGcqGAtKiny6SuZ56iveSO uNEfVfq+ ZaG9RzG3ey4CpM0aLZlgNcxy3gSBpVr9t1I1N4o29mIWGYMDljgRW3STd90DtzYEZNzGfLd5ed3b1CxJoxtsuaIA04qul4LsJd+9ybz4bhfyz1Uxht4q0S6Z1DAghdveMSoU8YBoIwVQoDqK2/EOmX4jPkeNnyIq1VlnvXWMjD+puxQGGU1tCcTZfyQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Tue, Aug 20 2024 at 15:16, kernel test robot wrote: > commit: dfb3911c3692e45b027f13c7dca3230921533953 ("x86/kaslr: Expose and use the end of the physical memory address space") > > [ 0.010309][ T0] ------------[ cut here ]------------ > [ 0.011020][ T0] kernel BUG at arch/x86/mm/physaddr.c:28! > [ 0.026951][ T0] ? __phys_addr (ld-temp.o:?) > [ 0.027298][ T0] ? kernel_randomize_memory (ld-temp.o:?) Sigh. I'm a moron. This obviously needs the fix below. The end of the region is start + size - 1. So there are two bugs: 1) It needs to be done before jumping forward to the next PUD. 2) If the direct map covers the full address space, then __pa(vaddr) is wrong because that's the next PUD already. I'll amend the commit and force push it. Thankfully I did not have time on sunday to send it to Linus :) Thanks, tglx --- diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c index 0f2a3a4a1078..230f1dee4f09 100644 --- a/arch/x86/mm/kaslr.c +++ b/arch/x86/mm/kaslr.c @@ -141,19 +141,19 @@ void __init kernel_randomize_memory(void) vaddr += entropy; *kaslr_regions[i].base = vaddr; - /* - * Jump the region and add a minimum padding based on - * randomization alignment. - */ + /* Calculate the end of the region */ vaddr += get_padding(&kaslr_regions[i]); - vaddr = round_up(vaddr + 1, PUD_SIZE); - /* * KASLR trims the maximum possible size of the * direct-map. Update the physmem_end boundary. + * No rounding required as the region starts + * PUD aligned and size is in units of TB. */ if (kaslr_regions[i].end) - *kaslr_regions[i].end = __pa(vaddr) - 1; + *kaslr_regions[i].end = __pa_nodebug(vaddr - 1); + + /* Add a minimum padding based on randomization alignment. */ + vaddr = round_up(vaddr + 1, PUD_SIZE); remain_entropy -= entropy; } }