From e97ede82d641e28d690500a647e4421a485600ad Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 25 Jun 2024 07:43:14 +0200 Subject: [PATCH] drop a nfs patch --- ...ast_boosted_vcpu-in-kvm_vcpu_on_spin.patch | 4 +- ...en-reading-pool_stats-before-server-.patch | 57 ------------------- queue-6.9/series | 1 - 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 queue-6.9/nfsd-fix-oops-when-reading-pool_stats-before-server-.patch diff --git a/queue-6.9/kvm-fix-a-data-race-on-last_boosted_vcpu-in-kvm_vcpu_on_spin.patch b/queue-6.9/kvm-fix-a-data-race-on-last_boosted_vcpu-in-kvm_vcpu_on_spin.patch index 85aba03e1f5..598acd3e642 100644 --- a/queue-6.9/kvm-fix-a-data-race-on-last_boosted_vcpu-in-kvm_vcpu_on_spin.patch +++ b/queue-6.9/kvm-fix-a-data-race-on-last_boosted_vcpu-in-kvm_vcpu_on_spin.patch @@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c -@@ -4067,12 +4067,13 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *m +@@ -4066,12 +4066,13 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *m { struct kvm *kvm = me->kvm; struct kvm_vcpu *vcpu; @@ -85,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman kvm_vcpu_set_in_spin_loop(me, true); /* * We boost the priority of a VCPU that is runnable but not -@@ -4110,7 +4111,7 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *m +@@ -4109,7 +4110,7 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *m yielded = kvm_vcpu_yield_to(vcpu); if (yielded > 0) { diff --git a/queue-6.9/nfsd-fix-oops-when-reading-pool_stats-before-server-.patch b/queue-6.9/nfsd-fix-oops-when-reading-pool_stats-before-server-.patch deleted file mode 100644 index 27a11d80207..00000000000 --- a/queue-6.9/nfsd-fix-oops-when-reading-pool_stats-before-server-.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 388a527c6cf55bde74bc0891d0b4c38f50d896be Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 17 Jun 2024 07:54:08 -0400 -Subject: nfsd: fix oops when reading pool_stats before server is started - -From: Jeff Layton - -[ Upstream commit 8e948c365d9c10b685d1deb946bd833d6a9b43e0 ] - -Sourbh reported an oops that is triggerable by trying to read the -pool_stats procfile before nfsd had been started. Move the check for a -NULL serv in svc_pool_stats_start above the mutex acquisition, and fix -the stop routine not to unlock the mutex if there is no serv yet. - -Fixes: 7b207ccd9833 ("svc: don't hold reference for poolstats, only mutex.") -Reported-by: Sourabh Jain -Signed-off-by: Jeff Layton -Tested-by: Sourabh Jain -Signed-off-by: Chuck Lever -Signed-off-by: Sasha Levin ---- - net/sunrpc/svc_xprt.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c -index b4a85a227bd7d..1a2982051f986 100644 ---- a/net/sunrpc/svc_xprt.c -+++ b/net/sunrpc/svc_xprt.c -@@ -1371,12 +1371,13 @@ static void *svc_pool_stats_start(struct seq_file *m, loff_t *pos) - - dprintk("svc_pool_stats_start, *pidx=%u\n", pidx); - -+ if (!si->serv) -+ return NULL; -+ - mutex_lock(si->mutex); - - if (!pidx) - return SEQ_START_TOKEN; -- if (!si->serv) -- return NULL; - return pidx > si->serv->sv_nrpools ? NULL - : &si->serv->sv_pools[pidx - 1]; - } -@@ -1408,7 +1409,8 @@ static void svc_pool_stats_stop(struct seq_file *m, void *p) - { - struct svc_info *si = m->private; - -- mutex_unlock(si->mutex); -+ if (si->serv) -+ mutex_unlock(si->mutex); - } - - static int svc_pool_stats_show(struct seq_file *m, void *p) --- -2.43.0 - diff --git a/queue-6.9/series b/queue-6.9/series index 84eb0213015..83e331be0ff 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -162,7 +162,6 @@ arm-dts-imx53-qsb-hdmi-disable-panel-instead-of-dele.patch arm64-dts-freescale-imx8mp-venice-gw73xx-2x-fix-bt-s.patch arm64-dts-imx93-11x11-evk-remove-the-no-sdio-propert.patch arm64-dts-freescale-imx8mm-verdin-enable-hysteresis-.patch -nfsd-fix-oops-when-reading-pool_stats-before-server-.patch acpica-revert-acpica-avoid-info-mapping-multiple-bar.patch acpi-scan-ignore-camera-graph-port-nodes-on-all-dell.patch spi-fix-spi-slave-probe-failure.patch -- 2.47.3