February 2020 - Linux-stable-mirror

[PATCH] mtd: spi-nor: Fixup page size for S25FS-S

by Alexander X Sverdlin

From: Alexander Sverdlin <alexander.sverdlin(a)nokia.com> Spansion S25FS-S family has an issue in Basic Flash Parameter Table: DWORD-11 bits 7-4 specify write page size 512 bytes. In reality this is configurable in the non-volatile CR3NV register and even factory default configuration is "wrap at 256 bytes". So blind relying on BFPT breaks write operation on these Flashes. All this story is vendor-specific, so add the corresponding fixup hook which first restores the safe page size of 256 bytes from struct flash_info but checks is more performant 512 bytes configuration is active and adjusts the page_size accordingly. Cc: stable(a)vger.kernel.org Fixes: f384b352c ("mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables") Signed-off-by: Alexander Sverdlin <alexander.sverdlin(a)nokia.com> --- drivers/mtd/spi-nor/spi-nor.c | 39 +++++++++++++++++++++++++++++++++++++-- include/linux/mtd/spi-nor.h | 5 +++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 73172d7..18f8705 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1711,6 +1711,39 @@ static struct spi_nor_fixups mx25l25635_fixups = { .post_bfpt = mx25l25635_post_bfpt_fixups, }; +/* Spansion S25FS-S SFDP workarounds */ +static int s25fs_s_post_bfpt_fixups(struct spi_nor *nor, + const struct sfdp_parameter_header *bfpt_header, + const struct sfdp_bfpt *bfpt, + struct spi_nor_flash_parameter *params) +{ + const struct flash_info *info = nor->info; + u8 read_opcode, buf; + int ret; + + /* Default is safe */ + params->page_size = info->page_size; + + /* + * But is the chip configured for more performant 512 bytes write page + * size? + */ + read_opcode = nor->read_opcode; + + nor->read_opcode = SPINOR_OP_RDAR; + ret = nor->read(nor, SPINOR_REG_CR3V, 1, &buf); + if (!ret && (buf & CR3V_02H_V)) + params->page_size = 512; + + nor->read_opcode = read_opcode; + + return ret; +} + +static const struct spi_nor_fixups s25fs_s_fixups = { + .post_bfpt = s25fs_s_post_bfpt_fixups, +}; + /* NOTE: double check command sets and memory organization when you add * more nor chips. This current list focusses on newer chips, which * have been converging on command sets which including JEDEC ID. @@ -1903,7 +1936,8 @@ static const struct flash_info spi_nor_ids[] = { SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, { "s25fl128s1", INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, - { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, USE_CLSR) }, + { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, USE_CLSR) + .fixups = &s25fs_s_fixups, }, { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, { "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | @@ -1913,7 +1947,8 @@ static const struct flash_info spi_nor_ids[] = { { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) }, { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) }, { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, - { "s25fl129p1", INFO(0x012018, 0x4d01, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, + { "s25fl129p1", INFO(0x012018, 0x4d01, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) + .fixups = &s25fs_s_fixups, }, { "s25sl004a", INFO(0x010212, 0, 64 * 1024, 8, 0) }, { "s25sl008a", INFO(0x010213, 0, 64 * 1024, 16, 0) }, { "s25sl016a", INFO(0x010214, 0, 64 * 1024, 32, 0) }, diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index b3d360b..222eee9 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -114,6 +114,7 @@ /* Used for Spansion flashes only. */ #define SPINOR_OP_BRWR 0x17 /* Bank register write */ #define SPINOR_OP_CLSR 0x30 /* Clear status register 1 */ +#define SPINOR_OP_RDAR 0x65 /* Read Any Register */ /* Used for Micron flashes only. */ #define SPINOR_OP_RD_EVCR 0x65 /* Read EVCR register */ @@ -149,6 +150,10 @@ /* Status Register 2 bits. */ #define SR2_QUAD_EN_BIT7 BIT(7) +/* Used for Spansion flashes RDAR command only. */ +#define SPINOR_REG_CR3V 0x800004 +#define CR3V_02H_V BIT(4) /* Page Buffer Wrap */ + /* Supported SPI protocols */ #define SNOR_PROTO_INST_MASK GENMASK(23, 16) #define SNOR_PROTO_INST_SHIFT 16 -- 2.4.6

4 years, 10 months

3
3
0 0

[PATCH 1/2] 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 | 158 ++++++++++++++------- drivers/gpu/drm/panfrost/panfrost_mmu.h | 5 +- 6 files changed, 135 insertions(+), 110 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index 06713811b92c..3f19288e8375 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -94,8 +94,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; @@ -106,9 +110,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 273d67e251c2..41e574742a3c 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -418,7 +418,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; } @@ -450,32 +450,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) { @@ -490,15 +464,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) @@ -507,9 +477,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; } @@ -522,8 +491,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 17b654e1eb94..406e595f99e4 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_unlocked(&mapping->obj->base.base); + panfrost_mmu_ctx_put(mapping->mmu); kfree(mapping); } @@ -145,11 +143,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; @@ -178,7 +176,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 4d383831c1fc..b0716e49eeca 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -154,7 +154,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); panfrost_devfreq_record_busy(pfdev); job_write(pfdev, JS_HEAD_NEXT_LO(js), jc_head & 0xFFFFFFFF); @@ -481,7 +481,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); 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 763cfca886a7..f70d5a75cbd5 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> @@ -332,7 +335,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 } @@ -354,56 +357,10 @@ static const struct iommu_flush_ops mmu_tlb_ops = { .tlb_flush_leaf = mmu_tlb_flush_leaf, }; -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), - .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; @@ -416,11 +373,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); @@ -430,7 +386,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; @@ -537,6 +493,106 @@ 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), + .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.24.1

4 years, 10 months

3
5
0 0

RE: [PATCH v2 2/8] ima: Switch to ima_hash_algo for boot aggregate

by Roberto Sassu

> -----Original Message----- > From: Sasha Levin [mailto:sashal@kernel.org] > Sent: Wednesday, February 5, 2020 3:45 PM > To: Sasha Levin <sashal(a)kernel.org>; Roberto Sassu > <roberto.sassu(a)huawei.com>; zohar(a)linux.ibm.com; > James.Bottomley(a)HansenPartnership.com > Cc: linux-integrity(a)vger.kernel.org; stable(a)vger.kernel.org; > stable(a)vger.kernel.org > Subject: Re: [PATCH v2 2/8] ima: Switch to ima_hash_algo for boot > aggregate > > Hi, > > [This is an automated email] > > This commit has been processed because it contains a -stable tag. > The stable tag indicates that it's relevant for the following trees: all > > The bot has tested the following trees: v5.5.1, v5.4.17, v4.19.101, v4.14.169, > v4.9.212, v4.4.212. > > v5.5.1: Build OK! > v5.4.17: Build OK! > v4.19.101: Failed to apply! Possible dependencies: > 100b16a6f290 ("tpm: sort objects in the Makefile") > 1ad6640cd614 ("tpm: move tpm1_pcr_extend to tpm1-cmd.c") > 70a3199a7101 ("tpm: factor out tpm_get_timeouts()") > 879b589210a9 ("tpm: retrieve digest size of unknown algorithms with PCR > read") Hi Sasha this patch is necessary. However, backporting it won't be that easy as it was part of a patch set. Before this patch, users of the TPM driver could only read the SHA1 PCR bank. The IMA patch needs to read also other PCR banks. > NOTE: The patch will not be queued to stable trees until it is upstream. > > How should we proceed with this patch? This question should be for Jarkko (added in CC), as some patches for the TPM driver must be backported to apply the IMA patch. Roberto HUAWEI TECHNOLOGIES Duesseldorf GmbH, HRB 56063 Managing Director: Li Peng, Li Jian, Shi Yanli

4 years, 10 months

1
0
0 0

[PATCH v2 2/3] x86/tsc_msr: Fix MSR_FSB_FREQ mask for Cherry Trail devices

by Hans de Goede

According to the "Intel 64 and IA-32 Architectures Software Developer’s Manual Volume 4: Model-Specific Registers" on Cherry Trail (Airmont) devices the 4 lowest bits of the MSR_FSB_FREQ mask indicate the bus freq unlike on e.g. Bay Trail where only the lowest 3 bits are used. This is also the reason why MAX_NUM_FREQS is defined as 9, since Cherry Trail SoCs have 9 possible frequencies, so we need to mask the lo value from the MSR with 0x0f, not with 0x07 otherwise the 9th frequency will get interpreted as the 1st. This commits bumps MAX_NUM_FREQS to 16 to avoid any possibility of addressing the array out of bounds and makes the mask part of the cpufreq struct so that we can set it per model. While at it also log an error when the index points to an uninitialized part of the freqs lookup-table. Cc: stable(a)vger.kernel.org Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/x86/kernel/tsc_msr.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c index 5fa41ac3feb1..95030895fffa 100644 --- a/arch/x86/kernel/tsc_msr.c +++ b/arch/x86/kernel/tsc_msr.c @@ -15,7 +15,7 @@ #include <asm/param.h> #include <asm/tsc.h> -#define MAX_NUM_FREQS 9 +#define MAX_NUM_FREQS 16 /* 4 bits to select the frequency */ /* * If MSR_PERF_STAT[31] is set, the maximum resolved bus ratio can be @@ -27,6 +27,7 @@ struct freq_desc { bool use_msr_plat; u32 freqs[MAX_NUM_FREQS]; + u32 mask; }; /* @@ -37,37 +38,44 @@ struct freq_desc { static const struct freq_desc freq_desc_pnw = { .use_msr_plat = false, .freqs = { 0, 0, 0, 0, 0, 99840, 0, 83200 }, + .mask = 0x07, }; static const struct freq_desc freq_desc_clv = { .use_msr_plat = false, .freqs = { 0, 133200, 0, 0, 0, 99840, 0, 83200 }, + .mask = 0x07, }; static const struct freq_desc freq_desc_byt = { .use_msr_plat = true, .freqs = { 83300, 100000, 133300, 116700, 80000, 0, 0, 0 }, + .mask = 0x07, }; static const struct freq_desc freq_desc_cht = { .use_msr_plat = true, .freqs = { 83300, 100000, 133300, 116700, 80000, 93300, 90000, 88900, 87500 }, + .mask = 0x0f, }; static const struct freq_desc freq_desc_tng = { .use_msr_plat = true, .freqs = { 0, 100000, 133300, 0, 0, 0, 0, 0 }, + .mask = 0x07, }; static const struct freq_desc freq_desc_ann = { .use_msr_plat = true, .freqs = { 83300, 100000, 133300, 100000, 0, 0, 0, 0 }, + .mask = 0x0f, }; static const struct freq_desc freq_desc_lgm = { .use_msr_plat = true, .freqs = { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 }, + .mask = 0x0f, }; static const struct x86_cpu_id tsc_msr_cpu_ids[] = { @@ -93,6 +101,7 @@ unsigned long cpu_khz_from_msr(void) const struct freq_desc *freq_desc; const struct x86_cpu_id *id; unsigned long res; + int index; id = x86_match_cpu(tsc_msr_cpu_ids); if (!id) @@ -109,13 +118,17 @@ unsigned long cpu_khz_from_msr(void) /* Get FSB FREQ ID */ rdmsr(MSR_FSB_FREQ, lo, hi); + index = lo & freq_desc->mask; /* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */ - freq = freq_desc->freqs[lo & 0x7]; + freq = freq_desc->freqs[index]; /* TSC frequency = maximum resolved freq * maximum resolved bus ratio */ res = freq * ratio; + if (freq == 0) + pr_err("Error MSR_FSB_FREQ index %d is unknown\n", index); + #ifdef CONFIG_X86_LOCAL_APIC lapic_timer_period = (freq * 1000) / HZ; #endif -- 2.24.1

