From nobody Sat Apr 4 00:24:37 2026 Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FD2132BF41 for ; Sun, 22 Mar 2026 13:16:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774185409; cv=none; b=hyb6la++3cZOyYQIhBW/qAiMqpJCHdnOPNy3UMwF/jvEuhRzhV/co0CGsvzO0WZbRebVG/lcghkXYw1NTSVupaeWZrnBvu3++qq/lpwAT8+3bo6rB6VI/RxqneIR5C/cMxLLk/12VfDKA62l5PiHT6fvO2RMDIHbep3qCQSCVSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774185409; c=relaxed/simple; bh=am2l4ajVSpFYKAgcYmT0ZaGpPJabmMJU5Ho5aT9U7yE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QQEcUQHWJd+oq9f8c9SorzfUWAob9R5xee3AIgnlOO1m8s2wsuSI6emYQKxqqun8FvE0vKFA72txOnSVyhJb9VTBWuPjWTyF0q2ocPo+07S5eeGmEFh+jHBisew92k+iuUADKFM+NJR+vZ4hTfC5luCAeaAizFxSwuXHX2xXHxk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=UsnR9NDl; arc=none smtp.client-ip=209.85.160.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="UsnR9NDl" Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-50917e02472so25193591cf.2 for ; Sun, 22 Mar 2026 06:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1774185407; x=1774790207; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5j7yKCV7ZUdpMw3XuXoTn7FM0uAcRR3NJGx0Uz7xasI=; b=UsnR9NDlZ0iH+v1SMG9HdCi0s+K7aRH61PE5nvepURxQNZP5FH0pS4KP0lwC7jMt8b 0z3sWTePrUZd4kOfX/r9h51j+YiPlW0n/F3fTjW4QiDnfWkh0Ba0YrcdYuu6zKE8sAG1 mZm/c43XdB0crSnFPS6jqZhrHYOdLLQQbBFRz1A9+jdyumNpl/afWK+s9G2qY1FZ4/BX A6IBDCHCEoWe+aDPN/fMaxnFyPXlGP1/FN0W17KfrMD78mAMWqXSks0WC9CQw0ZW8FO+ DvMp0AAIHCfAWb0AYGe0zrwIiEyriHTdMRuA2jHtYxMnxl7OnYbT0+fsBn+LnRrnVV8e HGDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774185407; x=1774790207; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5j7yKCV7ZUdpMw3XuXoTn7FM0uAcRR3NJGx0Uz7xasI=; b=LdQ0WeoGIGvMMU0wcVsg4T+xwmk6/3zCtIkV24qohuPU5b3YbE1m8DQmxCXd26zCxC /sNms7BHEDQj1GGsPHilOo/XTWFyF/WvQuqScMuVjOcaVCO6L50/9ezc7qj7FeQ7pP4K 7YWoM9KGqEh4fooni7AjT+exWN08fCePjhGoIfFS/HNRKf4hWWFiYyO7TDdrU4MBxk8U XdgXoFL2zNJwybf0ZrNwkSMFpC88eO5CWTNeJGAwL+N3V1uBRZ2Bgx+hQNWOnZ9ILqPQ BmOMBw+4vr5sQpOV7UwhN4vGDShLsQ9pISfQa1xJ/KT1fJVkBnl+nuYRnWKKLpbYqXfh WTjg== X-Gm-Message-State: AOJu0YxOCXUNUKecQlXcRRVQvpZlOFi2AJnci97a739GU5zLmdXKsE0s nTuBEqCKe9X+3r1FHMS7wkh5n8H2M0eStCaw8BBV+LXovM6wNUMcogIeRshMIru4VQA= X-Gm-Gg: ATEYQzyac70z8Q3DIwA/WynWPry2gjJsW6Ueewgy/Y8Dg3r7ZwAq0qW3bsp+u4FrKT+ 1RJDT6RGggZSnTc//o+BPoOwLylYVqqBdmB0tMQoHsGGDjnKo5XhjWKQqXUlTwJnGRP9HA9+9wd ivS/JsIjMUR4ZgfbBfl63yL/J9HahSezmxyNFFnHUIBbn63YvehHyCEOfISHa9LyDawyOGgtDKl ehFrqLiCkFK0fdYEnoO0H5Z7qCmhtJykDcOy5G7p7kezZ+tiE8n5PxQxRilRcE5kyWdDiAKbjhD h9KJzoBt8gbJuG32DQ5PJTgJA4ND9Tpd9hHNbH/yn63qW11Ozt4csOmDcM393cGQmv7GjNmq2mv jXV7Si6GFhTqqM+LoEP52MSGk1L/6tnxdH20NhVhdt0YN7ZtiejXerS9GhxSH0aw6RLoDtYmia9 02N6E9wjAXLdB+IAFnJc5RKwxL2oVgXIaSzrQZX2VCLN2YZXEjlEnRK3hi9eP3YfEz1/0Xr6CVn cZAWgJwT5y66Fw= X-Received: by 2002:a05:622a:8c4:b0:509:2527:d789 with SMTP id d75a77b69052e-50b373bdd66mr151533221cf.6.1774185406713; Sun, 22 Mar 2026 06:16:46 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F.lan (pool-96-255-20-138.washdc.ftas.verizon.net. [96.255.20.138]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50b36e35086sm59688651cf.18.2026.03.22.06.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Mar 2026 06:16:46 -0700 (PDT) From: Gregory Price To: linux-cxl@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, dave@stgolabs.net, jonathan.cameron@huawei.com, dave.jiang@intel.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com Subject: [PATCH v4 2/3] cxl/core/region: move dax region device logic into region_dax.c Date: Sun, 22 Mar 2026 09:16:37 -0400 Message-ID: <20260322131638.3636725-3-gourry@gourry.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260322131638.3636725-1-gourry@gourry.net> References: <20260322131638.3636725-1-gourry@gourry.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" core/region.c is overloaded with per-region control logic (pmem, dax, sysram, etc). Move the CXL DAX region device infrastructure from region.c into a new region_dax.c file. This will also allow us to add additional dax-driver integration paths that don't further dirty the core region.c logic. No functional changes. Signed-off-by: Gregory Price Reviewed-by: Alison Schofield Reviewed-by: Jonathan Cameron --- drivers/cxl/core/Makefile | 1 + drivers/cxl/core/core.h | 1 + drivers/cxl/core/region.c | 99 ------------------------------ drivers/cxl/core/region_dax.c | 109 ++++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+), 99 deletions(-) create mode 100644 drivers/cxl/core/region_dax.c diff --git a/drivers/cxl/core/Makefile b/drivers/cxl/core/Makefile index d1484a0e5eb4..d3ec8aea64c5 100644 --- a/drivers/cxl/core/Makefile +++ b/drivers/cxl/core/Makefile @@ -16,6 +16,7 @@ cxl_core-y +=3D pmu.o cxl_core-y +=3D cdat.o cxl_core-$(CONFIG_TRACING) +=3D trace.o cxl_core-$(CONFIG_CXL_REGION) +=3D region.o +cxl_core-$(CONFIG_CXL_REGION) +=3D region_dax.o cxl_core-$(CONFIG_CXL_REGION) +=3D region_pmem.o cxl_core-$(CONFIG_CXL_MCE) +=3D mce.o cxl_core-$(CONFIG_CXL_FEATURES) +=3D features.o diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index ef03966eeabd..82ca3a476708 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -50,6 +50,7 @@ int cxl_get_poison_by_endpoint(struct cxl_port *port); struct cxl_region *cxl_dpa_to_region(const struct cxl_memdev *cxlmd, u64 d= pa); u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev *cxlmd, u64 dpa); +int devm_cxl_add_dax_region(struct cxl_region *cxlr); int devm_cxl_add_pmem_region(struct cxl_region *cxlr); =20 #else diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 72aee1408efb..6a2ef3475764 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -3436,105 +3436,6 @@ static int region_offset_to_dpa_result(struct cxl_r= egion *cxlr, u64 offset, return -ENXIO; } =20 -static void cxl_dax_region_release(struct device *dev) -{ - struct cxl_dax_region *cxlr_dax =3D to_cxl_dax_region(dev); - - kfree(cxlr_dax); -} - -static const struct attribute_group *cxl_dax_region_attribute_groups[] =3D= { - &cxl_base_attribute_group, - NULL, -}; - -const struct device_type cxl_dax_region_type =3D { - .name =3D "cxl_dax_region", - .release =3D cxl_dax_region_release, - .groups =3D cxl_dax_region_attribute_groups, -}; - -static bool is_cxl_dax_region(struct device *dev) -{ - return dev->type =3D=3D &cxl_dax_region_type; -} - -struct cxl_dax_region *to_cxl_dax_region(struct device *dev) -{ - if (dev_WARN_ONCE(dev, !is_cxl_dax_region(dev), - "not a cxl_dax_region device\n")) - return NULL; - return container_of(dev, struct cxl_dax_region, dev); -} -EXPORT_SYMBOL_NS_GPL(to_cxl_dax_region, "CXL"); - -static struct lock_class_key cxl_dax_region_key; - -static struct cxl_dax_region *cxl_dax_region_alloc(struct cxl_region *cxlr) -{ - struct cxl_region_params *p =3D &cxlr->params; - struct cxl_dax_region *cxlr_dax; - struct device *dev; - - guard(rwsem_read)(&cxl_rwsem.region); - if (p->state !=3D CXL_CONFIG_COMMIT) - return ERR_PTR(-ENXIO); - - cxlr_dax =3D kzalloc_obj(*cxlr_dax); - if (!cxlr_dax) - return ERR_PTR(-ENOMEM); - - cxlr_dax->hpa_range.start =3D p->res->start; - cxlr_dax->hpa_range.end =3D p->res->end; - - dev =3D &cxlr_dax->dev; - cxlr_dax->cxlr =3D cxlr; - device_initialize(dev); - lockdep_set_class(&dev->mutex, &cxl_dax_region_key); - device_set_pm_not_required(dev); - dev->parent =3D &cxlr->dev; - dev->bus =3D &cxl_bus_type; - dev->type =3D &cxl_dax_region_type; - - return cxlr_dax; -} - -static void cxlr_dax_unregister(void *_cxlr_dax) -{ - struct cxl_dax_region *cxlr_dax =3D _cxlr_dax; - - device_unregister(&cxlr_dax->dev); -} - -static int devm_cxl_add_dax_region(struct cxl_region *cxlr) -{ - struct cxl_dax_region *cxlr_dax; - struct device *dev; - int rc; - - cxlr_dax =3D cxl_dax_region_alloc(cxlr); - if (IS_ERR(cxlr_dax)) - return PTR_ERR(cxlr_dax); - - dev =3D &cxlr_dax->dev; - rc =3D dev_set_name(dev, "dax_region%d", cxlr->id); - if (rc) - goto err; - - rc =3D device_add(dev); - if (rc) - goto err; - - dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(dev->parent), - dev_name(dev)); - - return devm_add_action_or_reset(&cxlr->dev, cxlr_dax_unregister, - cxlr_dax); -err: - put_device(dev); - return rc; -} - static int match_root_decoder(struct device *dev, const void *data) { const struct range *r1, *r2 =3D data; diff --git a/drivers/cxl/core/region_dax.c b/drivers/cxl/core/region_dax.c new file mode 100644 index 000000000000..fe367759ac69 --- /dev/null +++ b/drivers/cxl/core/region_dax.c @@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright(c) 2022 Intel Corporation. All rights reserved. + * Copyright(c) 2026 Meta Technologies Inc. All rights reserved. + */ +#include +#include +#include +#include +#include "core.h" + +static void cxl_dax_region_release(struct device *dev) +{ + struct cxl_dax_region *cxlr_dax =3D to_cxl_dax_region(dev); + + kfree(cxlr_dax); +} + +static const struct attribute_group *cxl_dax_region_attribute_groups[] =3D= { + &cxl_base_attribute_group, + NULL +}; + +const struct device_type cxl_dax_region_type =3D { + .name =3D "cxl_dax_region", + .release =3D cxl_dax_region_release, + .groups =3D cxl_dax_region_attribute_groups, +}; + +static bool is_cxl_dax_region(struct device *dev) +{ + return dev->type =3D=3D &cxl_dax_region_type; +} + +struct cxl_dax_region *to_cxl_dax_region(struct device *dev) +{ + if (dev_WARN_ONCE(dev, !is_cxl_dax_region(dev), + "not a cxl_dax_region device\n")) + return NULL; + return container_of(dev, struct cxl_dax_region, dev); +} +EXPORT_SYMBOL_NS_GPL(to_cxl_dax_region, "CXL"); + +static struct lock_class_key cxl_dax_region_key; + +static struct cxl_dax_region *cxl_dax_region_alloc(struct cxl_region *cxlr) +{ + struct cxl_region_params *p =3D &cxlr->params; + struct cxl_dax_region *cxlr_dax; + struct device *dev; + + guard(rwsem_read)(&cxl_rwsem.region); + if (p->state !=3D CXL_CONFIG_COMMIT) + return ERR_PTR(-ENXIO); + + cxlr_dax =3D kzalloc_obj(*cxlr_dax); + if (!cxlr_dax) + return ERR_PTR(-ENOMEM); + + cxlr_dax->hpa_range.start =3D p->res->start; + cxlr_dax->hpa_range.end =3D p->res->end; + + dev =3D &cxlr_dax->dev; + cxlr_dax->cxlr =3D cxlr; + device_initialize(dev); + lockdep_set_class(&dev->mutex, &cxl_dax_region_key); + device_set_pm_not_required(dev); + dev->parent =3D &cxlr->dev; + dev->bus =3D &cxl_bus_type; + dev->type =3D &cxl_dax_region_type; + + return cxlr_dax; +} + +static void cxlr_dax_unregister(void *_cxlr_dax) +{ + struct cxl_dax_region *cxlr_dax =3D _cxlr_dax; + + device_unregister(&cxlr_dax->dev); +} + +int devm_cxl_add_dax_region(struct cxl_region *cxlr) +{ + struct cxl_dax_region *cxlr_dax; + struct device *dev; + int rc; + + cxlr_dax =3D cxl_dax_region_alloc(cxlr); + if (IS_ERR(cxlr_dax)) + return PTR_ERR(cxlr_dax); + + dev =3D &cxlr_dax->dev; + rc =3D dev_set_name(dev, "dax_region%d", cxlr->id); + if (rc) + goto err; + + rc =3D device_add(dev); + if (rc) + goto err; + + dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(dev->parent), + dev_name(dev)); + + return devm_add_action_or_reset(&cxlr->dev, cxlr_dax_unregister, + cxlr_dax); +err: + put_device(dev); + return rc; +} --=20 2.53.0