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;
Date:   Thu, 17 Sep 2020 11:20:53 -0500
From:   Yazen Ghannam <yazen.ghannam@amd.com>
To:     Borislav Petkov <bp@alien8.de>
Cc:     linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org,
        tony.luck@intel.com, x86@kernel.org,
        Smita.KoralahalliChannabasappa@amd.com
Subject: Re: [PATCH v2 1/8] x86/CPU/AMD: Save NodeId on AMD-based systems
Message-ID: <20200917162053.GA234735@yaz-nikka.amd.com>
References: <20200903200144.310991-1-Yazen.Ghannam@amd.com>
 <20200903200144.310991-2-Yazen.Ghannam@amd.com>
 <20200909180647.GF12237@zn.tnic>
 <20200909201755.GB3014671@yaz-nikka.amd.com>
 <20200910101443.GC8357@zn.tnic>
 <20200914192039.GA39519@yaz-nikka.amd.com>
 <20200915083259.GC14436@zn.tnic>
 <20200916195152.GA3042858@yaz-nikka.amd.com>
 <20200917103720.GG31960@zn.tnic>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200917103720.GG31960@zn.tnic>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from yaz-nikka.amd.com (165.204.78.2) by DM6PR17CA0021.namprd17.prod.outlook.com (2603:10b6:5:1b3::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.11 via Frontend Transport; Thu, 17 Sep 2020 16:21:04 +0000
X-Originating-IP: [165.204.78.2]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: baad19e9-2555-4bc1-96fa-08d85b25ad57
X-MS-TrafficTypeDiagnostic: BN6PR1201MB0212:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BN6PR1201MB0212EFC0787A8C03A14FD121F83E0@BN6PR1201MB0212.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:9508;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: NqUW+1Co+qlIqboa5jL5kmwnOxWcPOYLsMEyqzdTf+dd+uuSwtDkesFvYHA3yS+GP7sA9uUKe2fxJXgEz36O64tc2cmFlerkvPseR6Gk9zkRNkIuvBuJi3B+aKpLRR8gTuwHVtKPzFAZOL9hTqD+lj+t50x6J1laH0Yfx6JmYW+uWKo8aqbz/kYiKfuMQpQ8j4skOEtri434CQdWpaQoqEKVb/ZYwYaTrxkv900WpmP0yNzn1X3LPyoeRaU00zaaLkm+QrYJw7ymwXzEyIJgFNGzJxFk+JcrzfUM3ai44JvjKWlFI2Zfu6OLm5zTVuVJeeKbmuDCS46Gs7rJapVoxQ==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN8PR12MB3108.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(39860400002)(346002)(366004)(396003)(376002)(44832011)(5660300002)(1076003)(2906002)(33656002)(956004)(316002)(6666004)(26005)(478600001)(55016002)(16526019)(186003)(83380400001)(66476007)(4326008)(66556008)(8676002)(66946007)(7696005)(86362001)(52116002)(6916009)(8936002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: thBWmLdMuoUi8wGkAVwBuRYT2ixz5jOTQH/S817IlZipmYYi3jDRJyInn/WyXADlgTp1FEKJTlVCHYTvkQwh8A8hYggHIoZO79+PsTTRU9xN9wzVc0QGITe38DFbM5dg0ZFQNCfxQiuPkMnVICAz38yucTyjc9tuTnKj+09CKeHDT3Qe64G5JHyGiumLYPbWps7M7+CkOScvRZfh0rZ5WFlFOZChhxpNp+EEieqnxRdmtai++gF+Z8H3581Kju9zvi6hMW4iGOjoBF9GDNYgFx+wTKv3a5oxmwGCfJGT3NT3wkwjSaRI0jJzjYMEnhBI/h8b9xanQClI9FPq3CQI6QHQWUv8yP3NN/ZjGwOkDw+zolHZC/zdw8t4hL6YBGMNhDxQHwMb94y1iTFGCAS4YKabWsYPBdsFOU7peVb42Zd6ApGw/ctjo4AMjE9Ejok5i1y+XcI72K5e8Jj5a/qTnH8Mdy/86uGQFossaQT3Oeb/tK0Pmd1SpEhhER4jxfzhHckB0WsAiTt8GoGLK/qrrThnJfnmV7O5JJuOXRdNaV6o5zHh/rU77tpWztQGFuMtt/b4LozIkBQHM6SZK2RFIUYbLo224S0wY8Y0NiVKpfcVvKvYCPXFrB4zaKsMvLszs3mIUqPCnwo1QgduwCY7og==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: baad19e9-2555-4bc1-96fa-08d85b25ad57
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3108.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2020 16:21:05.9997
 (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: jFxFj+q02CXn2o+JnrG8SY9JxsIgZ+chMMB5U/Yrq9RJ13NchtTZlikqO/MjH2YoLm97Z2mauoVp1hCO7uLLpQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0212
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Sep 17, 2020 at 12:37:20PM +0200, Borislav Petkov wrote:
> On Wed, Sep 16, 2020 at 02:51:52PM -0500, Yazen Ghannam wrote:
> > What do you think?
> 
> Yeah, forget logical_proc_id - the galactic senate of x86 maintainers
> said that we're keeping that for when BIOS vendors f*ck up with the
> phys_proc_id enumeration on AMD. Then we'll need that as a workaround.
> 
> Look instead at:
> 
> struct cpuinfo_x86 {
> 
> 	...
> 
>         u16                     cpu_die_id;
>         u16                     logical_die_id;
> 
> and
> 
> 7745f03eb395 ("x86/topology: Add CPUID.1F multi-die/package support")
> 
> "Some new systems have multiple software-visible die within each
> package."
> 
> and you could map the AMD packages to those dies. And if you guys
> implement CPUID.1F to enumerate those packages the same way, then all
> should just work (famous last words).
>
> Because Intel dies is basically AMD packages consisting of a CCX, caches
> and DF.
> 
> We would have to update the documentation in the end to denote that but
> let's see if this should work for you too first. Because the concepts
> sound very similar, if not identical...
>

Yep, we could ask the hardware folks to implement CPUID Leaf 0x1F, but
that'll be in some future products. 

I actually tried using cpu_die_id, but I ran into an issue on newer
systems.

On older systems, there is no CPUID Leaf 0xB or 0x1F, and cpu_die_id
doesn't get explicitly set. So setting cpu_die_id equal to AMD NodeId
would work. But newer systems support CPUID Leaf 0xB, so cpu_die_id
will get explicitly set by detect_extended_topology(). The value set is
different from the AMD NodeId. And at that point I shied away from
doing any override or fixup.

Thanks,
Yazen