4 years, 10 months

1
0
0 0

[PATCH v2 1/3] x86/tsc_msr: Use named struct initializers

by Hans de Goede

Use named struct initializers for the freq_desc struct-s initialization and change the "u8 msr_plat" to a "bool use_msr_plat" to make its meaning more clear instead of relying on a comment to explain it. Cc: stable(a)vger.kernel.org Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/x86/kernel/tsc_msr.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c index e0cbe4f2af49..5fa41ac3feb1 100644 --- a/arch/x86/kernel/tsc_msr.c +++ b/arch/x86/kernel/tsc_msr.c @@ -22,10 +22,10 @@ * read in MSR_PLATFORM_ID[12:8], otherwise in MSR_PERF_STAT[44:40]. * Unfortunately some Intel Atom SoCs aren't quite compliant to this, * so we need manually differentiate SoC families. This is what the - * field msr_plat does. + * field use_msr_plat does. */ struct freq_desc { - u8 msr_plat; /* 1: use MSR_PLATFORM_INFO, 0: MSR_IA32_PERF_STATUS */ + bool use_msr_plat; u32 freqs[MAX_NUM_FREQS]; }; @@ -35,31 +35,39 @@ struct freq_desc { * by MSR based on SDM. */ static const struct freq_desc freq_desc_pnw = { - 0, { 0, 0, 0, 0, 0, 99840, 0, 83200 } + .use_msr_plat = false, + .freqs = { 0, 0, 0, 0, 0, 99840, 0, 83200 }, }; static const struct freq_desc freq_desc_clv = { - 0, { 0, 133200, 0, 0, 0, 99840, 0, 83200 } + .use_msr_plat = false, + .freqs = { 0, 133200, 0, 0, 0, 99840, 0, 83200 }, }; static const struct freq_desc freq_desc_byt = { - 1, { 83300, 100000, 133300, 116700, 80000, 0, 0, 0 } + .use_msr_plat = true, + .freqs = { 83300, 100000, 133300, 116700, 80000, 0, 0, 0 }, }; static const struct freq_desc freq_desc_cht = { - 1, { 83300, 100000, 133300, 116700, 80000, 93300, 90000, 88900, 87500 } + .use_msr_plat = true, + .freqs = { 83300, 100000, 133300, 116700, 80000, 93300, 90000, + 88900, 87500 }, }; static const struct freq_desc freq_desc_tng = { - 1, { 0, 100000, 133300, 0, 0, 0, 0, 0 } + .use_msr_plat = true, + .freqs = { 0, 100000, 133300, 0, 0, 0, 0, 0 }, }; static const struct freq_desc freq_desc_ann = { - 1, { 83300, 100000, 133300, 100000, 0, 0, 0, 0 } + .use_msr_plat = true, + .freqs = { 83300, 100000, 133300, 100000, 0, 0, 0, 0 }, }; static const struct freq_desc freq_desc_lgm = { - 1, { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 } + .use_msr_plat = true, + .freqs = { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 }, }; static const struct x86_cpu_id tsc_msr_cpu_ids[] = { @@ -91,7 +99,7 @@ unsigned long cpu_khz_from_msr(void) return 0; freq_desc = (struct freq_desc *)id->driver_data; - if (freq_desc->msr_plat) { + if (freq_desc->use_msr_plat) { rdmsr(MSR_PLATFORM_INFO, lo, hi); ratio = (lo >> 8) & 0xff; } else { -- 2.24.1

4 years, 10 months

1
0
0 0

Re: [PATCH] Btrfs: fix race between using extent maps and merging them

by Sasha Levin

Hi, [This is an automated email] This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: 4.4+ The bot has tested the following trees: v5.5.1, v5.4.17, v4.19.101, v4.14.169, v4.9.212, v4.4.212. v5.5.1: Build OK! v5.4.17: Build OK! v4.19.101: Build OK! v4.14.169: Build OK! v4.9.212: Build failed! Errors: fs/btrfs/extent_map.c:238:6: error: implicit declaration of function ‘refcount_read’ [-Werror=implicit-function-declaration] v4.4.212: Build failed! Errors: fs/btrfs/extent_map.c:238:6: error: implicit declaration of function ‘refcount_read’ [-Werror=implicit-function-declaration] NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks, Sasha

4 years, 10 months

1
0
0 0

Linux 4.9.213

by Greg KH

I'm announcing the release of the 4.9.213 kernel. All users of the 4.9 kernel series must upgrade. The updated 4.9.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.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 ------------ Makefile | 2 arch/arc/plat-eznps/Kconfig | 2 arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 21 + arch/arm64/boot/Makefile | 2 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi | 1 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi | 1 crypto/af_alg.c | 6 crypto/pcrypt.c | 3 drivers/atm/eni.c | 4 drivers/char/ttyprintk.c | 15 drivers/clk/mmp/clk-of-mmp2.c | 2 drivers/gpio/Kconfig | 1 drivers/iio/gyro/st_gyro.h | 1 drivers/iio/gyro/st_gyro_core.c | 210 +++------- drivers/iio/gyro/st_gyro_i2c.c | 5 drivers/iio/gyro/st_gyro_spi.c | 1 drivers/media/radio/si470x/radio-si470x-i2c.c | 2 drivers/media/usb/dvb-usb/af9005.c | 2 drivers/media/usb/dvb-usb/digitv.c | 10 drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 drivers/media/usb/gspca/gspca.c | 2 drivers/net/ethernet/broadcom/b44.c | 9 drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 3 drivers/net/ethernet/chelsio/cxgb4/l2t.c | 3 drivers/net/ethernet/freescale/fman/fman_memac.c | 4 drivers/net/ethernet/freescale/xgmac_mdio.c | 7 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 37 + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 drivers/net/ethernet/natsemi/sonic.c | 109 ++++- drivers/net/ethernet/natsemi/sonic.h | 25 - drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 1 drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 2 drivers/net/usb/r8152.c | 9 drivers/net/wan/sdla.c | 2 drivers/net/wireless/ath/ath9k/hif_usb.c | 2 drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 4 drivers/net/wireless/cisco/airo.c | 20 drivers/net/wireless/intersil/orinoco/orinoco_usb.c | 4 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 drivers/net/wireless/rsi/rsi_91x_usb.c | 2 drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 drivers/scsi/fnic/fnic_scsi.c | 3 drivers/soc/ti/wkup_m3_ipc.c | 4 drivers/staging/most/aim-network/networking.c | 10 drivers/staging/vt6656/device.h | 2 drivers/staging/vt6656/int.c | 6 drivers/staging/vt6656/main_usb.c | 1 drivers/staging/vt6656/rxtx.c | 26 - drivers/staging/wlan-ng/prism2mgmt.c | 2 drivers/tty/serial/8250/8250_bcm2835aux.c | 2 drivers/usb/dwc3/core.c | 3 drivers/usb/serial/ir-usb.c | 136 ++++-- drivers/usb/storage/unusual_uas.h | 7 drivers/watchdog/rn5t618_wdt.c | 1 fs/btrfs/super.c | 10 fs/namei.c | 4 fs/reiserfs/super.c | 2 include/linux/usb/irda.h | 13 mm/mempolicy.c | 6 net/bluetooth/hci_sock.c | 3 net/core/utils.c | 20 net/ipv4/ip_vti.c | 13 net/ipv6/ip6_vti.c | 13 net/mac80211/mesh_hwmp.c | 3 net/mac80211/tkip.c | 18 net/sched/ematch.c | 3 net/wireless/reg.c | 13 net/wireless/wext-core.c | 3 sound/core/pcm_native.c | 2 tools/include/linux/string.h | 8 tools/lib/string.c | 7 87 files changed, 591 insertions(+), 316 deletions(-) Al Viro (1): vfs: fix do_last() regression Andreas Kemnade (1): watchdog: rn5t618_wdt: fix module aliases Andrey Shvetsov (1): staging: most: net: fix buffer overflow Arnd Bergmann (2): atm: eni: fix uninitialized variable warning wireless: wext: avoid gcc -O3 warning Bin Liu (1): usb: dwc3: turn off VBUS when leaving host mode Cambda Zhu (1): ixgbe: Fix calculation of queue with VFs and flow director on interface flap Colin Ian King (1): staging: wlan-ng: ensure error return is actually returned Dan Carpenter (2): mm/mempolicy.c: fix out of bounds write in mpol_parse_str() Bluetooth: Fix race condition in hci_release_sock() Dave Gerlach (1): soc: ti: wkup_m3_ipc: Fix race condition with rproc_boot Dirk Behme (1): arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean' Dmitry Osipenko (1): gpio: max77620: Add missing dependency on GPIOLIB_IRQCHIP Eric Dumazet (1): net_sched: ematch: reject invalid TCF_EM_SIMPLE Fenghua Yu (1): drivers/net/b44: Change to non-atomic bit operations on pwol_mask Finn Thain (4): net/sonic: Add mutual exclusion for accessing shared state net/sonic: Use MMIO accessors net/sonic: Fix receive buffer handling net/sonic: Quiesce SONIC before re-initializing descriptor memory Ganapathi Bhat (1): wireless: fix enabling channel 12 for custom regulatory domain Greg Kroah-Hartman (1): Linux 4.9.213 Hannes Reinecke (1): scsi: fnic: do not queue commands during fwreset Hans Verkuil (2): media: gspca: zero usb_buf media: dvb-usb/dvb-usb-urb.c: initialize actlen to 0 Hayes Wang (1): r8152: get default setting of WOL before initializing Herbert Xu (2): crypto: af_alg - Use bh_lock_sock in sk_destruct crypto: pcrypt - Fix user-after-free on module unload Jan Kara (1): reiserfs: Fix memory leak of journal device string Johan Hovold (9): orinoco_usb: fix interface sanity check rsi_91x_usb: fix interface sanity check USB: serial: ir-usb: add missing endpoint sanity check USB: serial: ir-usb: fix link-speed handling USB: serial: ir-usb: fix IrLAP framing ath9k: fix storage endpoint lookup brcmfmac: fix interface sanity check rtl8xxxu: fix interface sanity check zd1211rw: fix storage endpoint lookup Josef Bacik (1): btrfs: do not zero f_bavail if we have available space Jouni Malinen (1): mac80211: Fix TKIP replay protection immediately after key setup Kishon Vijay Abraham I (1): ARM: dts: beagle-x15-common: Model 5V0 regulator Krzysztof Kozlowski (1): net: wan: sdla: Fix cast from pointer to integer of different size Laura Abbott (1): usb-storage: Disable UAS on JMicron SATA enclosure Lee Jones (1): media: si470x-i2c: Move free() past last use of 'radio' Linus Walleij (1): iio: gyro: st_gyro: inline per-sensor data Lorenzo Bianconi (1): iio: gyro: st_gyro: fix L3GD20H support Lubomir Rintel (1): clk: mmp2: Fix the order of timer mux parents Lukas Wunner (1): serial: 8250_bcm2835aux: Fix line mismatch on driver unbind Madalin Bucur (3): powerpc/fsl/dts: add fsl,erratum-a011043 net/fsl: treat fsl,erratum-a011043 net: fsl/fman: rename IF_MODE_XGMII to IF_MODE_10G Malcolm Priestley (3): staging: vt6656: correct packet types for CTS protect, mode. staging: vt6656: use NULLFUCTION stack on mac80211 staging: vt6656: Fix false Tx excessive retries reporting. Manish Chopra (1): qlcnic: Fix CPU soft lockup while collecting firmware dump Markus Theil (1): mac80211: mesh: restrict airtime metric to peered established plinks Michael Ellerman (2): airo: Fix possible info leak in AIROOLDIOCTL/SIOCDEVPRIVATE airo: Add missing CAP_NET_ADMIN check in AIROOLDIOCTL/SIOCDEVPRIVATE Nicolas Dichtel (1): vti[6]: fix packet tx through bpf_redirect() Praveen Chaudhary (1): net: Fix skb->csum update in inet_proto_csum_replace16(). Radoslaw Tyl (1): ixgbevf: Remove limit of 10 entries for unicast filter list Randy Dunlap (1): arc: eznps: fix allmodconfig kconfig warning Sean Young (2): media: digitv: don't continue if remote control state can't be read media: af9005: uninitialized variable printked Takashi Iwai (1): ALSA: pcm: Add missing copy ops check before clearing buffer Vasily Averin (2): seq_tab_next() should increase position index l2t_seq_next should increase position index Vitaly Chikunov (1): tools lib: Fix builds when glibc contains strlcpy() Zhenzhong Duan (1): ttyprintk: fix a potential deadlock in interrupt context issue

