Merge tag 'rolling-lts/wsl/6.18.20.3' into linux-msft-wsl-6.18.y

Linux rolling-lts/wsl/6.18.20.3

Signed-off-by: Mitchell Levy <levymitchell0@gmail.com>

Author: chessturo

MSFT-Merge/log

@@ -4,7 +4,8 @@ config/wsl-6.18                                    47e6dda87358a7a45087a75021a55
 feature/arm64-hyperv-hypercall-interface/6.18      712c88941ba7cfd3c9eec3a58eef4c231226d66f
 feature/arm64-hyperv-synthetic-clocks-timers/6.18  ea0cd9a5b6202ef81b45f137c37b17478a54f382
 feature/wsl-module-script/6.18                     9c6d7c0a3fadd2ce32c90dad74429ed7e463ad4a
-feature/dxgkrnl/6.18                               cfd1dd6fa869afa857065d28b511e9bd5c3a2f8d
+feature/dxgkrnl/6.18                               7645bb43d045d813c5a11a5746c28bd763868b28
 product/wsl/readme/6.18                            bbf044c25e1203bed3182cedae466235420e7e96
 product/wsl/security/6.18                          20778f3fd73f259549f66a8bea0227dbdfe3e170
 fix/virtiofs-dax-hang/6.18                         668def1339349ba0ff85f22b6244066a8369b022
+fix/hv_sock_eio/6.18                               d483c85de3de96c58957510cda5eb2b24e9b3d91

Makefile

@@ -2,7 +2,7 @@
 VERSION = 6
 PATCHLEVEL = 18
 SUBLEVEL = 20
-EXTRAVERSION = .1
+EXTRAVERSION = .3
 NAME = Baby Opossum Posse
 
 # *DOCUMENTATION*

drivers/hv/dxgkrnl/dxgsyncfile.c

@@ -446,8 +446,8 @@ static bool dxgdmafence_signaled(struct dma_fence *fence)
 	syncpoint = to_syncpoint(fence);
 	if (syncpoint == 0)
 		return true;
-	return __dma_fence_is_later(syncpoint->fence_value, fence->seqno,
-				    fence->ops);
+	return __dma_fence_is_later(fence, syncpoint->fence_value,
+		fence->seqno);
 }
 
 static bool dxgdmafence_enable_signaling(struct dma_fence *fence)

net/vmw_vsock/hyperv_transport.c

@@ -694,17 +694,29 @@ static ssize_t hvs_stream_enqueue(struct vsock_sock *vsk, struct msghdr *msg,
 static s64 hvs_stream_has_data(struct vsock_sock *vsk)
 {
 	struct hvsock *hvs = vsk->trans;
-	bool need_refill;
 	s64 ret;
 
 	if (hvs->recv_data_len > 0)
 		return hvs->recv_data_len;
 
 	switch (hvs_channel_readable_payload(hvs->chan)) {
 	case 1:
-		need_refill = !hvs->recv_desc;
-		if (!need_refill)
-			return -EIO;
+		if (hvs->recv_desc) {
+			/* Here hvs->recv_data_len is 0, so hvs->recv_desc must
+			 * be NULL unless it points to the 0-byte-payload FIN
+			 * packet: see hvs_update_recv_data().
+			 *
+			 * Here all the payload has been dequeued, but
+			 * hvs_channel_readable_payload() still returns 1,
+			 * because the VMBus ringbuffer's read_index is not
+			 * updated for the FIN packet: hvs_stream_dequeue() ->
+			 * hv_pkt_iter_next() updates the cached priv_read_index
+			 * but has no opportunity to update the read_index in
+			 * hv_pkt_iter_close() as hvs_stream_has_data() returns
+			 * 0 for the FIN packet, so it won't get dequeued.
+			 */
+			return 0;
+		}
 
 		hvs->recv_desc = hv_pkt_iter_first(hvs->chan);
 		if (!hvs->recv_desc)