github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2912 from rn/kup

Browse Source 
Kernel update to 4.15.3/4.14.19/4.9.81
This commit is contained in:
Justin Cormack 2018-02-14 11:17:32 +00:00 committed by GitHub
commit ade95a9a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
112 changed files with 1270 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/aws.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/azure.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/cadvisor.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/docker-for-mac.yml
View File

@ -1,6 +1,6 @@
# This is an example for building the open source components of Docker for Mac
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/vpnkit-expose-port:v0.2 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host

2
examples/docker.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/gcp.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/getty.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/hostmount-writeable-overlay.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/minimal.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/node_exporter.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/openstack.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/packet.arm64.yml
View File

@ -5,7 +5,7 @@
# for arm64 then the 'ucode' line in the kernel section can be left
# out.
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyAMA0"
ucode: ""
onboot:

2
examples/packet.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: console=ttyS1
ucode: intel-ucode.cpio
init:

2
examples/redis-os.yml
View File

@ -1,7 +1,7 @@
# Minimal YAML to run a redis server (used at DockerCon'17)
# connect: nc localhost 6379
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/sshd.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/swap.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/vmware.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/vpnkit-forwarder.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/vsudd-containerd.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/vultr.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
examples/wireguard.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

10
kernel/Makefile
View File

@ -204,11 +204,11 @@ endef
# Build Targets
# Debug targets only for latest stable and LTS stable
#
$(eval $(call kernel,4.15.2,4.15.x,$(EXTRA)))
$(eval $(call kernel,4.14.18,4.14.x,$(EXTRA)))
$(eval $(call kernel,4.14.18,4.14.x,-dbg))
$(eval $(call kernel,4.9.80,4.9.x,$(EXTRA)))
$(eval $(call kernel,4.9.80,4.9.x,-dbg))
$(eval $(call kernel,4.15.3,4.15.x,$(EXTRA)))
$(eval $(call kernel,4.14.19,4.14.x,$(EXTRA)))
$(eval $(call kernel,4.14.19,4.14.x,-dbg))
$(eval $(call kernel,4.9.81,4.9.x,$(EXTRA)))
$(eval $(call kernel,4.9.81,4.9.x,-dbg))
$(eval $(call kernel,4.4.115,4.4.x,$(EXTRA)))
# Target for kernel config

2
kernel/config-4.14.x-aarch64
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.14.18 Kernel Configuration
# Linux/arm64 4.14.19 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y

2
kernel/config-4.14.x-x86_64
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.18 Kernel Configuration
# Linux/x86 4.14.19 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y

2
kernel/config-4.15.x-aarch64
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.15.2 Kernel Configuration
# Linux/arm64 4.15.3 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y

2
kernel/config-4.15.x-x86_64
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.15.2 Kernel Configuration
# Linux/x86 4.15.3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y

2
kernel/config-4.9.x-aarch64
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.9.80 Kernel Configuration
# Linux/arm64 4.9.81 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y

2
kernel/config-4.9.x-x86_64
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.9.80 Kernel Configuration
# Linux/x86 4.9.81 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y

6
kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch
View File

@ -1,8 +1,8 @@
From 68f097990b84f65ddf63e483f59f7a33810dbeda Mon Sep 17 00:00:00 2001
From 6bbdbaead3d12453aec28a37cb33bff2485a148a Mon Sep 17 00:00:00 2001
From: Cheng-mean Liu <soccerl@microsoft.com>
Date: Tue, 11 Jul 2017 16:58:26 -0700
Subject: [PATCH] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB (page
size)
Subject: [PATCH 01/18] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB
(page size)
Signed-off-by: Cheng-mean Liu <soccerl@microsoft.com>
Origin: https://github.com/Microsoft/opengcs/blob/master/kernelconfig/4.11/patch_lower-the-minimum-PMEM-size.patch

111
kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch Normal file
View File

@ -0,0 +1,111 @@
From 4e238653b5403128c184405dd84787f99ef12d77 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:00 -0700
Subject: [PATCH 02/18] hyper-v: trace vmbus_on_msg_dpc()
Add tracing subsystem to Hyper-V VMBus module and add tracepoint
to vmbus_on_msg_dpc() which is called when we receive a message from host.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c9fe0f8fa4136c2451dcc012e48fbf4470d6b592)
---
drivers/hv/Makefile | 4 +++-
drivers/hv/hv_trace.c | 4 ++++
drivers/hv/hv_trace.h | 29 +++++++++++++++++++++++++++++
drivers/hv/hyperv_vmbus.h | 2 ++
drivers/hv/vmbus_drv.c | 2 ++
5 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 drivers/hv/hv_trace.c
create mode 100644 drivers/hv/hv_trace.h
diff --git a/drivers/hv/Makefile b/drivers/hv/Makefile
index e7b1d796ba2e..14c22786b519 100644
--- a/drivers/hv/Makefile
+++ b/drivers/hv/Makefile
@@ -3,7 +3,9 @@ obj-$(CONFIG_HYPERV) += hv_vmbus.o
obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
obj-$(CONFIG_HYPERV_BALLOON) += hv_balloon.o
+CFLAGS_hv_trace.o = -I$(src)
+
hv_vmbus-y := vmbus_drv.o \
hv.o connection.o channel.o \
- channel_mgmt.o ring_buffer.o
+ channel_mgmt.o ring_buffer.o hv_trace.o
hv_utils-y := hv_util.o hv_kvp.o hv_snapshot.o hv_fcopy.o hv_utils_transport.o
diff --git a/drivers/hv/hv_trace.c b/drivers/hv/hv_trace.c
new file mode 100644
index 000000000000..df47acd01a81
--- /dev/null
+++ b/drivers/hv/hv_trace.c
@@ -0,0 +1,4 @@
+#include "hyperv_vmbus.h"
+
+#define CREATE_TRACE_POINTS
+#include "hv_trace.h"
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
new file mode 100644
index 000000000000..9c2772922c76
--- /dev/null
+++ b/drivers/hv/hv_trace.h
@@ -0,0 +1,29 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM hyperv
+
+#if !defined(_HV_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _HV_TRACE_H
+
+#include <linux/tracepoint.h>
+
+DECLARE_EVENT_CLASS(vmbus_hdr_msg,
+ TP_PROTO(const struct vmbus_channel_message_header *hdr),
+ TP_ARGS(hdr),
+ TP_STRUCT__entry(__field(unsigned int, msgtype)),
+ TP_fast_assign(__entry->msgtype = hdr->msgtype;),
+ TP_printk("msgtype=%u", __entry->msgtype)
+);
+
+DEFINE_EVENT(vmbus_hdr_msg, vmbus_on_msg_dpc,
+ TP_PROTO(const struct vmbus_channel_message_header *hdr),
+ TP_ARGS(hdr)
+);
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE hv_trace
+#endif /* _HV_TRACE_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index 49569f8fe038..82eb082f3302 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -31,6 +31,8 @@
#include <linux/hyperv.h>
#include <linux/interrupt.h>
+#include "hv_trace.h"
+
/*
* Timeout for services such as KVP and fcopy.
*/
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 2cd134dd94d2..9687e462fd43 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -833,6 +833,8 @@ void vmbus_on_msg_dpc(unsigned long data)
hdr = (struct vmbus_channel_message_header *)msg->u.payload;
+ trace_vmbus_on_msg_dpc(hdr);
+
if (hdr->msgtype >= CHANNELMSG_COUNT) {
WARN_ONCE(1, "unknown msgtype=%d\n", hdr->msgtype);
goto msg_handled;
--
2.16.0

49
kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch Normal file
View File

@ -0,0 +1,49 @@
From c87244e9cba6dc88b82cbe0a5d4ada4f9951e319 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:01 -0700
Subject: [PATCH 03/18] hyper-v: trace vmbus_on_message()
Add tracepoint to vmbus_on_message() which is called when we start
processing a blocking from work context.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 716fa52fb474a36ddd3cbc981108f93610c973ef)
---
drivers/hv/channel_mgmt.c | 2 ++
drivers/hv/hv_trace.h | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 65c6d6bdce4c..7948fff52a6d 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -1169,6 +1169,8 @@ void vmbus_onmessage(void *context)
hdr = (struct vmbus_channel_message_header *)msg->u.payload;
size = msg->header.payload_size;
+ trace_vmbus_on_message(hdr);
+
if (hdr->msgtype >= CHANNELMSG_COUNT) {
pr_err("Received invalid channel message type %d size %d\n",
hdr->msgtype, size);
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 9c2772922c76..d432aba5df8a 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -19,6 +19,11 @@ DEFINE_EVENT(vmbus_hdr_msg, vmbus_on_msg_dpc,
TP_ARGS(hdr)
);
+DEFINE_EVENT(vmbus_hdr_msg, vmbus_on_message,
+ TP_PROTO(const struct vmbus_channel_message_header *hdr),
+ TP_ARGS(hdr)
+);
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

80
kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch Normal file
View File

@ -0,0 +1,80 @@
From b37f6409b9cb749a1f1dd00fbdc080290b8c88ab Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:02 -0700
Subject: [PATCH 04/18] hyper-v: trace vmbus_onoffer()
Add tracepoint to CHANNELMSG_OFFERCHANNEL handler.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 03b81e66c78b076bfc127714ce6fd25655784600)
---
drivers/hv/channel_mgmt.c | 2 ++
drivers/hv/hv_trace.h | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 7948fff52a6d..1909c5c571d1 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -806,6 +806,8 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
offer = (struct vmbus_channel_offer_channel *)hdr;
+ trace_vmbus_onoffer(offer);
+
/* Allocate the channel object and save this offer. */
newchannel = alloc_channel();
if (!newchannel) {
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index d432aba5df8a..488b873b563e 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -24,6 +24,43 @@ DEFINE_EVENT(vmbus_hdr_msg, vmbus_on_message,
TP_ARGS(hdr)
);
+TRACE_EVENT(vmbus_onoffer,
+ TP_PROTO(const struct vmbus_channel_offer_channel *offer),
+ TP_ARGS(offer),
+ TP_STRUCT__entry(
+ __field(u32, child_relid)
+ __field(u8, monitorid)
+ __field(u16, is_ddc_int)
+ __field(u32, connection_id)
+ __array(char, if_type, 16)
+ __array(char, if_instance, 16)
+ __field(u16, chn_flags)
+ __field(u16, mmio_mb)
+ __field(u16, sub_idx)
+ ),
+ TP_fast_assign(__entry->child_relid = offer->child_relid;
+ __entry->monitorid = offer->monitorid;
+ __entry->is_ddc_int = offer->is_dedicated_interrupt;
+ __entry->connection_id = offer->connection_id;
+ memcpy(__entry->if_type,
+ &offer->offer.if_type.b, 16);
+ memcpy(__entry->if_instance,
+ &offer->offer.if_instance.b, 16);
+ __entry->chn_flags = offer->offer.chn_flags;
+ __entry->mmio_mb = offer->offer.mmio_megabytes;
+ __entry->sub_idx = offer->offer.sub_channel_index;
+ ),
+ TP_printk("child_relid 0x%x, monitorid 0x%x, is_dedicated %d, "
+ "connection_id 0x%x, if_type %pUl, if_instance %pUl, "
+ "chn_flags 0x%x, mmio_megabytes %d, sub_channel_index %d",
+ __entry->child_relid, __entry->monitorid,
+ __entry->is_ddc_int, __entry->connection_id,
+ __entry->if_type, __entry->if_instance,
+ __entry->chn_flags, __entry->mmio_mb,
+ __entry->sub_idx
+ )
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

51
kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch Normal file
View File

@ -0,0 +1,51 @@
From 635e04ba7b3f11d986f8657aaf8eba8ed72762e4 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:03 -0700
Subject: [PATCH 05/18] hyper-v: trace vmbus_onoffer_rescind()
Add tracepoint to CHANNELMSG_RESCIND_CHANNELOFFER handler.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5175167c77afb19993bd86ab8b4be63d9cb4a928)
---
drivers/hv/channel_mgmt.c | 2 ++
drivers/hv/hv_trace.h | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 1909c5c571d1..54235b32ac82 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -849,6 +849,8 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr)
rescind = (struct vmbus_channel_rescind_offer *)hdr;
+ trace_vmbus_onoffer_rescind(rescind);
+
/*
* The offer msg and the corresponding rescind msg
* from the host are guranteed to be ordered -
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 488b873b563e..dbbed1d1f327 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -61,6 +61,14 @@ TRACE_EVENT(vmbus_onoffer,
)
);
+TRACE_EVENT(vmbus_onoffer_rescind,
+ TP_PROTO(const struct vmbus_channel_rescind_offer *offer),
+ TP_ARGS(offer),
+ TP_STRUCT__entry(__field(u32, child_relid)),
+ TP_fast_assign(__entry->child_relid = offer->child_relid),
+ TP_printk("child_relid 0x%x", __entry->child_relid)
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

60
kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch Normal file
View File

@ -0,0 +1,60 @@
From ec7221a006dc8537f684a0f5164227ed6a4cc362 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:04 -0700
Subject: [PATCH 06/18] hyper-v: trace vmbus_onopen_result()
Add tracepoint to CHANNELMSG_OPENCHANNEL_RESULT handler.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 9f23ce1a23b6bf471d5920bdca5cc40940419e60)
---
drivers/hv/channel_mgmt.c | 2 ++
drivers/hv/hv_trace.h | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 54235b32ac82..66aa6b079b2e 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -979,6 +979,8 @@ static void vmbus_onopen_result(struct vmbus_channel_message_header *hdr)
result = (struct vmbus_channel_open_result *)hdr;
+ trace_vmbus_onopen_result(result);
+
/*
* Find the open msg, copy the result and signal/unblock the wait event
*/
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index dbbed1d1f327..9757c19d1c08 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -69,6 +69,23 @@ TRACE_EVENT(vmbus_onoffer_rescind,
TP_printk("child_relid 0x%x", __entry->child_relid)
);
+TRACE_EVENT(vmbus_onopen_result,
+ TP_PROTO(const struct vmbus_channel_open_result *result),
+ TP_ARGS(result),
+ TP_STRUCT__entry(
+ __field(u32, child_relid)
+ __field(u32, openid)
+ __field(u32, status)
+ ),
+ TP_fast_assign(__entry->child_relid = result->child_relid;
+ __entry->openid = result->openid;
+ __entry->status = result->status;
+ ),
+ TP_printk("child_relid 0x%x, openid %d, status %d",
+ __entry->child_relid, __entry->openid, __entry->status
+ )
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

60
kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch Normal file
View File

@ -0,0 +1,60 @@
From 1cae1a53932c3357f3f6ee3f5d1635a6280f4408 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:05 -0700
Subject: [PATCH 07/18] hyper-v: trace vmbus_ongpadl_created()
Add tracepoint to CHANNELMSG_GPADL_CREATED handler.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit a13bf0ea4a60a7946bf335bd57e60adc344033bd)
---
drivers/hv/channel_mgmt.c | 2 ++
drivers/hv/hv_trace.h | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 66aa6b079b2e..ca5eccd3dceb 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -1025,6 +1025,8 @@ static void vmbus_ongpadl_created(struct vmbus_channel_message_header *hdr)
gpadlcreated = (struct vmbus_channel_gpadl_created *)hdr;
+ trace_vmbus_ongpadl_created(gpadlcreated);
+
/*
* Find the establish msg, copy the result and signal/unblock the wait
* event
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 9757c19d1c08..20734b7b341b 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -86,6 +86,23 @@ TRACE_EVENT(vmbus_onopen_result,
)
);
+TRACE_EVENT(vmbus_ongpadl_created,
+ TP_PROTO(const struct vmbus_channel_gpadl_created *gpadlcreated),
+ TP_ARGS(gpadlcreated),
+ TP_STRUCT__entry(
+ __field(u32, child_relid)
+ __field(u32, gpadl)
+ __field(u32, status)
+ ),
+ TP_fast_assign(__entry->child_relid = gpadlcreated->child_relid;
+ __entry->gpadl = gpadlcreated->gpadl;
+ __entry->status = gpadlcreated->creation_status;
+ ),
+ TP_printk("child_relid 0x%x, gpadl 0x%x, creation_status %d",
+ __entry->child_relid, __entry->gpadl, __entry->status
+ )
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

51
kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch Normal file
View File

@ -0,0 +1,51 @@
From 69f601d5d2b8cbf98c72bfd4881d3e90baa6fa8e Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:06 -0700
Subject: [PATCH 08/18] hyper-v: trace vmbus_ongpadl_torndown()
Add tracepoint to CHANNELMSG_GPADL_TORNDOWN handler.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 602a8c525c8c7b2ff446894fc6b21f42471c952f)
---
drivers/hv/channel_mgmt.c | 2 ++
drivers/hv/hv_trace.h | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index ca5eccd3dceb..1e8b0ebe1b9e 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -1075,6 +1075,8 @@ static void vmbus_ongpadl_torndown(
gpadl_torndown = (struct vmbus_channel_gpadl_torndown *)hdr;
+ trace_vmbus_ongpadl_torndown(gpadl_torndown);
+
/*
* Find the open msg, copy the result and signal/unblock the wait event
*/
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 20734b7b341b..84c08cdf7235 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -103,6 +103,14 @@ TRACE_EVENT(vmbus_ongpadl_created,
)
);
+TRACE_EVENT(vmbus_ongpadl_torndown,
+ TP_PROTO(const struct vmbus_channel_gpadl_torndown *gpadltorndown),
+ TP_ARGS(gpadltorndown),
+ TP_STRUCT__entry(__field(u32, gpadl)),
+ TP_fast_assign(__entry->gpadl = gpadltorndown->gpadl),
+ TP_printk("gpadl 0x%x", __entry->gpadl)
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

55
kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch Normal file
View File

@ -0,0 +1,55 @@
From 21b6485093fe73933793d024f5fc07d17fb4f564 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:07 -0700
Subject: [PATCH 09/18] hyper-v: trace vmbus_onversion_response()
Add tracepoint to CHANNELMSG_VERSION_RESPONSE handler.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c7924fb07a2646c9ff661efcad1167a1106d6019)
---
drivers/hv/channel_mgmt.c | 3 +++
drivers/hv/hv_trace.h | 11 +++++++++++
2 files changed, 14 insertions(+)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 1e8b0ebe1b9e..26d5452ee2be 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -1120,6 +1120,9 @@ static void vmbus_onversion_response(
unsigned long flags;
version_response = (struct vmbus_channel_version_response *)hdr;
+
+ trace_vmbus_onversion_response(version_response);
+
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
list_for_each_entry(msginfo, &vmbus_connection.chn_msg_list,
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 84c08cdf7235..2a046547107f 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -111,6 +111,17 @@ TRACE_EVENT(vmbus_ongpadl_torndown,
TP_printk("gpadl 0x%x", __entry->gpadl)
);
+TRACE_EVENT(vmbus_onversion_response,
+ TP_PROTO(const struct vmbus_channel_version_response *response),
+ TP_ARGS(response),
+ TP_STRUCT__entry(
+ __field(u8, ver)
+ ),
+ TP_fast_assign(__entry->ver = response->version_supported;
+ ),
+ TP_printk("version_supported %d", __entry->ver)
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

55
kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch Normal file
View File

@ -0,0 +1,55 @@
From e171d5a3845680154bdc51a663e419543e9eb823 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:08 -0700
Subject: [PATCH 10/18] hyper-v: trace vmbus_request_offers()
Add tracepoint to CHANNELMSG_REQUESTOFFERS sender.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit d6706e63367a9c783974db4b94cf8980d31c4cb2)
---
drivers/hv/channel_mgmt.c | 4 +++-
drivers/hv/hv_trace.h | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 26d5452ee2be..51156ee83b93 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -1217,9 +1217,11 @@ int vmbus_request_offers(void)
msg->msgtype = CHANNELMSG_REQUESTOFFERS;
-
ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_message_header),
true);
+
+ trace_vmbus_request_offers(ret);
+
if (ret != 0) {
pr_err("Unable to request offers - %d\n", ret);
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 2a046547107f..566ac0f2fe56 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -122,6 +122,14 @@ TRACE_EVENT(vmbus_onversion_response,
TP_printk("version_supported %d", __entry->ver)
);
+TRACE_EVENT(vmbus_request_offers,
+ TP_PROTO(int ret),
+ TP_ARGS(ret),
+ TP_STRUCT__entry(__field(int, ret)),
+ TP_fast_assign(__entry->ret = ret),
+ TP_printk("sending ret %d", __entry->ret)
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

70
kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch Normal file
View File

@ -0,0 +1,70 @@
From ab0cedcde1c60fee6ea7baac4f563ef314cb81a2 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:09 -0700
Subject: [PATCH 11/18] hyper-v: trace vmbus_open()
Add tracepoint to CHANNELMSG_OPENCHANNEL sender.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 9202d771ca37514bfbc2c3a8fdcb018f40a6bd8a)
---
drivers/hv/channel.c | 2 ++
drivers/hv/hv_trace.h | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 05964347008d..b562a7fb4c42 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -185,6 +185,8 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
ret = vmbus_post_msg(open_msg,
sizeof(struct vmbus_channel_open_channel), true);
+ trace_vmbus_open(open_msg, ret);
+
if (ret != 0) {
err = ret;
goto error_clean_msglist;
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 566ac0f2fe56..38fedb803bd8 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -130,6 +130,33 @@ TRACE_EVENT(vmbus_request_offers,
TP_printk("sending ret %d", __entry->ret)
);
+TRACE_EVENT(vmbus_open,
+ TP_PROTO(const struct vmbus_channel_open_channel *msg, int ret),
+ TP_ARGS(msg, ret),
+ TP_STRUCT__entry(
+ __field(u32, child_relid)
+ __field(u32, openid)
+ __field(u32, gpadlhandle)
+ __field(u32, target_vp)
+ __field(u32, offset)
+ __field(int, ret)
+ ),
+ TP_fast_assign(
+ __entry->child_relid = msg->child_relid;
+ __entry->openid = msg->openid;
+ __entry->gpadlhandle = msg->ringbuffer_gpadlhandle;
+ __entry->target_vp = msg->target_vp;
+ __entry->offset = msg->downstream_ringbuffer_pageoffset;
+ __entry->ret = ret;
+ ),
+ TP_printk("sending child_relid 0x%x, openid %d, "
+ "gpadlhandle 0x%x, target_vp 0x%x, offset 0x%x, ret %d",
+ __entry->child_relid, __entry->openid,
+ __entry->gpadlhandle, __entry->target_vp,
+ __entry->offset, __entry->ret
+ )
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

58
kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch Normal file
View File

@ -0,0 +1,58 @@
From 2398d2a0e00a57022e2b43bb248ad8262ba63649 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:10 -0700
Subject: [PATCH 12/18] hyper-v: trace vmbus_close_internal()
Add tracepoint to CHANNELMSG_CLOSECHANNEL sender.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 633b005df0dff555c0d4f22b5f1f8b04dba67ac5)
---
drivers/hv/channel.c | 2 ++
drivers/hv/hv_trace.h | 15 +++++++++++++++
2 files changed, 17 insertions(+)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index b562a7fb4c42..70babce00ddc 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -591,6 +591,8 @@ static int vmbus_close_internal(struct vmbus_channel *channel)
ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_close_channel),
true);
+ trace_vmbus_close_internal(msg, ret);
+
if (ret) {
pr_err("Close failed: close post msg return is %d\n", ret);
/*
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 38fedb803bd8..302bd4e964f0 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -157,6 +157,21 @@ TRACE_EVENT(vmbus_open,
)
);
+TRACE_EVENT(vmbus_close_internal,
+ TP_PROTO(const struct vmbus_channel_close_channel *msg, int ret),
+ TP_ARGS(msg, ret),
+ TP_STRUCT__entry(
+ __field(u32, child_relid)
+ __field(int, ret)
+ ),
+ TP_fast_assign(
+ __entry->child_relid = msg->child_relid;
+ __entry->ret = ret;
+ ),
+ TP_printk("sending child_relid 0x%x, ret %d", __entry->child_relid,
+ __entry->ret)
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

96
kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch Normal file
View File

@ -0,0 +1,96 @@
From 02a9a8babb01ccd78337756138ced187ab13fa26 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:11 -0700
Subject: [PATCH 13/18] hyper-v: trace vmbus_establish_gpadl()
Add tracepoint to CHANNELMSG_GPADL_HEADER/CHANNELMSG_GPADL_BODY sender.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 69edbd5f4729a58e11437b2804103bf8ea52745c)
---
drivers/hv/channel.c | 6 ++++++
drivers/hv/hv_trace.h | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 70babce00ddc..a7ac16c091a9 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -435,6 +435,9 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
ret = vmbus_post_msg(gpadlmsg, msginfo->msgsize -
sizeof(*msginfo), true);
+
+ trace_vmbus_establish_gpadl_header(gpadlmsg, ret);
+
if (ret != 0)
goto cleanup;
@@ -450,6 +453,9 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
ret = vmbus_post_msg(gpadl_body,
submsginfo->msgsize - sizeof(*submsginfo),
true);
+
+ trace_vmbus_establish_gpadl_body(gpadl_body, ret);
+
if (ret != 0)
goto cleanup;
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 302bd4e964f0..978e70bdc7c5 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -172,6 +172,48 @@ TRACE_EVENT(vmbus_close_internal,
__entry->ret)
);
+TRACE_EVENT(vmbus_establish_gpadl_header,
+ TP_PROTO(const struct vmbus_channel_gpadl_header *msg, int ret),
+ TP_ARGS(msg, ret),
+ TP_STRUCT__entry(
+ __field(u32, child_relid)
+ __field(u32, gpadl)
+ __field(u16, range_buflen)
+ __field(u16, rangecount)
+ __field(int, ret)
+ ),
+ TP_fast_assign(
+ __entry->child_relid = msg->child_relid;
+ __entry->gpadl = msg->gpadl;
+ __entry->range_buflen = msg->range_buflen;
+ __entry->rangecount = msg->rangecount;
+ __entry->ret = ret;
+ ),
+ TP_printk("sending child_relid 0x%x, gpadl 0x%x, range_buflen %d "
+ "rangecount %d, ret %d",
+ __entry->child_relid, __entry->gpadl,
+ __entry->range_buflen, __entry->rangecount, __entry->ret
+ )
+ );
+
+TRACE_EVENT(vmbus_establish_gpadl_body,
+ TP_PROTO(const struct vmbus_channel_gpadl_body *msg, int ret),
+ TP_ARGS(msg, ret),
+ TP_STRUCT__entry(
+ __field(u32, msgnumber)
+ __field(u32, gpadl)
+ __field(int, ret)
+ ),
+ TP_fast_assign(
+ __entry->msgnumber = msg->msgnumber;
+ __entry->gpadl = msg->gpadl;
+ __entry->ret = ret;
+ ),
+ TP_printk("sending msgnumber %d, gpadl 0x%x, ret %d",
+ __entry->msgnumber, __entry->gpadl, __entry->ret
+ )
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

61
kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch Normal file
View File

@ -0,0 +1,61 @@
From ee9c6f7bcee6f9e224910b9d6e1416d14e8a2148 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:12 -0700
Subject: [PATCH 14/18] hyper-v: trace vmbus_teardown_gpadl()
Add tracepoint to CHANNELMSG_GPADL_TEARDOWN sender.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 09cdf8f87c15dbe9a3eeb6de04aaafd0cd922d6d)
---
drivers/hv/channel.c | 2 ++
drivers/hv/hv_trace.h | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index a7ac16c091a9..ba4b4eceb563 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -519,6 +519,8 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_gpadl_teardown),
true);
+ trace_vmbus_teardown_gpadl(msg, ret);
+
if (ret)
goto post_msg_err;
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 978e70bdc7c5..cd33a52ef27f 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -214,6 +214,24 @@ TRACE_EVENT(vmbus_establish_gpadl_body,
)
);
+TRACE_EVENT(vmbus_teardown_gpadl,
+ TP_PROTO(const struct vmbus_channel_gpadl_teardown *msg, int ret),
+ TP_ARGS(msg, ret),
+ TP_STRUCT__entry(
+ __field(u32, child_relid)
+ __field(u32, gpadl)
+ __field(int, ret)
+ ),
+ TP_fast_assign(
+ __entry->child_relid = msg->child_relid;
+ __entry->gpadl = msg->gpadl;
+ __entry->ret = ret;
+ ),
+ TP_printk("sending child_relid 0x%x, gpadl 0x%x, ret %d",
+ __entry->child_relid, __entry->gpadl, __entry->ret
+ )
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

70
kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch Normal file
View File

@ -0,0 +1,70 @@
From d25867a69fbb2602c717d54485afd16f526ff1aa Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:13 -0700
Subject: [PATCH 15/18] hyper-v: trace vmbus_negotiate_version()
Add tracepoint to CHANNELMSG_INITIATE_CONTACT sender.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 034ebf552e0a3403eeb7e7f8a3a502fc0c70a24c)
---
drivers/hv/connection.c | 3 +++
drivers/hv/hv_trace.h | 26 ++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index f41901f80b64..5e36f86d0b0c 100644
--- a/drivers/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -117,6 +117,9 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo,
ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_initiate_contact),
true);
+
+ trace_vmbus_negotiate_version(msg, ret);
+
if (ret != 0) {
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
list_del(&msginfo->msglistentry);
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index cd33a52ef27f..f06284d64a8c 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -232,6 +232,32 @@ TRACE_EVENT(vmbus_teardown_gpadl,
)
);
+TRACE_EVENT(vmbus_negotiate_version,
+ TP_PROTO(const struct vmbus_channel_initiate_contact *msg, int ret),
+ TP_ARGS(msg, ret),
+ TP_STRUCT__entry(
+ __field(u32, ver)
+ __field(u32, target_vcpu)
+ __field(int, ret)
+ __field(u64, int_page)
+ __field(u64, mon_page1)
+ __field(u64, mon_page2)
+ ),
+ TP_fast_assign(
+ __entry->ver = msg->vmbus_version_requested;
+ __entry->target_vcpu = msg->target_vcpu;
+ __entry->int_page = msg->interrupt_page;
+ __entry->mon_page1 = msg->monitor_page1;
+ __entry->mon_page2 = msg->monitor_page2;
+ __entry->ret = ret;
+ ),
+ TP_printk("sending vmbus_version_requested %d, target_vcpu 0x%x, "
+ "pages %llx:%llx:%llx, ret %d",
+ __entry->ver, __entry->target_vcpu, __entry->int_page,
+ __entry->mon_page1, __entry->mon_page2, __entry->ret
+ )
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

68
kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch Normal file
View File

@ -0,0 +1,68 @@
From c04ba9625defb6a199e554b6a5fc73fcb3ddf557 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:14 -0700
Subject: [PATCH 16/18] hyper-v: trace vmbus_release_relid()
Add tracepoint to CHANNELMSG_RELID_RELEASED sender.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 259cc665e9c08d054549a877c1b53b793de15753)
---
drivers/hv/channel_mgmt.c | 7 +++++--
drivers/hv/hv_trace.h | 16 ++++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 51156ee83b93..9263e3c86476 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -374,12 +374,15 @@ static void percpu_channel_deq(void *arg)
static void vmbus_release_relid(u32 relid)
{
struct vmbus_channel_relid_released msg;
+ int ret;
memset(&msg, 0, sizeof(struct vmbus_channel_relid_released));
msg.child_relid = relid;
msg.header.msgtype = CHANNELMSG_RELID_RELEASED;
- vmbus_post_msg(&msg, sizeof(struct vmbus_channel_relid_released),
- true);
+ ret = vmbus_post_msg(&msg, sizeof(struct vmbus_channel_relid_released),
+ true);
+
+ trace_vmbus_release_relid(&msg, ret);
}
void hv_process_channel_removal(u32 relid)
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index f06284d64a8c..f0e437c3522f 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -258,6 +258,22 @@ TRACE_EVENT(vmbus_negotiate_version,
)
);
+TRACE_EVENT(vmbus_release_relid,
+ TP_PROTO(const struct vmbus_channel_relid_released *msg, int ret),
+ TP_ARGS(msg, ret),
+ TP_STRUCT__entry(
+ __field(u32, child_relid)
+ __field(int, ret)
+ ),
+ TP_fast_assign(
+ __entry->child_relid = msg->child_relid;
+ __entry->ret = ret;
+ ),
+ TP_printk("sending child_relid 0x%x, ret %d",
+ __entry->child_relid, __entry->ret
+ )
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

74
kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch Normal file
View File

@ -0,0 +1,74 @@
From a19d56b5c3f5bb6fc2eae083b53191f9235c7899 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:15 -0700
Subject: [PATCH 17/18] hyper-v: trace vmbus_send_tl_connect_request()
Add tracepoint to CHANNELMSG_TL_CONNECT_REQUEST sender.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 98f31a0050ca8ba47b57c6d67599013cdbdd2122)
---
drivers/hv/channel.c | 7 ++++++-
drivers/hv/hv_trace.h | 20 ++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index ba4b4eceb563..218d16c7fbae 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -236,13 +236,18 @@ int vmbus_send_tl_connect_request(const uuid_le *shv_guest_servie_id,
const uuid_le *shv_host_servie_id)
{
struct vmbus_channel_tl_connect_request conn_msg;
+ int ret;
memset(&conn_msg, 0, sizeof(conn_msg));
conn_msg.header.msgtype = CHANNELMSG_TL_CONNECT_REQUEST;
conn_msg.guest_endpoint_id = *shv_guest_servie_id;
conn_msg.host_service_id = *shv_host_servie_id;
- return vmbus_post_msg(&conn_msg, sizeof(conn_msg), true);
+ ret = vmbus_post_msg(&conn_msg, sizeof(conn_msg), true);
+
+ trace_vmbus_send_tl_connect_request(&conn_msg, ret);
+
+ return ret;
}
EXPORT_SYMBOL_GPL(vmbus_send_tl_connect_request);
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index f0e437c3522f..5382d9630306 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -274,6 +274,26 @@ TRACE_EVENT(vmbus_release_relid,
)
);
+TRACE_EVENT(vmbus_send_tl_connect_request,
+ TP_PROTO(const struct vmbus_channel_tl_connect_request *msg,
+ int ret),
+ TP_ARGS(msg, ret),
+ TP_STRUCT__entry(
+ __array(char, guest_id, 16)
+ __array(char, host_id, 16)
+ __field(int, ret)
+ ),
+ TP_fast_assign(
+ memcpy(__entry->guest_id, &msg->guest_endpoint_id.b, 16);
+ memcpy(__entry->host_id, &msg->host_service_id.b, 16);
+ __entry->ret = ret;
+ ),
+ TP_printk("sending guest_endpoint_id %pUl, host_service_id %pUl, "
+ "ret %d",
+ __entry->guest_id, __entry->host_id, __entry->ret
+ )
+ );
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
--
2.16.0

101
kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch Normal file
View File

@ -0,0 +1,101 @@
From 6581af57280de139734ea6ddda9448a74899eaf7 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:16 -0700
Subject: [PATCH 18/18] hyper-v: trace channel events
Added an additional set of trace points for when channel gets notified
or signals host.
Slightly modified as 6981fbf37803("Drivers: hv: vmbus: Expose per-channel
interrupts and events counters") is not fully applied and caused a
cherry-pick conflict.
Suggested-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
(cherry picked from commit 991f8f1c6eb634688952fa6a03cc0ce949b6e363)
---
drivers/hv/channel.c | 2 ++
drivers/hv/connection.c | 2 ++
drivers/hv/hv_trace.h | 23 +++++++++++++++++++++++
drivers/hv/vmbus_drv.c | 2 ++
4 files changed, 29 insertions(+)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 218d16c7fbae..262ffbafeb52 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -43,6 +43,8 @@ void vmbus_setevent(struct vmbus_channel *channel)
{
struct hv_monitor_page *monitorpage;
+ trace_vmbus_setevent(channel);
+
/*
* For channels marked as in "low latency" mode
* bypass the monitor page mechanism.
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index 5e36f86d0b0c..8acd2e0e7c8e 100644
--- a/drivers/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -322,6 +322,8 @@ void vmbus_on_event(unsigned long data)
struct vmbus_channel *channel = (void *) data;
unsigned long time_limit = jiffies + 2;
+ trace_vmbus_on_event(channel);
+
do {
void (*callback_fn)(void *);
diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h
index 5382d9630306..d635ee95b20d 100644
--- a/drivers/hv/hv_trace.h
+++ b/drivers/hv/hv_trace.h
@@ -294,6 +294,29 @@ TRACE_EVENT(vmbus_send_tl_connect_request,
)
);
+DECLARE_EVENT_CLASS(vmbus_channel,
+ TP_PROTO(const struct vmbus_channel *channel),
+ TP_ARGS(channel),
+ TP_STRUCT__entry(__field(u32, relid)),
+ TP_fast_assign(__entry->relid = channel->offermsg.child_relid),
+ TP_printk("relid 0x%x", __entry->relid)
+);
+
+DEFINE_EVENT(vmbus_channel, vmbus_chan_sched,
+ TP_PROTO(const struct vmbus_channel *channel),
+ TP_ARGS(channel)
+);
+
+DEFINE_EVENT(vmbus_channel, vmbus_setevent,
+ TP_PROTO(const struct vmbus_channel *channel),
+ TP_ARGS(channel)
+);
+
+DEFINE_EVENT(vmbus_channel, vmbus_on_event,
+ TP_PROTO(const struct vmbus_channel *channel),
+ TP_ARGS(channel)
+);
+
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 9687e462fd43..27d5efd696ad 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -944,6 +944,8 @@ static void vmbus_chan_sched(struct hv_per_cpu_context *hv_cpu)
if (channel->rescind)
continue;
+ trace_vmbus_chan_sched(channel);
+
switch (channel->callback_mode) {
case HV_CALL_ISR:
vmbus_channel_isr(channel);
--
2.16.0

2
kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch
View File

@ -1,4 +1,4 @@
From 9586bfc77ee58cc2e9ae399f18d32bc05e4b6ffc Mon Sep 17 00:00:00 2001
From 7edc1c0dc75b0446fc6b6df432d9dd4a0d8e9d47 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 2 Mar 2017 12:55:49 -0300
Subject: [PATCH 01/13] tools build: Add test for sched_getcpu()

2
kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch
View File

@ -1,4 +1,4 @@
From 310ac1363fe5f87ce56c63e7a7a7d46a84be8d3f Mon Sep 17 00:00:00 2001
From 2f47053913fa5b998866088095e0a1fb751ab99b Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 13 Oct 2016 17:12:35 -0300
Subject: [PATCH 02/13] perf jit: Avoid returning garbage for a ret variable

2
kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch
View File

@ -1,4 +1,4 @@
From a39417812083d3474b98134d139e72d6d79bc492 Mon Sep 17 00:00:00 2001
From 2140adc1f00021ae260cf327a44709503fc7a3db Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Sat, 23 Jul 2016 01:35:51 +0000
Subject: [PATCH 03/13] hv_sock: introduce Hyper-V Sockets

2
kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch
View File

@ -1,4 +1,4 @@
From 1e0c2c94321b412be54c6b9a1cecf376c633780b Mon Sep 17 00:00:00 2001
From 7537735a26af23f71550b2b501b5e22edada9b8b Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
Date: Mon, 23 May 2016 18:55:45 +0100
Subject: [PATCH 04/13] vmbus: Don't spam the logs with unknown GUIDs

2
kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch
View File

@ -1,4 +1,4 @@
From 5f0fcc042a7e5287406c958776f49ff6fac00b73 Mon Sep 17 00:00:00 2001
From 3daee26f7a4c6a4ff771719e46c2e3cf26f1fbe3 Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sun, 6 Nov 2016 13:14:07 -0800
Subject: [PATCH 05/13] Drivers: hv: utils: Fix the mapping between host

2
kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch
View File

@ -1,4 +1,4 @@
From b8b4ae687821bc86381482a77ea3140670cf132e Mon Sep 17 00:00:00 2001
From 805443d8e0f0d7131b8fd094218cce1dbd3ffe27 Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sun, 6 Nov 2016 13:14:10 -0800
Subject: [PATCH 06/13] Drivers: hv: vss: Improve log messages.

2
kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch
View File

@ -1,4 +1,4 @@
From 298283fe160246b6e36d7c38da55a89b016e4a0b Mon Sep 17 00:00:00 2001
From a83e50896887ffb69b493692e030efea95756def Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sun, 6 Nov 2016 13:14:11 -0800
Subject: [PATCH 07/13] Drivers: hv: vss: Operation timeouts should match host

2
kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch
View File

@ -1,4 +1,4 @@
From 517d5ea9d31325d2d77018f6814c8a1344e48a00 Mon Sep 17 00:00:00 2001
From 257104242b1ab8b555ca1a02b5df595bba192464 Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sat, 28 Jan 2017 12:37:17 -0700
Subject: [PATCH 08/13] Drivers: hv: vmbus: Use all supported IC versions to

2
kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch
View File

@ -1,4 +1,4 @@
From 440b0cedc63f8db6db248d4aad884250433eae1a Mon Sep 17 00:00:00 2001
From aced8de6941e375ff038e44e8be2d4374a60025a Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sat, 28 Jan 2017 12:37:18 -0700
Subject: [PATCH 09/13] Drivers: hv: Log the negotiated IC versions.

2
kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch
View File

@ -1,4 +1,4 @@
From c82e7bcadba81fb8c9f7edd330589d95dca1d7f5 Mon Sep 17 00:00:00 2001
From f87005a13376088b6eae2236f2e9353e5f5c5b6a Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Sun, 26 Mar 2017 16:42:20 +0800
Subject: [PATCH 10/13] vmbus: fix missed ring events on boot

2
kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch
View File

@ -1,4 +1,4 @@
From c9344407111f75bbe709dd00f67be7f941798d29 Mon Sep 17 00:00:00 2001
From 68e114a437c754cd2752e531ed904b94f4e45c88 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Wed, 29 Mar 2017 18:37:10 +0800
Subject: [PATCH 11/13] vmbus: remove "goto error_clean_msglist" in

2
kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch
View File

@ -1,4 +1,4 @@
From 2855f13f45de54ca67a3f438d8c62d75fa99c7ca Mon Sep 17 00:00:00 2001
From 47a067250e8a959e49a968879e5ed1488d717586 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Fri, 24 Mar 2017 20:53:18 +0800
Subject: [PATCH 12/13] vmbus: dynamically enqueue/dequeue the channel on

80
kernel/patches-4.9.x/0013-x86-microcode-intel-Avoid-division-by-zero.patch
View File

@ -1,80 +0,0 @@
From 207fa9a93a6708071fecec462915570a52641c78 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
Date: Tue, 6 Feb 2018 13:02:57 +0000
Subject: [PATCH 13/13] x86/microcode/intel: Avoid division by zero
The backport of 7e702d17ed1 ("x86/microcode/intel: Extend BDW
late-loading further with LLC size check") introduced a division
by zero panic on some platforms, specifically on machine types
with one vCPU on Google Cloud (e.g., g1-small and n1-standard-1):
[ 1.591435] divide error: 0000 [#1] SMP
[ 1.591961] Modules linked in:
[ 1.592546] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.9.79-linuxkit #1
[ 1.593461] Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
[ 1.595135] task: ffffa01b2b63c040 task.stack: ffffb24f40010000
[ 1.596683] RIP: 0010:[<ffffffffb7d88ce3>] [<ffffffffb7d88ce3>] init_intel_microcode+0x49/0x5a
[ 1.598018] RSP: 0000:ffffb24f40013e48 EFLAGS: 00010206
[ 1.599016] RAX: 0000000001400000 RBX: 00000000ffffffea RCX: 0000000000000000
[ 1.600093] RDX: 0000000000000000 RSI: ffffa01b2fffa9a8 RDI: ffffffffb7d8888b
[ 1.601222] RBP: 00000000ffffffff R08: ffffa01b2fffa9a1 R09: 000000000000005f
[ 1.602330] R10: 0000000000000067 R11: ffffa01b22164177 R12: 0000000000000000
[ 1.603291] R13: ffffffffb7d787b6 R14: 0000000000000000 R15: 0000000000000000
[ 1.604406] FS: 0000000000000000(0000) GS:ffffa01b2fc00000(0000) knlGS:0000000000000000
[ 1.606154] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 1.607493] CR2: 0000000000000000 CR3: 000000002ac0a000 CR4: 0000000000040630
[ 1.609310] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 1.611122] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 1.613008] Stack:
[ 1.613445] ffffffffb7d888c1 0000000000000000 ffffffffb7d1ba40 0000000000000000
[ 1.615423] 0000000000000000 ffffffffb7d787b6 0000000000000000 0000000000000000
[ 1.617049] ffffffffb74fed89 00000000fffffff4 00000000ffffffff 4eae7bc133547c47
[ 1.617904] Call Trace:
[ 1.618198] [<ffffffffb7d888c1>] ? microcode_init+0x36/0x1de
[ 1.619264] [<ffffffffb7d787b6>] ? set_debug_rodata+0xc/0xc
[ 1.620143] [<ffffffffb74fed89>] ? driver_register+0xaf/0xb4
[ 1.621841] [<ffffffffb7d8888b>] ? save_microcode_in_initrd+0x3c/0x3c
[ 1.623424] [<ffffffffb70021b7>] ? do_one_initcall+0x98/0x130
[ 1.624659] [<ffffffffb7d787b6>] ? set_debug_rodata+0xc/0xc
[ 1.626303] [<ffffffffb7d79091>] ? kernel_init_freeable+0x166/0x1e7
[ 1.627674] [<ffffffffb77ce3d7>] ? rest_init+0x6e/0x6e
[ 1.628942] [<ffffffffb77ce3e1>] ? kernel_init+0xa/0xe6
[ 1.630243] [<ffffffffb77d8587>] ? ret_from_fork+0x57/0x70
[ 1.631592] Code: 16 0f b6 35 a0 ac fb ff 48 c7 c7 c4 ea 99 b7 e8 82 3e 41 ff 31 c0 c3 8b 05 3b ad fb ff 0f b7 0d 54 ad fb ff 31 d2 c1 e0 0a 48 98 <48> f7 f1 89 05 f4 6a 14 00 48 c7 c0 00 d8 c2 b7 c3 4c 8d 54 24
[ 1.638875] RIP [<ffffffffb7d88ce3>] init_intel_microcode+0x49/0x5a
[ 1.640382] RSP <ffffb24f40013e48>
[ 1.641320] ---[ end trace e88ef332e19594b9 ]---
[ 1.642418] Kernel panic - not syncing: Fatal exception
[ 1.644581] Kernel Offset: 0x36000000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff)
[ 1.647312] ---[ end Kernel panic - not syncing: Fatal exception
On these platforms x86_max_cores is 0:
[ 0.227977] ftrace: allocating 35563 entries in 139 pages
[ 0.273941] smpboot: x86_max_cores == zero !?!?
[ 0.274645] smpboot: Max logical packages: 1
Here, we check x86_max_core before calculating the llc_size.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
arch/x86/kernel/cpu/microcode/intel.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index f90f17610f62..a5dd9e5db4ce 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -1134,6 +1134,9 @@ static int __init calc_llc_size_per_core(struct cpuinfo_x86 *c)
{
u64 llc_size = c->x86_cache_size * 1024;
+ if (!c->x86_max_cores)
+ return 0;
+
do_div(llc_size, c->x86_max_cores);
return (int)llc_size;
--
2.16.0

2
linuxkit.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
projects/compose/compose-dynamic.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
projects/compose/compose-static.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
projects/logging/examples/logging.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 # with runc, logwrite, startmemlogd

2
projects/miragesdk/examples/mirage-dhcp.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/000_build/000_formats/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/010_platforms/000_qemu/010_run_iso/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/010_platforms/000_qemu/020_run_efi/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/010_platforms/000_qemu/050_run_aws/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/010_platforms/000_qemu/100_container/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/020_kernel/001_config_4.9.x/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/020_kernel/006_config_4.14.x/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.14.18
image: linuxkit/kernel:4.14.19
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/020_kernel/007_config_4.15.x/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.15.2
image: linuxkit/kernel:4.15.3
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/020_kernel/010_kmod_4.4.x/test.sh
View File

@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT
# Make sure we have the latest kernel image
docker pull linuxkit/kernel:4.9.80
docker pull linuxkit/kernel:4.9.81
# Build a package
docker build -t ${IMAGE_NAME} .

2
test/cases/020_kernel/011_kmod_4.9.x/Dockerfile
View File

@ -3,7 +3,7 @@
# In the last stage, it creates a package, which can be used for
# testing.
FROM linuxkit/kernel:4.9.80 AS ksrc
FROM linuxkit/kernel:4.9.81 AS ksrc
# Extract headers and compile module
FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build

2
test/cases/020_kernel/011_kmod_4.9.x/test.sh
View File

@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT
# Make sure we have the latest kernel image
docker pull linuxkit/kernel:4.9.80
docker pull linuxkit/kernel:4.9.81
# Build a package
docker build -t ${IMAGE_NAME} .

2
test/cases/020_kernel/011_kmod_4.9.x/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/020_kernel/016_kmod_4.14.x/Dockerfile
View File

@ -3,7 +3,7 @@
# In the last stage, it creates a package, which can be used for
# testing.
FROM linuxkit/kernel:4.14.18 AS ksrc
FROM linuxkit/kernel:4.14.19 AS ksrc
# Extract headers and compile module
FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build

2
test/cases/020_kernel/016_kmod_4.14.x/test.sh
View File

@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT
# Make sure we have the latest kernel image
docker pull linuxkit/kernel:4.9.80
docker pull linuxkit/kernel:4.9.81
# Build a package
docker build -t ${IMAGE_NAME} .

2
test/cases/020_kernel/016_kmod_4.14.x/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.14.18
image: linuxkit/kernel:4.14.19
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/020_kernel/017_kmod_4.15.x/Dockerfile
View File

@ -3,7 +3,7 @@
# In the last stage, it creates a package, which can be used for
# testing.
FROM linuxkit/kernel:4.15.2 AS ksrc
FROM linuxkit/kernel:4.15.3 AS ksrc
# Extract headers and compile module
FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build

2
test/cases/020_kernel/017_kmod_4.15.x/test.sh
View File

@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT
# Make sure we have the latest kernel image
docker pull linuxkit/kernel:4.9.80
docker pull linuxkit/kernel:4.9.81
# Build a package
docker build -t ${IMAGE_NAME} .

2
test/cases/020_kernel/017_kmod_4.15.x/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.15.2
image: linuxkit/kernel:4.15.3
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.14.18
image: linuxkit/kernel:4.14.19
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/030_security/000_docker-bench/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/030_security/010_ports/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/040_packages/002_binfmt/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/040_packages/003_ca-certificates/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/040_packages/003_containerd/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/040_packages/004_dhcpcd/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/040_packages/005_extend/000_ext4/test-create.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/040_packages/005_extend/000_ext4/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/040_packages/005_extend/001_btrfs/test-create.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/040_packages/005_extend/001_btrfs/test.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

2
test/cases/040_packages/005_extend/002_xfs/test-create.yml
View File

@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:4.9.80
image: linuxkit/kernel:4.9.81
cmdline: "console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782

Some files were not shown because too many files have changed in this diff Show More