ctrliq · PlaidCat · Dec 17, 2024 · Dec 11, 2024 · Dec 11, 2024 · Dec 11, 2024
diff --git a/COPYING → COPYING-5.14.0-503.16.1.el9_5 b/COPYING → COPYING-5.14.0-503.16.1.el9_5
diff --git a/Documentation/networking/device_drivers/atm/cxacru-cf.py b/Documentation/networking/device_drivers/atm/cxacru-cf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#! /usr/bin/python3 -s
 # Copyright 2009 Simon Arlott
 #
 # This program is free software; you can redistribute it and/or modify it

diff --git a/Documentation/networking/device_drivers/ethernet/amazon/ena.rst b/Documentation/networking/device_drivers/ethernet/amazon/ena.rst
@@ -230,6 +230,11 @@ per-queue stats) from the device.
 
 In addition the driver logs the stats to syslog upon device reset.
 
+On supported instance types, the statistics will also include the
+ENA Express data (fields prefixed with `ena_srd`). For a complete
+documentation of ENA Express data refer to
+https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ena-express.html#ena-express-monitor
+
 MTU
 ===
 

diff --git a/Documentation/sphinx/kernel_include.py b/Documentation/sphinx/kernel_include.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#! /usr/bin/python3 -s
 # -*- coding: utf-8; mode: python -*-
 # pylint: disable=R0903, C0330, R0914, R0912, E0401
 

diff --git a/Documentation/sphinx/maintainers_include.py b/Documentation/sphinx/maintainers_include.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#! /usr/bin/python3 -s
 # SPDX-License-Identifier: GPL-2.0
 # -*- coding: utf-8; mode: python -*-
 # pylint: disable=R0903, C0330, R0914, R0912, E0401

diff --git a/Documentation/sphinx/rstFlatTable.py b/Documentation/sphinx/rstFlatTable.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#! /usr/bin/python3 -s
 # -*- coding: utf-8; mode: python -*-
 # pylint: disable=C0330, R0903, R0912
 

diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#! /usr/bin/python3 -s
 # The TCM v4 multi-protocol fabric module generation script for drivers/target/$NEW_MOD
 #
 # Copyright (c) 2010 Rising Tide Systems

diff --git a/Documentation/trace/postprocess/decode_msr.py b/Documentation/trace/postprocess/decode_msr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#! /usr/bin/python3 -s
 # add symbolic names to read_msr / write_msr in trace
 # decode_msr msr-index.h < trace
 import sys

diff --git a/Makefile.rhelver b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 5
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 503
+RHEL_RELEASE = 503.16.1
 
 #
 # ZSTREAM
@@ -34,7 +34,7 @@ RHEL_RELEASE = 503
 #  (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
 #  number will be incremented instead of the Y).
 #
-ZSTREAM ?= no
+ZSTREAM ?= yes
 
 #
 # Early y+1 numbering

diff --git a/arch/arm64/boot/install.sh b/arch/arm64/boot/install.sh
@@ -17,7 +17,8 @@
 #   $3 - kernel map file
 #   $4 - default install path (blank if root directory)
 
-if [ "$(basename $2)" = "Image.gz" ]; then
+if [ "$(basename $2)" = "Image.gz" ] || [ "$(basename $2)" = "vmlinuz.efi" ]
+then
 # Compressed install
   echo "Installing compressed kernel"
   base=vmlinuz

diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h
@@ -267,7 +267,12 @@ static inline unsigned long kvm_s390_get_gfn_end(struct kvm_memslots *slots)
 
 static inline u32 kvm_s390_get_gisa_desc(struct kvm *kvm)
 {
-	u32 gd = virt_to_phys(kvm->arch.gisa_int.origin);
+	u32 gd;
+
+	if (!kvm->arch.gisa_int.origin)
+		return 0;
+
+	gd = virt_to_phys(kvm->arch.gisa_int.origin);
 
 	if (gd && sclp.has_gisaf)
 		gd |= GISA_FORMAT1;

diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
@@ -374,14 +374,14 @@ pti_clone_pgtable(unsigned long start, unsigned long end,
 			 */
 			*target_pmd = *pmd;
 
-			addr += PMD_SIZE;
+			addr = round_up(addr + 1, PMD_SIZE);
 
 		} else if (level == PTI_CLONE_PTE) {
 
 			/* Walk the page-table down to the pte level */
 			pte = pte_offset_kernel(pmd, addr);
 			if (pte_none(*pte)) {
-				addr += PAGE_SIZE;
+				addr = round_up(addr + 1, PAGE_SIZE);
 				continue;
 			}
 
@@ -401,7 +401,7 @@ pti_clone_pgtable(unsigned long start, unsigned long end,
 			/* Clone the PTE */
 			*target_pte = *pte;
 
-			addr += PAGE_SIZE;
+			addr = round_up(addr + 1, PAGE_SIZE);
 
 		} else {
 			BUG();

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
@@ -217,6 +217,7 @@ bool bio_integrity_prep(struct bio *bio)
 	unsigned long start, end;
 	unsigned int len, nr_pages;
 	unsigned int bytes, offset, i;
+	gfp_t gfp = GFP_NOIO;
 
 	if (!bi)
 		return true;
@@ -239,11 +240,19 @@ bool bio_integrity_prep(struct bio *bio)
 		if (!bi->profile->generate_fn ||
 		    !(bi->flags & BLK_INTEGRITY_GENERATE))
 			return true;
+
+		/*
+		 * Zero the memory allocated to not leak uninitialized kernel
+		 * memory to disk.  For PI this only affects the app tag, but
+		 * for non-integrity metadata it affects the entire metadata
+		 * buffer.
+		 */
+		gfp |= __GFP_ZERO;
 	}
 
 	/* Allocate kernel buffer for protection data */
 	len = bio_integrity_bytes(bi, bio_sectors(bio));
-	buf = kmalloc(len, GFP_NOIO);
+	buf = kmalloc(len, gfp);
 	if (unlikely(buf == NULL)) {
 		printk(KERN_ERR "could not allocate integrity buffer\n");
 		goto err_end_io;

diff --git a/certs/rhel.pem b/certs/rhel.pem
@@ -0,0 +1,117 @@
+-----BEGIN CERTIFICATE-----
+MIIFCTCCA/GgAwIBAgIBIjANBgkqhkiG9w0BAQsFADCB1DELMAkGA1UEBhMCVVMx
+ETAPBgNVBAgMCERlbGF3YXJlMQ4wDAYDVQQHDAVEb3ZlcjEtMCsGA1UECgwkUm9j
+a3kgRW50ZXJwcmlzZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMSEwHwYDVQQLDBhSZWxl
+YXNlIGVuZ2luZWVyaW5nIHRlYW0xKDAmBgNVBAMMH1JvY2t5IExpbnV4IFNlY3Vy
+ZSBCb290IFJvb3QgQ0ExJjAkBgkqhkiG9w0BCQEWF3NlY3VyaXR5QHJvY2t5bGlu
+dXgub3JnMB4XDTI0MDQwNDAwMzM0OVoXDTI1MDQwNDAwMzM0OVowgdgxCzAJBgNV
+BAYTAlVTMREwDwYDVQQIDAhEZWxhd2FyZTEOMAwGA1UEBwwFRG92ZXIxLTArBgNV
+BAoMJFJvY2t5IEVudGVycHJpc2UgU29mdHdhcmUgRm91bmRhdGlvbjEhMB8GA1UE
+CwwYUmVsZWFzZSBlbmdpbmVlcmluZyB0ZWFtMSwwKgYDVQQDDCNSb2NreSBMaW51
+eCBEcml2ZXIgU2lnbmluZyBDZXJ0IDEwMTEmMCQGCSqGSIb3DQEJARYXc2VjdXJp
+dHlAcm9ja3lsaW51eC5vcmcwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIB
+gQDAvHcZPrCh2MNBAASPDI22IDhsvww8IEK5s1dipx80+o5ikJvaTpmbbCclIq2u
+yljNU4ACdzIijDqMzYC8kLMtXJHmJ2UqTUd4pT0ZKalbVt6xrhQaiTL1pdy0S3mJ
+0K3g91hahIu9uT0tYc2MZrrwhZh6ugCt+epSvk3UN6g1jVfBPWeQwzqazsDTrqbz
+8xEBfGNC4RcdmWVN6M2KNhoKUmIJ3y6Uz3jxcj8ke06r2872FJFr2OpoY8ti0bq3
+9uy+qQR+GhmPFwP0bgItAGYu3wwc5aAsandaF6tK77lefM/IyVNRQTUElOYt0ywv
+IALu0fDg9joHwYb9aaU4vCHhgddYtCqs491NIzoK6wEMa3lIKsW1qeKW6eeRWf/0
+/sLfCWGR8v5xarpFhJlC10bw0cQ+Ksn8xfQ/o4b/WPqy5sBpYg4UXPX4LBg1xjh4
+2f6kup3mBZYupayJMU3xtD7p849dJdPPTVJwcZUcRFRCXcAFPHKGfg1MtdhSrIRO
+TjMCAwEAAaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFM5TfwxhXAOBFKy7ASM6W2K5OhlxMB8GA1UdIwQYMBaAFEwsa9fWTugVgcq4
+6YZmH2XiFm/EMA0GCSqGSIb3DQEBCwUAA4IBAQA+3NhUBeJxOJ80q9rHJmN6nypr
+xUbZFs4SELumPQFcr5OViiyZc2scAd9VPtb8IaIu5kcvWChozvgcq8nKQnPPIglQ
+UlS2qcJ5o9YI4dc7IoxbcojykusicxOCIgJecVOVirOGd40Lz4pSGVpI6yaruXiI
+anQ9Ve+tJBmKMnN5wXvMnpA1lqO/nzvv9fvbU/8Y/VUFmNNoOs8miP/O4uVbd2uZ
+JGsGjonO3kGdFMd1Wy7e52A9aOP44qEHOb7/B6MD+RzAyvbUBpYPQENTQlE/vmeG
+4u/bjR9073kgoFFFNp3OL08KGIfUtlGj4xdhPDi+pu13JaiDzd7ZmYrE+ktZ
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFCTCCA/GgAwIBAgIBJjANBgkqhkiG9w0BAQsFADCB1DELMAkGA1UEBhMCVVMx
+ETAPBgNVBAgMCERlbGF3YXJlMQ4wDAYDVQQHDAVEb3ZlcjEtMCsGA1UECgwkUm9j
+a3kgRW50ZXJwcmlzZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMSEwHwYDVQQLDBhSZWxl
+YXNlIGVuZ2luZWVyaW5nIHRlYW0xKDAmBgNVBAMMH1JvY2t5IExpbnV4IFNlY3Vy
+ZSBCb290IFJvb3QgQ0ExJjAkBgkqhkiG9w0BCQEWF3NlY3VyaXR5QHJvY2t5bGlu
+dXgub3JnMB4XDTI0MDQwNDAwMzM0OVoXDTI1MDQwNDAwMzM0OVowgdgxCzAJBgNV
+BAYTAlVTMREwDwYDVQQIDAhEZWxhd2FyZTEOMAwGA1UEBwwFRG92ZXIxLTArBgNV
+BAoMJFJvY2t5IEVudGVycHJpc2UgU29mdHdhcmUgRm91bmRhdGlvbjEhMB8GA1UE
+CwwYUmVsZWFzZSBlbmdpbmVlcmluZyB0ZWFtMSwwKgYDVQQDDCNSb2NreSBMaW51
+eCBLcGF0Y2ggU2lnbmluZyBDZXJ0IDEwMTEmMCQGCSqGSIb3DQEJARYXc2VjdXJp
+dHlAcm9ja3lsaW51eC5vcmcwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIB
+gQC/k4GyJKctyXNB51dU3TTQ28S7j+OimjM4LmA3qQVNq4go/+DWnbT9NpRb248h
+T6Dl5HIQ9yKNdt9zPD6fjZG+V8lRpdLnpGUFMWfjyMlGx1JTjtRzZ0QquO8P3gl3
+JMfLj0uKH+pGXV7QSFA3YiczG2A1jwf2qfDUjQJw87xFT+DYI2GWKrQqOyLnwRRl
+OeyJkvDOyqh/RVOsVX42bamzmATRCOmixzRGrk3+Ksv/0FV/eVUoqd8yib2AGlMf
+vMqPBRbrIURbHO4/wgcjhcNl4JioGk2V5FLVwG83dLOfwkJd2zp6I8dR8m1shEbj
+3zxtqc59JpW7WWhqXbwqCvFSQijVdkui/xyPCCr6o0b9zQWRaBArYbSxds48dgO5
+ZVHvTTCfSTPYYhtepZYMINuaWIbX3DD3wMOEK2kmNU5Qjg459RDZMb0Rl/PhbGuS
+F/GbkOVQhllENKjAxsGFi+IfApB2Dvz+EyWouvQlKDRBw5G0KHqauy/aWkeWeRzp
+n3kCAwEAAaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFLXuB8c35X7L6u1JOlE3l2OwYxLFMB8GA1UdIwQYMBaAFEwsa9fWTugVgcq4
+6YZmH2XiFm/EMA0GCSqGSIb3DQEBCwUAA4IBAQAAnyGNChwn8gs0srrl/F8h0yJO
+2SAcb+wMq0TypF0TuTCFWZL6ICCQ30HNXi7RSyajF/qa3xspXQv7Klu/uguW5SOz
+DCpx/YDp2VABTQtOWrsJXYmqicmeaNipfIhUJCrS/opPASQv1CQxl7JSSKlJDYtx
+jzE7QG3ptd8xBWj9RsVxpoeoF2qhv1A0VBmb5WUYp5w9S4TGL34U1fWTkEnLk+sy
+vMPYZ0FOYWF8o133kJTcjwXWPjVPW1L4evyTGzguju9eZP3OiCBxbjYwi43p4HlK
+3K8UhkhoCsIWT6Ucj3OFcZ3MUQXGxOa8BZEV4TdyPUFvtahlOIgfqMbxK12g
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEfjCCA2agAwIBAgIUWOH3GRgYTJQQwhxTTgTX3PHww9UwDQYJKoZIhvcNAQEL
+BQAwgccxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhEZWxhd2FyZTEOMAwGA1UEBwwF
+RG92ZXIxLTArBgNVBAoMJFJvY2t5IEVudGVycHJpc2UgU29mdHdhcmUgRm91bmRh
+dGlvbjEhMB8GA1UECwwYUmVsZWFzZSBlbmdpbmVlcmluZyB0ZWFtMRswGQYDVQQD
+DBJSb2NreSBMaW51eCBJTUEgQ0ExJjAkBgkqhkiG9w0BCQEWF3NlY3VyaXR5QHJv
+Y2t5bGludXgub3JnMB4XDTIzMTAyNjE4MzgwNVoXDTMxMDYxODE4MzgwNVowgccx
+CzAJBgNVBAYTAlVTMREwDwYDVQQIDAhEZWxhd2FyZTEOMAwGA1UEBwwFRG92ZXIx
+LTArBgNVBAoMJFJvY2t5IEVudGVycHJpc2UgU29mdHdhcmUgRm91bmRhdGlvbjEh
+MB8GA1UECwwYUmVsZWFzZSBlbmdpbmVlcmluZyB0ZWFtMRswGQYDVQQDDBJSb2Nr
+eSBMaW51eCBJTUEgQ0ExJjAkBgkqhkiG9w0BCQEWF3NlY3VyaXR5QHJvY2t5bGlu
+dXgub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyPUxFBA1UuW5
+8HCuneVvZL6xKUJXZ+Xqdm5g8bPKQVjXASQU5VynzqydYk0cwrPprxJa1OB3llN+
+lQadMOCGWcklwRBmH1x/Gbjja6gnnK/flY7vpRiL8IZudLG273qnlmUimde+GOYb
+akIJgqwhi7DJRwDIFEC1ScUqPUI3QncFENKQxzi7KiWNRWl+ObfkcizjXSe9U4Y4
+9hKt9qL+C5k2O1L6i3GE/1A82G5zgpmxKqRcY1soXGhBuUU99sx4a/uByzQNQm8Z
+8ndExjxH1jTpLAKF+0nzMBnRIGA8IlotntkL50y04i6luvHrGS9a678gujjK8OOA
+qATkiVn7jQIDAQABo2AwXjAdBgNVHQ4EFgQUHRzaTRas1RliJtGeH9ssJ2HRLE0w
+HwYDVR0jBBgwFoAUHRzaTRas1RliJtGeH9ssJ2HRLE0wDwYDVR0TAQH/BAUwAwEB
+/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAFsLn98eTIui2LWj9RVY
+dZjrvawKzyh8XeSnVjONQT1PSqjYS0oe5S09EgXPLCOGjtjKhAuJTiZdYnDQuht7
+JMIp5YpZu9Dwy2ihz7m86EqNrZaR1EWZv62qgjno0M517+w54fhPpLX+TgDgmd3N
+5olEq0MD+Tod5NIsTi8AuRZFPaDCcOZ9sXLLqYLTdFoXNeRGmo/KDop1LNNtEijT
+IpNSOJpZngY08Kl4teaVMMWq0k9ueeI3RGEM+3jiIRz0EL7hNcyhsPC8OSY25FeB
+FSWGkLQL+HK9YOs9g8KC45Ry8gJbtRvUTT0jkrBJnV+qt6sePjnmhVA3noFzjFJP
+7Ss=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFijCCBHKgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UEBhMCVVMx
+ETAPBgNVBAgMCERlbGF3YXJlMQ4wDAYDVQQHDAVEb3ZlcjEtMCsGA1UECgwkUm9j
+a3kgRW50ZXJwcmlzZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMSEwHwYDVQQLDBhSZWxl
+YXNlIGVuZ2luZWVyaW5nIHRlYW0xGjAYBgNVBAMMEU52aWRpYSBHUFUgT09UIENB
+MSYwJAYJKoZIhvcNAQkBFhdzZWN1cml0eUByb2NreWxpbnV4Lm9yZzAeFw0yNDA1
+MDEwMDE4MjdaFw0yNTA1MDEwMDE4MjdaMIHPMQswCQYDVQQGEwJVUzERMA8GA1UE
+CAwIRGVsYXdhcmUxDjAMBgNVBAcMBURvdmVyMS0wKwYDVQQKDCRSb2NreSBFbnRl
+cnByaXNlIFNvZnR3YXJlIEZvdW5kYXRpb24xITAfBgNVBAsMGFJlbGVhc2UgZW5n
+aW5lZXJpbmcgdGVhbTEjMCEGA1UEAwwaTnZpZGlhIEdQVSBPT1QgU2lnbmluZyAx
+MDExJjAkBgkqhkiG9w0BCQEWF3NlY3VyaXR5QHJvY2t5bGludXgub3JnMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxTgi1ZuRFbG0EuGNNj/Ydh4cfJyo
+4SNXMqICRK9JWXww2REQGwvvbFzu0qmtsq45NBOPJaixZAIJNihOHvMgeg4HAXg5
+BGADtaZGvCO7LSphVMriwxLsk28nnfXzsVQfCNDBeWhGqAlnHfCTfCYH+AZzg/vG
+13Bz3+t9D7enN+lU/f8AOcMyuR3hdqIXsQ3IATMz1n/9iLPbgC1w3L3yPK0S7D2Z
+6o676ldq3266rQj4fZhCzvq/g8h4oLKDMWr2DnLG2fGsb/3JN9tu7iKtL1N5osrI
+9ESj2KuIBXvZyTUcp9ycJan/fGH9sT/sGq7PW0yHiL5wxmVft0SNmCrPhSc+bDzo
+jT2ddWZg9YJQ0uwpewv+a7DrPqZSmzy4JCNlMMMOFIX7Cuu0K+6ujJB/UEqlLAu5
+8E8l66yYij0AvyBNzlR6iKsUsqLwvlc5GpJiehrxdeBbVPbfU+fC6aPNK/dyXw7O
+orkZYIEvEylKcddxfnPjAeA57A60/QRbKfuGM5/pDCVdAtKyvVkqmHfSywbJeQvt
+a6kjgygTgjdtepg13eh8ny39rLtc4PnpsTwx4IzxWpmdGh3rXNCLfL/nx+ZRR7mA
+6MPykc8cdbVAgh1byoWWVC54cIMRm5+AAvO323495h+upO+HaCvEILbogKihWIjb
+pNdTrRukcFUJ5e8CAwEAAaN4MHYwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMC
+B4AwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwMwHQYDVR0OBBYEFIFrqcdw5pYM7+N4
+Aghl1Ou8NSp9MB8GA1UdIwQYMBaAFIcd8JjoQR3iBsjCTKPtFrGhFulxMA0GCSqG
+SIb3DQEBCwUAA4IBAQCeu0wW4TfKZQE95iqZ+tFLr0U8W4ulVbwW5o31qR1hjZZl
+3yyktCvxTBUA6KPlHdOTg5964BuNEVeKIKoQcl/6XFyEw+pdPSXGEPokiNzw+Zjw
+WLLJ3zYTS4nFWyy2RpVmFj1WpY3rsGM/ynzpIozb8g08d3LA6yWrQtY9UGsm0ptx
+RtTytrcrcR3EBPm2xnJjpwqIopKf315QmLg9bopDYyGCBr0XXULawIL4vVOLJSj/
+ndVFghy75LzBHvKL/cSVDqP4qDJPezOti+u4Gzg1TgsizG2Cw0Yfy8jzFHNa6x4N
+V8Ni0YRKkRKYpuJ63RBdXoScm5TBibN941QvT1Gs
+-----END CERTIFICATE-----
diff --git a/ciq/ciq_backports/kernel-5.14.0-503.14.1.el9_5/137cef6d.failed b/ciq/ciq_backports/kernel-5.14.0-503.14.1.el9_5/137cef6d.failed
@@ -0,0 +1,59 @@
+net/mlx5: SF, Stop waiting for FW as teardown was called
+
+jira LE-2157
+Rebuild_History Non-Buildable kernel-5.14.0-503.14.1.el9_5
+commit-author Moshe Shemesh <moshe@nvidia.com>
+commit 137cef6d55564fb687d12fbc5f85be43ff7b53a7
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-5.14.0-503.14.1.el9_5/137cef6d.failed
+
+When PF/VF teardown is called the driver sets the flag
+MLX5_BREAK_FW_WAIT to stop waiting for FW loading and initializing. Same
+should be applied to SF driver teardown to cut waiting time. On
+mlx5_sf_dev_remove() set the flag before draining health WQ as recovery
+flow may also wait for FW reloading while it is not relevant anymore.
+
+	Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
+	Reviewed-by: Aya Levin <ayal@nvidia.com>
+	Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
+(cherry picked from commit 137cef6d55564fb687d12fbc5f85be43ff7b53a7)
+	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
+
+# Conflicts:
+#	drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
+diff --cc drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
+index 5c054a0005dd,bc863e1f062e..000000000000
+--- a/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
+@@@ -91,15 -95,19 +91,25 @@@ mdev_err
+  static void mlx5_sf_dev_remove(struct auxiliary_device *adev)
+  {
+  	struct mlx5_sf_dev *sf_dev = container_of(adev, struct mlx5_sf_dev, adev);
+- 	struct devlink *devlink = priv_to_devlink(sf_dev->mdev);
++ 	struct mlx5_core_dev *mdev = sf_dev->mdev;
++ 	struct devlink *devlink;
+
+++<<<<<<< HEAD
+ +	mlx5_drain_health_wq(sf_dev->mdev);
+ +	if (mlx5_dev_is_lightweight(sf_dev->mdev))
+ +		mlx5_uninit_one_light(sf_dev->mdev);
+++=======
++ 	devlink = priv_to_devlink(mdev);
++ 	set_bit(MLX5_BREAK_FW_WAIT, &mdev->intf_state);
++ 	mlx5_drain_health_wq(mdev);
++ 	devlink_unregister(devlink);
++ 	if (mlx5_dev_is_lightweight(mdev))
++ 		mlx5_uninit_one_light(mdev);
+++>>>>>>> 137cef6d5556 (net/mlx5: SF, Stop waiting for FW as teardown was called)
+  	else
+- 		mlx5_uninit_one(sf_dev->mdev);
+- 	iounmap(sf_dev->mdev->iseg);
+- 	mlx5_mdev_uninit(sf_dev->mdev);
++ 		mlx5_uninit_one(mdev);
++ 	iounmap(mdev->iseg);
++ 	mlx5_mdev_uninit(mdev);
+  	mlx5_devlink_free(devlink);
+  }
+
+* Unmerged path drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c