June 2021 - Linux-stable-mirror

[PATCH v2 01/12] drm/panfrost: Make sure MMU context lifetime is not bound to panfrost_priv

by Boris Brezillon

Jobs can be in-flight when the file descriptor is closed (either because the process did not terminate properly, or because it didn't wait for all GPU jobs to be finished), and apparently panfrost_job_close() does not cancel already running jobs. Let's refcount the MMU context object so it's lifetime is no longer bound to the FD lifetime and running jobs can finish properly without generating spurious page faults. Reported-by: Icecream95 <ixn(a)keemail.me> Fixes: 7282f7645d06 ("drm/panfrost: Implement per FD address spaces") Cc: <stable(a)vger.kernel.org> Signed-off-by: Boris Brezillon <boris.brezillon(a)collabora.com> --- drivers/gpu/drm/panfrost/panfrost_device.h | 8 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 50 ++----- drivers/gpu/drm/panfrost/panfrost_gem.c | 20 ++- drivers/gpu/drm/panfrost/panfrost_job.c | 4 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 160 ++++++++++++++------- drivers/gpu/drm/panfrost/panfrost_mmu.h | 5 +- 6 files changed, 136 insertions(+), 111 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index f614e98771e4..8b2cdb8c701d 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -121,8 +121,12 @@ struct panfrost_device { }; struct panfrost_mmu { + struct panfrost_device *pfdev; + struct kref refcount; struct io_pgtable_cfg pgtbl_cfg; struct io_pgtable_ops *pgtbl_ops; + struct drm_mm mm; + spinlock_t mm_lock; int as; atomic_t as_count; struct list_head list; @@ -133,9 +137,7 @@ struct panfrost_file_priv { struct drm_sched_entity sched_entity[NUM_JOB_SLOTS]; - struct panfrost_mmu mmu; - struct drm_mm mm; - spinlock_t mm_lock; + struct panfrost_mmu *mmu; }; static inline struct panfrost_device *to_panfrost_device(struct drm_device *ddev) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 075ec0ef746c..945133db1857 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -417,7 +417,7 @@ static int panfrost_ioctl_madvise(struct drm_device *dev, void *data, * anyway, so let's not bother. */ if (!list_is_singular(&bo->mappings.list) || - WARN_ON_ONCE(first->mmu != &priv->mmu)) { + WARN_ON_ONCE(first->mmu != priv->mmu)) { ret = -EINVAL; goto out_unlock_mappings; } @@ -449,32 +449,6 @@ int panfrost_unstable_ioctl_check(void) return 0; } -#define PFN_4G (SZ_4G >> PAGE_SHIFT) -#define PFN_4G_MASK (PFN_4G - 1) -#define PFN_16M (SZ_16M >> PAGE_SHIFT) - -static void panfrost_drm_mm_color_adjust(const struct drm_mm_node *node, - unsigned long color, - u64 *start, u64 *end) -{ - /* Executable buffers can't start or end on a 4GB boundary */ - if (!(color & PANFROST_BO_NOEXEC)) { - u64 next_seg; - - if ((*start & PFN_4G_MASK) == 0) - (*start)++; - - if ((*end & PFN_4G_MASK) == 0) - (*end)--; - - next_seg = ALIGN(*start, PFN_4G); - if (next_seg - *start <= PFN_16M) - *start = next_seg + 1; - - *end = min(*end, ALIGN(*start, PFN_4G) - 1); - } -} - static int panfrost_open(struct drm_device *dev, struct drm_file *file) { @@ -489,15 +463,11 @@ panfrost_open(struct drm_device *dev, struct drm_file *file) panfrost_priv->pfdev = pfdev; file->driver_priv = panfrost_priv; - spin_lock_init(&panfrost_priv->mm_lock); - - /* 4G enough for now. can be 48-bit */ - drm_mm_init(&panfrost_priv->mm, SZ_32M >> PAGE_SHIFT, (SZ_4G - SZ_32M) >> PAGE_SHIFT); - panfrost_priv->mm.color_adjust = panfrost_drm_mm_color_adjust; - - ret = panfrost_mmu_pgtable_alloc(panfrost_priv); - if (ret) - goto err_pgtable; + panfrost_priv->mmu = panfrost_mmu_ctx_create(pfdev); + if (IS_ERR(panfrost_priv->mmu)) { + ret = PTR_ERR(panfrost_priv->mmu); + goto err_free; + } ret = panfrost_job_open(panfrost_priv); if (ret) @@ -506,9 +476,8 @@ panfrost_open(struct drm_device *dev, struct drm_file *file) return 0; err_job: - panfrost_mmu_pgtable_free(panfrost_priv); -err_pgtable: - drm_mm_takedown(&panfrost_priv->mm); + panfrost_mmu_ctx_put(panfrost_priv->mmu); +err_free: kfree(panfrost_priv); return ret; } @@ -521,8 +490,7 @@ panfrost_postclose(struct drm_device *dev, struct drm_file *file) panfrost_perfcnt_close(file); panfrost_job_close(panfrost_priv); - panfrost_mmu_pgtable_free(panfrost_priv); - drm_mm_takedown(&panfrost_priv->mm); + panfrost_mmu_ctx_put(panfrost_priv->mmu); kfree(panfrost_priv); } diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c index 3e0723bc36bd..23377481f4e3 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c @@ -60,7 +60,7 @@ panfrost_gem_mapping_get(struct panfrost_gem_object *bo, mutex_lock(&bo->mappings.lock); list_for_each_entry(iter, &bo->mappings.list, node) { - if (iter->mmu == &priv->mmu) { + if (iter->mmu == priv->mmu) { kref_get(&iter->refcount); mapping = iter; break; @@ -74,16 +74,13 @@ panfrost_gem_mapping_get(struct panfrost_gem_object *bo, static void panfrost_gem_teardown_mapping(struct panfrost_gem_mapping *mapping) { - struct panfrost_file_priv *priv; - if (mapping->active) panfrost_mmu_unmap(mapping); - priv = container_of(mapping->mmu, struct panfrost_file_priv, mmu); - spin_lock(&priv->mm_lock); + spin_lock(&mapping->mmu->mm_lock); if (drm_mm_node_allocated(&mapping->mmnode)) drm_mm_remove_node(&mapping->mmnode); - spin_unlock(&priv->mm_lock); + spin_unlock(&mapping->mmu->mm_lock); } static void panfrost_gem_mapping_release(struct kref *kref) @@ -94,6 +91,7 @@ static void panfrost_gem_mapping_release(struct kref *kref) panfrost_gem_teardown_mapping(mapping); drm_gem_object_put(&mapping->obj->base.base); + panfrost_mmu_ctx_put(mapping->mmu); kfree(mapping); } @@ -143,11 +141,11 @@ int panfrost_gem_open(struct drm_gem_object *obj, struct drm_file *file_priv) else align = size >= SZ_2M ? SZ_2M >> PAGE_SHIFT : 0; - mapping->mmu = &priv->mmu; - spin_lock(&priv->mm_lock); - ret = drm_mm_insert_node_generic(&priv->mm, &mapping->mmnode, + mapping->mmu = panfrost_mmu_ctx_get(priv->mmu); + spin_lock(&mapping->mmu->mm_lock); + ret = drm_mm_insert_node_generic(&mapping->mmu->mm, &mapping->mmnode, size >> PAGE_SHIFT, align, color, 0); - spin_unlock(&priv->mm_lock); + spin_unlock(&mapping->mmu->mm_lock); if (ret) goto err; @@ -176,7 +174,7 @@ void panfrost_gem_close(struct drm_gem_object *obj, struct drm_file *file_priv) mutex_lock(&bo->mappings.lock); list_for_each_entry(iter, &bo->mappings.list, node) { - if (iter->mmu == &priv->mmu) { + if (iter->mmu == priv->mmu) { mapping = iter; list_del(&iter->node); break; diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c index 2df3e999a38d..3757c6eb3023 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -165,7 +165,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) return; } - cfg = panfrost_mmu_as_get(pfdev, &job->file_priv->mmu); + cfg = panfrost_mmu_as_get(pfdev, job->file_priv->mmu); job_write(pfdev, JS_HEAD_NEXT_LO(js), jc_head & 0xFFFFFFFF); job_write(pfdev, JS_HEAD_NEXT_HI(js), jc_head >> 32); @@ -527,7 +527,7 @@ static irqreturn_t panfrost_job_irq_handler(int irq, void *data) if (job) { pfdev->jobs[j] = NULL; - panfrost_mmu_as_put(pfdev, &job->file_priv->mmu); + panfrost_mmu_as_put(pfdev, job->file_priv->mmu); panfrost_devfreq_record_idle(&pfdev->pfdevfreq); dma_fence_signal_locked(job->done_fence); diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c index 0581186ebfb3..569509c2ba27 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -1,5 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright 2019 Linaro, Ltd, Rob Herring <robh(a)kernel.org> */ + +#include <drm/panfrost_drm.h> + #include <linux/atomic.h> #include <linux/bitfield.h> #include <linux/delay.h> @@ -337,7 +340,7 @@ static void mmu_tlb_inv_context_s1(void *cookie) static void mmu_tlb_sync_context(void *cookie) { - //struct panfrost_device *pfdev = cookie; + //struct panfrost_mmu *mmu = cookie; // TODO: Wait 1000 GPU cycles for HW_ISSUE_6367/T60X } @@ -352,57 +355,10 @@ static const struct iommu_flush_ops mmu_tlb_ops = { .tlb_flush_walk = mmu_tlb_flush_walk, }; -int panfrost_mmu_pgtable_alloc(struct panfrost_file_priv *priv) -{ - struct panfrost_mmu *mmu = &priv->mmu; - struct panfrost_device *pfdev = priv->pfdev; - - INIT_LIST_HEAD(&mmu->list); - mmu->as = -1; - - mmu->pgtbl_cfg = (struct io_pgtable_cfg) { - .pgsize_bitmap = SZ_4K | SZ_2M, - .ias = FIELD_GET(0xff, pfdev->features.mmu_features), - .oas = FIELD_GET(0xff00, pfdev->features.mmu_features), - .coherent_walk = pfdev->coherent, - .tlb = &mmu_tlb_ops, - .iommu_dev = pfdev->dev, - }; - - mmu->pgtbl_ops = alloc_io_pgtable_ops(ARM_MALI_LPAE, &mmu->pgtbl_cfg, - priv); - if (!mmu->pgtbl_ops) - return -EINVAL; - - return 0; -} - -void panfrost_mmu_pgtable_free(struct panfrost_file_priv *priv) -{ - struct panfrost_device *pfdev = priv->pfdev; - struct panfrost_mmu *mmu = &priv->mmu; - - spin_lock(&pfdev->as_lock); - if (mmu->as >= 0) { - pm_runtime_get_noresume(pfdev->dev); - if (pm_runtime_active(pfdev->dev)) - panfrost_mmu_disable(pfdev, mmu->as); - pm_runtime_put_autosuspend(pfdev->dev); - - clear_bit(mmu->as, &pfdev->as_alloc_mask); - clear_bit(mmu->as, &pfdev->as_in_use_mask); - list_del(&mmu->list); - } - spin_unlock(&pfdev->as_lock); - - free_io_pgtable_ops(mmu->pgtbl_ops); -} - static struct panfrost_gem_mapping * addr_to_mapping(struct panfrost_device *pfdev, int as, u64 addr) { struct panfrost_gem_mapping *mapping = NULL; - struct panfrost_file_priv *priv; struct drm_mm_node *node; u64 offset = addr >> PAGE_SHIFT; struct panfrost_mmu *mmu; @@ -415,11 +371,10 @@ addr_to_mapping(struct panfrost_device *pfdev, int as, u64 addr) goto out; found_mmu: - priv = container_of(mmu, struct panfrost_file_priv, mmu); - spin_lock(&priv->mm_lock); + spin_lock(&mmu->mm_lock); - drm_mm_for_each_node(node, &priv->mm) { + drm_mm_for_each_node(node, &mmu->mm) { if (offset >= node->start && offset < (node->start + node->size)) { mapping = drm_mm_node_to_panfrost_mapping(node); @@ -429,7 +384,7 @@ addr_to_mapping(struct panfrost_device *pfdev, int as, u64 addr) } } - spin_unlock(&priv->mm_lock); + spin_unlock(&mmu->mm_lock); out: spin_unlock(&pfdev->as_lock); return mapping; @@ -542,6 +497,107 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, return ret; } +static void panfrost_mmu_release_ctx(struct kref *kref) +{ + struct panfrost_mmu *mmu = container_of(kref, struct panfrost_mmu, + refcount); + struct panfrost_device *pfdev = mmu->pfdev; + + spin_lock(&pfdev->as_lock); + if (mmu->as >= 0) { + pm_runtime_get_noresume(pfdev->dev); + if (pm_runtime_active(pfdev->dev)) + panfrost_mmu_disable(pfdev, mmu->as); + pm_runtime_put_autosuspend(pfdev->dev); + + clear_bit(mmu->as, &pfdev->as_alloc_mask); + clear_bit(mmu->as, &pfdev->as_in_use_mask); + list_del(&mmu->list); + } + spin_unlock(&pfdev->as_lock); + + free_io_pgtable_ops(mmu->pgtbl_ops); + drm_mm_takedown(&mmu->mm); + kfree(mmu); +} + +void panfrost_mmu_ctx_put(struct panfrost_mmu *mmu) +{ + kref_put(&mmu->refcount, panfrost_mmu_release_ctx); +} + +struct panfrost_mmu *panfrost_mmu_ctx_get(struct panfrost_mmu *mmu) +{ + kref_get(&mmu->refcount); + + return mmu; +} + +#define PFN_4G (SZ_4G >> PAGE_SHIFT) +#define PFN_4G_MASK (PFN_4G - 1) +#define PFN_16M (SZ_16M >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust(const struct drm_mm_node *node, + unsigned long color, + u64 *start, u64 *end) +{ + /* Executable buffers can't start or end on a 4GB boundary */ + if (!(color & PANFROST_BO_NOEXEC)) { + u64 next_seg; + + if ((*start & PFN_4G_MASK) == 0) + (*start)++; + + if ((*end & PFN_4G_MASK) == 0) + (*end)--; + + next_seg = ALIGN(*start, PFN_4G); + if (next_seg - *start <= PFN_16M) + *start = next_seg + 1; + + *end = min(*end, ALIGN(*start, PFN_4G) - 1); + } +} + +struct panfrost_mmu *panfrost_mmu_ctx_create(struct panfrost_device *pfdev) +{ + struct panfrost_mmu *mmu; + + mmu = kzalloc(sizeof(*mmu), GFP_KERNEL); + if (!mmu) + return ERR_PTR(-ENOMEM); + + mmu->pfdev = pfdev; + spin_lock_init(&mmu->mm_lock); + + /* 4G enough for now. can be 48-bit */ + drm_mm_init(&mmu->mm, SZ_32M >> PAGE_SHIFT, (SZ_4G - SZ_32M) >> PAGE_SHIFT); + mmu->mm.color_adjust = panfrost_drm_mm_color_adjust; + + INIT_LIST_HEAD(&mmu->list); + mmu->as = -1; + + mmu->pgtbl_cfg = (struct io_pgtable_cfg) { + .pgsize_bitmap = SZ_4K | SZ_2M, + .ias = FIELD_GET(0xff, pfdev->features.mmu_features), + .oas = FIELD_GET(0xff00, pfdev->features.mmu_features), + .coherent_walk = pfdev->coherent, + .tlb = &mmu_tlb_ops, + .iommu_dev = pfdev->dev, + }; + + mmu->pgtbl_ops = alloc_io_pgtable_ops(ARM_MALI_LPAE, &mmu->pgtbl_cfg, + mmu); + if (!mmu->pgtbl_ops) { + kfree(mmu); + return ERR_PTR(-EINVAL); + } + + kref_init(&mmu->refcount); + + return mmu; +} + static const char *access_type_name(struct panfrost_device *pfdev, u32 fault_status) { diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.h b/drivers/gpu/drm/panfrost/panfrost_mmu.h index 44fc2edf63ce..cc2a0d307feb 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.h +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.h @@ -18,7 +18,8 @@ void panfrost_mmu_reset(struct panfrost_device *pfdev); u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu); void panfrost_mmu_as_put(struct panfrost_device *pfdev, struct panfrost_mmu *mmu); -int panfrost_mmu_pgtable_alloc(struct panfrost_file_priv *priv); -void panfrost_mmu_pgtable_free(struct panfrost_file_priv *priv); +struct panfrost_mmu *panfrost_mmu_ctx_get(struct panfrost_mmu *mmu); +void panfrost_mmu_ctx_put(struct panfrost_mmu *mmu); +struct panfrost_mmu *panfrost_mmu_ctx_create(struct panfrost_device *pfdev); #endif -- 2.31.1

