From: Sasha Levin Date: Mon, 6 Sep 2021 01:10:40 +0000 (-0400) Subject: Fixes for 4.14 X-Git-Tag: v5.10.63~37 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35887ab38a13e8d5288914754c83827855b73d53;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/cryptoloop-add-a-deprecation-warning.patch b/queue-4.14/cryptoloop-add-a-deprecation-warning.patch new file mode 100644 index 00000000000..e765b8b66ea --- /dev/null +++ b/queue-4.14/cryptoloop-add-a-deprecation-warning.patch @@ -0,0 +1,62 @@ +From 3d96e6902d2900fb38bdfaa4e7c53a635c0ca793 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 27 Aug 2021 18:32:50 +0200 +Subject: cryptoloop: add a deprecation warning + +From: Christoph Hellwig + +[ Upstream commit 222013f9ac30b9cec44301daa8dbd0aae38abffb ] + +Support for cryptoloop has been officially marked broken and deprecated +in favor of dm-crypt (which supports the same broken algorithms if +needed) in Linux 2.6.4 (released in March 2004), and support for it has +been entirely removed from losetup in util-linux 2.23 (released in April +2013). Add a warning and a deprecation schedule. + +Signed-off-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20210827163250.255325-1-hch@lst.de +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/Kconfig | 4 ++-- + drivers/block/cryptoloop.c | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig +index 01091c08e999..ef702fdb2f92 100644 +--- a/drivers/block/Kconfig ++++ b/drivers/block/Kconfig +@@ -234,7 +234,7 @@ config BLK_DEV_LOOP_MIN_COUNT + dynamically allocated with the /dev/loop-control interface. + + config BLK_DEV_CRYPTOLOOP +- tristate "Cryptoloop Support" ++ tristate "Cryptoloop Support (DEPRECATED)" + select CRYPTO + select CRYPTO_CBC + depends on BLK_DEV_LOOP +@@ -246,7 +246,7 @@ config BLK_DEV_CRYPTOLOOP + WARNING: This device is not safe for journaled file systems like + ext3 or Reiserfs. Please use the Device Mapper crypto module + instead, which can be configured to be on-disk compatible with the +- cryptoloop device. ++ cryptoloop device. cryptoloop support will be removed in Linux 5.16. + + source "drivers/block/drbd/Kconfig" + +diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c +index 74e03aa537ad..32363816cb04 100644 +--- a/drivers/block/cryptoloop.c ++++ b/drivers/block/cryptoloop.c +@@ -203,6 +203,8 @@ init_cryptoloop(void) + + if (rc) + printk(KERN_ERR "cryptoloop: loop_register_transfer failed\n"); ++ else ++ pr_warn("the cryptoloop driver has been deprecated and will be removed in in Linux 5.16\n"); + return rc; + } + +-- +2.30.2 + diff --git a/queue-4.14/net-macb-add-a-null-check-on-desc_ptp.patch b/queue-4.14/net-macb-add-a-null-check-on-desc_ptp.patch new file mode 100644 index 00000000000..f1a2f999a0f --- /dev/null +++ b/queue-4.14/net-macb-add-a-null-check-on-desc_ptp.patch @@ -0,0 +1,61 @@ +From 30c2473380a2522e3293b2282f9d6eb6e19f69ac Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Aug 2021 15:32:09 +0530 +Subject: net: macb: Add a NULL check on desc_ptp + +From: Harini Katakam + +[ Upstream commit 85520079afce885b80647fbd0d13d8f03d057167 ] + +macb_ptp_desc will not return NULL under most circumstances with correct +Kconfig and IP design config register. But for the sake of the extreme +corner case, check for NULL when using the helper. In case of rx_tstamp, +no action is necessary except to return (similar to timestamp disabled) +and warn. In case of TX, return -EINVAL to let the skb be free. Perform +this check before marking skb in progress. +Fixes coverity warning: +(4) Event dereference: +Dereferencing a null pointer "desc_ptp" + +Signed-off-by: Harini Katakam +Reviewed-by: Radhey Shyam Pandey +Signed-off-by: Michal Simek +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cadence/macb_ptp.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/cadence/macb_ptp.c b/drivers/net/ethernet/cadence/macb_ptp.c +index f1f07e9d53f8..07d6472dd149 100755 +--- a/drivers/net/ethernet/cadence/macb_ptp.c ++++ b/drivers/net/ethernet/cadence/macb_ptp.c +@@ -286,6 +286,12 @@ void gem_ptp_rxstamp(struct macb *bp, struct sk_buff *skb, + + if (GEM_BFEXT(DMA_RXVALID, desc->addr)) { + desc_ptp = macb_ptp_desc(bp, desc); ++ /* Unlikely but check */ ++ if (!desc_ptp) { ++ dev_warn_ratelimited(&bp->pdev->dev, ++ "Timestamp not supported in BD\n"); ++ return; ++ } + gem_hw_timestamp(bp, desc_ptp->ts_1, desc_ptp->ts_2, &ts); + memset(shhwtstamps, 0, sizeof(struct skb_shared_hwtstamps)); + shhwtstamps->hwtstamp = ktime_set(ts.tv_sec, ts.tv_nsec); +@@ -318,8 +324,11 @@ int gem_ptp_txstamp(struct macb_queue *queue, struct sk_buff *skb, + if (CIRC_SPACE(head, tail, PTP_TS_BUFFER_SIZE) == 0) + return -ENOMEM; + +- skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; + desc_ptp = macb_ptp_desc(queue->bp, desc); ++ /* Unlikely but check */ ++ if (!desc_ptp) ++ return -EINVAL; ++ skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; + tx_timestamp = &queue->tx_timestamps[head]; + tx_timestamp->skb = skb; + tx_timestamp->desc_ptp.ts_1 = desc_ptp->ts_1; +-- +2.30.2 + diff --git a/queue-4.14/perf-x86-amd-ibs-work-around-erratum-1197.patch b/queue-4.14/perf-x86-amd-ibs-work-around-erratum-1197.patch new file mode 100644 index 00000000000..ccd3be57ad9 --- /dev/null +++ b/queue-4.14/perf-x86-amd-ibs-work-around-erratum-1197.patch @@ -0,0 +1,64 @@ +From 7849f6fa0ccf3b8388fcd6249cdf3fc3f279cbaa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Aug 2021 17:10:42 -0500 +Subject: perf/x86/amd/ibs: Work around erratum #1197 + +From: Kim Phillips + +[ Upstream commit 26db2e0c51fe83e1dd852c1321407835b481806e ] + +Erratum #1197 "IBS (Instruction Based Sampling) Register State May be +Incorrect After Restore From CC6" is published in a document: + + "Revision Guide for AMD Family 19h Models 00h-0Fh Processors" 56683 Rev. 1.04 July 2021 + + https://bugzilla.kernel.org/show_bug.cgi?id=206537 + +Implement the erratum's suggested workaround and ignore IBS samples if +MSRC001_1031 == 0. + +Signed-off-by: Kim Phillips +Signed-off-by: Peter Zijlstra (Intel) +Signed-off-by: Ingo Molnar +Link: https://lore.kernel.org/r/20210817221048.88063-3-kim.phillips@amd.com +Signed-off-by: Sasha Levin +--- + arch/x86/events/amd/ibs.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c +index 3fe68f7f9d5e..5043425ced6b 100644 +--- a/arch/x86/events/amd/ibs.c ++++ b/arch/x86/events/amd/ibs.c +@@ -90,6 +90,7 @@ struct perf_ibs { + unsigned long offset_mask[1]; + int offset_max; + unsigned int fetch_count_reset_broken : 1; ++ unsigned int fetch_ignore_if_zero_rip : 1; + struct cpu_perf_ibs __percpu *pcpu; + + struct attribute **format_attrs; +@@ -674,6 +675,10 @@ fail: + if (check_rip && (ibs_data.regs[2] & IBS_RIP_INVALID)) { + regs.flags &= ~PERF_EFLAGS_EXACT; + } else { ++ /* Workaround for erratum #1197 */ ++ if (perf_ibs->fetch_ignore_if_zero_rip && !(ibs_data.regs[1])) ++ goto out; ++ + set_linear_ip(®s, ibs_data.regs[1]); + regs.flags |= PERF_EFLAGS_EXACT; + } +@@ -767,6 +772,9 @@ static __init void perf_event_ibs_init(void) + if (boot_cpu_data.x86 >= 0x16 && boot_cpu_data.x86 <= 0x18) + perf_ibs_fetch.fetch_count_reset_broken = 1; + ++ if (boot_cpu_data.x86 == 0x19 && boot_cpu_data.x86_model < 0x10) ++ perf_ibs_fetch.fetch_ignore_if_zero_rip = 1; ++ + perf_ibs_pmu_init(&perf_ibs_fetch, "ibs_fetch"); + + if (ibs_caps & IBS_CAPS_OPCNT) { +-- +2.30.2 + diff --git a/queue-4.14/perf-x86-intel-pt-fix-mask-of-num_address_ranges.patch b/queue-4.14/perf-x86-intel-pt-fix-mask-of-num_address_ranges.patch new file mode 100644 index 00000000000..e5b067e52e3 --- /dev/null +++ b/queue-4.14/perf-x86-intel-pt-fix-mask-of-num_address_ranges.patch @@ -0,0 +1,37 @@ +From 743207581e0e617b8753184bd663f8d053b1d91b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Aug 2021 12:06:22 +0800 +Subject: perf/x86/intel/pt: Fix mask of num_address_ranges + +From: Xiaoyao Li + +[ Upstream commit c53c6b7409f4cd9e542991b53d597fbe2751d7db ] + +Per SDM, bit 2:0 of CPUID(0x14,1).EAX[2:0] reports the number of +configurable address ranges for filtering, not bit 1:0. + +Signed-off-by: Xiaoyao Li +Signed-off-by: Peter Zijlstra (Intel) +Acked-by: Alexander Shishkin +Link: https://lkml.kernel.org/r/20210824040622.4081502-1-xiaoyao.li@intel.com +Signed-off-by: Sasha Levin +--- + arch/x86/events/intel/pt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c +index 0661227d935c..990ca9614b23 100644 +--- a/arch/x86/events/intel/pt.c ++++ b/arch/x86/events/intel/pt.c +@@ -69,7 +69,7 @@ static struct pt_cap_desc { + PT_CAP(topa_multiple_entries, 0, CPUID_ECX, BIT(1)), + PT_CAP(single_range_output, 0, CPUID_ECX, BIT(2)), + PT_CAP(payloads_lip, 0, CPUID_ECX, BIT(31)), +- PT_CAP(num_address_ranges, 1, CPUID_EAX, 0x3), ++ PT_CAP(num_address_ranges, 1, CPUID_EAX, 0x7), + PT_CAP(mtc_periods, 1, CPUID_EAX, 0xffff0000), + PT_CAP(cycle_thresholds, 1, CPUID_EBX, 0xffff), + PT_CAP(psb_periods, 1, CPUID_EBX, 0xffff0000), +-- +2.30.2 + diff --git a/queue-4.14/qed-fix-the-vf-msix-vectors-flow.patch b/queue-4.14/qed-fix-the-vf-msix-vectors-flow.patch new file mode 100644 index 00000000000..cbd01c9fbc2 --- /dev/null +++ b/queue-4.14/qed-fix-the-vf-msix-vectors-flow.patch @@ -0,0 +1,43 @@ +From 08a8c62f8aefa1fb5c121d34b6991014027b8e62 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 22 Aug 2021 22:21:14 +0300 +Subject: qed: Fix the VF msix vectors flow + +From: Shai Malin + +[ Upstream commit b0cd08537db8d2fbb227cdb2e5835209db295a24 ] + +For VFs we should return with an error in case we didn't get the exact +number of msix vectors as we requested. +Not doing that will lead to a crash when starting queues for this VF. + +Signed-off-by: Prabhakar Kushwaha +Signed-off-by: Ariel Elior +Signed-off-by: Shai Malin +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/qlogic/qed/qed_main.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c +index 52e747fd9c83..62d514b60e23 100644 +--- a/drivers/net/ethernet/qlogic/qed/qed_main.c ++++ b/drivers/net/ethernet/qlogic/qed/qed_main.c +@@ -437,7 +437,12 @@ static int qed_enable_msix(struct qed_dev *cdev, + rc = cnt; + } + +- if (rc > 0) { ++ /* For VFs, we should return with an error in case we didn't get the ++ * exact number of msix vectors as we requested. ++ * Not doing that will lead to a crash when starting queues for ++ * this VF. ++ */ ++ if ((IS_PF(cdev) && rc > 0) || (IS_VF(cdev) && rc == cnt)) { + /* MSI-x configuration was achieved */ + int_params->out.int_mode = QED_INT_MODE_MSIX; + int_params->out.num_vectors = rc; +-- +2.30.2 + diff --git a/queue-4.14/qede-fix-memset-corruption.patch b/queue-4.14/qede-fix-memset-corruption.patch new file mode 100644 index 00000000000..3bbd31b9741 --- /dev/null +++ b/queue-4.14/qede-fix-memset-corruption.patch @@ -0,0 +1,48 @@ +From 97543e94923c4943be67b835c031bcd100b3e0b6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Aug 2021 19:52:49 +0300 +Subject: qede: Fix memset corruption + +From: Shai Malin + +[ Upstream commit e543468869e2532f5d7926e8f417782b48eca3dc ] + +Thanks to Kees Cook who detected the problem of memset that starting +from not the first member, but sized for the whole struct. +The better change will be to remove the redundant memset and to clear +only the msix_cnt member. + +Signed-off-by: Prabhakar Kushwaha +Signed-off-by: Ariel Elior +Signed-off-by: Shai Malin +Reported-by: Kees Cook +Reviewed-by: Kees Cook +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c +index 8bb734486bf3..99de923728ec 100644 +--- a/drivers/net/ethernet/qlogic/qede/qede_main.c ++++ b/drivers/net/ethernet/qlogic/qede/qede_main.c +@@ -1590,6 +1590,7 @@ static void qede_sync_free_irqs(struct qede_dev *edev) + } + + edev->int_info.used_cnt = 0; ++ edev->int_info.msix_cnt = 0; + } + + static int qede_req_msix_irqs(struct qede_dev *edev) +@@ -2088,7 +2089,6 @@ static int qede_load(struct qede_dev *edev, enum qede_load_mode mode, + goto out; + err4: + qede_sync_free_irqs(edev); +- memset(&edev->int_info.msix_cnt, 0, sizeof(struct qed_int_info)); + err3: + qede_napi_disable_remove(edev); + err2: +-- +2.30.2 + diff --git a/queue-4.14/series b/queue-4.14/series index 878d64d4ef4..54c54c1d496 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1 +1,7 @@ ext4-fix-race-writing-to-an-inline_data-file-while-its-xattrs-are-changing.patch +qed-fix-the-vf-msix-vectors-flow.patch +net-macb-add-a-null-check-on-desc_ptp.patch +qede-fix-memset-corruption.patch +perf-x86-intel-pt-fix-mask-of-num_address_ranges.patch +perf-x86-amd-ibs-work-around-erratum-1197.patch +cryptoloop-add-a-deprecation-warning.patch