Import Debian changes 5.4.0-1084.91

linux-aws (5.4.0-1084.91) focal; urgency=medium

  * focal/linux-aws: 5.4.0-1084.91 -proposed tracker (LP: #1983914)

  [ Ubuntu: 5.4.0-125.141 ]

  * focal/linux: 5.4.0-125.141 -proposed tracker (LP: #1983947)
  * nbd: requests can become stuck when disconnecting from server with qemu-nbd
    (LP: #1896350)
    - blk-mq: blk-mq: provide forced completion method
    - blk-mq: move failure injection out of blk_mq_complete_request
    - nbd: don't handle response without a corresponding request message
    - nbd: make sure request completion won't concurrent
    - nbd: don't clear 'NBD_CMD_INFLIGHT' flag if request is not completed
    - nbd: fix io hung while disconnecting device
  * CVE-2021-33656
    - vt: drop old FONT ioctls
  * CVE-2021-33061
    - ixgbe: add the ability for the PF to disable VF link state
    - ixgbe: add improvement for MDD response functionality
    - ixgbevf: add disable link state

block/blk-mq.c

@@ -579,7 +579,14 @@ static void __blk_mq_complete_request_remote(void *data)
 	q->mq_ops->complete(rq);
 }
 
-static void __blk_mq_complete_request(struct request *rq)
+/**
+ * blk_mq_complete_request - end I/O on a request
+ * @rq:		the request being processed
+ *
+ * Description:
+ *	Complete a request by scheduling the ->complete_rq operation.
+ **/
+void blk_mq_complete_request(struct request *rq)
 {
 	struct blk_mq_ctx *ctx = rq->mq_ctx;
 	struct request_queue *q = rq->q;
@@ -625,6 +632,7 @@ static void __blk_mq_complete_request(struct request *rq)
 	}
 	put_cpu();
 }
+EXPORT_SYMBOL(blk_mq_complete_request);
 
 static void hctx_unlock(struct blk_mq_hw_ctx *hctx, int srcu_idx)
 	__releases(hctx->srcu)
@@ -646,23 +654,6 @@ static void hctx_lock(struct blk_mq_hw_ctx *hctx, int *srcu_idx)
 		*srcu_idx = srcu_read_lock(hctx->srcu);
 }
 
-/**
- * blk_mq_complete_request - end I/O on a request
- * @rq:		the request being processed
- *
- * Description:
- *	Ends all I/O on a request. It does not handle partial completions.
- *	The actual completion happens out-of-order, through a IPI handler.
- **/
-bool blk_mq_complete_request(struct request *rq)
-{
-	if (unlikely(blk_should_fake_timeout(rq->q)))
-		return false;
-	__blk_mq_complete_request(rq);
-	return true;
-}
-EXPORT_SYMBOL(blk_mq_complete_request);
-
 int blk_mq_request_started(struct request *rq)
 {
 	return blk_mq_rq_state(rq) != MQ_RQ_IDLE;

block/blk-timeout.c

@@ -20,13 +20,11 @@ static int __init setup_fail_io_timeout(char *str)
 }
 __setup("fail_io_timeout=", setup_fail_io_timeout);
 
-int blk_should_fake_timeout(struct request_queue *q)
+bool __blk_should_fake_timeout(struct request_queue *q)
 {
-	if (!test_bit(QUEUE_FLAG_FAIL_IO, &q->queue_flags))
-		return 0;
-
 	return should_fail(&fail_io_timeout, 1);
 }
