DLPX-92453 Cherry-pick Delphix commits of linux-kernel-generic for LTS upgrade

[palash-gandhi]

This change cherry-picks the Delphix patch set from develop onto a branch forked off of upstreams/os-upgrade. upstreams/os-upgrade currently has commits from Linux kernel 6.8, the version that ships with Ubuntu 24.04. I ran the following command to perform the cherry-pick:

$ git cherry-pick cbe07afa9fe4659c4b3e738128a6f4f040cd7ace^..8a5662e072342ad4f698afc817795d13b3020202

Here's the actual diff between upstreams/os-upgrade and os-upgrade: upstreams/os-upgrade...dlpx/pr/palash.gandhi/generic

Additional changes that were required:

• Implement similar fix from 8ff02ed but in the appropriate annotations file. Link to commit.
• Add a change to set and consume the PKG_ABI macro as a string. Upstream has introduced changes that consume this value to perform a bitwise OR. Link to commit
• Revert DLPX-84985 target: iscsi: fix deadlock in the iSCSI login code #22 in favor of upstreamed fix. In order to maintain a linear git history, I chose to cherry-pick all commits and then revert this one for posterity. Link to commit

build-package: https://ops-jenkins.eng-tools-prd.aws.delphixcloud.com/job/linux-pkg/job/os-upgrade/job/build-package/job/linux-kernel-generic/job/pre-push/17/console

Resulting merge conflicts

 $ git cherry-pick cbe07afa9fe4659c4b3e738128a6f4f040cd7ace^..8a5662e072342ad4f698afc817795d13b3020202