4 years, 10 months

1
1
0 0

Linux 4.4.213

by Greg KH

I'm announcing the release of the 4.4.213 kernel. All users of the 4.4 kernel series must upgrade. The updated 4.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.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 ------------ Makefile | 2 arch/arm64/boot/Makefile | 2 crypto/af_alg.c | 6 crypto/pcrypt.c | 3 drivers/atm/eni.c | 4 drivers/char/ttyprintk.c | 15 + drivers/clk/mmp/clk-of-mmp2.c | 2 drivers/media/radio/si470x/radio-si470x-i2c.c | 2 drivers/media/usb/dvb-usb/digitv.c | 10 - drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 drivers/media/usb/gspca/gspca.c | 2 drivers/net/ethernet/broadcom/b44.c | 9 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 3 drivers/net/ethernet/chelsio/cxgb4/l2t.c | 3 drivers/net/ethernet/freescale/xgmac_mdio.c | 7 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 37 +++- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 drivers/net/ethernet/natsemi/sonic.c | 109 +++++++++++--- drivers/net/ethernet/natsemi/sonic.h | 25 +-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 1 drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 2 drivers/net/usb/r8152.c | 9 - drivers/net/wan/sdla.c | 2 drivers/net/wireless/airo.c | 20 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 2 drivers/net/wireless/brcm80211/brcmfmac/usb.c | 4 drivers/net/wireless/orinoco/orinoco_usb.c | 4 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 2 drivers/net/wireless/rsi/rsi_91x_usb.c | 2 drivers/net/wireless/zd1211rw/zd_usb.c | 2 drivers/scsi/fnic/fnic_scsi.c | 3 drivers/staging/most/aim-network/networking.c | 10 + drivers/staging/vt6656/device.h | 2 drivers/staging/vt6656/int.c | 6 drivers/staging/vt6656/main_usb.c | 1 drivers/staging/vt6656/rxtx.c | 26 +-- drivers/staging/wlan-ng/prism2mgmt.c | 2 drivers/usb/dwc3/core.c | 3 drivers/usb/serial/ir-usb.c | 136 +++++++++++++----- drivers/usb/storage/unusual_uas.h | 7 drivers/watchdog/rn5t618_wdt.c | 1 fs/btrfs/super.c | 24 ++- fs/namei.c | 4 fs/reiserfs/super.c | 2 include/linux/usb/irda.h | 13 + mm/mempolicy.c | 6 net/core/utils.c | 20 ++ net/ipv4/ip_vti.c | 13 + net/ipv6/ip6_vti.c | 13 + net/sched/ematch.c | 3 net/wireless/wext-core.c | 3 sound/core/pcm_native.c | 2 52 files changed, 434 insertions(+), 164 deletions(-) Al Viro (1): vfs: fix do_last() regression Andreas Kemnade (1): watchdog: rn5t618_wdt: fix module aliases Andrey Shvetsov (1): staging: most: net: fix buffer overflow Arnd Bergmann (2): atm: eni: fix uninitialized variable warning wireless: wext: avoid gcc -O3 warning Bin Liu (1): usb: dwc3: turn off VBUS when leaving host mode Cambda Zhu (1): ixgbe: Fix calculation of queue with VFs and flow director on interface flap Colin Ian King (1): staging: wlan-ng: ensure error return is actually returned Dan Carpenter (1): mm/mempolicy.c: fix out of bounds write in mpol_parse_str() Dirk Behme (1): arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean' Eric Dumazet (1): net_sched: ematch: reject invalid TCF_EM_SIMPLE Fenghua Yu (1): drivers/net/b44: Change to non-atomic bit operations on pwol_mask Finn Thain (4): net/sonic: Add mutual exclusion for accessing shared state net/sonic: Use MMIO accessors net/sonic: Fix receive buffer handling net/sonic: Quiesce SONIC before re-initializing descriptor memory Greg Kroah-Hartman (1): Linux 4.4.213 Hannes Reinecke (1): scsi: fnic: do not queue commands during fwreset Hans Verkuil (2): media: gspca: zero usb_buf media: dvb-usb/dvb-usb-urb.c: initialize actlen to 0 Hayes Wang (1): r8152: get default setting of WOL before initializing Herbert Xu (2): crypto: af_alg - Use bh_lock_sock in sk_destruct crypto: pcrypt - Fix user-after-free on module unload Jan Kara (1): reiserfs: Fix memory leak of journal device string Johan Hovold (9): orinoco_usb: fix interface sanity check rsi_91x_usb: fix interface sanity check USB: serial: ir-usb: add missing endpoint sanity check USB: serial: ir-usb: fix link-speed handling USB: serial: ir-usb: fix IrLAP framing ath9k: fix storage endpoint lookup brcmfmac: fix interface sanity check rtl8xxxu: fix interface sanity check zd1211rw: fix storage endpoint lookup Josef Bacik (1): btrfs: do not zero f_bavail if we have available space Krzysztof Kozlowski (1): net: wan: sdla: Fix cast from pointer to integer of different size Laura Abbott (1): usb-storage: Disable UAS on JMicron SATA enclosure Lee Jones (1): media: si470x-i2c: Move free() past last use of 'radio' Lubomir Rintel (1): clk: mmp2: Fix the order of timer mux parents Luis de Bethencourt (1): btrfs: fix mixed block count of available space Madalin Bucur (1): net/fsl: treat fsl,erratum-a011043 Malcolm Priestley (3): staging: vt6656: correct packet types for CTS protect, mode. staging: vt6656: use NULLFUCTION stack on mac80211 staging: vt6656: Fix false Tx excessive retries reporting. Manish Chopra (1): qlcnic: Fix CPU soft lockup while collecting firmware dump Michael Ellerman (2): airo: Fix possible info leak in AIROOLDIOCTL/SIOCDEVPRIVATE airo: Add missing CAP_NET_ADMIN check in AIROOLDIOCTL/SIOCDEVPRIVATE Nicolas Dichtel (1): vti[6]: fix packet tx through bpf_redirect() Praveen Chaudhary (1): net: Fix skb->csum update in inet_proto_csum_replace16(). Radoslaw Tyl (1): ixgbevf: Remove limit of 10 entries for unicast filter list Sean Young (1): media: digitv: don't continue if remote control state can't be read Takashi Iwai (1): ALSA: pcm: Add missing copy ops check before clearing buffer Vasily Averin (2): seq_tab_next() should increase position index l2t_seq_next should increase position index Zhenzhong Duan (1): ttyprintk: fix a potential deadlock in interrupt context issue