3 years, 4 months

3
4
0 0

[RFC 2/2] ARM: dts: imx6dl-yapp4: Fix lp5562 driver probe

by Michal Vokáč

Since the LED multicolor framework support was added in commit 92a81562e695 ("leds: lp55xx: Add multicolor framework support to lp55xx") LEDs on this platform stopped working. Author of the framework attempted to accommodate this DT to the framework in commit b86d3d21cd4c ("ARM: dts: imx6dl-yapp4: Add reg property to the lp5562 channel node") but that is not sufficient. A color property is now required even if the multicolor framework is not used, otherwise the driver probe fails: lp5562: probe of 1-0030 failed with error -22 Add the color property to fix this and remove the actually unused white channel. Fixes: b86d3d21cd4c ("ARM: dts: imx6dl-yapp4: Add reg property to the lp5562 channel node") Cc: <stable(a)vger.kernel.org> Cc: Pavel Machek <pavel(a)ucw.cz> Cc: Jacek Anaszewski <jacek.anaszewski(a)gmail.com> Cc: linux-leds(a)vger.kernel.org Signed-off-by: Michal Vokáč <michal.vokac(a)ysoft.com> --- arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi index 7d2c72562c73..3107bf7fbce5 100644 --- a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi +++ b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi @@ -5,6 +5,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/pwm/pwm.h> / { @@ -271,6 +272,7 @@ led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; reg = <0>; + color = <LED_COLOR_ID_RED>; }; chan@1 { @@ -278,6 +280,7 @@ led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; reg = <1>; + color = <LED_COLOR_ID_GREEN>; }; chan@2 { @@ -285,13 +288,7 @@ led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; reg = <2>; - }; - - chan@3 { - chan-name = "W"; - led-cur = /bits/ 8 <0x0>; - max-cur = /bits/ 8 <0x0>; - reg = <3>; + color = <LED_COLOR_ID_BLUE>; }; }; -- 2.7.4

