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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1B93C10F27 for ; Wed, 11 Mar 2020 14:51:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 231AC2072F for ; Wed, 11 Mar 2020 14:51:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="De/mRK/7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 231AC2072F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC2hQ-0006k6-EK for qemu-devel@archiver.kernel.org; Wed, 11 Mar 2020 10:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50101) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC2gW-00061D-Sj for qemu-devel@nongnu.org; Wed, 11 Mar 2020 10:50:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC2gU-0004ei-4K for qemu-devel@nongnu.org; Wed, 11 Mar 2020 10:50:12 -0400 Received: from mail-mw2nam12on2084.outbound.protection.outlook.com ([40.107.244.84]:33883 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jC2gT-0004dF-OU for qemu-devel@nongnu.org; Wed, 11 Mar 2020 10:50:10 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P7tbcOyy2DOsyEA2B5jkT/vsc52b5f/QeXxfDG557KFQ1RXfO32V90HydD2j0tbeMoQXn5nd/Wjre0y08UfL/oHL498yy4WZUf6fw+2Oq90pdeFysDBK8n9RqcErt9FERC+GEtuuywnF2gt19uj7QQ3hVo7iaIKp+6jaeGVMiNc2eT3HWKlHU+c6lK++Ep6ovVX7mQb02A0NjGY9s9oYrM+cCWe8uGHFlCS7P69YeWgGSEpdJd9ZEiAwlywCaGgNRA0111U2nuChyGZRGhkX1OlH1B1rgejTizkAyD8qih3Zbu+P2DrCpb3OgecLwGXEi5hSvQUHcuhq/aKIcXzfPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xmJmy7pO1VWZRwGZOaf1DxiIvSc9UKd8sWit5wo4j0I=; b=e83XM4OcWZuonyZOj12YtHEDdL4sqHfyQH8FT8Nrpfzq9+7/3JdN1q6a8rkqZNLq0jIrb0EOIXWJ5qmYKEMQAth5yIl3RCfPX/iRbitRi+PrwSOq+UobhBY/ocmNgH2kgJJvNbhB0tcqvm6vmSM699XpeU0Jpz4Q04mXU6CnfnqMDzocq+0A8OeeKVlIfs9THie8SAGdKeaow5FMCwyoQojNZ/SytjmgCs2Xg8seiK5rsJUWQvtgedlo3pO/QQnNe4JEl7CPJ29TxIGfaw2CfpEfrWf8OskfHuz6B0d5lGa1B8O5efDT69PDyvlOvdxsN0PJfbJ7mzS5fYbhnm+1BQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xmJmy7pO1VWZRwGZOaf1DxiIvSc9UKd8sWit5wo4j0I=; b=De/mRK/7VopekFGhRLaEcYFSBhfB/djYnZk5LSXPdpNMTJTS3oFi3dBeNEv/jv9eHHA1OgtjlKaax9NS9wcArwxSjLgxS48pecl34P/l6ruY2xGMHbEDARzGmhqvlo/qs1f31ujLCYvChemqDdIA9zo8OPa5F1BIq1LtOxTdiHI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; Received: from SN1PR12MB2560.namprd12.prod.outlook.com (2603:10b6:802:26::19) by SN1PR12MB2575.namprd12.prod.outlook.com (2603:10b6:802:25::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.14; Wed, 11 Mar 2020 14:50:05 +0000 Received: from SN1PR12MB2560.namprd12.prod.outlook.com ([fe80::382f:640c:215f:be93]) by SN1PR12MB2560.namprd12.prod.outlook.com ([fe80::382f:640c:215f:be93%5]) with mapi id 15.20.2793.013; Wed, 11 Mar 2020 14:50:05 +0000 Subject: Re: [PATCH v6 10/13] i386: Check for apic id encoding To: Igor Mammedov References: <158389385028.22020.7608244627303132902.stgit@naples-babu.amd.com> <158389406581.22020.12203992175835061363.stgit@naples-babu.amd.com> <20200311131712.35ac421b@redhat.com> From: Babu Moger Message-ID: Date: Wed, 11 Mar 2020 09:50:04 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 In-Reply-To: <20200311131712.35ac421b@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: SN1PR12CA0110.namprd12.prod.outlook.com (2603:10b6:802:21::45) To SN1PR12MB2560.namprd12.prod.outlook.com (2603:10b6:802:26::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [10.236.30.87] (165.204.77.1) by SN1PR12CA0110.namprd12.prod.outlook.com (2603:10b6:802:21::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.15 via Frontend Transport; Wed, 11 Mar 2020 14:50:05 +0000 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: be3ebd27-14da-4822-5659-08d7c5cb7c97 X-MS-TrafficTypeDiagnostic: SN1PR12MB2575: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 0339F89554 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(396003)(136003)(39860400002)(376002)(346002)(199004)(52116002)(5660300002)(8936002)(81166006)(31696002)(81156014)(44832011)(66946007)(86362001)(66476007)(66556008)(478600001)(8676002)(36756003)(31686004)(956004)(4326008)(316002)(16576012)(2616005)(2906002)(26005)(53546011)(6486002)(186003)(16526019)(6916009); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB2575; H:SN1PR12MB2560.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: evsoQYNrMYcJEMyqDuVMgx795QvVeEbrZsq8eSL5DEVCe/u0jokQncMBiWH9rM9tJUiT3OpWIikGG/Q0MPb40JDiwfA6oVpE2vRPwRoSz6gVPY8sgA1Nu3ZrA+4f4/BRizmq1lRkBhHcRAvaGHWzoMerFHfOr3h8S2SguwVFRA2FRcBHUsqhcLp02w2XyRez9vqQMAWzrxR9avuAv+Ss42S18lhaQp3rsirSYmJxfXZ2gfTA4himQ+8uspzLYWVoc5BiY3YKnUv9pKgSwMYctriWjrNOjVUlf6UN2QbozrSUAJTE4fthOdUdT9CMOx0I39HPVcikiZcvbfOzZyJLqDLBv48pFwBNiWe7ODwdkzT3B5iE37Im4J0TbTjqDDKdc0M6rYEuyoO6AHoScrHQUBTusMI1vRssqPqIQBucEv9NmOZzoovzdRgBciV4u+7W X-MS-Exchange-AntiSpam-MessageData: KTJ1DvTFqj7uHDplwgvuaoAgEvGkCzQNYx2NDxQNgBmYBcuVu57pRgHXssBYDERyzgSZ/igIkIgPaYE60krMD85REqxsW2vxaHjZVUiWNnyBrGVJydHieFjcYdILwDSXjzh/QAC7BBnYvFyavCkxCQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: be3ebd27-14da-4822-5659-08d7c5cb7c97 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2020 14:50:05.7639 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wF8qYtbzD9kJ6ddtFaZZZFvSD0XYzT4YLU+6c0qC0H+v1KC1I0a4jO5CJmtn0lDX X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2575 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.244.84 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 3/11/20 7:17 AM, Igor Mammedov wrote: > On Tue, 10 Mar 2020 21:34:25 -0500 > Babu Moger wrote: > >> Check X86CPUDefinition if use_epyc_apic_id_encoding is enabled. If enabled >> update X86MachineState with EPYC mode apic_id encoding handlers. >> >> Also update the calling convention to use apic_id handlers from X86MachineState. >> >> Signed-off-by: Babu Moger >> Acked-by: Michael S. Tsirkin > usually tags are not retained in case patch is changed significantly > Ok. > see more below > >> --- >> hw/i386/pc.c | 6 +++--- >> hw/i386/x86.c | 32 +++++++++++++++++++++++++++----- >> target/i386/cpu.c | 11 +++++++++++ >> target/i386/cpu.h | 1 + >> 4 files changed, 42 insertions(+), 8 deletions(-) >> >> diff --git a/hw/i386/pc.c b/hw/i386/pc.c >> index 98ee763f68..2d7d611184 100644 >> --- a/hw/i386/pc.c >> +++ b/hw/i386/pc.c >> @@ -1580,14 +1580,14 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, >> topo_ids.die_id = cpu->die_id; >> topo_ids.core_id = cpu->core_id; >> topo_ids.smt_id = cpu->thread_id; >> - cpu->apic_id = x86_apicid_from_topo_ids(&topo_info, &topo_ids); >> + cpu->apic_id = x86ms->apicid_from_topo_ids(&topo_info, &topo_ids); >> } >> >> cpu_slot = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx); >> if (!cpu_slot) { >> MachineState *ms = MACHINE(pcms); >> >> - x86_topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids); >> + x86ms->topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids); >> error_setg(errp, >> "Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with" >> " APIC ID %" PRIu32 ", valid index range 0:%d", >> @@ -1608,7 +1608,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, >> /* TODO: move socket_id/core_id/thread_id checks into x86_cpu_realizefn() >> * once -smp refactoring is complete and there will be CPU private >> * CPUState::nr_cores and CPUState::nr_threads fields instead of globals */ >> - x86_topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids); >> + x86ms->topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids); >> if (cpu->socket_id != -1 && cpu->socket_id != topo_ids.pkg_id) { >> error_setg(errp, "property socket-id: %u doesn't match set apic-id:" >> " 0x%x (socket-id: %u)", cpu->socket_id, cpu->apic_id, >> diff --git a/hw/i386/x86.c b/hw/i386/x86.c >> index 7dc237c014..ad85347142 100644 >> --- a/hw/i386/x86.c >> +++ b/hw/i386/x86.c >> @@ -68,6 +68,25 @@ inline void init_topo_info(X86CPUTopoInfo *topo_info, >> topo_info->threads_per_core = ms->smp.threads; >> } >> >> +/* >> + * Check for APIC ID encoding >> + * >> + * AMD uses different apic id encoding for their EPYC based cpus. >> + * Check if we need to use different handlers than the default. > comment is not valid, cpu_x86_use_epyc_apic_id_encoding() does the checking > but this function actually overrides it. > > it would be better to name it properly and amend comment, something like > > if (cpu_x86_use_epyc_apic_id_encoding(machine->cpu_type)) { > set_epyc_topo_handlers() > } Ok. Will fix it. I will move the assignment to new function set_epyc_topo_handlers() and fix the comment. > >> + */ >> +static void x86_check_apic_id_encoding(MachineState *machine) >> +{ >> + X86MachineState *x86ms = X86_MACHINE(machine); >> + >> + if (cpu_x86_use_epyc_apic_id_encoding(machine->cpu_type)) { >> + x86ms->apicid_from_cpu_idx = x86_apicid_from_cpu_idx_epyc; >> + x86ms->topo_ids_from_apicid = x86_topo_ids_from_apicid_epyc; >> + x86ms->topo_ids_from_idx = x86_topo_ids_from_idx_epyc; >> + x86ms->apicid_from_topo_ids = x86_apicid_from_topo_ids_epyc; >> + x86ms->apicid_pkg_offset = apicid_pkg_offset_epyc; >> + } >> +} >> + >> /* >> * Calculates initial APIC ID for a specific CPU index >> * >> @@ -86,7 +105,7 @@ uint32_t x86_cpu_apic_id_from_index(X86MachineState *x86ms, >> >> init_topo_info(&topo_info, x86ms); >> >> - correct_id = x86_apicid_from_cpu_idx(&topo_info, cpu_index); >> + correct_id = x86ms->apicid_from_cpu_idx(&topo_info, cpu_index); >> if (x86mc->compat_apic_id_mode) { >> if (cpu_index != correct_id && !warned && !qtest_enabled()) { >> error_report("APIC IDs set in compatibility mode, " >> @@ -158,8 +177,8 @@ int64_t x86_get_default_cpu_node_id(const MachineState *ms, int idx) >> init_topo_info(&topo_info, x86ms); >> >> assert(idx < ms->possible_cpus->len); >> - x86_topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id, >> - &topo_info, &topo_ids); >> + x86ms->topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id, >> + &topo_info, &topo_ids); >> return topo_ids.pkg_id % ms->numa_state->num_nodes; >> } >> >> @@ -179,6 +198,9 @@ const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms) >> return ms->possible_cpus; >> } >> >> + /* Check for apicid encoding */ >> + x86_check_apic_id_encoding(ms); > > that might crash if user used legacy -numa node,cpus= option > option parser would call reach here before machine->cpu_type is set > > it's better to put this call into x86_cpus_init() like it was done > in previous versions I have tested with legacy -numa option. It works fine. I can remove this call from here but I need to call the function x86_topo_ids_from_apicid(or x86_topo_ids_from_idx) directly. I cannot use the callback here(because x86_cpus_init has not happened at this point). Is that fine? > >> ms->possible_cpus = g_malloc0(sizeof(CPUArchIdList) + >> sizeof(CPUArchId) * max_cpus); >> ms->possible_cpus->len = max_cpus; >> @@ -192,8 +214,8 @@ const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms) >> ms->possible_cpus->cpus[i].vcpus_count = 1; >> ms->possible_cpus->cpus[i].arch_id = >> x86_cpu_apic_id_from_index(x86ms, i); >> - x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id, >> - &topo_info, &topo_ids); >> + x86ms->topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id, >> + &topo_info, &topo_ids); >> ms->possible_cpus->cpus[i].props.has_socket_id = true; >> ms->possible_cpus->cpus[i].props.socket_id = topo_ids.pkg_id; >> if (x86ms->smp_dies > 1) { >> diff --git a/target/i386/cpu.c b/target/i386/cpu.c >> index a3051524a2..19de79d01c 100644 >> --- a/target/i386/cpu.c >> +++ b/target/i386/cpu.c >> @@ -1615,6 +1615,10 @@ typedef struct X86CPUDefinition { >> FeatureWordArray features; >> const char *model_id; >> CPUCaches *cache_info; >> + >> + /* Use AMD EPYC encoding for apic id */ >> + bool use_epyc_apic_id_encoding; >> + >> /* >> * Definitions for alternative versions of CPU model. >> * List is terminated by item with version == 0. >> @@ -1656,6 +1660,13 @@ static const X86CPUVersionDefinition *x86_cpu_def_get_versions(X86CPUDefinition >> return def->versions ?: default_version_list; >> } >> >> +bool cpu_x86_use_epyc_apic_id_encoding(const char *cpu_type) >> +{ >> + X86CPUClass *xcc = X86_CPU_CLASS(object_class_by_name(cpu_type)); > > assert(xcc) will add and I need to check for cpudef also. > >> + >> + return xcc->model->cpudef->use_epyc_apic_id_encoding; >> +} >> + >> static CPUCaches epyc_cache_info = { >> .l1d_cache = &(CPUCacheInfo) { >> .type = DATA_CACHE, >> diff --git a/target/i386/cpu.h b/target/i386/cpu.h >> index 7e9e963d78..6e522fcd34 100644 >> --- a/target/i386/cpu.h >> +++ b/target/i386/cpu.h >> @@ -1897,6 +1897,7 @@ void cpu_clear_apic_feature(CPUX86State *env); >> void host_cpuid(uint32_t function, uint32_t count, >> uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); >> void host_vendor_fms(char *vendor, int *family, int *model, int *stepping); >> +bool cpu_x86_use_epyc_apic_id_encoding(const char *cpu_type); >> >> /* helper.c */ >> bool x86_cpu_tlb_fill(CPUState *cs, vaddr address, int size, >> >