4 years, 10 months

1
1
0 0

[PATCH 4.19 00/70] 4.19.102-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.102 release. There are 70 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 05 Feb 2020 16:17:59 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.102-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.102-rc1 Praveen Chaudhary <praveen5582(a)gmail.com> net: Fix skb->csum update in inet_proto_csum_replace16(). Vasily Averin <vvs(a)virtuozzo.com> l2t_seq_next should increase position index Vasily Averin <vvs(a)virtuozzo.com> seq_tab_next() should increase position index Madalin Bucur <madalin.bucur(a)oss.nxp.com> net: fsl/fman: rename IF_MODE_XGMII to IF_MODE_10G Madalin Bucur <madalin.bucur(a)oss.nxp.com> net/fsl: treat fsl,erratum-a011043 Madalin Bucur <madalin.bucur(a)oss.nxp.com> powerpc/fsl/dts: add fsl,erratum-a011043 Manish Chopra <manishc(a)marvell.com> qlcnic: Fix CPU soft lockup while collecting firmware dump Raag Jadav <raagjadav(a)gmail.com> ARM: dts: am43x-epos-evm: set data pin directions for spi0 and spi1 Hayes Wang <hayeswang(a)realtek.com> r8152: get default setting of WOL before initializing Michael Ellerman <mpe(a)ellerman.id.au> airo: Add missing CAP_NET_ADMIN check in AIROOLDIOCTL/SIOCDEVPRIVATE Michael Ellerman <mpe(a)ellerman.id.au> airo: Fix possible info leak in AIROOLDIOCTL/SIOCDEVPRIVATE Vincenzo Frascino <vincenzo.frascino(a)arm.com> tee: optee: Fix compilation issue with nommu Vladimir Murzin <vladimir.murzin(a)arm.com> ARM: 8955/1: virt: Relax arch timer version check during early boot Hannes Reinecke <hare(a)suse.de> scsi: fnic: do not queue commands during fwreset Xu Wang <vulab(a)iscas.ac.cn> xfrm: interface: do not confirm neighbor when do pmtu update Nicolas Dichtel <nicolas.dichtel(a)6wind.com> xfrm interface: fix packet tx through bpf_redirect() Nicolas Dichtel <nicolas.dichtel(a)6wind.com> vti[6]: fix packet tx through bpf_redirect() Matwey V. Kornilov <matwey(a)sai.msu.ru> ARM: dts: am335x-boneblack-common: fix memory size Johan Hovold <johan(a)kernel.org> Input: aiptek - use descriptors of current altsetting Haim Dreyfuss <haim.dreyfuss(a)intel.com> iwlwifi: Don't ignore the cap field upon mcc update Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: mvm: fix NVM check for 3168 devices Ilie Halip <ilie.halip(a)gmail.com> riscv: delete temporary files Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Fix ipv6 RFS filter matching logic. Florian Fainelli <f.fainelli(a)gmail.com> net: dsa: bcm_sf2: Configure IMP port for 2Gb/sec Florian Westphal <fw(a)strlen.de> netfilter: nft_tunnel: ERSPAN_VERSION must not be null Arnd Bergmann <arnd(a)arndb.de> wireless: wext: avoid gcc -O3 warning Jouni Malinen <j(a)w1.fi> mac80211: Fix TKIP replay protection immediately after key setup Orr Mazor <orr.mazor(a)tandemg.com> cfg80211: Fix radar event during another phy CAC Ganapathi Bhat <ganapathi.bhat(a)nxp.com> wireless: fix enabling channel 12 for custom regulatory domain Krzysztof Kozlowski <krzk(a)kernel.org> parisc: Use proper printk format for resource_size_t Kristian Evensen <kristian.evensen(a)gmail.com> qmi_wwan: Add support for Quectel RM500Q Arnaud Pouliquen <arnaud.pouliquen(a)st.com> ASoC: sti: fix possible sleep-in-atomic Hans de Goede <hdegoede(a)redhat.com> platform/x86: GPD pocket fan: Allow somewhat lower/higher temperature limits Manfred Rudigier <manfred.rudigier(a)omicronenergy.com> igb: Fix SGMII SFP module discovery for 100FX/LX. Cambda Zhu <cambda(a)linux.alibaba.com> ixgbe: Fix calculation of queue with VFs and flow director on interface flap Radoslaw Tyl <radoslawx.tyl(a)intel.com> ixgbevf: Remove limit of 10 entries for unicast filter list Dmitry Osipenko <digetx(a)gmail.com> ASoC: rt5640: Fix NULL dereference on module unload Lubomir Rintel <lkundrak(a)v3.sk> clk: mmp2: Fix the order of timer mux parents Markus Theil <markus.theil(a)tu-ilmenau.de> mac80211: mesh: restrict airtime metric to peered established plinks Samuel Holland <samuel(a)sholland.org> clk: sunxi-ng: h6-r: Fix AR100/R_APB2 parent order Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> rseq: Unregister rseq for clone CLONE_VM Hewenliang <hewenliang4(a)huawei.com> tools lib traceevent: Fix memory leakage in filter_event Dave Gerlach <d-gerlach(a)ti.com> soc: ti: wkup_m3_ipc: Fix race condition with rproc_boot Kishon Vijay Abraham I <kishon(a)ti.com> ARM: dts: beagle-x15-common: Model 5V0 regulator Kishon Vijay Abraham I <kishon(a)ti.com> ARM: dts: am57xx-beagle-x15/am57xx-idk: Remove "gpios" for endpoint dt nodes Marek Szyprowski <m.szyprowski(a)samsung.com> ARM: dts: sun8i: a83t: Correct USB3503 GPIOs polarity Lee Jones <lee.jones(a)linaro.org> media: si470x-i2c: Move free() past last use of 'radio' Michal Koutný <mkoutny(a)suse.com> cgroup: Prevent double killing of css when enabling threaded cgroup Dan Carpenter <dan.carpenter(a)oracle.com> Bluetooth: Fix race condition in hci_release_sock() Zhenzhong Duan <zhenzhong.duan(a)gmail.com> ttyprintk: fix a potential deadlock in interrupt context issue Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> tomoyo: Use atomic_t for statistics counter Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: dvb-usb/dvb-usb-urb.c: initialize actlen to 0 Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: gspca: zero usb_buf Sean Young <sean(a)mess.org> media: vp7045: do not read uninitialized values if usb transfer fails Sean Young <sean(a)mess.org> media: af9005: uninitialized variable printked Sean Young <sean(a)mess.org> media: digitv: don't continue if remote control state can't be read Jan Kara <jack(a)suse.cz> reiserfs: Fix memory leak of journal device string Dan Carpenter <dan.carpenter(a)oracle.com> mm/mempolicy.c: fix out of bounds write in mpol_parse_str() Theodore Ts'o <tytso(a)mit.edu> ext4: validate the debug_want_extra_isize mount option at parse time Dirk Behme <dirk.behme(a)de.bosch.com> arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean' Vitaly Chikunov <vt(a)altlinux.org> tools lib: Fix builds when glibc contains strlcpy() Chanwoo Choi <cw00.choi(a)samsung.com> PM / devfreq: Add new name attribute for sysfs Andres Freund <andres(a)anarazel.de> perf c2c: Fix return type for histogram sorting comparision functions Johan Hovold <johan(a)kernel.org> rsi: fix use-after-free on failed probe and unbind Siva Rebbagondla <siva.rebbagondla(a)redpinesignals.com> rsi: add hci detach for hibernation and poweroff Herbert Xu <herbert(a)gondor.apana.org.au> crypto: pcrypt - Fix user-after-free on module unload Xiaochen Shen <xiaochen.shen(a)intel.com> x86/resctrl: Fix a deadlock due to inaccurate reference Xiaochen Shen <xiaochen.shen(a)intel.com> x86/resctrl: Fix use-after-free due to inaccurate refcount of rdtgroup Xiaochen Shen <xiaochen.shen(a)intel.com> x86/resctrl: Fix use-after-free when deleting resource groups Al Viro <viro(a)zeniv.linux.org.uk> vfs: fix do_last() regression ------------- Diffstat: Documentation/ABI/testing/sysfs-class-devfreq | 7 ++ Makefile | 4 +- arch/arm/boot/dts/am335x-boneblack-common.dtsi | 5 + arch/arm/boot/dts/am43x-epos-evm.dts | 2 + arch/arm/boot/dts/am571x-idk.dts | 4 - arch/arm/boot/dts/am572x-idk-common.dtsi | 4 - arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 25 +++- arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 2 +- arch/arm/kernel/hyp-stub.S | 7 +- arch/arm64/boot/Makefile | 2 +- arch/parisc/kernel/drivers.c | 4 +- .../dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi | 1 + .../dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi | 1 + arch/riscv/kernel/vdso/Makefile | 3 +- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 32 ++++-- crypto/pcrypt.c | 3 +- drivers/char/ttyprintk.c | 15 ++- drivers/clk/mmp/clk-of-mmp2.c | 2 +- drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 4 +- drivers/devfreq/devfreq.c | 9 ++ drivers/input/tablet/aiptek.c | 2 +- drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- drivers/media/usb/dvb-usb/af9005.c | 2 +- drivers/media/usb/dvb-usb/digitv.c | 10 +- drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 +- drivers/media/usb/dvb-usb/vp7045.c | 21 ++-- drivers/media/usb/gspca/gspca.c | 2 +- drivers/net/dsa/bcm_sf2.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 22 +++- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 3 +- drivers/net/ethernet/chelsio/cxgb4/l2t.c | 3 +- drivers/net/ethernet/freescale/fman/fman_memac.c | 4 +- drivers/net/ethernet/freescale/xgmac_mdio.c | 7 +- drivers/net/ethernet/intel/igb/e1000_82575.c | 8 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 37 ++++-- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 - .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 1 + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 2 + drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/r8152.c | 9 +- drivers/net/wireless/cisco/airo.c | 20 ++-- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 48 +++++++- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 6 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- drivers/net/wireless/rsi/rsi_91x_sdio.c | 18 +++ drivers/net/wireless/rsi/rsi_91x_usb.c | 25 +++- drivers/platform/x86/gpd-pocket-fan.c | 2 +- drivers/scsi/fnic/fnic_scsi.c | 3 + drivers/soc/ti/wkup_m3_ipc.c | 4 +- drivers/tee/optee/Kconfig | 1 + fs/ext4/super.c | 127 +++++++++++---------- fs/namei.c | 4 +- fs/reiserfs/super.c | 2 + include/linux/sched.h | 4 +- include/net/cfg80211.h | 5 + kernel/cgroup/cgroup.c | 11 +- mm/mempolicy.c | 6 +- net/bluetooth/hci_sock.c | 3 + net/core/utils.c | 20 +++- net/ipv4/ip_vti.c | 13 ++- net/ipv6/ip6_vti.c | 13 ++- net/mac80211/cfg.c | 23 ++++ net/mac80211/mesh_hwmp.c | 3 + net/mac80211/tkip.c | 18 ++- net/netfilter/nft_tunnel.c | 3 + net/wireless/rdev-ops.h | 10 ++ net/wireless/reg.c | 36 +++++- net/wireless/trace.h | 5 + net/wireless/wext-core.c | 3 +- net/xfrm/xfrm_interface.c | 34 ++++-- security/tomoyo/common.c | 11 +- sound/soc/codecs/rt5640.c | 7 ++ sound/soc/sti/uniperif_player.c | 7 +- tools/include/linux/string.h | 8 ++ tools/lib/string.c | 7 ++ tools/lib/traceevent/parse-filter.c | 4 +- tools/perf/builtin-c2c.c | 10 +- 95 files changed, 596 insertions(+), 232 deletions(-)

4 years, 10 months

5
76
0 0

General for Development Coordination

by Secretary-General for Development Coordination

Congratulations, Your email was randomly selected for the 2020 first quarter reimbursement via certified ATM CARD. Please reach Mrs. Sarah Buchiri with your code:U.N.D.C/2020/10/0109 for more information. Contact Name: Mrs. Sarah Buchiri Email: sarah.buchiri(a)gmail.com Robert Andrew Piper Assistant Secretary-General for Development Coordination

4 years, 10 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror February 2020