+EXPORT_SYMBOL_GPL(__blk_should_fake_timeout);
 
 static int __init fail_io_timeout_debugfs(void)
 {

block/blk.h

@@ -214,17 +214,9 @@ static inline void elevator_exit(struct request_queue *q,
 
 struct hd_struct *__disk_get_part(struct gendisk *disk, int partno);
 
-#ifdef CONFIG_FAIL_IO_TIMEOUT
-int blk_should_fake_timeout(struct request_queue *);
 ssize_t part_timeout_show(struct device *, struct device_attribute *, char *);
 ssize_t part_timeout_store(struct device *, struct device_attribute *,
 				const char *, size_t);
-#else
-static inline int blk_should_fake_timeout(struct request_queue *q)
-{
-	return 0;
-}
-#endif
 
 void __blk_queue_split(struct request_queue *q, struct bio **bio,
 		unsigned int *nr_segs);

block/bsg-lib.c

@@ -181,9 +181,12 @@ EXPORT_SYMBOL_GPL(bsg_job_get);
 void bsg_job_done(struct bsg_job *job, int result,
 		  unsigned int reply_payload_rcv_len)
 {
+	struct request *rq = blk_mq_rq_from_pdu(job);
+
 	job->result = result;
 	job->reply_payload_rcv_len = reply_payload_rcv_len;
-	blk_mq_complete_request(blk_mq_rq_from_pdu(job));
+	if (likely(!blk_should_fake_timeout(rq->q)))
+		blk_mq_complete_request(rq);
 }
 EXPORT_SYMBOL_GPL(bsg_job_done);
 

debian.aws/abi/5.4.0-1083.90/abiname

@@ -0,0 +1 @@
+1083

debian.aws/changelog

@@ -1,3 +1,27 @@
+linux-aws (5.4.0-1084.91) focal; urgency=medium
+
+  * focal/linux-aws: 5.4.0-1084.91 -proposed tracker (LP: #1983914)
+
+  [ Ubuntu: 5.4.0-125.141 ]
+
+  * focal/linux: 5.4.0-125.141 -proposed tracker (LP: #1983947)
+  * nbd: requests can become stuck when disconnecting from server with qemu-nbd
+    (LP: #1896350)
+    - blk-mq: blk-mq: provide forced completion method
+    - blk-mq: move failure injection out of blk_mq_complete_request
+    - nbd: don't handle response without a corresponding request message
+    - nbd: make sure request completion won't concurrent
+    - nbd: don't clear 'NBD_CMD_INFLIGHT' flag if request is not completed
+    - nbd: fix io hung while disconnecting device
+  * CVE-2021-33656
+    - vt: drop old FONT ioctls
+  * CVE-2021-33061
+    - ixgbe: add the ability for the PF to disable VF link state
+    - ixgbe: add improvement for MDD response functionality
+    - ixgbevf: add disable link state
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Thu, 11 Aug 2022 08:58:11 -0600
+
 linux-aws (5.4.0-1083.90) focal; urgency=medium
 
   [ Ubuntu: 5.4.0-124.140 ]

debian.aws/reconstruct

@@ -11,6 +11,7 @@ rm -f 'drivers/net/can/dev.c'
 rm -f 'drivers/net/can/rx-offload.c'
 rm -f 'drivers/staging/mt7621-dma/mtk-hsdma.c'
 rm -f 'include/Kbuild'
+rm -f 'include/linux/kd.h'
 rm -f 'include/uapi/rdma/nes-abi.h'
 rm -f 'kernel/elfcore.c'
 rm -f 'tools/build/feature/test-libpython-version.c'

debian.aws/tracking-bug

@@ -1 +1 @@
-1981251 2022.07.11-1
+1983914 2022.08.08-1

debian.master/abi/5.4.0-124.140/abiname

@@ -0,0 +1 @@
+124

debian.master/changelog

@@ -1,3 +1,26 @@
+linux (5.4.0-125.141) focal; urgency=medium
+
+  * focal/linux: 5.4.0-125.141 -proposed tracker (LP: #1983947)
+
+  * nbd: requests can become stuck when disconnecting from server with qemu-nbd
+    (LP: #1896350)
+    - blk-mq: blk-mq: provide forced completion method
+    - blk-mq: move failure injection out of blk_mq_complete_request
+    - nbd: don't handle response without a corresponding request message
+    - nbd: make sure request completion won't concurrent
+    - nbd: don't clear 'NBD_CMD_INFLIGHT' flag if request is not completed
+    - nbd: fix io hung while disconnecting device
+
+  * CVE-2021-33656
+    - vt: drop old FONT ioctls
+
+  * CVE-2021-33061
+    - ixgbe: add the ability for the PF to disable VF link state
+    - ixgbe: add improvement for MDD response functionality
+    - ixgbevf: add disable link state
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Wed, 10 Aug 2022 10:17:28 +0200
+
 linux (5.4.0-124.140) focal; urgency=medium
 
   * CVE-2022-2586

debian.master/reconstruct

@@ -11,6 +11,7 @@ rm -f 'drivers/net/can/dev.c'
 rm -f 'drivers/net/can/rx-offload.c'
 rm -f 'drivers/staging/mt7621-dma/mtk-hsdma.c'
 rm -f 'include/Kbuild'
+rm -f 'include/linux/kd.h'
 rm -f 'include/uapi/rdma/nes-abi.h'
 rm -f 'kernel/elfcore.c'
 rm -f 'tools/build/feature/test-libpython-version.c'

debian.master/tracking-bug

@@ -1 +1 @@
-1981284 2022.07.11-1
+1983947 2022.08.08-1

debian/changelog

@@ -1,3 +1,27 @@
+linux-aws (5.4.0-1084.91) focal; urgency=medium
+
+  * focal/linux-aws: 5.4.0-1084.91 -proposed tracker (LP: #1983914)
+
+  [ Ubuntu: 5.4.0-125.141 ]
+
+  * focal/linux: 5.4.0-125.141 -proposed tracker (LP: #1983947)
+  * nbd: requests can become stuck when disconnecting from server with qemu-nbd
+    (LP: #1896350)
+    - blk-mq: blk-mq: provide forced completion method
+    - blk-mq: move failure injection out of blk_mq_complete_request
+    - nbd: don't handle response without a corresponding request message
+    - nbd: make sure request completion won't concurrent
+    - nbd: don't clear 'NBD_CMD_INFLIGHT' flag if request is not completed
+    - nbd: fix io hung while disconnecting device
+  * CVE-2021-33656
+    - vt: drop old FONT ioctls
+  * CVE-2021-33061
+    - ixgbe: add the ability for the PF to disable VF link state
+    - ixgbe: add improvement for MDD response functionality
+    - ixgbevf: add disable link state
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Thu, 11 Aug 2022 08:58:11 -0600
+
 linux-aws (5.4.0-1083.90) focal; urgency=medium
 
   [ Ubuntu: 5.4.0-124.140 ]

debian/control

@@ -54,7 +54,7 @@ Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-aws/+git
 XS-Testsuite: autopkgtest
 #XS-Testsuite-Depends: gcc-4.7 binutils
 
-Package: linux-aws-headers-5.4.0-1083
+Package: linux-aws-headers-5.4.0-1084
 Build-Profiles: <!stage1>
 Architecture: all
 Multi-Arch: foreign
@@ -65,46 +65,46 @@ Breaks: iscsitarget-dkms (<< 1.4.20.3+svn502-2ubuntu4.4)
 Description: Header files related to Linux kernel version 5.4.0
  This package provides kernel header files for version 5.4.0, for sites
  that want the latest kernel headers. Please read
- /usr/share/doc/linux-aws-headers-5.4.0-1083/debian.README.gz for details
+ /usr/share/doc/linux-aws-headers-5.4.0-1084/debian.README.gz for details
 
-Package: linux-aws-tools-5.4.0-1083
+Package: linux-aws-tools-5.4.0-1084
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
-Description: Linux kernel version specific tools for version 5.4.0-1083
+Description: Linux kernel version specific tools for version 5.4.0-1084
  This package provides the architecture dependant parts for kernel
  version locked tools (such as perf and x86_energy_perf_policy) for
- version 5.4.0-1083 on
+ version 5.4.0-1084 on
  64 bit x86.
- You probably want to install linux-tools-5.4.0-1083-<flavour>.
+ You probably want to install linux-tools-5.4.0-1084-<flavour>.
 
-Package: linux-aws-cloud-tools-5.4.0-1083
+Package: linux-aws-cloud-tools-5.4.0-1084
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common
-Description: Linux kernel version specific cloud tools for version 5.4.0-1083
+Description: Linux kernel version specific cloud tools for version 5.4.0-1084
  This package provides the architecture dependant parts for kernel
- version locked tools for cloud tools for version 5.4.0-1083 on
+ version locked tools for cloud tools for version 5.4.0-1084 on
  64 bit x86.
- You probably want to install linux-cloud-tools-5.4.0-1083-<flavour>.
+ You probably want to install linux-cloud-tools-5.4.0-1084-<flavour>.
 
 
 
-Package: linux-image-unsigned-5.4.0-1083-aws
+Package: linux-image-unsigned-5.4.0-1084-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel
 Priority: optional
 Provides: linux-image, fuse-module, aufs-dkms, ${linux:rprovides}
-Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.4.0-1083-aws
+Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.4.0-1084-aws
 Recommends: grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | grub-efi-arm64 [arm64], initramfs-tools | linux-initramfs-tool
 Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x]
-Conflicts: linux-image-5.4.0-1083-aws
-Suggests: fdutils, linux-aws-doc-5.4.0 | linux-aws-source-5.4.0, linux-aws-tools, linux-headers-5.4.0-1083-aws
+Conflicts: linux-image-5.4.0-1084-aws
+Suggests: fdutils, linux-aws-doc-5.4.0 | linux-aws-source-5.4.0, linux-aws-tools, linux-headers-5.4.0-1084-aws
 Description: Linux kernel image for version 5.4.0 on 64 bit x86 SMP
  This package contains the unsigned Linux kernel image for version 5.4.0 on
  64 bit x86 SMP.
@@ -117,7 +117,7 @@ Description: Linux kernel image for version 5.4.0 on 64 bit x86 SMP
  the linux-aws meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-modules-5.4.0-1083-aws
+Package: linux-modules-5.4.0-1084-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel
@@ -137,12 +137,12 @@ Description: Linux kernel extra modules for version 5.4.0 on 64 bit x86 SMP
  the linux-aws meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-modules-extra-5.4.0-1083-aws
+Package: linux-modules-extra-5.4.0-1084-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.4.0-1083-aws | linux-image-unsigned-5.4.0-1083-aws, crda | wireless-crda
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.4.0-1084-aws | linux-image-unsigned-5.4.0-1084-aws, crda | wireless-crda
 Description: Linux kernel extra modules for version 5.4.0 on 64 bit x86 SMP
  This package contains the Linux kernel extra modules for version 5.4.0 on
  64 bit x86 SMP.
@@ -155,21 +155,21 @@ Description: Linux kernel extra modules for version 5.4.0 on 64 bit x86 SMP
  the linux-modules-extra-aws meta-package, which will ensure that upgrades
  work correctly, and that supporting packages are also installed.
 
-Package: linux-headers-5.4.0-1083-aws
+Package: linux-headers-5.4.0-1084-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-aws-headers-5.4.0-1083, ${shlibs:Depends}
+Depends: ${misc:Depends}, linux-aws-headers-5.4.0-1084, ${shlibs:Depends}
 Provides: linux-headers, linux-headers-3.0
 Description: Linux kernel headers for version 5.4.0 on 64 bit x86 SMP
  This package provides kernel header files for version 5.4.0 on
  64 bit x86 SMP.
  .
  This is for sites that want the latest kernel headers.  Please read
- /usr/share/doc/linux-headers-5.4.0-1083/debian.README.gz for details.
+ /usr/share/doc/linux-headers-5.4.0-1084/debian.README.gz for details.
 
-Package: linux-image-unsigned-5.4.0-1083-aws-dbgsym
+Package: linux-image-unsigned-5.4.0-1084-aws-dbgsym
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
@@ -186,27 +186,27 @@ Description: Linux kernel debug image for version 5.4.0 on 64 bit x86 SMP
  is uncompressed, and unstripped. This package also includes the
  unstripped modules.
 
-Package: linux-tools-5.4.0-1083-aws
+Package: linux-tools-5.4.0-1084-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-aws-tools-5.4.0-1083
-Description: Linux kernel version specific tools for version 5.4.0-1083
+Depends: ${misc:Depends}, linux-aws-tools-5.4.0-1084
+Description: Linux kernel version specific tools for version 5.4.0-1084
  This package provides the architecture dependant parts for kernel
  version locked tools (such as perf and x86_energy_perf_policy) for
- version 5.4.0-1083 on
+ version 5.4.0-1084 on
  64 bit x86.
 
-Package: linux-cloud-tools-5.4.0-1083-aws
+Package: linux-cloud-tools-5.4.0-1084-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-aws-cloud-tools-5.4.0-1083
-Description: Linux kernel version specific cloud tools for version 5.4.0-1083
+Depends: ${misc:Depends}, linux-aws-cloud-tools-5.4.0-1084
+Description: Linux kernel version specific cloud tools for version 5.4.0-1084
  This package provides the architecture dependant parts for kernel
- version locked tools for cloud for version 5.4.0-1083 on
+ version locked tools for cloud for version 5.4.0-1084 on
  64 bit x86.
 
 Package: linux-udebs-aws
@@ -220,7 +220,7 @@ Description: Metapackage depending on kernel udebs
  for easier version and migration tracking.
 
 
-Package: linux-buildinfo-5.4.0-1083-aws
+Package: linux-buildinfo-5.4.0-1084-aws
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel

drivers/block/loop.c

@@ -497,7 +497,8 @@ static void lo_rw_aio_do_completion(struct loop_cmd *cmd)
 		return;
 	kfree(cmd->bvec);
 	cmd->bvec = NULL;
-	blk_mq_complete_request(rq);
+	if (likely(!blk_should_fake_timeout(rq->q)))
+		blk_mq_complete_request(rq);
 }
 
 static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2)
@@ -2027,7 +2028,8 @@ static void loop_handle_cmd(struct loop_cmd *cmd)
 	/* complete non-aio request */
 	if (!cmd->use_aio || ret) {
 		cmd->ret = ret ? -EIO : 0;
-		blk_mq_complete_request(rq);
+		if (likely(!blk_should_fake_timeout(rq->q)))
+			blk_mq_complete_request(rq);
 	}
 }