From patchwork Tue Nov 15 21:40:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Sammler X-Patchwork-Id: 20594 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2956207wru; Tue, 15 Nov 2022 13:49:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf62SWmQzKFKv/2h4FZv2UkMz/XtrcttYX7orSg+kISqtXNhYdbGL8zsgGr7wV6NaIlvx6I4 X-Received: by 2002:a17:902:b195:b0:187:3fcb:121e with SMTP id s21-20020a170902b19500b001873fcb121emr6008609plr.100.1668548977492; Tue, 15 Nov 2022 13:49:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668548977; cv=none; d=google.com; s=arc-20160816; b=PoCOxEwJq0qdDXG/bvI4Koz7ywUHrz4znGoT+Rg/cX2TArUUJw2qGXcGv7qG4kKLYS 1x0M0XRrF1NHIIrmyg16xUVrSRsmxxQmU3Umg3DmPtoRWqc2CLtkdvtAqE6z8UPUwNFO ueCBgiu++I0xyJizKWIB50Z1b75EMIjqrDl37gwr0mfldj+7lxM9m1SL9tIvfO/jhdLi H4w/u5VFDVTycvGWmvbyDOr0ko5IL4DLvSoOeWv4CAsGegJ91+axZ3C5M30hS0zsiYeD CPFXM0bwUanzYCgq33PBEgoyPPQDC4fOQP2rGvuQTznMeGvqnATWZNWX3zb8W3a9iwuw 29Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=X2q2jXZbiR4aVk+j4cgzelsOGwbnws5+6EO0kS0q+IE=; b=rlj/3Vt9hGfjolad4rYHVr6aYq/dYlFKQf898hQkff9B+tu7u/cINqjM33/IJ1JOBy 9ewHJQMWIx40/2qXlvExuHn9eiWuHZ0OOh/9hPLKIj4AzvTgIzOop8jrIzsRaciAo1Nt XpnnchXL6nCkLDxwUNXmZzeZB92nlMxA2Ex2v9DiWCdfxIxsZgosMdUrwOHZZ+d3fg8t TLza4R5G00prebZlH/QHTx65z3Ryg8QhY9Yn1ahHO6eFTWZxHPgjJVHH26uX6P0UIglx ybKwPtylozFsacL4dDIacIJurdpEeuananLJls+bPcuhUFKH5wZOtIFIyx/ixusuQAzx Lm4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=bc8gszcc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s18-20020a170902ea1200b0017f75654a27si14446635plg.510.2022.11.15.13.49.23; Tue, 15 Nov 2022 13:49:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=bc8gszcc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232469AbiKOVmZ (ORCPT + 99 others); Tue, 15 Nov 2022 16:42:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230296AbiKOVmA (ORCPT ); Tue, 15 Nov 2022 16:42:00 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B8B332BA9 for ; Tue, 15 Nov 2022 13:41:22 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id y6-20020a25b9c6000000b006c1c6161716so14201732ybj.8 for ; Tue, 15 Nov 2022 13:41:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=X2q2jXZbiR4aVk+j4cgzelsOGwbnws5+6EO0kS0q+IE=; b=bc8gszccDarK7qqwempMPNtbikI8jkIOiq/wh6VybGdCVg6NwG/Nx85IKREmkFRuKU wShAc4YefT81y8pFMR1rxelAe/RRgfpvpPmNlQEZEKpzo+c1M3/C7NJnGgjkinSTAxWr qVKQ3wauGSA/Lewwmgqvq9e006mGZVpXq682GvsurpiaXjeSpHA3QRJTFqPGwKqgTeOm YpeAyY7kri8DeFOmUx37xDNBusgu4XbtjicarUdIsq0DCAcH6Us3YD5wihN/jH4yP30k 7W198pKVPpm5ebcBI9A8BeOfWYWFyoQiE5lu9Q9bZIYmQ82aQhzPy9WzzxM2O19DPRLm ZrRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=X2q2jXZbiR4aVk+j4cgzelsOGwbnws5+6EO0kS0q+IE=; b=W5cQmDNLXypR/5wmplxHaoxmcj5M+zP3kPjOVZJ0esTlIUn5Lj+JCC7VTSYWf7ujJf bj7G3ScbkSi7uD7H0iJrm5vfNc0v1to6sD7BkthqkGdUy/HJqcmExQcWicmDDnY5Iu4m edLcUE6chq6jJou4G8RnGUgtuhb5ys0OswZe0EQhvyj3LXyaIOkUx6pg7YVTyp7hfdFO 8QeP24njtDfqvy5cmDXETutTKQMQmQBVXjwUY68SDPCfYRF66vMrLmHUBxrgPcQ9EHsh hd8NphT9qm82fRPWNlKolZrDhEYL9xAOP1h9UE8xhtUthDwVQL2TbXuMvJgleXbXjvQ/ WUmQ== X-Gm-Message-State: ANoB5pnAb2sMfZsFquZUocqFIQ2lnEraIx6BlCfd8QovKw/g1kyUQAD/ GKytQCHwa1MJ1a2+kprTOoKBWBXo9v2U X-Received: from sammler.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:43cd]) (user=sammler job=sendgmr) by 2002:a25:41d7:0:b0:6cb:8949:fdbb with SMTP id o206-20020a2541d7000000b006cb8949fdbbmr18613201yba.328.1668548481659; Tue, 15 Nov 2022 13:41:21 -0800 (PST) Date: Tue, 15 Nov 2022 21:40:36 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Message-ID: <20221115214036.1571015-1-sammler@google.com> Subject: [PATCH v2] virtio_pmem: populate numa information From: Michael Sammler To: Pankaj Gupta , Dan Williams , Vishal Verma , Dave Jiang , Ira Weiny , Pasha Tatashin , Mina Almasry , nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Michael Sammler , Pankaj Gupta X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749600412740628994?= X-GMAIL-MSGID: =?utf-8?q?1749600412740628994?= Compute the numa information for a virtio_pmem device from the memory range of the device. Previously, the target_node was always 0 since the ndr_desc.target_node field was never explicitly set. The code for computing the numa node is taken from cxl_pmem_region_probe in drivers/cxl/pmem.c. Signed-off-by: Michael Sammler Reviewed-by: Pasha Tatashin Reviewed-by: Pankaj Gupta Tested-by: Mina Almasry --- Changes from v1: - added Reviewed-by and Tested-by - synced with mainline drivers/nvdimm/virtio_pmem.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.38.1.431.g37b22c650d-goog diff --git a/drivers/nvdimm/virtio_pmem.c b/drivers/nvdimm/virtio_pmem.c index 20da455d2ef6..a92eb172f0e7 100644 --- a/drivers/nvdimm/virtio_pmem.c +++ b/drivers/nvdimm/virtio_pmem.c @@ -32,7 +32,6 @@ static int init_vq(struct virtio_pmem *vpmem) static int virtio_pmem_probe(struct virtio_device *vdev) { struct nd_region_desc ndr_desc = {}; - int nid = dev_to_node(&vdev->dev); struct nd_region *nd_region; struct virtio_pmem *vpmem; struct resource res; @@ -79,7 +78,15 @@ static int virtio_pmem_probe(struct virtio_device *vdev) dev_set_drvdata(&vdev->dev, vpmem->nvdimm_bus); ndr_desc.res = &res; - ndr_desc.numa_node = nid; + + ndr_desc.numa_node = memory_add_physaddr_to_nid(res.start); + ndr_desc.target_node = phys_to_target_node(res.start); + if (ndr_desc.target_node == NUMA_NO_NODE) { + ndr_desc.target_node = ndr_desc.numa_node; + dev_dbg(&vdev->dev, "changing target node from %d to %d", + NUMA_NO_NODE, ndr_desc.target_node); + } + ndr_desc.flush = async_pmem_flush; ndr_desc.provider_data = vdev; set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags);