Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-18 07:01:15 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-18 07:01:15 +0200
commitd71cd3e4579c566eeb35afc320126c7b897a6e73 (patch)
tree067dcac0ca2738abe3fce3d5cb34a8c4c345016d
parent3f23b50b09614a8d88ca8f072f3579b3834b25fa (diff)
parent187af5acf5ad2298218938a66776e34cab0ddb90 (diff)
Merge branch 'SLE15' into SLE12-SP4
-rw-r--r--config/ppc64le/default3
-rw-r--r--patches.arch/kvm-svm-avic-do-not-send-avic-doorbell-to-self46
-rw-r--r--patches.arch/powerpc-crypto-Use-cheaper-random-numbers-for-crc-vp.patch54
-rwxr-xr-xscripts/tar-up.sh9
-rw-r--r--series.conf2
-rw-r--r--supported.conf2
6 files changed, 112 insertions, 4 deletions
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 53d79ac8b3..49bd67dccf 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -5249,7 +5249,8 @@ CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRCT10DIF=y
-# CONFIG_CRYPTO_CRCT10DIF_VPMSUM is not set
+CONFIG_CRYPTO_CRCT10DIF_VPMSUM=m
+CONFIG_CRYPTO_VPMSUM_TESTER=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_MD4=m
diff --git a/patches.arch/kvm-svm-avic-do-not-send-avic-doorbell-to-self b/patches.arch/kvm-svm-avic-do-not-send-avic-doorbell-to-self
new file mode 100644
index 0000000000..4b0a313a88
--- /dev/null
+++ b/patches.arch/kvm-svm-avic-do-not-send-avic-doorbell-to-self
@@ -0,0 +1,46 @@
+From: "Suthikulpanit, Suravee" <Suravee.Suthikulpanit@amd.com>
+Date: Fri, 3 May 2019 06:38:53 -0700
+Subject: kvm: svm/avic: Do not send AVIC doorbell to self
+Git-commit: 0532dd52dfec0cf774188d3e692d50c197bc4210
+References: bsc#1140133
+Patch-mainline: v5.3-rc1
+
+AVIC doorbell is used to notify a running vCPU that interrupts
+has been injected into the vCPU AVIC backing page. Current logic
+checks only if a VCPU is running before sending a doorbell.
+However, the doorbell is not necessary if the destination
+CPU is itself.
+
+Add logic to check currently running CPU before sending doorbell.
+
+Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
+Reviewed-by: Alexander Graf <graf@amazon.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Acked-by: Joerg Roedel <jroedel@suse.de>
+---
+ arch/x86/kvm/svm.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
+index a7ea34bed3fe..c56f40d430e5 100644
+--- a/arch/x86/kvm/svm.c
++++ b/arch/x86/kvm/svm.c
+@@ -5163,10 +5163,13 @@ static void svm_deliver_avic_intr(struct kvm_vcpu *vcpu, int vec)
+ kvm_lapic_set_irr(vec, vcpu->arch.apic);
+ smp_mb__after_atomic();
+
+- if (avic_vcpu_is_running(vcpu))
+- wrmsrl(SVM_AVIC_DOORBELL,
+- kvm_cpu_get_apicid(vcpu->cpu));
+- else
++ if (avic_vcpu_is_running(vcpu)) {
++ int cpuid = vcpu->cpu;
++
++ if (cpuid != get_cpu())
++ wrmsrl(SVM_AVIC_DOORBELL, kvm_cpu_get_apicid(cpuid));
++ put_cpu();
++ } else
+ kvm_vcpu_wake_up(vcpu);
+ }
+
+
diff --git a/patches.arch/powerpc-crypto-Use-cheaper-random-numbers-for-crc-vp.patch b/patches.arch/powerpc-crypto-Use-cheaper-random-numbers-for-crc-vp.patch
new file mode 100644
index 0000000000..717ed1daf8
--- /dev/null
+++ b/patches.arch/powerpc-crypto-Use-cheaper-random-numbers-for-crc-vp.patch
@@ -0,0 +1,54 @@
+From 80d04b7fabe161a23d143b3bfcfca1b002c23da1 Mon Sep 17 00:00:00 2001
+From: George Spelvin <lkml@sdf.org>
+Date: Thu, 21 Mar 2019 10:42:22 +0000
+Subject: [PATCH] powerpc/crypto: Use cheaper random numbers for crc-vpmsum
+ self-test
+
+References: FATE#327696
+Patch-mainline: v5.2-rc1
+Git-commit: 80d04b7fabe161a23d143b3bfcfca1b002c23da1
+
+This code was filling a 64K buffer from /dev/urandom in order to
+compute a CRC over (on average half of) it by two different methods,
+comparing the CRCs, and repeating.
+
+This is not a remotely security-critical application, so use the far
+faster and cheaper prandom_u32() generator.
+
+And, while we're at it, only fill as much of the buffer as we plan to use.
+
+Signed-off-by: George Spelvin <lkml@sdf.org>
+Acked-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ arch/powerpc/crypto/crc-vpmsum_test.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/arch/powerpc/crypto/crc-vpmsum_test.c b/arch/powerpc/crypto/crc-vpmsum_test.c
+index 0153a9c6f4af..98ea4f4d3dde 100644
+--- a/arch/powerpc/crypto/crc-vpmsum_test.c
++++ b/arch/powerpc/crypto/crc-vpmsum_test.c
+@@ -78,16 +78,12 @@ static int __init crc_test_init(void)
+
+ pr_info("crc-vpmsum_test begins, %lu iterations\n", iterations);
+ for (i=0; i<iterations; i++) {
+- size_t len, offset;
++ size_t offset = prandom_u32_max(16);
++ size_t len = prandom_u32_max(MAX_CRC_LENGTH);
+
+- get_random_bytes(data, MAX_CRC_LENGTH);
+- get_random_bytes(&len, sizeof(len));
+- get_random_bytes(&offset, sizeof(offset));
+-
+- len %= MAX_CRC_LENGTH;
+- offset &= 15;
+ if (len <= offset)
+ continue;
++ prandom_bytes(data, len);
+ len -= offset;
+
+ crypto_shash_update(crct10dif_shash, data+offset, len);
+--
+2.22.0
+
diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh
index 9e5ece204b..aaae2d176e 100755
--- a/scripts/tar-up.sh
+++ b/scripts/tar-up.sh
@@ -225,9 +225,12 @@ elif $using_git; then
# users of the rpm packages.
# FIXME: the remote might have a different name than "origin" or there
# might be no remote at all.
- if git cat-file -e origin/scripts 2>/dev/null; then
- exclude[${#exclude[@]}]=^origin/scripts
- fi
+ for remote in $(git remote)
+ do
+ if git cat-file -e ${remote}/scripts 2>/dev/null; then
+ exclude[${#exclude[@]}]=^${remote}/scripts
+ fi
+ done
if git cat-file -e scripts 2>/dev/null; then
exclude[${#exclude[@]}]=^scripts
fi
diff --git a/series.conf b/series.conf
index 63ab0075d5..7e8a5776b3 100644
--- a/series.conf
+++ b/series.conf
@@ -22766,6 +22766,7 @@
patches.suse/tipc-fix-hanging-clients-using-poll-with-EPOLLOUT-fl.patch
patches.fixes/vlan-disable-SIOCSHWTSTAMP-in-container.patch
patches.suse/packet-Fix-error-path-in-packet_init.patch
+ patches.arch/powerpc-crypto-Use-cheaper-random-numbers-for-crc-vp.patch
patches.arch/powerpc-numa-improve-control-of-topology-updates.patch
patches.arch/powerpc-numa-document-topology_updates_enabled-disab.patch
patches.arch/powerpc-powernv-idle-Restore-IAMR-after-idle.patch
@@ -23205,6 +23206,7 @@
patches.fixes/0001-ocfs2-add-last-unlock-times-in-locking_state.patch
patches.fixes/0002-ocfs2-add-locking-filter-debugfs-file.patch
patches.fixes/0003-ocfs2-add-first-lock-wait-time-in-locking_state.patch
+ patches.arch/kvm-svm-avic-do-not-send-avic-doorbell-to-self
patches.arch/powerpc-watchpoint-Restore-NV-GPRs-while-returning-f.patch
patches.arch/powerpc-mm-drconf-Use-NUMA_NO_NODE-on-failures-inste.patch
patches.arch/powerpc-mm-Fix-node-look-up-with-numa-off-boot.patch
diff --git a/supported.conf b/supported.conf
index 3737af0113..76ce5db458 100644
--- a/supported.conf
+++ b/supported.conf
@@ -27,6 +27,8 @@
arch/arm64/crypto/sha256-arm64
arch/arm64/crypto/sha512-arm64
arch/powerpc/crypto/crc32c-vpmsum # ppc-specific crc32c
+ arch/powerpc/crypto/crct10dif-vpmsum # FATE#327696
+- arch/powerpc/crypto/crc-vpmsum_test # test for the above modules
arch/powerpc/crypto/sha1-powerpc
arch/powerpc/crypto/md5-ppc
arch/powerpc/kernel/rtas_flash