From nobody Fri May 30 15:57:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87D21drNz5xq8T; Fri, 30 May 2025 15:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87D14RFHz3RVl; Fri, 30 May 2025 15:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PC0GS4zLg/SnjW4pcdXf3JkWlXKz69/D8McXWbfXUGI=; b=Di6uCCM4wlXupPEniliGEzkj7ob9qROSk/KPWfKdkkFJwGkbSfOsu/Cd9e2udZqJCMusEe Qv8TnRHsUM/evBNexp4cLTnolCc/FMwy2Wxrhll7QlyhfKaqNKcT+fdUn7pA8Gvmi7lr/F RJfzZ2/Nm/lb4iLcEKr3ZS7WBtgeKH2J/qL/iPqhvyJRYJn5mbbToas413XtZcgLnavaZn rZd8ArYfFPcbcnHtsgaLRvIPeLKuZQGDRW/lxGlxbjgGqe6fo6VQt1OKeDPgxcJ08ZhNBg nY6AhAJSzFDwru1ZmXPvpyRXoscfRSKgTWsY8plDhrfV1BPxwjmvEmZWFLX1DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620641; a=rsa-sha256; cv=none; b=WFA6BOW8m1wu4h3hVasqFbEWAmwMquQdr0kf2NRGvuB3lGDgBg/m5T7dxnr0vTVwBEIKtG KAL1yMpg4aTdSVtxEre91i4MxoF9nsm+ARfTvOtckK7k6pngLUaFP6+4oJDucshsr80h6m eTjXJ62TizWfsYIGe6X7RWHrWkwAJQ+rBiPfEqjA8tfnwX6cf9CUuWefIL5VzFsHbFr3ao 72I+FANBJeC9WUwM6KMVHGhfeWM0mPKQ+fstOa7Lp6k6lC4f7/FjQwz4gR4ZNkMOEXew8D 5vbY2CLyVnf5A7dJlo5wBrXkbaHFN0hfRDqmOTWG2rPC29G4uoNwHXTxB/B5Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PC0GS4zLg/SnjW4pcdXf3JkWlXKz69/D8McXWbfXUGI=; b=xJ4dA09cU9W2epuPyf4lQ8m/jXiq5+3ASi+iWBC6iZi4VQwedl5apJVtDIuWa6mdsSqd6b OHQAh2RicO2LEV6fe3ul9eCeEKm6klkuuHk0JrodoX18aiAXoK1zNuYZWMYkanNIf68rED dAyUKNbeQp5kjFXC5vu5AreNfZVYLQCPVJjRceVEdTP0s13qIKnsKXPXsM56U56IuGBbnt 5Nct3LFAoPs8TfWTiJ2PGFmsJ4d3KqXbhJwWc1Zg5ScMT6F4VbgHZQ0jGfp26bQ9pq+oja XSPHtUSfk3H44x2QoEze0Hw2AFWBOVXgjMvlIfawqVQgRnQh58bwS+nPV6YRpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87D13v7Nzyyn; Fri, 30 May 2025 15:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54UFvLM4079292; Fri, 30 May 2025 15:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFvLQk079289; Fri, 30 May 2025 15:57:21 GMT (envelope-from git) Date: Fri, 30 May 2025 15:57:21 GMT Message-Id: <202505301557.54UFvLQk079289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 700a2c08dcea - main - stand/efi: Use EFI_PAGE_SIZE here, it's more appropriate List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 700a2c08dceab4dc41859e5c1501ec3b186f6cbd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=700a2c08dceab4dc41859e5c1501ec3b186f6cbd commit 700a2c08dceab4dc41859e5c1501ec3b186f6cbd Author: Warner Losh AuthorDate: 2025-05-30 14:14:15 +0000 Commit: Warner Losh CommitDate: 2025-05-30 15:56:50 +0000 stand/efi: Use EFI_PAGE_SIZE here, it's more appropriate No functional change: We're allocating a page from EFI, which is always 4k on amd64. So, this should always be 4k. PAGE_SIZE usually is this, but might not be in some cases. For the end of the stack pointer in the ist1, it should point the architecture's physical page past where we've allocated. EFI_PAGE_SIZE more faithfully reflects that here since PAGE_SIZE might not be exactly that in the future (if we had a larger logical page than physical page). Since the AllocPage interface is in EFI_PAGE_SIZE pages always, this seems safer. No functional change since they are both 2096 today. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D50584 --- stand/efi/loader/arch/amd64/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c index 95a42a18f719..61feb76e2dca 100644 --- a/stand/efi/loader/arch/amd64/trap.c +++ b/stand/efi/loader/arch/amd64/trap.c @@ -356,7 +356,7 @@ efi_redirect_exceptions(void) PREPARE_EXCEPTION(19); PREPARE_EXCEPTION(20); - exc_rsp = exc_stack_pa + PAGE_SIZE - + exc_rsp = exc_stack_pa + EFI_PAGE_SIZE - (6 /* hw exception frame */ + 3 /* scratch regs */) * 8; /* Find free IST and use it */ @@ -376,7 +376,7 @@ efi_redirect_exceptions(void) if (intercepted[i]) loader_idt_e->gd_ist = ist; } - (&(tss->tss_ist1))[ist - 1] = exc_stack_pa + PAGE_SIZE; + (&(tss->tss_ist1))[ist - 1] = exc_stack_pa + EFI_PAGE_SIZE; /* Switch to new IDT */ rfl = intr_disable();