mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-06-27 15:57:09 +00:00
clh: Enable versions and kernel tag to enable CLH CI for kata 2.0
This PR updates the versions for the virtiofs kernel branch and as there is a tag based in kernel 5.6 move patches to uses the tag name. This PR is needed to enable CLH CI for kata 2.0. This PR is backporting kata-containers/runtime#2843 and kata-containers/packaging#1098. Fixes #532 Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
This commit is contained in:
parent
c1d3e8f7fa
commit
ecaa1f9e25
@ -1 +1 @@
|
|||||||
81
|
82
|
||||||
|
@ -0,0 +1,49 @@
|
|||||||
|
From c7ec155ec5e0f573e9c3cc4eb38d47543a2f1e81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
|
||||||
|
Date: Thu, 13 Feb 2020 08:50:38 +0100
|
||||||
|
Subject: [PATCH] net: virtio_vsock: Fix race condition between bind and listen
|
||||||
|
|
||||||
|
Whenever the vsock backend on the host sends a packet through the RX
|
||||||
|
queue, it expects an answer on the TX queue. Unfortunately, there is one
|
||||||
|
case where the host side will hang waiting for the answer and will
|
||||||
|
effectively never recover.
|
||||||
|
|
||||||
|
This issue happens when the guest side starts binding to the socket,
|
||||||
|
which insert a new bound socket into the list of already bound sockets.
|
||||||
|
At this time, we expect the guest to also start listening, which will
|
||||||
|
trigger the sk_state to move from TCP_CLOSE to TCP_LISTEN. The problem
|
||||||
|
occurs if the host side queued a RX packet and triggered an interrupt
|
||||||
|
right between the end of the binding process and the beginning of the
|
||||||
|
listening process. In this specific case, the function processing the
|
||||||
|
packet virtio_transport_recv_pkt() will find a bound socket, which means
|
||||||
|
it will hit the switch statement checking for the sk_state, but the
|
||||||
|
state won't be changed into TCP_LISTEN yet, which leads the code to pick
|
||||||
|
the default statement. This default statement will only free the buffer,
|
||||||
|
while it should also respond to the host side, by sending a packet on
|
||||||
|
its TX queue.
|
||||||
|
|
||||||
|
In order to simply fix this unfortunate chain of events, it is important
|
||||||
|
that in case the default statement is entered, and because at this stage
|
||||||
|
we know the host side is waiting for an answer, we must send back a
|
||||||
|
packet containing the operation VIRTIO_VSOCK_OP_RST.
|
||||||
|
|
||||||
|
Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
|
||||||
|
---
|
||||||
|
net/vmw_vsock/virtio_transport_common.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
|
||||||
|
index 6f1a8aff65c5..0b6fb687a3e0 100644
|
||||||
|
--- a/net/vmw_vsock/virtio_transport_common.c
|
||||||
|
+++ b/net/vmw_vsock/virtio_transport_common.c
|
||||||
|
@@ -1048,6 +1048,7 @@ void virtio_transport_recv_pkt(struct virtio_vsock_pkt *pkt)
|
||||||
|
virtio_transport_free_pkt(pkt);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
+ (void)virtio_transport_reset_no_sock(t, pkt);
|
||||||
|
virtio_transport_free_pkt(pkt);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
@ -158,9 +158,9 @@ assets:
|
|||||||
version: "v5.4.32"
|
version: "v5.4.32"
|
||||||
|
|
||||||
kernel-experimental:
|
kernel-experimental:
|
||||||
description: "Linux kernel with virtio-fs-dev branch"
|
description: "Linux kernel with virtio-fs support"
|
||||||
url: "https://gitlab.com/virtio-fs/linux.git"
|
url: "https://gitlab.com/virtio-fs/linux.git"
|
||||||
tag: "virtio-fs-dev"
|
tag: "kata-v5.6-april-09-2020"
|
||||||
|
|
||||||
components:
|
components:
|
||||||
description: "Core system functionality"
|
description: "Core system functionality"
|
||||||
|
Loading…
Reference in New Issue
Block a user