From: Greg Kroah-Hartman Date: Sun, 6 Feb 2022 13:05:19 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v4.9.300~27 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4a339a276a5305003068bf6a0de710360c9d834;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: asoc-cpcap-check-for-null-pointer-after-calling-of_get_child_by_name.patch asoc-fsl-add-missing-error-handling-in-pcm030_fabric_probe.patch asoc-max9759-fix-underflow-in-speaker_gain_control_put.patch asoc-xilinx-xlnx_formatter_pcm-make-buffer-bytes-multiple-of-period-bytes.patch bpf-use-vm_map-instead-of-vm_alloc-for-ringbuf.patch drm-i915-overlay-prevent-divide-by-zero-bugs-in-scaling.patch gve-fix-the-wrong-adminq-buffer-queue-index-check.patch ib-rdmavt-validate-remote_addr-during-loopback-atomic-tests.patch iommu-amd-fix-loop-timeout-issue-in-iommu_ga_log_enable.patch iommu-vt-d-fix-potential-memory-leak-in-intel_setup_irq_remapping.patch net-ieee802154-ca8210-stop-leaking-skb-s.patch net-ieee802154-hwsim-ensure-proper-channel-selection-at-probe-time.patch net-ieee802154-mcr20a-fix-lifs-sifs-periods.patch net-ieee802154-return-meaningful-error-codes-from-the-netlink-helpers.patch net-macsec-fix-offload-support-for-netdev_unregister-event.patch net-macsec-verify-that-send_sci-is-on-when-setting-tx-sci-explicitly.patch net-stmmac-dump-gmac4-dma-registers-correctly.patch net-stmmac-ensure-ptp-time-register-reads-are-consistent.patch nfsd-nfsd4_setclientid_confirm-mistakenly-expires-confirmed-client.patch pinctrl-bcm2835-fix-a-few-error-paths.patch pinctrl-intel-fix-a-glitch-when-updating-irq-flags-on-a-preconfigured-line.patch pinctrl-intel-fix-unexpected-interrupt.patch rdma-cma-use-correct-address-when-leaving-multicast-group.patch rdma-mlx4-don-t-continue-event-handler-after-memory-allocation-failure.patch rdma-siw-fix-broken-rdma-read-fence-resume-logic.patch rdma-ucma-protect-mc-during-concurrent-multicast-leaves.patch scsi-bnx2fc-make-bnx2fc_recv_frame-mp-safe.patch selftests-exec-remove-pipe-from-test_gen_files.patch selftests-futex-use-variable-make-instead-of-make.patch spi-bcm-qspi-check-for-valid-cs-before-applying-chip-select.patch spi-mediatek-avoid-null-pointer-crash-in-interrupt.patch spi-meson-spicc-add-irq-check-in-meson_spicc_probe.patch spi-uniphier-fix-reference-count-leak-in-uniphier_spi_probe.patch tools-resolve_btfids-do-not-print-any-commands-when-building-silently.patch --- diff --git a/queue-5.10/asoc-cpcap-check-for-null-pointer-after-calling-of_get_child_by_name.patch b/queue-5.10/asoc-cpcap-check-for-null-pointer-after-calling-of_get_child_by_name.patch new file mode 100644 index 00000000000..7c1fa0750b1 --- /dev/null +++ b/queue-5.10/asoc-cpcap-check-for-null-pointer-after-calling-of_get_child_by_name.patch @@ -0,0 +1,36 @@ +From f7a6021aaf02088870559f82fc13c58cda7fea1a Mon Sep 17 00:00:00 2001 +From: Jiasheng Jiang +Date: Tue, 11 Jan 2022 10:50:48 +0800 +Subject: ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name + +From: Jiasheng Jiang + +commit f7a6021aaf02088870559f82fc13c58cda7fea1a upstream. + +If the device does not exist, of_get_child_by_name() will return NULL +pointer. +And devm_snd_soc_register_component() does not check it. +Also, I have noticed that cpcap_codec_driver has not been used yet. +Therefore, it should be better to check it in order to avoid the future +dereference of the NULL pointer. + +Fixes: f6cdf2d3445d ("ASoC: cpcap: new codec") +Signed-off-by: Jiasheng Jiang +Link: https://lore.kernel.org/r/20220111025048.524134-1-jiasheng@iscas.ac.cn +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/codecs/cpcap.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/soc/codecs/cpcap.c ++++ b/sound/soc/codecs/cpcap.c +@@ -1544,6 +1544,8 @@ static int cpcap_codec_probe(struct plat + { + struct device_node *codec_node = + of_get_child_by_name(pdev->dev.parent->of_node, "audio-codec"); ++ if (!codec_node) ++ return -ENODEV; + + pdev->dev.of_node = codec_node; + diff --git a/queue-5.10/asoc-fsl-add-missing-error-handling-in-pcm030_fabric_probe.patch b/queue-5.10/asoc-fsl-add-missing-error-handling-in-pcm030_fabric_probe.patch new file mode 100644 index 00000000000..cf5abd02742 --- /dev/null +++ b/queue-5.10/asoc-fsl-add-missing-error-handling-in-pcm030_fabric_probe.patch @@ -0,0 +1,48 @@ +From fb25621da5702c104ce0a48de5b174ced09e5b4e Mon Sep 17 00:00:00 2001 +From: Miaoqian Lin +Date: Thu, 27 Jan 2022 13:13:34 +0000 +Subject: ASoC: fsl: Add missing error handling in pcm030_fabric_probe + +From: Miaoqian Lin + +commit fb25621da5702c104ce0a48de5b174ced09e5b4e upstream. + +Add the missing platform_device_put() and platform_device_del() +before return from pcm030_fabric_probe in the error handling case. + +Fixes: c912fa913446 ("ASoC: fsl: register the wm9712-codec") +Signed-off-by: Miaoqian Lin +Link: https://lore.kernel.org/r/20220127131336.30214-1-linmq006@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/fsl/pcm030-audio-fabric.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +--- a/sound/soc/fsl/pcm030-audio-fabric.c ++++ b/sound/soc/fsl/pcm030-audio-fabric.c +@@ -93,16 +93,21 @@ static int pcm030_fabric_probe(struct pl + dev_err(&op->dev, "platform_device_alloc() failed\n"); + + ret = platform_device_add(pdata->codec_device); +- if (ret) ++ if (ret) { + dev_err(&op->dev, "platform_device_add() failed: %d\n", ret); ++ platform_device_put(pdata->codec_device); ++ } + + ret = snd_soc_register_card(card); +- if (ret) ++ if (ret) { + dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret); ++ platform_device_del(pdata->codec_device); ++ platform_device_put(pdata->codec_device); ++ } + + platform_set_drvdata(op, pdata); +- + return ret; ++ + } + + static int pcm030_fabric_remove(struct platform_device *op) diff --git a/queue-5.10/asoc-max9759-fix-underflow-in-speaker_gain_control_put.patch b/queue-5.10/asoc-max9759-fix-underflow-in-speaker_gain_control_put.patch new file mode 100644 index 00000000000..24d66558c9a --- /dev/null +++ b/queue-5.10/asoc-max9759-fix-underflow-in-speaker_gain_control_put.patch @@ -0,0 +1,36 @@ +From 4c907bcd9dcd233da6707059d777ab389dcbd964 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Wed, 19 Jan 2022 15:31:01 +0300 +Subject: ASoC: max9759: fix underflow in speaker_gain_control_put() + +From: Dan Carpenter + +commit 4c907bcd9dcd233da6707059d777ab389dcbd964 upstream. + +Check for negative values of "priv->gain" to prevent an out of bounds +access. The concern is that these might come from the user via: + -> snd_ctl_elem_write_user() + -> snd_ctl_elem_write() + -> kctl->put() + +Fixes: fa8d915172b8 ("ASoC: max9759: Add Amplifier Driver") +Signed-off-by: Dan Carpenter +Link: https://lore.kernel.org/r/20220119123101.GA9509@kili +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/codecs/max9759.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/sound/soc/codecs/max9759.c ++++ b/sound/soc/codecs/max9759.c +@@ -64,7 +64,8 @@ static int speaker_gain_control_put(stru + struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol); + struct max9759 *priv = snd_soc_component_get_drvdata(c); + +- if (ucontrol->value.integer.value[0] > 3) ++ if (ucontrol->value.integer.value[0] < 0 || ++ ucontrol->value.integer.value[0] > 3) + return -EINVAL; + + priv->gain = ucontrol->value.integer.value[0]; diff --git a/queue-5.10/asoc-xilinx-xlnx_formatter_pcm-make-buffer-bytes-multiple-of-period-bytes.patch b/queue-5.10/asoc-xilinx-xlnx_formatter_pcm-make-buffer-bytes-multiple-of-period-bytes.patch new file mode 100644 index 00000000000..4c7cf7daeed --- /dev/null +++ b/queue-5.10/asoc-xilinx-xlnx_formatter_pcm-make-buffer-bytes-multiple-of-period-bytes.patch @@ -0,0 +1,90 @@ +From e958b5884725dac86d36c1e7afe5a55f31feb0b2 Mon Sep 17 00:00:00 2001 +From: Robert Hancock +Date: Fri, 7 Jan 2022 15:47:06 -0600 +Subject: ASoC: xilinx: xlnx_formatter_pcm: Make buffer bytes multiple of period bytes + +From: Robert Hancock + +commit e958b5884725dac86d36c1e7afe5a55f31feb0b2 upstream. + +This patch is based on one in the Xilinx kernel tree, "ASoc: xlnx: Make +buffer bytes multiple of period bytes" by Devarsh Thakkar. The same +issue exists in the mainline version of the driver. The original +patch description is as follows: + +"The Xilinx Audio Formatter IP has a constraint on period +bytes to be multiple of 64. This leads to driver changing +the period size to suitable frames such that period bytes +are multiple of 64. + +Now since period bytes and period size are updated but not +the buffer bytes, this may make the buffer bytes unaligned +and not multiple of period bytes. + +When this happens we hear popping noise as while DMA is being +done the buffer bytes are not enough to complete DMA access +for last period of frame within the application buffer boundary. + +To avoid this, align buffer bytes too as multiple of 64, and +set another constraint to always enforce number of periods as +integer. Now since, there is already a rule in alsa core +to enforce Buffer size = Number of Periods * Period Size +this automatically aligns buffer bytes as multiple of period +bytes." + +Fixes: 6f6c3c36f091 ("ASoC: xlnx: add pcm formatter platform driver") +Cc: Devarsh Thakkar +Signed-off-by: Robert Hancock +Link: https://lore.kernel.org/r/20220107214711.1100162-2-robert.hancock@calian.com +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/xilinx/xlnx_formatter_pcm.c | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +--- a/sound/soc/xilinx/xlnx_formatter_pcm.c ++++ b/sound/soc/xilinx/xlnx_formatter_pcm.c +@@ -37,6 +37,7 @@ + #define XLNX_AUD_XFER_COUNT 0x28 + #define XLNX_AUD_CH_STS_START 0x2C + #define XLNX_BYTES_PER_CH 0x44 ++#define XLNX_AUD_ALIGN_BYTES 64 + + #define AUD_STS_IOC_IRQ_MASK BIT(31) + #define AUD_STS_CH_STS_MASK BIT(29) +@@ -368,12 +369,32 @@ static int xlnx_formatter_pcm_open(struc + snd_soc_set_runtime_hwparams(substream, &xlnx_pcm_hardware); + runtime->private_data = stream_data; + +- /* Resize the period size divisible by 64 */ ++ /* Resize the period bytes as divisible by 64 */ + err = snd_pcm_hw_constraint_step(runtime, 0, +- SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64); ++ SNDRV_PCM_HW_PARAM_PERIOD_BYTES, ++ XLNX_AUD_ALIGN_BYTES); + if (err) { + dev_err(component->dev, +- "unable to set constraint on period bytes\n"); ++ "Unable to set constraint on period bytes\n"); ++ return err; ++ } ++ ++ /* Resize the buffer bytes as divisible by 64 */ ++ err = snd_pcm_hw_constraint_step(runtime, 0, ++ SNDRV_PCM_HW_PARAM_BUFFER_BYTES, ++ XLNX_AUD_ALIGN_BYTES); ++ if (err) { ++ dev_err(component->dev, ++ "Unable to set constraint on buffer bytes\n"); ++ return err; ++ } ++ ++ /* Set periods as integer multiple */ ++ err = snd_pcm_hw_constraint_integer(runtime, ++ SNDRV_PCM_HW_PARAM_PERIODS); ++ if (err < 0) { ++ dev_err(component->dev, ++ "Unable to set constraint on periods to be integer\n"); + return err; + } + diff --git a/queue-5.10/bpf-use-vm_map-instead-of-vm_alloc-for-ringbuf.patch b/queue-5.10/bpf-use-vm_map-instead-of-vm_alloc-for-ringbuf.patch new file mode 100644 index 00000000000..54eea305baa --- /dev/null +++ b/queue-5.10/bpf-use-vm_map-instead-of-vm_alloc-for-ringbuf.patch @@ -0,0 +1,42 @@ +From b293dcc473d22a62dc6d78de2b15e4f49515db56 Mon Sep 17 00:00:00 2001 +From: Hou Tao +Date: Wed, 2 Feb 2022 14:01:58 +0800 +Subject: bpf: Use VM_MAP instead of VM_ALLOC for ringbuf + +From: Hou Tao + +commit b293dcc473d22a62dc6d78de2b15e4f49515db56 upstream. + +After commit 2fd3fb0be1d1 ("kasan, vmalloc: unpoison VM_ALLOC pages +after mapping"), non-VM_ALLOC mappings will be marked as accessible +in __get_vm_area_node() when KASAN is enabled. But now the flag for +ringbuf area is VM_ALLOC, so KASAN will complain out-of-bound access +after vmap() returns. Because the ringbuf area is created by mapping +allocated pages, so use VM_MAP instead. + +After the change, info in /proc/vmallocinfo also changes from + [start]-[end] 24576 ringbuf_map_alloc+0x171/0x290 vmalloc user +to + [start]-[end] 24576 ringbuf_map_alloc+0x171/0x290 vmap user + +Fixes: 457f44363a88 ("bpf: Implement BPF ring buffer and verifier support for it") +Reported-by: syzbot+5ad567a418794b9b5983@syzkaller.appspotmail.com +Signed-off-by: Hou Tao +Signed-off-by: Andrii Nakryiko +Link: https://lore.kernel.org/bpf/20220202060158.6260-1-houtao1@huawei.com +Signed-off-by: Greg Kroah-Hartman +--- + kernel/bpf/ringbuf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/bpf/ringbuf.c ++++ b/kernel/bpf/ringbuf.c +@@ -108,7 +108,7 @@ static struct bpf_ringbuf *bpf_ringbuf_a + } + + rb = vmap(pages, nr_meta_pages + 2 * nr_data_pages, +- VM_ALLOC | VM_USERMAP, PAGE_KERNEL); ++ VM_MAP | VM_USERMAP, PAGE_KERNEL); + if (rb) { + kmemleak_not_leak(pages); + rb->pages = pages; diff --git a/queue-5.10/drm-i915-overlay-prevent-divide-by-zero-bugs-in-scaling.patch b/queue-5.10/drm-i915-overlay-prevent-divide-by-zero-bugs-in-scaling.patch new file mode 100644 index 00000000000..ded124f07b7 --- /dev/null +++ b/queue-5.10/drm-i915-overlay-prevent-divide-by-zero-bugs-in-scaling.patch @@ -0,0 +1,44 @@ +From 90a3d22ff02b196d5884e111f39271a1d4ee8e3e Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Mon, 24 Jan 2022 15:24:09 +0300 +Subject: drm/i915/overlay: Prevent divide by zero bugs in scaling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Dan Carpenter + +commit 90a3d22ff02b196d5884e111f39271a1d4ee8e3e upstream. + +Smatch detected a divide by zero bug in check_overlay_scaling(). + + drivers/gpu/drm/i915/display/intel_overlay.c:976 check_overlay_scaling() + error: potential divide by zero bug '/ rec->dst_height'. + drivers/gpu/drm/i915/display/intel_overlay.c:980 check_overlay_scaling() + error: potential divide by zero bug '/ rec->dst_width'. + +Prevent this by ensuring that the dst height and width are non-zero. + +Fixes: 02e792fbaadb ("drm/i915: implement drmmode overlay support v4") +Signed-off-by: Dan Carpenter +Signed-off-by: Ville Syrjälä +Link: https://patchwork.freedesktop.org/patch/msgid/20220124122409.GA31673@kili +(cherry picked from commit cf5b64f7f10b28bebb9b7c9d25e7aee5cbe43918) +Signed-off-by: Tvrtko Ursulin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/i915/display/intel_overlay.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/gpu/drm/i915/display/intel_overlay.c ++++ b/drivers/gpu/drm/i915/display/intel_overlay.c +@@ -932,6 +932,9 @@ static int check_overlay_dst(struct inte + const struct intel_crtc_state *pipe_config = + overlay->crtc->config; + ++ if (rec->dst_height == 0 || rec->dst_width == 0) ++ return -EINVAL; ++ + if (rec->dst_x < pipe_config->pipe_src_w && + rec->dst_x + rec->dst_width <= pipe_config->pipe_src_w && + rec->dst_y < pipe_config->pipe_src_h && diff --git a/queue-5.10/gve-fix-the-wrong-adminq-buffer-queue-index-check.patch b/queue-5.10/gve-fix-the-wrong-adminq-buffer-queue-index-check.patch new file mode 100644 index 00000000000..5cb9014fa11 --- /dev/null +++ b/queue-5.10/gve-fix-the-wrong-adminq-buffer-queue-index-check.patch @@ -0,0 +1,62 @@ +From 1f84a9450d75e08af70d9e2f2d5e1c0ac0c881d2 Mon Sep 17 00:00:00 2001 +From: Haiyue Wang +Date: Fri, 28 Jan 2022 18:47:14 +0800 +Subject: gve: fix the wrong AdminQ buffer queue index check + +From: Haiyue Wang + +commit 1f84a9450d75e08af70d9e2f2d5e1c0ac0c881d2 upstream. + +The 'tail' and 'head' are 'unsigned int' type free-running count, when +'head' is overflow, the 'int i (= tail) < u32 head' will be false: + +Only '- loop 0: idx = 63' result is shown, so it needs to use 'int' type +to compare, it can handle the overflow correctly. + +typedef uint32_t u32; + +int main() +{ + u32 tail, head; + int stail, shead; + int i, loop; + + tail = 0xffffffff; + head = 0x00000000; + + for (i = tail, loop = 0; i < head; i++) { + unsigned int idx = i & 63; + + printf("+ loop %d: idx = %u\n", loop++, idx); + } + + stail = tail; + shead = head; + for (i = stail, loop = 0; i < shead; i++) { + unsigned int idx = i & 63; + + printf("- loop %d: idx = %u\n", loop++, idx); + } + + return 0; +} + +Fixes: 5cdad90de62c ("gve: Batch AQ commands for creating and destroying queues.") +Signed-off-by: Haiyue Wang +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/google/gve/gve_adminq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/google/gve/gve_adminq.c ++++ b/drivers/net/ethernet/google/gve/gve_adminq.c +@@ -141,7 +141,7 @@ static int gve_adminq_parse_err(struct g + */ + static int gve_adminq_kick_and_wait(struct gve_priv *priv) + { +- u32 tail, head; ++ int tail, head; + int i; + + tail = ioread32be(&priv->reg_bar0->adminq_event_counter); diff --git a/queue-5.10/ib-rdmavt-validate-remote_addr-during-loopback-atomic-tests.patch b/queue-5.10/ib-rdmavt-validate-remote_addr-during-loopback-atomic-tests.patch new file mode 100644 index 00000000000..b07fed23a3b --- /dev/null +++ b/queue-5.10/ib-rdmavt-validate-remote_addr-during-loopback-atomic-tests.patch @@ -0,0 +1,42 @@ +From 4028bccb003cf67e46632dee7f97ddc5d7b6e685 Mon Sep 17 00:00:00 2001 +From: Mike Marciniszyn +Date: Wed, 19 Jan 2022 04:28:09 -0500 +Subject: IB/rdmavt: Validate remote_addr during loopback atomic tests + +From: Mike Marciniszyn + +commit 4028bccb003cf67e46632dee7f97ddc5d7b6e685 upstream. + +The rdma-core test suite sends an unaligned remote address and expects a +failure. + +ERROR: test_atomic_non_aligned_addr (tests.test_atomic.AtomicTest) + +The qib/hfi1 rc handling validates properly, but the test has the client +and server on the same system. + +The loopback of these operations is a distinct code path. + +Fix by syntaxing the proposed remote address in the loopback code path. + +Fixes: 15703461533a ("IB/{hfi1, qib, rdmavt}: Move ruc_loopback to rdmavt") +Link: https://lore.kernel.org/r/1642584489-141005-1-git-send-email-mike.marciniszyn@cornelisnetworks.com +Reviewed-by: Dennis Dalessandro +Signed-off-by: Mike Marciniszyn +Signed-off-by: Jason Gunthorpe +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/sw/rdmavt/qp.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/infiniband/sw/rdmavt/qp.c ++++ b/drivers/infiniband/sw/rdmavt/qp.c +@@ -3124,6 +3124,8 @@ do_write: + case IB_WR_ATOMIC_FETCH_AND_ADD: + if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_ATOMIC))) + goto inv_err; ++ if (unlikely(wqe->atomic_wr.remote_addr & (sizeof(u64) - 1))) ++ goto inv_err; + if (unlikely(!rvt_rkey_ok(qp, &qp->r_sge.sge, sizeof(u64), + wqe->atomic_wr.remote_addr, + wqe->atomic_wr.rkey, diff --git a/queue-5.10/iommu-amd-fix-loop-timeout-issue-in-iommu_ga_log_enable.patch b/queue-5.10/iommu-amd-fix-loop-timeout-issue-in-iommu_ga_log_enable.patch new file mode 100644 index 00000000000..75980112aba --- /dev/null +++ b/queue-5.10/iommu-amd-fix-loop-timeout-issue-in-iommu_ga_log_enable.patch @@ -0,0 +1,45 @@ +From 9b45a7738eec52bf0f5d8d3d54e822962781c5f2 Mon Sep 17 00:00:00 2001 +From: Joerg Roedel +Date: Fri, 4 Feb 2022 12:55:37 +0100 +Subject: iommu/amd: Fix loop timeout issue in iommu_ga_log_enable() + +From: Joerg Roedel + +commit 9b45a7738eec52bf0f5d8d3d54e822962781c5f2 upstream. + +The polling loop for the register change in iommu_ga_log_enable() needs +to have a udelay() in it. Otherwise the CPU might be faster than the +IOMMU hardware and wrongly trigger the WARN_ON() further down the code +stream. Use a 10us for udelay(), has there is some hardware where +activation of the GA log can take more than a 100ms. + +A future optimization should move the activation check of the GA log +to the point where it gets used for the first time. But that is a +bigger change and not suitable for a fix. + +Fixes: 8bda0cfbdc1a ("iommu/amd: Detect and initialize guest vAPIC log") +Signed-off-by: Joerg Roedel +Link: https://lore.kernel.org/r/20220204115537.3894-1-joro@8bytes.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/amd/init.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/iommu/amd/init.c ++++ b/drivers/iommu/amd/init.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -833,6 +834,7 @@ static int iommu_ga_log_enable(struct am + status = readl(iommu->mmio_base + MMIO_STATUS_OFFSET); + if (status & (MMIO_STATUS_GALOG_RUN_MASK)) + break; ++ udelay(10); + } + + if (WARN_ON(i >= LOOP_TIMEOUT)) diff --git a/queue-5.10/iommu-vt-d-fix-potential-memory-leak-in-intel_setup_irq_remapping.patch b/queue-5.10/iommu-vt-d-fix-potential-memory-leak-in-intel_setup_irq_remapping.patch new file mode 100644 index 00000000000..61071856358 --- /dev/null +++ b/queue-5.10/iommu-vt-d-fix-potential-memory-leak-in-intel_setup_irq_remapping.patch @@ -0,0 +1,69 @@ +From 99e675d473eb8cf2deac1376a0f840222fc1adcf Mon Sep 17 00:00:00 2001 +From: Guoqing Jiang +Date: Fri, 28 Jan 2022 11:10:02 +0800 +Subject: iommu/vt-d: Fix potential memory leak in intel_setup_irq_remapping() + +From: Guoqing Jiang + +commit 99e675d473eb8cf2deac1376a0f840222fc1adcf upstream. + +After commit e3beca48a45b ("irqdomain/treewide: Keep firmware node +unconditionally allocated"). For tear down scenario, fn is only freed +after fail to allocate ir_domain, though it also should be freed in case +dmar_enable_qi returns error. + +Besides free fn, irq_domain and ir_msi_domain need to be removed as well +if intel_setup_irq_remapping fails to enable queued invalidation. + +Improve the rewinding path by add out_free_ir_domain and out_free_fwnode +lables per Baolu's suggestion. + +Fixes: e3beca48a45b ("irqdomain/treewide: Keep firmware node unconditionally allocated") +Suggested-by: Lu Baolu +Signed-off-by: Guoqing Jiang +Link: https://lore.kernel.org/r/20220119063640.16864-1-guoqing.jiang@linux.dev +Signed-off-by: Lu Baolu +Link: https://lore.kernel.org/r/20220128031002.2219155-3-baolu.lu@linux.intel.com +Signed-off-by: Joerg Roedel +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/intel/irq_remapping.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +--- a/drivers/iommu/intel/irq_remapping.c ++++ b/drivers/iommu/intel/irq_remapping.c +@@ -576,9 +576,8 @@ static int intel_setup_irq_remapping(str + fn, &intel_ir_domain_ops, + iommu); + if (!iommu->ir_domain) { +- irq_domain_free_fwnode(fn); + pr_err("IR%d: failed to allocate irqdomain\n", iommu->seq_id); +- goto out_free_bitmap; ++ goto out_free_fwnode; + } + iommu->ir_msi_domain = + arch_create_remap_msi_irq_domain(iommu->ir_domain, +@@ -602,7 +601,7 @@ static int intel_setup_irq_remapping(str + + if (dmar_enable_qi(iommu)) { + pr_err("Failed to enable queued invalidation\n"); +- goto out_free_bitmap; ++ goto out_free_ir_domain; + } + } + +@@ -626,6 +625,14 @@ static int intel_setup_irq_remapping(str + + return 0; + ++out_free_ir_domain: ++ if (iommu->ir_msi_domain) ++ irq_domain_remove(iommu->ir_msi_domain); ++ iommu->ir_msi_domain = NULL; ++ irq_domain_remove(iommu->ir_domain); ++ iommu->ir_domain = NULL; ++out_free_fwnode: ++ irq_domain_free_fwnode(fn); + out_free_bitmap: + bitmap_free(bitmap); + out_free_pages: diff --git a/queue-5.10/net-ieee802154-ca8210-stop-leaking-skb-s.patch b/queue-5.10/net-ieee802154-ca8210-stop-leaking-skb-s.patch new file mode 100644 index 00000000000..d1a2b58464a --- /dev/null +++ b/queue-5.10/net-ieee802154-ca8210-stop-leaking-skb-s.patch @@ -0,0 +1,35 @@ +From 621b24b09eb61c63f262da0c9c5f0e93348897e5 Mon Sep 17 00:00:00 2001 +From: Miquel Raynal +Date: Tue, 25 Jan 2022 13:14:24 +0100 +Subject: net: ieee802154: ca8210: Stop leaking skb's + +From: Miquel Raynal + +commit 621b24b09eb61c63f262da0c9c5f0e93348897e5 upstream. + +Upon error the ieee802154_xmit_complete() helper is not called. Only +ieee802154_wake_queue() is called manually. We then leak the skb +structure. + +Free the skb structure upon error before returning. + +Fixes: ded845a781a5 ("ieee802154: Add CA8210 IEEE 802.15.4 device driver") +Signed-off-by: Miquel Raynal +Acked-by: Alexander Aring +Link: https://lore.kernel.org/r/20220125121426.848337-5-miquel.raynal@bootlin.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ieee802154/ca8210.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/ieee802154/ca8210.c ++++ b/drivers/net/ieee802154/ca8210.c +@@ -1771,6 +1771,7 @@ static int ca8210_async_xmit_complete( + status + ); + if (status != MAC_TRANSACTION_OVERFLOW) { ++ dev_kfree_skb_any(priv->tx_skb); + ieee802154_wake_queue(priv->hw); + return 0; + } diff --git a/queue-5.10/net-ieee802154-hwsim-ensure-proper-channel-selection-at-probe-time.patch b/queue-5.10/net-ieee802154-hwsim-ensure-proper-channel-selection-at-probe-time.patch new file mode 100644 index 00000000000..b79ea6b860c --- /dev/null +++ b/queue-5.10/net-ieee802154-hwsim-ensure-proper-channel-selection-at-probe-time.patch @@ -0,0 +1,37 @@ +From 1293fccc9e892712d910ec96079d3717307f1d2d Mon Sep 17 00:00:00 2001 +From: Miquel Raynal +Date: Tue, 25 Jan 2022 13:14:21 +0100 +Subject: net: ieee802154: hwsim: Ensure proper channel selection at probe time + +From: Miquel Raynal + +commit 1293fccc9e892712d910ec96079d3717307f1d2d upstream. + +Drivers are expected to set the PHY current_channel and current_page +according to their default state. The hwsim driver is advertising being +configured on channel 13 by default but that is not reflected in its own +internal pib structure. In order to ensure that this driver consider the +current channel as being 13 internally, we at least need to set the +pib->channel field to 13. + +Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb") +Signed-off-by: Miquel Raynal +[stefan@datenfreihafen.org: fixed assigment from page to channel] +Acked-by: Alexander Aring +Link: https://lore.kernel.org/r/20220125121426.848337-2-miquel.raynal@bootlin.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ieee802154/mac802154_hwsim.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/ieee802154/mac802154_hwsim.c ++++ b/drivers/net/ieee802154/mac802154_hwsim.c +@@ -786,6 +786,7 @@ static int hwsim_add_one(struct genl_inf + goto err_pib; + } + ++ pib->channel = 13; + rcu_assign_pointer(phy->pib, pib); + phy->idx = idx; + INIT_LIST_HEAD(&phy->edges); diff --git a/queue-5.10/net-ieee802154-mcr20a-fix-lifs-sifs-periods.patch b/queue-5.10/net-ieee802154-mcr20a-fix-lifs-sifs-periods.patch new file mode 100644 index 00000000000..4405e89dd25 --- /dev/null +++ b/queue-5.10/net-ieee802154-mcr20a-fix-lifs-sifs-periods.patch @@ -0,0 +1,37 @@ +From d753c4004820a888ec007dd88b271fa9c3172c5c Mon Sep 17 00:00:00 2001 +From: Miquel Raynal +Date: Tue, 25 Jan 2022 13:14:22 +0100 +Subject: net: ieee802154: mcr20a: Fix lifs/sifs periods + +From: Miquel Raynal + +commit d753c4004820a888ec007dd88b271fa9c3172c5c upstream. + +These periods are expressed in time units (microseconds) while 40 and 12 +are the number of symbol durations these periods will last. We need to +multiply them both with phy->symbol_duration in order to get these +values in microseconds. + +Fixes: 8c6ad9cc5157 ("ieee802154: Add NXP MCR20A IEEE 802.15.4 transceiver driver") +Signed-off-by: Miquel Raynal +Acked-by: Alexander Aring +Link: https://lore.kernel.org/r/20220125121426.848337-3-miquel.raynal@bootlin.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ieee802154/mcr20a.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/ieee802154/mcr20a.c ++++ b/drivers/net/ieee802154/mcr20a.c +@@ -976,8 +976,8 @@ static void mcr20a_hw_setup(struct mcr20 + dev_dbg(printdev(lp), "%s\n", __func__); + + phy->symbol_duration = 16; +- phy->lifs_period = 40; +- phy->sifs_period = 12; ++ phy->lifs_period = 40 * phy->symbol_duration; ++ phy->sifs_period = 12 * phy->symbol_duration; + + hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | + IEEE802154_HW_AFILT | diff --git a/queue-5.10/net-ieee802154-return-meaningful-error-codes-from-the-netlink-helpers.patch b/queue-5.10/net-ieee802154-return-meaningful-error-codes-from-the-netlink-helpers.patch new file mode 100644 index 00000000000..d399dd57b7f --- /dev/null +++ b/queue-5.10/net-ieee802154-return-meaningful-error-codes-from-the-netlink-helpers.patch @@ -0,0 +1,61 @@ +From 79c37ca73a6e9a33f7b2b7783ba6af07a448c8a9 Mon Sep 17 00:00:00 2001 +From: Miquel Raynal +Date: Tue, 25 Jan 2022 13:14:25 +0100 +Subject: net: ieee802154: Return meaningful error codes from the netlink helpers + +From: Miquel Raynal + +commit 79c37ca73a6e9a33f7b2b7783ba6af07a448c8a9 upstream. + +Returning -1 does not indicate anything useful. + +Use a standard and meaningful error code instead. + +Fixes: a26c5fd7622d ("nl802154: add support for security layer") +Signed-off-by: Miquel Raynal +Acked-by: Alexander Aring +Link: https://lore.kernel.org/r/20220125121426.848337-6-miquel.raynal@bootlin.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Greg Kroah-Hartman +--- + net/ieee802154/nl802154.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/net/ieee802154/nl802154.c ++++ b/net/ieee802154/nl802154.c +@@ -1441,7 +1441,7 @@ static int nl802154_send_key(struct sk_b + + hdr = nl802154hdr_put(msg, portid, seq, flags, cmd); + if (!hdr) +- return -1; ++ return -ENOBUFS; + + if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex)) + goto nla_put_failure; +@@ -1634,7 +1634,7 @@ static int nl802154_send_device(struct s + + hdr = nl802154hdr_put(msg, portid, seq, flags, cmd); + if (!hdr) +- return -1; ++ return -ENOBUFS; + + if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex)) + goto nla_put_failure; +@@ -1812,7 +1812,7 @@ static int nl802154_send_devkey(struct s + + hdr = nl802154hdr_put(msg, portid, seq, flags, cmd); + if (!hdr) +- return -1; ++ return -ENOBUFS; + + if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex)) + goto nla_put_failure; +@@ -1988,7 +1988,7 @@ static int nl802154_send_seclevel(struct + + hdr = nl802154hdr_put(msg, portid, seq, flags, cmd); + if (!hdr) +- return -1; ++ return -ENOBUFS; + + if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex)) + goto nla_put_failure; diff --git a/queue-5.10/net-macsec-fix-offload-support-for-netdev_unregister-event.patch b/queue-5.10/net-macsec-fix-offload-support-for-netdev_unregister-event.patch new file mode 100644 index 00000000000..adf3b025cee --- /dev/null +++ b/queue-5.10/net-macsec-fix-offload-support-for-netdev_unregister-event.patch @@ -0,0 +1,70 @@ +From 9cef24c8b76c1f6effe499d2f131807c90f7ce9a Mon Sep 17 00:00:00 2001 +From: Lior Nahmanson +Date: Sun, 30 Jan 2022 13:29:01 +0200 +Subject: net: macsec: Fix offload support for NETDEV_UNREGISTER event + +From: Lior Nahmanson + +commit 9cef24c8b76c1f6effe499d2f131807c90f7ce9a upstream. + +Current macsec netdev notify handler handles NETDEV_UNREGISTER event by +releasing relevant SW resources only, this causes resources leak in case +of macsec HW offload, as the underlay driver was not notified to clean +it's macsec offload resources. + +Fix by calling the underlay driver to clean it's relevant resources +by moving offload handling from macsec_dellink() to macsec_common_dellink() +when handling NETDEV_UNREGISTER event. + +Fixes: 3cf3227a21d1 ("net: macsec: hardware offloading infrastructure") +Signed-off-by: Lior Nahmanson +Reviewed-by: Raed Salem +Signed-off-by: Raed Salem +Reviewed-by: Antoine Tenart +Link: https://lore.kernel.org/r/1643542141-28956-1-git-send-email-raeds@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/macsec.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +--- a/drivers/net/macsec.c ++++ b/drivers/net/macsec.c +@@ -3869,6 +3869,18 @@ static void macsec_common_dellink(struct + struct macsec_dev *macsec = macsec_priv(dev); + struct net_device *real_dev = macsec->real_dev; + ++ /* If h/w offloading is available, propagate to the device */ ++ if (macsec_is_offloaded(macsec)) { ++ const struct macsec_ops *ops; ++ struct macsec_context ctx; ++ ++ ops = macsec_get_ops(netdev_priv(dev), &ctx); ++ if (ops) { ++ ctx.secy = &macsec->secy; ++ macsec_offload(ops->mdo_del_secy, &ctx); ++ } ++ } ++ + unregister_netdevice_queue(dev, head); + list_del_rcu(&macsec->secys); + macsec_del_dev(macsec); +@@ -3883,18 +3895,6 @@ static void macsec_dellink(struct net_de + struct net_device *real_dev = macsec->real_dev; + struct macsec_rxh_data *rxd = macsec_data_rtnl(real_dev); + +- /* If h/w offloading is available, propagate to the device */ +- if (macsec_is_offloaded(macsec)) { +- const struct macsec_ops *ops; +- struct macsec_context ctx; +- +- ops = macsec_get_ops(netdev_priv(dev), &ctx); +- if (ops) { +- ctx.secy = &macsec->secy; +- macsec_offload(ops->mdo_del_secy, &ctx); +- } +- } +- + macsec_common_dellink(dev, head); + + if (list_empty(&rxd->secys)) { diff --git a/queue-5.10/net-macsec-verify-that-send_sci-is-on-when-setting-tx-sci-explicitly.patch b/queue-5.10/net-macsec-verify-that-send_sci-is-on-when-setting-tx-sci-explicitly.patch new file mode 100644 index 00000000000..13b0f39f4d4 --- /dev/null +++ b/queue-5.10/net-macsec-verify-that-send_sci-is-on-when-setting-tx-sci-explicitly.patch @@ -0,0 +1,47 @@ +From d0cfa548dbde354de986911d3913897b5448faad Mon Sep 17 00:00:00 2001 +From: Lior Nahmanson +Date: Sun, 30 Jan 2022 13:37:52 +0200 +Subject: net: macsec: Verify that send_sci is on when setting Tx sci explicitly + +From: Lior Nahmanson + +commit d0cfa548dbde354de986911d3913897b5448faad upstream. + +When setting Tx sci explicit, the Rx side is expected to use this +sci and not recalculate it from the packet.However, in case of Tx sci +is explicit and send_sci is off, the receiver is wrongly recalculate +the sci from the source MAC address which most likely be different +than the explicit sci. + +Fix by preventing such configuration when macsec newlink is established +and return EINVAL error code on such cases. + +Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver") +Signed-off-by: Lior Nahmanson +Reviewed-by: Raed Salem +Signed-off-by: Raed Salem +Link: https://lore.kernel.org/r/1643542672-29403-1-git-send-email-raeds@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/macsec.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/drivers/net/macsec.c ++++ b/drivers/net/macsec.c +@@ -4017,6 +4017,15 @@ static int macsec_newlink(struct net *ne + !macsec_check_offload(macsec->offload, macsec)) + return -EOPNOTSUPP; + ++ /* send_sci must be set to true when transmit sci explicitly is set */ ++ if ((data && data[IFLA_MACSEC_SCI]) && ++ (data && data[IFLA_MACSEC_INC_SCI])) { ++ u8 send_sci = !!nla_get_u8(data[IFLA_MACSEC_INC_SCI]); ++ ++ if (!send_sci) ++ return -EINVAL; ++ } ++ + if (data && data[IFLA_MACSEC_ICV_LEN]) + icv_len = nla_get_u8(data[IFLA_MACSEC_ICV_LEN]); + mtu = real_dev->mtu - icv_len - macsec_extra_len(true); diff --git a/queue-5.10/net-stmmac-dump-gmac4-dma-registers-correctly.patch b/queue-5.10/net-stmmac-dump-gmac4-dma-registers-correctly.patch new file mode 100644 index 00000000000..30b51bdbab0 --- /dev/null +++ b/queue-5.10/net-stmmac-dump-gmac4-dma-registers-correctly.patch @@ -0,0 +1,95 @@ +From 7af037c39b600bac2c716dd1228e8ddbe149573f Mon Sep 17 00:00:00 2001 +From: Camel Guo +Date: Mon, 31 Jan 2022 09:38:40 +0100 +Subject: net: stmmac: dump gmac4 DMA registers correctly + +From: Camel Guo + +commit 7af037c39b600bac2c716dd1228e8ddbe149573f upstream. + +Unlike gmac100, gmac1000, gmac4 has 27 DMA registers and they are +located at DMA_CHAN_BASE_ADDR (0x1100). In order for ethtool to dump +gmac4 DMA registers correctly, this commit checks if a net_device has +gmac4 and uses different logic to dump its DMA registers. + +This fixes the following KASAN warning, which can normally be triggered +by a command similar like "ethtool -d eth0": + +BUG: KASAN: vmalloc-out-of-bounds in dwmac4_dump_dma_regs+0x6d4/0xb30 +Write of size 4 at addr ffffffc010177100 by task ethtool/1839 + kasan_report+0x200/0x21c + __asan_report_store4_noabort+0x34/0x60 + dwmac4_dump_dma_regs+0x6d4/0xb30 + stmmac_ethtool_gregs+0x110/0x204 + ethtool_get_regs+0x200/0x4b0 + dev_ethtool+0x1dac/0x3800 + dev_ioctl+0x7c0/0xb50 + sock_ioctl+0x298/0x6c4 + ... + +Fixes: fbf68229ffe7 ("net: stmmac: unify registers dumps methods") +Signed-off-by: Camel Guo +Link: https://lore.kernel.org/r/20220131083841.3346801-1-camel.guo@axis.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 19 +++++++++++++++++-- + 2 files changed, 18 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h ++++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +@@ -130,6 +130,7 @@ + + #define NUM_DWMAC100_DMA_REGS 9 + #define NUM_DWMAC1000_DMA_REGS 23 ++#define NUM_DWMAC4_DMA_REGS 27 + + void dwmac_enable_dma_transmission(void __iomem *ioaddr); + void dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx); +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +@@ -21,10 +21,18 @@ + #include "dwxgmac2.h" + + #define REG_SPACE_SIZE 0x1060 ++#define GMAC4_REG_SPACE_SIZE 0x116C + #define MAC100_ETHTOOL_NAME "st_mac100" + #define GMAC_ETHTOOL_NAME "st_gmac" + #define XGMAC_ETHTOOL_NAME "st_xgmac" + ++/* Same as DMA_CHAN_BASE_ADDR defined in dwmac4_dma.h ++ * ++ * It is here because dwmac_dma.h and dwmac4_dam.h can not be included at the ++ * same time due to the conflicting macro names. ++ */ ++#define GMAC4_DMA_CHAN_BASE_ADDR 0x00001100 ++ + #define ETHTOOL_DMA_OFFSET 55 + + struct stmmac_stats { +@@ -413,6 +421,8 @@ static int stmmac_ethtool_get_regs_len(s + + if (priv->plat->has_xgmac) + return XGMAC_REGSIZE * 4; ++ else if (priv->plat->has_gmac4) ++ return GMAC4_REG_SPACE_SIZE; + return REG_SPACE_SIZE; + } + +@@ -425,8 +435,13 @@ static void stmmac_ethtool_gregs(struct + stmmac_dump_mac_regs(priv, priv->hw, reg_space); + stmmac_dump_dma_regs(priv, priv->ioaddr, reg_space); + +- if (!priv->plat->has_xgmac) { +- /* Copy DMA registers to where ethtool expects them */ ++ /* Copy DMA registers to where ethtool expects them */ ++ if (priv->plat->has_gmac4) { ++ /* GMAC4 dumps its DMA registers at its DMA_CHAN_BASE_ADDR */ ++ memcpy(®_space[ETHTOOL_DMA_OFFSET], ++ ®_space[GMAC4_DMA_CHAN_BASE_ADDR / 4], ++ NUM_DWMAC4_DMA_REGS * 4); ++ } else if (!priv->plat->has_xgmac) { + memcpy(®_space[ETHTOOL_DMA_OFFSET], + ®_space[DMA_BUS_MODE / 4], + NUM_DWMAC1000_DMA_REGS * 4); diff --git a/queue-5.10/net-stmmac-ensure-ptp-time-register-reads-are-consistent.patch b/queue-5.10/net-stmmac-ensure-ptp-time-register-reads-are-consistent.patch new file mode 100644 index 00000000000..d0234d5b13b --- /dev/null +++ b/queue-5.10/net-stmmac-ensure-ptp-time-register-reads-are-consistent.patch @@ -0,0 +1,55 @@ +From 80d4609008e6d696a279e39ae7458c916fcd44c1 Mon Sep 17 00:00:00 2001 +From: Yannick Vignon +Date: Thu, 3 Feb 2022 17:00:25 +0100 +Subject: net: stmmac: ensure PTP time register reads are consistent + +From: Yannick Vignon + +commit 80d4609008e6d696a279e39ae7458c916fcd44c1 upstream. + +Even if protected from preemption and interrupts, a small time window +remains when the 2 register reads could return inconsistent values, +each time the "seconds" register changes. This could lead to an about +1-second error in the reported time. + +Add logic to ensure the "seconds" and "nanoseconds" values are consistent. + +Fixes: 92ba6888510c ("stmmac: add the support for PTP hw clock driver") +Signed-off-by: Yannick Vignon +Reviewed-by: Russell King (Oracle) +Link: https://lore.kernel.org/r/20220203160025.750632-1-yannick.vignon@oss.nxp.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c +@@ -142,15 +142,20 @@ static int adjust_systime(void __iomem * + + static void get_systime(void __iomem *ioaddr, u64 *systime) + { +- u64 ns; ++ u64 ns, sec0, sec1; + +- /* Get the TSSS value */ +- ns = readl(ioaddr + PTP_STNSR); +- /* Get the TSS and convert sec time value to nanosecond */ +- ns += readl(ioaddr + PTP_STSR) * 1000000000ULL; ++ /* Get the TSS value */ ++ sec1 = readl_relaxed(ioaddr + PTP_STSR); ++ do { ++ sec0 = sec1; ++ /* Get the TSSS value */ ++ ns = readl_relaxed(ioaddr + PTP_STNSR); ++ /* Get the TSS value */ ++ sec1 = readl_relaxed(ioaddr + PTP_STSR); ++ } while (sec0 != sec1); + + if (systime) +- *systime = ns; ++ *systime = ns + (sec1 * 1000000000ULL); + } + + const struct stmmac_hwtimestamp stmmac_ptp = { diff --git a/queue-5.10/nfsd-nfsd4_setclientid_confirm-mistakenly-expires-confirmed-client.patch b/queue-5.10/nfsd-nfsd4_setclientid_confirm-mistakenly-expires-confirmed-client.patch new file mode 100644 index 00000000000..0f68fa6cc7f --- /dev/null +++ b/queue-5.10/nfsd-nfsd4_setclientid_confirm-mistakenly-expires-confirmed-client.patch @@ -0,0 +1,45 @@ +From ab451ea952fe9d7afefae55ddb28943a148247fe Mon Sep 17 00:00:00 2001 +From: Dai Ngo +Date: Wed, 26 Jan 2022 13:13:38 -0800 +Subject: nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client. + +From: Dai Ngo + +commit ab451ea952fe9d7afefae55ddb28943a148247fe upstream. + +From RFC 7530 Section 16.34.5: + +o The server has not recorded an unconfirmed { v, x, c, *, * } and + has recorded a confirmed { v, x, c, *, s }. If the principals of + the record and of SETCLIENTID_CONFIRM do not match, the server + returns NFS4ERR_CLID_INUSE without removing any relevant leased + client state, and without changing recorded callback and + callback_ident values for client { x }. + +The current code intends to do what the spec describes above but +it forgot to set 'old' to NULL resulting to the confirmed client +to be expired. + +Fixes: 2b63482185e6 ("nfsd: fix clid_inuse on mount with security change") +Signed-off-by: Dai Ngo +Signed-off-by: Chuck Lever +Reviewed-by: Bruce Fields +Signed-off-by: Greg Kroah-Hartman +--- + fs/nfsd/nfs4state.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/fs/nfsd/nfs4state.c ++++ b/fs/nfsd/nfs4state.c +@@ -4047,8 +4047,10 @@ nfsd4_setclientid_confirm(struct svc_rqs + status = nfserr_clid_inuse; + if (client_has_state(old) + && !same_creds(&unconf->cl_cred, +- &old->cl_cred)) ++ &old->cl_cred)) { ++ old = NULL; + goto out; ++ } + status = mark_client_expired_locked(old); + if (status) { + old = NULL; diff --git a/queue-5.10/pinctrl-bcm2835-fix-a-few-error-paths.patch b/queue-5.10/pinctrl-bcm2835-fix-a-few-error-paths.patch new file mode 100644 index 00000000000..f340ccc6b46 --- /dev/null +++ b/queue-5.10/pinctrl-bcm2835-fix-a-few-error-paths.patch @@ -0,0 +1,78 @@ +From 5297c693d8c8e08fa742e3112cf70723f7a04da2 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Thu, 27 Jan 2022 13:50:31 -0800 +Subject: pinctrl: bcm2835: Fix a few error paths + +From: Florian Fainelli + +commit 5297c693d8c8e08fa742e3112cf70723f7a04da2 upstream. + +After commit 266423e60ea1 ("pinctrl: bcm2835: Change init order for gpio +hogs") a few error paths would not unwind properly the registration of +gpio ranges. Correct that by assigning a single error label and goto it +whenever we encounter a fatal error. + +Fixes: 266423e60ea1 ("pinctrl: bcm2835: Change init order for gpio hogs") +Signed-off-by: Florian Fainelli +Link: https://lore.kernel.org/r/20220127215033.267227-1-f.fainelli@gmail.com +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c ++++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c +@@ -1264,16 +1264,18 @@ static int bcm2835_pinctrl_probe(struct + sizeof(*girq->parents), + GFP_KERNEL); + if (!girq->parents) { +- pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range); +- return -ENOMEM; ++ err = -ENOMEM; ++ goto out_remove; + } + + if (is_7211) { + pc->wake_irq = devm_kcalloc(dev, BCM2835_NUM_IRQS, + sizeof(*pc->wake_irq), + GFP_KERNEL); +- if (!pc->wake_irq) +- return -ENOMEM; ++ if (!pc->wake_irq) { ++ err = -ENOMEM; ++ goto out_remove; ++ } + } + + /* +@@ -1297,8 +1299,10 @@ static int bcm2835_pinctrl_probe(struct + + len = strlen(dev_name(pc->dev)) + 16; + name = devm_kzalloc(pc->dev, len, GFP_KERNEL); +- if (!name) +- return -ENOMEM; ++ if (!name) { ++ err = -ENOMEM; ++ goto out_remove; ++ } + + snprintf(name, len, "%s:bank%d", dev_name(pc->dev), i); + +@@ -1317,11 +1321,14 @@ static int bcm2835_pinctrl_probe(struct + err = gpiochip_add_data(&pc->gpio_chip, pc); + if (err) { + dev_err(dev, "could not add GPIO chip\n"); +- pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range); +- return err; ++ goto out_remove; + } + + return 0; ++ ++out_remove: ++ pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range); ++ return err; + } + + static struct platform_driver bcm2835_pinctrl_driver = { diff --git a/queue-5.10/pinctrl-intel-fix-a-glitch-when-updating-irq-flags-on-a-preconfigured-line.patch b/queue-5.10/pinctrl-intel-fix-a-glitch-when-updating-irq-flags-on-a-preconfigured-line.patch new file mode 100644 index 00000000000..2ac79d5118c --- /dev/null +++ b/queue-5.10/pinctrl-intel-fix-a-glitch-when-updating-irq-flags-on-a-preconfigured-line.patch @@ -0,0 +1,69 @@ +From e12963c453263d5321a2c610e98cbc731233b685 Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Wed, 19 Jan 2022 20:19:15 +0200 +Subject: pinctrl: intel: Fix a glitch when updating IRQ flags on a preconfigured line + +From: Andy Shevchenko + +commit e12963c453263d5321a2c610e98cbc731233b685 upstream. + +The commit af7e3eeb84e2 ("pinctrl: intel: Disable input and output buffer +when switching to GPIO") hadn't taken into account an update of the IRQ +flags scenario. + +When updating the IRQ flags on the preconfigured line the ->irq_set_type() +is called again. In such case the sequential Rx buffer configuration +changes may trigger a falling or rising edge interrupt that may lead, +on some platforms, to an undesired event. + +This may happen because each of intel_gpio_set_gpio_mode() and +__intel_gpio_set_direction() updates the pad configuration with a different +value of the GPIORXDIS bit. Notable, that the intel_gpio_set_gpio_mode() is +called only for the pads that are configured as an input. Due to this fact, +integrate the logic of __intel_gpio_set_direction() call into the +intel_gpio_set_gpio_mode() so that the Rx buffer won't be disabled and +immediately re-enabled. + +Fixes: af7e3eeb84e2 ("pinctrl: intel: Disable input and output buffer when switching to GPIO") +Reported-by: Kane Chen +Signed-off-by: Andy Shevchenko +Acked-by: Mika Westerberg +Tested-by: Grace Kao +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pinctrl/intel/pinctrl-intel.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +--- a/drivers/pinctrl/intel/pinctrl-intel.c ++++ b/drivers/pinctrl/intel/pinctrl-intel.c +@@ -441,8 +441,8 @@ static void intel_gpio_set_gpio_mode(voi + value &= ~PADCFG0_PMODE_MASK; + value |= PADCFG0_PMODE_GPIO; + +- /* Disable input and output buffers */ +- value |= PADCFG0_GPIORXDIS; ++ /* Disable TX buffer and enable RX (this will be input) */ ++ value &= ~PADCFG0_GPIORXDIS; + value |= PADCFG0_GPIOTXDIS; + + /* Disable SCI/SMI/NMI generation */ +@@ -487,9 +487,6 @@ static int intel_gpio_request_enable(str + + intel_gpio_set_gpio_mode(padcfg0); + +- /* Disable TX buffer and enable RX (this will be input) */ +- __intel_gpio_set_direction(padcfg0, true); +- + raw_spin_unlock_irqrestore(&pctrl->lock, flags); + + return 0; +@@ -1105,9 +1102,6 @@ static int intel_gpio_irq_type(struct ir + + intel_gpio_set_gpio_mode(reg); + +- /* Disable TX buffer and enable RX (this will be input) */ +- __intel_gpio_set_direction(reg, true); +- + value = readl(reg); + + value &= ~(PADCFG0_RXEVCFG_MASK | PADCFG0_RXINV); diff --git a/queue-5.10/pinctrl-intel-fix-unexpected-interrupt.patch b/queue-5.10/pinctrl-intel-fix-unexpected-interrupt.patch new file mode 100644 index 00000000000..75042fdbaa2 --- /dev/null +++ b/queue-5.10/pinctrl-intel-fix-unexpected-interrupt.patch @@ -0,0 +1,123 @@ +From e986f0e602f19ecb7880b04dd1db415ed9bca3f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C5=81ukasz=20Bartosik?= +Date: Mon, 24 Jan 2022 13:55:29 +0100 +Subject: pinctrl: intel: fix unexpected interrupt +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Łukasz Bartosik + +commit e986f0e602f19ecb7880b04dd1db415ed9bca3f6 upstream. + +ASUS Chromebook C223 with Celeron N3350 crashes sometimes during +cold booot. Inspection of the kernel log showed that it gets into +an inifite loop logging the following message: + +->handle_irq(): 000000009cdb51e8, handle_bad_irq+0x0/0x251 +->irq_data.chip(): 000000005ec212a7, 0xffffa043009d8e7 +->action(): 00000 + IRQ_NOPROBE set +unexpected IRQ trap at vector 7c + +The issue happens during cold boot but only if cold boot happens +at most several dozen seconds after Chromebook is powered off. For +longer intervals between power off and power on (cold boot) the issue +does not reproduce. The unexpected interrupt is sourced from INT3452 +GPIO pin which is used for SD card detect. Investigation relevealed +that when the interval between power off and power on (cold boot) +is less than several dozen seconds then values of INT3452 GPIO interrupt +enable and interrupt pending registers survive power off and power +on sequence and interrupt for SD card detect pin is enabled and pending +during probe of SD controller which causes the unexpected IRQ message. +"Intel Pentium and Celeron Processor N- and J- Series" volume 3 doc +mentions that GPIO interrupt enable and status registers default +value is 0x0. +The fix clears INT3452 GPIO interrupt enabled and interrupt pending +registers in its probe function. + +Fixes: 7981c0015af2 ("pinctrl: intel: Add Intel Sunrisepoint pin controller and GPIO support") +Signed-off-by: Łukasz Bartosik +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pinctrl/intel/pinctrl-intel.c | 54 +++++++++++++++++++++------------- + 1 file changed, 34 insertions(+), 20 deletions(-) + +--- a/drivers/pinctrl/intel/pinctrl-intel.c ++++ b/drivers/pinctrl/intel/pinctrl-intel.c +@@ -1201,6 +1201,39 @@ static irqreturn_t intel_gpio_irq(int ir + return IRQ_RETVAL(ret); + } + ++static void intel_gpio_irq_init(struct intel_pinctrl *pctrl) ++{ ++ int i; ++ ++ for (i = 0; i < pctrl->ncommunities; i++) { ++ const struct intel_community *community; ++ void __iomem *base; ++ unsigned int gpp; ++ ++ community = &pctrl->communities[i]; ++ base = community->regs; ++ ++ for (gpp = 0; gpp < community->ngpps; gpp++) { ++ /* Mask and clear all interrupts */ ++ writel(0, base + community->ie_offset + gpp * 4); ++ writel(0xffff, base + community->is_offset + gpp * 4); ++ } ++ } ++} ++ ++static int intel_gpio_irq_init_hw(struct gpio_chip *gc) ++{ ++ struct intel_pinctrl *pctrl = gpiochip_get_data(gc); ++ ++ /* ++ * Make sure the interrupt lines are in a proper state before ++ * further configuration. ++ */ ++ intel_gpio_irq_init(pctrl); ++ ++ return 0; ++} ++ + static int intel_gpio_add_community_ranges(struct intel_pinctrl *pctrl, + const struct intel_community *community) + { +@@ -1305,6 +1338,7 @@ static int intel_gpio_probe(struct intel + girq->num_parents = 0; + girq->default_type = IRQ_TYPE_NONE; + girq->handler = handle_bad_irq; ++ girq->init_hw = intel_gpio_irq_init_hw; + + ret = devm_gpiochip_add_data(pctrl->dev, &pctrl->chip, pctrl); + if (ret) { +@@ -1634,26 +1668,6 @@ int intel_pinctrl_suspend_noirq(struct d + } + EXPORT_SYMBOL_GPL(intel_pinctrl_suspend_noirq); + +-static void intel_gpio_irq_init(struct intel_pinctrl *pctrl) +-{ +- size_t i; +- +- for (i = 0; i < pctrl->ncommunities; i++) { +- const struct intel_community *community; +- void __iomem *base; +- unsigned int gpp; +- +- community = &pctrl->communities[i]; +- base = community->regs; +- +- for (gpp = 0; gpp < community->ngpps; gpp++) { +- /* Mask and clear all interrupts */ +- writel(0, base + community->ie_offset + gpp * 4); +- writel(0xffff, base + community->is_offset + gpp * 4); +- } +- } +-} +- + static bool intel_gpio_update_reg(void __iomem *reg, u32 mask, u32 value) + { + u32 curr, updated; diff --git a/queue-5.10/rdma-cma-use-correct-address-when-leaving-multicast-group.patch b/queue-5.10/rdma-cma-use-correct-address-when-leaving-multicast-group.patch new file mode 100644 index 00000000000..3126f170e87 --- /dev/null +++ b/queue-5.10/rdma-cma-use-correct-address-when-leaving-multicast-group.patch @@ -0,0 +1,63 @@ +From d9e410ebbed9d091b97bdf45b8a3792e2878dc48 Mon Sep 17 00:00:00 2001 +From: Maor Gottlieb +Date: Tue, 18 Jan 2022 09:35:00 +0200 +Subject: RDMA/cma: Use correct address when leaving multicast group + +From: Maor Gottlieb + +commit d9e410ebbed9d091b97bdf45b8a3792e2878dc48 upstream. + +In RoCE we should use cma_iboe_set_mgid() and not cma_set_mgid to generate +the mgid, otherwise we will generate an IGMP for an incorrect address. + +Fixes: b5de0c60cc30 ("RDMA/cma: Fix use after free race in roce multicast join") +Link: https://lore.kernel.org/r/913bc6783fd7a95fe71ad9454e01653ee6fb4a9a.1642491047.git.leonro@nvidia.com +Signed-off-by: Maor Gottlieb +Signed-off-by: Leon Romanovsky +Signed-off-by: Jason Gunthorpe +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/core/cma.c | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +--- a/drivers/infiniband/core/cma.c ++++ b/drivers/infiniband/core/cma.c +@@ -68,8 +68,8 @@ static const char * const cma_events[] = + [RDMA_CM_EVENT_TIMEWAIT_EXIT] = "timewait exit", + }; + +-static void cma_set_mgid(struct rdma_id_private *id_priv, struct sockaddr *addr, +- union ib_gid *mgid); ++static void cma_iboe_set_mgid(struct sockaddr *addr, union ib_gid *mgid, ++ enum ib_gid_type gid_type); + + const char *__attribute_const__ rdma_event_msg(enum rdma_cm_event_type event) + { +@@ -1840,17 +1840,19 @@ static void destroy_mc(struct rdma_id_pr + if (dev_addr->bound_dev_if) + ndev = dev_get_by_index(dev_addr->net, + dev_addr->bound_dev_if); +- if (ndev) { ++ if (ndev && !send_only) { ++ enum ib_gid_type gid_type; + union ib_gid mgid; + +- cma_set_mgid(id_priv, (struct sockaddr *)&mc->addr, +- &mgid); +- +- if (!send_only) +- cma_igmp_send(ndev, &mgid, false); +- +- dev_put(ndev); ++ gid_type = id_priv->cma_dev->default_gid_type ++ [id_priv->id.port_num - ++ rdma_start_port( ++ id_priv->cma_dev->device)]; ++ cma_iboe_set_mgid((struct sockaddr *)&mc->addr, &mgid, ++ gid_type); ++ cma_igmp_send(ndev, &mgid, false); + } ++ dev_put(ndev); + + cancel_work_sync(&mc->iboe_join.work); + } diff --git a/queue-5.10/rdma-mlx4-don-t-continue-event-handler-after-memory-allocation-failure.patch b/queue-5.10/rdma-mlx4-don-t-continue-event-handler-after-memory-allocation-failure.patch new file mode 100644 index 00000000000..e90b77fe318 --- /dev/null +++ b/queue-5.10/rdma-mlx4-don-t-continue-event-handler-after-memory-allocation-failure.patch @@ -0,0 +1,40 @@ +From f3136c4ce7acf64bee43135971ca52a880572e32 Mon Sep 17 00:00:00 2001 +From: Leon Romanovsky +Date: Mon, 31 Jan 2022 11:45:26 +0200 +Subject: RDMA/mlx4: Don't continue event handler after memory allocation failure +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Leon Romanovsky + +commit f3136c4ce7acf64bee43135971ca52a880572e32 upstream. + +The failure to allocate memory during MLX4_DEV_EVENT_PORT_MGMT_CHANGE +event handler will cause skip the assignment logic, but +ib_dispatch_event() will be called anyway. + +Fix it by calling to return instead of break after memory allocation +failure. + +Fixes: 00f5ce99dc6e ("mlx4: Use port management change event instead of smp_snoop") +Link: https://lore.kernel.org/r/12a0e83f18cfad4b5f62654f141e240d04915e10.1643622264.git.leonro@nvidia.com +Signed-off-by: Leon Romanovsky +Reviewed-by: HÃ¥kon Bugge +Signed-off-by: Jason Gunthorpe +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/hw/mlx4/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/infiniband/hw/mlx4/main.c ++++ b/drivers/infiniband/hw/mlx4/main.c +@@ -3273,7 +3273,7 @@ static void mlx4_ib_event(struct mlx4_de + case MLX4_DEV_EVENT_PORT_MGMT_CHANGE: + ew = kmalloc(sizeof *ew, GFP_ATOMIC); + if (!ew) +- break; ++ return; + + INIT_WORK(&ew->work, handle_port_mgmt_change_event); + memcpy(&ew->ib_eqe, eqe, sizeof *eqe); diff --git a/queue-5.10/rdma-siw-fix-broken-rdma-read-fence-resume-logic.patch b/queue-5.10/rdma-siw-fix-broken-rdma-read-fence-resume-logic.patch new file mode 100644 index 00000000000..fa567c808bd --- /dev/null +++ b/queue-5.10/rdma-siw-fix-broken-rdma-read-fence-resume-logic.patch @@ -0,0 +1,97 @@ +From b43a76f423aa304037603fd6165c4a534d2c09a7 Mon Sep 17 00:00:00 2001 +From: Bernard Metzler +Date: Sun, 30 Jan 2022 18:08:15 +0100 +Subject: RDMA/siw: Fix broken RDMA Read Fence/Resume logic. + +From: Bernard Metzler + +commit b43a76f423aa304037603fd6165c4a534d2c09a7 upstream. + +Code unconditionally resumed fenced SQ processing after next RDMA Read +completion, even if other RDMA Read responses are still outstanding, or +ORQ is full. Also adds comments for better readability of fence +processing, and removes orq_get_tail() helper, which is not needed +anymore. + +Fixes: 8b6a361b8c48 ("rdma/siw: receive path") +Fixes: a531975279f3 ("rdma/siw: main include file") +Link: https://lore.kernel.org/r/20220130170815.1940-1-bmt@zurich.ibm.com +Reported-by: Jared Holzman +Signed-off-by: Bernard Metzler +Signed-off-by: Jason Gunthorpe +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/sw/siw/siw.h | 7 +------ + drivers/infiniband/sw/siw/siw_qp_rx.c | 20 +++++++++++--------- + 2 files changed, 12 insertions(+), 15 deletions(-) + +--- a/drivers/infiniband/sw/siw/siw.h ++++ b/drivers/infiniband/sw/siw/siw.h +@@ -644,14 +644,9 @@ static inline struct siw_sqe *orq_get_cu + return &qp->orq[qp->orq_get % qp->attrs.orq_size]; + } + +-static inline struct siw_sqe *orq_get_tail(struct siw_qp *qp) +-{ +- return &qp->orq[qp->orq_put % qp->attrs.orq_size]; +-} +- + static inline struct siw_sqe *orq_get_free(struct siw_qp *qp) + { +- struct siw_sqe *orq_e = orq_get_tail(qp); ++ struct siw_sqe *orq_e = &qp->orq[qp->orq_put % qp->attrs.orq_size]; + + if (READ_ONCE(orq_e->flags) == 0) + return orq_e; +--- a/drivers/infiniband/sw/siw/siw_qp_rx.c ++++ b/drivers/infiniband/sw/siw/siw_qp_rx.c +@@ -1153,11 +1153,12 @@ static int siw_check_tx_fence(struct siw + + spin_lock_irqsave(&qp->orq_lock, flags); + +- rreq = orq_get_current(qp); +- + /* free current orq entry */ ++ rreq = orq_get_current(qp); + WRITE_ONCE(rreq->flags, 0); + ++ qp->orq_get++; ++ + if (qp->tx_ctx.orq_fence) { + if (unlikely(tx_waiting->wr_status != SIW_WR_QUEUED)) { + pr_warn("siw: [QP %u]: fence resume: bad status %d\n", +@@ -1165,10 +1166,12 @@ static int siw_check_tx_fence(struct siw + rv = -EPROTO; + goto out; + } +- /* resume SQ processing */ ++ /* resume SQ processing, if possible */ + if (tx_waiting->sqe.opcode == SIW_OP_READ || + tx_waiting->sqe.opcode == SIW_OP_READ_LOCAL_INV) { +- rreq = orq_get_tail(qp); ++ ++ /* SQ processing was stopped because of a full ORQ */ ++ rreq = orq_get_free(qp); + if (unlikely(!rreq)) { + pr_warn("siw: [QP %u]: no ORQE\n", qp_id(qp)); + rv = -EPROTO; +@@ -1181,15 +1184,14 @@ static int siw_check_tx_fence(struct siw + resume_tx = 1; + + } else if (siw_orq_empty(qp)) { ++ /* ++ * SQ processing was stopped by fenced work request. ++ * Resume since all previous Read's are now completed. ++ */ + qp->tx_ctx.orq_fence = 0; + resume_tx = 1; +- } else { +- pr_warn("siw: [QP %u]: fence resume: orq idx: %d:%d\n", +- qp_id(qp), qp->orq_get, qp->orq_put); +- rv = -EPROTO; + } + } +- qp->orq_get++; + out: + spin_unlock_irqrestore(&qp->orq_lock, flags); + diff --git a/queue-5.10/rdma-ucma-protect-mc-during-concurrent-multicast-leaves.patch b/queue-5.10/rdma-ucma-protect-mc-during-concurrent-multicast-leaves.patch new file mode 100644 index 00000000000..5ff95b6189e --- /dev/null +++ b/queue-5.10/rdma-ucma-protect-mc-during-concurrent-multicast-leaves.patch @@ -0,0 +1,154 @@ +From 36e8169ec973359f671f9ec7213547059cae972e Mon Sep 17 00:00:00 2001 +From: Leon Romanovsky +Date: Tue, 18 Jan 2022 09:35:01 +0200 +Subject: RDMA/ucma: Protect mc during concurrent multicast leaves + +From: Leon Romanovsky + +commit 36e8169ec973359f671f9ec7213547059cae972e upstream. + +Partially revert the commit mentioned in the Fixes line to make sure that +allocation and erasing multicast struct are locked. + + BUG: KASAN: use-after-free in ucma_cleanup_multicast drivers/infiniband/core/ucma.c:491 [inline] + BUG: KASAN: use-after-free in ucma_destroy_private_ctx+0x914/0xb70 drivers/infiniband/core/ucma.c:579 + Read of size 8 at addr ffff88801bb74b00 by task syz-executor.1/25529 + CPU: 0 PID: 25529 Comm: syz-executor.1 Not tainted 5.16.0-rc7-syzkaller #0 + Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 + Call Trace: + __dump_stack lib/dump_stack.c:88 [inline] + dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 + print_address_description.constprop.0.cold+0x8d/0x320 mm/kasan/report.c:247 + __kasan_report mm/kasan/report.c:433 [inline] + kasan_report.cold+0x83/0xdf mm/kasan/report.c:450 + ucma_cleanup_multicast drivers/infiniband/core/ucma.c:491 [inline] + ucma_destroy_private_ctx+0x914/0xb70 drivers/infiniband/core/ucma.c:579 + ucma_destroy_id+0x1e6/0x280 drivers/infiniband/core/ucma.c:614 + ucma_write+0x25c/0x350 drivers/infiniband/core/ucma.c:1732 + vfs_write+0x28e/0xae0 fs/read_write.c:588 + ksys_write+0x1ee/0x250 fs/read_write.c:643 + do_syscall_x64 arch/x86/entry/common.c:50 [inline] + do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 + entry_SYSCALL_64_after_hwframe+0x44/0xae + +Currently the xarray search can touch a concurrently freeing mc as the +xa_for_each() is not surrounded by any lock. Rather than hold the lock for +a full scan hold it only for the effected items, which is usually an empty +list. + +Fixes: 95fe51096b7a ("RDMA/ucma: Remove mc_list and rely on xarray") +Link: https://lore.kernel.org/r/1cda5fabb1081e8d16e39a48d3a4f8160cea88b8.1642491047.git.leonro@nvidia.com +Reported-by: syzbot+e3f96c43d19782dd14a7@syzkaller.appspotmail.com +Suggested-by: Jason Gunthorpe +Reviewed-by: Maor Gottlieb +Signed-off-by: Leon Romanovsky +Signed-off-by: Jason Gunthorpe +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/core/ucma.c | 34 +++++++++++++++++++++++----------- + 1 file changed, 23 insertions(+), 11 deletions(-) + +--- a/drivers/infiniband/core/ucma.c ++++ b/drivers/infiniband/core/ucma.c +@@ -95,6 +95,7 @@ struct ucma_context { + u64 uid; + + struct list_head list; ++ struct list_head mc_list; + struct work_struct close_work; + }; + +@@ -105,6 +106,7 @@ struct ucma_multicast { + + u64 uid; + u8 join_state; ++ struct list_head list; + struct sockaddr_storage addr; + }; + +@@ -198,6 +200,7 @@ static struct ucma_context *ucma_alloc_c + + INIT_WORK(&ctx->close_work, ucma_close_id); + init_completion(&ctx->comp); ++ INIT_LIST_HEAD(&ctx->mc_list); + /* So list_del() will work if we don't do ucma_finish_ctx() */ + INIT_LIST_HEAD(&ctx->list); + ctx->file = file; +@@ -484,19 +487,19 @@ err1: + + static void ucma_cleanup_multicast(struct ucma_context *ctx) + { +- struct ucma_multicast *mc; +- unsigned long index; ++ struct ucma_multicast *mc, *tmp; + +- xa_for_each(&multicast_table, index, mc) { +- if (mc->ctx != ctx) +- continue; ++ xa_lock(&multicast_table); ++ list_for_each_entry_safe(mc, tmp, &ctx->mc_list, list) { ++ list_del(&mc->list); + /* + * At this point mc->ctx->ref is 0 so the mc cannot leave the + * lock on the reader and this is enough serialization + */ +- xa_erase(&multicast_table, index); ++ __xa_erase(&multicast_table, mc->id); + kfree(mc); + } ++ xa_unlock(&multicast_table); + } + + static void ucma_cleanup_mc_events(struct ucma_multicast *mc) +@@ -1469,12 +1472,16 @@ static ssize_t ucma_process_join(struct + mc->uid = cmd->uid; + memcpy(&mc->addr, addr, cmd->addr_size); + +- if (xa_alloc(&multicast_table, &mc->id, NULL, xa_limit_32b, ++ xa_lock(&multicast_table); ++ if (__xa_alloc(&multicast_table, &mc->id, NULL, xa_limit_32b, + GFP_KERNEL)) { + ret = -ENOMEM; + goto err_free_mc; + } + ++ list_add_tail(&mc->list, &ctx->mc_list); ++ xa_unlock(&multicast_table); ++ + mutex_lock(&ctx->mutex); + ret = rdma_join_multicast(ctx->cm_id, (struct sockaddr *)&mc->addr, + join_state, mc); +@@ -1500,8 +1507,11 @@ err_leave_multicast: + mutex_unlock(&ctx->mutex); + ucma_cleanup_mc_events(mc); + err_xa_erase: +- xa_erase(&multicast_table, mc->id); ++ xa_lock(&multicast_table); ++ list_del(&mc->list); ++ __xa_erase(&multicast_table, mc->id); + err_free_mc: ++ xa_unlock(&multicast_table); + kfree(mc); + err_put_ctx: + ucma_put_ctx(ctx); +@@ -1569,15 +1579,17 @@ static ssize_t ucma_leave_multicast(stru + mc = ERR_PTR(-EINVAL); + else if (!refcount_inc_not_zero(&mc->ctx->ref)) + mc = ERR_PTR(-ENXIO); +- else +- __xa_erase(&multicast_table, mc->id); +- xa_unlock(&multicast_table); + + if (IS_ERR(mc)) { ++ xa_unlock(&multicast_table); + ret = PTR_ERR(mc); + goto out; + } + ++ list_del(&mc->list); ++ __xa_erase(&multicast_table, mc->id); ++ xa_unlock(&multicast_table); ++ + mutex_lock(&mc->ctx->mutex); + rdma_leave_multicast(mc->ctx->cm_id, (struct sockaddr *) &mc->addr); + mutex_unlock(&mc->ctx->mutex); diff --git a/queue-5.10/scsi-bnx2fc-make-bnx2fc_recv_frame-mp-safe.patch b/queue-5.10/scsi-bnx2fc-make-bnx2fc_recv_frame-mp-safe.patch new file mode 100644 index 00000000000..dc6916c5025 --- /dev/null +++ b/queue-5.10/scsi-bnx2fc-make-bnx2fc_recv_frame-mp-safe.patch @@ -0,0 +1,92 @@ +From 936bd03405fc83ba039d42bc93ffd4b88418f1d3 Mon Sep 17 00:00:00 2001 +From: John Meneghini +Date: Mon, 24 Jan 2022 09:51:10 -0500 +Subject: scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe + +From: John Meneghini + +commit 936bd03405fc83ba039d42bc93ffd4b88418f1d3 upstream. + +Running tests with a debug kernel shows that bnx2fc_recv_frame() is +modifying the per_cpu lport stats counters in a non-mpsafe way. Just boot +a debug kernel and run the bnx2fc driver with the hardware enabled. + +[ 1391.699147] BUG: using smp_processor_id() in preemptible [00000000] code: bnx2fc_ +[ 1391.699160] caller is bnx2fc_recv_frame+0xbf9/0x1760 [bnx2fc] +[ 1391.699174] CPU: 2 PID: 4355 Comm: bnx2fc_l2_threa Kdump: loaded Tainted: G B +[ 1391.699180] Hardware name: HP ProLiant DL120 G7, BIOS J01 07/01/2013 +[ 1391.699183] Call Trace: +[ 1391.699188] dump_stack_lvl+0x57/0x7d +[ 1391.699198] check_preemption_disabled+0xc8/0xd0 +[ 1391.699205] bnx2fc_recv_frame+0xbf9/0x1760 [bnx2fc] +[ 1391.699215] ? do_raw_spin_trylock+0xb5/0x180 +[ 1391.699221] ? bnx2fc_npiv_create_vports.isra.0+0x4e0/0x4e0 [bnx2fc] +[ 1391.699229] ? bnx2fc_l2_rcv_thread+0xb7/0x3a0 [bnx2fc] +[ 1391.699240] bnx2fc_l2_rcv_thread+0x1af/0x3a0 [bnx2fc] +[ 1391.699250] ? bnx2fc_ulp_init+0xc0/0xc0 [bnx2fc] +[ 1391.699258] kthread+0x364/0x420 +[ 1391.699263] ? _raw_spin_unlock_irq+0x24/0x50 +[ 1391.699268] ? set_kthread_struct+0x100/0x100 +[ 1391.699273] ret_from_fork+0x22/0x30 + +Restore the old get_cpu/put_cpu code with some modifications to reduce the +size of the critical section. + +Link: https://lore.kernel.org/r/20220124145110.442335-1-jmeneghi@redhat.com +Fixes: d576a5e80cd0 ("bnx2fc: Improve stats update mechanism") +Tested-by: Guangwu Zhang +Acked-by: Saurav Kashyap +Signed-off-by: John Meneghini +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c ++++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +@@ -506,7 +506,8 @@ static int bnx2fc_l2_rcv_thread(void *ar + + static void bnx2fc_recv_frame(struct sk_buff *skb) + { +- u32 fr_len; ++ u64 crc_err; ++ u32 fr_len, fr_crc; + struct fc_lport *lport; + struct fcoe_rcv_info *fr; + struct fc_stats *stats; +@@ -540,6 +541,11 @@ static void bnx2fc_recv_frame(struct sk_ + skb_pull(skb, sizeof(struct fcoe_hdr)); + fr_len = skb->len - sizeof(struct fcoe_crc_eof); + ++ stats = per_cpu_ptr(lport->stats, get_cpu()); ++ stats->RxFrames++; ++ stats->RxWords += fr_len / FCOE_WORD_TO_BYTE; ++ put_cpu(); ++ + fp = (struct fc_frame *)skb; + fc_frame_init(fp); + fr_dev(fp) = lport; +@@ -622,16 +628,15 @@ static void bnx2fc_recv_frame(struct sk_ + return; + } + +- stats = per_cpu_ptr(lport->stats, smp_processor_id()); +- stats->RxFrames++; +- stats->RxWords += fr_len / FCOE_WORD_TO_BYTE; ++ fr_crc = le32_to_cpu(fr_crc(fp)); + +- if (le32_to_cpu(fr_crc(fp)) != +- ~crc32(~0, skb->data, fr_len)) { +- if (stats->InvalidCRCCount < 5) ++ if (unlikely(fr_crc != ~crc32(~0, skb->data, fr_len))) { ++ stats = per_cpu_ptr(lport->stats, get_cpu()); ++ crc_err = (stats->InvalidCRCCount++); ++ put_cpu(); ++ if (crc_err < 5) + printk(KERN_WARNING PFX "dropping frame with " + "CRC error\n"); +- stats->InvalidCRCCount++; + kfree_skb(skb); + return; + } diff --git a/queue-5.10/selftests-exec-remove-pipe-from-test_gen_files.patch b/queue-5.10/selftests-exec-remove-pipe-from-test_gen_files.patch new file mode 100644 index 00000000000..78657e45b99 --- /dev/null +++ b/queue-5.10/selftests-exec-remove-pipe-from-test_gen_files.patch @@ -0,0 +1,41 @@ +From 908a26e139e8cf21093acc56d8e90ddad2ad1eff Mon Sep 17 00:00:00 2001 +From: Muhammad Usama Anjum +Date: Thu, 27 Jan 2022 21:33:45 +0500 +Subject: selftests/exec: Remove pipe from TEST_GEN_FILES + +From: Muhammad Usama Anjum + +commit 908a26e139e8cf21093acc56d8e90ddad2ad1eff upstream. + +pipe named FIFO special file is being created in execveat.c to perform +some tests. Makefile doesn't need to do anything with the pipe. When it +isn't found, Makefile generates the following build error: + +make: *** No rule to make target +'../tools/testing/selftests/exec/pipe', needed by 'all'. Stop. + +pipe is created and removed during test run-time. + +Amended change log to add pipe remove info: +Shuah Khan + +Fixes: 61016db15b8e ("selftests/exec: Verify execve of non-regular files fail") +Signed-off-by: Muhammad Usama Anjum +Reviewed-by: Shuah Khan +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/exec/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/exec/Makefile ++++ b/tools/testing/selftests/exec/Makefile +@@ -5,7 +5,7 @@ CFLAGS += -D_GNU_SOURCE + + TEST_PROGS := binfmt_script non-regular + TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216 +-TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir pipe ++TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir + # Makefile is a run-time dependency, since it's accessed by the execveat test + TEST_FILES := Makefile + diff --git a/queue-5.10/selftests-futex-use-variable-make-instead-of-make.patch b/queue-5.10/selftests-futex-use-variable-make-instead-of-make.patch new file mode 100644 index 00000000000..8cfcdc3db63 --- /dev/null +++ b/queue-5.10/selftests-futex-use-variable-make-instead-of-make.patch @@ -0,0 +1,46 @@ +From b9199181a9ef8252e47e207be8c23e1f50662620 Mon Sep 17 00:00:00 2001 +From: Muhammad Usama Anjum +Date: Thu, 27 Jan 2022 22:44:46 +0500 +Subject: selftests: futex: Use variable MAKE instead of make +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Muhammad Usama Anjum + +commit b9199181a9ef8252e47e207be8c23e1f50662620 upstream. + +Recursive make commands should always use the variable MAKE, not the +explicit command name ‘make’. This has benefits and removes the +following warning when multiple jobs are used for the build: + +make[2]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. + +Fixes: a8ba798bc8ec ("selftests: enable O and KBUILD_OUTPUT") +Signed-off-by: Muhammad Usama Anjum +Reviewed-by: André Almeida +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/futex/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/tools/testing/selftests/futex/Makefile ++++ b/tools/testing/selftests/futex/Makefile +@@ -11,7 +11,7 @@ all: + @for DIR in $(SUBDIRS); do \ + BUILD_TARGET=$(OUTPUT)/$$DIR; \ + mkdir $$BUILD_TARGET -p; \ +- make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ ++ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ + if [ -e $$DIR/$(TEST_PROGS) ]; then \ + rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \ + fi \ +@@ -32,6 +32,6 @@ override define CLEAN + @for DIR in $(SUBDIRS); do \ + BUILD_TARGET=$(OUTPUT)/$$DIR; \ + mkdir $$BUILD_TARGET -p; \ +- make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ ++ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ + done + endef diff --git a/queue-5.10/series b/queue-5.10/series index 6ae3d4e7ce4..d73dfff43ad 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -22,3 +22,37 @@ dma-buf-heaps-fix-potential-spectre-v1-gadget.patch ib-hfi1-fix-aip-early-init-panic.patch revert-asoc-mediatek-check-for-error-clk-pointer.patch memcg-charge-fs_context-and-legacy_fs_context.patch +rdma-cma-use-correct-address-when-leaving-multicast-group.patch +rdma-ucma-protect-mc-during-concurrent-multicast-leaves.patch +ib-rdmavt-validate-remote_addr-during-loopback-atomic-tests.patch +rdma-siw-fix-broken-rdma-read-fence-resume-logic.patch +rdma-mlx4-don-t-continue-event-handler-after-memory-allocation-failure.patch +iommu-vt-d-fix-potential-memory-leak-in-intel_setup_irq_remapping.patch +iommu-amd-fix-loop-timeout-issue-in-iommu_ga_log_enable.patch +spi-bcm-qspi-check-for-valid-cs-before-applying-chip-select.patch +spi-mediatek-avoid-null-pointer-crash-in-interrupt.patch +spi-meson-spicc-add-irq-check-in-meson_spicc_probe.patch +spi-uniphier-fix-reference-count-leak-in-uniphier_spi_probe.patch +net-ieee802154-hwsim-ensure-proper-channel-selection-at-probe-time.patch +net-ieee802154-mcr20a-fix-lifs-sifs-periods.patch +net-ieee802154-ca8210-stop-leaking-skb-s.patch +net-ieee802154-return-meaningful-error-codes-from-the-netlink-helpers.patch +net-macsec-fix-offload-support-for-netdev_unregister-event.patch +net-macsec-verify-that-send_sci-is-on-when-setting-tx-sci-explicitly.patch +net-stmmac-dump-gmac4-dma-registers-correctly.patch +net-stmmac-ensure-ptp-time-register-reads-are-consistent.patch +drm-i915-overlay-prevent-divide-by-zero-bugs-in-scaling.patch +asoc-fsl-add-missing-error-handling-in-pcm030_fabric_probe.patch +asoc-xilinx-xlnx_formatter_pcm-make-buffer-bytes-multiple-of-period-bytes.patch +asoc-cpcap-check-for-null-pointer-after-calling-of_get_child_by_name.patch +asoc-max9759-fix-underflow-in-speaker_gain_control_put.patch +pinctrl-intel-fix-a-glitch-when-updating-irq-flags-on-a-preconfigured-line.patch +pinctrl-intel-fix-unexpected-interrupt.patch +pinctrl-bcm2835-fix-a-few-error-paths.patch +scsi-bnx2fc-make-bnx2fc_recv_frame-mp-safe.patch +nfsd-nfsd4_setclientid_confirm-mistakenly-expires-confirmed-client.patch +gve-fix-the-wrong-adminq-buffer-queue-index-check.patch +bpf-use-vm_map-instead-of-vm_alloc-for-ringbuf.patch +selftests-exec-remove-pipe-from-test_gen_files.patch +selftests-futex-use-variable-make-instead-of-make.patch +tools-resolve_btfids-do-not-print-any-commands-when-building-silently.patch diff --git a/queue-5.10/spi-bcm-qspi-check-for-valid-cs-before-applying-chip-select.patch b/queue-5.10/spi-bcm-qspi-check-for-valid-cs-before-applying-chip-select.patch new file mode 100644 index 00000000000..85c9d7a7458 --- /dev/null +++ b/queue-5.10/spi-bcm-qspi-check-for-valid-cs-before-applying-chip-select.patch @@ -0,0 +1,36 @@ +From 2cbd27267ffe020af1442b95ec57f59a157ba85c Mon Sep 17 00:00:00 2001 +From: Kamal Dasu +Date: Thu, 27 Jan 2022 13:53:59 -0500 +Subject: spi: bcm-qspi: check for valid cs before applying chip select + +From: Kamal Dasu + +commit 2cbd27267ffe020af1442b95ec57f59a157ba85c upstream. + +Apply only valid chip select value. This change fixes case where chip +select is set to initial value of '-1' during probe and PM supend and +subsequent resume can try to use the value with undefined behaviour. +Also in case where gpio based chip select, the check in +bcm_qspi_chip_select() shall prevent undefined behaviour on resume. + +Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver") +Signed-off-by: Kamal Dasu +Acked-by: Florian Fainelli +Link: https://lore.kernel.org/r/20220127185359.27322-1-kdasu.kdev@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + drivers/spi/spi-bcm-qspi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/spi/spi-bcm-qspi.c ++++ b/drivers/spi/spi-bcm-qspi.c +@@ -551,7 +551,7 @@ static void bcm_qspi_chip_select(struct + u32 rd = 0; + u32 wr = 0; + +- if (qspi->base[CHIP_SELECT]) { ++ if (cs >= 0 && qspi->base[CHIP_SELECT]) { + rd = bcm_qspi_read(qspi, CHIP_SELECT, 0); + wr = (rd & ~0xff) | (1 << cs); + if (rd == wr) diff --git a/queue-5.10/spi-mediatek-avoid-null-pointer-crash-in-interrupt.patch b/queue-5.10/spi-mediatek-avoid-null-pointer-crash-in-interrupt.patch new file mode 100644 index 00000000000..9952e10ea6e --- /dev/null +++ b/queue-5.10/spi-mediatek-avoid-null-pointer-crash-in-interrupt.patch @@ -0,0 +1,34 @@ +From f83a96e5f033fbbd21764705cb9c04234b96218e Mon Sep 17 00:00:00 2001 +From: Benjamin Gaignard +Date: Mon, 31 Jan 2022 15:17:08 +0100 +Subject: spi: mediatek: Avoid NULL pointer crash in interrupt + +From: Benjamin Gaignard + +commit f83a96e5f033fbbd21764705cb9c04234b96218e upstream. + +In some case, like after a transfer timeout, master->cur_msg pointer +is NULL which led to a kernel crash when trying to use master->cur_msg->spi. +mtk_spi_can_dma(), pointed by master->can_dma, doesn't use this parameter +avoid the problem by setting NULL as second parameter. + +Fixes: a568231f46322 ("spi: mediatek: Add spi bus for Mediatek MT8173") +Signed-off-by: Benjamin Gaignard +Link: https://lore.kernel.org/r/20220131141708.888710-1-benjamin.gaignard@collabora.com +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + drivers/spi/spi-mt65xx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/spi/spi-mt65xx.c ++++ b/drivers/spi/spi-mt65xx.c +@@ -540,7 +540,7 @@ static irqreturn_t mtk_spi_interrupt(int + else + mdata->state = MTK_SPI_IDLE; + +- if (!master->can_dma(master, master->cur_msg->spi, trans)) { ++ if (!master->can_dma(master, NULL, trans)) { + if (trans->rx_buf) { + cnt = mdata->xfer_len / 4; + ioread32_rep(mdata->base + SPI_RX_DATA_REG, diff --git a/queue-5.10/spi-meson-spicc-add-irq-check-in-meson_spicc_probe.patch b/queue-5.10/spi-meson-spicc-add-irq-check-in-meson_spicc_probe.patch new file mode 100644 index 00000000000..c1d5c9d6186 --- /dev/null +++ b/queue-5.10/spi-meson-spicc-add-irq-check-in-meson_spicc_probe.patch @@ -0,0 +1,37 @@ +From e937440f7fc444a3e3f1fb75ea65292d6f433a44 Mon Sep 17 00:00:00 2001 +From: Miaoqian Lin +Date: Wed, 26 Jan 2022 11:04:47 +0000 +Subject: spi: meson-spicc: add IRQ check in meson_spicc_probe + +From: Miaoqian Lin + +commit e937440f7fc444a3e3f1fb75ea65292d6f433a44 upstream. + +This check misses checking for platform_get_irq()'s call and may passes +the negative error codes to devm_request_irq(), which takes unsigned IRQ #, +causing it to fail with -EINVAL, overriding an original error code. +Stop calling devm_request_irq() with invalid IRQ #s. + +Fixes: 454fa271bc4e ("spi: Add Meson SPICC driver") +Signed-off-by: Miaoqian Lin +Link: https://lore.kernel.org/r/20220126110447.24549-1-linmq006@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + drivers/spi/spi-meson-spicc.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/spi/spi-meson-spicc.c ++++ b/drivers/spi/spi-meson-spicc.c +@@ -693,6 +693,11 @@ static int meson_spicc_probe(struct plat + writel_relaxed(0, spicc->base + SPICC_INTREG); + + irq = platform_get_irq(pdev, 0); ++ if (irq < 0) { ++ ret = irq; ++ goto out_master; ++ } ++ + ret = devm_request_irq(&pdev->dev, irq, meson_spicc_irq, + 0, NULL, spicc); + if (ret) { diff --git a/queue-5.10/spi-uniphier-fix-reference-count-leak-in-uniphier_spi_probe.patch b/queue-5.10/spi-uniphier-fix-reference-count-leak-in-uniphier_spi_probe.patch new file mode 100644 index 00000000000..121663b326c --- /dev/null +++ b/queue-5.10/spi-uniphier-fix-reference-count-leak-in-uniphier_spi_probe.patch @@ -0,0 +1,80 @@ +From 37c2c83ca4f1ef4b6908181ac98e18360af89b42 Mon Sep 17 00:00:00 2001 +From: Xin Xiong +Date: Tue, 25 Jan 2022 18:12:15 +0800 +Subject: spi: uniphier: fix reference count leak in uniphier_spi_probe() + +From: Xin Xiong + +commit 37c2c83ca4f1ef4b6908181ac98e18360af89b42 upstream. + +The issue happens in several error paths in uniphier_spi_probe(). +When either dma_get_slave_caps() or devm_spi_register_master() returns +an error code, the function forgets to decrease the refcount of both +`dma_rx` and `dma_tx` objects, which may lead to refcount leaks. + +Fix it by decrementing the reference count of specific objects in +those error paths. + +Signed-off-by: Xin Xiong +Signed-off-by: Xiyu Yang +Signed-off-by: Xin Tan +Reviewed-by: Kunihiko Hayashi +Fixes: 28d1dddc59f6 ("spi: uniphier: Add DMA transfer mode support") +Link: https://lore.kernel.org/r/20220125101214.35677-1-xiongx18@fudan.edu.cn +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + drivers/spi/spi-uniphier.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +--- a/drivers/spi/spi-uniphier.c ++++ b/drivers/spi/spi-uniphier.c +@@ -726,7 +726,7 @@ static int uniphier_spi_probe(struct pla + if (ret) { + dev_err(&pdev->dev, "failed to get TX DMA capacities: %d\n", + ret); +- goto out_disable_clk; ++ goto out_release_dma; + } + dma_tx_burst = caps.max_burst; + } +@@ -735,7 +735,7 @@ static int uniphier_spi_probe(struct pla + if (IS_ERR_OR_NULL(master->dma_rx)) { + if (PTR_ERR(master->dma_rx) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; +- goto out_disable_clk; ++ goto out_release_dma; + } + master->dma_rx = NULL; + dma_rx_burst = INT_MAX; +@@ -744,7 +744,7 @@ static int uniphier_spi_probe(struct pla + if (ret) { + dev_err(&pdev->dev, "failed to get RX DMA capacities: %d\n", + ret); +- goto out_disable_clk; ++ goto out_release_dma; + } + dma_rx_burst = caps.max_burst; + } +@@ -753,10 +753,20 @@ static int uniphier_spi_probe(struct pla + + ret = devm_spi_register_master(&pdev->dev, master); + if (ret) +- goto out_disable_clk; ++ goto out_release_dma; + + return 0; + ++out_release_dma: ++ if (!IS_ERR_OR_NULL(master->dma_rx)) { ++ dma_release_channel(master->dma_rx); ++ master->dma_rx = NULL; ++ } ++ if (!IS_ERR_OR_NULL(master->dma_tx)) { ++ dma_release_channel(master->dma_tx); ++ master->dma_tx = NULL; ++ } ++ + out_disable_clk: + clk_disable_unprepare(priv->clk); + diff --git a/queue-5.10/tools-resolve_btfids-do-not-print-any-commands-when-building-silently.patch b/queue-5.10/tools-resolve_btfids-do-not-print-any-commands-when-building-silently.patch new file mode 100644 index 00000000000..371f68bbc1f --- /dev/null +++ b/queue-5.10/tools-resolve_btfids-do-not-print-any-commands-when-building-silently.patch @@ -0,0 +1,44 @@ +From 7f3bdbc3f13146eb9d07de81ea71f551587a384b Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Tue, 1 Feb 2022 14:25:04 -0700 +Subject: tools/resolve_btfids: Do not print any commands when building silently + +From: Nathan Chancellor + +commit 7f3bdbc3f13146eb9d07de81ea71f551587a384b upstream. + +When building with 'make -s', there is some output from resolve_btfids: + +$ make -sj"$(nproc)" oldconfig prepare + MKDIR .../tools/bpf/resolve_btfids/libbpf/ + MKDIR .../tools/bpf/resolve_btfids//libsubcmd + LINK resolve_btfids + +Silent mode means that no information should be emitted about what is +currently being done. Use the $(silent) variable from Makefile.include +to avoid defining the msg macro so that there is no information printed. + +Fixes: fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object") +Signed-off-by: Nathan Chancellor +Signed-off-by: Daniel Borkmann +Link: https://lore.kernel.org/bpf/20220201212503.731732-1-nathan@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + tools/bpf/resolve_btfids/Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/tools/bpf/resolve_btfids/Makefile ++++ b/tools/bpf/resolve_btfids/Makefile +@@ -9,7 +9,11 @@ ifeq ($(V),1) + msg = + else + Q = @ +- msg = @printf ' %-8s %s%s\n' "$(1)" "$(notdir $(2))" "$(if $(3), $(3))"; ++ ifeq ($(silent),1) ++ msg = ++ else ++ msg = @printf ' %-8s %s%s\n' "$(1)" "$(notdir $(2))" "$(if $(3), $(3))"; ++ endif + MAKEFLAGS=--no-print-directory + endif +