cxl: Add helper function to verify port is in memdev hierarchy
Subsystems (2)
Dave Jiang
maintainerPATCH v2 1/1 cxl: Add helper function to verify port is in memdev hierarchy
'cxl enable-port -m' uses cxl_port_get_dport_by_memdev() to find the memdevs that are associated with a port in order to enable those associated memdevs. When the kernel switch to delayed dport initialization by enumerating the dports during memdev probe, the dports are no longer valid until the memdev is probed. This means that cxl_port_get_dport_by_memdev() will not find any memdevs under the port.
Add a new helper function cxl_port_is_memdev_hierarchy() that checks if a port is in the memdev hierarchy via the memdev->host_path where the sysfs path contains all the devices in the hierarchy. This call is also backward compatible with the old behavior.
---
v2:
- Remove usages of cxl_port_get_dport_by_memdev() and add documentation to explain when cxl_port_get_dport_by_memdev() should be used. (Alison)
--- Documentation/cxl/lib/libcxl.txt | 5 +++++ cxl/filter.c | 2 +- cxl/lib/libcxl.c | 31 +++++++++++++++++++++++++++++++ cxl/lib/libcxl.sym | 5 +++++ cxl/libcxl.h | 3 +++ cxl/port.c | 4 ++-- 6 files changed, 47 insertions(+), 3 deletions(-)
Documentation/cxl/lib/libcxl.txt +5 -0
@@ -348,11 +348,16 @@ struct cxl_dport *cxl_dport_get_first(struct cxl_port *port); struct cxl_dport *cxl_dport_get_next(struct cxl_dport *dport); struct cxl_dport *cxl_port_get_dport_by_memdev(struct cxl_port *port, struct cxl_memdev *memdev); +bool cxl_memdev_is_port_ancestor(struct cxl_memdev *memdev, + struct cxl_port *port); #define cxl_dport_foreach(port, dport) \ for (dport = cxl_dport_get_first(port); dport != NULL; \ dport = cxl_dport_get_next(dport)) ---- +cxl_port_get_dport_by_memdev() is only usable when the memdev driver is bound +and therefore the ports and dports in between the root port and the endpoint are +enumerated. ===== DPORT: Attributes ----
cxl/filter.c +1 -1
@@ -564,7 +564,7 @@ static bool __memdev_filter_by_port(struct cxl_memdev *memdev,struct cxl_endpoint *endpoint;if (util_cxl_port_filter (port, port_ident,CXL_PF_SINGLE ) && -cxl_port_get_dport_by_memdev (port, memdev)) +cxl_memdev_is_port_ancestor (memdev, port))return true;cxl_endpoint_foreach (port, endpoint)
cxl/lib/libcxl.c +31 -0
@@ -2024,6 +2024,37 @@ CXL_EXPORT int cxl_memdev_nvdimm_bridge_active(struct cxl_memdev *memdev)return is_enabled (path); } +CXL_EXPORT bool cxl_memdev_is_port_ancestor(struct cxl_memdev *memdev, +struct cxl_port *port) +{ +const char *uport =cxl_port_get_host (port); +const char *start ="devices" ; +const char *pstr ="platform" ; +char *host, *pos; + + host =strdup (memdev->host_path); +if (!host) +return false; + + pos =strstr (host, start); + pos +=strlen (start) +1 ; +if (strncmp (pos, pstr,strlen (pstr)) ==0 ) + pos +=strlen (pstr) +1 ; + pos =strtok (pos,"/" ); + +while (pos) { +if (strcmp (pos, uport) ==0 ) { +free (host); +return true; + } + pos =strtok (NULL ,"/" ); + } + +free (host); + +return false; +} +static int cxl_port_init (struct cxl_port *port,struct cxl_port *parent_port,enum cxl_port_type type,struct cxl_ctx *ctx,int id,const char *cxlport_base)
cxl/lib/libcxl.sym +5 -0
@@ -295,3 +295,8 @@ global: cxl_fwctl_get_major; cxl_fwctl_get_minor; } LIBECXL_8; + +LIBCXL_10 { +global: + cxl_memdev_is_port_ancestor; +} LIBCXL_9;
cxl/libcxl.h +3 -0
@@ -179,6 +179,9 @@ bool cxl_dport_maps_memdev(struct cxl_dport *dport, struct cxl_memdev *memdev);struct cxl_dport *cxl_port_get_dport_by_memdev (struct cxl_port *port,struct cxl_memdev *memdev); +bool cxl_memdev_is_port_ancestor (struct cxl_memdev *memdev, +struct cxl_port *port); +#define cxl_dport_foreach (port, dport) \ for (dport = cxl_dport_get_first(port); dport != NULL; \ dport = cxl_dport_get_next(dport))
cxl/port.c +2 -2
@@ -67,7 +67,7 @@ static int action_disable(struct cxl_port *port) } cxl_memdev_foreach(ctx, memdev) { -if (!cxl_port_get_dport_by_memdev (port, memdev)) +if (!cxl_memdev_is_port_ancestor (memdev, port))continue ;if (cxl_memdev_is_enabled (memdev)) active_memdevs++;
@@ -102,7 +102,7 @@ static int action_enable(struct cxl_port *port)return rc; cxl_memdev_foreach(ctx, memdev) -if (cxl_port_get_dport_by_memdev (port, memdev)) +if (cxl_memdev_is_port_ancestor (memdev, port))cxl_memdev_enable (memdev);return 0 ; }
base-commit: 74b9e411bf13e87df39a517d10143fafa7e2ea92
Signature · 1 line
2.50.0
Verma, Vishal L
maintainerQuoted 9 lines · Dave Jiang
'cxl enable-port -m' uses
cxl_port_get_dport_by_memdev()to find the memdevs that are associated with a port in order to enable those associated memdevs. When the kernel switch to delayed dport initialization by enumerating the dports during memdev probe, the dports are no longer valid until the memdev is probed. This means thatcxl_port_get_dport_by_memdev()will not find any memdevs under the port.Add a new helper function
cxl_port_is_memdev_hierarchy()that checks if a
Stale commit message - since the actual helper is called cxl_memdev_is_port_ancestor() ?
Quoted 17 lines
port is in the memdev hierarchy via the
memdev->host_pathwhere the sysfs path contains all the devices in the hierarchy. This call is also backward compatible with the old behavior.Signed-off-by Dave Jiang <[email protected]>---
v2:
- Remove usages ofcxl_port_get_dport_by_memdev()and add documentation to explain whencxl_port_get_dport_by_memdev()should be used. (Alison)
---
Documentation/cxl/lib/libcxl.txt | 5 +++++
cxl/filter.c | 2 +-
cxl/lib/libcxl.c | 31 +++++++++++++++++++++++++++++++ cxl/lib/libcxl.sym | 5 +++++
cxl/libcxl.h | 3 +++
cxl/port.c | 4 ++--6 files changed, 47 insertions(+), 3 deletions(-)
Dave Jiang
maintainerQuoted 9 lines · Vishal L
Quoted 8 lines · Dave Jiang
'cxl enable-port -m' uses
cxl_port_get_dport_by_memdev()to find the memdevs that are associated with a port in order to enable those associated memdevs. When the kernel switch to delayed dport initialization by enumerating the dports during memdev probe, the dports are no longer valid until the memdev is probed. This means thatcxl_port_get_dport_by_memdev()will not find any memdevs under the port.
Quoted 4 lines
Quoted 1 line
Add a new helper function
cxl_port_is_memdev_hierarchy()that checks if aStale commit message - since the actual helper is called
cxl_memdev_is_port_ancestor()?
Ooops. Maybe Alison can fix it up when she applies if there are no other changes.
Quoted 18 lines
Quoted 18 lines
port is in the memdev hierarchy via the
memdev->host_pathwhere the sysfs path contains all the devices in the hierarchy. This call is also backward compatible with the old behavior.Signed-off-by Dave Jiang <[email protected]>---
v2:
- Remove usages ofcxl_port_get_dport_by_memdev()and add documentation to explain whencxl_port_get_dport_by_memdev()should be used. (Alison)
---
Documentation/cxl/lib/libcxl.txt | 5 +++++
cxl/filter.c | 2 +-
cxl/lib/libcxl.c | 31 +++++++++++++++++++++++++++++++ cxl/lib/libcxl.sym | 5 +++++
cxl/libcxl.h | 3 +++
cxl/port.c | 4 ++--6 files changed, 47 insertions(+), 3 deletions(-)
Alison Schofield
maintainerQuoted 9 lines · Vishal Verma
Quoted 8 lines · Dave Jiang
'cxl enable-port -m' uses
cxl_port_get_dport_by_memdev()to find the memdevs that are associated with a port in order to enable those associated memdevs. When the kernel switch to delayed dport initialization by enumerating the dports during memdev probe, the dports are no longer valid until the memdev is probed. This means thatcxl_port_get_dport_by_memdev()will not find any memdevs under the port.
Quoted 4 lines
Quoted 1 line
Add a new helper function
cxl_port_is_memdev_hierarchy()that checks if aStale commit message - since the actual helper is called
cxl_memdev_is_port_ancestor()?
Sure, I can fix that up the commit log when applying.
Vishal - Can you comment on how to handle the existing library call that now behaves differently? Here we have a comment to add to the docs. I'm not clear that is crisp enough. Prior to this patch it would only return NULL if dport not found. Now it returns NULL if dport not found, or memdev not bound.
For cxl-cli - we never used the dport, so the new call suffices. If 'other' library users, were using it similarly, then the suggestion is to switch to the new call. But that usage is not a given - maybe they wanted the actual dport.
So - asking for your library rules expertise on the options here.
Quoted 4 lines
Quoted 4 lines
port is in the memdev hierarchy via the
memdev->host_pathwhere the sysfs path contains all the devices in the hierarchy. This call is also backward compatible with the old behavior.
I guess it's backward compatible, if user was only checking for existense:
if (cxl_port_get_dport_by_memdev()) then do this
but not if they were doing this: dport = cxl_port_get_dport_by_memdev();
BTW - I'm also OK with fixing this up for cxl-cli by adding and using the new helper, and then coming around with another patch dealing with the existing library call for our 'other' library users.
-- Alison
Quoted 14 lines
Quoted 14 lines
Signed-off-by Dave Jiang <[email protected]>---
v2:
- Remove usages ofcxl_port_get_dport_by_memdev()and add documentation to explain whencxl_port_get_dport_by_memdev()should be used. (Alison)
---
Documentation/cxl/lib/libcxl.txt | 5 +++++
cxl/filter.c | 2 +-
cxl/lib/libcxl.c | 31 +++++++++++++++++++++++++++++++ cxl/lib/libcxl.sym | 5 +++++
cxl/libcxl.h | 3 +++
cxl/port.c | 4 ++--6 files changed, 47 insertions(+), 3 deletions(-)
Alison Schofield
maintainerQuoted 8 lines · Dave Jiang
'cxl enable-port -m' uses
cxl_port_get_dport_by_memdev()to find the memdevs that are associated with a port in order to enable those associated memdevs. When the kernel switch to delayed dport initialization by enumerating the dports during memdev probe, the dports are no longer valid until the memdev is probed. This means thatcxl_port_get_dport_by_memdev()will not find any memdevs under the port.
Quoted 6 lines
Add a new helper function
cxl_port_is_memdev_hierarchy()that checks if a port is in the memdev hierarchy via thememdev->host_pathwhere the sysfs path contains all the devices in the hierarchy. This call is also backward compatible with the old behavior.Signed-off-by Dave Jiang <[email protected]>
Fixed up the func name in commit log.