3 years, 4 months

2
2
0 0

[PATCH] crypto: nx: Fix memcpy() over-reading in nonce

by Kees Cook

Fix typo in memcpy() where size should be CTR_RFC3686_NONCE_SIZE. Fixes: 030f4e968741 ("crypto: nx - Fix reentrancy bugs") Cc: stable(a)vger.kernel.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- drivers/crypto/nx/nx-aes-ctr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/nx/nx-aes-ctr.c b/drivers/crypto/nx/nx-aes-ctr.c index 13f518802343..6120e350ff71 100644 --- a/drivers/crypto/nx/nx-aes-ctr.c +++ b/drivers/crypto/nx/nx-aes-ctr.c @@ -118,7 +118,7 @@ static int ctr3686_aes_nx_crypt(struct skcipher_request *req) struct nx_crypto_ctx *nx_ctx = crypto_skcipher_ctx(tfm); u8 iv[16]; - memcpy(iv, nx_ctx->priv.ctr.nonce, CTR_RFC3686_IV_SIZE); + memcpy(iv, nx_ctx->priv.ctr.nonce, CTR_RFC3686_NONCE_SIZE); memcpy(iv + CTR_RFC3686_NONCE_SIZE, req->iv, CTR_RFC3686_IV_SIZE); iv[12] = iv[13] = iv[14] = 0; iv[15] = 1; -- 2.25.1

3 years, 4 months

3
3
0 0

[PATCH v2] selftests/lkdtm: Use /bin/sh not $SHELL

by Kees Cook

Some environments do not set $SHELL when running tests. There's no need to use $SHELL here anyway, so just replace it with hard-coded path instead. Additionally avoid using bash-isms in the command, so that regular /bin/sh can be used. Suggested-by: Guillaume Tucker <guillaume.tucker(a)collabora.com> Fixes: 46d1a0f03d66 ("selftests/lkdtm: Add tests for LKDTM targets") Cc: stable(a)vger.kernel.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- tools/testing/selftests/lkdtm/run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/lkdtm/run.sh b/tools/testing/selftests/lkdtm/run.sh index bb7a1775307b..0f9f22ac004b 100755 --- a/tools/testing/selftests/lkdtm/run.sh +++ b/tools/testing/selftests/lkdtm/run.sh @@ -78,8 +78,9 @@ dmesg > "$DMESG" # Most shells yell about signals and we're expecting the "cat" process # to usually be killed by the kernel. So we have to run it in a sub-shell -# and silence errors. -($SHELL -c 'cat <(echo '"$test"') >'"$TRIGGER" 2>/dev/null) || true +# to avoid terminating this script. Leave stderr alone, just in case +# something _else_ happens. +(/bin/sh -c '(echo '"$test"') | cat >'"$TRIGGER") || true # Record and dump the results dmesg | comm --nocheck-order -13 "$DMESG" - > "$LOG" || true -- 2.25.1

3 years, 4 months

4
10
0 0

[RESEND PATCH 1/3] perf/x86/intel: Fix fixed counter check warning for some Alder Lake

by kan.liang＠linux.intel.com

