blkcg:Support to track FC storage blk io traffic
Subsystems (7)
v9 cover blkcg:Support to track FC storage blk io traffic
This Patch added a unique application identifier i.e app_id knob to blkcg which allows identification of traffic sources at an individual cgroup based Applications (ex:virtual machine (VM))level in both host and fabric infrastructure.
Added a new sysfs attribute appid_store to set the application identfier in the blkcg associted with cgroup id under /sys/class/fc/fc_udev_device/*
With this new interface the user can set the application identfier in the blkcg associted with cgroup id.
This capability can be utilized by multiple block transport infrastructure like fc,iscsi,roce.
Existing FC fabric will use this feature and the description of the use case is below.
Various virtualization technologies used in Fibre Channel SAN deployments have created the opportunity to identify and associate traffic with specific virtualized applications. The concepts behind the T11 Application Services standard is to provide the general mechanisms needed to identify virtualized services.
It enables the Fabric and the storage targets to identify, monitor, and handle FC traffic
based on vm tags by inserting application specific identification into the FC frame.
The patches were cut against 5.13/scsi-queue tree
v9:
Addressed the issues reported by kernel test robot Replaced lpfc_get_vmid_from_hashtable with the generic kernel based hashtable (include/linux/hashtable.h) and made the changes in the code accordingly. Addressed the locking issue and also merged few patches
v8:
Modified the structure member,log messages and function declarations Added proper error codes and return values
v7:
Modified the Kconfig comments
v6:
Addressed the issues reported by kernel test robot Modified the Kconfig files as per standard
v5:
Renamed the function cgroup_get_from_kernfs_id tocgroup_get_from_id.
Moved the input validation at the beginning of the function in Renamed the arguments appropriatley.
Changed Return code to non-numeric/SymbolChanged Return code to non-numeric/Symbol
Modified the comments.
v4:
Addressed the error reported by kernel test robot
v3:
removed RFC.
Renamed the functions and app_id to more specific Addressed the reference leaks in blkcg_set_app_identifier Added a new config BLK_CGROUP_FC_APPID and made changes to select the same under SCSI_FC_ATTRS
V2:
renamed app_identifier to app_id.
removed the sysfs interface blkio.app_identifie under /sys/fs/cgroup/blkio
Ported the patch on top of 5.10/scsi-queue. Removed redundant code due to changes since last submit. Added a fix for issuing QFPA command.
Gaurav Srivastava (10):
lpfc: vmid: Add the datastructure for supporting VMID in lpfc
lpfc: vmid: VMID params initialization
lpfc: vmid: Add support for vmid in mailbox command, does vmid
resource allocation and vmid cleanup
lpfc: vmid: Implements ELS commands for appid patch
lpfc: vmid: Functions to manage vmids
lpfc: vmid: Implements CT commands for appid.
lpfc: vmid: Appends the vmid in the wqe before sending
lpfc: vmid: Timeout implementation for vmid
lpfc: vmid: Adding qfpa and vmid timeout check in worker thread
lpfc: vmid: Introducing vmid in io path.
Muneendra (3):
cgroup: Added cgroup_get_from_id
blkcg: Added a app identifier support for blkcg
nvme: Added a newsysfs attribute appid_store
block/Kconfig | 9 + drivers/nvme/host/fc.c | 73 +++++- drivers/scsi/Kconfig | 13 ++ drivers/scsi/lpfc/lpfc.h | 122 +++++++++++ drivers/scsi/lpfc/lpfc_attr.c | 48 ++++ drivers/scsi/lpfc/lpfc_crtn.h | 11 + drivers/scsi/lpfc/lpfc_ct.c | 257 +++++++++++++++++++++- drivers/scsi/lpfc/lpfc_disc.h | 1 + drivers/scsi/lpfc/lpfc_els.c | 366 ++++++++++++++++++++++++++++++- drivers/scsi/lpfc/lpfc_hbadisc.c | 147 +++++++++++++ drivers/scsi/lpfc/lpfc_hw.h | 124 ++++++++++- drivers/scsi/lpfc/lpfc_hw4.h | 12 + drivers/scsi/lpfc/lpfc_init.c | 104 +++++++++ drivers/scsi/lpfc/lpfc_mbox.c | 6 + drivers/scsi/lpfc/lpfc_scsi.c | 316 ++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_sli.c | 63 ++++++ drivers/scsi/lpfc/lpfc_sli.h | 8 + include/linux/blk-cgroup.h | 56 +++++ include/linux/cgroup.h | 6 + kernel/cgroup/cgroup.c | 26 +++ 20 files changed, 1758 insertions(+), 10 deletions(-)
Signature · 1 line
2.26.2
PATCH v9 1/13 cgroup: Added cgroup_get_from_id
Added a new function cgroup_get_from_id to retrieve the cgroup associated with cgroup id.
Exported the same as this can be used by blk-cgorup.c
Added function declaration of cgroup_get_from_id in cgorup.h
This patch also exported the function cgroup_get_e_css as this is getting used in blk-cgroup.h
---
v9:
Addressed the issues reported by kernel test robot
v8:
No change
v7:
No change
v6:
No change
v5:
renamed the function cgroup_get_from_kernfs_id tocgroup_get_from_id
v4:
No change
v3:
Exported the cgroup_get_e_css
v2:
New patch
--- include/linux/cgroup.h | 6 ++++++ kernel/cgroup/cgroup.c | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+)
include/linux/cgroup.h +6 -0
@@ -696,6 +696,7 @@ static inline void cgroup_kthread_ready(void) }void cgroup_path_from_kernfs_id (u64 id,char *buf,size_t buflen); +struct cgroup *cgroup_get_from_id (u64 id);#else /* !CONFIG_CGROUPS */ struct cgroup_subsys_state ;
@@ -743,6 +744,11 @@ static inline bool task_under_cgroup_hierarchy(struct task_struct *task,static inline void cgroup_path_from_kernfs_id (u64 id,char *buf,size_t buflen) {} + +static inline struct cgroup *cgroup_get_from_id (u64 id) +{ +return NULL ; +}#endif /* !CONFIG_CGROUPS */ #ifdef CONFIG_CGROUPS
kernel/cgroup/cgroup.c +26 -0
@@ -577,6 +577,7 @@ struct cgroup_subsys_state *cgroup_get_e_css(struct cgroup *cgrp,rcu_read_unlock ();return css; } +EXPORT_SYMBOL_GPL (cgroup_get_e_css);static void cgroup_get_live (struct cgroup *cgrp) {
@@ -5768,6 +5769,31 @@ void cgroup_path_from_kernfs_id(u64 id, char *buf, size_t buflen)kernfs_put (kn); } +/* +* cgroup_get_from_id : get the cgroup associated with cgroup id +* @id: cgroup id +* On success it returns the cgrp on failure it returns NULL +*/ +struct cgroup *cgroup_get_from_id (u64 id) +{ +struct kernfs_node *kn; +struct cgroup *cgrp =NULL ; + +mutex_lock (&cgroup_mutex); + kn =kernfs_find_and_get_node_by_id (cgrp_dfl_root.kf_root, id); +if (!kn) + goto out_unlock; + + cgrp = kn->priv; +if (cgroup_is_dead (cgrp) || !cgroup_tryget (cgrp)) + cgrp =NULL ; +kernfs_put (kn); +out_unlock: +mutex_unlock (&cgroup_mutex); +return cgrp; +} +EXPORT_SYMBOL_GPL (cgroup_get_from_id); +/* * proc_cgroup_show() * - Print task's cgroup paths into seq_file, one line for each hierarchy
Signature · 1 line
2.26.2
Re: [PATCH v9 01/13] cgroup: Added cgroup_get_from_id
Quoted 35 lines · Muneendra
Added a new function
cgroup_get_from_idto retrieve the cgroup associated with cgroup id.
Exported the same as this can be used byblk-cgorup.cAdded function declaration of
cgroup_get_from_idincgorup.hThis patch also exported the function
cgroup_get_e_cssas this is getting used inblk-cgroup.hReported-by kernel test robot <[email protected]>Signed-off-by Muneendra <[email protected]>---
v9:
Addressed the issues reported by kernel test robotv8:
No changev7:
No changev6:
No changev5:
renamed the functioncgroup_get_from_kernfs_idtocgroup_get_from_idv4:
No changev3:
Exported thecgroup_get_e_css
Quoted 7 lines
v2:
New patch--- include/linux/cgroup.h | 6 ++++++ kernel/cgroup/cgroup.c | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+)Reviewed-by Hannes Reinecke <[email protected]>
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v9 2/13 blkcg: Added a app identifier support for blkcg
In reply to MuneendraThis Patch added a unique application identifier i.e fc_app_id member in blkcg which allows identification of traffic sources at an individual cgroup based Applications (ex:virtual machine (VM))level in both host and
fabric infrastructure.
Added a new function blkcg_get_fc_appid to
grab the app identifier associated with a bio.
Added a new function blkcg_set_fc_appid to
set the app identifier in a blkcgrp associated with cgroup id
Added a new config BLK_CGROUP_FC_APPID and moved the changes under this config
Merged the patch 16 of previous version in which we
added a new config FC_APPID to select BLK_CGROUP_FC_APPID which Enable support to track FC io Traffic.
---
v9:
Merged patch16 of previosu version to this patch
where we are using Kconfig settings
v8:
No change
v7:
Modified the Kconfig file
v6:
Modified the Kconfig file as per standard specified in Documentation/process/coding-style.rst
v5:
Renamed the arguments appropriatley
Renamed APPID_LEN to FC_APPID_LEN
Moved the input validation at the begining of the function Modified the comments
v4:
No change
v3:
Renamed the functions and app_id to more specific
Addressed the reference leaks in blkcg_set_app_identifier
Added a new config BLK_CGROUP_FC_APPID and moved the changes under this config
Added blkcg_get_fc_appid,blkcg_set_fc_appid as inline functions
v2:
renamed app_identifier to app_id
removed the sysfs interface blkio.app_identifie under
--- block/Kconfig | 9 ++++++ drivers/scsi/Kconfig | 13 +++++++++ include/linux/blk-cgroup.h | 56 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+)
block/Kconfig +9 -0
@@ -144,6 +144,15 @@ config BLK_CGROUP_IOLATENCY Note, this is an experimental interface and could be changed someday. +config BLK_CGROUP_FC_APPID + bool "Enable support to track FC I/O Traffic across cgroup applications" + depends on BLK_CGROUP=y + help + Enabling this option enables the support to track FC I/O traffic across + cgroup applications. It enables the Fabric and the storage targets to + identify, monitor, and handle FC traffic based on VM tags by inserting + application specific identification into the FC frame. + config BLK_CGROUP_IOCOST bool "Enable support for cost model based cgroup IO controller" depends on BLK_CGROUP=y
drivers/scsi/Kconfig +13 -0
@@ -235,6 +235,19 @@ config SCSI_FC_ATTRS each attached FiberChannel device to sysfs, say Y. Otherwise, say N. +config FC_APPID + bool "Enable support to track FC I/O Traffic" + depends on BLOCK && BLK_CGROUP + depends on SCSI + select BLK_CGROUP_FC_APPID + default y + help + If you say Y here, it enables the support to track + FC I/O traffic over fabric. It enables the Fabric and the + storage targets to identify, monitor, and handle FC traffic + based on VM tags by inserting application specific + identification into the FC frame. + config SCSI_ISCSI_ATTRS tristate "iSCSI Transport Attributes" depends on SCSI && NET
include/linux/blk-cgroup.h +56 -0
72 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [PATCH v9 02/13] blkcg: Added a app identifier support for blkcg
Quoted 55 lines · Muneendra
This Patch added a unique application identifier i.e
fc_app_idmember in blkcg which allows identification of traffic sources at an individual cgroup based Applications (ex:virtual machine (VM))level in both host and
fabric infrastructure.Added a new function
blkcg_get_fc_appidto
grab the app identifier associated with a bio.Added a new function
blkcg_set_fc_appidto
set the app identifier in a blkcgrp associated with cgroup idAdded a new config
BLK_CGROUP_FC_APPIDand moved the changes under this configMerged the patch 16 of previous version in which we
added a new configFC_APPIDto selectBLK_CGROUP_FC_APPIDwhich Enable support to track FC io Traffic.Signed-off-by Muneendra <[email protected]>---
v9:
Merged patch16 of previosu version to this patch
where we are usingKconfigsettingsv8:
No changev7:
Modified theKconfigfilev6:
Modified theKconfigfile as per standard specified inDocumentation/process/coding-style.rstv5:
Renamed the arguments appropriatley
RenamedAPPID_LENtoFC_APPID_LEN
Moved the input validation at the begining of the function Modified the commentsv4:
No changev3:
Renamed the functions andapp_idto more specificAddressed the reference leaks in
blkcg_set_app_identifierAdded a new config
BLK_CGROUP_FC_APPIDand moved the changes under this configAdded blkcg_get_fc_appid,blkcg_set_fc_appid as inline functions
Quoted 9 lines
v2:
renamedapp_identifiertoapp_id
removed the sysfs interface blkio.app_identifie under--- block/Kconfig | 9 ++++++ drivers/scsi/Kconfig | 13 +++++++++ include/linux/blk-cgroup.h | 56 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+)
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v9 3/13 nvme: Added a newsysfs attribute appid_store
In reply to MuneendraAdded a new sysfs attribute appid_store under/sys/class/fc/fc_udev_device/*
With this new interface the user can set the application identfier in the blkcg associted with cgroup id.
Once the application identifer has set with this interface it allows identification of traffic sources at an individual cgroup based Applications (ex:virtual machine (VM))level in both host and fabric infrastructure(FC).
Below is the interface provided to set the app_id
echo "<cgroupid>:<appid>" >> /sys/class/fc/fc_udev_device/appid_store echo "457E:100000109b521d27" >> /sys/class/fc/fc_udev_device/appid_store
---
v9:
No change
v8:
No change
v7:
No change
v6:
No change
v5:
Replaced APPID_LEN with FC_APPID_LEN
v4:
No change
v3:
Replaced blkcg_set_app_identifier function with blkcg_set_fc_appid
v2:
New Patch
--- drivers/nvme/host/fc.c | 73 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-)
drivers/nvme/host/fc.c +72 -1
@@ -9,7 +9,7 @@#include <uapi/scsi/fc/fc_els.h> #include <linux/delay.h> #include <linux/overflow.h> - +#include <linux/blk-cgroup.h> #include "nvme.h" #include "fabrics.h" #include <linux/nvme-fc-driver.h>
@@ -3782,10 +3782,81 @@ static ssize_t nvme_fc_nvme_discovery_store(struct device *dev,return count; } + +/*parse the Cgroup id from a buf and returns the length of cgrpid*/ +static int fc_parse_cgrpid (const char *buf,u64 *id) +{ +char cgrp_id[16 +1 ]; +int cgrpid_len, j; + +memset (cgrp_id,0x0 ,sizeof (cgrp_id)); +for (cgrpid_len =0 , j =0 ; cgrpid_len <17 ; cgrpid_len++) { +if (buf[cgrpid_len] !=':' ) + cgrp_id[cgrpid_len] = buf[cgrpid_len]; +else { + j =1 ; +break ; + } + } +if (!j) +return -EINVAL ; +if (kstrtou64 (cgrp_id,16 , id) <0 ) +return -EINVAL ; +return cgrpid_len; +} + +/* +* fc_update_appid :parses and updates the appid in the blkcg associated with +* cgroupid. +* @buf: buf contains both cgrpid and appid info +* @count: size of the buffer +*/ +static int fc_update_appid (const char *buf,size_t count) +{ +u64 cgrp_id; +int appid_len =0 ; +int cgrpid_len =0 ; +char app_id[FC_APPID_LEN ]; +int ret =0 ; + +if (buf[count-1 ] =='\n' ) + count--; + +if ((count > (16 +1 +FC_APPID_LEN )) || (!strchr (buf,':' ))) +return -EINVAL ; + + cgrpid_len =fc_parse_cgrpid (buf, &cgrp_id); +if (cgrpid_len <0 ) +return -EINVAL ; +/*appid len is count - cgrpid_len -1 (: + \n) */ + appid_len = count - cgrpid_len -1 ; +if (appid_len >FC_APPID_LEN ) +return -EINVAL ; + +memset (app_id,0x0 ,sizeof (app_id)); +memcpy (app_id, &buf[cgrpid_len+1 ], appid_len); + ret =blkcg_set_fc_appid (app_id, cgrp_id,sizeof (app_id)); +if (ret <0 ) +return ret; +return count; +} + +static ssize_t fc_appid_store (struct device *dev, +struct device_attribute *attr,const char *buf,size_t count) +{ +int ret =0 ; + + ret =fc_update_appid (buf, count); +if (ret <0 ) +return -EINVAL ; +return count; +} static DEVICE_ATTR(nvme_discovery, 0200, NULL, nvme_fc_nvme_discovery_store); +static DEVICE_ATTR(appid_store, 0200, NULL, fc_appid_store);static struct attribute *nvme_fc_attrs[] = { &dev_attr_nvme_discovery.attr, + &dev_attr_appid_store.attr,NULL };
Signature · 1 line
2.26.2
Re: [PATCH v9 03/13] nvme: Added a newsysfs attribute appid_store
Quoted 38 lines · Muneendra
Added a new sysfs attribute
appid_storeunder/sys/class/fc/fc_udev_device/*With this new interface the user can set the application identfier in the blkcg associted with cgroup id.
Once the application identifer has set with this interface it allows identification of traffic sources at an individual cgroup based Applications (ex:virtual machine (VM))level in both host and fabric infrastructure(FC).
Below is the interface provided to set the
app_idecho "<cgroupid>:<appid>" >>
/sys/class/fc/fc_udev_device/appid_storeecho "457E:100000109b521d27" >>/sys/class/fc/fc_udev_device/appid_storeReviewed-by Hannes Reinecke <[email protected]>Signed-off-by Muneendra <[email protected]>---
v9:
No changev8:
No changev7:
No changev6:
No changev5:
ReplacedAPPID_LENwithFC_APPID_LENv4:
No change
Quoted 8 lines
v3:
Replacedblkcg_set_app_identifierfunction withblkcg_set_fc_appidv2:
New Patch--- drivers/nvme/host/fc.c | 73 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-)
Hmm, I wonder why only NVMe-FC? Or is this just for the moment? We also have the FC transport class for SCSI; I assume this could feed the same IDs into the LLDs.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
RE: [PATCH v9 03/13] nvme: Added a newsysfs attribute appid_store
Hi Benjamin,
Quoted 6 lines
Quoted 4 lines
--- drivers/nvme/host/fc.c | 73 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-)Hmm, I wonder why only NVMe-FC? Or is this just for the moment? We also
have the FC transport class for SCSI; I assume this could feed the same IDs into the LLDs.
At present it supports only for SCSI-FC .
In future we are adding the support for NVMe-FC
But to make it generic and avoid duplication we added this under /sys/class/fc .
Ewan was mentioning that at some point there is a plan to decouple the FC transport
somewhat so that there is a layer that represents the FC stuff regardless of the FC4 type
(SCSI, NVMe). When we have this layer we can move the things accordingly.
Regards,
Muneendra.
Signature · 11 lines
This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.
Re: [PATCH v9 03/13] nvme: Added a newsysfs attribute appid_store
Quoted 7 lines · Muneendra Kumar M
Hi Benjamin,
Quoted 4 lines
Quoted 4 lines
--- drivers/nvme/host/fc.c | 73 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-)
Quoted 5 lines
Quoted 3 lines
Hmm, I wonder why only NVMe-FC? Or is this just for the moment? We also have the FC transport class for SCSI; I assume this could feed the same IDs into the LLDs.
At present it supports only for SCSI-FC .
It does? By adding it to the implementation under drivers/nvme/host/? I am confused.
I see it adds the sysfs-attribute to nvme_fc_attrs, how would that be added to a FC Host that does not have a NVMe 'personality'? I was assuming this only ever appears under /sys/class/fc if the LLDD registers itself with the NVMe subsystem (presumably via nvme_fc_register_localport()).
zFCP, for example, does not do that, but we do implement the SCSI FC transport class in drivers/scsi/scsi_transport_fc.c.
Quoted 9 lines
In future we are adding the support for NVMe-FC
But to make it generic and avoid duplication we added this under/sys/class/fc.Ewan was mentioning that at some point there is a plan to decouple the FC transport somewhat so that there is a layer that represents the FC stuff regardless of the FC4 type (SCSI, NVMe). When we have this layer we can move the things accordingly.
Signature · 4 lines
Best Regards, Benjamin Block / Linux on IBM Z Kernel Development / IBM Systems IBM Deutschland Research & Development GmbH / https://www.ibm.com/privacy Vorsitz. AufsR.: Gregor Pillen / Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen / Registergericht: AmtsG Stuttgart, HRB 243294
Re: [PATCH v9 03/13] nvme: Added a newsysfs attribute appid_store
Quoted 8 lines · Benjamin Block
Quoted 7 lines · Muneendra Kumar M
Hi Benjamin,
Quoted 4 lines
Quoted 4 lines
--- drivers/nvme/host/fc.c | 73 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-)
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Hmm, I wonder why only NVMe-FC? Or is this just for the moment? We also have the FC transport class for SCSI; I assume this could feed the same IDs into the LLDs.
At present it supports only for SCSI-FC .
It does? By adding it to the implementation under
drivers/nvme/host/? I am confused.
Yeah, this is a little odd.
This history is: we know we need to merge the scsi fc transport and the nvme fc transport as the two independent things are creating difficulties and duplications (devloss is an example). But it's a bit of work to change this as it will move where the objects are in the topology tree.
As we tried to figure out how to do the interaction with cgroups, we wanted to support SCSI and nvme. If you look at how this new attribute sets the vmid, it's somewhat generic - it just sets the fc appid field on a cgrp id. There's really nothing that says the cgrp is on a block device that is scsi or is nvme. It should work on devices regardless of their underlying protocol type. Which then left the question - where to place such an attribute.
Given this is an "fc service" and as we knew the transport will be merged eventually we picked to put it under /sys/class/fc point which is where we expect to root the common transport. This class point happens to be owned/created by the nvme fc host code for requesting nve-fc rediscovery events. It is odd that it creates a requirement to load the nvme-fc transport in order to set values for scsi fc devices, but we deemed it acceptable. Guess we need to get going on that merged transport...
-- james
Re: [PATCH v9 03/13] nvme: Added a newsysfs attribute appid_store
Quoted 33 lines · James Smart
Quoted 8 lines · Benjamin Block
Quoted 7 lines · Muneendra Kumar M
Hi Benjamin,
Quoted 4 lines
Quoted 4 lines
--- drivers/nvme/host/fc.c | 73 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-)Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Hmm, I wonder why only NVMe-FC? Or is this just for the moment? We also have the FC transport class for SCSI; I assume this could feed the same IDs into the LLDs.
At present it supports only for SCSI-FC .
It does? By adding it to the implementation under
drivers/nvme/host/? I am confused.Yeah, this is a little odd.
This history is: we know we need to merge the scsi fc transport and the nvme fc transport as the two independent things are creating difficulties and duplications (devloss is an example). But it's a bit of work to change this as it will move where the objects are in the topology tree.
As we tried to figure out how to do the interaction with cgroups, we wanted to support SCSI and nvme. If you look at how this new attribute sets the vmid, it's somewhat generic - it just sets the fc appid field on a cgrp id. There's really nothing that says the cgrp is on a block device that is scsi or is nvme. It should work on devices regardless of their underlying protocol type. Which then left the question - where to place such an attribute.
Quoted 3 lines
Given this is an "fc service" and as we knew the transport will be merged eventually we picked to put it under
/sys/class/fcpoint which is where we expect to root the common transport.
Ah ok, I think I confused it with the already existing /sys/class/fc_host//sys/class/fc_transport//..., but thats something different. Yeah, having some common ancestor makes sense, if the HBA offers multiple ULPs.
Quoted 4 lines
This class point happens to be owned/created by the nvme fc host code for requesting nve-fc rediscovery events. It is odd that it creates a requirement to load the nvme-fc transport in order to set values for scsi fc devices, but we deemed it acceptable.
Well, I mean, right now I don't have a immediate need for zfcp in this regard, so I don't want to blow this out of proportions. But like I said, we (zfcp) don't have a NVMe personality, so we never hook into NVMe-FC.
Quoted 1 line
Guess we need to get going on that merged transport...
Feel free to reach out, if there is anything coming up.
Signature · 4 lines
Best Regards, Benjamin Block / Linux on IBM Z Kernel Development / IBM Systems IBM Deutschland Research & Development GmbH / https://www.ibm.com/privacy Vorsitz. AufsR.: Gregor Pillen / Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen / Registergericht: AmtsG Stuttgart, HRB 243294
PATCH v9 4/13 lpfc: vmid: Add the datastructure for supporting VMID in lpfc
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
This patch adds the primary datastructures needed to implement VMID in lpfc driver. It maintains the capability, current state, hash table for the vmid/appid along with other information. The implementation supports the two versions of vmid implementation (app header and priority tagging)
---
v9:
Updated the data structures
Merged patch 5 and 6 of previous version v8 to this patch
v8:
modify structure member to uniform data type naming scheme
v7:
No change
v6:
No change
v5:
No Change
v4:
No change
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue
Removed unused variable.
--- drivers/scsi/lpfc/lpfc.h | 122 +++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_crtn.h | 11 +++ drivers/scsi/lpfc/lpfc_disc.h | 1 + drivers/scsi/lpfc/lpfc_hw.h | 124 ++++++++++++++++++++++++++++++++-- drivers/scsi/lpfc/lpfc_sli.h | 8 +++ 5 files changed, 262 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc.h +122 -0
@@ -303,6 +303,64 @@ struct lpfc_stats {struct lpfc_hba ; +#define LPFC_VMID_TIMER 300/* timer interval in seconds. */ + +#define LPFC_MAX_VMID_SIZE 256 +#define LPFC_COMPRESS_VMID_SIZE 16 + +union lpfc_vmid_io_tag { +u32 app_id;/* App Id vmid */ +u8 cs_ctl_vmid;/* Priority tag vmid */ +}; + +#define JIFFIES_PER_HR (HZ * 60 * 60) + +struct lpfc_vmid { +u8 flag; +#define LPFC_VMID_SLOT_FREE 0x0 +#define LPFC_VMID_SLOT_USED 0x1 +#define LPFC_VMID_REQ_REGISTER 0x2 +#define LPFC_VMID_REGISTERED 0x4 +#define LPFC_VMID_DE_REGISTER 0x8 +char host_vmid[LPFC_MAX_VMID_SIZE ]; +union lpfc_vmid_io_tag un; +struct hlist_node hnode; +u64 io_rd_cnt; +u64 io_wr_cnt; +u8 vmid_len; +u8 delete_inactive;/* Delete if inactive flag 0 = no, 1 = yes */ +u32 hash_index; +u64 __percpu *last_io_time; +}; + +#define lpfc_vmid_is_type_priority_tag (vport)\ + (vport->vmid_priority_tagging ? 1 : 0) + +#define LPFC_VMID_HASH_SIZE 256 +#define LPFC_VMID_HASH_MASK 255 +#define LPFC_VMID_HASH_SHIFT 6 + +struct lpfc_vmid_context { +struct lpfc_vmid *vmp; +struct lpfc_nodelist *nlp; +bool instantiated; +}; + +struct lpfc_vmid_priority_range { +u8 low; +u8 high; +u8 qos; +}; + +struct lpfc_vmid_priority_info { +u32 num_descriptors; +struct lpfc_vmid_priority_range *vmid_range; +}; + +#define QFPA_EVEN_ONLY 0x01 +#define QFPA_ODD_ONLY 0x02 +#define QFPA_EVEN_ODD 0x03 +enum discovery_state {LPFC_VPORT_UNKNOWN =0 ,/* vport state is unknown */ LPFC_VPORT_FAILED =1 ,/* vport has failed */
@@ -442,6 +500,9 @@ struct lpfc_vport {#define WORKER_RAMP_DOWN_QUEUE 0x800/* hba: Decrease Q depth */ #define WORKER_RAMP_UP_QUEUE 0x1000/* hba: Increase Q depth */ #define WORKER_SERVICE_TXQ 0x2000/* hba: IOCBs on the txq */ +#define WORKER_CHECK_INACTIVE_VMID 0x4000/* hba: check inactive vmids */ +#define WORKER_CHECK_VMID_ISSUE_QFPA 0x8000/* vport: Check if qfpa need */ +/* to issue */ struct timer_list els_tmofunc;struct timer_list delayed_disc_tmo;
@@ -452,6 +513,8 @@ struct lpfc_vport {#define FC_LOADING 0x1/* HBA in process of loading drvr */ #define FC_UNLOADING 0x2/* HBA in process of unloading drvr */ #define FC_ALLOW_FDMI 0x4/* port is ready for FDMI requests */ +#define FC_ALLOW_VMID 0x8/* Allow VMID IO's */ +#define FC_DEREGISTER_ALL_APP_ID 0x10/* Deregister all vmid's */ /* Vport Config Parameters */ uint32_t cfg_scan_down;uint32_t cfg_lun_queue_depth;
@@ -470,9 +533,36 @@ struct lpfc_vport {uint32_t cfg_tgt_queue_depth;uint32_t cfg_first_burst_size;uint32_t dev_loss_tmo_changed; +/* VMID parameters */ +u8 lpfc_vmid_host_uuid[LPFC_COMPRESS_VMID_SIZE ]; +u32 max_vmid;/* maximum VMIDs allowed per port */ +u32 cur_vmid_cnt;/* Current VMID count */ +#define LPFC_MIN_VMID 4 +#define LPFC_MAX_VMID 255 +u32 vmid_inactivity_timeout;/* Time after which the VMID */ +/* deregisters from switch */ +u32 vmid_priority_tagging; +#define LPFC_VMID_PRIO_TAG_DISABLE 0/* Disable */ +#define LPFC_VMID_PRIO_TAG_SUP_TARGETS 1/* Allow supported targets only */ +#define LPFC_VMID_PRIO_TAG_ALL_TARGETS 2/* Allow all targets */ +unsigned long *vmid_priority_range; +#define LPFC_VMID_MAX_PRIORITY_RANGE 256 +#define LPFC_VMID_PRIORITY_BITMAP_SIZE 32 +u8 vmid_flag; +#define LPFC_VMID_IN_USE 0x1 +#define LPFC_VMID_ISSUE_QFPA 0x2 +#define LPFC_VMID_QFPA_CMPL 0x4 +#define LPFC_VMID_QOS_ENABLED 0x8 +#define LPFC_VMID_TIMER_ENBLD 0x10 +struct fc_qfpa_res *qfpa_res;struct fc_vport *fc_vport; +struct lpfc_vmid *vmid; +DECLARE_HASHTABLE (hash_table,8 ); +rwlock_t vmid_lock; +struct lpfc_vmid_priority_info vmid_priority; +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS struct dentry *debug_disc_trc;struct dentry *debug_nodelist;
@@ -938,6 +1028,13 @@ struct lpfc_hba {struct nvmet_fc_target_port *targetport;lpfc_vpd_t vpd;/* vital product data */ +u32 cfg_max_vmid;/* maximum VMIDs allowed per port */ +u32 cfg_vmid_app_header; +#define LPFC_VMID_APP_HEADER_DISABLE 0 +#define LPFC_VMID_APP_HEADER_ENABLE 1 +u32 cfg_vmid_priority_tagging; +u32 cfg_vmid_inactivity_timeout;/* Time after which the VMID */ +/* deregisters from switch */ struct pci_dev *pcidev;struct list_head work_list;uint32_t work_ha;/* Host Attention Bits for WT */
@@ -1178,6 +1275,7 @@ struct lpfc_hba {struct list_head ct_ev_waiters;struct unsol_rcv_ct_ctx ct_ctx[LPFC_CT_CTX_MAX ];uint32_t ctx_idx; +struct timer_list inactive_vmid_poll;/* RAS Support */ struct lpfc_ras_fwlog ras_fwlog;
@@ -1419,3 +1517,27 @@ static const char *routine(enum enum_name table_key) \ } \return name; \ } + +/** +* lpfc_is_vmid_enabled - returns if VMID is enabled for either switch types +* @phba: Pointer to HBA context object. +* +* Relationship between the enable, target support and if vmid tag is required +* for the particular combination +* --------------------------------------------------- +* Switch Enable Flag Target Support VMID Needed +* --------------------------------------------------- +* App Id 0 NA N +* App Id 1 0 N +* App Id 1 1 Y +* Pr Tag 0 NA N +* Pr Tag 1 0 N +* Pr Tag 1 1 Y +* Pr Tag 2 * Y +--------------------------------------------------- +* +**/ +static inline int lpfc_is_vmid_enabled (struct lpfc_hba *phba) +{ +return phba->cfg_vmid_app_header || phba->cfg_vmid_priority_tagging; +}
drivers/scsi/lpfc/lpfc_crtn.h +11 -0
@@ -610,3 +610,14 @@ extern unsigned long lpfc_no_hba_reset[];extern union lpfc_wqe128 lpfc_iread_cmd_template;extern union lpfc_wqe128 lpfc_iwrite_cmd_template;extern union lpfc_wqe128 lpfc_icmnd_cmd_template; + +/* vmid interface */ +int lpfc_vmid_uvem (struct lpfc_vport *vport,struct lpfc_vmid *vmid,bool ins); +uint32_t lpfc_vmid_get_cs_ctl (struct lpfc_vport *vport); +int lpfc_vmid_cmd (struct lpfc_vport *vport, +int cmdcode,struct lpfc_vmid *vmid); +int lpfc_vmid_hash_fn (const char *vmid,int len); +struct lpfc_vmid *lpfc_get_vmid_from_hastable (struct lpfc_vport *vport, +uint32_t hash,uint8_t *buf); +void lpfc_vmid_vport_cleanup (struct lpfc_vport *vport); +int lpfc_issue_els_qfpa (struct lpfc_vport *vport);
drivers/scsi/lpfc/lpfc_disc.h +1 -0
@@ -124,6 +124,7 @@ struct lpfc_nodelist {uint8_t nlp_fcp_info;/* class info, bits 0-3 */ #define NLP_FCP_2_DEVICE 0x10/* FCP-2 device */ u8 nlp_nvme_info;/* NVME NSLER Support */ +uint8_t vmid_support;/* destination VMID support */ #define NLP_NVME_NSLER 0x1/* NVME NSLER device */ struct timer_list nlp_delayfunc;/* Used for delayed ELS cmds */
drivers/scsi/lpfc/lpfc_hw.h +120 -4
167 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.h +8 -0
@@ -35,6 +35,12 @@ typedef enum _lpfc_ctx_cmd {LPFC_CTX_HOST } lpfc_ctx_cmd; +union lpfc_vmid_iocb_tag { +uint32_t app_id; +uint8_t cs_ctl_vmid; +struct lpfc_vmid_context *vmid_context;/* UVEM context information */ +}; +struct lpfc_cq_event {struct list_head list;uint16_t hdwq;
@@ -100,6 +106,7 @@ struct lpfc_iocbq {#define LPFC_IO_NVME 0x200000/* NVME FCP command */ #define LPFC_IO_NVME_LS 0x400000/* NVME LS command */ #define LPFC_IO_NVMET 0x800000/* NVMET command */ +#define LPFC_IO_VMID 0x1000000/* VMID tagged IO */ uint32_t drvrTimeout;/* driver timeout in seconds */ struct lpfc_vport *vport;/* virtual port pointer */
@@ -114,6 +121,7 @@ struct lpfc_iocbq {struct lpfc_node_rrq *rrq; } context_un; +union lpfc_vmid_iocb_tag vmid_tag;void (*fabric_iocb_cmpl)(struct lpfc_hba *,struct lpfc_iocbq *,struct lpfc_iocbq *); void (*wait_iocb_cmpl)(struct lpfc_hba *, struct lpfc_iocbq *,
Signature · 1 line
2.26.2
Re: [PATCH v9 04/13] lpfc: vmid: Add the datastructure for supporting VMID in lpfc
Quoted 37 lines · Muneendra
From: Gaurav Srivastava <[email protected]>
This patch adds the primary datastructures needed to implement VMID in lpfc driver. It maintains the capability, current state, hash table for the vmid/appid along with other information. The implementation supports the two versions of vmid implementation (app header and priority tagging)
Signed-off-by Gaurav Srivastava <[email protected]>Signed-off-by James Smart <[email protected]>---
v9:
Updated the data structures
Merged patch 5 and 6 of previous version v8 to this patchv8:
modify structure member to uniform data type naming schemev7:
No changev6:
No changev5:
No Changev4:
No changev3:
No changev2:
Ported the patch on top of 5.10/scsi-queue
Removed unused variable.
Quoted 8 lines
--- drivers/scsi/lpfc/lpfc.h | 122 +++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_crtn.h | 11 +++ drivers/scsi/lpfc/lpfc_disc.h | 1 + drivers/scsi/lpfc/lpfc_hw.h | 124 ++++++++++++++++++++++++++++++++-- drivers/scsi/lpfc/lpfc_sli.h | 8 +++ 5 files changed, 262 insertions(+), 4 deletions(-)
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v9 5/13 lpfc: vmid: VMID params initialization
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
This patch initializes the VMID parameters like the type of vmid, max number of vmids supported and timeout value for the vmid registration based on the user input.
---
v9:
updated comments
v8:
No change
v7:
No change
v6:
No change
v5:
No change
v4:
No change
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue
--- drivers/scsi/lpfc/lpfc_attr.c | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
drivers/scsi/lpfc/lpfc_attr.c +48 -0
@@ -6150,6 +6150,45 @@ LPFC_ATTR_RW(enable_dpp, 1, 0, 1, "Enable Direct Packet Push");*/ LPFC_ATTR_R (enable_mi,1 ,0 ,1 ,"Enable MI" ); +/* +* lpfc_max_vmid: Maximum number of VMs to be tagged. This is valid only if +* either vmid_app_header or vmid_priority_tagging is enabled. +* 4 - 255 = vmid support enabled for 4-255 VMs +* Value range is [4,255]. +*/ +LPFC_ATTR_RW (max_vmid,LPFC_MIN_VMID ,LPFC_MIN_VMID ,LPFC_MAX_VMID , +"Maximum number of VMs supported" ); + +/* +* lpfc_vmid_inactivity_timeout: Inactivity timeout duration in hours +* 0 = Timeout is disabled +* Value range is [0,24]. +*/ +LPFC_ATTR_RW (vmid_inactivity_timeout,4 ,0 ,24 , +"Inactivity timeout in hours" ); + +/* +* lpfc_vmid_app_header: Enable App Header VMID support +* 0 = Support is disabled (default) +* 1 = Support is enabled +* Value range is [0,1]. +*/ +LPFC_ATTR_RW (vmid_app_header,LPFC_VMID_APP_HEADER_DISABLE , +LPFC_VMID_APP_HEADER_DISABLE ,LPFC_VMID_APP_HEADER_ENABLE , +"Enable App Header VMID support" ); + +/* +* lpfc_vmid_priority_tagging: Enable Priority Tagging VMID support +* 0 = Support is disabled (default) +* 1 = Allow supported targets only +* 2 = Allow all targets +* Value range is [0,2]. +*/ +LPFC_ATTR_RW (vmid_priority_tagging,LPFC_VMID_PRIO_TAG_DISABLE , +LPFC_VMID_PRIO_TAG_DISABLE , +LPFC_VMID_PRIO_TAG_ALL_TARGETS , +"Enable Priority Tagging VMID support" ); +struct device_attribute *lpfc_hba_attrs[] = { &dev_attr_nvme_info, &dev_attr_scsi_stat,
@@ -6268,6 +6307,10 @@ struct device_attribute *lpfc_hba_attrs[] = { &dev_attr_lpfc_enable_bbcr, &dev_attr_lpfc_enable_dpp, &dev_attr_lpfc_enable_mi, + &dev_attr_lpfc_max_vmid, + &dev_attr_lpfc_vmid_inactivity_timeout, + &dev_attr_lpfc_vmid_app_header, + &dev_attr_lpfc_vmid_priority_tagging, NULL, };
@@ -7327,6 +7370,11 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)lpfc_enable_hba_heartbeat_init (phba, lpfc_enable_hba_heartbeat);lpfc_EnableXLane_init (phba, lpfc_EnableXLane); +/* VMID Inits */ +lpfc_max_vmid_init (phba, lpfc_max_vmid); +lpfc_vmid_inactivity_timeout_init (phba, lpfc_vmid_inactivity_timeout); +lpfc_vmid_app_header_init (phba, lpfc_vmid_app_header); +lpfc_vmid_priority_tagging_init (phba, lpfc_vmid_priority_tagging);if (phba->sli_rev !=LPFC_SLI_REV4 ) phba->cfg_EnableXLane =0 ;lpfc_XLanePriority_init (phba, lpfc_XLanePriority);
Signature · 1 line
2.26.2
Re: [PATCH v9 05/13] lpfc: vmid: VMID params initialization
Quoted 28 lines · Muneendra
From: Gaurav Srivastava <[email protected]>
This patch initializes the VMID parameters like the type of vmid, max number of vmids supported and timeout value for the vmid registration based on the user input.
Signed-off-by Gaurav Srivastava <[email protected]>Signed-off-by James Smart <[email protected]>---
v9:
updated commentsv8:
No changev7:
No changev6:
No changev5:
No changev4:
No change
Quoted 9 lines
v3:
No changev2:
Ported the patch on top of 5.10/scsi-queue--- drivers/scsi/lpfc/lpfc_attr.c | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v9 6/13 lpfc: vmid: Add support for vmid in mailbox command, does vmid resource allocation and vmid cleanup
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
This patch does the following -
1.adds supporting datastructures for mailbox command which helps in determining if the firmware supports appid or not.
2.This patch allocates the resource for vmid and checks if the firmware supports the feature or not.
3.The patch cleans up the vmid resources and stops the timer.
---
v9:
Modified code for use of hashtable
v8:
Added new function declaration, return error code and memory allocation API changes
v7:
No change
v6:
Added Forward declarations and functions to static
v5:
Merged patches 8 and 11 of v4 to this patch
Changed Return code to non-numeric/Symbol
v4:
No change
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue
--- drivers/scsi/lpfc/lpfc_hw4.h | 12 +++++++ drivers/scsi/lpfc/lpfc_init.c | 64 +++++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_mbox.c | 6 ++++ drivers/scsi/lpfc/lpfc_scsi.c | 29 ++++++++++++++++ drivers/scsi/lpfc/lpfc_sli.c | 9 +++++ 5 files changed, 120 insertions(+)
drivers/scsi/lpfc/lpfc_hw4.h +12 -0
@@ -272,6 +272,9 @@ struct lpfc_sli4_flags {#define lpfc_vfi_rsrc_rdy_MASK 0x00000001#define lpfc_vfi_rsrc_rdy_WORD word0#define LPFC_VFI_RSRC_RDY 1 +#define lpfc_ftr_ashdr_SHIFT 4 +#define lpfc_ftr_ashdr_MASK 0x00000001 +#define lpfc_ftr_ashdr_WORD word0 };struct sli4_bls_rsp {
@@ -2943,6 +2946,9 @@ struct lpfc_mbx_request_features {#define lpfc_mbx_rq_ftr_rq_mrqp_SHIFT 16#define lpfc_mbx_rq_ftr_rq_mrqp_MASK 0x00000001#define lpfc_mbx_rq_ftr_rq_mrqp_WORD word2 +#define lpfc_mbx_rq_ftr_rq_ashdr_SHIFT 17 +#define lpfc_mbx_rq_ftr_rq_ashdr_MASK 0x00000001 +#define lpfc_mbx_rq_ftr_rq_ashdr_WORD word2uint32_t word3;#define lpfc_mbx_rq_ftr_rsp_iaab_SHIFT 0#define lpfc_mbx_rq_ftr_rsp_iaab_MASK 0x00000001
@@ -2974,6 +2980,9 @@ struct lpfc_mbx_request_features {#define lpfc_mbx_rq_ftr_rsp_mrqp_SHIFT 16#define lpfc_mbx_rq_ftr_rsp_mrqp_MASK 0x00000001#define lpfc_mbx_rq_ftr_rsp_mrqp_WORD word3 +#define lpfc_mbx_rq_ftr_rsp_ashdr_SHIFT 17 +#define lpfc_mbx_rq_ftr_rsp_ashdr_MASK 0x00000001 +#define lpfc_mbx_rq_ftr_rsp_ashdr_WORD word3 };struct lpfc_mbx_supp_pages {
@@ -4391,6 +4400,9 @@ struct wqe_common {#define wqe_xchg_WORD word10#define LPFC_SCSI_XCHG 0x0#define LPFC_NVME_XCHG 0x1 +#define wqe_appid_SHIFT 5 +#define wqe_appid_MASK 0x00000001 +#define wqe_appid_WORD word10#define wqe_oas_SHIFT 6#define wqe_oas_MASK 0x00000001#define wqe_oas_WORD word10
drivers/scsi/lpfc/lpfc_init.c +64 -0
94 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_mbox.c +6 -0
@@ -2100,6 +2100,12 @@ lpfc_request_features(struct lpfc_hba *phba, struct lpfcMboxq *mboxq)bf_set (lpfc_mbx_rq_ftr_rq_iaab, &mboxq->u.mqe.un.req_ftrs,0 );bf_set (lpfc_mbx_rq_ftr_rq_iaar, &mboxq->u.mqe.un.req_ftrs,0 ); } + +/* Enable Application Services Header for apphedr VMID */ +if (phba->cfg_vmid_app_header) { +bf_set (lpfc_mbx_rq_ftr_rq_ashdr, &mboxq->u.mqe.un.req_ftrs,1 ); +bf_set (lpfc_ftr_ashdr, &phba->sli4_hba.sli4_flags,1 ); + }return ; }
drivers/scsi/lpfc/lpfc_scsi.c +29 -0
@@ -5384,6 +5384,35 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)return 0 ; } +/* +* lpfc_vmid_vport_cleanup - cleans up the resources associated with a vports +* @vport: The virtual port for which this call is being executed. +*/ +void lpfc_vmid_vport_cleanup (struct lpfc_vport *vport) +{ +u32 bucket; +struct lpfc_vmid *cur; + +/* delete the timer */ +if (vport->port_type ==LPFC_PHYSICAL_PORT ) +del_timer_sync (&vport->phba->inactive_vmid_poll); + +/* free the resources */ +kfree (vport->qfpa_res); +kfree (vport->vmid_priority.vmid_range); +kfree (vport->vmid); + +/* for all elements in the hash table */ +if (!hash_empty (vport->hash_table)) +hash_for_each (vport->hash_table, bucket, cur, hnode) +hash_del (&cur->hnode); + +/* reset variables */ + vport->qfpa_res =NULL ; + vport->vmid_priority.vmid_range =NULL ; + vport->vmid =NULL ; + vport->cur_vmid_cnt =0 ; +}/** * lpfc_abort_handler - scsi_host_template eh_abort_handler entry point
drivers/scsi/lpfc/lpfc_sli.c +9 -0
@@ -7698,6 +7698,15 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba) goto out_free_mbox; } +/* Disable vmid if app header is not supported */ +if (phba->cfg_vmid_app_header && !(bf_get (lpfc_mbx_rq_ftr_rsp_ashdr, + &mqe->un.req_ftrs))) { +bf_set (lpfc_ftr_ashdr, &phba->sli4_hba.sli4_flags,0 ); + phba->cfg_vmid_app_header =0 ; +lpfc_printf_log (phba,KERN_DEBUG ,LOG_SLI , +"1242 vmid feature not supported\n" ); + } +/* * The port must support FCP initiator mode as this is the * only mode running in the host.
Signature · 1 line
2.26.2
Re: [PATCH v9 06/13] lpfc: vmid: Add support for vmid in mailbox command, does vmid resource allocation and vmid cleanup
Quoted 261 lines · Muneendra
From: Gaurav Srivastava <[email protected]>
This patch does the following -
1.adds supporting datastructures for mailbox command which helps in determining if the firmware supports appid or not.
2.This patch allocates the resource for vmid and checks if the firmware supports the feature or not.
3.The patch cleans up the vmid resources and stops the timer.Signed-off-by Gaurav Srivastava <[email protected]>Signed-off-by James Smart <[email protected]>---
v9:
Modified code for use of hashtablev8:
Added new function declaration, return error code and memory allocation API changesv7:
No changev6:
Added Forward declarations and functions to staticv5:
Merged patches 8 and 11 of v4 to this patch
Changed Return code to non-numeric/Symbolv4:
No changev3:
No changev2:
Ported the patch on top of 5.10/scsi-queue--- drivers/scsi/lpfc/lpfc_hw4.h | 12 +++++++ drivers/scsi/lpfc/lpfc_init.c | 64 +++++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_mbox.c | 6 ++++ drivers/scsi/lpfc/lpfc_scsi.c | 29 ++++++++++++++++ drivers/scsi/lpfc/lpfc_sli.c | 9 +++++ 5 files changed, 120 insertions(+)drivers/scsi/lpfc/lpfc_hw4.h +12
-0@@ -272,6 +272,9 @@ struct lpfc_sli4_flags {#define lpfc_vfi_rsrc_rdy_MASK 0x00000001#define lpfc_vfi_rsrc_rdy_WORD word0#define LPFC_VFI_RSRC_RDY 1 +#define lpfc_ftr_ashdr_SHIFT 4 +#define lpfc_ftr_ashdr_MASK 0x00000001 +#define lpfc_ftr_ashdr_WORD word0 };struct sli4_bls_rsp {@@ -2943,6 +2946,9 @@ struct lpfc_mbx_request_features {#define lpfc_mbx_rq_ftr_rq_mrqp_SHIFT 16#define lpfc_mbx_rq_ftr_rq_mrqp_MASK 0x00000001#define lpfc_mbx_rq_ftr_rq_mrqp_WORD word2 +#define lpfc_mbx_rq_ftr_rq_ashdr_SHIFT 17 +#define lpfc_mbx_rq_ftr_rq_ashdr_MASK 0x00000001 +#define lpfc_mbx_rq_ftr_rq_ashdr_WORD word2uint32_t word3;#define lpfc_mbx_rq_ftr_rsp_iaab_SHIFT 0#define lpfc_mbx_rq_ftr_rsp_iaab_MASK 0x00000001@@ -2974,6 +2980,9 @@ struct lpfc_mbx_request_features {#define lpfc_mbx_rq_ftr_rsp_mrqp_SHIFT 16#define lpfc_mbx_rq_ftr_rsp_mrqp_MASK 0x00000001#define lpfc_mbx_rq_ftr_rsp_mrqp_WORD word3 +#define lpfc_mbx_rq_ftr_rsp_ashdr_SHIFT 17 +#define lpfc_mbx_rq_ftr_rsp_ashdr_MASK 0x00000001 +#define lpfc_mbx_rq_ftr_rsp_ashdr_WORD word3 };struct lpfc_mbx_supp_pages {@@ -4391,6 +4400,9 @@ struct wqe_common {#define wqe_xchg_WORD word10#define LPFC_SCSI_XCHG 0x0#define LPFC_NVME_XCHG 0x1 +#define wqe_appid_SHIFT 5 +#define wqe_appid_MASK 0x00000001 +#define wqe_appid_WORD word10#define wqe_oas_SHIFT 6#define wqe_oas_MASK 0x00000001#define wqe_oas_WORD word10drivers/scsi/lpfc/lpfc_init.c +64
-0@@ -98,6 +98,7 @@ static struct scsi_transport_template *lpfc_transport_template = NULL;static struct scsi_transport_template *lpfc_vport_transport_template =NULL ;static DEFINE_IDR (lpfc_hba_index);#define LPFC_NVMET_BUF_POST 254 +static int lpfc_vmid_res_alloc (struct lpfc_hba *phba,struct lpfc_vport *vport);/** * lpfc_config_port_prep - Perform lpfc initialization prior to config port @@ -2888,6 +2889,10 @@ lpfc_cleanup(struct lpfc_vport *vport)if (phba->link_state >LPFC_LINK_DOWN )lpfc_port_link_failure (vport); +/* cleanup vmid resources */ +if (lpfc_is_vmid_enabled (phba)) +lpfc_vmid_vport_cleanup (vport); +list_for_each_entry_safe (ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {if (vport->port_type !=LPFC_PHYSICAL_PORT && ndlp->nlp_DID == Fabric_DID) {@@ -4318,6 +4323,57 @@ lpfc_get_wwpn(struct lpfc_hba *phba)return rol64 (wwn,32 ); } +/** +* lpfc_vmid_res_alloc - Allocates resources for VMID +* @phba: pointer to lpfc hba data structure. +* @vport: pointer to vport data structure +* +* This routine allocated the resources needed for the vmid. +* +* Return codes +* 0 on Succeess +* Non-0 on Failure +*/ +static int +lpfc_vmid_res_alloc (struct lpfc_hba *phba,struct lpfc_vport *vport) +{ +/* vmid feature is supported only on SLI4 */ +if (phba->sli_rev ==LPFC_SLI_REV3 ) { + phba->cfg_vmid_app_header =0 ; + phba->cfg_vmid_priority_tagging =0 ; + } + +/* if enabled, then allocated the resources */ +if (lpfc_is_vmid_enabled (phba)) { + vport->vmid = +kcalloc (phba->cfg_max_vmid,sizeof (struct lpfc_vmid ), +GFP_KERNEL ); +if (!vport->vmid) +return -ENOMEM ; + +rwlock_init (&vport->vmid_lock); + +/* setting the VMID parameters for the vport */ + vport->vmid_priority_tagging = phba->cfg_vmid_priority_tagging; + vport->vmid_inactivity_timeout = + phba->cfg_vmid_inactivity_timeout; + vport->max_vmid = phba->cfg_max_vmid; + vport->cur_vmid_cnt =0 ; + + vport->vmid_priority_range =bitmap_zalloc + (LPFC_VMID_MAX_PRIORITY_RANGE ,GFP_KERNEL ); + +if (!vport->vmid_priority_range) { +kfree (vport->vmid); +return -ENOMEM ; + } + +/* Initialize the hashtable */ +hash_init (vport->hash_table); + } +return 0 ; +} +/** * lpfc_create_port - Create an FC port * @phba: pointer to lpfc hba data structure. @@ -4470,6 +4526,12 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev) vport->port_type, shost->sg_tablesize, phba->cfg_scsi_seg_cnt, phba->cfg_sg_seg_cnt); +/* allocate the resources for vmid */ + rc =lpfc_vmid_res_alloc (phba, vport); + +if (rc) + goto out; +/* Initialize all internally managed lists. */ INIT_LIST_HEAD (&vport->fc_nodes);INIT_LIST_HEAD (&vport->rcv_buffer_list);@@ -4494,6 +4556,8 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)return vport; out_put_shost: +kfree (vport->vmid); +bitmap_free (vport->vmid_priority_range);scsi_host_put (shost); out:return NULL ;drivers/scsi/lpfc/lpfc_mbox.c +6
-0@@ -2100,6 +2100,12 @@ lpfc_request_features(struct lpfc_hba *phba, struct lpfcMboxq *mboxq)bf_set (lpfc_mbx_rq_ftr_rq_iaab, &mboxq->u.mqe.un.req_ftrs,0 );bf_set (lpfc_mbx_rq_ftr_rq_iaar, &mboxq->u.mqe.un.req_ftrs,0 ); } + +/* Enable Application Services Header for apphedr VMID */ +if (phba->cfg_vmid_app_header) { +bf_set (lpfc_mbx_rq_ftr_rq_ashdr, &mboxq->u.mqe.un.req_ftrs,1 ); +bf_set (lpfc_ftr_ashdr, &phba->sli4_hba.sli4_flags,1 ); + }return ; }drivers/scsi/lpfc/lpfc_scsi.c +29
-0@@ -5384,6 +5384,35 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)return 0 ; } +/* +* lpfc_vmid_vport_cleanup - cleans up the resources associated with a vports +* @vport: The virtual port for which this call is being executed. +*/ +void lpfc_vmid_vport_cleanup (struct lpfc_vport *vport) +{ +u32 bucket; +struct lpfc_vmid *cur; + +/* delete the timer */ +if (vport->port_type ==LPFC_PHYSICAL_PORT ) +del_timer_sync (&vport->phba->inactive_vmid_poll); + +/* free the resources */ +kfree (vport->qfpa_res); +kfree (vport->vmid_priority.vmid_range); +kfree (vport->vmid); + +/* for all elements in the hash table */ +if (!hash_empty (vport->hash_table)) +hash_for_each (vport->hash_table, bucket, cur, hnode) +hash_del (&cur->hnode); + +/* reset variables */ + vport->qfpa_res =NULL ; + vport->vmid_priority.vmid_range =NULL ; + vport->vmid =NULL ; + vport->cur_vmid_cnt =0 ; +}/** * lpfc_abort_handler - scsi_host_template eh_abort_handler entry point drivers/scsi/lpfc/lpfc_sli.c +2
-0@@ -7698,6 +7698,15 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba) goto out_free_mbox; } +/* Disable vmid if app header is not supported */ + if (phba->cfg_vmid_app_header && !(bf_get(lpfc_mbx_rq_ftr_rsp_ashdr,
drivers/scsi/lpfc/lpfc_sli.c lpfc_sli4_hba_setup(struct lpfc_hba *phba) · line 7712
Quoted 10 lines
drivers/scsi/lpfc/lpfc_sli.c +7
-0+ &mqe->un.req_ftrs))) { +bf_set (lpfc_ftr_ashdr, &phba->sli4_hba.sli4_flags,0 ); + phba->cfg_vmid_app_header =0 ; +lpfc_printf_log (phba,KERN_DEBUG ,LOG_SLI , +"1242 vmid feature not supported\n" ); + } +/* * The port must support FCP initiator mode as this is the * only mode running in the host.
I would have thought that the forward declaration for lpfc_vport_cleanup() should be present in this patch (and not the previous one). But that's largely cosmetical, so:
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v9 7/13 lpfc: vmid: Implements ELS commands for appid patch
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
This patch implements ELS command like QFPA and UVEM for the priority tagging appid support. Other supporting functions are also part of this patch.
---
v9:
Added a lock while accessing a flag
v8:
Added log messages modifications, memory allocation API changes, return error codes
v7:
No change
v6:
Added Forward declarations, static functions and
removed unused variables
v5:
Changed Return code to non-numeric/Symbol.
Addressed the review comments by Hannes
v4:
No change
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue
--- drivers/scsi/lpfc/lpfc_els.c | 366 ++++++++++++++++++++++++++++++++++- 1 file changed, 362 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +362 -4
@@ -25,6 +25,7 @@#include <linux/pci.h> #include <linux/slab.h> #include <linux/interrupt.h> +#include <linux/delay.h> #include <scsi/scsi.h> #include <scsi/scsi_device.h>
@@ -55,9 +56,15 @@ static int lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, uint8_t retry);static int lpfc_issue_fabric_iocb (struct lpfc_hba *phba,struct lpfc_iocbq *iocb); +static void lpfc_cmpl_els_uvem (struct lpfc_hba *,struct lpfc_iocbq *, +struct lpfc_iocbq *);static int lpfc_max_els_tries =3 ; +static void lpfc_init_cs_ctl_bitmap (struct lpfc_vport *vport); +static void lpfc_vmid_set_cs_ctl_range (struct lpfc_vport *vport,u32 min,u32 max); +static void lpfc_vmid_put_cs_ctl (struct lpfc_vport *vport,u32 ctcl_vmid); +/** * lpfc_els_chk_latt - Check host link attention event for a vport * @vport: pointer to a host virtual N_Port data structure.
@@ -314,10 +321,10 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS ,"0116 Xmit ELS command x%x to remote " "NPORT x%x I/O tag: x%x, port state:x%x " -"rpi x%x fc_flag:x%x\n" , +"rpi x%x fc_flag:x%x nlp_flag:x%x vport:x%p\n" , elscmd, did, elsiocb->iotag, vport->port_state, ndlp->nlp_rpi, - vport->fc_flag); + vport->fc_flag, ndlp->nlp_flag, vport); }else {/* Xmit ELS response <elsCmd> to remote NPORT <did> */ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
@@ -1112,11 +1119,15 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,/* FLOGI completes successfully */ lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS ,"0101 FLOGI completes successfully, I/O tag:x%x, " -"xri x%x Data: x%x x%x x%x x%x x%x %x\n" , +"xri x%x Data: x%x x%x x%x x%x x%x x%x x%x\n" , cmdiocb->iotag, cmdiocb->sli4_xritag, irsp->un.ulpWord[4 ], sp->cmn.e_d_tov, sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution, - vport->port_state, vport->fc_flag); + vport->port_state, vport->fc_flag, + sp->cmn.priority_tagging); + +if (sp->cmn.priority_tagging) + vport->vmid_flag |=LPFC_VMID_ISSUE_QFPA ;if (vport->port_state ==LPFC_FLOGI ) {/*
@@ -1299,6 +1310,18 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,if (sp->cmn.fcphHigh <FC_PH3 ) sp->cmn.fcphHigh =FC_PH3 ; +/* to deterine if switch supports priority tagging */ +if (phba->cfg_vmid_priority_tagging) { + sp->cmn.priority_tagging =1 ; +/* lpfc_vmid_host_uuid is combination of wwpn and wwnn */ +if (uuid_is_null ((uuid_t *)vport->lpfc_vmid_host_uuid)) { +memcpy (vport->lpfc_vmid_host_uuid, phba->wwpn, +sizeof (phba->wwpn)); +memcpy (&vport->lpfc_vmid_host_uuid[8 ], phba->wwnn, +sizeof (phba->wwnn)); + } + } +if (phba->sli_rev ==LPFC_SLI_REV4 ) {if (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) ==LPFC_SLI_INTF_IF_TYPE_0 ) {
@@ -1907,6 +1930,7 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,struct lpfc_nodelist *ndlp, *free_ndlp;struct lpfc_dmabuf *prsp;int disc; +struct serv_parm *sp =NULL ;/* we pass cmdiocb to state machine which needs rspiocb as well */ cmdiocb->context_un.rsp_iocb = rspiocb;
@@ -1997,6 +2021,23 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, cmdiocb->context2)->list.next, struct lpfc_dmabuf, list); ndlp =lpfc_plogi_confirm_nport (phba, prsp->virt, ndlp); + + sp = (struct serv_parm *)((u8 *)prsp->virt + +sizeof (u32)); + + ndlp->vmid_support =0 ; +if ((phba->cfg_vmid_app_header && sp->cmn.app_hdr_support) || + (phba->cfg_vmid_priority_tagging && + sp->cmn.priority_tagging)) { +lpfc_printf_log (phba,KERN_DEBUG ,LOG_ELS , +"4018 app_hdr_support %d tagging %d DID x%x\n" , + sp->cmn.app_hdr_support, + sp->cmn.priority_tagging, + ndlp->nlp_DID); +/* if the dest port supports VMID, mark it in ndlp */ + ndlp->vmid_support =1 ; + } +lpfc_disc_state_machine (vport, ndlp, cmdiocb,NLP_EVT_CMPL_PLOGI ); }
@@ -2119,6 +2160,14 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)memset (sp->un.vendorVersion,0 ,sizeof (sp->un.vendorVersion)); sp->cmn.bbRcvSizeMsb &=0xF ; +/* check if the destination port supports VMID */ + ndlp->vmid_support =0 ; +if (vport->vmid_priority_tagging) + sp->cmn.priority_tagging =1 ; +else if (phba->cfg_vmid_app_header && +bf_get (lpfc_ftr_ashdr, &phba->sli4_hba.sli4_flags)) + sp->cmn.app_hdr_support =1 ; +lpfc_debugfs_disc_trc (vport,LPFC_DISC_TRC_ELS_CMD ,"Issue PLOGI: did:x%x" , did,0 ,0 );
@@ -10260,3 +10309,312 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport,lpfc_unreg_rpi (vport, ndlp); } +static void lpfc_init_cs_ctl_bitmap (struct lpfc_vport *vport) +{ +bitmap_zero (vport->vmid_priority_range,LPFC_VMID_MAX_PRIORITY_RANGE ); +} + +static void +lpfc_vmid_set_cs_ctl_range (struct lpfc_vport *vport,u32 min,u32 max) +{ +u32 i; + +if ((min > max) || (max >LPFC_VMID_MAX_PRIORITY_RANGE )) +return ; + +for (i = min; i <= max; i++) +set_bit (i, vport->vmid_priority_range); +} + +static void lpfc_vmid_put_cs_ctl (struct lpfc_vport *vport,u32 ctcl_vmid) +{ +set_bit (ctcl_vmid, vport->vmid_priority_range); +} + +u32 lpfc_vmid_get_cs_ctl (struct lpfc_vport *vport) +{ +u32 i; + + i =find_first_bit (vport->vmid_priority_range, +LPFC_VMID_MAX_PRIORITY_RANGE ); + +if (i ==LPFC_VMID_MAX_PRIORITY_RANGE ) +return 0 ; + +clear_bit (i, vport->vmid_priority_range); +return i; +} + +#define MAX_PRIORITY_DESC 255 + +static void +lpfc_cmpl_els_qfpa (struct lpfc_hba *phba,struct lpfc_iocbq *cmdiocb, +struct lpfc_iocbq *rspiocb) +{ +struct lpfc_vport *vport = cmdiocb->vport; +struct priority_range_desc *desc; +struct lpfc_dmabuf *prsp =NULL ; +struct lpfc_vmid_priority_range *vmid_range =NULL ; +u32 *data; +struct lpfc_dmabuf *dmabuf = cmdiocb->context2; +IOCB_t *irsp = &rspiocb->iocb; +u8 *pcmd, max_desc; +u32 len, i; +struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *)cmdiocb->context1; + + prsp = list_get_first(&dmabuf->list, struct lpfc_dmabuf, list); +if (!prsp) + goto out; + + pcmd = prsp->virt; + data = (u32 *)pcmd; +if (data[0 ] ==ELS_CMD_LS_RJT ) { +lpfc_printf_vlog (vport,KERN_WARNING ,LOG_SLI , +"3277 QFPA LS_RJT x%x x%x\n" , + data[0 ], data[1 ]); + goto out; + } +if (irsp->ulpStatus) { +lpfc_printf_vlog (vport,KERN_ERR ,LOG_SLI , +"6529 QFPA failed with status x%x x%x\n" , + irsp->ulpStatus, irsp->un.ulpWord[4 ]); + goto out; + } + +if (!vport->qfpa_res) { + max_desc =FCELSSIZE /sizeof (*vport->qfpa_res); + vport->qfpa_res =kcalloc (max_desc,sizeof (*vport->qfpa_res), +GFP_KERNEL ); +if (!vport->qfpa_res) + goto out; + } + + len = *((u32 *)(pcmd +4 )); + len =be32_to_cpu (len); +memcpy (vport->qfpa_res, pcmd, len +8 ); + len = len /LPFC_PRIORITY_RANGE_DESC_SIZE ; + + desc = (struct priority_range_desc *)(pcmd +8 ); + vmid_range = vport->vmid_priority.vmid_range; +if (!vmid_range) { + vmid_range =kcalloc (MAX_PRIORITY_DESC ,sizeof (*vmid_range), +GFP_KERNEL ); +if (!vmid_range) { +kfree (vport->qfpa_res); + goto out; + } + vport->vmid_priority.vmid_range = vmid_range; + } + vport->vmid_priority.num_descriptors = len; + +for (i =0 ; i < len; i++, vmid_range++, desc++) { +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_ELS , +"6539 vmid values low=%d, high=%d, qos=%d, " +"local ve id=%d\n" , desc->lo_range, + desc->hi_range, desc->qos_priority, + desc->local_ve_id); + + vmid_range->low = desc->lo_range <<1 ; +if (desc->local_ve_id ==QFPA_ODD_ONLY ) + vmid_range->low++; +if (desc->qos_priority) + vport->vmid_flag |=LPFC_VMID_QOS_ENABLED ; + vmid_range->qos = desc->qos_priority; + + vmid_range->high = desc->hi_range <<1 ; +if ((desc->local_ve_id ==QFPA_ODD_ONLY ) || + (desc->local_ve_id ==QFPA_EVEN_ODD )) + vmid_range->high++; + } +lpfc_init_cs_ctl_bitmap (vport); +for (i =0 ; i < vport->vmid_priority.num_descriptors; i++) { +lpfc_vmid_set_cs_ctl_range (vport, + vport->vmid_priority.vmid_range[i].low, + vport->vmid_priority.vmid_range[i].high); + } + + vport->vmid_flag |=LPFC_VMID_QFPA_CMPL ; + out: +lpfc_els_free_iocb (phba, cmdiocb); +lpfc_nlp_put (ndlp); +} + +int lpfc_issue_els_qfpa (struct lpfc_vport *vport) +{ +struct lpfc_hba *phba = vport->phba; +struct lpfc_nodelist *ndlp; +struct lpfc_iocbq *elsiocb; +u8 *pcmd; +int ret; + + ndlp =lpfc_findnode_did (phba->pport, Fabric_DID); +if (!ndlp || ndlp->nlp_state !=NLP_STE_UNMAPPED_NODE ) +return -ENXIO ; + + elsiocb =lpfc_prep_els_iocb (vport,1 ,LPFC_QFPA_SIZE ,2 , ndlp, + ndlp->nlp_DID,ELS_CMD_QFPA ); +if (!elsiocb) +return -ENOMEM ; + + pcmd = (u8 *)(((struct lpfc_dmabuf *)elsiocb->context2)->virt); + + *((u32 *)(pcmd)) =ELS_CMD_QFPA ; + pcmd +=4 ; + + elsiocb->iocb_cmpl = lpfc_cmpl_els_qfpa; + + elsiocb->context1 =lpfc_nlp_get (ndlp); +if (!elsiocb->context1) { +lpfc_els_free_iocb (vport->phba, elsiocb); +return -ENXIO ; + } + + ret =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,2 ); +if (ret !=IOCB_SUCCESS ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return -EIO ; + } + vport->vmid_flag &= ~LPFC_VMID_QOS_ENABLED ; +return 0 ; +} + +int +lpfc_vmid_uvem (struct lpfc_vport *vport, +struct lpfc_vmid *vmid,bool instantiated) +{ +struct lpfc_vem_id_desc *vem_id_desc; +struct lpfc_nodelist *ndlp; +struct lpfc_iocbq *elsiocb; +struct instantiated_ve_desc *inst_desc; +struct lpfc_vmid_context *vmid_context; +u8 *pcmd; +u32 *len; +int ret =0 ; + + ndlp =lpfc_findnode_did (vport, Fabric_DID); +if (!ndlp || ndlp->nlp_state !=NLP_STE_UNMAPPED_NODE ) +return -ENXIO ; + + vmid_context =kmalloc (sizeof (*vmid_context),GFP_KERNEL ); +if (!vmid_context) +return -ENOMEM ; + elsiocb =lpfc_prep_els_iocb (vport,1 ,LPFC_UVEM_SIZE ,2 , + ndlp, Fabric_DID,ELS_CMD_UVEM ); +if (!elsiocb) + goto out; + +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_ELS , +"3427 Host vmid %s %d\n" , + vmid->host_vmid, instantiated); + vmid_context->vmp = vmid; + vmid_context->nlp = ndlp; + vmid_context->instantiated = instantiated; + elsiocb->vmid_tag.vmid_context = vmid_context; + pcmd = (u8 *)(((struct lpfc_dmabuf *)elsiocb->context2)->virt); + +if (uuid_is_null ((uuid_t *)vport->lpfc_vmid_host_uuid)) +memcpy (vport->lpfc_vmid_host_uuid, vmid->host_vmid, +LPFC_COMPRESS_VMID_SIZE ); + + *((u32 *)(pcmd)) =ELS_CMD_UVEM ; + len = (u32 *)(pcmd +4 ); + *len =cpu_to_be32 (LPFC_UVEM_SIZE -8 ); + + vem_id_desc = (struct lpfc_vem_id_desc *)(pcmd +8 ); + vem_id_desc->tag =be32_to_cpu (VEM_ID_DESC_TAG ); + vem_id_desc->length =be32_to_cpu (LPFC_UVEM_VEM_ID_DESC_SIZE ); +memcpy (vem_id_desc->vem_id, vport->lpfc_vmid_host_uuid, +LPFC_COMPRESS_VMID_SIZE ); + + inst_desc = (struct instantiated_ve_desc *)(pcmd +32 ); + inst_desc->tag =be32_to_cpu (INSTANTIATED_VE_DESC_TAG ); + inst_desc->length =be32_to_cpu (LPFC_UVEM_VE_MAP_DESC_SIZE ); +memcpy (inst_desc->global_vem_id, vmid->host_vmid, +LPFC_COMPRESS_VMID_SIZE ); + +bf_set (lpfc_instantiated_nport_id, inst_desc, vport->fc_myDID); +bf_set (lpfc_instantiated_local_id, inst_desc, + vmid->un.cs_ctl_vmid); +if (instantiated) { + inst_desc->tag =be32_to_cpu (INSTANTIATED_VE_DESC_TAG ); + }else { + inst_desc->tag =be32_to_cpu (DEINSTANTIATED_VE_DESC_TAG ); +lpfc_vmid_put_cs_ctl (vport, vmid->un.cs_ctl_vmid); + } + inst_desc->word6 =cpu_to_be32 (inst_desc->word6); + + elsiocb->iocb_cmpl = lpfc_cmpl_els_uvem; + + elsiocb->context1 =lpfc_nlp_get (ndlp); +if (!elsiocb->context1) { +lpfc_els_free_iocb (vport->phba, elsiocb); + goto out; + } + + ret =lpfc_sli_issue_iocb (vport->phba,LPFC_ELS_RING , elsiocb,0 ); +if (ret !=IOCB_SUCCESS ) { +lpfc_els_free_iocb (vport->phba, elsiocb); +lpfc_nlp_put (ndlp); + goto out; + } + +return 0 ; + out: +kfree (vmid_context); +return -EIO ; +} + +static void +lpfc_cmpl_els_uvem (struct lpfc_hba *phba,struct lpfc_iocbq *icmdiocb, +struct lpfc_iocbq *rspiocb) +{ +struct lpfc_vport *vport = icmdiocb->vport; +struct lpfc_dmabuf *prsp =NULL ; +struct lpfc_vmid_context *vmid_context = + icmdiocb->vmid_tag.vmid_context; +struct lpfc_nodelist *ndlp = icmdiocb->context1; +u8 *pcmd; +u32 *data; +IOCB_t *irsp = &rspiocb->iocb; +struct lpfc_dmabuf *dmabuf = icmdiocb->context2; +struct lpfc_vmid *vmid; + + vmid = vmid_context->vmp; +if (!ndlp || ndlp->nlp_state !=NLP_STE_UNMAPPED_NODE ) + ndlp =NULL ; + + prsp = list_get_first(&dmabuf->list, struct lpfc_dmabuf, list); +if (!prsp) + goto out; + pcmd = prsp->virt; + data = (u32 *)pcmd; +if (data[0 ] ==ELS_CMD_LS_RJT ) { +lpfc_printf_vlog (vport,KERN_WARNING ,LOG_SLI , +"4532 UVEM LS_RJT %x %x\n" , data[0 ], data[1 ]); + goto out; + } +if (irsp->ulpStatus) { +lpfc_printf_vlog (vport,KERN_WARNING ,LOG_SLI , +"4533 UVEM error status %x: %x\n" , + irsp->ulpStatus, irsp->un.ulpWord[4 ]); + goto out; + } +spin_lock (&phba->hbalock); +/* Set IN USE flag */ + vport->vmid_flag |=LPFC_VMID_IN_USE ; + phba->pport->vmid_flag |=LPFC_VMID_IN_USE ; +spin_unlock (&phba->hbalock); + +if (vmid_context->instantiated) { +write_lock (&vport->vmid_lock); + vmid->flag |=LPFC_VMID_REGISTERED ; + vmid->flag &= ~LPFC_VMID_REQ_REGISTER ; +write_unlock (&vport->vmid_lock); + } + + out: +kfree (vmid_context); +lpfc_els_free_iocb (phba, icmdiocb); +lpfc_nlp_put (ndlp); +}
Signature · 1 line
2.26.2
Re: [PATCH v9 07/13] lpfc: vmid: Implements ELS commands for appid patch
Quoted 100 lines · Muneendra
From: Gaurav Srivastava <[email protected]>
This patch implements ELS command like QFPA and UVEM for the priority tagging appid support. Other supporting functions are also part of this patch.
Signed-off-by Gaurav Srivastava <[email protected]>Signed-off-by James Smart <[email protected]>---
v9:
Added a lock while accessing a flagv8:
Added log messages modifications, memory allocation API changes, return error codesv7:
No changev6:
Added Forward declarations, static functions and
removed unused variablesv5:
Changed Return code to non-numeric/Symbol.
Addressed the review comments by Hannesv4:
No changev3:
No changev2:
Ported the patch on top of 5.10/scsi-queue--- drivers/scsi/lpfc/lpfc_els.c | 366 ++++++++++++++++++++++++++++++++++- 1 file changed, 362 insertions(+), 4 deletions(-)drivers/scsi/lpfc/lpfc_els.c +15
-4@@ -25,6 +25,7 @@#include <linux/pci.h> #include <linux/slab.h> #include <linux/interrupt.h> +#include <linux/delay.h> #include <scsi/scsi.h> #include <scsi/scsi_device.h> @@ -55,9 +56,15 @@ static int lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, uint8_t retry);static int lpfc_issue_fabric_iocb (struct lpfc_hba *phba,struct lpfc_iocbq *iocb); +static void lpfc_cmpl_els_uvem (struct lpfc_hba *,struct lpfc_iocbq *, +struct lpfc_iocbq *);static int lpfc_max_els_tries =3 ; +static void lpfc_init_cs_ctl_bitmap (struct lpfc_vport *vport); +static void lpfc_vmid_set_cs_ctl_range (struct lpfc_vport *vport,u32 min,u32 max); +static void lpfc_vmid_put_cs_ctl (struct lpfc_vport *vport,u32 ctcl_vmid); +/** * lpfc_els_chk_latt - Check host link attention event for a vport * @vport: pointer to a host virtual N_Port data structure. @@ -314,10 +321,10 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS ,"0116 Xmit ELS command x%x to remote " "NPORT x%x I/O tag: x%x, port state:x%x " -"rpi x%x fc_flag:x%x\n" , +"rpi x%x fc_flag:x%x nlp_flag:x%x vport:x%p\n" , elscmd, did, elsiocb->iotag, vport->port_state, ndlp->nlp_rpi, - vport->fc_flag); + vport->fc_flag, ndlp->nlp_flag, vport); }else {/* Xmit ELS response <elsCmd> to remote NPORT <did> */ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,@@ -1112,11 +1119,15 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,/* FLOGI completes successfully */ lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS ,"0101 FLOGI completes successfully, I/O tag:x%x, " -"xri x%x Data: x%x x%x x%x x%x x%x %x\n" , +"xri x%x Data: x%x x%x x%x x%x x%x x%x x%x\n" , cmdiocb->iotag, cmdiocb->sli4_xritag, irsp->un.ulpWord[4 ], sp->cmn.e_d_tov, sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution, - vport->port_state, vport->fc_flag); + vport->port_state, vport->fc_flag, + sp->cmn.priority_tagging); + +if (sp->cmn.priority_tagging) + vport->vmid_flag |=LPFC_VMID_ISSUE_QFPA ;if (vport->port_state ==LPFC_FLOGI ) {/*
drivers/scsi/lpfc/lpfc_els.c lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, · line 1313
Quoted 4 lines
drivers/scsi/lpfc/lpfc_els.c +1
-0@@ -1299,6 +1310,18 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,if (sp->cmn.fcphHigh <FC_PH3 ) sp->cmn.fcphHigh =FC_PH3 ; +/* to deterine if switch supports priority tagging */
determine (sp) ...
Quoted 365 lines
drivers/scsi/lpfc/lpfc_els.c +336
-0+if (phba->cfg_vmid_priority_tagging) { + sp->cmn.priority_tagging =1 ; +/* lpfc_vmid_host_uuid is combination of wwpn and wwnn */ +if (uuid_is_null ((uuid_t *)vport->lpfc_vmid_host_uuid)) { +memcpy (vport->lpfc_vmid_host_uuid, phba->wwpn, +sizeof (phba->wwpn)); +memcpy (&vport->lpfc_vmid_host_uuid[8 ], phba->wwnn, +sizeof (phba->wwnn)); + } + } +if (phba->sli_rev ==LPFC_SLI_REV4 ) {if (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) ==LPFC_SLI_INTF_IF_TYPE_0 ) {@@ -1907,6 +1930,7 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,struct lpfc_nodelist *ndlp, *free_ndlp;struct lpfc_dmabuf *prsp;int disc; +struct serv_parm *sp =NULL ;/* we pass cmdiocb to state machine which needs rspiocb as well */ cmdiocb->context_un.rsp_iocb = rspiocb;@@ -1997,6 +2021,23 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, cmdiocb->context2)->list.next, struct lpfc_dmabuf, list); ndlp =lpfc_plogi_confirm_nport (phba, prsp->virt, ndlp); + + sp = (struct serv_parm *)((u8 *)prsp->virt + +sizeof (u32)); + + ndlp->vmid_support =0 ; +if ((phba->cfg_vmid_app_header && sp->cmn.app_hdr_support) || + (phba->cfg_vmid_priority_tagging && + sp->cmn.priority_tagging)) { +lpfc_printf_log (phba,KERN_DEBUG ,LOG_ELS , +"4018 app_hdr_support %d tagging %d DID x%x\n" , + sp->cmn.app_hdr_support, + sp->cmn.priority_tagging, + ndlp->nlp_DID); +/* if the dest port supports VMID, mark it in ndlp */ + ndlp->vmid_support =1 ; + } +lpfc_disc_state_machine (vport, ndlp, cmdiocb,NLP_EVT_CMPL_PLOGI ); }@@ -2119,6 +2160,14 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)memset (sp->un.vendorVersion,0 ,sizeof (sp->un.vendorVersion)); sp->cmn.bbRcvSizeMsb &=0xF ; +/* check if the destination port supports VMID */ + ndlp->vmid_support =0 ; +if (vport->vmid_priority_tagging) + sp->cmn.priority_tagging =1 ; +else if (phba->cfg_vmid_app_header && +bf_get (lpfc_ftr_ashdr, &phba->sli4_hba.sli4_flags)) + sp->cmn.app_hdr_support =1 ; +lpfc_debugfs_disc_trc (vport,LPFC_DISC_TRC_ELS_CMD ,"Issue PLOGI: did:x%x" , did,0 ,0 );@@ -10260,3 +10309,312 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport,lpfc_unreg_rpi (vport, ndlp); } +static void lpfc_init_cs_ctl_bitmap (struct lpfc_vport *vport) +{ +bitmap_zero (vport->vmid_priority_range,LPFC_VMID_MAX_PRIORITY_RANGE ); +} + +static void +lpfc_vmid_set_cs_ctl_range (struct lpfc_vport *vport,u32 min,u32 max) +{ +u32 i; + +if ((min > max) || (max >LPFC_VMID_MAX_PRIORITY_RANGE )) +return ; + +for (i = min; i <= max; i++) +set_bit (i, vport->vmid_priority_range); +} + +static void lpfc_vmid_put_cs_ctl (struct lpfc_vport *vport,u32 ctcl_vmid) +{ +set_bit (ctcl_vmid, vport->vmid_priority_range); +} + +u32 lpfc_vmid_get_cs_ctl (struct lpfc_vport *vport) +{ +u32 i; + + i =find_first_bit (vport->vmid_priority_range, +LPFC_VMID_MAX_PRIORITY_RANGE ); + +if (i ==LPFC_VMID_MAX_PRIORITY_RANGE ) +return 0 ; + +clear_bit (i, vport->vmid_priority_range); +return i; +} + +#define MAX_PRIORITY_DESC 255 + +static void +lpfc_cmpl_els_qfpa (struct lpfc_hba *phba,struct lpfc_iocbq *cmdiocb, +struct lpfc_iocbq *rspiocb) +{ +struct lpfc_vport *vport = cmdiocb->vport; +struct priority_range_desc *desc; +struct lpfc_dmabuf *prsp =NULL ; +struct lpfc_vmid_priority_range *vmid_range =NULL ; +u32 *data; +struct lpfc_dmabuf *dmabuf = cmdiocb->context2; +IOCB_t *irsp = &rspiocb->iocb; +u8 *pcmd, max_desc; +u32 len, i; +struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *)cmdiocb->context1; + + prsp = list_get_first(&dmabuf->list, struct lpfc_dmabuf, list); +if (!prsp) + goto out; + + pcmd = prsp->virt; + data = (u32 *)pcmd; +if (data[0 ] ==ELS_CMD_LS_RJT ) { +lpfc_printf_vlog (vport,KERN_WARNING ,LOG_SLI , +"3277 QFPA LS_RJT x%x x%x\n" , + data[0 ], data[1 ]); + goto out; + } +if (irsp->ulpStatus) { +lpfc_printf_vlog (vport,KERN_ERR ,LOG_SLI , +"6529 QFPA failed with status x%x x%x\n" , + irsp->ulpStatus, irsp->un.ulpWord[4 ]); + goto out; + } + +if (!vport->qfpa_res) { + max_desc =FCELSSIZE /sizeof (*vport->qfpa_res); + vport->qfpa_res =kcalloc (max_desc,sizeof (*vport->qfpa_res), +GFP_KERNEL ); +if (!vport->qfpa_res) + goto out; + } + + len = *((u32 *)(pcmd +4 )); + len =be32_to_cpu (len); +memcpy (vport->qfpa_res, pcmd, len +8 ); + len = len /LPFC_PRIORITY_RANGE_DESC_SIZE ; + + desc = (struct priority_range_desc *)(pcmd +8 ); + vmid_range = vport->vmid_priority.vmid_range; +if (!vmid_range) { + vmid_range =kcalloc (MAX_PRIORITY_DESC ,sizeof (*vmid_range), +GFP_KERNEL ); +if (!vmid_range) { +kfree (vport->qfpa_res); + goto out; + } + vport->vmid_priority.vmid_range = vmid_range; + } + vport->vmid_priority.num_descriptors = len; + +for (i =0 ; i < len; i++, vmid_range++, desc++) { +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_ELS , +"6539 vmid values low=%d, high=%d, qos=%d, " +"local ve id=%d\n" , desc->lo_range, + desc->hi_range, desc->qos_priority, + desc->local_ve_id); + + vmid_range->low = desc->lo_range <<1 ; +if (desc->local_ve_id ==QFPA_ODD_ONLY ) + vmid_range->low++; +if (desc->qos_priority) + vport->vmid_flag |=LPFC_VMID_QOS_ENABLED ; + vmid_range->qos = desc->qos_priority; + + vmid_range->high = desc->hi_range <<1 ; +if ((desc->local_ve_id ==QFPA_ODD_ONLY ) || + (desc->local_ve_id ==QFPA_EVEN_ODD )) + vmid_range->high++; + } +lpfc_init_cs_ctl_bitmap (vport); +for (i =0 ; i < vport->vmid_priority.num_descriptors; i++) { +lpfc_vmid_set_cs_ctl_range (vport, + vport->vmid_priority.vmid_range[i].low, + vport->vmid_priority.vmid_range[i].high); + } + + vport->vmid_flag |=LPFC_VMID_QFPA_CMPL ; + out: +lpfc_els_free_iocb (phba, cmdiocb); +lpfc_nlp_put (ndlp); +} + +int lpfc_issue_els_qfpa (struct lpfc_vport *vport) +{ +struct lpfc_hba *phba = vport->phba; +struct lpfc_nodelist *ndlp; +struct lpfc_iocbq *elsiocb; +u8 *pcmd; +int ret; + + ndlp =lpfc_findnode_did (phba->pport, Fabric_DID); +if (!ndlp || ndlp->nlp_state !=NLP_STE_UNMAPPED_NODE ) +return -ENXIO ; + + elsiocb =lpfc_prep_els_iocb (vport,1 ,LPFC_QFPA_SIZE ,2 , ndlp, + ndlp->nlp_DID,ELS_CMD_QFPA ); +if (!elsiocb) +return -ENOMEM ; + + pcmd = (u8 *)(((struct lpfc_dmabuf *)elsiocb->context2)->virt); + + *((u32 *)(pcmd)) =ELS_CMD_QFPA ; + pcmd +=4 ; + + elsiocb->iocb_cmpl = lpfc_cmpl_els_qfpa; + + elsiocb->context1 =lpfc_nlp_get (ndlp); +if (!elsiocb->context1) { +lpfc_els_free_iocb (vport->phba, elsiocb); +return -ENXIO ; + } + + ret =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,2 ); +if (ret !=IOCB_SUCCESS ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return -EIO ; + } + vport->vmid_flag &= ~LPFC_VMID_QOS_ENABLED ; +return 0 ; +} + +int +lpfc_vmid_uvem (struct lpfc_vport *vport, +struct lpfc_vmid *vmid,bool instantiated) +{ +struct lpfc_vem_id_desc *vem_id_desc; +struct lpfc_nodelist *ndlp; +struct lpfc_iocbq *elsiocb; +struct instantiated_ve_desc *inst_desc; +struct lpfc_vmid_context *vmid_context; +u8 *pcmd; +u32 *len; +int ret =0 ; + + ndlp =lpfc_findnode_did (vport, Fabric_DID); +if (!ndlp || ndlp->nlp_state !=NLP_STE_UNMAPPED_NODE ) +return -ENXIO ; + + vmid_context =kmalloc (sizeof (*vmid_context),GFP_KERNEL ); +if (!vmid_context) +return -ENOMEM ; + elsiocb =lpfc_prep_els_iocb (vport,1 ,LPFC_UVEM_SIZE ,2 , + ndlp, Fabric_DID,ELS_CMD_UVEM ); +if (!elsiocb) + goto out; + +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_ELS , +"3427 Host vmid %s %d\n" , + vmid->host_vmid, instantiated); + vmid_context->vmp = vmid; + vmid_context->nlp = ndlp; + vmid_context->instantiated = instantiated; + elsiocb->vmid_tag.vmid_context = vmid_context; + pcmd = (u8 *)(((struct lpfc_dmabuf *)elsiocb->context2)->virt); + +if (uuid_is_null ((uuid_t *)vport->lpfc_vmid_host_uuid)) +memcpy (vport->lpfc_vmid_host_uuid, vmid->host_vmid, +LPFC_COMPRESS_VMID_SIZE ); + + *((u32 *)(pcmd)) =ELS_CMD_UVEM ; + len = (u32 *)(pcmd +4 ); + *len =cpu_to_be32 (LPFC_UVEM_SIZE -8 ); + + vem_id_desc = (struct lpfc_vem_id_desc *)(pcmd +8 ); + vem_id_desc->tag =be32_to_cpu (VEM_ID_DESC_TAG ); + vem_id_desc->length =be32_to_cpu (LPFC_UVEM_VEM_ID_DESC_SIZE ); +memcpy (vem_id_desc->vem_id, vport->lpfc_vmid_host_uuid, +LPFC_COMPRESS_VMID_SIZE ); + + inst_desc = (struct instantiated_ve_desc *)(pcmd +32 ); + inst_desc->tag =be32_to_cpu (INSTANTIATED_VE_DESC_TAG ); + inst_desc->length =be32_to_cpu (LPFC_UVEM_VE_MAP_DESC_SIZE ); +memcpy (inst_desc->global_vem_id, vmid->host_vmid, +LPFC_COMPRESS_VMID_SIZE ); + +bf_set (lpfc_instantiated_nport_id, inst_desc, vport->fc_myDID); +bf_set (lpfc_instantiated_local_id, inst_desc, + vmid->un.cs_ctl_vmid); +if (instantiated) { + inst_desc->tag =be32_to_cpu (INSTANTIATED_VE_DESC_TAG ); + }else { + inst_desc->tag =be32_to_cpu (DEINSTANTIATED_VE_DESC_TAG ); +lpfc_vmid_put_cs_ctl (vport, vmid->un.cs_ctl_vmid); + } + inst_desc->word6 =cpu_to_be32 (inst_desc->word6); + + elsiocb->iocb_cmpl = lpfc_cmpl_els_uvem; + + elsiocb->context1 =lpfc_nlp_get (ndlp); +if (!elsiocb->context1) { +lpfc_els_free_iocb (vport->phba, elsiocb); + goto out; + } + + ret =lpfc_sli_issue_iocb (vport->phba,LPFC_ELS_RING , elsiocb,0 ); +if (ret !=IOCB_SUCCESS ) { +lpfc_els_free_iocb (vport->phba, elsiocb); +lpfc_nlp_put (ndlp); + goto out; + } + +return 0 ; + out: +kfree (vmid_context); +return -EIO ; +} + +static void +lpfc_cmpl_els_uvem (struct lpfc_hba *phba,struct lpfc_iocbq *icmdiocb, +struct lpfc_iocbq *rspiocb) +{ +struct lpfc_vport *vport = icmdiocb->vport; +struct lpfc_dmabuf *prsp =NULL ; +struct lpfc_vmid_context *vmid_context = + icmdiocb->vmid_tag.vmid_context; +struct lpfc_nodelist *ndlp = icmdiocb->context1; +u8 *pcmd; +u32 *data; +IOCB_t *irsp = &rspiocb->iocb; +struct lpfc_dmabuf *dmabuf = icmdiocb->context2; +struct lpfc_vmid *vmid; + + vmid = vmid_context->vmp; +if (!ndlp || ndlp->nlp_state !=NLP_STE_UNMAPPED_NODE ) + ndlp =NULL ; + + prsp = list_get_first(&dmabuf->list, struct lpfc_dmabuf, list); +if (!prsp) + goto out; + pcmd = prsp->virt; + data = (u32 *)pcmd; +if (data[0 ] ==ELS_CMD_LS_RJT ) { +lpfc_printf_vlog (vport,KERN_WARNING ,LOG_SLI , +"4532 UVEM LS_RJT %x %x\n" , data[0 ], data[1 ]); + goto out; + } +if (irsp->ulpStatus) { +lpfc_printf_vlog (vport,KERN_WARNING ,LOG_SLI , +"4533 UVEM error status %x: %x\n" , + irsp->ulpStatus, irsp->un.ulpWord[4 ]); + goto out; + } +spin_lock (&phba->hbalock); +/* Set IN USE flag */ + vport->vmid_flag |=LPFC_VMID_IN_USE ; + phba->pport->vmid_flag |=LPFC_VMID_IN_USE ; +spin_unlock (&phba->hbalock); + +if (vmid_context->instantiated) { +write_lock (&vport->vmid_lock);
drivers/scsi/lpfc/lpfc_els.c lpfc_sli_abts_recover_port(struct lpfc_vport *vport, · line 10620
Quoted 10 lines
drivers/scsi/lpfc/lpfc_els.c +10
-0+ vmid->flag |=LPFC_VMID_REGISTERED ; + vmid->flag &= ~LPFC_VMID_REQ_REGISTER ; +write_unlock (&vport->vmid_lock); + } + + out: +kfree (vmid_context); +lpfc_els_free_iocb (phba, icmdiocb); +lpfc_nlp_put (ndlp); +}
Other than that:
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Re: [PATCH v9 07/13] lpfc: vmid: Implements ELS commands for appid patch
In reply to MuneendraHey,
Quoted 149 lines · Muneendra
From: Gaurav Srivastava <[email protected]>
This patch implements ELS command like QFPA and UVEM for the priority tagging appid support. Other supporting functions are also part of this patch.
Signed-off-by Gaurav Srivastava <[email protected]>Signed-off-by James Smart <[email protected]>---
v9:
Added a lock while accessing a flagv8:
Added log messages modifications, memory allocation API changes, return error codesv7:
No changev6:
Added Forward declarations, static functions and
removed unused variablesv5:
Changed Return code to non-numeric/Symbol.
Addressed the review comments by Hannesv4:
No changev3:
No changev2:
Ported the patch on top of 5.10/scsi-queue--- drivers/scsi/lpfc/lpfc_els.c | 366 ++++++++++++++++++++++++++++++++++- 1 file changed, 362 insertions(+), 4 deletions(-)drivers/scsi/lpfc/lpfc_els.c +101
-0@@ -10260,3 +10309,312 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport,lpfc_unreg_rpi (vport, ndlp); } +static void lpfc_init_cs_ctl_bitmap (struct lpfc_vport *vport) +{ +bitmap_zero (vport->vmid_priority_range,LPFC_VMID_MAX_PRIORITY_RANGE ); +} + +static void +lpfc_vmid_set_cs_ctl_range (struct lpfc_vport *vport,u32 min,u32 max) +{ +u32 i; + +if ((min > max) || (max >LPFC_VMID_MAX_PRIORITY_RANGE )) +return ; + +for (i = min; i <= max; i++) +set_bit (i, vport->vmid_priority_range); +} + +static void lpfc_vmid_put_cs_ctl (struct lpfc_vport *vport,u32 ctcl_vmid) +{ +set_bit (ctcl_vmid, vport->vmid_priority_range); +} + +u32 lpfc_vmid_get_cs_ctl (struct lpfc_vport *vport) +{ +u32 i; + + i =find_first_bit (vport->vmid_priority_range, +LPFC_VMID_MAX_PRIORITY_RANGE ); + +if (i ==LPFC_VMID_MAX_PRIORITY_RANGE ) +return 0 ; + +clear_bit (i, vport->vmid_priority_range); +return i; +} + +#define MAX_PRIORITY_DESC 255 + +static void +lpfc_cmpl_els_qfpa (struct lpfc_hba *phba,struct lpfc_iocbq *cmdiocb, +struct lpfc_iocbq *rspiocb) +{ +struct lpfc_vport *vport = cmdiocb->vport; +struct priority_range_desc *desc; +struct lpfc_dmabuf *prsp =NULL ; +struct lpfc_vmid_priority_range *vmid_range =NULL ; +u32 *data; +struct lpfc_dmabuf *dmabuf = cmdiocb->context2; +IOCB_t *irsp = &rspiocb->iocb; +u8 *pcmd, max_desc; +u32 len, i; +struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *)cmdiocb->context1; + + prsp = list_get_first(&dmabuf->list, struct lpfc_dmabuf, list); +if (!prsp) + goto out; + + pcmd = prsp->virt; + data = (u32 *)pcmd; +if (data[0 ] ==ELS_CMD_LS_RJT ) { +lpfc_printf_vlog (vport,KERN_WARNING ,LOG_SLI , +"3277 QFPA LS_RJT x%x x%x\n" , + data[0 ], data[1 ]); + goto out; + } +if (irsp->ulpStatus) { +lpfc_printf_vlog (vport,KERN_ERR ,LOG_SLI , +"6529 QFPA failed with status x%x x%x\n" , + irsp->ulpStatus, irsp->un.ulpWord[4 ]); + goto out; + } + +if (!vport->qfpa_res) { + max_desc =FCELSSIZE /sizeof (*vport->qfpa_res); + vport->qfpa_res =kcalloc (max_desc,sizeof (*vport->qfpa_res), +GFP_KERNEL ); +if (!vport->qfpa_res) + goto out; + } + + len = *((u32 *)(pcmd +4 )); + len =be32_to_cpu (len); +memcpy (vport->qfpa_res, pcmd, len +8 ); + len = len /LPFC_PRIORITY_RANGE_DESC_SIZE ; + + desc = (struct priority_range_desc *)(pcmd +8 ); + vmid_range = vport->vmid_priority.vmid_range; +if (!vmid_range) { + vmid_range =kcalloc (MAX_PRIORITY_DESC ,sizeof (*vmid_range), +GFP_KERNEL ); +if (!vmid_range) { +kfree (vport->qfpa_res); + goto out; + } + vport->vmid_priority.vmid_range = vmid_range; + } + vport->vmid_priority.num_descriptors = len; + +for (i =0 ; i < len; i++, vmid_range++, desc++) { +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_ELS , + "6539 vmid values low=%d, high=%d, qos=%d, "
drivers/scsi/lpfc/lpfc_els.c lpfc_sli_abts_recover_port(struct lpfc_vport *vport, · line 10422
Quoted 10 lines
drivers/scsi/lpfc/lpfc_els.c +10
-0+"local ve id=%d\n" , desc->lo_range, + desc->hi_range, desc->qos_priority, + desc->local_ve_id); + + vmid_range->low = desc->lo_range <<1 ; +if (desc->local_ve_id ==QFPA_ODD_ONLY ) + vmid_range->low++; +if (desc->qos_priority) + vport->vmid_flag |=LPFC_VMID_QOS_ENABLED ; + vmid_range->qos = desc->qos_priority;
I'm curios, if the FC-switch signals it supports QoS for a range here, how exactly interacts this with the VM IDs that you seem to allocate dynamically during runtime for cgroups that request specific App IDs? You don't seem to use LPFC_VMID_QOS_ENABLED anywhere else in the series.
Would different cgroups get different QoS classes/guarantees depending on the selected VM ID (higher VM ID gets better QoS class, or something like that?)? Would the tagged traffic be handled differently than the ordinary traffic in the fabric?
I tried to get something from FC-LS (-5) or FC-FS (-6), but they are extremely sparse somehow. FC-LS-5 just says "QoS priority provided" for the field.. and FC-FS doesn't say anything regarding QoS if the tagging extension in CS_CTL is used.
Quoted 58 lines
drivers/scsi/lpfc/lpfc_els.c +58
-0+ + vmid_range->high = desc->hi_range <<1 ; +if ((desc->local_ve_id ==QFPA_ODD_ONLY ) || + (desc->local_ve_id ==QFPA_EVEN_ODD )) + vmid_range->high++; + } +lpfc_init_cs_ctl_bitmap (vport); +for (i =0 ; i < vport->vmid_priority.num_descriptors; i++) { +lpfc_vmid_set_cs_ctl_range (vport, + vport->vmid_priority.vmid_range[i].low, + vport->vmid_priority.vmid_range[i].high); + } + + vport->vmid_flag |=LPFC_VMID_QFPA_CMPL ; + out: +lpfc_els_free_iocb (phba, cmdiocb); +lpfc_nlp_put (ndlp); +} + +int lpfc_issue_els_qfpa (struct lpfc_vport *vport) +{ +struct lpfc_hba *phba = vport->phba; +struct lpfc_nodelist *ndlp; +struct lpfc_iocbq *elsiocb; +u8 *pcmd; +int ret; + + ndlp =lpfc_findnode_did (phba->pport, Fabric_DID); +if (!ndlp || ndlp->nlp_state !=NLP_STE_UNMAPPED_NODE ) +return -ENXIO ; + + elsiocb =lpfc_prep_els_iocb (vport,1 ,LPFC_QFPA_SIZE ,2 , ndlp, + ndlp->nlp_DID,ELS_CMD_QFPA ); +if (!elsiocb) +return -ENOMEM ; + + pcmd = (u8 *)(((struct lpfc_dmabuf *)elsiocb->context2)->virt); + + *((u32 *)(pcmd)) =ELS_CMD_QFPA ; + pcmd +=4 ; + + elsiocb->iocb_cmpl = lpfc_cmpl_els_qfpa; + + elsiocb->context1 =lpfc_nlp_get (ndlp); +if (!elsiocb->context1) { +lpfc_els_free_iocb (vport->phba, elsiocb); +return -ENXIO ; + } + + ret =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,2 ); +if (ret !=IOCB_SUCCESS ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return -EIO ; + } + vport->vmid_flag &= ~LPFC_VMID_QOS_ENABLED ; +return 0 ; +}
Signature · 4 lines
Best Regards, Benjamin Block / Linux on IBM Z Kernel Development / IBM Systems IBM Deutschland Research & Development GmbH / https://www.ibm.com/privacy Vorsitz. AufsR.: Gregor Pillen / Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen / Registergericht: AmtsG Stuttgart, HRB 243294
Re: [PATCH v9 07/13] lpfc: vmid: Implements ELS commands for appid patch
On 4/20/2021 5:38 AM, Benjamin Block wrote:
...
Quoted 33 lines
Quoted 21 lines
drivers/scsi/lpfc/lpfc_els.c +21
-0+ len = *((u32 *)(pcmd +4 )); + len =be32_to_cpu (len); +memcpy (vport->qfpa_res, pcmd, len +8 ); + len = len /LPFC_PRIORITY_RANGE_DESC_SIZE ; + + desc = (struct priority_range_desc *)(pcmd +8 ); + vmid_range = vport->vmid_priority.vmid_range; +if (!vmid_range) { + vmid_range =kcalloc (MAX_PRIORITY_DESC ,sizeof (*vmid_range), +GFP_KERNEL ); +if (!vmid_range) { +kfree (vport->qfpa_res); + goto out; + } + vport->vmid_priority.vmid_range = vmid_range; + } + vport->vmid_priority.num_descriptors = len; + +for (i =0 ; i < len; i++, vmid_range++, desc++) { +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_ELS , + "6539 vmid values low=%d, high=%d, qos=%d, "drivers/scsi/lpfc/lpfc_els.c lpfc_sli_abts_recover_port(struct lpfc_vport *vport, · line 10422
Quoted 10 lines
drivers/scsi/lpfc/lpfc_els.c +10
-0+"local ve id=%d\n" , desc->lo_range, + desc->hi_range, desc->qos_priority, + desc->local_ve_id); + + vmid_range->low = desc->lo_range <<1 ; +if (desc->local_ve_id ==QFPA_ODD_ONLY ) + vmid_range->low++; +if (desc->qos_priority) + vport->vmid_flag |=LPFC_VMID_QOS_ENABLED ; + vmid_range->qos = desc->qos_priority;I'm curios, if the FC-switch signals it supports QoS for a range here, how
Quoted 8 lines
exactly interacts this with the VM IDs that you seem to allocate dynamically during runtime for cgroups that request specific App IDs? You don't seem to use
LPFC_VMID_QOS_ENABLEDanywhere else in the series. >
Would different cgroups get different QoS classes/guarantees depending on the selected VM ID (higher VM ID gets better QoS class, or something like that?)? Would the tagged traffic be handled differently than the ordinary traffic in the fabric?
The simple answer is there is no interaction w/ the cgroup on priority.
And no- we really don't look or use it. The ranges don't really have hard priority values. The way it works is that all values within a range is equal; a value in the first range is "higher priority" than a value in the second range; and a value in the second range is higher than those in the third range, and so on. Doesn't really matter whether the range was marked Best Effort or H/M/L. There's no real "weight".
What you see is the driver simply recording the different ranges so that it knows what to allocate from later on. The driver creates a flat bitmap of all possible values (max of 255) from all ranges - then will allocate values on a first bit set basis. I know at one point we were going to only auto-assign if there was 1 range, and if multiple range was going to defer a mgmt authority to tell us which range, but this obviously doesn't do that.
Also... although this is coded to support the full breadth of what the standard allows, it may well be the switch only implements 1 range in practice.
Quoted 5 lines
I tried to get something from FC-LS (-5) or FC-FS (-6), but they are extremely sparse somehow. FC-LS-5 just says "QoS priority provided" for the field.. and FC-FS doesn't say anything regarding QoS if the tagging extension in
CS_CTLis used.
Yes - most of the discussion on how this form of VMID is used/performed was given in the T11 proposals, but as most of that is informational and non-normative, very little ends up getting into the spec.
FC-LS-5 section 9 "Priority Tagging" is what you want to look at.
The other form of VMID is the Application Tag (up to 32bits) which is described in FC-GS-8 section 6.9 Application Server. Both forms map a value to a uuid and the switch may apply some QoS level to the value when it sees it.
The priority tagging method seems to tie in more to qos, but the application tag is can equally be done although any qos aspects are solely in the switch and not exported to the driver/host.
-- james
Re: [PATCH v9 07/13] lpfc: vmid: Implements ELS commands for appid patch
Quoted 44 lines · James Smart
On 4/20/2021 5:38 AM, Benjamin Block wrote:
...Quoted 33 lines
Quoted 21 lines
drivers/scsi/lpfc/lpfc_els.c +21
-0+ len = *((u32 *)(pcmd +4 )); + len =be32_to_cpu (len); +memcpy (vport->qfpa_res, pcmd, len +8 ); + len = len /LPFC_PRIORITY_RANGE_DESC_SIZE ; + + desc = (struct priority_range_desc *)(pcmd +8 ); + vmid_range = vport->vmid_priority.vmid_range; +if (!vmid_range) { + vmid_range =kcalloc (MAX_PRIORITY_DESC ,sizeof (*vmid_range), +GFP_KERNEL ); +if (!vmid_range) { +kfree (vport->qfpa_res); + goto out; + } + vport->vmid_priority.vmid_range = vmid_range; + } + vport->vmid_priority.num_descriptors = len; + +for (i =0 ; i < len; i++, vmid_range++, desc++) { +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_ELS , + "6539 vmid values low=%d, high=%d, qos=%d, "drivers/scsi/lpfc/lpfc_els.c lpfc_sli_abts_recover_port(struct lpfc_vport *vport, · line 10422
Quoted 10 lines
drivers/scsi/lpfc/lpfc_els.c +10
-0+"local ve id=%d\n" , desc->lo_range, + desc->hi_range, desc->qos_priority, + desc->local_ve_id); + + vmid_range->low = desc->lo_range <<1 ; +if (desc->local_ve_id ==QFPA_ODD_ONLY ) + vmid_range->low++; +if (desc->qos_priority) + vport->vmid_flag |=LPFC_VMID_QOS_ENABLED ; + vmid_range->qos = desc->qos_priority;I'm curios, if the FC-switch signals it supports QoS for a range here, how
Quoted 8 lines
exactly interacts this with the VM IDs that you seem to allocate dynamically during runtime for cgroups that request specific App IDs? You don't seem to use
LPFC_VMID_QOS_ENABLEDanywhere else in the series. >
Would different cgroups get different QoS classes/guarantees depending on the selected VM ID (higher VM ID gets better QoS class, or something like that?)? Would the tagged traffic be handled differently than the ordinary traffic in the fabric?
Quoted 6 lines
The simple answer is there is no interaction w/ the cgroup on priority. And no- we really don't look or use it. The ranges don't really have hard priority values. The way it works is that all values within a range is equal; a value in the first range is "higher priority" than a value in the second range; and a value in the second range is higher than those in the third range, and so on.
Ah. That's interesting. I thought it is like that, but wasn't sure from the spec. Thanks for clarifying.
Quoted 9 lines
Doesn't really matter whether the range was marked Best Effort or H/M/L. There's no real "weight".
What you see is the driver simply recording the different ranges so that it knows what to allocate from later on. The driver creates a flat bitmap of all possible values (max of 255) from all ranges - then will allocate values on a first bit set basis. I know at one point we were going to only auto-assign if there was 1 range, and if multiple range was going to defer a mgmt authority to tell us which range, but this obviously doesn't do that.
I was worrying a bit whether this would create some hard to debug problems in the wild, when QoS essentially depends on the order in which Applications/Containers are started and get IDs assigned accordingly - assuming there is multiple priority ranges.
Quoted 4 lines
Also... although this is coded to support the full breadth of what the standard allows, it may well be the switch only implements 1 range in practice.
Signature · 4 lines
Best Regards, Benjamin Block / Linux on IBM Z Kernel Development / IBM Systems IBM Deutschland Research & Development GmbH / https://www.ibm.com/privacy Vorsitz. AufsR.: Gregor Pillen / Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen / Registergericht: AmtsG Stuttgart, HRB 243294
PATCH v9 8/13 lpfc: vmid: Functions to manage vmids
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
This patch contains the routines to save, retrieve and remove the vmids from the data structure. A hash table is used to save the vmids and the corresponding UUIDs associated with the application/VMs.
---
v9:
Added changes for implementing kernel based hashtable
v8:
Added correct return value and error codes
v7:
No change
v6:
Added Forward declarations and functions to static
v5:
Changed Return code to non-numeric/Symbol
v4:
No change
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue
--- drivers/scsi/lpfc/lpfc_scsi.c | 118 ++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+)
drivers/scsi/lpfc/lpfc_scsi.c +118 -0
@@ -28,6 +28,7 @@#include <asm/unaligned.h> #include <linux/t10-pi.h> #include <linux/crc-t10dif.h> +#include <linux/blk-cgroup.h> #include <net/checksum.h> #include <scsi/scsi.h>
@@ -86,6 +87,14 @@ static void lpfc_release_scsi_buf_s3(struct lpfc_hba *phba, struct lpfc_io_buf *psb);static int lpfc_prot_group_type (struct lpfc_hba *phba,struct scsi_cmnd *sc); +static void +lpfc_put_vmid_in_hashtable (struct lpfc_vport *vport,u32 hash, +struct lpfc_vmid *vmp); +static void lpfc_vmid_update_entry (struct lpfc_vport *vport,struct scsi_cmnd + *cmd,struct lpfc_vmid *vmp, +union lpfc_vmid_io_tag *tag); +static void lpfc_vmid_assign_cs_ctl (struct lpfc_vport *vport, +struct lpfc_vmid *vmid);static inline unsigned lpfc_cmd_blksize (struct scsi_cmnd *sc)
@@ -5145,6 +5154,115 @@ void lpfc_poll_timeout(struct timer_list *t) } } +/* +* lpfc_get_vmid_from_hastable - search the UUID in the hash table +* @vport: The virtual port for which this call is being executed. +* @hash: calculated hash value +* @buf: uuid associated with the VE +* Returns the vmid entry associated with the UUID +* Make sure to acquire the appropriate lock before invoking this routine. +*/ +struct lpfc_vmid *lpfc_get_vmid_from_hastable (struct lpfc_vport *vport, +u32 hash,u8 *buf) +{ +struct lpfc_vmid *vmp; + +hash_for_each_possible (vport->hash_table, vmp, hnode, hash) { +if (memcmp (&vmp->host_vmid[0 ], buf,16 ) ==0 ) +return vmp; + } +return NULL ; +} + +/* +* lpfc_put_vmid_from_hastable - put the VMID in the hash table +* @vport: The virtual port for which this call is being executed. +* @hash - calculated hash value +* @vmp: Pointer to a VMID entry representing a VM sending IO +* +* This routine will insert the newly acquired vmid entity in the hash table. +* Make sure to acquire the appropriate lock before invoking this routine. +*/ +static void +lpfc_put_vmid_in_hashtable (struct lpfc_vport *vport,u32 hash, +struct lpfc_vmid *vmp) +{ +hash_add (vport->hash_table, &vmp->hnode, hash); +} + +/* +* lpfc_vmid_hash_fn - creates a hash value of the UUID +* @vmid: uuid associated with the VE +* @len: length of the vmid string +* Returns the calculated hash value +*/ +int lpfc_vmid_hash_fn (const char *vmid,int len) +{ +int c; +int hash =0 ; + +if (len ==0 ) +return 0 ; +while (len--) { + c = *vmid++; +if (c >='A' && c <='Z' ) + c +='a' -'A' ; + + hash = (hash + (c <<LPFC_VMID_HASH_SHIFT ) + + (c >>LPFC_VMID_HASH_SHIFT )) *19 ; + } + +return hash &LPFC_VMID_HASH_MASK ; +} + +/* +* lpfc_vmid_update_entry - update the vmid entry in the hash table +* @vport: The virtual port for which this call is being executed. +* @cmd: address of scsi cmmd descriptor +* @vmp: Pointer to a VMID entry representing a VM sending IO +* @tag: VMID tag +*/ +static void lpfc_vmid_update_entry (struct lpfc_vport *vport,struct scsi_cmnd + *cmd,struct lpfc_vmid *vmp, +union lpfc_vmid_io_tag *tag) +{ +u64 *lta; + +if (vport->vmid_priority_tagging) + tag->cs_ctl_vmid = vmp->un.cs_ctl_vmid; +else + tag->app_id = vmp->un.app_id; + +if (cmd->sc_data_direction ==DMA_TO_DEVICE ) + vmp->io_wr_cnt++; +else + vmp->io_rd_cnt++; + +/* update the last access timestamp in the table */ + lta =per_cpu_ptr (vmp->last_io_time,raw_smp_processor_id ()); + *lta = jiffies; +} + +static void lpfc_vmid_assign_cs_ctl (struct lpfc_vport *vport, +struct lpfc_vmid *vmid) +{ +u32 hash; +struct lpfc_vmid *pvmid; + +if (vport->port_type ==LPFC_PHYSICAL_PORT ) { + vmid->un.cs_ctl_vmid =lpfc_vmid_get_cs_ctl (vport); + }else { + hash =lpfc_vmid_hash_fn (vmid->host_vmid, vmid->vmid_len); + pvmid = +lpfc_get_vmid_from_hastable (vport->phba->pport, hash, + vmid->host_vmid); +if (pvmid) + vmid->un.cs_ctl_vmid = pvmid->un.cs_ctl_vmid; +else + vmid->un.cs_ctl_vmid =lpfc_vmid_get_cs_ctl (vport); + } +} +/** * lpfc_queuecommand - scsi_host_template queuecommand entry point * @shost: kernel scsi host pointer.
Signature · 1 line
2.26.2
Re: [PATCH v9 08/13] lpfc: vmid: Functions to manage vmids
Quoted 68 lines · Muneendra
From: Gaurav Srivastava <[email protected]>
This patch contains the routines to save, retrieve and remove the vmids from the data structure. A hash table is used to save the vmids and the corresponding UUIDs associated with the application/VMs.
Signed-off-by Gaurav Srivastava <[email protected]>Signed-off-by James Smart <[email protected]>---
v9:
Added changes for implementing kernel based hashtablev8:
Added correct return value and error codesv7:
No changev6:
Added Forward declarations and functions to staticv5:
Changed Return code to non-numeric/Symbolv4:
No changev3:
No changev2:
Ported the patch on top of 5.10/scsi-queue--- drivers/scsi/lpfc/lpfc_scsi.c | 118 ++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+)drivers/scsi/lpfc/lpfc_scsi.c +9
-0@@ -28,6 +28,7 @@#include <asm/unaligned.h> #include <linux/t10-pi.h> #include <linux/crc-t10dif.h> +#include <linux/blk-cgroup.h> #include <net/checksum.h> #include <scsi/scsi.h> @@ -86,6 +87,14 @@ static void lpfc_release_scsi_buf_s3(struct lpfc_hba *phba, struct lpfc_io_buf *psb);static int lpfc_prot_group_type (struct lpfc_hba *phba,struct scsi_cmnd *sc); +static void +lpfc_put_vmid_in_hashtable (struct lpfc_vport *vport,u32 hash, +struct lpfc_vmid *vmp); +static void lpfc_vmid_update_entry (struct lpfc_vport *vport,struct scsi_cmnd + *cmd,struct lpfc_vmid *vmp, +union lpfc_vmid_io_tag *tag); +static void lpfc_vmid_assign_cs_ctl (struct lpfc_vport *vport, +struct lpfc_vmid *vmid);static inline unsigned lpfc_cmd_blksize (struct scsi_cmnd *sc)@@ -5145,6 +5154,115 @@ void lpfc_poll_timeout(struct timer_list *t) } }
drivers/scsi/lpfc/lpfc_scsi.c void lpfc_poll_timeout(struct timer_list *t) · line 5166
Quoted 10 lines
drivers/scsi/lpfc/lpfc_scsi.c +10
-0+/* +* lpfc_get_vmid_from_hastable - search the UUID in the hash table +* @vport: The virtual port for which this call is being executed. +* @hash: calculated hash value +* @buf: uuid associated with the VE +* Returns the vmid entry associated with the UUID +* Make sure to acquire the appropriate lock before invoking this routine. +*/ +struct lpfc_vmid *lpfc_get_vmid_from_hastable (struct lpfc_vport *vport, +u32 hash,u8 *buf)
lpfc_get_vmid_from_hashtable(), please.
Quoted 16 lines
drivers/scsi/lpfc/lpfc_scsi.c +16
-0+{ +struct lpfc_vmid *vmp; + +hash_for_each_possible (vport->hash_table, vmp, hnode, hash) { +if (memcmp (&vmp->host_vmid[0 ], buf,16 ) ==0 ) +return vmp; + } +return NULL ; +} + +/* +* lpfc_put_vmid_from_hastable - put the VMID in the hash table +* @vport: The virtual port for which this call is being executed. +* @hash - calculated hash value +* @vmp: Pointer to a VMID entry representing a VM sending IO +*
drivers/scsi/lpfc/lpfc_scsi.c void lpfc_poll_timeout(struct timer_list *t) · line 5192
Quoted 10 lines
drivers/scsi/lpfc/lpfc_scsi.c +10
-0+* This routine will insert the newly acquired vmid entity in the hash table. +* Make sure to acquire the appropriate lock before invoking this routine. +*/ +static void +lpfc_put_vmid_in_hashtable (struct lpfc_vport *vport,u32 hash, +struct lpfc_vmid *vmp) +{ +hash_add (vport->hash_table, &vmp->hnode, hash); +} +
Similar here; lpfc_put_vmid_in_hashtable()
Quoted 67 lines
drivers/scsi/lpfc/lpfc_scsi.c +66
-0+/* +* lpfc_vmid_hash_fn - creates a hash value of the UUID +* @vmid: uuid associated with the VE +* @len: length of the vmid string +* Returns the calculated hash value +*/ +int lpfc_vmid_hash_fn (const char *vmid,int len) +{ +int c; +int hash =0 ; + +if (len ==0 ) +return 0 ; +while (len--) { + c = *vmid++; +if (c >='A' && c <='Z' ) + c +='a' -'A' ; + + hash = (hash + (c <<LPFC_VMID_HASH_SHIFT ) + + (c >>LPFC_VMID_HASH_SHIFT )) *19 ; + } + +return hash &LPFC_VMID_HASH_MASK ; +} + +/* +* lpfc_vmid_update_entry - update the vmid entry in the hash table +* @vport: The virtual port for which this call is being executed. +* @cmd: address of scsi cmmd descriptor +* @vmp: Pointer to a VMID entry representing a VM sending IO +* @tag: VMID tag +*/ +static void lpfc_vmid_update_entry (struct lpfc_vport *vport,struct scsi_cmnd + *cmd,struct lpfc_vmid *vmp, +union lpfc_vmid_io_tag *tag) +{ +u64 *lta; + +if (vport->vmid_priority_tagging) + tag->cs_ctl_vmid = vmp->un.cs_ctl_vmid; +else + tag->app_id = vmp->un.app_id; + +if (cmd->sc_data_direction ==DMA_TO_DEVICE ) + vmp->io_wr_cnt++; +else + vmp->io_rd_cnt++; + +/* update the last access timestamp in the table */ + lta =per_cpu_ptr (vmp->last_io_time,raw_smp_processor_id ()); + *lta = jiffies; +} + +static void lpfc_vmid_assign_cs_ctl (struct lpfc_vport *vport, +struct lpfc_vmid *vmid) +{ +u32 hash; +struct lpfc_vmid *pvmid; + +if (vport->port_type ==LPFC_PHYSICAL_PORT ) { + vmid->un.cs_ctl_vmid =lpfc_vmid_get_cs_ctl (vport); + }else { + hash =lpfc_vmid_hash_fn (vmid->host_vmid, vmid->vmid_len); + pvmid = +lpfc_get_vmid_from_hastable (vport->phba->pport, hash, + vmid->host_vmid);
drivers/scsi/lpfc/lpfc_scsi.c void lpfc_poll_timeout(struct timer_list *t) · line 5268
Quoted 10 lines
drivers/scsi/lpfc/lpfc_scsi.c +7
-0+if (pvmid) + vmid->un.cs_ctl_vmid = pvmid->un.cs_ctl_vmid; +else + vmid->un.cs_ctl_vmid =lpfc_vmid_get_cs_ctl (vport); + } +} +/** * lpfc_queuecommand - scsi_host_template queuecommand entry point * @shost: kernel scsi host pointer.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v9 9/13 lpfc: vmid: Implements CT commands for appid.
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
The patch implements CT commands for registering and deregistering the appid for the application. Also, a small change in decrementing the ndlp ref counter has been added.
---
v9:
Added Changes related to locking and new hashtable implementation
v8:
modified log messages and fixed the refcount
v7:
No Change
v6:
Added Forward declarations and functions to static
v5:
No change
v4:
No change
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue Removed redundant code due to changes since last submit
--- drivers/scsi/lpfc/lpfc_ct.c | 257 +++++++++++++++++++++++++++++++++++- 1 file changed, 256 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_ct.c +256 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2020 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2021 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2004-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
@@ -75,6 +75,9 @@static char *lpfc_release_version =LPFC_DRIVER_VERSION ; +static void +lpfc_cmpl_ct_cmd_vmid (struct lpfc_hba *phba,struct lpfc_iocbq *cmdiocb, +struct lpfc_iocbq *rspiocb); static void lpfc_ct_ignore_hbq_buffer(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq,
@@ -3744,3 +3747,255 @@ lpfc_decode_firmware_rev(struct lpfc_hba *phba, char *fwrevision, int flag) }return ; } + +static void +lpfc_cmpl_ct_cmd_vmid (struct lpfc_hba *phba,struct lpfc_iocbq *cmdiocb, +struct lpfc_iocbq *rspiocb) +{ +struct lpfc_vport *vport = cmdiocb->vport; +struct lpfc_dmabuf *inp = cmdiocb->context1; +struct lpfc_dmabuf *outp = cmdiocb->context2; +struct lpfc_sli_ct_request *ctcmd = inp->virt; +struct lpfc_sli_ct_request *ctrsp = outp->virt; +u16 rsp = ctrsp->CommandResponse.bits.CmdRsp; +struct app_id_object *app; +u32 cmd, hash, bucket; +struct lpfc_vmid *vmp, *cur; +u8 *data = outp->virt; +int i; + + cmd =be16_to_cpu (ctcmd->CommandResponse.bits.CmdRsp); +if (cmd ==SLI_CTAS_DALLAPP_ID ) +lpfc_ct_free_iocb (phba, cmdiocb); + +if (lpfc_els_chk_latt (vport) || rspiocb->iocb.ulpStatus) { +if (cmd !=SLI_CTAS_DALLAPP_ID ) +return ; + } +/* Check for a CT LS_RJT response */ +if (rsp ==be16_to_cpu (SLI_CT_RESPONSE_FS_RJT )) { +if (cmd !=SLI_CTAS_DALLAPP_ID ) +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"3306 VMID FS_RJT Data: x%x x%x x%x\n" , + cmd, ctrsp->ReasonCode, + ctrsp->Explanation); +if ((cmd !=SLI_CTAS_DALLAPP_ID ) || + (ctrsp->ReasonCode !=SLI_CT_UNABLE_TO_PERFORM_REQ ) || + (ctrsp->Explanation !=SLI_CT_APP_ID_NOT_AVAILABLE )) { +/* If DALLAPP_ID failed retry later */ +if (cmd ==SLI_CTAS_DALLAPP_ID ) + vport->load_flag |=FC_DEREGISTER_ALL_APP_ID ; +return ; + } + } + +switch (cmd) { +case SLI_CTAS_RAPP_IDENT : + app = (struct app_id_object *)(RAPP_IDENT_OFFSET + data); +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"6712 RAPP_IDENT app id %d port id x%x id " +"len %d\n" ,be32_to_cpu (app->app_id), +be32_to_cpu (app->port_id), + app->obj.entity_id_len); + +if (app->obj.entity_id_len ==0 || app->port_id ==0 ) +return ; + + hash =lpfc_vmid_hash_fn (app->obj.entity_id, + app->obj.entity_id_len); + vmp =lpfc_get_vmid_from_hastable (vport, hash, + app->obj.entity_id); +if (vmp) { +write_lock (&vport->vmid_lock); + vmp->un.app_id =be32_to_cpu (app->app_id); + vmp->flag |=LPFC_VMID_REGISTERED ; + vmp->flag &= ~LPFC_VMID_REQ_REGISTER ; +write_unlock (&vport->vmid_lock); +/* Set IN USE flag */ + vport->vmid_flag |=LPFC_VMID_IN_USE ; + }else { +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"6901 No entry found %s hash %d\n" , + app->obj.entity_id, hash); + } +break ; +case SLI_CTAS_DAPP_IDENT : + app = (struct app_id_object *)(DAPP_IDENT_OFFSET + data); +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"6713 DAPP_IDENT app id %d port id x%x\n" , +be32_to_cpu (app->app_id), +be32_to_cpu (app->port_id)); +break ; +case SLI_CTAS_DALLAPP_ID : +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"8856 Deregistered all app ids\n" ); +read_lock (&vport->vmid_lock); +for (i =0 ; i < phba->cfg_max_vmid; i++) { + vmp = &vport->vmid[i]; +if (vmp->flag !=LPFC_VMID_SLOT_FREE ) +memset (vmp,0 ,sizeof (struct lpfc_vmid )); + } +read_unlock (&vport->vmid_lock); +/* for all elements in the hash table */ +if (!hash_empty (vport->hash_table)) +hash_for_each (vport->hash_table, bucket, cur, hnode) +hash_del (&cur->hnode); + vport->load_flag |=FC_ALLOW_VMID ; +break ; +default : +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"8857 Invalid command code\n" ); + } +} + +/** +* lpfc_vmid_cmd - Build and send a FDMI cmd to the specified NPort +* @vport: pointer to a host virtual N_Port data structure. +* @ndlp: ndlp to send FDMI cmd to (if NULL use FDMI_DID) +* cmdcode: FDMI command to send +* mask: Mask of HBA or PORT Attributes to send +* +* Builds and sends a FDMI command using the CT subsystem. +*/ +int +lpfc_vmid_cmd (struct lpfc_vport *vport, +int cmdcode,struct lpfc_vmid *vmid) +{ +struct lpfc_hba *phba = vport->phba; +struct lpfc_dmabuf *mp, *bmp; +struct lpfc_sli_ct_request *ctreq; +struct ulp_bde64 *bpl; +u32 size; +u32 rsp_size; +u8 *data; +struct lpfc_vmid_rapp_ident_list *rap; +struct lpfc_vmid_dapp_ident_list *dap; +u8 retry =0 ; +struct lpfc_nodelist *ndlp; + +void (*cmpl)(struct lpfc_hba *phba,struct lpfc_iocbq *cmdiocb, +struct lpfc_iocbq *rspiocb); + + ndlp =lpfc_findnode_did (vport,FDMI_DID ); +if (!ndlp || ndlp->nlp_state !=NLP_STE_UNMAPPED_NODE ) +return 0 ; + + cmpl = lpfc_cmpl_ct_cmd_vmid; + +/* fill in BDEs for command */ +/* Allocate buffer for command payload */ + mp =kmalloc (sizeof (*mp),GFP_KERNEL ); +if (!mp) + goto vmid_free_mp_exit; + + mp->virt =lpfc_mbuf_alloc (phba,0 , &mp->phys); +if (!mp->virt) + goto vmid_free_mp_virt_exit; + +/* Allocate buffer for Buffer ptr list */ + bmp =kmalloc (sizeof (*bmp),GFP_KERNEL ); +if (!bmp) + goto vmid_free_bmp_exit; + + bmp->virt =lpfc_mbuf_alloc (phba,0 , &bmp->phys); +if (!bmp->virt) + goto vmid_free_bmp_virt_exit; + +INIT_LIST_HEAD (&mp->list); +INIT_LIST_HEAD (&bmp->list); + +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"3275 VMID Request Data: x%x x%x x%x\n" , + vport->fc_flag, vport->port_state, cmdcode); + ctreq = (struct lpfc_sli_ct_request *)mp->virt; + data = mp->virt; +/* First populate the CT_IU preamble */ +memset (data,0 ,LPFC_BPL_SIZE ); + ctreq->RevisionId.bits.Revision =SLI_CT_REVISION ; + ctreq->RevisionId.bits.InId =0 ; + + ctreq->FsType =SLI_CT_MANAGEMENT_SERVICE ; + ctreq->FsSubType = SLI_CT_APP_SEV_Subtypes; + + ctreq->CommandResponse.bits.CmdRsp =cpu_to_be16 (cmdcode); + rsp_size =LPFC_BPL_SIZE ; + size =0 ; + +switch (cmdcode) { +case SLI_CTAS_RAPP_IDENT : +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"1329 RAPP_IDENT for %s\n" , vmid->host_vmid); + ctreq->un.PortID =cpu_to_be32 (vport->fc_myDID); + rap = (struct lpfc_vmid_rapp_ident_list *) + (DAPP_IDENT_OFFSET + data); + rap->no_of_objects =cpu_to_be32 (1 ); + rap->obj[0 ].entity_id_len = vmid->vmid_len; +memcpy (rap->obj[0 ].entity_id, vmid->host_vmid, vmid->vmid_len); + size =RAPP_IDENT_OFFSET + +sizeof (struct lpfc_vmid_rapp_ident_list ); + retry =1 ; +break ; + +case SLI_CTAS_GALLAPPIA_ID : + ctreq->un.PortID =cpu_to_be32 (vport->fc_myDID); + size =GALLAPPIA_ID_SIZE ; +break ; + +case SLI_CTAS_DAPP_IDENT : +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"1469 DAPP_IDENT for %s\n" , vmid->host_vmid); + ctreq->un.PortID =cpu_to_be32 (vport->fc_myDID); + dap = (struct lpfc_vmid_dapp_ident_list *) + (DAPP_IDENT_OFFSET + data); + dap->no_of_objects =cpu_to_be32 (1 ); + dap->obj[0 ].entity_id_len = vmid->vmid_len; +memcpy (dap->obj[0 ].entity_id, vmid->host_vmid, vmid->vmid_len); + size =DAPP_IDENT_OFFSET + +sizeof (struct lpfc_vmid_dapp_ident_list ); +write_lock (&vport->vmid_lock); + vmid->flag &= ~LPFC_VMID_REGISTERED ; +write_unlock (&vport->vmid_lock); + retry =1 ; +break ; + +case SLI_CTAS_DALLAPP_ID : + ctreq->un.PortID =cpu_to_be32 (vport->fc_myDID); + size =DALLAPP_ID_SIZE ; +break ; + +default : +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"7062 VMID cmdcode x%x not supported\n" , + cmdcode); + goto vmid_free_all_mem; + } + + ctreq->CommandResponse.bits.Size =cpu_to_be16 (rsp_size); + + bpl = (struct ulp_bde64 *)bmp->virt; + bpl->addrHigh =putPaddrHigh (mp->phys); + bpl->addrLow =putPaddrLow (mp->phys); + bpl->tus.f.bdeFlags =0 ; + bpl->tus.f.bdeSize = size; + +/* The lpfc_ct_cmd/lpfc_get_req shall increment ndlp reference count +* to hold ndlp reference for the corresponding callback function. +*/ +if (!lpfc_ct_cmd (vport, mp, bmp, ndlp, cmpl, rsp_size, retry)) +return 0 ; + + vmid_free_all_mem: +lpfc_mbuf_free (phba, bmp->virt, bmp->phys); + vmid_free_bmp_virt_exit: +kfree (bmp); + vmid_free_bmp_exit: +lpfc_mbuf_free (phba, mp->virt, mp->phys); + vmid_free_mp_virt_exit: +kfree (mp); + vmid_free_mp_exit: + +/* Issue CT request failed */ +lpfc_printf_vlog (vport,KERN_DEBUG ,LOG_DISCOVERY , +"3276 VMID CT request failed Data: x%x\n" , cmdcode); +return -EIO ; +}
Signature · 1 line
2.26.2
Re: [PATCH v9 09/13] lpfc: vmid: Implements CT commands for appid.
Quoted 31 lines · Muneendra
From: Gaurav Srivastava <[email protected]>
The patch implements CT commands for registering and deregistering the appid for the application. Also, a small change in decrementing the ndlp ref counter has been added.
Signed-off-by Gaurav Srivastava <[email protected]>Signed-off-by James Smart <[email protected]>---
v9:
Added Changes related to locking and new hashtable implementationv8:
modified log messages and fixed the refcountv7:
No Changev6:
Added Forward declarations and functions to staticv5:
No changev4:
No changev3:
No change
Quoted 7 lines
v2:
Ported the patch on top of 5.10/scsi-queue Removed redundant code due to changes since last submit--- drivers/scsi/lpfc/lpfc_ct.c | 257 +++++++++++++++++++++++++++++++++++- 1 file changed, 256 insertions(+), 1 deletion(-)
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v9 10/13 lpfc: vmid: Appends the vmid in the wqe before sending
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
This patch adds the vmid in wqe before sending out the request. The type of vmid depends on the configured type and is checked before being appended.
---
v9:
No change
v8:
Modified the log messages
v7:
No change
v6:
No change
v5:
Modified the comments
v4:
No change
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue
--- drivers/scsi/lpfc/lpfc_sli.c | 54 ++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
drivers/scsi/lpfc/lpfc_sli.c +54 -0
@@ -9764,6 +9764,8 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, *pcmd == ELS_CMD_RSCN_XMT || *pcmd == ELS_CMD_FDISC || *pcmd == ELS_CMD_LOGO || + *pcmd == ELS_CMD_QFPA || + *pcmd == ELS_CMD_UVEM || *pcmd == ELS_CMD_PLOGI)) {bf_set (els_req64_sp, &wqe->els_req,1 ); bf_set(els_req64_sid, &wqe->els_req,
@@ -9895,6 +9897,24 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, ptr = &wqe->words[22 ];memcpy (ptr, fcp_cmnd,sizeof (struct fcp_cmnd )); } + +/* add the VMID tags as per switch response */ +if (iocbq->iocb_flag &LPFC_IO_VMID ) { +union lpfc_wqe128 *wqe128; + +if (phba->pport->vmid_priority_tagging) { +bf_set (wqe_ccpe, &wqe->fcp_iwrite.wqe_com,1 ); +bf_set (wqe_ccp, &wqe->fcp_iwrite.wqe_com, + (iocbq->vmid_tag.cs_ctl_vmid)); +/* Bit 0 must be 0 */ + }else { + wqe128 = (union lpfc_wqe128 *)wqe; +bf_set (wqe_appid, &wqe->fcp_iwrite.wqe_com,1 ); +bf_set (wqe_wqes, &wqe128->fcp_iwrite.wqe_com, +1 ); + wqe128->words[31 ] = iocbq->vmid_tag.app_id; + } + }break ;case CMD_FCP_IREAD64_CR :/* word3 iocb=iotag wqe=payload_offset_len */
@@ -9959,6 +9979,23 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, ptr = &wqe->words[22 ];memcpy (ptr, fcp_cmnd,sizeof (struct fcp_cmnd )); } + +/* add the VMID tags as per switch response */ +if (iocbq->iocb_flag &LPFC_IO_VMID ) { +union lpfc_wqe128 *wqe128; + +if (phba->pport->vmid_priority_tagging) { +bf_set (wqe_ccpe, &wqe->fcp_iread.wqe_com,1 ); +bf_set (wqe_ccp, &wqe->fcp_iread.wqe_com, + (iocbq->vmid_tag.cs_ctl_vmid)); +/* Bit 0 must be 0 */ + }else { + wqe128 = (union lpfc_wqe128 *)wqe; +bf_set (wqe_appid, &wqe->fcp_iread.wqe_com,1 ); +bf_set (wqe_wqes, &wqe128->fcp_iread.wqe_com,1 ); + wqe128->words[31 ] = iocbq->vmid_tag.app_id; + } + }break ;case CMD_FCP_ICMND64_CR :/* word3 iocb=iotag wqe=payload_offset_len */
@@ -10016,6 +10053,23 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, ptr = &wqe->words[22 ];memcpy (ptr, fcp_cmnd,sizeof (struct fcp_cmnd )); } + +/* add the VMID tags as per switch response */ +if (iocbq->iocb_flag &LPFC_IO_VMID ) { +union lpfc_wqe128 *wqe128; + +if (phba->pport->vmid_priority_tagging) { +bf_set (wqe_ccpe, &wqe->fcp_icmd.wqe_com,1 ); +bf_set (wqe_ccp, &wqe->fcp_icmd.wqe_com, + (iocbq->vmid_tag.cs_ctl_vmid)); +/* Bit 0 must be 0 */ + }else { + wqe128 = (union lpfc_wqe128 *)wqe; +bf_set (wqe_appid, &wqe->fcp_icmd.wqe_com,1 ); +bf_set (wqe_wqes, &wqe128->fcp_icmd.wqe_com,1 ); + wqe128->words[31 ] = iocbq->vmid_tag.app_id; + } + }break ;case CMD_GEN_REQUEST64_CR :/* For this command calculate the xmit length of the
Signature · 1 line
2.26.2
PATCH v9 11/13 lpfc: vmid: Timeout implementation for vmid
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
This patch implements the timeout functionality for the vmid. After the set time period of inactivity, the vmid is deregistered from the switch.
---
v9:
Modified code for use of hashtable
v8:
Fixed the uninitialized variable
v7:
No change
v6:
Added Forward declarations
v5:
No change
v4:
No change
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 104 +++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_init.c | 40 ++++++++++++ 2 files changed, 144 insertions(+)
drivers/scsi/lpfc/lpfc_hbadisc.c +104 -0
@@ -72,6 +72,7 @@ static void lpfc_disc_flush_list(struct lpfc_vport *vport);static void lpfc_unregister_fcfi_cmpl (struct lpfc_hba *,LPFC_MBOXQ_t *);static int lpfc_fcf_inuse (struct lpfc_hba *);static void lpfc_mbx_cmpl_read_sparam (struct lpfc_hba *,LPFC_MBOXQ_t *); +static void lpfc_check_inactive_vmid (struct lpfc_hba *phba);static int lpfc_valid_xpt_node (struct lpfc_nodelist *ndlp)
@@ -239,6 +240,109 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)return ; } +/** +* lpfc_check_inactive_vmid_one - VMID inactivity checker for a vport +* @vport: Pointer to vport context object. +* +* This function checks for idle vmid entries related to a particular vport. If +* found unused/idle, it frees them accordingly. +**/ +static void lpfc_check_inactive_vmid_one (struct lpfc_vport *vport) +{ +u16 keep; +u32 difftime =0 , r, bucket; +u64 *lta; +int cpu; +struct lpfc_vmid *vmp; + +write_lock (&vport->vmid_lock); + +if (!vport->cur_vmid_cnt) + goto out; + +/* iterate through the table */ +hash_for_each (vport->hash_table, bucket, vmp, hnode) { + keep =0 ; +if (vmp->flag &LPFC_VMID_REGISTERED ) { +/* check if the particular vmid is in use */ +/* for all available per cpu variable */ +for_each_possible_cpu (cpu) { +/* if last access time is less than timeout */ + lta =per_cpu_ptr (vmp->last_io_time, cpu); +if (!lta) +continue ; + difftime = (jiffies) - (*lta); +if ((vport->vmid_inactivity_timeout * +JIFFIES_PER_HR ) > difftime) { + keep =1 ; +break ; + } + } + +/* if none of the cpus have been used by the vm, */ +/* remove the entry if already registered */ +if (!keep) { +/* mark the entry for deregistration */ + vmp->flag =LPFC_VMID_DE_REGISTER ; +write_unlock (&vport->vmid_lock); +if (vport->vmid_priority_tagging) + r =lpfc_vmid_uvem (vport, vmp, false); +else + r =lpfc_vmid_cmd (vport, +SLI_CTAS_DAPP_IDENT , + vmp); + +/* decrement number of active vms and mark */ +/* entry in slot as free */ +write_lock (&vport->vmid_lock); +if (!r) { +struct lpfc_vmid *ht = vmp; + vport->cur_vmid_cnt--; + ht->flag =LPFC_VMID_SLOT_FREE ; +free_percpu (ht->last_io_time); + ht->last_io_time =NULL ; +hash_del (&ht->hnode); + } + } + } + } + out: +write_unlock (&vport->vmid_lock); +} + +/** +* lpfc_check_inactive_vmid - VMID inactivity checker +* @phba: Pointer to hba context object. +* +* This function is called from the worker thread to determine if an entry in +* the vmid table can be released since there was no IO activity seen from that +* particular VM for the specified time. When this happens, the entry in the +* table is released and also the resources on the switch cleared. +**/ + +static void lpfc_check_inactive_vmid (struct lpfc_hba *phba) +{ +struct lpfc_vport *vport; +struct lpfc_vport **vports; +int i; + + vports =lpfc_create_vport_work_array (phba); +if (!vports) +return ; + +for (i =0 ; i <= phba->max_vports; i++) { +if ((!vports[i]) && (i ==0 )) + vport = phba->pport; +else + vport = vports[i]; +if (!vport) +break ; + +lpfc_check_inactive_vmid_one (vport); + } +lpfc_destroy_vport_work_array (phba, vports); +} +/** * lpfc_dev_loss_tmo_handler - Remote node devloss timeout handler * @ndlp: Pointer to remote node object.
drivers/scsi/lpfc/lpfc_init.c +40 -0
@@ -4856,6 +4856,42 @@ lpfc_sli4_fcf_redisc_wait_tmo(struct timer_list *t)lpfc_worker_wake_up (phba); } +/** +* lpfc_vmid_poll - VMID timeout detection +* @ptr: Map to lpfc_hba data structure pointer. +* +* This routine is invoked when there is no IO on by a VM for the specified +* amount of time. When this situation is detected, the VMID has to be +* deregistered from the switch and all the local resources freed. The VMID +* will be reassigned to the VM once the IO begins. +**/ +static void +lpfc_vmid_poll (struct timer_list *t) +{ +struct lpfc_hba *phba =from_timer (phba, t, inactive_vmid_poll); +u32 wake_up =0 ; + +/* check if there is a need to issue QFPA */ +if (phba->pport->vmid_priority_tagging) { + wake_up =1 ; + phba->pport->work_port_events |=WORKER_CHECK_VMID_ISSUE_QFPA ; + } + +/* Is the vmid inactivity timer enabled */ +if (phba->pport->vmid_inactivity_timeout || + phba->pport->load_flag &FC_DEREGISTER_ALL_APP_ID ) { + wake_up =1 ; + phba->pport->work_port_events |=WORKER_CHECK_INACTIVE_VMID ; + } + +if (wake_up) +lpfc_worker_wake_up (phba); + +/* restart the timer for the next iteration */ +mod_timer (&phba->inactive_vmid_poll, jiffies +msecs_to_jiffies (1000 * +LPFC_VMID_TIMER )); +} +/** * lpfc_sli4_parse_latt_fault - Parse sli4 link-attention link fault code * @phba: pointer to lpfc hba data structure.
@@ -6706,6 +6742,10 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) phba->hbqs[LPFC_ELS_HBQ ].hbq_alloc_buffer = lpfc_sli4_rb_alloc; phba->hbqs[LPFC_ELS_HBQ ].hbq_free_buffer = lpfc_sli4_rb_free; +/* for VMID idle timeout if VMID is enabled */ +if (lpfc_is_vmid_enabled (phba)) +timer_setup (&phba->inactive_vmid_poll, lpfc_vmid_poll,0 ); +/* * Initialize the SLI Layer to run with lpfc SLI4 HBAs. */
Signature · 1 line
2.26.2
Re: [PATCH v9 11/13] lpfc: vmid: Timeout implementation for vmid
Quoted 30 lines · Muneendra
From: Gaurav Srivastava <[email protected]>
This patch implements the timeout functionality for the vmid. After the set time period of inactivity, the vmid is deregistered from the switch.
Signed-off-by Gaurav Srivastava <[email protected]>Signed-off-by James Smart <[email protected]>---
v9:
Modified code for use of hashtablev8:
Fixed the uninitialized variablev7:
No changev6:
Added Forward declarationsv5:
No changev4:
No changev3:
No change
Quoted 7 lines
v2:
Ported the patch on top of 5.10/scsi-queue--- drivers/scsi/lpfc/lpfc_hbadisc.c | 104 +++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_init.c | 40 ++++++++++++ 2 files changed, 144 insertions(+)
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v9 12/13 lpfc: vmid: Adding qfpa and vmid timeout check in worker thread
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
This patch add the periodic check for issuing of qfpa command and vmid timeout in the worker thread. The inactivity timeout check is added via the timer function.
---
v9:
No change
v8:
checked the function return value
v7:
No change
v6:
Added Forward declarations and removed unused variable
v5:
No change
v4:
No change
v3:
No change
v2:
Ported the patch on top of 5.10/scsi-queue
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 43 ++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
drivers/scsi/lpfc/lpfc_hbadisc.c +43 -0
@@ -73,6 +73,7 @@ static void lpfc_unregister_fcfi_cmpl(struct lpfc_hba *, LPFC_MBOXQ_t *);static int lpfc_fcf_inuse (struct lpfc_hba *);static void lpfc_mbx_cmpl_read_sparam (struct lpfc_hba *,LPFC_MBOXQ_t *);static void lpfc_check_inactive_vmid (struct lpfc_hba *phba); +static void lpfc_check_vmid_qfpa_issue (struct lpfc_hba *phba);static int lpfc_valid_xpt_node (struct lpfc_nodelist *ndlp)
@@ -433,6 +434,32 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)return fcf_inuse; } +static void lpfc_check_vmid_qfpa_issue (struct lpfc_hba *phba) +{ +struct lpfc_vport *vport; +struct lpfc_vport **vports; +int i; + + vports =lpfc_create_vport_work_array (phba); +if (!vports) +return ; + +for (i =0 ; i <= phba->max_vports; i++) { +if ((!vports[i]) && (i ==0 )) + vport = phba->pport; +else + vport = vports[i]; +if (!vport) +break ; + +if (vport->vmid_flag &LPFC_VMID_ISSUE_QFPA ) { +if (!lpfc_issue_els_qfpa (vport)) + vport->vmid_flag &= ~LPFC_VMID_ISSUE_QFPA ; + } + } +lpfc_destroy_vport_work_array (phba, vports); +} +/** * lpfc_sli4_post_dev_loss_tmo_handler - SLI4 post devloss timeout handler * @phba: Pointer to hba context object.
@@ -753,6 +780,22 @@ lpfc_work_done(struct lpfc_hba *phba)if (ha_copy &HA_LATT )lpfc_handle_latt (phba); +/* Handle VMID Events */ +if (lpfc_is_vmid_enabled (phba)) { +if (phba->pport->work_port_events & +WORKER_CHECK_VMID_ISSUE_QFPA ) { +lpfc_check_vmid_qfpa_issue (phba); + phba->pport->work_port_events &= + ~WORKER_CHECK_VMID_ISSUE_QFPA ; + } +if (phba->pport->work_port_events & +WORKER_CHECK_INACTIVE_VMID ) { +lpfc_check_inactive_vmid (phba); + phba->pport->work_port_events &= + ~WORKER_CHECK_INACTIVE_VMID ; + } + } +/* Process SLI4 events */ if (phba->pci_dev_grp ==LPFC_PCI_DEV_OC ) {if (phba->hba_flag &HBA_RRQ_ACTIVE )
Signature · 1 line
2.26.2
PATCH v9 13/13 lpfc: vmid: Introducing vmid in io path.
In reply to MuneendraFrom: Gaurav Srivastava <[email protected]>
The patch introduces the vmid in the io path. It checks if the vmid is enabled and if io belongs to a vm or not and acts accordingly. Other supporing APIs are also included in the patch.
---
v9:
Added changes related to locking and new hashtable implementation
v8:
Added proper error codes
updated logic while handling vmid
v7:
No change
v6:
No change
v5:
No change
v4:
No change
v3:
Replaced blkcg_get_app_identifier with blkcg_get_fc_appid
v2:
Ported the patch on top of 5.10/scsi-queue
Added a fix for issuing QFPA command which was not included in the last submit
--- drivers/scsi/lpfc/lpfc_scsi.c | 169 ++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+)
drivers/scsi/lpfc/lpfc_scsi.c +169 -0
@@ -5263,6 +5263,155 @@ static void lpfc_vmid_assign_cs_ctl(struct lpfc_vport *vport, } } +/* +* lpfc_vmid_get_appid- get the vmid associated with the uuid +* @vport: The virtual port for which this call is being executed. +* @uuid: uuid associated with the VE +* @cmd: address of scsi cmmd descriptor +* @tag: VMID tag +* Returns status of the function +*/ +static int lpfc_vmid_get_appid (struct lpfc_vport *vport,char *uuid,struct +scsi_cmnd * cmd,union lpfc_vmid_io_tag *tag) +{ +struct lpfc_vmid *vmp =NULL ; +int hash, len, rc, i; +u8 pending =0 ; + +/* check if QFPA is complete */ +if (lpfc_vmid_is_type_priority_tag (vport) && !(vport->vmid_flag & +LPFC_VMID_QFPA_CMPL )) { + vport->work_port_events |=WORKER_CHECK_VMID_ISSUE_QFPA ; +return -EAGAIN ; + } + +/* search if the uuid has already been mapped to the vmid */ + len =strlen (uuid); + hash =lpfc_vmid_hash_fn (uuid, len); + +/* search for the VMID in the table */ +read_lock (&vport->vmid_lock); + vmp =lpfc_get_vmid_from_hastable (vport, hash, uuid); + +/* if found, check if its already registered */ +if (vmp && vmp->flag &LPFC_VMID_REGISTERED ) { +read_unlock (&vport->vmid_lock); +lpfc_vmid_update_entry (vport, cmd, vmp, tag); + rc =0 ; + }else if (vmp && (vmp->flag &LPFC_VMID_REQ_REGISTER || + vmp->flag &LPFC_VMID_DE_REGISTER )) { +/* else if register or dereg request has already been sent */ +/* Hence vmid tag will not be added for this IO */ +read_unlock (&vport->vmid_lock); + rc = -EBUSY ; + }else { +/* The vmid was not found in the hashtable. At this point, */ +/* drop the read lock first before proceeding further */ +read_unlock (&vport->vmid_lock); +/* start the process to obtain one as per the */ +/* type of the vmid indicated */ +write_lock (&vport->vmid_lock); + vmp =lpfc_get_vmid_from_hastable (vport, hash, uuid); + +/* while the read lock was released, in case the entry was */ +/* added by other context or is in process of being added */ +if (vmp && vmp->flag &LPFC_VMID_REGISTERED ) { +lpfc_vmid_update_entry (vport, cmd, vmp, tag); +write_unlock (&vport->vmid_lock); +return 0 ; + }else if (vmp && vmp->flag &LPFC_VMID_REQ_REGISTER ) { +write_unlock (&vport->vmid_lock); +return -EBUSY ; + } + +/* else search and allocate a free slot in the hash table */ +if (vport->cur_vmid_cnt < vport->max_vmid) { +for (i =0 ; i < vport->max_vmid; ++i) { + vmp = vport->vmid + i; +if (vmp->flag ==LPFC_VMID_SLOT_FREE ) { + vmp = vport->vmid + i; +break ; + } + } + }else { +write_unlock (&vport->vmid_lock); +return -ENOMEM ; + } + +if (vmp && (vmp->flag ==LPFC_VMID_SLOT_FREE )) { +/* Add the vmid and register */ +lpfc_put_vmid_in_hashtable (vport, hash, vmp); + vmp->vmid_len = len; +memcpy (vmp->host_vmid, uuid, vmp->vmid_len); + vmp->io_rd_cnt =0 ; + vmp->io_wr_cnt =0 ; + vmp->flag =LPFC_VMID_SLOT_USED ; + + vmp->delete_inactive = + vport->vmid_inactivity_timeout ?1 :0 ; + +/* if type priority tag, get next available vmid */ +if (lpfc_vmid_is_type_priority_tag (vport)) +lpfc_vmid_assign_cs_ctl (vport, vmp); + +/* allocate the per cpu variable for holding */ +/* the last access time stamp only if vmid is enabled */ +if (!vmp->last_io_time) + vmp->last_io_time = +__alloc_percpu (sizeof (u64), + __alignof__(struct +lpfc_vmid )); + +/* registration pending */ + pending =1 ; + }else { + rc = -ENOMEM ; + } +write_unlock (&vport->vmid_lock); + +/* complete transaction with switch */ +if (pending) { +if (lpfc_vmid_is_type_priority_tag (vport)) + rc =lpfc_vmid_uvem (vport, vmp, true); +else + rc =lpfc_vmid_cmd (vport, +SLI_CTAS_RAPP_IDENT , + vmp); +if (!rc) { +write_lock (&vport->vmid_lock); + vport->cur_vmid_cnt++; + vmp->flag |=LPFC_VMID_REQ_REGISTER ; +write_unlock (&vport->vmid_lock); + } + } + +/* finally, enable the idle timer once */ +if (!(vport->phba->pport->vmid_flag &LPFC_VMID_TIMER_ENBLD )) { +mod_timer (&vport->phba->inactive_vmid_poll, + jiffies + +msecs_to_jiffies (1000 *LPFC_VMID_TIMER )); + vport->phba->pport->vmid_flag |=LPFC_VMID_TIMER_ENBLD ; + } + } +return rc; +} + +/* +* lpfc_is_command_vm_io - get the uuid from blk cgroup +* @cmd:Pointer to scsi_cmnd data structure +* Returns uuid if present if not null +*/ +static char *lpfc_is_command_vm_io (struct scsi_cmnd *cmd) +{ +char *uuid =NULL ; + +if (cmd->request) { +if (cmd->request->bio) + uuid =blkcg_get_fc_appid (cmd->request->bio); + } +return uuid; +} +/** * lpfc_queuecommand - scsi_host_template queuecommand entry point * @shost: kernel scsi host pointer.
@@ -5288,6 +5437,7 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)int err, idx;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS uint64_t start =0L ; +u8 *uuid =NULL ;if (phba->ktime_on) start =ktime_get_ns ();
@@ -5415,6 +5565,25 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) } +/* check the necessary and sufficient condition to support VMID */ +if (lpfc_is_vmid_enabled (phba) && + (ndlp->vmid_support || + phba->pport->vmid_priority_tagging == +LPFC_VMID_PRIO_TAG_ALL_TARGETS )) { +/* is the IO generated by a VM, get the associated virtual */ +/* entity id */ + uuid =lpfc_is_command_vm_io (cmnd); + +if (uuid) { + err =lpfc_vmid_get_appid (vport, uuid, cmnd, + (union lpfc_vmid_io_tag *) + &lpfc_cmd->cur_iocbq.vmid_tag); +if (!err) + lpfc_cmd->cur_iocbq.iocb_flag |=LPFC_IO_VMID ; + } + } + +atomic_inc (&ndlp->cmd_pending);#ifdef CONFIG_SCSI_LPFC_DEBUG_FS if (unlikely (phba->hdwqstat_on &LPFC_CHECK_SCSI_IO ))this_cpu_inc (phba->sli4_hba.c_stat->xmt_io);
Signature · 1 line
2.26.2
Re: [PATCH v9 13/13] lpfc: vmid: Introducing vmid in io path.
Quoted 5 lines · Muneendra
From: Gaurav Srivastava <[email protected]>
The patch introduces the vmid in the io path. It checks if the vmid is enabled and if io belongs to a vm or not and acts accordingly. Other supporing APIs are also included in the patch.
supporting (sp)
Quoted 220 lines
Signed-off-by Gaurav Srivastava <[email protected]>Signed-off-by James Smart <[email protected]>---
v9:
Added changes related to locking and new hashtable implementationv8:
Added proper error codes
updated logic while handling vmidv7:
No changev6:
No changev5:
No changev4:
No changev3:
Replacedblkcg_get_app_identifierwithblkcg_get_fc_appidv2:
Ported the patch on top of 5.10/scsi-queue
Added a fix for issuing QFPA command which was not included in the last submit--- drivers/scsi/lpfc/lpfc_scsi.c | 169 ++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+)drivers/scsi/lpfc/lpfc_scsi.c +162
-0@@ -5263,6 +5263,155 @@ static void lpfc_vmid_assign_cs_ctl(struct lpfc_vport *vport, } } +/* +* lpfc_vmid_get_appid- get the vmid associated with the uuid +* @vport: The virtual port for which this call is being executed. +* @uuid: uuid associated with the VE +* @cmd: address of scsi cmmd descriptor +* @tag: VMID tag +* Returns status of the function +*/ +static int lpfc_vmid_get_appid (struct lpfc_vport *vport,char *uuid,struct +scsi_cmnd * cmd,union lpfc_vmid_io_tag *tag) +{ +struct lpfc_vmid *vmp =NULL ; +int hash, len, rc, i; +u8 pending =0 ; + +/* check if QFPA is complete */ +if (lpfc_vmid_is_type_priority_tag (vport) && !(vport->vmid_flag & +LPFC_VMID_QFPA_CMPL )) { + vport->work_port_events |=WORKER_CHECK_VMID_ISSUE_QFPA ; +return -EAGAIN ; + } + +/* search if the uuid has already been mapped to the vmid */ + len =strlen (uuid); + hash =lpfc_vmid_hash_fn (uuid, len); + +/* search for the VMID in the table */ +read_lock (&vport->vmid_lock); + vmp =lpfc_get_vmid_from_hastable (vport, hash, uuid); + +/* if found, check if its already registered */ +if (vmp && vmp->flag &LPFC_VMID_REGISTERED ) { +read_unlock (&vport->vmid_lock); +lpfc_vmid_update_entry (vport, cmd, vmp, tag); + rc =0 ; + }else if (vmp && (vmp->flag &LPFC_VMID_REQ_REGISTER || + vmp->flag &LPFC_VMID_DE_REGISTER )) { +/* else if register or dereg request has already been sent */ +/* Hence vmid tag will not be added for this IO */ +read_unlock (&vport->vmid_lock); + rc = -EBUSY ; + }else { +/* The vmid was not found in the hashtable. At this point, */ +/* drop the read lock first before proceeding further */ +read_unlock (&vport->vmid_lock); +/* start the process to obtain one as per the */ +/* type of the vmid indicated */ +write_lock (&vport->vmid_lock); + vmp =lpfc_get_vmid_from_hastable (vport, hash, uuid); + +/* while the read lock was released, in case the entry was */ +/* added by other context or is in process of being added */ +if (vmp && vmp->flag &LPFC_VMID_REGISTERED ) { +lpfc_vmid_update_entry (vport, cmd, vmp, tag); +write_unlock (&vport->vmid_lock); +return 0 ; + }else if (vmp && vmp->flag &LPFC_VMID_REQ_REGISTER ) { +write_unlock (&vport->vmid_lock); +return -EBUSY ; + } + +/* else search and allocate a free slot in the hash table */ +if (vport->cur_vmid_cnt < vport->max_vmid) { +for (i =0 ; i < vport->max_vmid; ++i) { + vmp = vport->vmid + i; +if (vmp->flag ==LPFC_VMID_SLOT_FREE ) { + vmp = vport->vmid + i; +break ; + } + } + }else { +write_unlock (&vport->vmid_lock); +return -ENOMEM ; + } + +if (vmp && (vmp->flag ==LPFC_VMID_SLOT_FREE )) { +/* Add the vmid and register */ +lpfc_put_vmid_in_hashtable (vport, hash, vmp); + vmp->vmid_len = len; +memcpy (vmp->host_vmid, uuid, vmp->vmid_len); + vmp->io_rd_cnt =0 ; + vmp->io_wr_cnt =0 ; + vmp->flag =LPFC_VMID_SLOT_USED ; + + vmp->delete_inactive = + vport->vmid_inactivity_timeout ?1 :0 ; + +/* if type priority tag, get next available vmid */ +if (lpfc_vmid_is_type_priority_tag (vport)) +lpfc_vmid_assign_cs_ctl (vport, vmp); + +/* allocate the per cpu variable for holding */ +/* the last access time stamp only if vmid is enabled */ +if (!vmp->last_io_time) + vmp->last_io_time = +__alloc_percpu (sizeof (u64), + __alignof__(struct +lpfc_vmid )); + +/* registration pending */ + pending =1 ; + }else { + rc = -ENOMEM ; + } +write_unlock (&vport->vmid_lock); + +/* complete transaction with switch */ +if (pending) { +if (lpfc_vmid_is_type_priority_tag (vport)) + rc =lpfc_vmid_uvem (vport, vmp, true); +else + rc =lpfc_vmid_cmd (vport, +SLI_CTAS_RAPP_IDENT , + vmp); +if (!rc) { +write_lock (&vport->vmid_lock); + vport->cur_vmid_cnt++; + vmp->flag |=LPFC_VMID_REQ_REGISTER ; +write_unlock (&vport->vmid_lock); + } + } + +/* finally, enable the idle timer once */ +if (!(vport->phba->pport->vmid_flag &LPFC_VMID_TIMER_ENBLD )) { +mod_timer (&vport->phba->inactive_vmid_poll, + jiffies + +msecs_to_jiffies (1000 *LPFC_VMID_TIMER )); + vport->phba->pport->vmid_flag |=LPFC_VMID_TIMER_ENBLD ; + } + } +return rc; +} + +/* +* lpfc_is_command_vm_io - get the uuid from blk cgroup +* @cmd:Pointer to scsi_cmnd data structure +* Returns uuid if present if not null +*/ +static char *lpfc_is_command_vm_io (struct scsi_cmnd *cmd) +{ +char *uuid =NULL ; + +if (cmd->request) { +if (cmd->request->bio) + uuid =blkcg_get_fc_appid (cmd->request->bio); + } +return uuid; +} +/** * lpfc_queuecommand - scsi_host_template queuecommand entry point * @shost: kernel scsi host pointer. @@ -5288,6 +5437,7 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)int err, idx;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS uint64_t start =0L ; +u8 *uuid =NULL ;if (phba->ktime_on) start =ktime_get_ns ();@@ -5415,6 +5565,25 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) } +/* check the necessary and sufficient condition to support VMID */ +if (lpfc_is_vmid_enabled (phba) && + (ndlp->vmid_support || + phba->pport->vmid_priority_tagging == +LPFC_VMID_PRIO_TAG_ALL_TARGETS )) { +/* is the IO generated by a VM, get the associated virtual */ +/* entity id */ + uuid =lpfc_is_command_vm_io (cmnd); + +if (uuid) { + err = lpfc_vmid_get_appid(vport, uuid, cmnd, + (union lpfc_vmid_io_tag *)
drivers/scsi/lpfc/lpfc_scsi.c lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) · line 5589
Quoted 10 lines
drivers/scsi/lpfc/lpfc_scsi.c +7
-0+ &lpfc_cmd->cur_iocbq.vmid_tag); +if (!err) + lpfc_cmd->cur_iocbq.iocb_flag |=LPFC_IO_VMID ; + } + } + +atomic_inc (&ndlp->cmd_pending);#ifdef CONFIG_SCSI_LPFC_DEBUG_FS if (unlikely (phba->hdwqstat_on &LPFC_CHECK_SCSI_IO ))this_cpu_inc (phba->sli4_hba.c_stat->xmt_io);
And that's the bit which I don't particular like.
Essentially we'll have to inject additional ELS commands _on each I/O_ to get a valid VMID. Where there are _so_ many things which might get wrong, causing an I/O stall.
I would have vastly preferred if we could _avoid_ having to do additional ELS commands for VMID registration in the I/O path (ie only allow for I/O with a valid VMID), and reject the I/O otherwise until VMID registration is complete.
IE return 'BUSY' (or even a command retry?) when no valid VMID for this particular I/O is found, register the VMID (preferably in another thread), and restart the queue once the VMID is registered.
That way we have a clear separation, and the I/O path will always work with valid VMIDs.
Hmm?
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Re: [PATCH v9 13/13] lpfc: vmid: Introducing vmid in io path.
Quoted 2 lines · Hannes Reinecke
Quoted 1 line · Muneendra
From: Gaurav Srivastava <[email protected]>
...
Quoted 9 lines
Quoted 9 lines
+ /* while the read lock was released, in case the entry was */ + /* added by other context or is in process of being added */ + if (vmp &&
vmp->flag&LPFC_VMID_REGISTERED) {
+lpfc_vmid_update_entry(vport, cmd, vmp, tag); +write_unlock(&vport->vmid_lock);
+ return 0;
+ } else if (vmp &&vmp->flag&LPFC_VMID_REQ_REGISTER) { +write_unlock(&vport->vmid_lock);
+ return-EBUSY;
Quoted 8 lines
Quoted 8 lines
+ }
+
+ /* else search and allocate a free slot in the hash table */ + if (vport->cur_vmid_cnt<vport->max_vmid) {
+ for (i = 0; i <vport->max_vmid; ++i) {
+ vmp =vport->vmid+ i;
+ if (vmp->flag==LPFC_VMID_SLOT_FREE) {
+ vmp =vport->vmid+ i;
delete this last line and adjust parens - really odd that it replicates the assignment 2 lines earlier.
Quoted 3 lines
Quoted 3 lines
+ break;
+ }
+ }
I would prefer that if the table is expended and no slots free, that -ENOMEM is returned here. Rather than falling down below and qualifying by slot free, then by pending (set only if slot free). I can't believe there is a reason the idle timer has to be started if no slots free as all the other fail cases don't bother with it.
This also helps indentation levels below.
Quoted 118 lines
Quoted 106 lines
+ } else {
+write_unlock(&vport->vmid_lock);
+ return-ENOMEM;
+ }drivers/scsi/lpfc/lpfc_scsi.c +75
-0+ + if (vmp && (vmp->flag == LPFC_VMID_SLOT_FREE)) { + /* Add the vmid and register */ + lpfc_put_vmid_in_hashtable(vport, hash, vmp); + vmp->vmid_len = len; + memcpy(vmp->host_vmid, uuid, vmp->vmid_len); + vmp->io_rd_cnt = 0; + vmp->io_wr_cnt = 0; + vmp->flag = LPFC_VMID_SLOT_USED; + + vmp->delete_inactive = + vport->vmid_inactivity_timeout ? 1 : 0; + + /* if type priority tag, get next available vmid */ + if (lpfc_vmid_is_type_priority_tag(vport)) + lpfc_vmid_assign_cs_ctl(vport, vmp); + + /* allocate the per cpu variable for holding */ + /* the last access time stamp only if vmid is enabled */ + if (!vmp->last_io_time) + vmp->last_io_time = + __alloc_percpu(sizeof(u64), + __alignof__(struct + lpfc_vmid)); + + /* registration pending */ + pending = 1; + } else { + rc = -ENOMEM; + } + write_unlock(&vport->vmid_lock); + + /* complete transaction with switch */ + if (pending) { + if (lpfc_vmid_is_type_priority_tag(vport)) + rc = lpfc_vmid_uvem(vport, vmp, true); + else + rc = lpfc_vmid_cmd(vport, + SLI_CTAS_RAPP_IDENT, + vmp); + if (!rc) { + write_lock(&vport->vmid_lock); + vport->cur_vmid_cnt++; + vmp->flag |= LPFC_VMID_REQ_REGISTER; + write_unlock(&vport->vmid_lock); + } + } + + /* finally, enable the idle timer once */ + if (!(vport->phba->pport->vmid_flag & LPFC_VMID_TIMER_ENBLD)) { + mod_timer(&vport->phba->inactive_vmid_poll, + jiffies + + msecs_to_jiffies(1000 * LPFC_VMID_TIMER)); + vport->phba->pport->vmid_flag |= LPFC_VMID_TIMER_ENBLD; + } + } + return rc; +} + +/* +* lpfc_is_command_vm_io - get the uuid from blk cgroup +* @cmd:Pointer to scsi_cmnd data structure +* Returns uuid if present if not null +*/ +static char *lpfc_is_command_vm_io (struct scsi_cmnd *cmd) +{ + char *uuid = NULL; + + if (cmd->request) { + if (cmd->request->bio) + uuid = blkcg_get_fc_appid(cmd->request->bio); + } + return uuid; +} +/**
*lpfc_queuecommand-scsi_host_templatequeuecommand entry point
* @shost: kernel scsi host pointer.drivers/scsi/lpfc/lpfc_scsi.c +14
-0@@ -5288,6 +5437,7 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) int err, idx; #ifdef CONFIG_SCSI_LPFC_DEBUG_FS uint64_t start = 0L; + u8 *uuid = NULL; if (phba->ktime_on) start = ktime_get_ns();@@ -5415,6 +5565,25 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) } + /* check the necessary and sufficient condition to support VMID */ + if (lpfc_is_vmid_enabled(phba) && + (ndlp->vmid_support || + phba->pport->vmid_priority_tagging == + LPFC_VMID_PRIO_TAG_ALL_TARGETS)) { + /* is the IO generated by a VM, get the associated virtual */ + /* entity id */ + uuid = lpfc_is_command_vm_io(cmnd); + + if (uuid) { + err = lpfc_vmid_get_appid(vport, uuid, cmnd, + (union lpfc_vmid_io_tag *) + &lpfc_cmd->cur_iocbq.vmid_tag);drivers/scsi/lpfc/lpfc_scsi.c lpfc_queuecommand(struct Scsi_Host *shost, · line 5589
Quoted 10 lines
drivers/scsi/lpfc/lpfc_scsi.c +6
-0+ if (!err) + lpfc_cmd->cur_iocbq.iocb_flag |= LPFC_IO_VMID; + } + } + + atomic_inc(&ndlp->cmd_pending); #ifdef CONFIG_SCSI_LPFC_DEBUG_FS if (unlikely(phba->hdwqstat_on & LPFC_CHECK_SCSI_IO)) this_cpu_inc(phba->sli4_hba.c_stat->xmt_io);And that's the bit which I don't particular like.
Quoted 2 lines
Essentially we'll have to inject additional ELS commands
_oneach I/O_ to get a valid VMID. Where there are _so_ many things which might get wrong, causing an I/O stall.
I don't follow you - yes ELS's are injected when there isn't an entry for the VM, but once there is, there isn't further ELS's. That is the cost. as we don't know what uuid's I/O will be sent to before hand, so it has to be siphoned off during the I/O flow. I/O's can be sent non-tagged while the ELS's are completing (and there aren't multiple sets of ELS's as long as it's the same uuid), which is fine.
so I disagree with "_on each I/O_".
Quoted 4 lines
I would have vastly preferred if we could _avoid_ having to do additional ELS commands for VMID registration in the I/O path (ie only allow for I/O with a valid VMID), and reject the I/O otherwise until VMID registration is complete.
IE return 'BUSY' (or even a command retry?) when no valid VMID for this particular I/O is found, register the VMID (preferably in another thread), and restart the queue once the VMID is registered.
Why does it bother you with the I/O path ? It's actually happening in parallel with no real relation between the two.
I seriously disagree with reject if no vmid tag. Why? what do you gain ? This actually introduces more disruption than the parallel flow with the ELSs. Also, after link bounce, where all VMID's have to be done, it adds a stall window after link up right when things are trying to resume after rports rejoin. Why add the i/o rebouncing ? There no real benefit. Issuing a few untagged I/O doesn't hurt.
Quoted 8 lines
That way we have a clear separation, and the I/O path will always work with valid VMIDs.
Hmm?
Cheers,
Hannes
-- james
Hannes Reinecke
Reviewed-byRe: [PATCH v9 13/13] lpfc: vmid: Introducing vmid in io path.
Quoted 152 lines · James Smart
Quoted 2 lines · Hannes Reinecke
Quoted 1 line · Muneendra
From: Gaurav Srivastava <[email protected]>
...
Quoted 9 lines
Quoted 9 lines
+ /* while the read lock was released, in case the entry was */ + /* added by other context or is in process of being added */ + if (vmp &&
vmp->flag&LPFC_VMID_REGISTERED) {
+lpfc_vmid_update_entry(vport, cmd, vmp, tag); +write_unlock(&vport->vmid_lock);
+ return 0;
+ } else if (vmp &&vmp->flag&LPFC_VMID_REQ_REGISTER) { +write_unlock(&vport->vmid_lock);
+ return-EBUSY;Quoted 8 lines
Quoted 8 lines
+ }
+
+ /* else search and allocate a free slot in the hash table */ + if (vport->cur_vmid_cnt<vport->max_vmid) {
+ for (i = 0; i <vport->max_vmid; ++i) {
+ vmp =vport->vmid+ i;
+ if (vmp->flag==LPFC_VMID_SLOT_FREE) {
+ vmp =vport->vmid+ i;delete this last line and adjust parens - really odd that it replicates the assignment 2 lines earlier.
Quoted 3 lines
Quoted 3 lines
+ break;
+ }
+ }I would prefer that if the table is expended and no slots free, that
-ENOMEMis returned here. Rather than falling down below and qualifying
by slot free, then by pending (set only if slot free). I can't believe there is a reason the idle timer has to be started if no slots free as all the other fail cases don't bother with it.This also helps indentation levels below.
Quoted 118 lines
Quoted 106 lines
+ } else {
+write_unlock(&vport->vmid_lock);
+ return-ENOMEM;
+ }drivers/scsi/lpfc/lpfc_scsi.c +75
-0+ + if (vmp && (vmp->flag == LPFC_VMID_SLOT_FREE)) { + /* Add the vmid and register */ + lpfc_put_vmid_in_hashtable(vport, hash, vmp); + vmp->vmid_len = len; + memcpy(vmp->host_vmid, uuid, vmp->vmid_len); + vmp->io_rd_cnt = 0; + vmp->io_wr_cnt = 0; + vmp->flag = LPFC_VMID_SLOT_USED; + + vmp->delete_inactive = + vport->vmid_inactivity_timeout ? 1 : 0; + + /* if type priority tag, get next available vmid */ + if (lpfc_vmid_is_type_priority_tag(vport)) + lpfc_vmid_assign_cs_ctl(vport, vmp); + + /* allocate the per cpu variable for holding */ + /* the last access time stamp only if vmid is enabled */ + if (!vmp->last_io_time) + vmp->last_io_time = + __alloc_percpu(sizeof(u64), + __alignof__(struct + lpfc_vmid)); + + /* registration pending */ + pending = 1; + } else { + rc = -ENOMEM; + } + write_unlock(&vport->vmid_lock); + + /* complete transaction with switch */ + if (pending) { + if (lpfc_vmid_is_type_priority_tag(vport)) + rc = lpfc_vmid_uvem(vport, vmp, true); + else + rc = lpfc_vmid_cmd(vport, + SLI_CTAS_RAPP_IDENT, + vmp); + if (!rc) { + write_lock(&vport->vmid_lock); + vport->cur_vmid_cnt++; + vmp->flag |= LPFC_VMID_REQ_REGISTER; + write_unlock(&vport->vmid_lock); + } + } + + /* finally, enable the idle timer once */ + if (!(vport->phba->pport->vmid_flag & LPFC_VMID_TIMER_ENBLD)) { + mod_timer(&vport->phba->inactive_vmid_poll, + jiffies + + msecs_to_jiffies(1000 * LPFC_VMID_TIMER)); + vport->phba->pport->vmid_flag |= LPFC_VMID_TIMER_ENBLD; + } + } + return rc; +} + +/* +* lpfc_is_command_vm_io - get the uuid from blk cgroup +* @cmd:Pointer to scsi_cmnd data structure +* Returns uuid if present if not null +*/ +static char *lpfc_is_command_vm_io (struct scsi_cmnd *cmd) +{ + char *uuid = NULL; + + if (cmd->request) { + if (cmd->request->bio) + uuid = blkcg_get_fc_appid(cmd->request->bio); + } + return uuid; +} +/**
*lpfc_queuecommand-scsi_host_templatequeuecommand entry point
* @shost: kernel scsi host pointer.drivers/scsi/lpfc/lpfc_scsi.c +14
-0@@ -5288,6 +5437,7 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) int err, idx; #ifdef CONFIG_SCSI_LPFC_DEBUG_FS uint64_t start = 0L; + u8 *uuid = NULL; if (phba->ktime_on) start = ktime_get_ns();@@ -5415,6 +5565,25 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) } + /* check the necessary and sufficient condition to support VMID */ + if (lpfc_is_vmid_enabled(phba) && + (ndlp->vmid_support || + phba->pport->vmid_priority_tagging == + LPFC_VMID_PRIO_TAG_ALL_TARGETS)) { + /* is the IO generated by a VM, get the associated virtual */ + /* entity id */ + uuid = lpfc_is_command_vm_io(cmnd); + + if (uuid) { + err = lpfc_vmid_get_appid(vport, uuid, cmnd, + (union lpfc_vmid_io_tag *) + &lpfc_cmd->cur_iocbq.vmid_tag);drivers/scsi/lpfc/lpfc_scsi.c lpfc_queuecommand(struct Scsi_Host *shost, · line 5589
Quoted 10 lines
drivers/scsi/lpfc/lpfc_scsi.c +6
-0+ if (!err) + lpfc_cmd->cur_iocbq.iocb_flag |= LPFC_IO_VMID; + } + } + + atomic_inc(&ndlp->cmd_pending); #ifdef CONFIG_SCSI_LPFC_DEBUG_FS if (unlikely(phba->hdwqstat_on & LPFC_CHECK_SCSI_IO)) this_cpu_inc(phba->sli4_hba.c_stat->xmt_io);And that's the bit which I don't particular like.
Quoted 7 lines
Quoted 2 lines
Essentially we'll have to inject additional ELS commands
_oneach I/O_ to get a valid VMID. Where there are _so_ many things which might get wrong, causing an I/O stall.I don't follow you - yes ELS's are injected when there isn't an entry for the VM, but once there is, there isn't further ELS's. That is the cost. as we don't know what uuid's I/O will be sent to before hand, so it has to be siphoned off during the I/O flow. I/O's can be sent non-tagged while the ELS's are completing (and there aren't multiple sets of ELS's as long as it's the same uuid), which is fine.
so I disagree with "
_oneach I/O_".
Yeah, that was an exaggeration.
Not on each I/O; I should've said 'on each unregistered I/O'.
This really is my unhappiness with the entire VMID specification, where you can time out VMIDs after a certain period, and hence never be sure if any particular I/O really _is_ registered.
Quoted 9 lines
Quoted 4 lines
I would have vastly preferred if we could _avoid_ having to do additional ELS commands for VMID registration in the I/O path (ie only allow for I/O with a valid VMID), and reject the I/O otherwise until VMID registration is complete.
IE return 'BUSY' (or even a command retry?) when no valid VMID for this particular I/O is found, register the VMID (preferably in another thread), and restart the queue once the VMID is registered.
Why does it bother you with the I/O path ? It's actually happening in parallel with no real relation between the two.
I seriously disagree with reject if no vmid tag. Why? what do you gain ? This actually introduces more disruption than the parallel flow with the ELSs. Also, after link bounce, where all VMID's have to be done, it adds a stall window after link up right when things are trying to resume after rports rejoin. Why add the i/o rebouncing ? There no real benefit. Issuing a few untagged I/O doesn't hurt.
That indeed is a valid point. I retract my objection.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer