From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 81A5AD80281 for ; Tue, 20 Feb 2024 17:49:51 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=P9hb8VHxWH1D7y0xtZAHrMyVCzlDc5ejW+VKtkIdoRg=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1708451390; v=1; b=s3J9/EZJy8B4FgzOfjY7zJWL14IUCk8QrN738NcDUTCc5e4eVZdQF7r7QpCTRviymblS4b3L 2GXCruBfkGc9QzpAneqP/CRkjxvtUJb27klIGTIsu0mZt/IaQFyV1doyEix9v374MgM/jJ9PJSJ 6GLKlBHTBo7ELdejN1jHJSCI= X-Received: by 127.0.0.2 with SMTP id VPplYY7687511x83CwjjXyJm; Tue, 20 Feb 2024 09:49:50 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.19690.1708451389401867852 for ; Tue, 20 Feb 2024 09:49:49 -0800 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-62-Hk59eYC5PRuTB_EuA1CtSA-1; Tue, 20 Feb 2024 12:49:44 -0500 X-MC-Unique: Hk59eYC5PRuTB_EuA1CtSA-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3F1BC28210D1; Tue, 20 Feb 2024 17:49:44 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.175]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B87D61C14B12; Tue, 20 Feb 2024 17:49:43 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6E55C18017FE; Tue, 20 Feb 2024 18:49:39 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Oliver Steffen , Laszlo Ersek , Rahul Kumar , Ray Ni , Gerd Hoffmann Subject: [edk2-devel] [PATCH v2 5/5] UefiCpuPkg/MpInitLib: Add support for multiple HOBs to SaveCpuMpData() Date: Tue, 20 Feb 2024 18:49:39 +0100 Message-ID: <20240220174939.1288689-6-kraxel@redhat.com> In-Reply-To: <20240220174939.1288689-1-kraxel@redhat.com> References: <20240220174939.1288689-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: FPkVcOJhWkQ4t2ZtLLfpfiXWx7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b="s3J9/EZJ"; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none) Add support for splitting Hand-Off data into multiple HOBs. This is required for VMs with thousands of CPUs. The actual CPU count per HOB is much smaller (128) for better test coverage. Signed-off-by: Gerd Hoffmann --- UefiCpuPkg/Library/MpInitLib/PeiMpLib.c | 44 +++++++++++++++---------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c index f80e00edcff3..8a916a218016 100644 --- a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c @@ -126,35 +126,45 @@ SaveCpuMpData ( IN CPU_MP_DATA *CpuMpData ) { + UINT32 MaxCpusPerHob, CpusInHob; UINT64 Data64; - UINTN Index; + UINT32 Index, HobBase; CPU_INFO_IN_HOB *CpuInfoInHob; MP_HAND_OFF *MpHandOff; UINTN MpHandOffSize; + MaxCpusPerHob = (MAX_UINT16 - sizeof (EFI_HOB_GUID_TYPE) - sizeof (MP_HAND_OFF)) / sizeof (PROCESSOR_HAND_OFF); + // // When APs are in a state that can be waken up by a store operation to a memory address, // report the MP_HAND_OFF data for DXE to use. // - CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob; - MpHandOffSize = sizeof (MP_HAND_OFF) + sizeof (PROCESSOR_HAND_OFF) * CpuMpData->CpuCount; - MpHandOff = (MP_HAND_OFF *)BuildGuidHob (&mMpHandOffGuid, MpHandOffSize); - ASSERT (MpHandOff != NULL); - ZeroMem (MpHandOff, MpHandOffSize); - MpHandOff->ProcessorIndex = 0; + CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob; - MpHandOff->CpuCount = CpuMpData->CpuCount; - if (CpuMpData->ApLoopMode != ApInHltLoop) { - MpHandOff->StartupSignalValue = MP_HAND_OFF_SIGNAL; - MpHandOff->WaitLoopExecutionMode = sizeof (VOID *); - } + for (Index = 0; Index < CpuMpData->CpuCount; Index++) { + if (Index % MaxCpusPerHob == 0) { + HobBase = Index; + CpusInHob = MIN (CpuMpData->CpuCount - HobBase, MaxCpusPerHob); - for (Index = 0; Index < MpHandOff->CpuCount; Index++) { - MpHandOff->Info[Index].ApicId = CpuInfoInHob[Index].ApicId; - MpHandOff->Info[Index].Health = CpuInfoInHob[Index].Health; + MpHandOffSize = sizeof (MP_HAND_OFF) + sizeof (PROCESSOR_HAND_OFF) * CpusInHob; + MpHandOff = (MP_HAND_OFF *)BuildGuidHob (&mMpHandOffGuid, MpHandOffSize); + ASSERT (MpHandOff != NULL); + ZeroMem (MpHandOff, MpHandOffSize); + + MpHandOff->ProcessorIndex = HobBase; + MpHandOff->CpuCount = CpusInHob; + + if (CpuMpData->ApLoopMode != ApInHltLoop) { + MpHandOff->StartupSignalValue = MP_HAND_OFF_SIGNAL; + MpHandOff->WaitLoopExecutionMode = sizeof (VOID *); + } + } + + MpHandOff->Info[Index-HobBase].ApicId = CpuInfoInHob[Index].ApicId; + MpHandOff->Info[Index-HobBase].Health = CpuInfoInHob[Index].Health; if (CpuMpData->ApLoopMode != ApInHltLoop) { - MpHandOff->Info[Index].StartupSignalAddress = (UINT64)(UINTN)CpuMpData->CpuData[Index].StartupApSignal; - MpHandOff->Info[Index].StartupProcedureAddress = (UINT64)(UINTN)&CpuMpData->CpuData[Index].ApFunction; + MpHandOff->Info[Index-HobBase].StartupSignalAddress = (UINT64)(UINTN)CpuMpData->CpuData[Index].StartupApSignal; + MpHandOff->Info[Index-HobBase].StartupProcedureAddress = (UINT64)(UINTN)&CpuMpData->CpuData[Index].ApFunction; } } -- 2.43.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115670): https://edk2.groups.io/g/devel/message/115670 Mute This Topic: https://groups.io/mt/104472313/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-