From: Kan Liang <kan.liang(a)linux.intel.com> For some Alder Lake machine, the below fixed counter check warning may be triggered. [ 2.010766] hw perf events fixed 5 > max(4), clipping! Current perf unconditionally increases the number of the GP counters and the fixed counters for a big core PMU on an Alder Lake system, because the number enumerated in the CPUID only reflects the common counters. The big core may has more counters. However, Alder Lake may have an alternative configuration. With that configuration, the X86_FEATURE_HYBRID_CPU is not set. The number of the GP counters and fixed counters enumerated in the CPUID is accurate. Perf mistakenly increases the number of counters. The warning is triggered. Directly use the enumerated value on the system with the alternative configuration. Fixes: f83d2f91d259 ("perf/x86/intel: Add Alder Lake Hybrid support") Reported-by: Jin Yao <yao.jin(a)linux.intel.com> Signed-off-by: Kan Liang <kan.liang(a)linux.intel.com> Cc: stable(a)vger.kernel.org --- The original post can be found at https://lkml.kernel.org/r/1623413662-18373-1-git-send-email-kan.liang@linux… arch/x86/events/intel/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 2521d03..d39991b 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -6157,8 +6157,13 @@ __init int intel_pmu_init(void) pmu = &x86_pmu.hybrid_pmu[X86_HYBRID_PMU_CORE_IDX]; pmu->name = "cpu_core"; pmu->cpu_type = hybrid_big; - pmu->num_counters = x86_pmu.num_counters + 2; - pmu->num_counters_fixed = x86_pmu.num_counters_fixed + 1; + if (cpu_feature_enabled(X86_FEATURE_HYBRID_CPU)) { + pmu->num_counters = x86_pmu.num_counters + 2; + pmu->num_counters_fixed = x86_pmu.num_counters_fixed + 1; + } else { + pmu->num_counters = x86_pmu.num_counters; + pmu->num_counters_fixed = x86_pmu.num_counters_fixed; + } pmu->max_pebs_events = min_t(unsigned, MAX_PEBS_EVENTS, pmu->num_counters); pmu->unconstrained = (struct event_constraint) __EVENT_CONSTRAINT(0, (1ULL << pmu->num_counters) - 1, -- 2.7.4

3 years, 4 months

2
1
0 0

[PATCH 2/3] perf/x86/intel: Add more events requires FRONTEND MSR on Sapphire Rapids

by kan.liang＠linux.intel.com

From: Kan Liang <kan.liang(a)linux.intel.com> On Sapphire Rapids, there are two more events 0x40ad and 0x04c2 which rely on the FRONTEND MSR. If the FRONTEND MSR is not set correctly, the count value is not correct. Update intel_spr_extra_regs[] to support them. Fixes: 61b985e3e775 ("perf/x86/intel: Add perf core PMU support for Sapphire Rapids") Signed-off-by: Kan Liang <kan.liang(a)linux.intel.com> Cc: stable(a)vger.kernel.org --- arch/x86/events/intel/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index d39991b..e442b55 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -280,6 +280,8 @@ static struct extra_reg intel_spr_extra_regs[] __read_mostly = { INTEL_UEVENT_EXTRA_REG(0x012b, MSR_OFFCORE_RSP_1, 0x3fffffffffull, RSP_1), INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd), INTEL_UEVENT_EXTRA_REG(0x01c6, MSR_PEBS_FRONTEND, 0x7fff17, FE), + INTEL_UEVENT_EXTRA_REG(0x40ad, MSR_PEBS_FRONTEND, 0x7, FE), + INTEL_UEVENT_EXTRA_REG(0x04c2, MSR_PEBS_FRONTEND, 0x8, FE), EVENT_EXTRA_END }; -- 2.7.4

3 years, 4 months

2
1
0 0

[PATCH 3/3] perf/x86/intel: Fix instructions:ppp support in Sapphire Rapids

by kan.liang＠linux.intel.com

