Merge ~sergiodj/ubuntu/+source/python-rtslib-fb:fix-cpu-allowed-list-s390x into ubuntu/+source/python-rtslib-fb:ubuntu/devel

[Sergio Durigan Junior]

This MP fixes the dep8 test failure that is currently affecting targetcli-fb.

The problem is caused by the fact that the target Linux kernel module has a new "cpus_allowed_list" attribute which is not properly handled by python-rtslib-fb, as can be seen in the following log:

https://autopkgtest.ubuntu.com/results/autopkgtest-kinetic/kinetic/s390x/t/targetcli-fb/20220830_075622_04113@/log.gz

Upstream has a fix for this:

https://github.com/open-iscsi/rtslib-fb/commit/8d2543c4da62e962661011fea5b19252b9660822

Ideally we would update the package to the latest version, but it's too late in the cycle for that. For this reason, I'm backporting the upstream patch.

PPA with the proposed change:

https://launchpad.net/~sergiodj/+archive/ubuntu/targetcli-fb/+packages

autopkgtest is now good:

http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-sergiodj-targetcli-fb/?format=plain

[Lucas Kanashiro (lucaskanashiro)]

I am reviewing this MP.

[Lucas Kanashiro (lucaskanashiro)]

Thanks for this Sergio, all the changes look good to me. Package is building fine and autopkgtest is fixed in s390x. +1.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, lucaskanashiro
Uploaders: sergiodj, lucaskanashiro
MP auto-approved

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Friday, September 02 2022, Lucas Kanashiro wrote:

> Thanks for this Sergio, all the changes look good to me. Package is building fine and autopkgtest is fixed in s390x. +1.

Thanks, Lucas. Uploaded:

$ dput python-rtslib-fb_2.1.74-0ubuntu5_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/python-rtslib-fb/python-rtslib-fb_2.1.74-0ubuntu5_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/python-rtslib-fb/python-rtslib-fb_2.1.74-0ubuntu5.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading python-rtslib-fb_2.1.74-0ubuntu5.dsc: done.
  Uploading python-rtslib-fb_2.1.74-0ubuntu5.debian.tar.xz: done.
  Uploading python-rtslib-fb_2.1.74-0ubuntu5_source.buildinfo: done.
  Uploading python-rtslib-fb_2.1.74-0ubuntu5_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/debian/changelog b/debian/changelog
index 903ce49..dc142ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-rtslib-fb (2.1.74-0ubuntu5) kinetic; urgency=medium
+
+  * d/p/handle-target-kernel-module-new-attribute-cpus_allow.patch:
+    Handle new Linux kernel module attribute "cpus_allowed_list".
+    (LP: #1988366)
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 31 Aug 2022 22:41:11 -0400
+
 python-rtslib-fb (2.1.74-0ubuntu4) jammy; urgency=medium
 
   * No-change rebuild to update maintainer scripts, see LP: 1959054
diff --git a/debian/patches/handle-target-kernel-module-new-attribute-cpus_allow.patch b/debian/patches/handle-target-kernel-module-new-attribute-cpus_allow.patch
new file mode 100644
index 0000000..2853e46
--- /dev/null
+++ b/debian/patches/handle-target-kernel-module-new-attribute-cpus_allow.patch
@@ -0,0 +1,82 @@
+From: Mingzhe Zou <[e-mail]>
+Date: Fri, 11 Feb 2022 15:49:23 +0800
+Subject: handle target kernel module new attribute cpus_allowed_list
+
+target has been added cpus_allowed_list attribute in sysfs.
+Therefore, the rtslib should handle the new attribute:
+    1. add cpus_allowed_list item in target_names_excludes
+    2. add cpus_allowed_list feature in ISCSIFabricModule
+
+Signed-off-by: Zou Mingzhe [e-mail]
+
+Origin: upstream, https://github.com/open-iscsi/rtslib-fb/commit/8d2543c4da62e962661011fea5b19252b9660822
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-rtslib-fb/+bug/1988366
+Applied-Upstream: 2.1.75
+---
+ rtslib/fabric.py | 32 ++++++++++++++++++++++++++++----
+ 1 file changed, 28 insertions(+), 4 deletions(-)
+
+diff --git a/rtslib/fabric.py b/rtslib/fabric.py
+index cb23a0f..aacbce7 100644
+--- a/rtslib/fabric.py
++++ b/rtslib/fabric.py
+@@ -118,9 +118,15 @@ from .utils import RTSLibError, modprobe, ignored
+ from .target import Target
+ from .utils import _get_auth_attr, _set_auth_attr
+ 
+-version_attributes = set(["lio_version", "version"])
+-discovery_auth_attributes = set(["discovery_auth"])
+-target_names_excludes = version_attributes | discovery_auth_attributes
++excludes_list = [
++    # version_attributes
++    "lio_version", "version",
++    # discovery_auth_attributes
++    "discovery_auth",
++    # cpus_allowed_list_attributes
++    "cpus_allowed_list",
++]
++target_names_excludes = set(excludes_list)
+ 
+ 
+ class _BaseFabricModule(CFSNode):
+@@ -144,7 +150,8 @@ class _BaseFabricModule(CFSNode):
+         self.name = name
+         self.spec_file = "N/A"
+         self._path = "%s/%s" % (self.configfs_dir, self.name)
+-        self.features = ('discovery_auth', 'acls', 'auth', 'nps', 'tpgts')
++        self.features = ('discovery_auth', 'acls', 'auth', 'nps', 'tpgts',
++            'cpus_allowed_list')
+         self.wwn_types = ('free',)
+         self.kernel_module = "%s_target_mod" % self.name
+ 
+@@ -220,6 +227,18 @@ class _BaseFabricModule(CFSNode):
+             raise RTSLibError("Fabric module %s does not implement "
+                               + "the %s feature" % (self.name, feature))
+ 
++    def _get_cpus_allowed_list(self):
++        self._check_self()
++        self._assert_feature('cpus_allowed_list')
++        path = "%s/cpus_allowed_list" % self.path
++        return fread(path)
++
++    def _set_cpus_allowed_list(self, allowed):
++        self._check_self()
++        self._assert_feature('cpus_allowed_list')
++        path = "%s/cpus_allowed_list" % self.path
++        fwrite(path, allowed)
++
+     def clear_discovery_auth_settings(self):
+         self._check_self()
+         self._assert_feature('discovery_auth')
+@@ -267,6 +286,11 @@ class _BaseFabricModule(CFSNode):
+         self._assert_feature('discovery_auth')
+         _set_auth_attr(self, *args, **kwargs)
+ 
++    cpus_allowed_list = \
++            property(_get_cpus_allowed_list,
++                     _set_cpus_allowed_list,
++                     doc="Set or get the cpus_allowed_list attribute.")
++
+     discovery_enable_auth = \
+             property(_get_discovery_enable_auth,
+                      _set_discovery_enable_auth,
diff --git a/debian/patches/series b/debian/patches/series
index 39b9b57..2877d7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-path-of-etc-saveconfig.json.patch
 fix-interpreter-version.patch
 lp1891214-disable-xen-pvscsi.patch
+handle-target-kernel-module-new-attribute-cpus_allow.patch