[lts e4c2d707c6f0] @@DELPHIX_PATCHSET_START@@
 Author: John Wren Kennedy <[email protected]>
 Date: Thu Apr 1 19:46:14 2021 +0000
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 delphix
Auto-merging drivers/target/iscsi/iscsi_target_login.c
Auto-merging drivers/target/iscsi/iscsi_target_nego.c
[lts 875ba2f9278c] DLPX-71852 iSCSI: journal flooded with "Unable to locate Target IQN" messages (#2)
 Author: Pavel Zakharov <[email protected]>
 Date: Tue Feb 9 11:15:55 2021 -0500
 2 files changed, 2 insertions(+), 2 deletions(-)
Auto-merging drivers/target/iscsi/iscsi_target_erl1.c
Auto-merging drivers/target/target_core_transport.c
Auto-merging include/target/target_core_fabric.h
[lts 94bace0f05e8] DLPX-72065 Aborted iSCSI command never completes after LUN reset (#4)
 Author: Pavel Zakharov <[email protected]>
 Date: Mon Mar 8 18:11:08 2021 -0500
 3 files changed, 22 insertions(+), 5 deletions(-)
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
CONFLICT (modify/delete): debian.hwe-5.15/dkms-versions deleted in HEAD and modified in a6ae7f761dd0 (DLPX-83442 Disable various kernel modules which we don't use (#13)).  Version a6ae7f761dd0 (DLPX-83442 Disable various kernel modules which we don't use (#13)) of debian.hwe-5.15/dkms-versions left in tree.
Auto-merging debian.master/dkms-versions
CONFLICT (content): Merge conflict in debian.master/dkms-versions
Auto-merging debian/rules.d/2-binary-arch.mk
error: could not apply a6ae7f761dd0... DLPX-83442 Disable various kernel modules which we don't use (#13)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

 $ gs
On branch lts
Cherry-pick currently in progress.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   debian.master/config/OVERRIDES
	modified:   debian/rules.d/2-binary-arch.mk

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Makefile
	deleted by us:   debian.hwe-5.15/dkms-versions
	both modified:   debian.master/dkms-versions

 $ git cherry-pick --continue
[lts 2f7c5ee6ce92] DLPX-83442 Disable various kernel modules which we don't use (#13)
 Author: Prakash Surya <[email protected]>
 Date: Tue Nov 15 14:41:17 2022 -0800
 4 files changed, 239 insertions(+), 11 deletions(-)
 create mode 100644 debian.master/config/OVERRIDES
Auto-merging drivers/target/iscsi/iscsi_target.c
Auto-merging drivers/target/iscsi/iscsi_target_login.c
Auto-merging include/target/iscsi/iscsi_target_core.h
[lts 6ae64caff88f] DLPX-83697 iscsi target login should wait until tx/rx threads have properly started
 Author: Paul Dagnelie <[email protected]>
 Date: Mon Nov 14 13:49:55 2022 -0800
 3 files changed, 6 insertions(+)
Auto-merging fs/namespace.c
[lts c910f6e6d697] DLPX-83701 Make function mnt_add_count() traceable (#16)
 Author: Don Brady <[email protected]>
 Date: Fri Dec 9 16:21:35 2022 -0700
 1 file changed, 3 insertions(+), 2 deletions(-)
[lts f7d9bb6c7477] DLPX-84608 Remove merge commit from linux-kernel-generic
 Author: John Wren Kennedy <[email protected]>
 Date: Fri Feb 10 15:25:25 2023 -0700
 1 file changed, 1 deletion(-)
[lts 2b88ee5f6dee] DLPX-84907 CVE-2022-3628 (#21)
 Author: Prakash Surya <[email protected]>
 Date: Wed Mar 1 09:08:26 2023 -0800
 1 file changed, 1 insertion(+)
Auto-merging drivers/target/iscsi/iscsi_target_login.c
Auto-merging drivers/target/iscsi/iscsi_target_nego.c
CONFLICT (content): Merge conflict in drivers/target/iscsi/iscsi_target_nego.c
Auto-merging drivers/target/iscsi/iscsi_target_util.c
CONFLICT (content): Merge conflict in drivers/target/iscsi/iscsi_target_util.c
Auto-merging drivers/target/iscsi/iscsi_target_util.h
CONFLICT (content): Merge conflict in drivers/target/iscsi/iscsi_target_util.h
Auto-merging include/target/iscsi/iscsi_target_core.h
CONFLICT (content): Merge conflict in include/target/iscsi/iscsi_target_core.h
error: could not apply ca31ccb3fe10... DLPX-84985 target: iscsi: fix deadlock in the iSCSI login code (#22)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

 $ gs
On branch lts
Cherry-pick currently in progress.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   drivers/target/iscsi/iscsi_target_nego.c
	both modified:   drivers/target/iscsi/iscsi_target_util.c
	both modified:   drivers/target/iscsi/iscsi_target_util.h
	both modified:   include/target/iscsi/iscsi_target_core.h

 $ git cherry-pick --continue
[lts 580a47c58812] DLPX-84985 target: iscsi: fix deadlock in the iSCSI login code (#22)
 Author: Serapheim Dimitropoulos <[email protected]>
 Date: Tue Mar 7 13:37:23 2023 -0800
 1 file changed, 14 insertions(+), 3 deletions(-)
[lts a4506a5ff920] DLPX-84906 Disable frame buffer drivers (#25)
 Author: sumedhbala-delphix <[email protected]>
 Date: Tue May 9 10:23:37 2023 -0700
 1 file changed, 1 insertion(+)
[lts c90e6860459d] DLPX-86177 Azure Accelerated networking broken because Mellanox drivers absent in kernel (#26)
 Author: Palash Gandhi <[email protected]>
 Date: Tue May 23 08:13:48 2023 -0700
 1 file changed, 5 deletions(-)
Performing inexact rename detection: 100% (33794/33794), done.
[lts 1ae4baadf173] DLPX-86675 Disk quota exceeded when unpacking an upgrade image (#27)
 Author: Prakash Surya <[email protected]>
 Date: Tue Jun 27 10:37:36 2023 -0700
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename {debian.master => debian.hwe-5.15}/config/OVERRIDES (99%)
CONFLICT (modify/delete): debian.hwe-5.15/config/annotations deleted in HEAD and modified in 4b92bb96d262 (DLPX-87344 Fix kernel merge conflict with upstream).  Version 4b92bb96d262 (DLPX-87344 Fix kernel merge conflict with upstream) of debian.hwe-5.15/config/annotations left in tree.
error: could not apply 4b92bb96d262... DLPX-87344 Fix kernel merge conflict with upstream
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

 $ gs
On branch lts
Cherry-pick currently in progress.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   debian.hwe-5.15/config/annotations

 $ git rm debian.hwe-5.15/config/annotations
rm 'debian.hwe-5.15/config/annotations'

 $ git commit --allow-empty
[lts e2abab9f9861] DLPX-87344 Fix kernel merge conflict with upstream
 Author: Prakash Surya <[email protected]>
 Date: Tue Aug 15 12:23:29 2023 -0700

 $ gs
On branch lts
Cherry-pick currently in progress.
  (run "git cherry-pick --continue" to continue)
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

$ git cherry-pick --continue
CONFLICT (modify/delete): debian.hwe-5.15/config/annotations deleted in HEAD and modified in 9273b91afa18 (DLPX-87710 upgrade from 6.0.16.0 to 15.0.0.0 failed because disk quota error (#29)).  Version 9273b91afa18 (DLPX-87710 upgrade from 6.0.16.0 to 15.0.0.0 failed because disk quota error (#29)) of debian.hwe-5.15/config/annotations left in tree.
error: could not apply 9273b91afa18... DLPX-87710 upgrade from 6.0.16.0 to 15.0.0.0 failed because disk quota error (#29)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

 $ gs
On branch lts
Cherry-pick currently in progress.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   debian.delphix/config/annotations
	deleted:    debian.hwe-5.15/config/OVERRIDES

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   debian.hwe-5.15/config/annotations

$ git rm debian.hwe-5.15/config/annotations
rm 'debian.hwe-5.15/config/annotations'

 $ gs
On branch lts
Cherry-pick currently in progress.
  (run "git cherry-pick --continue" to continue)
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   debian.delphix/config/annotations
	deleted:    debian.hwe-5.15/config/OVERRIDES

 $ git cherry-pick --continue
[lts acbf8056f273] DLPX-87710 upgrade from 6.0.16.0 to 15.0.0.0 failed because disk quota error (#29)
 Author: Palash Gandhi <[email protected]>
 Date: Wed Sep 6 20:20:02 2023 -0700
 2 files changed, 230 insertions(+), 229 deletions(-)
 create mode 100644 debian.delphix/config/annotations
 delete mode 100644 debian.hwe-5.15/config/OVERRIDES
CONFLICT (modify/delete): debian.hwe-5.15/config/annotations deleted in HEAD and modified in 2aebdf21a534 (DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts (#31)).  Version 2aebdf21a534 (DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts (#31)) of debian.hwe-5.15/config/annotations left in tree.
error: could not apply 2aebdf21a534... DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts (#31)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

 $ gs
On branch lts
Cherry-pick currently in progress.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	deleted:    debian.delphix/config/annotations

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   debian.hwe-5.15/config/annotations

 $ git rm debian.hwe-5.15/config/annotations
rm 'debian.hwe-5.15/config/annotations'

 $ git cherry-pick --continue
[lts b19532a5b76d] DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts (#31)
 Author: Palash Gandhi <[email protected]>
 Date: Tue Sep 19 08:03:17 2023 -0700
 1 file changed, 230 deletions(-)
 delete mode 100644 debian.delphix/config/annotations
Auto-merging drivers/target/iscsi/iscsi_target.c
On branch lts
Cherry-pick currently in progress.
  (run "git cherry-pick --continue" to continue)
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

$ git commit --allow-empty
[lts 814eb1523f7c] DLPX-91889 scsi: target: iscsi: Handle abort for WRITE_PENDING cmds (#40)
 Author: Paul Dagnelie <[email protected]>
 Date: Fri Aug 9 13:57:25 2024 -0700