From: Kan Liang <kan.liang(a)linux.intel.com> Perf errors out when sampling instructions:ppp. $ perf record -e instructions:ppp -- true Error: The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (instructions:ppp). The instruction PDIR is only available on the fixed counter 0. The event constraint has been updated to fixed0_constraint in icl_get_event_constraints(). The Sapphire Rapids codes unconditionally error out for the event which is not available on the GP counter 0. Make the instructions:ppp an exception. Fixes: 61b985e3e775 ("perf/x86/intel: Add perf core PMU support for Sapphire Rapids") Reported-by: Yasin, Ahmad <ahmad.yasin(a)intel.com> Signed-off-by: Kan Liang <kan.liang(a)linux.intel.com> Cc: stable(a)vger.kernel.org --- arch/x86/events/intel/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index e442b55..e355db5 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -4032,8 +4032,10 @@ spr_get_event_constraints(struct cpu_hw_events *cpuc, int idx, * The :ppp indicates the Precise Distribution (PDist) facility, which * is only supported on the GP counter 0. If a :ppp event which is not * available on the GP counter 0, error out. + * Exception: Instruction PDIR is only available on the fixed counter 0. */ - if (event->attr.precise_ip == 3) { + if ((event->attr.precise_ip == 3) && + !constraint_match(&fixed0_constraint, event->hw.config)) { if (c->idxmsk64 & BIT_ULL(0)) return &counter0_constraint; -- 2.7.4

3 years, 4 months

2
1
0 0

Linux 5.4.128

by Greg Kroah-Hartman

I'm announcing the release of the 5.4.128 kernel. All users of the 5.4 kernel series must upgrade. The updated 5.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/vm/slub.rst | 10 Makefile | 2 arch/arc/include/uapi/asm/sigcontext.h | 1 arch/arc/kernel/signal.c | 43 +++ arch/arm/boot/dts/dra7-l4.dtsi | 4 arch/arm/boot/dts/dra7.dtsi | 20 + arch/arm/mach-omap1/pm.c | 13 - arch/arm/mach-omap1/time.c | 10 arch/arm/mach-omap1/timer32k.c | 10 arch/arm/mach-omap2/board-generic.c | 4 arch/arm/mach-omap2/timer.c | 181 ++++++++++----- arch/x86/include/asm/fpu/internal.h | 13 - arch/x86/kernel/fpu/signal.c | 26 +- arch/x86/kvm/lapic.c | 3 arch/x86/kvm/x86.c | 5 drivers/clk/ti/clk-7xx.c | 1 drivers/dma/Kconfig | 1 drivers/dma/pl330.c | 6 drivers/dma/qcom/Kconfig | 1 drivers/dma/ste_dma40.c | 3 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 drivers/gpu/drm/radeon/radeon_uvd.c | 4 drivers/hwmon/scpi-hwmon.c | 9 drivers/net/can/usb/mcba_usb.c | 17 + drivers/net/ethernet/atheros/alx/main.c | 1 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 drivers/net/ethernet/ec_bhf.c | 4 drivers/net/ethernet/emulex/benet/be_main.c | 1 drivers/net/ethernet/freescale/fec_ptp.c | 8 drivers/net/ethernet/lantiq_xrx200.c | 5 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 3 drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 30 +- drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 8 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 drivers/net/ethernet/xilinx/ll_temac_main.c | 8 drivers/net/hamradio/mkiss.c | 1 drivers/net/usb/cdc_eem.c | 2 drivers/net/usb/cdc_ncm.c | 2 drivers/net/usb/smsc75xx.c | 10 drivers/net/vrf.c | 6 drivers/pci/controller/pci-aardvark.c | 59 +++- drivers/pci/quirks.c | 89 +++++++ drivers/ptp/ptp_clock.c | 6 drivers/spi/spi-stm32-qspi.c | 5 drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 2 drivers/usb/core/hub.c | 7 drivers/usb/dwc3/core.c | 2 drivers/usb/dwc3/debug.h | 3 drivers/usb/dwc3/debugfs.c | 21 - drivers/usb/dwc3/gadget.c | 3 fs/afs/main.c | 4 include/linux/cpuhotplug.h | 1 include/linux/mfd/rohm-bd70528.h | 4 include/linux/mlx5/transobj.h | 1 include/linux/ptp_clock_kernel.h | 2 include/linux/socket.h | 2 include/net/net_namespace.h | 7 include/uapi/linux/in.h | 3 kernel/trace/trace.c | 11 kernel/trace/trace_clock.c | 6 mm/memory-failure.c | 7 mm/slab_common.c | 3 mm/slub.c | 23 + net/batman-adv/bat_iv_ogm.c | 4 net/bridge/br_private.h | 4 net/bridge/br_vlan_tunnel.c | 38 +-- net/can/bcm.c | 62 ++++- net/can/j1939/transport.c | 54 +++- net/can/raw.c | 62 +++-- net/core/net_namespace.c | 12 net/core/rtnetlink.c | 8 net/ipv4/cipso_ipv4.c | 1 net/ipv4/icmp.c | 7 net/ipv4/igmp.c | 1 net/ipv4/udp.c | 10 net/ipv6/udp.c | 3 net/netfilter/nf_synproxy_core.c | 5 net/qrtr/qrtr.c | 2 net/rds/recv.c | 2 net/sched/act_ct.c | 21 + net/sched/sch_cake.c | 6 net/socket.c | 13 - net/unix/af_unix.c | 7 net/wireless/Makefile | 2 net/wireless/pmsr.c | 16 + sound/soc/codecs/rt5659.c | 26 +- tools/include/uapi/linux/in.h | 3 virt/kvm/arm/vgic/vgic-kvm-device.c | 4 95 files changed, 839 insertions(+), 319 deletions(-) Aleksander Jan Bajkowski (2): net: lantiq: disable interrupt before sheduling NAPI lantiq: net: fix duplicated skb in rx descriptor ring Andrew Lunn (1): usb: core: hub: Disable autosuspend for Cypress CY7C65632 Andrew Morton (1): mm/slub.c: include swab.h Antti Järvinen (1): PCI: Mark TI C667X to avoid bus reset Arnaldo Carvalho de Melo (1): tools headers UAPI: Sync linux/in.h copy with the kernel sources Avraham Stern (1): cfg80211: avoid double free of PMSR request Axel Lin (1): regulator: bd70528: Fix off-by-one for buck123 .n_voltages setting Aya Levin (1): net/mlx5e: Block offload of outer header csum for UDP tunnels Bumyong Lee (1): dmaengine: pl330: fix wrong usage of spinlock flags in dma_cyclc Changbin Du (1): net: make get_net_ns return error if NET_NS is disabled Chen Li (1): radeon: use memcpy_to/fromio for UVD fw upload Chengyang Fan (1): net: ipv4: fix memory leak in ip_mc_add1_src Chiqijun (1): PCI: Work around Huawei Intelligent NIC VF FLR erratum Christophe JAILLET (4): alx: Fix an error handling path in 'alx_probe()' qlcnic: Fix an error handling path in 'qlcnic_probe()' netxen_nic: Fix an error handling path in 'netxen_nic_probe()' be2net: Fix an error handling path in 'be_probe()' Dan Carpenter (1): afs: Fix an IS_ERR() vs NULL check Davide Caratti (1): net/mlx5e: allow TSO on VXLAN over VLAN topologies Dima Chumak (1): net/mlx5e: Fix page reclaim for dead peer hairpin Dongliang Mu (1): net: usb: fix possible use-after-free in smsc75xx_bind Eric Auger (1): KVM: arm/arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST read Eric Dumazet (1): net/af_unix: fix a data-race in unix_dgram_sendmsg / unix_release_sock Esben Haabendal (2): net: ll_temac: Make sure to free skb when it is completely used net: ll_temac: Fix TX BD buffer overwrite Fugang Duan (1): net: fec_ptp: add clock rate zero check Greg Kroah-Hartman (1): Linux 5.4.128 Huy Nguyen (1): net/mlx5e: Remove dependency in IPsec initialization flows Ido Schimmel (1): rtnetlink: Fix regression in bridge VLAN configuration Jack Pham (1): usb: dwc3: debugfs: Add and remove endpoint dirs dynamically Jack Yu (1): ASoC: rt5659: Fix the lost powers for the HDA header Jakub Kicinski (1): ptp: improve max_adj check against unreasonable values Jim Mattson (1): kvm: LAPIC: Restore guard to prevent illegal APIC register access Jisheng Zhang (1): net: stmmac: dwmac1000: Fix extended MAC address registers definition Joakim Zhang (2): net: fec_ptp: fix issue caused by refactor the fec_devtype net: stmmac: disable clocks in stmmac_remove_config_dt() Johannes Berg (1): cfg80211: make certificate generation more robust Kees Cook (2): mm/slub: clarify verification reporting mm/slub: fix redzoning for small allocations Linyu Yuan (1): net: cdc_eem: fix tx fixup skb leak Maciej Żenczykowski (1): net: cdc_ncm: switch to eth%d interface naming Maor Gottlieb (1): net/mlx5: Consider RoCE cap before init RDMA resources Marcelo Ricardo Leitner (1): net/sched: act_ct: handle DNAT tuple collision Maxim Mikityanskiy (2): netfilter: synproxy: Fix out of bounds when parsing TCP options sch_cake: Fix out of bounds when parsing TCP options and header Michael Chan (1): bnxt_en: Rediscover PHY capabilities after firmware reset Nanyong Sun (1): net: ipv4: fix memory leak in netlbl_cipsov4_add_std Nicolas Dichtel (1): vrf: fix maximum MTU Nikolay Aleksandrov (2): net: bridge: fix vlan tunnel dst null pointer dereference net: bridge: fix vlan tunnel dst refcnt when egressing Norbert Slusarek (1): can: bcm: fix infoleak in struct bcm_msg_head Oleksij Rempel (1): can: j1939: fix Use-after-Free, hold skb ref while in use Pali Rohár (1): PCI: aardvark: Fix kernel panic during PIO transfer Paolo Abeni (1): udp: fix race between close() and udp_abort() Patrice Chotard (1): spi: stm32-qspi: Always wait BUSY bit to be cleared in stm32_qspi_wait_cmd() Pavel Machek (1): cxgb4: fix wrong shift. Pavel Skripkin (5): net: rds: fix memory leak in rds_recvmsg net: qrtr: fix OOB Read in qrtr_endpoint_post net: hamradio: fix memory leak in mkiss_close net: ethernet: fix potential use-after-free in ec_bhf_remove can: mcba_usb: fix memory leak in mcba_usb Peter Chen (1): usb: dwc3: core: fix kernel panic when do reboot Randy Dunlap (2): dmaengine: ALTERA_MSGDMA depends on HAS_IOMEM dmaengine: QCOM_HIDMA_MGMT depends on HAS_IOMEM Remi Pommarel (1): PCI: aardvark: Don't rely on jiffies while holding spinlock Riwen Lu (1): hwmon: (scpi-hwmon) shows the negative temperature properly Sean Christopherson (1): KVM: x86: Immediately reset the MMU context when the SMM flag is cleared Sergio Paracuellos (1): pinctrl: ralink: rt2880: avoid to error in calls is pin is already enabled Shanker Donthineni (1): PCI: Mark some NVIDIA GPUs to avoid bus reset Somnath Kotur (1): bnxt_en: Call bnxt_ethtool_free() in bnxt_init_one() error path Sriharsha Basavapatna (1): PCI: Add ACS quirk for Broadcom BCM57414 NIC Steven Rostedt (VMware) (3): tracing: Do not stop recording cmdlines when tracing is off tracing: Do not stop recording comms if the trace file is being read tracing: Do no increment trace_clock_global() by one Sven Eckelmann (1): batman-adv: Avoid WARN_ON timing related checks Tetsuo Handa (1): can: bcm/raw/isotp: use per module netdevice notifier Thomas Gleixner (3): x86/process: Check PF_KTHREAD and not current->mm for kernel threads x86/pkru: Write hardware init value to PKRU when xstate is init x86/fpu: Reset state for all signal restore failures Toke Høiland-Jørgensen (1): icmp: don't send out ICMP messages with a source address of 0.0.0.0 Tony Lindgren (3): clocksource/drivers/timer-ti-dm: Add clockevent and clocksource support clocksource/drivers/timer-ti-dm: Prepare to handle dra7 timer wrap issue clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940 Vineet Gupta (1): ARCv2: save ABI registers across signal handling Yang Yingliang (1): dmaengine: stedma40: add missing iounmap() on error in d40_probe() Yifan Zhang (2): drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell. drm/amdgpu/gfx9: fix the doorbell missing when in CGPG issue. afzal mohammed (1): ARM: OMAP: replace setup_irq() by request_irq() yangerkun (1): mm/memory-failure: make sure wait for page writeback in memory_failure

3 years, 4 months

2
2
0 0

[net 2/2] can: peak_pciefd: pucan_handle_status(): fix a potential starvation issue in TX path

by Marc Kleine-Budde

From: Stephane Grosjean <s.grosjean(a)peak-system.com> Rather than just indicating that transmission can start, this patch requires the explicit flushing of the network TX queue when the driver is informed by the device that it can transmit, next to its configuration. In this way, if frames have already been written by the application, they will actually be transmitted. Fixes: ffd137f7043c ("can: peak/pcie_fd: remove useless code when interface starts") Link: https://lore.kernel.org/r/20210623142600.149904-1-s.grosjean@peak-system.com Cc: linux-stable <stable(a)vger.kernel.org> Signed-off-by: Stephane Grosjean <s.grosjean(a)peak-system.com> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/peak_canfd/peak_canfd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/peak_canfd/peak_canfd.c b/drivers/net/can/peak_canfd/peak_canfd.c index 00847cbaf7b6..d08718e98e11 100644 --- a/drivers/net/can/peak_canfd/peak_canfd.c +++ b/drivers/net/can/peak_canfd/peak_canfd.c @@ -351,8 +351,8 @@ static int pucan_handle_status(struct peak_canfd_priv *priv, return err; } - /* start network queue (echo_skb array is empty) */ - netif_start_queue(ndev); + /* wake network queue up (echo_skb array is empty) */ + netif_wake_queue(ndev); return 0; } -- 2.30.2

3 years, 4 months

1
0
0 0

Linux 5.10.46

by Greg Kroah-Hartman

I'm announcing the release of the 5.10.46 kernel. All users of the 5.10 kernel series must upgrade. The updated 5.10.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/vm/slub.rst | 10 - Makefile | 2 arch/arc/include/uapi/asm/sigcontext.h | 1 arch/arc/kernel/signal.c | 43 +++++ arch/s390/kernel/entry.S | 2 arch/x86/include/asm/fpu/internal.h | 13 + arch/x86/kernel/fpu/signal.c | 54 ++++-- arch/x86/kvm/lapic.c | 3 arch/x86/kvm/mmu/mmu.c | 26 +++ arch/x86/kvm/x86.c | 6 arch/x86/mm/ioremap.c | 4 arch/x86/mm/numa.c | 8 drivers/dma/Kconfig | 1 drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 3 drivers/dma/idxd/init.c | 1 drivers/dma/pl330.c | 6 drivers/dma/qcom/Kconfig | 1 drivers/dma/sf-pdma/Kconfig | 1 drivers/dma/ste_dma40.c | 3 drivers/dma/xilinx/xilinx_dpdma.c | 24 ++ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 drivers/gpu/drm/radeon/radeon_uvd.c | 4 drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 31 +++ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 5 drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 41 ++++- drivers/hwmon/scpi-hwmon.c | 9 + drivers/irqchip/irq-gic-v3.c | 36 ++++ drivers/net/can/usb/mcba_usb.c | 17 +- drivers/net/ethernet/atheros/alx/main.c | 1 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 48 ++++- drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 46 +++-- drivers/net/ethernet/ec_bhf.c | 4 drivers/net/ethernet/emulex/benet/be_main.c | 1 drivers/net/ethernet/freescale/fec_ptp.c | 8 drivers/net/ethernet/intel/ice/ice_lib.c | 18 +- drivers/net/ethernet/intel/ice/ice_main.c | 15 + drivers/net/ethernet/lantiq_xrx200.c | 5 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 10 - drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 6 drivers/net/ethernet/mellanox/mlx5/core/mr.c | 2 drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 3 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 17 +- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c | 17 +- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h | 6 drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 6 drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 30 ++- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 6 drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 drivers/net/ethernet/mscc/ocelot.c | 5 drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 15 + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 2 drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 89 +++++++++-- drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 3 drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 8 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 drivers/net/ethernet/xilinx/ll_temac_main.c | 8 drivers/net/hamradio/mkiss.c | 1 drivers/net/usb/cdc_eem.c | 2 drivers/net/usb/cdc_ncm.c | 2 drivers/net/usb/smsc75xx.c | 10 - drivers/net/vrf.c | 6 drivers/pci/controller/pci-aardvark.c | 49 ++++-- drivers/pci/quirks.c | 89 +++++++++++ drivers/phy/mediatek/phy-mtk-tphy.c | 2 drivers/platform/x86/thinkpad_acpi.c | 1 drivers/ptp/ptp_clock.c | 6 drivers/regulator/cros-ec-regulator.c | 3 drivers/regulator/rt4801-regulator.c | 4 drivers/regulator/rtmv20-regulator.c | 2 drivers/s390/crypto/ap_queue.c | 11 + drivers/spi/spi-stm32-qspi.c | 5 drivers/spi/spi-zynq-qspi.c | 7 drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 2 drivers/usb/chipidea/usbmisc_imx.c | 16 + drivers/usb/core/hub.c | 7 drivers/usb/dwc3/core.c | 2 drivers/usb/dwc3/debug.h | 3 drivers/usb/dwc3/debugfs.c | 21 -- drivers/usb/dwc3/gadget.c | 3 fs/afs/main.c | 4 fs/notify/fanotify/fanotify_user.c | 4 include/linux/mfd/rohm-bd70528.h | 4 include/linux/mlx5/transobj.h | 1 include/linux/mm_types.h | 27 ++- include/linux/ptp_clock_kernel.h | 2 include/linux/socket.h | 2 include/linux/swapops.h | 15 + include/net/mac80211.h | 7 include/net/net_namespace.h | 7 include/uapi/linux/in.h | 3 kernel/bpf/verifier.c | 68 +++++++- kernel/crash_core.c | 1 kernel/sched/fair.c | 10 - kernel/trace/trace.c | 11 - kernel/trace/trace_clock.c | 6 mm/memory-failure.c | 7 mm/slab_common.c | 3 mm/slub.c | 37 +--- mm/swapfile.c | 2 net/batman-adv/bat_iv_ogm.c | 4 net/bridge/br_private.h | 4 net/bridge/br_vlan_tunnel.c | 38 ++-- net/can/bcm.c | 62 ++++++- net/can/isotp.c | 61 +++++-- net/can/j1939/transport.c | 54 ++++-- net/can/raw.c | 62 +++++-- net/core/net_namespace.c | 12 + net/core/rtnetlink.c | 8 net/ethtool/strset.c | 2 net/ipv4/cipso_ipv4.c | 1 net/ipv4/icmp.c | 7 net/ipv4/igmp.c | 1 net/ipv4/route.c | 15 + net/ipv4/udp.c | 10 + net/ipv6/netfilter/nft_fib_ipv6.c | 22 ++ net/ipv6/udp.c | 3 net/mac80211/scan.c | 21 +- net/mac80211/tx.c | 52 ++++-- net/mptcp/options.c | 2 net/mptcp/protocol.c | 10 - net/mptcp/subflow.c | 10 - net/netfilter/nf_synproxy_core.c | 5 net/qrtr/qrtr.c | 2 net/rds/recv.c | 2 net/sched/act_ct.c | 21 +- net/sched/sch_cake.c | 6 net/socket.c | 13 - net/unix/af_unix.c | 7 net/wireless/Makefile | 2 net/wireless/pmsr.c | 16 + sound/soc/codecs/rt5659.c | 26 ++- sound/soc/codecs/rt5682-sdw.c | 3 sound/soc/codecs/tas2562.h | 14 - sound/soc/fsl/fsl-asoc-card.c | 1 sound/soc/qcom/lpass-cpu.c | 79 +++++++++ sound/soc/qcom/lpass.h | 4 tools/include/uapi/linux/in.h | 3 tools/lib/bpf/xsk.c | 2 tools/perf/trace/beauty/include/linux/socket.h | 2 tools/testing/selftests/net/fib_tests.sh | 25 +++ tools/testing/selftests/net/mptcp/mptcp_connect.sh | 11 - 150 files changed, 1512 insertions(+), 440 deletions(-) Aleksander Jan Bajkowski (2): net: lantiq: disable interrupt before sheduling NAPI lantiq: net: fix duplicated skb in rx descriptor ring Alex Elder (1): net: qualcomm: rmnet: don't over-count statistics Alexander Gordeev (1): s390/mcck: fix calculation of SIE critical section size Andrew Lunn (1): usb: core: hub: Disable autosuspend for Cypress CY7C65632 Andrew Morton (1): mm/slub.c: include swab.h Andy Lutomirski (1): x86/fpu: Invalidate FPU state after a failed XRSTOR from a user buffer Antti Järvinen (1): PCI: Mark TI C667X to avoid bus reset Arnaldo Carvalho de Melo (2): tools headers UAPI: Sync linux/in.h copy with the kernel sources perf beauty: Update copy of linux/socket.h with the kernel sources Avraham Stern (1): cfg80211: avoid double free of PMSR request Axel Lin (3): regulator: cros-ec: Fix error code in dev_err message regulator: bd70528: Fix off-by-one for buck123 .n_voltages setting regulator: rt4801: Fix NULL pointer dereference if priv->enable_gpios is NULL Aya Levin (2): net/mlx5e: Block offload of outer header csum for UDP tunnels net/mlx5: Reset mkey index on creation Breno Lima (1): usb: chipidea: imx: Fix Battery Charger 1.2 CDP detection Bumyong Lee (1): dmaengine: pl330: fix wrong usage of spinlock flags in dma_cyclc Changbin Du (1): net: make get_net_ns return error if NET_NS is disabled Chen Li (1): radeon: use memcpy_to/fromio for UVD fw upload Chengyang Fan (1): net: ipv4: fix memory leak in ip_mc_add1_src ChiYuan Huang (1): regulator: rtmv20: Fix to make regcache value first reading back from HW Chiqijun (1): PCI: Work around Huawei Intelligent NIC VF FLR erratum Christophe JAILLET (4): alx: Fix an error handling path in 'alx_probe()' qlcnic: Fix an error handling path in 'qlcnic_probe()' netxen_nic: Fix an error handling path in 'netxen_nic_probe()' be2net: Fix an error handling path in 'be_probe()' Dan Carpenter (1): afs: Fix an IS_ERR() vs NULL check Daniel Borkmann (3): bpf: Fix leakage under speculation on mispredicted branches bpf: Inherit expanded/patched seen count from old aux data bpf: Do not mark insn as seen under speculative path verification Dave Jiang (1): dmaengine: idxd: add missing dsa driver unregister David Ahern (1): ipv4: Fix device used for dst_alloc with local routes Dima Chumak (1): net/mlx5e: Fix page reclaim for dead peer hairpin Dongliang Mu (1): net: usb: fix possible use-after-free in smsc75xx_bind Du Cheng (1): mac80211: fix skb length check in ieee80211_scan_rx() Eric Dumazet (1): net/af_unix: fix a data-race in unix_dgram_sendmsg / unix_release_sock Esben Haabendal (2): net: ll_temac: Make sure to free skb when it is completely used net: ll_temac: Fix TX BD buffer overwrite Fan Du (1): x86/mm: Avoid truncating memblocks for SGX memory Feng Tang (1): mm: relocate 'write_protect_seq' in struct mm_struct Florian Westphal (1): netfilter: nft_fib_ipv6: skip ipv6 packets from any to link-local Fugang Duan (1): net: fec_ptp: add clock rate zero check Greg Kroah-Hartman (1): Linux 5.10.46 Harald Freudenberger (1): s390/ap: Fix hanging ioctl caused by wrong msg counter Huy Nguyen (1): net/mlx5e: Remove dependency in IPsec initialization flows Ido Schimmel (1): rtnetlink: Fix regression in bridge VLAN configuration Jack Pham (1): usb: dwc3: debugfs: Add and remove endpoint dirs dynamically Jack Yu (1): ASoC: rt5659: Fix the lost powers for the HDA header Jakub Kicinski (2): ethtool: strset: fix message length calculation ptp: improve max_adj check against unreasonable values Jim Mattson (1): kvm: LAPIC: Restore guard to prevent illegal APIC register access Jisheng Zhang (1): net: stmmac: dwmac1000: Fix extended MAC address registers definition Joakim Zhang (2): net: fec_ptp: fix issue caused by refactor the fec_devtype net: stmmac: disable clocks in stmmac_remove_config_dt() Johannes Berg (1): cfg80211: make certificate generation more robust Kees Cook (3): mm/slub: clarify verification reporting mm/slub: fix redzoning for small allocations mm/slub: actually fix freelist pointer vs redzoning Kev Jackson (1): libbpf: Fixes incorrect rx_ring_setup_done Linyu Yuan (1): net: cdc_eem: fix tx fixup skb leak Maciej Fijalkowski (2): ice: add ndo_bpf callback for safe mode netdev ops ice: parameterize functions responsible for Tx ring management Maciej Żenczykowski (1): net: cdc_ncm: switch to eth%d interface naming Maor Gottlieb (2): net/mlx5: Consider RoCE cap before init RDMA resources net/mlx5: DR, Don't use SW steering when RoCE is not supported Marc Zyngier (1): irqchip/gic-v3: Workaround inconsistent PMR setting on NMI entry Marcelo Ricardo Leitner (1): net/sched: act_ct: handle DNAT tuple collision Mathy Vanhoef (1): mac80211: Fix NULL ptr deref for injected rate info Matthew Bobrowski (1): fanotify: fix copy_event_to_user() fid error clean up Maxim Mikityanskiy (3): netfilter: synproxy: Fix out of bounds when parsing TCP options mptcp: Fix out of bounds when parsing TCP options sch_cake: Fix out of bounds when parsing TCP options and header Michael Chan (1): bnxt_en: Rediscover PHY capabilities after firmware reset Mykola Kostenok (1): mlxsw: core: Set thermal zone polling delay argument to real value at init Nanyong Sun (1): net: ipv4: fix memory leak in netlbl_cipsov4_add_std Nicolas Cavallari (1): ASoC: fsl-asoc-card: Set .owner attribute when registering card. Nicolas Dichtel (1): vrf: fix maximum MTU Nikolay Aleksandrov (2): net: bridge: fix vlan tunnel dst null pointer dereference net: bridge: fix vlan tunnel dst refcnt when egressing Norbert Slusarek (1): can: bcm: fix infoleak in struct bcm_msg_head Oder Chiou (1): ASoC: rt5682: Fix the fast discharge for headset unplugging in soundwire mode Oleksij Rempel (1): can: j1939: fix Use-after-Free, hold skb ref while in use Pali Rohár (1): PCI: aardvark: Fix kernel panic during PIO transfer Paolo Abeni (4): udp: fix race between close() and udp_abort() mptcp: try harder to borrow memory from subflow under pressure mptcp: do not warn on bad input from the network selftests: mptcp: enable syncookie only in absence of reorders Parav Pandit (2): net/mlx5: E-Switch, Read PF mac address net/mlx5: E-Switch, Allow setting GUID for host PF vport Patrice Chotard (1): spi: stm32-qspi: Always wait BUSY bit to be cleared in stm32_qspi_wait_cmd() Pavel Machek (1): cxgb4: fix wrong shift. Pavel Skripkin (5): net: rds: fix memory leak in rds_recvmsg net: qrtr: fix OOB Read in qrtr_endpoint_post net: hamradio: fix memory leak in mkiss_close net: ethernet: fix potential use-after-free in ec_bhf_remove can: mcba_usb: fix memory leak in mcba_usb Peter Chen (1): usb: dwc3: core: fix kernel panic when do reboot Peter Xu (1): mm/swap: fix pte_same_as_swp() not removing uffd-wp bit when compare Petr Machata (1): mlxsw: reg: Spectrum-3: Enforce lowest max-shaper burst size of 11 Pingfan Liu (1): crash_core, vmcoreinfo: append 'SECTION_SIZE_BITS' to vmcoreinfo Quanyang Wang (1): dmaengine: xilinx: dpdma: initialize registers before request_irq Rahul Lakkireddy (4): cxgb4: fix endianness when flashing boot image cxgb4: fix sleep in atomic when flashing PHY firmware cxgb4: halt chip before flashing PHY firmware image cxgb4: fix wrong ethtool n-tuple rule lookup Randy Dunlap (3): dmaengine: ALTERA_MSGDMA depends on HAS_IOMEM dmaengine: QCOM_HIDMA_MGMT depends on HAS_IOMEM dmaengine: SF_PDMA depends on HAS_IOMEM Richard Weinberger (1): ASoC: tas2562: Fix TDM_CFG0_SAMPRATE values Riwen Lu (1): hwmon: (scpi-hwmon) shows the negative temperature properly Rukhsana Ansari (1): bnxt_en: Fix TQM fastpath ring backing store computation Saravana Kannan (1): drm/sun4i: dw-hdmi: Make HDMI PHY into a platform device Sean Christopherson (2): KVM: x86: Immediately reset the MMU context when the SMM flag is cleared KVM: x86/mmu: Calculate and check "full" mmu_role for nested MMU Sergio Paracuellos (1): pinctrl: ralink: rt2880: avoid to error in calls is pin is already enabled Shanker Donthineni (1): PCI: Mark some NVIDIA GPUs to avoid bus reset Somnath Kotur (1): bnxt_en: Call bnxt_ethtool_free() in bnxt_init_one() error path Sriharsha Basavapatna (1): PCI: Add ACS quirk for Broadcom BCM57414 NIC Srinivasa Rao Mandadapu (1): ASoC: qcom: lpass-cpu: Fix pop noise during audio capture begin Steven Rostedt (VMware) (3): tracing: Do not stop recording cmdlines when tracing is off tracing: Do not stop recording comms if the trace file is being read tracing: Do no increment trace_clock_global() by one Subash Abhinov Kasiviswanathan (1): net: qualcomm: rmnet: Update rmnet device MTU based on real device Sven Eckelmann (1): batman-adv: Avoid WARN_ON timing related checks Tetsuo Handa (1): can: bcm/raw/isotp: use per module netdevice notifier Thomas Gleixner (4): x86/process: Check PF_KTHREAD and not current->mm for kernel threads x86/pkru: Write hardware init value to PKRU when xstate is init x86/fpu: Prevent state corruption in __fpu__restore_sig() x86/fpu: Reset state for all signal restore failures Tiezhu Yang (1): phy: phy-mtk-tphy: Fix some resource leaks in mtk_phy_init() Til Jasper Ullrich (1): platform/x86: thinkpad_acpi: Add X1 Carbon Gen 9 second fan support Toke Høiland-Jørgensen (1): icmp: don't send out ICMP messages with a source address of 0.0.0.0 Tom Lendacky (1): x86/ioremap: Map EFI-reserved memory as encrypted for SEV Vincent Guittot (1): sched/pelt: Ensure that *_sum is always synced with *_avg Vineet Gupta (1): ARCv2: save ABI registers across signal handling Vladimir Oltean (1): net: dsa: felix: re-enable TX flow control in ocelot_port_flush() Wanpeng Li (1): KVM: X86: Fix x86_emulator slab cache leak Yang Yingliang (1): dmaengine: stedma40: add missing iounmap() on error in d40_probe() Yevgeny Kliteynik (1): net/mlx5: DR, Allow SW steering for sw_owner_v2 devices Yifan Zhang (2): drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell. drm/amdgpu/gfx9: fix the doorbell missing when in CGPG issue. Zhen Lei (1): dmaengine: fsl-dpaa2-qdma: Fix error return code in two functions yangerkun (1): mm/memory-failure: make sure wait for page writeback in memory_failure zpershuai (1): spi: spi-zynq-qspi: Fix some wrong goto jumps & missing error code

3 years, 4 months

2
2
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2021