5.1.6-stable review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 61/405 blk-mq: split blk_mq_alloc_and_init_hctx into two parts
In reply to Greg Kroah-Hartman[ Upstream commit 7c6c5b7c9186e3fb5b10afb8e5f710ae661144c6 ]
Split blk_mq_alloc_and_init_hctx into two parts, and one is blk_mq_alloc_hctx() for allocating all hctx resources, another is blk_mq_init_hctx() for initializing hctx, which serves as counter-part of blk_mq_exit_hctx().
--- block/blk-mq.c | 139 ++++++++++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 64 deletions(-)
block/blk-mq.c +75 -64
@@ -2284,15 +2284,65 @@ static void blk_mq_exit_hw_queues(struct request_queue *q, } } +static int blk_mq_hw_ctx_size (struct blk_mq_tag_set *tag_set) +{ +int hw_ctx_size =sizeof (struct blk_mq_hw_ctx ); + +BUILD_BUG_ON (ALIGN (offsetof(struct blk_mq_hw_ctx , srcu), + __alignof__(struct blk_mq_hw_ctx )) != +sizeof (struct blk_mq_hw_ctx )); + +if (tag_set->flags &BLK_MQ_F_BLOCKING ) + hw_ctx_size +=sizeof (struct srcu_struct ); + +return hw_ctx_size; +} +static int blk_mq_init_hctx (struct request_queue *q,struct blk_mq_tag_set *set,struct blk_mq_hw_ctx *hctx,unsigned hctx_idx) { -int node; + hctx->queue_num = hctx_idx; + +cpuhp_state_add_instance_nocalls (CPUHP_BLK_MQ_DEAD , &hctx->cpuhp_dead); + + hctx->tags = set->tags[hctx_idx]; + +if (set->ops->init_hctx && + set->ops->init_hctx (hctx, set->driver_data, hctx_idx)) + goto unregister_cpu_notifier; - node = hctx->numa_node; +if (blk_mq_init_request (set, hctx->fq->flush_rq, hctx_idx, + hctx->numa_node)) + goto exit_hctx; +return 0 ; + + exit_hctx: +if (set->ops->exit_hctx) + set->ops->exit_hctx (hctx, hctx_idx); + unregister_cpu_notifier: +blk_mq_remove_cpuhp (hctx); +return -1 ; +} + +static struct blk_mq_hw_ctx * +blk_mq_alloc_hctx (struct request_queue *q,struct blk_mq_tag_set *set, +int node) +{ +struct blk_mq_hw_ctx *hctx; +gfp_t gfp =GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY; + + hctx =kzalloc_node (blk_mq_hw_ctx_size (set), gfp, node); +if (!hctx) + goto fail_alloc_hctx; + +if (!zalloc_cpumask_var_node (&hctx->cpumask, gfp, node)) + goto free_hctx; + +atomic_set (&hctx->nr_active,0 );if (node ==NUMA_NO_NODE ) - node = hctx->numa_node = set->numa_node; + node = set->numa_node; + hctx->numa_node = node;INIT_DELAYED_WORK (&hctx->run_work, blk_mq_run_work_fn);spin_lock_init (&hctx->lock);
@@ -2300,58 +2350,45 @@ static int blk_mq_init_hctx(struct request_queue *q, hctx->queue = q; hctx->flags = set->flags & ~BLK_MQ_F_TAG_SHARED ; -cpuhp_state_add_instance_nocalls (CPUHP_BLK_MQ_DEAD , &hctx->cpuhp_dead); - - hctx->tags = set->tags[hctx_idx]; -/* * Allocate space for all possible cpus to avoid allocation at * runtime */ hctx->ctxs =kmalloc_array_node (nr_cpu_ids,sizeof (void *), -GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, node); + gfp, node);if (!hctx->ctxs) - goto unregister_cpu_notifier; + goto free_cpumask;if (sbitmap_init_node (&hctx->ctx_map, nr_cpu_ids,ilog2 (8 ), -GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, node)) + gfp, node)) goto free_ctxs; - hctx->nr_ctx =0 ;spin_lock_init (&hctx->dispatch_wait_lock);init_waitqueue_func_entry (&hctx->dispatch_wait, blk_mq_dispatch_wake);INIT_LIST_HEAD (&hctx->dispatch_wait.entry); -if (set->ops->init_hctx && - set->ops->init_hctx (hctx, set->driver_data, hctx_idx)) - goto free_bitmap; - hctx->fq =blk_alloc_flush_queue (q, hctx->numa_node, set->cmd_size, -GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY); + gfp);if (!hctx->fq) - goto exit_hctx; - -if (blk_mq_init_request (set, hctx->fq->flush_rq, hctx_idx, node)) - goto free_fq; + goto free_bitmap;if (hctx->flags &BLK_MQ_F_BLOCKING )init_srcu_struct (hctx->srcu); +blk_mq_hctx_kobj_init (hctx); -return 0 ; +return hctx; - free_fq: -blk_free_flush_queue (hctx->fq); - exit_hctx: -if (set->ops->exit_hctx) - set->ops->exit_hctx (hctx, hctx_idx); free_bitmap:sbitmap_free (&hctx->ctx_map); free_ctxs:kfree (hctx->ctxs); - unregister_cpu_notifier: -blk_mq_remove_cpuhp (hctx); -return -1 ; + free_cpumask: +free_cpumask_var (hctx->cpumask); + free_hctx: +kfree (hctx); + fail_alloc_hctx: +return NULL ; } static void blk_mq_init_cpu_queues(struct request_queue *q,
@@ -2695,51 +2732,25 @@ struct request_queue *blk_mq_init_sq_queue(struct blk_mq_tag_set *set, }EXPORT_SYMBOL (blk_mq_init_sq_queue); -static int blk_mq_hw_ctx_size (struct blk_mq_tag_set *tag_set) -{ -int hw_ctx_size =sizeof (struct blk_mq_hw_ctx ); - -BUILD_BUG_ON (ALIGN (offsetof(struct blk_mq_hw_ctx , srcu), - __alignof__(struct blk_mq_hw_ctx )) != -sizeof (struct blk_mq_hw_ctx )); - -if (tag_set->flags &BLK_MQ_F_BLOCKING ) - hw_ctx_size +=sizeof (struct srcu_struct ); - -return hw_ctx_size; -} -static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx (struct blk_mq_tag_set *set,struct request_queue *q,int hctx_idx,int node) {struct blk_mq_hw_ctx *hctx; - hctx =kzalloc_node (blk_mq_hw_ctx_size (set), -GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, - node); + hctx =blk_mq_alloc_hctx (q, set, node);if (!hctx) -return NULL ; - -if (!zalloc_cpumask_var_node (&hctx->cpumask, -GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, - node)) { -kfree (hctx); -return NULL ; - } - -atomic_set (&hctx->nr_active,0 ); - hctx->numa_node = node; - hctx->queue_num = hctx_idx; + goto fail; -if (blk_mq_init_hctx (q, set, hctx, hctx_idx)) { -free_cpumask_var (hctx->cpumask); -kfree (hctx); -return NULL ; - } -blk_mq_hctx_kobj_init (hctx); +if (blk_mq_init_hctx (q, set, hctx, hctx_idx)) + goto free_hctx;return hctx; + + free_hctx: +kobject_put (&hctx->kobj); + fail: +return NULL ; } static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/405 blk-mq: grab .q_usage_counter when queuing request from plug code path
In reply to Greg Kroah-Hartman[ Upstream commit e87eb301bee183d82bb3d04bd71b6660889a2588 ]
Just like aio/io_uring, we need to grab 2 refcount for queuing one request, one is for submission, another is for completion.
If the request isn't queued from plug code path, the refcount grabbed in generic_make_request() serves for submission. In theroy, this refcount should have been released after the sumission(async run queue) is done. blk_freeze_queue() works with blk_sync_queue() together for avoiding race between cleanup queue and IO submission, given async run queue activities are canceled because hctx->run_work is scheduled with the refcount held, so it is fine to not hold the refcount when running the run queue work function for dispatch IO.
However, if request is staggered into plug list, and finally queued from plug code path, the refcount in submission side is actually missed. And we may start to run queue after queue is removed because the queue's kobject refcount isn't guaranteed to be grabbed in flushing plug list context, then kernel oops is triggered, see the following race:
blk_mq_flush_plug_list():
blk_mq_sched_insert_requests()
insert requests to sw queue or scheduler queue blk_mq_run_hw_queue
Because of concurrent run queue, all requests inserted above may be completed before calling the above blk_mq_run_hw_queue. Then queue can be freed during the above blk_mq_run_hw_queue().
Fixes the issue by grab .q_usage_counter before calling blk_mq_sched_insert_requests() in blk_mq_flush_plug_list(). This way is safe because the queue is absolutely alive before inserting request.
--- block/blk-mq-sched.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
block/blk-mq-sched.c +11 -1
@@ -413,6 +413,14 @@ void blk_mq_sched_insert_requests(struct blk_mq_hw_ctx *hctx, struct list_head *list, bool run_queue_async) {struct elevator_queue *e; +struct request_queue *q = hctx->queue; + +/* +* blk_mq_sched_insert_requests() is called from flush plug +* context only, and hold one usage counter to prevent queue +* from being released. +*/ +percpu_ref_get (&q->q_usage_counter); e = hctx->queue->elevator;if (e && e->type->ops.insert_requests)
@@ -426,12 +434,14 @@ void blk_mq_sched_insert_requests(struct blk_mq_hw_ctx *hctx,if (!hctx->dispatch_busy && !e && !run_queue_async) {blk_mq_try_issue_list_directly (hctx, list);if (list_empty (list)) -return ; + goto out; }blk_mq_insert_requests (hctx, ctx, list); }blk_mq_run_hw_queue (hctx, run_queue_async); + out: +percpu_ref_put (&q->q_usage_counter); } static void blk_mq_sched_free_tags(struct blk_mq_tag_set *set,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/405 pinctrl: zte: fix leaked of_node references
In reply to Greg Kroah-Hartman[ Upstream commit 02d15f0d80720545f1f4922a1550ea4aaad4e152 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/pinctrl/zte/pinctrl-zx.c:415:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function. ./drivers/pinctrl/zte/pinctrl-zx.c:422:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function. ./drivers/pinctrl/zte/pinctrl-zx.c:436:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function. ./drivers/pinctrl/zte/pinctrl-zx.c:444:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function. ./drivers/pinctrl/zte/pinctrl-zx.c:448:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function.
--- drivers/pinctrl/zte/pinctrl-zx.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/zte/pinctrl-zx.c +1 -0
@@ -411,6 +411,7 @@ int zx_pinctrl_init(struct platform_device *pdev, } zpctl->aux_base =of_iomap (np,0 ); +of_node_put (np);if (!zpctl->aux_base)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/405 x86/ftrace: Set trampoline pages as executable
In reply to Greg Kroah-Hartman[ Upstream commit 3c0dab44e22782359a0a706cbce72de99a22aa75 ]
Since alloc_module() will not set the pages as executable soon, set ftrace trampoline pages as executable after they are allocated.
For the time being, do not change ftrace to use the text_poke() interface. As a result, ftrace still breaks W^X.
--- arch/x86/kernel/ftrace.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/kernel/ftrace.c +8 -0
@@ -749,6 +749,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)unsigned long end_offset;unsigned long op_offset;unsigned long offset; +unsigned long npages;unsigned long size;unsigned long retq;unsigned long *ptr;
@@ -781,6 +782,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)return 0 ; *tramp_size = size +RET_SIZE +sizeof (void *); + npages =DIV_ROUND_UP (*tramp_size,PAGE_SIZE );/* Copy ftrace_caller onto the trampoline memory */ ret =probe_kernel_read (trampoline, (void *)start_offset, size);
@@ -825,6 +827,12 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)/* ALLOC_TRAMP flags lets us know we created it */ ops->flags |=FTRACE_OPS_FL_ALLOC_TRAMP ; +/* +* Module allocation needs to be completed by making the page +* executable. The page is still writable, which is a security hazard, +* but anyhow ftrace breaks W^X completely. +*/ +set_memory_x ((unsigned long )trampoline, npages);return (unsigned long )trampoline; fail:tramp_free (trampoline, *tramp_size);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/405 x86/modules: Avoid breaking W^X while loading modules
In reply to Greg Kroah-Hartman[ Upstream commit f2c65fb3221adc6b73b0549fc7ba892022db9797 ]
When modules and BPF filters are loaded, there is a time window in which some memory is both writable and executable. An attacker that has already found another vulnerability (e.g., a dangling pointer) might be able to exploit this behavior to overwrite kernel code. Prevent having writable executable PTEs in this stage.
In addition, avoiding having W+X mappings can also slightly simplify the patching of modules code on initialization (e.g., by alternatives and static-key), as would be done in the next patch. This was actually the main motivation for this patch.
To avoid having W+X mappings, set them initially as RW (NX) and after they are set as RO set them as X as well. Setting them as executable is done as a separate step to avoid one core in which the old PTE is cached (hence writable), and another which sees the updated PTE (executable), which would break the W^X protection.
--- arch/x86/kernel/alternative.c | 28 +++++++++++++++++++++------- arch/x86/kernel/module.c | 2 +- include/linux/filter.h | 1 + kernel/module.c | 5 +++++ 4 files changed, 28 insertions(+), 8 deletions(-)
arch/x86/kernel/alternative.c +21 -7
@@ -667,15 +667,29 @@ void __init alternative_instructions(void)* handlers seeing an inconsistent instruction while you patch. */ void *__init_or_module text_poke_early(void *addr, const void *opcode, -size_t len) +size_t len) {unsigned long flags; -local_irq_save (flags); -memcpy (addr, opcode, len); -local_irq_restore (flags); -sync_core (); -/* Could also do a CLFLUSH here to speed up CPU recovery; but -that causes hangs on some VIA CPUs. */ + +if (boot_cpu_has (X86_FEATURE_NX ) && +is_module_text_address ((unsigned long )addr)) { +/* +* Modules text is marked initially as non-executable, so the +* code cannot be running and speculative code-fetches are +* prevented. Just change the code. +*/ +memcpy (addr, opcode, len); + }else { +local_irq_save (flags); +memcpy (addr, opcode, len); +local_irq_restore (flags); +sync_core (); + +/* +* Could also do a CLFLUSH here to speed up CPU recovery; but +* that causes hangs on some VIA CPUs. +*/ + }return addr; }
arch/x86/kernel/module.c +1 -1
@@ -87,7 +87,7 @@ void *module_alloc(unsigned long size) p =__vmalloc_node_range (size,MODULE_ALIGN ,MODULES_VADDR +get_module_load_offset (),MODULES_END ,GFP_KERNEL , -PAGE_KERNEL_EXEC ,0 ,NUMA_NO_NODE , +PAGE_KERNEL ,0 ,NUMA_NO_NODE ,__builtin_return_address (0 ));if (p && (kasan_module_alloc (p, size) <0 )) {vfree (p);
include/linux/filter.h +1 -0
@@ -746,6 +746,7 @@ static inline void bpf_prog_unlock_ro(struct bpf_prog *fp)static inline void bpf_jit_binary_lock_ro (struct bpf_binary_header *hdr) {set_memory_ro ((unsigned long )hdr, hdr->pages); +set_memory_x ((unsigned long )hdr, hdr->pages); }static inline void bpf_jit_binary_unlock_ro (struct bpf_binary_header *hdr)
kernel/module.c +5 -0
@@ -1950,8 +1950,13 @@ void module_enable_ro(const struct module *mod, bool after_init)return ;frob_text (&mod->core_layout, set_memory_ro); +frob_text (&mod->core_layout, set_memory_x); +frob_rodata (&mod->core_layout, set_memory_ro); +frob_text (&mod->init_layout, set_memory_ro); +frob_text (&mod->init_layout, set_memory_x); +frob_rodata (&mod->init_layout, set_memory_ro);if (after_init)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/405 pinctrl: pistachio: fix leaked of_node references
In reply to Greg Kroah-Hartman[ Upstream commit 44a4455ac2c6b0981eace683a2b6eccf47689022 ]
The call to of_get_child_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/pinctrl/pinctrl-pistachio.c:1422:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1360, but without a corresponding object release within this function.
--- drivers/pinctrl/pinctrl-pistachio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-pistachio.c +2 -0
@@ -1367,6 +1367,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)if (!of_find_property (child,"gpio-controller" ,NULL )) {dev_err (pctl->dev,"No gpio-controller property for bank %u\n" , i); +of_node_put (child); ret = -ENODEV ; goto err; }
@@ -1374,6 +1375,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl) irq =irq_of_parse_and_map (child,0 );if (irq <0 ) {dev_err (pctl->dev,"No IRQ for bank %u: %d\n" , i, irq); +of_node_put (child); ret = irq; goto err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 148/405 pinctrl: st: fix leaked of_node references
In reply to Greg Kroah-Hartman[ Upstream commit 483d70d73beaecab55882fcd2a357af72674e24c ]
The call to of_get_child_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/pinctrl/pinctrl-st.c:1188:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1175, but without a corresponding object release within this function. ./drivers/pinctrl/pinctrl-st.c:1188:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1175, but without a corresponding object release within this function. ./drivers/pinctrl/pinctrl-st.c:1199:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1175, but without a corresponding object release within this function. ./drivers/pinctrl/pinctrl-st.c:1199:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1175, but without a corresponding object release within this function.
--- drivers/pinctrl/pinctrl-st.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/pinctrl/pinctrl-st.c +10 -5
@@ -1170,7 +1170,7 @@ static int st_pctl_dt_parse_groups(struct device_node *np,struct property *pp;struct st_pinconf *conf;struct device_node *pins; -int i =0 , npins =0 , nr_props; +int i =0 , npins =0 , nr_props, ret =0 ; pins =of_get_child_by_name (np,"st,pins" );if (!pins)
@@ -1185,7 +1185,8 @@ static int st_pctl_dt_parse_groups(struct device_node *np, npins++; }else {pr_warn ("Invalid st,pins in %pOFn node\n" , np); -return -EINVAL ; + ret = -EINVAL ; + goto out_put_node; } }
@@ -1195,8 +1196,10 @@ static int st_pctl_dt_parse_groups(struct device_node *np, grp->pin_conf =devm_kcalloc (info->dev, npins,sizeof (*conf),GFP_KERNEL ); -if (!grp->pins || !grp->pin_conf) -return -ENOMEM ; +if (!grp->pins || !grp->pin_conf) { + ret = -ENOMEM ; + goto out_put_node; + }/* <bank offset mux direction rt_type rt_delay rt_clk> */ for_each_property_of_node (pins, pp) {
@@ -1229,9 +1232,11 @@ static int st_pctl_dt_parse_groups(struct device_node *np, } i++; } + +out_put_node:of_node_put (pins); -return 0 ; +return ret; } static int st_pctl_parse_functions(struct device_node *np,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 149/405 pinctrl: samsung: fix leaked of_node references
In reply to Greg Kroah-Hartman[ Upstream commit 44b9f86cd41db6c522effa5aec251d664a52fbc0 ]
The call to of_find_compatible_node returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/pinctrl/samsung/pinctrl-exynos-arm.c:76:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 66, but without a corresponding object release within this function. ./drivers/pinctrl/samsung/pinctrl-exynos-arm.c:82:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 66, but without a corresponding object release within this function.
--- drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/samsung/pinctrl-exynos-arm.c +1 -0
@@ -71,6 +71,7 @@ s5pv210_retention_init(struct samsung_pinctrl_drv_data *drvdata, } clk_base =of_iomap (np,0 ); +of_node_put (np);if (!clk_base) {pr_err ("%s: failed to map clock registers\n" , __func__);return ERR_PTR (-EINVAL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 173/405 drm/msm: a5xx: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit 6cd5235c3135ea84b32469ea51b2aae384eda8af ]
The call to of_get_child_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
drivers/gpu/drm/msm/adreno/a5xx_gpu.c:57:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 47, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:66:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 47, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:118:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 47, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:57:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 51, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:66:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 51, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:118:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 51, but without a corresponding object release within this function.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +6 -4
@@ -34,7 +34,7 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname) {struct device *dev = &gpu->pdev->dev;const struct firmware *fw; -struct device_node *np; +struct device_node *np, *mem_np;struct resource r;phys_addr_t mem_phys;ssize_t mem_size;
@@ -48,11 +48,13 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname)if (!np)return -ENODEV ; - np =of_parse_phandle (np,"memory-region" ,0 ); -if (!np) + mem_np =of_parse_phandle (np,"memory-region" ,0 ); +of_node_put (np); +if (!mem_np)return -EINVAL ; - ret =of_address_to_resource (np,0 , &r); + ret =of_address_to_resource (mem_np,0 , &r); +of_node_put (mem_np);if (ret)return ret;
Signature · 8 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Greg Kroah-Hartman
maintainerPATCH 236/405 spi: Dont call spi_get_gpio_descs() before device name is set
In reply to Greg Kroah-Hartman[ Upstream commit 0a919ae49223d32ac0e8be3494547fcd1e4aa0aa ]
Move code calling spi_get_gpio_descs() to happen after ctlr->dev's name is set in order to have proper GPIO consumer names.
Before:
cat /sys/kernel/debug/gpio
gpiochip0: GPIOs 0-31, parent: platform/40049000.gpio, vf610-gpio:
gpio-6 ( |regulator-usb0-vbus ) out lo
gpiochip1: GPIOs 32-63, parent: platform/4004a000.gpio, vf610-gpio:
gpio-36 ( |scl ) in hi gpio-37 ( |sda ) in hi gpio-40 ( |(null) CS1 ) out lo gpio-41 ( |(null) CS0 ) out lo ACTIVE LOW gpio-42 ( |miso ) in hi gpio-43 ( |mosi ) in lo gpio-44 ( |sck ) out lo
After:
cat /sys/kernel/debug/gpio
gpiochip0: GPIOs 0-31, parent: platform/40049000.gpio, vf610-gpio:
gpio-6 ( |regulator-usb0-vbus ) out lo
gpiochip1: GPIOs 32-63, parent: platform/4004a000.gpio, vf610-gpio:
gpio-36 ( |scl ) in hi gpio-37 ( |sda ) in hi gpio-40 ( |spi0 CS1 ) out lo gpio-41 ( |spi0 CS0 ) out lo ACTIVE LOW gpio-42 ( |miso ) in hi gpio-43 ( |mosi ) in lo gpio-44 ( |sck ) out lo
--- drivers/spi/spi.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)
drivers/spi/spi.c +19 -18
@@ -2275,24 +2275,6 @@ int spi_register_controller(struct spi_controller *ctlr)if (status)return status; -if (!spi_controller_is_slave (ctlr)) { -if (ctlr->use_gpio_descriptors) { - status =spi_get_gpio_descs (ctlr); -if (status) -return status; -/* -* A controller using GPIO descriptors always -* supports SPI_CS_HIGH if need be. -*/ - ctlr->mode_bits |=SPI_CS_HIGH ; - }else { -/* Legacy code path for GPIOs from DT */ - status =of_spi_register_master (ctlr); -if (status) -return status; - } - } -/* even if it's just one always-selected device, there must * be at least one chipselect */
@@ -2349,6 +2331,25 @@ int spi_register_controller(struct spi_controller *ctlr)* registration fails if the bus ID is in use. */ dev_set_name (&ctlr->dev,"spi%u" , ctlr->bus_num); + +if (!spi_controller_is_slave (ctlr)) { +if (ctlr->use_gpio_descriptors) { + status =spi_get_gpio_descs (ctlr); +if (status) +return status; +/* +* A controller using GPIO descriptors always +* supports SPI_CS_HIGH if need be. +*/ + ctlr->mode_bits |=SPI_CS_HIGH ; + }else { +/* Legacy code path for GPIOs from DT */ + status =of_spi_register_master (ctlr); +if (status) +return status; + } + } + status =device_add (&ctlr->dev);if (status <0 ) {/* free bus id */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 275/405 ASoC: fsl_utils: fix a leaked reference by adding missing of_node_put
In reply to Greg Kroah-Hartman[ Upstream commit c705247136a523488eac806bd357c3e5d79a7acd ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./sound/soc/fsl/fsl_utils.c:74:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 38, but without a corresponding object release within this function.
--- sound/soc/fsl/fsl_utils.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/fsl/fsl_utils.c +1 -0
@@ -71,6 +71,7 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, iprop =of_get_property (dma_np,"cell-index" ,NULL );if (!iprop) {of_node_put (dma_np); +of_node_put (dma_channel_np);return -EINVAL ; } *dma_id =be32_to_cpup (iprop);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 310/405 x86/platform/uv: Fix missing checks of kcalloc() return values
In reply to Greg Kroah-Hartman[ Upstream commit 766460852cfaeca4042e5f3aeb9616b3689147bc ]
Handle potential errors returned from kcalloc().
[ bp: rewrite commit message. ]
--- arch/x86/platform/uv/tlb_uv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/platform/uv/tlb_uv.c +6 -1
@@ -2133,14 +2133,19 @@ static int __init summarize_uvhub_sockets(int nuvhubs,*/ static int __init init_per_cpu (int nuvhubs,int base_part_pnode) { -unsigned char *uvhub_mask;struct uvhub_desc *uvhub_descs; +unsigned char *uvhub_mask =NULL ;if (is_uv3_hub () ||is_uv2_hub () ||is_uv1_hub ()) timeout_us =calculate_destination_timeout (); uvhub_descs =kcalloc (nuvhubs,sizeof (struct uvhub_desc ),GFP_KERNEL ); +if (!uvhub_descs) + goto fail; + uvhub_mask =kzalloc ((nuvhubs+7 )/8 ,GFP_KERNEL ); +if (!uvhub_mask) + goto fail;if (get_cpu_topology (base_part_pnode, uvhub_descs, uvhub_mask)) goto fail;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 1/405 x86: Hide the int3_emulate_call/jmp functions from UML
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 693713cbdb3a4bda5a8a678c31f06560bbb14657 upstream.
User Mode Linux does not have access to the ip or sp fields of the pt_regs, and accessing them causes UML to fail to build. Hide the int3_emulate_jmp() and int3_emulate_call() instructions from UML, as it doesn't need them anyway.
--- arch/x86/include/asm/text-patching.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/include/asm/text-patching.h +3 -1
@@ -39,6 +39,7 @@ extern int poke_int3_handler(struct pt_rextern void *text_poke_bp (void *addr,const void *opcode,size_t len,void *handler);extern int after_bootmem; +#ifndef CONFIG_UML_X86 static inline void int3_emulate_jmp (struct pt_regs *regs,unsigned long ip) { regs->ip = ip;
@@ -65,6 +66,7 @@ static inline void int3_emulate_call(strint3_emulate_push (regs, regs->ip -INT3_INSN_SIZE +CALL_INSN_SIZE );int3_emulate_jmp (regs, func); } -#endif +#endif /* CONFIG_X86_64 */ +#endif /* !CONFIG_UML_X86 */ #endif /* _ASM_X86_TEXT_PATCHING_H */
Greg Kroah-Hartman
maintainerPATCH 10/405 crypto: vmx - CTR: always increment IV as quadword
In reply to Greg Kroah-HartmanFrom: Daniel Axtens <[email protected]>
commit 009b30ac7444c17fae34c4f435ebce8e8e2b3250 upstream.
The kernel self-tests picked up an issue with CTR mode:
alg: skcipher: p8_aes_ctr encryption test failed (wrong result) on test vector 3, cfg="uneven misaligned splits, may sleep"
Test vector 3 has an IV of FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD, so after 3 increments it should wrap around to 0.
In the aesp8-ppc code from OpenSSL, there are two paths that increment IVs: the bulk (8 at a time) path, and the individual path which is used when there are fewer than 8 AES blocks to process.
In the bulk path, the IV is incremented with vadduqm: "Vector Add Unsigned Quadword Modulo", which does 128-bit addition.
In the individual path, however, the IV is incremented with
vadduwm: "Vector Add Unsigned Word Modulo", which instead does 4 32-bit additions. Thus the IV would instead become FFFFFFFFFFFFFFFFFFFFFFFF00000000, throwing off the result.
Use vadduqm.
This was probably a typo originally, what with q and w being adjacent. It is a pretty narrow edge case: I am really impressed by the quality of the kernel self-tests!
--- drivers/crypto/vmx/aesp8-ppc.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/vmx/aesp8-ppc.pl +1 -1
@@ -1357,7 +1357,7 @@ Loop_ctr32_enc: addi $idx,$idx,16 bdnz Loop_ctr32_enc - vadduwm $ivec,$ivec,$one + vadduqm $ivec,$ivec,$one vmr $dat,$inptail lvx $inptail,0,$inp addi $inp,$inp,16
Greg Kroah-Hartman
maintainerPATCH 13/405 tracing: Add a check_val() check before updating cond_snapshot() track_val
In reply to Greg Kroah-HartmanFrom: Tom Zanussi <[email protected]>
commit 9b2ca371b1505a547217b244f903ad3fb86fa5b4 upstream.
Without this check a snapshot is taken whenever a bucket's max is hit, rather than only when the global max is hit, as it should be.
Before:
In this example, we do a first run of the workload (cyclictest), examine the output, note the max ('triggering value') (347), then do a second run and note the max again.
In this case, the max in the second run (39) is below the max in the first run, but since we haven't cleared the histogram, the first max is still in the histogram and is higher than any other max, so it should still be the max for the snapshot. It isn't however - the value should still be 347 after the second run.
# echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="cyclictest"' >> /sys/kernel/debug/tracing/events/sched/sched_waking/trigger # echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmax($wakeup_lat).save(next_prio,next_comm,prev_pid,prev_prio,prev_comm):onmax($wakeup_lat).snapshot() if next_comm=="cyclictest"' >> /sys/kernel/debug/tracing/events/sched/sched_switch/trigger
# cyclictest -p 80 -n -s -t 2 -D 2
# cat /sys/kernel/debug/tracing/events/sched/sched_switch/hist
{ next_pid: 2143 } hitcount: 199
max: 44 next_prio: 120 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/4 { next_pid: 2145 } hitcount: 1325
max: 38 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/2
{ next_pid: 2144 } hitcount: 1982
max: 347 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/6
Snapshot taken (see tracing/snapshot). Details:
triggering value { onmax($wakeup_lat) }: 347
triggered by event with key: { next_pid: 2144 }
# cyclictest -p 80 -n -s -t 2 -D 2
# cat /sys/kernel/debug/tracing/events/sched/sched_switch/hist
{ next_pid: 2143 } hitcount: 199
max: 44 next_prio: 120 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/4 { next_pid: 2148 } hitcount: 199
max: 16 next_prio: 120 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/1 { next_pid: 2145 } hitcount: 1325
max: 38 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/2
{ next_pid: 2150 } hitcount: 1326
max: 39 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/4
{ next_pid: 2144 } hitcount: 1982
max: 347 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/6
{ next_pid: 2149 } hitcount: 1983
max: 130 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/0
Snapshot taken (see tracing/snapshot). Details:
triggering value { onmax($wakeup_lat) }: 39
triggered by event with key: { next_pid: 2150 }
After:
In this example, we do a first run of the workload (cyclictest), examine the output, note the max ('triggering value') (375), then do a second run and note the max again.
In this case, the max in the second run is still 375, the highest in any bucket, as it should be.
# cyclictest -p 80 -n -s -t 2 -D 2
# cat /sys/kernel/debug/tracing/events/sched/sched_switch/hist
{ next_pid: 2072 } hitcount: 200
max: 28 next_prio: 120 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/5 { next_pid: 2074 } hitcount: 1323
max: 375 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/2
{ next_pid: 2073 } hitcount: 1980
max: 153 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/6
Snapshot taken (see tracing/snapshot). Details:
triggering value { onmax($wakeup_lat) }: 375
triggered by event with key: { next_pid: 2074 }
# cyclictest -p 80 -n -s -t 2 -D 2
# cat /sys/kernel/debug/tracing/events/sched/sched_switch/hist
{ next_pid: 2101 } hitcount: 199
max: 49 next_prio: 120 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/6 { next_pid: 2072 } hitcount: 200
max: 28 next_prio: 120 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/5 { next_pid: 2074 } hitcount: 1323
max: 375 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/2
{ next_pid: 2103 } hitcount: 1325
max: 74 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/4
{ next_pid: 2073 } hitcount: 1980
max: 153 next_prio: 19 next_comm: cyclictest
prev_pid: 0 prev_prio: 120 prev_comm: swapper/6
{ next_pid: 2102 } hitcount: 1981
max: 84 next_prio: 19 next_comm: cyclictest
prev_pid: 12 prev_prio: 120 prev_comm: kworker/0:1
Snapshot taken (see tracing/snapshot). Details:
triggering value { onmax($wakeup_lat) }: 375
triggered by event with key: { next_pid: 2074 }
--- kernel/trace/trace_events_hist.c | 6 ++++++ 1 file changed, 6 insertions(+)
kernel/trace/trace_events_hist.c +6 -0
@@ -3543,14 +3543,20 @@ static bool cond_snapshot_update(structstruct track_data *track_data = tr->cond_snapshot->cond_data;struct hist_elt_data *elt_data, *track_elt_data;struct snapshot_context *context = cond_data; +struct action_data *action;u64 track_val;if (!track_data)return false; + action = track_data->action_data; + track_val =get_track_val (track_data->hist_data, context->elt, track_data->action_data); +if (!action->track_data.check_val (track_data->track_val, track_val)) +return false; + track_data->track_val = track_val;memcpy (track_data->key, context->key, track_data->key_len);
Greg Kroah-Hartman
maintainerPATCH 20/405 arm64: Kconfig: Make ARM64_PSEUDO_NMI depend on BROKEN for now
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 96a13f57b946be7a6c10405e4bd780c0b6b6fe63 upstream.
Although we merged support for pseudo-nmi using interrupt priority masking in 5.1, we've since uncovered a number of non-trivial issues with the implementation. Although there are patches pending to address these problems, we're facing issues that prevent us from merging them at this current time:
https://lkml.kernel.org/r/[email protected]
For now, simply mark this optional feature as BROKEN in the hope that we can fix things properly in the near future.
--- arch/arm64/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/Kconfig +1 -0
@@ -1347,6 +1347,7 @@ config ARM64_MODULE_PLTS config ARM64_PSEUDO_NMI bool "Support for NMI-like interrupts" + depends on BROKEN # [email protected] select CONFIG_ARM_GIC_V3 help Adds support for mimicking Non-Maskable Interrupts through the use of
Greg Kroah-Hartman
maintainerPATCH 23/405 btrfs: dont double unlock on error in btrfs_punch_hole
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 8fca955057b9c58467d1b231e43f19c4cf26ae8c upstream.
If we have an error writing out a delalloc range in btrfs_punch_hole_lock_range we'll unlock the inode and then goto out_only_mutex, where we will again unlock the inode. This is bad, don't do this.
--- fs/btrfs/file.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/btrfs/file.c +1 -3
@@ -2546,10 +2546,8 @@ static int btrfs_punch_hole(struct inode ret =btrfs_punch_hole_lock_range (inode, lockstart, lockend, &cached_state); -if (ret) { -inode_unlock (inode); +if (ret) goto out_only_mutex; - } path =btrfs_alloc_path ();if (!path) {
Greg Kroah-Hartman
maintainerPATCH 12/405 mmc: sdhci-iproc: Set NO_HISPD bit to fix HS50 data hold time problem
In reply to Greg Kroah-HartmanFrom: Trac Hoang <[email protected]>
commit ec0970e0a1b2c807c908d459641a9f9a1be3e130 upstream.
The iproc host eMMC/SD controller hold time does not meet the specification in the HS50 mode. This problem can be mitigated by disabling the HISPD bit; thus forcing the controller output data to be driven on the falling clock edges rather than the rising clock edges.
Stable tag (v4.12+) chosen to assist stable kernel maintainers so that the change does not produce merge conflicts backporting to older kernel versions. In reality, the timing bug existed since the driver was first introduced but there is no need for this driver to be supported in kernel versions that old.
--- drivers/mmc/host/sdhci-iproc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-iproc.c +2 -1
@@ -220,7 +220,8 @@ static const struct sdhci_iproc_data iprstatic const struct sdhci_pltfm_data sdhci_iproc_pltfm_data = { .quirks =SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | -SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 , +SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 | +SDHCI_QUIRK_NO_HISPD_BIT , .quirks2 =SDHCI_QUIRK2_ACMD23_BROKEN , .ops = &sdhci_iproc_ops, };
Greg Kroah-Hartman
maintainerPATCH 17/405 KVM: nVMX: Fix using __this_cpu_read() in preemptible context
In reply to Greg Kroah-HartmanFrom: Wanpeng Li <[email protected]>
commit 541e886f7972cc647804dbb4909189e67987a945 upstream.
BUG: using __this_cpu_read() in preemptible [00000000] code: qemu-system-x86/4590 caller is nested_vmx_enter_non_root_mode+0xebd/0x1790 [kvm_intel] CPU: 4 PID: 4590 Comm: qemu-system-x86 Tainted: G OE 5.1.0-rc4+ #1 Call Trace: dump_stack+0x67/0x95 __this_cpu_preempt_check+0xd2/0xe0 nested_vmx_enter_non_root_mode+0xebd/0x1790 [kvm_intel] nested_vmx_run+0xda/0x2b0 [kvm_intel] handle_vmlaunch+0x13/0x20 [kvm_intel] vmx_handle_exit+0xbd/0x660 [kvm_intel] kvm_arch_vcpu_ioctl_run+0xa2c/0x1e50 [kvm] kvm_vcpu_ioctl+0x3ad/0x6d0 [kvm] do_vfs_ioctl+0xa5/0x6e0 ksys_ioctl+0x6d/0x80 __x64_sys_ioctl+0x1a/0x20 do_syscall_64+0x6f/0x6c0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
Accessing per-cpu variable should disable preemption, this patch extends the preemption disable region for __this_cpu_read().
--- arch/x86/kvm/vmx/nested.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/nested.c +2 -2
@@ -2792,14 +2792,13 @@ static int nested_vmx_check_vmentry_hw(s : "cc", "memory" ); -preempt_enable (); -if (vmx->msr_autoload.host.nr)vmcs_write32 (VM_EXIT_MSR_LOAD_COUNT , vmx->msr_autoload.host.nr);if (vmx->msr_autoload.guest.nr)vmcs_write32 (VM_ENTRY_MSR_LOAD_COUNT , vmx->msr_autoload.guest.nr);if (vm_fail) { +preempt_enable ();WARN_ON_ONCE (vmcs_read32 (VM_INSTRUCTION_ERROR ) !=VMXERR_ENTRY_INVALID_CONTROL_FIELD );return 1 ;
@@ -2811,6 +2810,7 @@ static int nested_vmx_check_vmentry_hw(slocal_irq_enable ();if (hw_breakpoint_active ())set_debugreg (__this_cpu_read (cpu_dr7),7 ); +preempt_enable ();/* * A non-failing VMEntry means we somehow entered guest mode with
Greg Kroah-Hartman
maintainerPATCH 8/405 Revert "scsi: sd: Keep disk read-only when re-reading partition"
In reply to Greg Kroah-HartmanFrom: Martin K. Petersen <[email protected]>
commit 8acf608e602f6ec38b7cc37b04c80f1ce9a1a6cc upstream.
This reverts commit 20bd1d026aacc5399464f8328f305985c493cde3.
This patch introduced regressions for devices that come online in read-only state and subsequently switch to read-write.
Given how the partition code is currently implemented it is not possible to persist the read-only flag across a device revalidate call. This may need to get addressed in the future since it is common for user applications to proactively call BLKRRPART.
Reverting this commit will re-introduce a regression where a device-initiated revalidate event will cause the admin state to be forgotten. A separate patch will address this issue.
--- drivers/scsi/sd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/sd.c +1 -2
@@ -2603,7 +2603,6 @@ sd_read_write_protect_flag(struct scsi_dint res;struct scsi_device *sdp = sdkp->device;struct scsi_mode_data data; -int disk_ro =get_disk_ro (sdkp->disk);int old_wp = sdkp->write_prot;set_disk_ro (sdkp->disk,0 );
@@ -2644,7 +2643,7 @@ sd_read_write_protect_flag(struct scsi_d "Test WP failed, assume Write Enabled\n"); }else { sdkp->write_prot = ((data.device_specific &0x80 ) !=0 ); -set_disk_ro (sdkp->disk, sdkp->write_prot || disk_ro); +set_disk_ro (sdkp->disk, sdkp->write_prot);if (sdkp->first_scan || old_wp != sdkp->write_prot) {sd_printk (KERN_NOTICE , sdkp,"Write Protect is %s\n" , sdkp->write_prot ?"on" :"off" );
Greg Kroah-Hartman
maintainerPATCH 31/405 arm64: errata: Add workaround for Cortex-A76 erratum #1463225
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 969f5ea627570e91c9d54403287ee3ed657f58fe upstream.
Revisions of the Cortex-A76 CPU prior to r4p0 are affected by an erratum that can prevent interrupts from being taken when single-stepping.
This patch implements a software workaround to prevent userspace from effectively being able to disable interrupts.
--- Documentation/arm64/silicon-errata.txt | 1 arch/arm64/Kconfig | 18 ++++++++++++++++ arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/kernel/cpu_errata.c | 24 +++++++++++++++++++++ arch/arm64/kernel/syscall.c | 31 +++++++++++++++++++++++++++ arch/arm64/mm/fault.c | 37 +++++++++++++++++++++++++++++++-- 6 files changed, 111 insertions(+), 3 deletions(-)
Documentation/arm64/silicon-errata.txt +1 -0
@@ -61,6 +61,7 @@ stable kernels. | ARM | Cortex-A76 | #1188873 | ARM64_ERRATUM_1188873 | | ARM | Cortex-A76 | #1165522 | ARM64_ERRATUM_1165522 | | ARM | Cortex-A76 | #1286807 | ARM64_ERRATUM_1286807 | +| ARM | Cortex-A76 | #1463225 | ARM64_ERRATUM_1463225 | | ARM | MMU-500 | #841119,#826419 | N/A | | | | | | | Cavium | ThunderX ITS | #22375, #24313 | CAVIUM_ERRATUM_22375 |
arch/arm64/Kconfig +18 -0
@@ -517,6 +517,24 @@ config ARM64_ERRATUM_1286807 If unsure, say Y. +config ARM64_ERRATUM_1463225 + bool "Cortex-A76: Software Step might prevent interrupt recognition" + default y + help + This option adds a workaround for Arm Cortex-A76 erratum 1463225. + + On the affected Cortex-A76 cores (r0p0 to r3p1), software stepping + of a system call instruction (SVC) can prevent recognition of + subsequent interrupts when software stepping is disabled in the + exception handler of the system call and either kernel debugging + is enabled or VHE is in use. + + Work around the erratum by triggering a dummy step exception + when handling a system call from a task that is being stepped + in a VHE configuration of the kernel. + + If unsure, say Y. + config CAVIUM_ERRATUM_22375 bool "Cavium erratum 22375, 24313" default y
arch/arm64/include/asm/cpucaps.h +2 -1
@@ -61,7 +61,8 @@#define ARM64_HAS_GENERIC_AUTH_ARCH 40#define ARM64_HAS_GENERIC_AUTH_IMP_DEF 41#define ARM64_HAS_IRQ_PRIO_MASKING 42 +#define ARM64_WORKAROUND_1463225 43 -#define ARM64_NCAPS 43 +#define ARM64_NCAPS 44#endif /* __ASM_CPUCAPS_H */
arch/arm64/kernel/cpu_errata.c +24 -0
@@ -464,6 +464,22 @@ out_printmsg: }#endif /* CONFIG_ARM64_SSBD */ +#ifdef CONFIG_ARM64_ERRATUM_1463225 +DEFINE_PER_CPU (int, __in_cortex_a76_erratum_1463225_wa); + +static bool +has_cortex_a76_erratum_1463225 (const struct arm64_cpu_capabilities *entry, +int scope) +{ +u32 midr =read_cpuid_id (); +/* Cortex-A76 r0p0 - r3p1 */ +struct midr_range range =MIDR_RANGE (MIDR_CORTEX_A76 ,0 ,0 ,3 ,1 ); + +WARN_ON (scope !=SCOPE_LOCAL_CPU ||preemptible ()); +return is_midr_in_range (midr, &range) &&is_kernel_in_hyp_mode (); +} +#endif +static void __maybe_unused cpu_enable_cache_maint_trap (const struct arm64_cpu_capabilities *__unused) {
@@ -739,6 +755,14 @@ const struct arm64_cpu_capabilities arm6 ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0), },#endif +#ifdef CONFIG_ARM64_ERRATUM_1463225 + { + .desc = "ARM erratum 1463225", + .capability = ARM64_WORKAROUND_1463225, + .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, + .matches = has_cortex_a76_erratum_1463225, + }, +#endif { } };
arch/arm64/kernel/syscall.c +31 -0
@@ -8,6 +8,7 @@#include <linux/syscalls.h> #include <asm/daifflags.h> +#include <asm/debug-monitors.h> #include <asm/fpsimd.h> #include <asm/syscall.h> #include <asm/thread_info.h>
@@ -60,6 +61,35 @@ static inline bool has_syscall_work(unsiint syscall_trace_enter (struct pt_regs *regs);void syscall_trace_exit (struct pt_regs *regs); +#ifdef CONFIG_ARM64_ERRATUM_1463225 +DECLARE_PER_CPU (int, __in_cortex_a76_erratum_1463225_wa); + +static void cortex_a76_erratum_1463225_svc_handler (void ) +{ +u32 reg, val; + +if (!unlikely (test_thread_flag (TIF_SINGLESTEP ))) +return ; + +if (!unlikely (this_cpu_has_cap (ARM64_WORKAROUND_1463225 ))) +return ; + +__this_cpu_write (__in_cortex_a76_erratum_1463225_wa,1 ); + reg =read_sysreg (mdscr_el1); + val = reg |DBG_MDSCR_SS |DBG_MDSCR_KDE ; +write_sysreg (val, mdscr_el1); + asmvolatile ("msr daifclr, #8" ); +isb (); + +/* We will have taken a single-step exception by this point */ + +write_sysreg (reg, mdscr_el1); +__this_cpu_write (__in_cortex_a76_erratum_1463225_wa,0 ); +} +#else +static void cortex_a76_erratum_1463225_svc_handler (void ) { } +#endif /* CONFIG_ARM64_ERRATUM_1463225 */ +static void el0_svc_common (struct pt_regs *regs,int scno,int sc_nr,const syscall_fn_t syscall_table[]) {
@@ -68,6 +98,7 @@ static void el0_svc_common(struct pt_reg regs->orig_x0 = regs->regs[0 ]; regs->syscallno = scno; +cortex_a76_erratum_1463225_svc_handler ();local_daif_restore (DAIF_PROCCTX );user_exit ();
arch/arm64/mm/fault.c +35 -2
@@ -810,14 +810,47 @@ void __init hook_debug_fault_code(int nr debug_fault_info[nr].name = name; } +#ifdef CONFIG_ARM64_ERRATUM_1463225 +DECLARE_PER_CPU (int, __in_cortex_a76_erratum_1463225_wa); + +static int __exception +cortex_a76_erratum_1463225_debug_handler (struct pt_regs *regs) +{ +if (user_mode (regs)) +return 0 ; + +if (!__this_cpu_read (__in_cortex_a76_erratum_1463225_wa)) +return 0 ; + +/* +* We've taken a dummy step exception from the kernel to ensure +* that interrupts are re-enabled on the syscall path. Return back +* to cortex_a76_erratum_1463225_svc_handler() with debug exceptions +* masked so that we can safely restore the mdscr and get on with +* handling the syscall. +*/ + regs->pstate |=PSR_D_BIT ; +return 1 ; +} +#else +static int __exception +cortex_a76_erratum_1463225_debug_handler (struct pt_regs *regs) +{ +return 0 ; +} +#endif /* CONFIG_ARM64_ERRATUM_1463225 */ + asmlinkage int __exception do_debug_exception(unsigned long addr_if_watchpoint, -unsigned int esr, -struct pt_regs *regs) +unsigned int esr, +struct pt_regs *regs) {const struct fault_info *inf =esr_to_debug_fault_info (esr);unsigned long pc =instruction_pointer (regs);int rv; +if (cortex_a76_erratum_1463225_debug_handler (regs)) +return 0 ; +/* * Tell lockdep we disabled irqs in entry.S. Do nothing if they were * already disabled to preserve the last enabled/disabled addresses.
Greg Kroah-Hartman
maintainerPATCH 53/405 mmc: core: Verify SD bus width
In reply to Greg Kroah-Hartman[ Upstream commit 9e4be8d03f50d1b25c38e2b59e73b194c130df7d ]
The SD Physical Layer Spec says the following: Since the SD Memory Card shall support at least the two bus modes 1-bit or 4-bit width, then any SD Card shall set at least bits 0 and 2 (SD_BUS_WIDTH="0101").
This change verifies the card has specified a bus width.
AMD SDHC Device 7806 can get into a bad state after a card disconnect where anything transferred via the DATA lines will always result in a zero filled buffer. Currently the driver will continue without error if the HC is in this condition. A block device will be created, but reading from it will result in a zero buffer. This makes it seem like the SD device has been erased, when in actuality the data is never getting copied from the DATA lines to the data buffer.
SCR is the first command in the SD initialization sequence that uses the DATA lines. By checking that the response was invalid, we can abort mounting the card.
--- drivers/mmc/core/sd.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/mmc/core/sd.c +8 -0
@@ -221,6 +221,14 @@ static int mmc_decode_scr(struct mmc_card *card)if (scr->sda_spec3) scr->cmds =UNSTUFF_BITS (resp,32 ,2 ); + +/* SD Spec says: any SD Card shall set at least bits 0 and 2 */ +if (!(scr->bus_widths &SD_SCR_BUS_WIDTH_1 ) || + !(scr->bus_widths &SD_SCR_BUS_WIDTH_4 )) { +pr_err ("%s: invalid bus width\n" ,mmc_hostname (card->host)); +return -EINVAL ; + } +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/405 media: vivid: use vfree() instead of kfree() for dev->bitmap_cap
In reply to Greg Kroah-HartmanFrom: Alexander Potapenko <[email protected]>
commit dad7e270ba712ba1c99cd2d91018af6044447a06 upstream.
syzkaller reported crashes on kfree() called from vivid_vid_cap_s_selection(). This looks like a simple typo, as dev->bitmap_cap is allocated with vzalloc() throughout the file.
parts")
--- drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/vivid/vivid-vid-cap.c +1 -1
@@ -1007,7 +1007,7 @@ int vivid_vid_cap_s_selection(struct filv4l2_rect_map_inside (&s->r, &dev->fmt_cap_rect);if (dev->bitmap_cap && (compose->width != s->r.width || compose->height != s->r.height)) { -kfree (dev->bitmap_cap); +vfree (dev->bitmap_cap); dev->bitmap_cap =NULL ; } *compose = s->r;
Greg Kroah-Hartman
maintainerPATCH 45/405 gfs2: Fix lru_count going negative
In reply to Greg Kroah-Hartman[ Upstream commit 7881ef3f33bb80f459ea6020d1e021fc524a6348 ]
Under certain conditions, lru_count may drop below zero resulting in a large amount of log spam like this:
vmscan: shrink_slab: gfs2_dump_glock+0x3b0/0x630 [gfs2] \
negative objects to delete nr=-1
This happens as follows:
1) A glock is moved from lru_list to the dispose list and lru_count is decremented.
2) The dispose function calls cond_resched() and drops the lru lock.
3) Another thread takes the lru lock and tries to add the same glock to lru_list, checking if the glock is on an lru list.
4) It is on a list (actually the dispose list) and so it avoids incrementing lru_count.
5) The glock is moved to lru_list.
5) The original thread doesn't dispose it because it has been re-added to the lru list but the lru_count has still decreased by one.
Fix by checking if the LRU flag is set on the glock rather than checking if the glock is on some list and rearrange the code so that the LRU flag is added/removed precisely when the glock is added/removed from lru_list.
--- fs/gfs2/glock.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
fs/gfs2/glock.c +13 -9
@@ -183,15 +183,19 @@ static int demote_ok(const struct gfs2_glock *gl)void gfs2_glock_add_to_lru (struct gfs2_glock *gl) { +if (!(gl->gl_ops->go_flags &GLOF_LRU )) +return ; +spin_lock (&lru_lock); -if (!list_empty (&gl->gl_lru)) -list_del_init (&gl->gl_lru); -else +list_del (&gl->gl_lru); +list_add_tail (&gl->gl_lru, &lru_list); + +if (!test_bit (GLF_LRU , &gl->gl_flags)) { +set_bit (GLF_LRU , &gl->gl_flags);atomic_inc (&lru_count); + } -list_add_tail (&gl->gl_lru, &lru_list); -set_bit (GLF_LRU , &gl->gl_flags);spin_unlock (&lru_lock); }
@@ -201,7 +205,7 @@ static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)return ;spin_lock (&lru_lock); -if (!list_empty (&gl->gl_lru)) { +if (test_bit (GLF_LRU , &gl->gl_flags)) {list_del_init (&gl->gl_lru);atomic_dec (&lru_count);clear_bit (GLF_LRU , &gl->gl_flags);
@@ -1159,8 +1163,7 @@ void gfs2_glock_dq(struct gfs2_holder *gh) !test_bit(GLF_DEMOTE, &gl->gl_flags)) fast_path =1 ; } -if (!test_bit (GLF_LFLUSH , &gl->gl_flags) &&demote_ok (gl) && - (glops->go_flags &GLOF_LRU )) +if (!test_bit (GLF_LFLUSH , &gl->gl_flags) &&demote_ok (gl))gfs2_glock_add_to_lru (gl);trace_gfs2_glock_queue (gh,0 );
@@ -1456,6 +1459,7 @@ __acquires(&lru_lock)if (!spin_trylock (&gl->gl_lockref.lock)) { add_back_to_lru:list_add (&gl->gl_lru, &lru_list); +set_bit (GLF_LRU , &gl->gl_flags);atomic_inc (&lru_count);continue ; }
@@ -1463,7 +1467,6 @@ __acquires(&lru_lock)spin_unlock (&gl->gl_lockref.lock); goto add_back_to_lru; } -clear_bit (GLF_LRU , &gl->gl_flags); gl->gl_lockref.count++;if (demote_ok (gl))handle_callback (gl,LM_ST_UNLOCKED ,0 , false);
@@ -1498,6 +1501,7 @@ static long gfs2_scan_glock_lru(int nr)if (!test_bit (GLF_LOCK , &gl->gl_flags)) {list_move (&gl->gl_lru, &dispose);atomic_dec (&lru_count); +clear_bit (GLF_LRU , &gl->gl_flags); freed++;continue ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/405 KVM: x86: fix return value for reserved EFER
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 66f61c92889ff3ca365161fb29dd36d6354682ba upstream.
Commit 11988499e62b ("KVM: x86: Skip EFER vs. guest CPUID checks for host-initiated writes", 2019-04-02) introduced a "return false" in a function returning int, and anyway set_efer has a "nonzero on error" conventon so it should be returning 1.
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/x86.c +1 -1
@@ -1288,7 +1288,7 @@ static int set_efer(struct kvm_vcpu *vcpu64 efer = msr_info->data;if (efer & efer_reserved_bits) -return false; +return 1 ;if (!msr_info->host_initiated) {if (!__kvm_valid_efer (vcpu, efer))
Greg Kroah-Hartman
maintainerPATCH 40/405 batman-adv: mcast: fix multicast tt/tvlv worker locking
In reply to Greg Kroah-HartmanFrom: Linus Lüssing <[email protected]>
commit a3c7cd0cdf1107f891aff847ad481e34df727055 upstream.
Syzbot has reported some issues with the locking assumptions made for the multicast tt/tvlv worker: It was able to trigger the WARN_ON() in batadv_mcast_mla_tt_retract() and batadv_mcast_mla_tt_add(). While hard/not reproduceable for us so far it seems that the delayed_work_pending() we use might not be quite safe from reordering.
Therefore this patch adds an explicit, new spinlock to protect the update of the mla_list and flags in bat_priv and then removes the WARN_ON(delayed_work_pending()).
--- net/batman-adv/main.c | 1 + net/batman-adv/multicast.c | 11 +++-------- net/batman-adv/types.h | 5 +++++ 3 files changed, 9 insertions(+), 8 deletions(-)
net/batman-adv/main.c +1 -0
@@ -161,6 +161,7 @@ int batadv_mesh_init(struct net_device *spin_lock_init (&bat_priv->tt.commit_lock);spin_lock_init (&bat_priv->gw.list_lock);#ifdef CONFIG_BATMAN_ADV_MCAST +spin_lock_init (&bat_priv->mcast.mla_lock);spin_lock_init (&bat_priv->mcast.want_lists_lock);#endif spin_lock_init (&bat_priv->tvlv.container_list_lock);
net/batman-adv/multicast.c +3 -8
@@ -325,8 +325,6 @@ static void batadv_mcast_mla_list_free(s* translation table except the ones listed in the given mcast_list. * * If mcast_list is NULL then all are retracted. -* -* Do not call outside of the mcast worker! (or cancel mcast worker first) */ static void batadv_mcast_mla_tt_retract (struct batadv_priv *bat_priv,struct hlist_head *mcast_list)
@@ -334,8 +332,6 @@ static void batadv_mcast_mla_tt_retract(struct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; -WARN_ON (delayed_work_pending (&bat_priv->mcast.work)); -hlist_for_each_entry_safe (mcast_entry, tmp, &bat_priv->mcast.mla_list, list) { if (mcast_list &&
@@ -359,8 +355,6 @@ static void batadv_mcast_mla_tt_retract(* * Adds multicast listener announcements from the given mcast_list to the * translation table if they have not been added yet. -* -* Do not call outside of the mcast worker! (or cancel mcast worker first) */ static void batadv_mcast_mla_tt_add (struct batadv_priv *bat_priv,struct hlist_head *mcast_list)
@@ -368,8 +362,6 @@ static void batadv_mcast_mla_tt_add(strustruct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; -WARN_ON (delayed_work_pending (&bat_priv->mcast.work)); -if (!mcast_list)return ;
@@ -658,7 +650,10 @@ static void batadv_mcast_mla_update(stru priv_mcast = container_of(delayed_work, struct batadv_priv_mcast, work); bat_priv = container_of(priv_mcast, struct batadv_priv, mcast); +spin_lock (&bat_priv->mcast.mla_lock);__batadv_mcast_mla_update (bat_priv); +spin_unlock (&bat_priv->mcast.mla_lock); +batadv_mcast_start_timer (bat_priv); }
net/batman-adv/types.h +5 -0
@@ -1224,6 +1224,11 @@ struct batadv_priv_mcast { unsigned char bridged:1;/** +* @mla_lock: a lock protecting mla_list and mla_flags +*/ +spinlock_t mla_lock; + +/** * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP * traffic */
Greg Kroah-Hartman
maintainerPATCH 6/405 bio: fix improper use of smp_mb__before_atomic()
In reply to Greg Kroah-HartmanFrom: Andrea Parri <[email protected]>
commit f381c6a4bd0ae0fde2d6340f1b9bb0f58d915de6 upstream.
This barrier only applies to the read-modify-write operations; in particular, it does not apply to the atomic_set() primitive.
Replace the barrier with an smp_mb().
--- include/linux/bio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bio.h +1 -1
@@ -224,7 +224,7 @@ static inline void bio_cnt_set(struct bi {if (count !=1 ) { bio->bi_flags |= (1 <<BIO_REFFED ); -smp_mb__before_atomic (); +smp_mb (); }atomic_set (&bio->__bi_cnt, count); }
Greg Kroah-Hartman
maintainerPATCH 83/405 drm/nouveau/bar/nv50: ensure BAR is mapped
In reply to Greg Kroah-Hartman[ Upstream commit f10b83de1fd49216a4c657816f48001437e4bdd5 ]
If the BAR is zero size, it indicates it was never successfully mapped. Ensure that the BAR is valid during initialization before attempting to use it.
--- drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c +9 -3
@@ -109,7 +109,7 @@ nv50_bar_oneinit(struct nvkm_bar *base)struct nvkm_device *device = bar->base.subdev.device;static struct lock_class_key bar1_lock;static struct lock_class_key bar2_lock; -u64 start, limit; +u64 start, limit, size;int ret; ret =nvkm_gpuobj_new (device,0x20000 ,0 , false,NULL , &bar->mem);
@@ -127,7 +127,10 @@ nv50_bar_oneinit(struct nvkm_bar *base)/* BAR2 */ start =0x0100000000ULL ; - limit = start + device->func->resource_size (device,3 ); + size = device->func->resource_size (device,3 ); +if (!size) +return -ENOMEM ; + limit = start + size; ret =nvkm_vmm_new (device, start, limit-- - start,NULL ,0 , &bar2_lock,"bar2" , &bar->bar2_vmm);
@@ -164,7 +167,10 @@ nv50_bar_oneinit(struct nvkm_bar *base)/* BAR1 */ start =0x0000000000ULL ; - limit = start + device->func->resource_size (device,1 ); + size = device->func->resource_size (device,1 ); +if (!size) +return -ENOMEM ; + limit = start + size; ret =nvkm_vmm_new (device, start, limit-- - start,NULL ,0 , &bar1_lock,"bar1" , &bar->bar1_vmm);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/405 media: stm32-dcmi: return appropriate error codes during probe
In reply to Greg Kroah-Hartman[ Upstream commit b5b5a27bee5884860798ffd0f08e611a3942064b ]
During probe, return the provided errors value instead of -ENODEV. This allows the driver to be deferred probed if needed.
--- drivers/media/platform/stm32/stm32-dcmi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/media/platform/stm32/stm32-dcmi.c +8 -6
@@ -1645,7 +1645,7 @@ static int dcmi_probe(struct platform_device *pdev) dcmi->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL );if (IS_ERR (dcmi->rstc)) {dev_err (&pdev->dev,"Could not get reset control\n" ); -return -ENODEV ; +return PTR_ERR (dcmi->rstc); }/* Get bus characteristics from devicetree */
@@ -1660,7 +1660,7 @@ static int dcmi_probe(struct platform_device *pdev)of_node_put (np);if (ret) {dev_err (&pdev->dev,"Could not parse the endpoint\n" ); -return -ENODEV ; +return ret; }if (ep.bus_type ==V4L2_MBUS_CSI2_DPHY ) {
@@ -1673,8 +1673,9 @@ static int dcmi_probe(struct platform_device *pdev) irq =platform_get_irq (pdev,0 );if (irq <=0 ) { -dev_err (&pdev->dev,"Could not get irq\n" ); -return -ENODEV ; +if (irq != -EPROBE_DEFER ) +dev_err (&pdev->dev,"Could not get irq\n" ); +return irq; } dcmi->res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -1694,12 +1695,13 @@ static int dcmi_probe(struct platform_device *pdev) dev_name(&pdev->dev), dcmi);if (ret) {dev_err (&pdev->dev,"Unable to request irq %d\n" , irq); -return -ENODEV ; +return ret; } mclk =devm_clk_get (&pdev->dev,"mclk" );if (IS_ERR (mclk)) { -dev_err (&pdev->dev,"Unable to get mclk\n" ); +if (PTR_ERR (mclk) != -EPROBE_DEFER ) +dev_err (&pdev->dev,"Unable to get mclk\n" );return PTR_ERR (mclk); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/405 ARM: vdso: Remove dependency with the arch_timer driver internals
In reply to Greg Kroah-Hartman[ Upstream commit 1f5b62f09f6b314c8d70b9de5182dae4de1f94da ]
The VDSO code uses the kernel helper that was originally designed to abstract the access between 32 and 64bit systems. It worked so far because this function is declared as 'inline'.
As we're about to revamp that part of the code, the VDSO would break. Let's fix it by doing what should have been done from the start, a proper system register access.
--- arch/arm/include/asm/cp15.h | 2 ++ arch/arm/vdso/vgettimeofday.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-)
arch/arm/include/asm/cp15.h +2 -0
@@ -68,6 +68,8 @@#define BPIALL __ACCESS_CP15(c7, 0, c5, 6)#define ICIALLU __ACCESS_CP15(c7, 0, c5, 0) +#define CNTVCT __ACCESS_CP15_64(1, c14) +extern unsigned long cr_alignment;/* defined in entry-armv.S */ static inline unsigned long get_cr (void )
arch/arm/vdso/vgettimeofday.c +3 -2
@@ -18,9 +18,9 @@#include <linux/compiler.h> #include <linux/hrtimer.h> #include <linux/time.h> -#include <asm/arch_timer.h> #include <asm/barrier.h> #include <asm/bug.h> +#include <asm/cp15.h> #include <asm/page.h> #include <asm/unistd.h> #include <asm/vdso_datapage.h>
@@ -123,7 +123,8 @@ static notrace u64 get_ns(struct vdso_data *vdata)u64 cycle_now;u64 nsec; - cycle_now =arch_counter_get_cntvct (); +isb (); + cycle_now =read_sysreg (CNTVCT ); cycle_delta = (cycle_now - vdata->cs_cycle_last) & vdata->cs_mask;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/405 gfs2: fix race between gfs2_freeze_func and unmount
In reply to Greg Kroah-Hartman[ Upstream commit 8f91821990fd6f170a5dca79697a441181a41b16 ]
As part of the freeze operation, gfs2_freeze_func() is left blocking on a request to hold the sd_freeze_gl in SH. This glock is held in EX by the gfs2_freeze() code.
A subsequent call to gfs2_unfreeze() releases the EXclusively held sd_freeze_gl, which allows gfs2_freeze_func() to acquire it in SH and resume its operation.
gfs2_unfreeze(), however, doesn't wait for gfs2_freeze_func() to complete. If a umount is issued right after unfreeze, it could result in an inconsistent filesystem because some journal data (statfs update) isn't written out.
Refer to commit 24972557b12c for a more detailed explanation of how freeze/unfreeze work.
This patch causes gfs2_unfreeze() to wait for gfs2_freeze_func() to complete before returning to the user.
--- fs/gfs2/incore.h | 1 + fs/gfs2/super.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)
fs/gfs2/incore.h +1 -0
@@ -621,6 +621,7 @@ enum {SDF_SKIP_DLM_UNLOCK =8 ,SDF_FORCE_AIL_FLUSH =9 ,SDF_AIL1_IO_ERROR =10 , + SDF_FS_FROZEN = 11, }; enum gfs2_freeze_state {
fs/gfs2/super.c +5 -3
@@ -973,8 +973,7 @@ void gfs2_freeze_func(struct work_struct *work)if (error) {printk (KERN_INFO "GFS2: couldn't get freeze lock : %d\n" , error);gfs2_assert_withdraw (sdp,0 ); - } -else { + }else {atomic_set (&sdp->sd_freeze_state,SFS_UNFROZEN ); error =thaw_super (sb);if (error) {
@@ -987,6 +986,8 @@ void gfs2_freeze_func(struct work_struct *work)gfs2_glock_dq_uninit (&freeze_gh); }deactivate_super (sb); +clear_bit_unlock (SDF_FS_FROZEN , &sdp->sd_flags); +wake_up_bit (&sdp->sd_flags,SDF_FS_FROZEN );return ; }
@@ -1029,6 +1030,7 @@ static int gfs2_freeze(struct super_block *sb)msleep (1000 ); } error =0 ; +set_bit (SDF_FS_FROZEN , &sdp->sd_flags); out:mutex_unlock (&sdp->sd_freeze_mutex);return error;
@@ -1053,7 +1055,7 @@ static int gfs2_unfreeze(struct super_block *sb)gfs2_glock_dq_uninit (&sdp->sd_freeze_gh);mutex_unlock (&sdp->sd_freeze_mutex); -return 0 ; +return wait_on_bit (&sdp->sd_flags,SDF_FS_FROZEN ,TASK_INTERRUPTIBLE ); }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/405 io_uring: use cpu_online() to check p->sq_thread_cpu instead of cpu_possible()
In reply to Greg Kroah-Hartman[ Upstream commit 7889f44dd9cee15aff1c3f7daf81ca4dfed48fc7 ]
This issue is found by running liburing/test/io_uring_setup test.
When test run, the testcase "attempt to bind to invalid cpu" would not pass with messages like:
io_uring_setup(1, 0xbfc2f7c8), \
flags: IORING_SETUP_SQPOLL|IORING_SETUP_SQ_AFF, \
resv: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000, \sq_thread_cpu: 2
expected -1, got 3
FAIL
On my system, there is:
CPU(s) possible : 0-3
CPU(s) online : 0-1 CPU(s) offline : 2-3 CPU(s) present : 0-1
The sq_thread_cpu 2 is offline on my system, so the bind should fail. But cpu_possible() will pass the check. We shouldn't be able to bind to an offline cpu. Use cpu_online() to do the check.
After the change, the testcase run as expected: EINVAL will be returned for cpu offlined.
--- fs/io_uring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/io_uring.c +1 -1
@@ -2334,7 +2334,7 @@ static int io_sq_offload_start(struct io_ring_ctx *ctx, nr_cpu_ids); ret = -EINVAL ; -if (!cpu_possible (cpu)) +if (!cpu_online (cpu)) goto err; ctx->sqo_thread = kthread_create_on_cpu(io_sq_thread,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/405 IB/hfi1: Fix WQ_MEM_RECLAIM warning
In reply to Greg Kroah-Hartman[ Upstream commit 4c4b1996b5db688e2dcb8242b0a3bf7b1e845e42 ]
The work_item cancels that occur when a QP is destroyed can elicit the following trace:
workqueue: WQ_MEM_RECLAIM ipoib_wq:ipoib_cm_tx_reap [ib_ipoib] is flushing !WQ_MEM_RECLAIM hfi0_0:_hfi1_do_send [hfi1]
WARNING: CPU: 7 PID: 1403 at kernel/workqueue.c:2486 check_flush_dependency+0xb1/0x100 Call Trace: __flush_work.isra.29+0x8c/0x1a0 ? __switch_to_asm+0x40/0x70 __cancel_work_timer+0x103/0x190 ? schedule+0x32/0x80 iowait_cancel_work+0x15/0x30 [hfi1] rvt_reset_qp+0x1f8/0x3e0 [rdmavt] rvt_destroy_qp+0x65/0x1f0 [rdmavt] ? _cond_resched+0x15/0x30 ib_destroy_qp+0xe9/0x230 [ib_core] ipoib_cm_tx_reap+0x21c/0x560 [ib_ipoib] process_one_work+0x171/0x370 worker_thread+0x49/0x3f0 kthread+0xf8/0x130 ? max_active_store+0x80/0x80 ? kthread_bind+0x10/0x10 ret_from_fork+0x35/0x40
Since QP destruction frees memory, hfi1_wq should have the WQ_MEM_RECLAIM.
The hfi1_wq does not allocate memory with GFP_KERNEL or otherwise become entangled with memory reclaim, so this flag is appropriate.
--- drivers/infiniband/hw/hfi1/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/init.c +2 -1
@@ -805,7 +805,8 @@ static int create_workqueues(struct hfi1_devdata *dd) ppd->hfi1_wq =alloc_workqueue ("hfi%d_%d" , -WQ_SYSFS |WQ_HIGHPRI |WQ_CPU_INTENSIVE , +WQ_SYSFS |WQ_HIGHPRI |WQ_CPU_INTENSIVE | +WQ_MEM_RECLAIM ,HFI1_MAX_ACTIVE_WORKQUEUE_ENTRIES , dd->unit, pidx);if (!ppd->hfi1_wq)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/405 scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending()
In reply to Greg Kroah-Hartman[ Upstream commit e209783d66bca04b5fce4429e59338517ffc1a0b ]
Implementations of the .write_pending() callback functions must guarantee that an appropriate LIO core callback function will be called immediately or at a later time. Make sure that this guarantee is met for aborted SCSI commands.
[mkp: typo]
--- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/qla2xxx/tcm_qla2xxx.c +2 -0
@@ -399,6 +399,8 @@ static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd) cmd->se_cmd.transport_state, cmd->se_cmd.t_state, cmd->se_cmd.se_cmd_flags); +transport_generic_request_failure (&cmd->se_cmd, +TCM_CHECK_CONDITION_ABORT_CMD );return 0 ; } cmd->trc_flags |=TRC_XFR_RDY ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 5.1.6-stable review
This is the start of the stable review cycle for the 5.1.6 release. There are 405 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 Sat 01 Jun 2019 03:01:59 AM UTC. 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/v5.x/stable-review/patch-5.1.6-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.1.6-rc1
Benjamin Coddington <[email protected]>
NFS: Fix a double unlock from nfs_match,get_client
Maxime Ripard <[email protected]>
drm/sun4i: dsi: Enforce boundaries on the start delay
Brett Creeley <[email protected]>
ice: Put __ICE_PREPARED_FOR_RESET check in ice_prepare_for_reset
YueHaibing <[email protected]>
extcon: axp288: Add a depends on ACPI to the Kconfig entry
Farhan Ali <[email protected]>
vfio-ccw: Prevent quiesce function going into an infinite loop
Maxime Ripard <[email protected]>
drm/sun4i: dsi: Restrict DSI tcon clock divider
Maxime Ripard <[email protected]>
drm/sun4i: dsi: Change the start delay calculation
Chris Wilson <[email protected]>
drm: Wake up next in drm_read() chain if we are forced to putback the event
Noralf Trønnes <[email protected]>
drm/drv: Hold ref on parent device during drm_device lifetime
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Reset planes that were disabled in init_pipes
Anthony Koo <[email protected]>
drm/amd/display: Fix exception from AUX acquire failure
Eric Anholt <[email protected]>
drm/v3d: Handle errors from IRQ setup.
Arnd Bergmann <[email protected]>
ASoC: ti: fix davinci_mcasp_probe dependencies
Arnd Bergmann <[email protected]>
ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM
Chris Lesiak <[email protected]>
spi: Fix zero length xfer bug
Steve Twiss <[email protected]>
regulator: da9055: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: da9062: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: pv88090: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: wm831x: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: pv88080: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: da9063: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: da9211: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: lp8755: Fix notifier mutex lock warning
Trent Piepho <[email protected]>
spi: imx: stop buffer overflow in RX FIFO flush
Steve Twiss <[email protected]>
regulator: pv88060: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: ltc3589: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: ltc3676: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: wm831x isink: Fix notifier mutex lock warning
Steve Twiss <[email protected]>
regulator: wm831x ldo: Fix notifier mutex lock warning
Geert Uytterhoeven <[email protected]>
spi: rspi: Fix sequencer reset during initialization
Laurent Pinchart <[email protected]>
drm/omap: Notify all devices in the pipeline of output disconnection
Tony Lindgren <[email protected]>
drm/omap: dsi: Fix PM for display blank with paired dss_pll calls
Laurent Pinchart <[email protected]>
drm: writeback: Fix leak of writeback job
Aditya Pakki <[email protected]>
spi : spi-topcliff-pch: Fix to handle empty DMA buffers
Li RongQing <[email protected]>
audit: fix a memleak caused by auditing load module
James Smart <[email protected]>
scsi: lpfc: Fix use-after-free mailbox cmd completion
James Smart <[email protected]>
scsi: lpfc: Resolve irq-unsafe lockdep heirarchy warning in lpfc_io_free
James Smart <[email protected]>
scsi: lpfc: Resolve inconsistent check of hdwq in lpfc_scsi_cmd_iocb_cmpl
James Smart <[email protected]>
scsi: lpfc: Fix mailbox hang on adapter init
James Smart <[email protected]>
scsi: lpfc: Fix SLI3 commands being issued on SLI4 devices
Arnd Bergmann <[email protected]>
media: saa7146: avoid high stack usage with clang
James Smart <[email protected]>
scsi: lpfc: Fix io lost on host resets
James Smart <[email protected]>
scsi: lpfc: Fix fc4type information for FDMI
James Smart <[email protected]>
scsi: lpfc: Fix FDMI manufacturer attribute value
Jernej Skrabec <[email protected]>
media: cedrus: Add a quirk for not setting DMA offset
Hans Verkuil <[email protected]>
media: vim2m: replace devm_kzalloc by kzalloc
Hans Verkuil <[email protected]>
media: vimc: zero the media_device on probe
Steve Longerbeam <[email protected]>
media: imx: vdic: Restore default case to prepare_vdi_in_buffers()
Alexandre Courbot <[email protected]>
media: mtk-vcodec: fix access to vb2_v4l2_buffer struct
Arnd Bergmann <[email protected]>
media: go7007: avoid clang frame overflow warning with KASAN
Arnd Bergmann <[email protected]>
media: vicodec: avoid clang frame size warning
Hans Verkuil <[email protected]>
media: gspca: do not resubmit URBs when streaming has stopped
Helen Fornazier <[email protected]>
media: vimc: stream: fix thread state before sleep
Kangjie Lu <[email protected]>
scsi: ufs: fix a missing check of devm_reset_control_get
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Set stream->mode_changed when connectors change
Martin Leung <[email protected]>
drm/amd/display: half bandwidth for YCbCr420 during validation
David Francis <[email protected]>
drm/amd/display: Re-add custom degamma support
Murton Liu <[email protected]>
drm/amd/display: Fix Divide by 0 in memory calculations
Arnd Bergmann <[email protected]>
media: staging: davinci_vpfe: disallow building with COMPILE_TEST
Wenjing Liu <[email protected]>
drm/amd/display: add pipe lock during stream update
James Hutchinson <[email protected]>
media: m88ds3103: serialize reset messages in m88ds3103_set_frontend
Stefan Brüns <[email protected]>
media: dvbsky: Avoid leaking dvb frontend
Kangjie Lu <[email protected]>
media: si2165: fix a missing check of return value
Kai-Heng Feng <[email protected]>
igb: Exclude device from suspend direct complete optimization
Noralf Trønnes <[email protected]>
tinydrm/mipi-dbi: Use dma-safe buffers for all SPI transfers
Kai-Heng Feng <[email protected]>
e1000e: Disable runtime PM on CNP+
Akeem G Abodunrin <[email protected]>
ice: Fix issue with VF reset and multiple VFs support on PFs
Hans Verkuil <[email protected]>
media: vicodec: reset last_src/dst_buf based on the IS_OUTPUT
Arnd Bergmann <[email protected]>
media: staging/intel-ipu3: mark PM function as __maybe_unused
Akinobu Mita <[email protected]>
media: ov7670: restore default settings after power-up
Sakari Ailus <[email protected]>
media: v4l2-fwnode: The first default data lane is 0 on C-PHY
Kangjie Lu <[email protected]>
thunderbolt: property: Fix a NULL pointer dereference
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Reset alpha state for planes to the correct values
David Francis <[email protected]>
drm/amd/display: Update ABM crtc state on non-modeset
Samson Tam <[email protected]>
drm/amd/display: Link train only when link is DP and backend is enabled
Dmytro Laktyushkin <[email protected]>
drm/amd/display: fix releasing planes when exiting odm
Arnd Bergmann <[email protected]>
regulator: add regulator_get_linear_step() stub helper
Arnd Bergmann <[email protected]>
spi: export tracepoint symbols to modules
Aditya Pakki <[email protected]>
thunderbolt: Fix to check for kmemdup failure
Aditya Pakki <[email protected]>
thunderbolt: Fix to check return value of ida_simple_get
Rouven Czerwinski <[email protected]>
hwrng: omap - Set default quality
George Hilliard <[email protected]>
staging: mt7621-mmc: Check for nonzero number of scatterlist entries
Saeed Mahameed <[email protected]>
net/mlx5e: Fix compilation warning in en_tc.c
Pu Wen <[email protected]>
x86/CPU/hygon: Fix phys_proc_id calculation logic for multi-die processors
Sameer Pujar <[email protected]>
dmaengine: tegra210-adma: use devm_clk_*() helpers
Linus Lüssing <[email protected]>
batman-adv: allow updating DAT entry timeouts on incoming ARP Replies
Arnd Bergmann <[email protected]>
selinux: avoid uninitialized variable warning
Dave Ertman <[email protected]>
ice: Prevent unintended multiple chain resets
Dafna Hirschfeld <[email protected]>
media: vicodec: bugfix - call v4l2_m2m_buf_copy_metadata also if decoding fails
Arnd Bergmann <[email protected]>
scsi: lpfc: avoid uninitialized variable warning
Arnd Bergmann <[email protected]>
scsi: qla4xxx: avoid freeing unallocated dma memory
Anirudh Venkataramanan <[email protected]>
ice: Fix for adaptive interrupt moderation
Tony Lindgren <[email protected]>
usb: core: Add PM runtime calls to usb_hcd_platform_shutdown
Ludovic Barre <[email protected]>
spi: stm32-qspi: add spi_master_put in release function
Leon Romanovsky <[email protected]>
RDMA/rxe: Fix slab-out-bounds access which lead to kernel crash later
Kangjie Lu <[email protected]>
x86/platform/uv: Fix missing checks of kcalloc() return values
Neeraj Upadhyay <[email protected]>
rcu: Do a single rhp->func read in rcu_head_after_call_rcu()
Paul E. McKenney <[email protected]>
rcuperf: Fix cleanup path for invalid perf_type strings
Yazen Ghannam <[email protected]>
x86/mce: Handle varying MCA bank counts
Paul E. McKenney <[email protected]>
rcutorture: Fix cleanup path for invalid torture_type strings
Tony Luck <[email protected]>
x86/mce: Fix machine_check_poll() tests for error types
Leon Romanovsky <[email protected]>
overflow: Fix -Wtype-limits compilation warnings
George Hilliard <[email protected]>
staging: mt7621-mmc: Initialize completions a single time during probe
Kangjie Lu <[email protected]>
tty: ipwireless: fix missing checks for ioremap
Pankaj Gupta <[email protected]>
virtio_console: initialize vtermno value for ports
Thierry Escande <[email protected]>
misc: fastrpc: Fix a possible double free
Srinivas Kandagatla <[email protected]>
misc: fastrpc: make sure memory read and writes are visible
Srinivas Kandagatla <[email protected]>
misc: fastrpc: consider address offset before sending to DSP
Chad Dupuis <[email protected]>
scsi: qedf: Add missing return in qedf_post_io_req() in the fcport offload check
Artemy Kovalyov <[email protected]>
IB/mlx5: Compare only index part of a memory window rkey
Thomas Gleixner <[email protected]>
timekeeping: Force upper bound for setting CLOCK_REALTIME
Laurent Pinchart <[email protected]>
drm: rcar-du: lvds: Fix post-DLL divider calculation
Laurent Pinchart <[email protected]>
drm: rcar-du: lvds: Set LVEN and LVRES bits together on D3
Aditya Pakki <[email protected]>
thunderbolt: Fix to check the return value of kmemdup
Kangjie Lu <[email protected]>
thunderbolt: property: Fix a missing check of kzalloc
Alexandre Courbot <[email protected]>
media: mtk-vcodec: fix access to incorrect planes member
Ard Biesheuvel <[email protected]>
efifb: Omit memory map check on legacy boot
Ezequiel Garcia <[email protected]>
media: gspca: Kill URBs on USB device disconnect
Dan Carpenter <[email protected]>
media: wl128x: prevent two potential buffer overflows
Kangjie Lu <[email protected]>
media: video-mux: fix null pointer dereferences
Tetsuo Handa <[email protected]>
kobject: Don't trigger kobject_uevent(KOBJ_REMOVE) twice.
Oded Gabbay <[email protected]>
habanalabs: prevent CPU soft lockup on Palladium
Sowjanya Komatineni <[email protected]>
spi: tegra114: reset controller on probe
Hans de Goede <[email protected]>
HID: logitech-hidpp: change low battery level threshold from 31 to 30 percent
Takeshi Kihara <[email protected]>
clk: renesas: rcar-gen3: Correct parent clock of Audio-DMAC
Ming Lei <[email protected]>
block: pass page to xen_biovec_phys_mergeable
Ming Lei <[email protected]>
block: avoid to break XEN by multi-page bvec
Takeshi Kihara <[email protected]>
clk: renesas: rcar-gen3: Correct parent clock of SYS-DMAC
Gustavo A. R. Silva <[email protected]>
cxgb3/l2t: Fix undefined behaviour
Wen Yang <[email protected]>
ASoC: wcd9335: fix a leaked reference by adding missing of_node_put
Wen Yang <[email protected]>
ASoC: fsl_utils: fix a leaked reference by adding missing of_node_put
Wen Yang <[email protected]>
ASoC: eukrea-tlv320: fix a leaked reference by adding missing of_node_put
Nicolas Saenz Julienne <[email protected]>
HID: core: move Usage Page concatenation to Main item
Geert Uytterhoeven <[email protected]>
sh: sh7786: Add explicit I/O cast to sh7786_mm_sel()
Leon Romanovsky <[email protected]>
RDMA/hns: Fix bad endianess of port_pd variable
Chengguang Xu <[email protected]>
chardev: add additional check for minor range overlap
Peter Zijlstra <[email protected]>
x86/uaccess: Fix up the fixup
Peter Zijlstra <[email protected]>
x86/ia32: Fix ia32_restore_sigcontext() AC leak
Peter Zijlstra <[email protected]>
x86/uaccess, signal: Fix AC=1 bloat
Johannes Berg <[email protected]>
iwlwifi: mvm: IBSS: use BE FIFO for multicast
Peter Zijlstra <[email protected]>
x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP
Lior David <[email protected]>
wil6210: fix return code of wmi_mgmt_tx and wmi_mgmt_tx_ext
Peter Zijlstra <[email protected]>
locking/static_key: Fix false positive warnings on concurrent dec/inc
Wen Yang <[email protected]>
arm64: cpu_ops: fix a leaked reference by adding missing of_node_put
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Prevent cursor hotspot overflow for RV overlay planes
Yannick Fertré <[email protected]>
drm/panel: otm8009a: Add delay at the end of initialization
Stanley Chu <[email protected]>
scsi: ufs: Avoid configuring regulator with undefined voltage range
Stanley Chu <[email protected]>
scsi: ufs: Fix regulator load and icc-level configuration
Ping-Ke Shih <[email protected]>
rtlwifi: fix potential NULL pointer dereference
Geert Uytterhoeven <[email protected]>
spi: Add missing error handling for CS GPIOs
Alexandre Belloni <[email protected]>
rtc: xgene: fix possible race condition
Piotr Figiel <[email protected]>
brcmfmac: fix Oops when bringing up interface during USB disconnect
Piotr Figiel <[email protected]>
brcmfmac: fix race during disconnect when USB completion is in progress
Piotr Figiel <[email protected]>
brcmfmac: fix WARNING during USB disconnect in case of unempty psq
Piotr Figiel <[email protected]>
brcmfmac: convert dev_init_lock mutex to completion
Arnd Bergmann <[email protected]>
b43: shut up clang -Wuninitialized variable warning
Kangjie Lu <[email protected]>
brcmfmac: fix missing checks for kmemdup
YueHaibing <[email protected]>
mwifiex: Fix mem leak in mwifiex_tm_cmd
Kangjie Lu <[email protected]>
rtlwifi: fix a potential NULL pointer dereference
Daniel T. Lee <[email protected]>
selftests/bpf: ksym_search won't check symbols exists
Jian Shen <[email protected]>
net: hns3: add protect when handling mac addr list
Huazhong Tan <[email protected]>
net: hns3: check resetting status in hns3_get_stats()
Justin Chen <[email protected]>
iio: adc: ti-ads7950: Fix improper use of mlock
Nathan Chancellor <[email protected]>
iio: common: ssp_sensors: Initialize calculated_time in ssp_common_process_data
Kangjie Lu <[email protected]>
iio: hmc5843: fix potential NULL pointer dereferences
Lars-Peter Clausen <[email protected]>
iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion
Wen Yang <[email protected]>
drm/pl111: fix possible object reference leak
Ranjani Sridharan <[email protected]>
ASoC: core: remove link components before cleaning up card resources
Charles Keepax <[email protected]>
regulator: core: Avoid potential deadlock on regulator_unregister
Andrey Smirnov <[email protected]>
spi: Don't call spi_get_gpio_descs() before device name is set
Kees Cook <[email protected]>
x86/build: Keep local relocations with ld.lld
Alexei Starovoitov <[email protected]>
samples/bpf: fix build with new clang
Oded Gabbay <[email protected]>
habanalabs: all FD must be closed before removing device
Oded Gabbay <[email protected]>
habanalabs: prevent device PTE read/write during hard-reset
David Kozub <[email protected]>
block: sed-opal: fix IOC_OPAL_ENABLE_DISABLE_MBR
Wen Yang <[email protected]>
cpufreq: ap806: fix possible object reference leak
Wen Yang <[email protected]>
cpufreq: imx6q: fix possible object reference leak
Wen Yang <[email protected]>
cpufreq: kirkwood: fix possible object reference leak
Wen Yang <[email protected]>
cpufreq: pmac32: fix possible object reference leak
Wen Yang <[email protected]>
cpufreq/pasemi: fix possible object reference leak
Wen Yang <[email protected]>
cpufreq: ppc_cbe: fix possible object reference leak
Huazhong Tan <[email protected]>
net: hns3: add error handler for initializing command queue
Kristian Evensen <[email protected]>
qmi_wwan: Add quirk for Quectel dynamic config
Huazhong Tan <[email protected]>
net: hns3: fix keep_alive_timer not stop problem
Roman Gushchin <[email protected]>
selftests: cgroup: fix cleanup path in test_memcg_subtree_control()
Wenjing Liu <[email protected]>
drm/amd/display: use proper formula to calculate bandwidth from timing
Arnd Bergmann <[email protected]>
s390: cio: fix cio_irb declaration
Thomas Huth <[email protected]>
s390/mm: silence compiler warning when compiling without CONFIG_PGSTE
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Initialize stream_update with memset
Borislav Petkov <[email protected]>
x86/microcode: Fix the ancient deprecated microcode loading method
Arnd Bergmann <[email protected]>
s390: zcrypt: initialize variables before_use
Michael Tretter <[email protected]>
clk: zynqmp: fix check for fractional clock
Douglas Anderson <[email protected]>
clk: rockchip: Make rkpwm a critical clock on rk3288
Charles Keepax <[email protected]>
extcon: arizona: Disable mic detect if running when driver is removed
Douglas Anderson <[email protected]>
clk: rockchip: Fix video codec clocks on rk3288
Ulf Hansson <[email protected]>
PM / core: Propagate dev->power.wakeup_path when no callbacks
Christian König <[email protected]>
drm/amdgpu: fix old fence check in amdgpu_fence_emit
Peng Li <[email protected]>
net: hns3: free the pending skb when clean RX ring
Yinbo Zhu <[email protected]>
mmc: sdhci-of-esdhc: add erratum eSDHC-A001 and A-008358 support
Yinbo Zhu <[email protected]>
mmc: sdhci-of-esdhc: add erratum A-009204 support
Yinbo Zhu <[email protected]>
mmc: sdhci-of-esdhc: add erratum eSDHC5 support
Kangjie Lu <[email protected]>
mmc_spi: add a status check for spi_sync_locked
Andrea Merello <[email protected]>
mmc: core: make pwrseq_emmc (partially) support sleepy GPIO controllers
John Garry <[email protected]>
scsi: libsas: Do discovery on empty PHY to update PHY info
Guenter Roeck <[email protected]>
hwmon: (f71805f) Use request_muxed_region for Super-IO accesses
Guenter Roeck <[email protected]>
hwmon: (pc87427) Use request_muxed_region for Super-IO accesses
Guenter Roeck <[email protected]>
hwmon: (smsc47b397) Use request_muxed_region for Super-IO accesses
Guenter Roeck <[email protected]>
hwmon: (smsc47m1) Use request_muxed_region for Super-IO accesses
Guenter Roeck <[email protected]>
hwmon: (vt1211) Use request_muxed_region for Super-IO accesses
Enric Balletbo i Serra <[email protected]>
PM / devfreq: Fix static checker warning in try_then_request_governor
Kan Liang <[email protected]>
perf/x86/intel/cstate: Add Icelake support
Kan Liang <[email protected]>
perf/x86/intel/rapl: Add Icelake support
Kan Liang <[email protected]>
perf/x86/msr: Add Icelake support
Eric Biggers <[email protected]>
fscrypt: use READ_ONCE() to access ->i_crypt_info
Colin Ian King <[email protected]>
RDMA/cxgb4: Fix null pointer dereference on alloc_skb failure
Vincenzo Frascino <[email protected]>
arm64: vdso: Fix clock_getres() for CLOCK_REALTIME
Kefeng Wang <[email protected]>
ACPI/IORT: Reject platform device creation on NUMA node mapping failure
Nicholas Nunley <[email protected]>
i40e: don't allow changes to HW VLAN stripping on active port VLANs
Adam Ludkiewicz <[email protected]>
i40e: Able to add up to 16 MAC filters on an untrusted VF
Ioana Ciocoi Radulescu <[email protected]>
dpaa2-eth: Fix Rx classification status
Arnd Bergmann <[email protected]>
phy: ti: usb2: fix OMAP_CONTROL_PHY dependency
Arnd Bergmann <[email protected]>
phy: mapphone-mdm6600: add gpiolib dependency
Paul Kocialkowski <[email protected]>
phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode
Evan Green <[email protected]>
dt-bindings: phy-qcom-qmp: Add UFS PHY reset
Russell King <[email protected]>
drm: etnaviv: avoid DMA API warning when importing buffers
Thomas Gleixner <[email protected]>
x86/irq/64: Limit IST stack overflow check to #DB stack
Alan Stern <[email protected]>
USB: core: Don't unbind interfaces following device reset failure
Julian Wiedmann <[email protected]>
s390/qeth: handle error from qeth_update_from_chp_desc()
Mika Westerberg <[email protected]>
thunderbolt: Take domain lock in switch sysfs attribute callbacks
Nicholas Piggin <[email protected]>
irq_work: Do not raise an IPI when queueing work on the local CPU
Luca Weiss <[email protected]>
drm/msm: Fix NULL pointer dereference
Sean Paul <[email protected]>
drm/msm: dpu: Don't set frame_busy_mask for async updates
Wen Yang <[email protected]>
drm/msm: a5xx: fix possible object reference leak
Jeykumar Sankaran <[email protected]>
drm/msm/dpu: release resources on modeset failure
Nicholas Mc Guire <[email protected]>
staging: vc04_services: handle kzalloc failure
Konstantin Khlebnikov <[email protected]>
sched/core: Handle overflow in cpu_shares_write_u64
Konstantin Khlebnikov <[email protected]>
sched/rt: Check integer overflow at usec to nsec conversion
Konstantin Khlebnikov <[email protected]>
sched/core: Check quota and period overflow at usec to nsec conversion
Roman Gushchin <[email protected]>
cgroup: protect cgroup->nr_(dying_)descendants by css_set_lock
Sebastian Andrzej Siewior <[email protected]>
random: add a spinlock_t to struct batched_entropy
Jon DeVree <[email protected]>
random: fix CRNG initialization when random.trust_cpu=1
Russell Currey <[email protected]>
powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX
Nathan Lynch <[email protected]>
powerpc/numa: improve control of topology updates
Yufen Yu <[email protected]>
block: fix use-after-free on gendisk
Fabrice Gasnier <[email protected]>
iio: adc: stm32-dfsdm: fix unmet direct dependencies detected
Dan Carpenter <[email protected]>
media: pvrusb2: Prevent a buffer overflow
Shuah Khan <[email protected]>
media: au0828: Fix NULL pointer dereference in au0828_analog_stream_enable()
Hugues Fruchet <[email protected]>
media: stm32-dcmi: fix crash when subdev do not expose any formats
Wenwen Wang <[email protected]>
audit: fix a memory leak bug
Akinobu Mita <[email protected]>
media: ov2659: make S_FMT succeed even if requested format doesn't match
Hans Verkuil <[email protected]>
media: au0828: stop video streaming only when last user stops
Janusz Krzysztofik <[email protected]>
media: ov6650: Move v4l2_clk_get() to ov6650_video_probe() helper
Philipp Zabel <[email protected]>
media: coda: clear error return value before picture run
Nicolas Ferre <[email protected]>
dmaengine: at_xdmac: remove BUG_ON macro in tasklet
Robin Murphy <[email protected]>
perf/arm-cci: Remove broken race mitigation
Douglas Anderson <[email protected]>
clk: rockchip: undo several noc and special clocks as critical on rk3288
Wen Yang <[email protected]>
pinctrl: samsung: fix leaked of_node references
Wen Yang <[email protected]>
pinctrl: st: fix leaked of_node references
Wen Yang <[email protected]>
pinctrl: pistachio: fix leaked of_node references
Hans de Goede <[email protected]>
HID: logitech-hidpp: use RAP instead of FAP to get the protocol version
Sean Wang <[email protected]>
Bluetooth: mediatek: Fixed incorrect type in assignment
Ferry Toth <[email protected]>
Bluetooth: btbcm: Add default address for BCM43341B
Balakrishna Godavarthi <[email protected]>
Bluetooth: hci_qca: Give enough time to ROME controller to bootup.
Matthias Kaehlcke <[email protected]>
Bluetooth: hci_qca: Fix crash with non-serdev devices
Peter Zijlstra <[email protected]>
mm/uaccess: Use 'unsigned long' to placate UBSAN warnings on older GCC versions
Jiri Kosina <[email protected]>
x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault()
Peter Zijlstra <[email protected]>
x86/uaccess: Dont leak the AC flag into __put_user() argument evaluation
Sebastian Andrzej Siewior <[email protected]>
smpboot: Place the __percpu annotation correctly
Kees Cook <[email protected]>
x86/build: Move _etext to actual end of .text
Farhan Ali <[email protected]>
vfio-ccw: Release any channel program when releasing/removing vfio-ccw mdev
Farhan Ali <[email protected]>
vfio-ccw: Do not call flush_workqueue while holding the spinlock
Parav Pandit <[email protected]>
RDMA/cma: Consider scope_id while binding to ipv6 ll address
Arnd Bergmann <[email protected]>
bcache: avoid clang -Wunintialized warning
Coly Li <[email protected]>
bcache: add failure check to run_cache_set() for journal replay
Tang Junhui <[email protected]>
bcache: fix failure in journal relplay
Coly Li <[email protected]>
bcache: return error immediately in bch_journal_replay()
Shenghui Wang <[email protected]>
bcache: avoid potential memleak of list of journal_replay(s) in the CACHE_SYNC branch of run_cache_set
Corentin Labbe <[email protected]>
crypto: sun4i-ss - Fix invalid calculation of hash end
Sagi Grimberg <[email protected]>
nvme-tcp: fix a NULL deref when an admin connect times out
Sagi Grimberg <[email protected]>
nvme-rdma: fix a NULL deref when an admin connect times out
Sagi Grimberg <[email protected]>
nvme: set 0 capacity if namespace block size exceeds PAGE_SIZE
Kangjie Lu <[email protected]>
net: cw1200: fix a NULL pointer dereference
Aditya Pakki <[email protected]>
rsi: Fix NULL pointer dereference in kmalloc
Dan Carpenter <[email protected]>
mwifiex: prevent an array overflow
Xiaoli Feng <[email protected]>
Fix nfs4.2 return -EINVAL when do dedupe operation
Daniel Baluta <[email protected]>
ASoC: fsl_sai: Update is_slave_mode with correct value
Linus Walleij <[email protected]>
regulator: core: Actually put the gpiod after use
Kangjie Lu <[email protected]>
slimbus: fix a potential NULL pointer dereference in of_qcom_slim_ngd_register
Daniel T. Lee <[email protected]>
libbpf: fix samples/bpf build failure due to undefined UINT32_MAX
Masahiro Yamada <[email protected]>
drm: prefix header search paths with $(srctree)/
Sergey Matyukevich <[email protected]>
mac80211/cfg80211: update bss channel on channel switch
Sugar Zhang <[email protected]>
dmaengine: pl330: _stop: clear interrupt status
Huazhong Tan <[email protected]>
net: hns3: use atomic_t replace u32 for arq's count
Will Deacon <[email protected]>
arm64: futex: Fix FUTEX_WAKE_OP atomic ops with non-zero result value
Arnd Bergmann <[email protected]>
s390: qeth: address type mismatch warning
Heiner Kallweit <[email protected]>
net: phy: improve genphy_soft_reset
Yunsheng Lin <[email protected]>
net: hns3: fix for TX clean num when cleaning TX BD
Huazhong Tan <[email protected]>
net: hns3: fix pause configure fail problem
Mariusz Bialonczyk <[email protected]>
w1: fix the resume command API
Grygorii Strashko <[email protected]>
net: ethernet: ti: cpsw: fix allmulti cfg in dual_mac mode
Nicholas Piggin <[email protected]>
sched/nohz: Run NOHZ idle load balancer on HK_FLAG_MISC CPUs
Bard liao <[email protected]>
ALSA: hda: fix unregister device twice on ASoC driver
Philipp Rudo <[email protected]>
s390/kexec_file: Fix detection of text segment in ELF loader
Manish Rangankar <[email protected]>
scsi: qedi: Abort ep termination if offload not scheduled
Fabien Dessenne <[email protected]>
rtc: stm32: manage the get_irq probe defer case
Sven Van Asbroeck <[email protected]>
rtc: 88pm860x: prevent use-after-free on device remove
Johannes Berg <[email protected]>
iwlwifi: pcie: don't crash on invalid RX interrupt
Qu Wenruo <[email protected]>
btrfs: Don't panic when we can't find a root key
Josef Bacik <[email protected]>
btrfs: fix panic during relocation after ENOSPC before writeback happens
Robbie Ko <[email protected]>
Btrfs: fix data bytes_may_use underflow with fallocate due to failed quota reserve
Nadav Amit <[email protected]>
x86/modules: Avoid breaking W^X while loading modules
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix hardirq-unsafe locking
Bart Van Assche <[email protected]>
scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session()
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending()
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix a qla24xx_enable_msix() error path
Viresh Kumar <[email protected]>
cpufreq: Fix kobject memleak
Nicholas Piggin <[email protected]>
powerpc/watchdog: Use hrtimers for per-CPU heartbeat
Nadav Amit <[email protected]>
x86/ftrace: Set trampoline pages as executable
Lorenzo Bianconi <[email protected]>
mt76: remove mt76_queue dependency from tx_queue_skb function pointer
Qian Cai <[email protected]>
arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable
Marc Zyngier <[email protected]>
ARM: vdso: Remove dependency with the arch_timer driver internals
Fabien Dessenne <[email protected]>
media: stm32-dcmi: return appropriate error codes during probe
Jon Derrick <[email protected]>
drm/nouveau/bar/nv50: ensure BAR is mapped
Pierre-Louis Bossart <[email protected]>
ACPI / property: fix handling of data_nodes in acpi_get_next_subnode()
Dan Carpenter <[email protected]>
brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler()
Bodong Wang <[email protected]>
net/mlx5: E-Switch, Use atomic rep state to serialize state change
Flavio Suligoi <[email protected]>
spi: pxa2xx: fix SCR (divisor) calculation
Arnd Bergmann <[email protected]>
ASoC: imx: fix fiq dependencies
Claudiu Beznea <[email protected]>
spi: atmel-quadspi: fix crash while suspending
Anju T Sudhakar <[email protected]>
powerpc/perf: Fix loop exit condition in nest_imc_event_init
Bo YU <[email protected]>
powerpc/boot: Fix missing check of lseek() return value
Anju T Sudhakar <[email protected]>
powerpc/perf: Return accordingly on invalid chip-id in
Jerome Brunet <[email protected]>
ASoC: hdmi-codec: unlock the device on startup errors
Fei Yang <[email protected]>
usb: gadget: f_fs: don't free buffer prematurely
Marek Szyprowski <[email protected]>
usb: dwc3: move synchronize_irq() out of the spinlock protected block
Minas Harutyunyan <[email protected]>
usb: dwc2: gadget: Increase descriptors count for ISOC's
Mac Chiang <[email protected]>
ASoC: Intel: kbl_da7219_max98357a: Map BTN_0 to KEY_PLAYPAUSE
Wen Yang <[email protected]>
pinctrl: zte: fix leaked of_node references
João Paulo Rechi Vita <[email protected]>
Bluetooth: Ignore CC events not matching the last HCI command
Haiyang Zhang <[email protected]>
hv_netvsc: fix race that may miss tx queue wakeup
Sameeh Jubran <[email protected]>
net: ena: fix: set freed objects to NULL to avoid failing future allocations
Sameeh Jubran <[email protected]>
net: ena: gcc 8: fix compilation warning
Sameer Pujar <[email protected]>
dmaengine: tegra210-dma: free dma controller in remove()
Ming Lei <[email protected]>
blk-mq: grab .q_usage_counter when queuing request from plug code path
Ming Lei <[email protected]>
blk-mq: split blk_mq_alloc_and_init_hctx into two parts
Tony Nguyen <[email protected]>
ice: Preserve VLAN Rx stripping settings
Tony Nguyen <[email protected]>
ice: Separate if conditions for ice_set_features()
Masahiro Yamada <[email protected]>
bpftool: exclude bash-completion/bpftool from .gitignore pattern
Yonghong Song <[email protected]>
selftests/bpf: set RLIMIT_MEMLOCK properly for test_libbpf_open.c
Björn Töpel <[email protected]>
libbpf: fix invalid munmap call
Martyna Szapar <[email protected]>
i40e: Fix of memory leak and integer truncation in i40e_virtchnl.c
Vineet Gupta <[email protected]>
tools/bpf: fix perf build error with uClibc (seen on ARC)
Raul E Rangel <[email protected]>
mmc: core: Verify SD bus width
Andreas Gruenbacher <[email protected]>
gfs2: Fix occasional glock use-after-free
Mike Marciniszyn <[email protected]>
IB/hfi1: Fix WQ_MEM_RECLAIM warning
Shenghui Wang <[email protected]>
io_uring: use cpu_online() to check p->sq_thread_cpu instead of cpu_possible()
Abhi Das <[email protected]>
gfs2: fix race between gfs2_freeze_func and unmount
Roberto Bergantinos Corpas <[email protected]>
NFS: make nfs_match_client killable
David Howells <[email protected]>
afs: Fix getting the afs.fid xattr
YueHaibing <[email protected]>
cxgb4: Fix error path in cxgb4_init_module
Ross Lagerwall <[email protected]>
gfs2: Fix lru_count going negative
David Sterba <[email protected]>
Revert "btrfs: Honour FITRIM range constraints during free space trim"
Kristian Evensen <[email protected]>
netfilter: ctnetlink: Resolve conntrack L3-protocol flush regression
Al Viro <[email protected]>
acct_on(): don't mess with freeze protection
YueHaibing <[email protected]>
at76c50x-usb: Don't register led_trigger if usb_register_driver failed
Linus Lüssing <[email protected]>
batman-adv: mcast: fix multicast tt/tvlv worker locking
Eric Dumazet <[email protected]>
bpf: devmap: fix use-after-free Read in __dev_map_entry_free
YueHaibing <[email protected]>
ssb: Fix possible NULL pointer dereference in ssb_host_pcmcia_exit
Alexander Potapenko <[email protected]>
media: vivid: use vfree() instead of kfree() for dev->bitmap_cap
Hans Verkuil <[email protected]>
media: vb2: add waiting_in_dqbuf flag
YueHaibing <[email protected]>
media: serial_ir: Fix use-after-free in serial_ir_init_module
YueHaibing <[email protected]>
media: cpia2: Fix use-after-free in cpia2_exit
Jiufei Xue <[email protected]>
fbdev: fix WARNING in __alloc_pages_nodemask bug
Amir Goldstein <[email protected]>
ovl: relax WARN_ON() for overlapping layers use case
Will Deacon <[email protected]>
arm64: errata: Add workaround for Cortex-A76 erratum #1463225
Shile Zhang <[email protected]>
fbdev: fix divide error in fb_var_to_videomode
Tobin C. Harding <[email protected]>
btrfs: sysfs: don't leak memory when failing add fsid
Tobin C. Harding <[email protected]>
btrfs: sysfs: Fix error path kobject memory leak
Filipe Manana <[email protected]>
Btrfs: fix race between ranged fsync and writeback of adjacent ranges
Filipe Manana <[email protected]>
Btrfs: avoid fallback to transaction commit during fsync of files with holes
Filipe Manana <[email protected]>
Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path
Johnny Chang <[email protected]>
btrfs: Check the compression level before getting a workspace
Josef Bacik <[email protected]>
btrfs: don't double unlock on error in btrfs_punch_hole
Andreas Gruenbacher <[email protected]>
gfs2: Fix sign extension bug in gfs2_update_stats
Christoph Hellwig <[email protected]>
arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable
Will Deacon <[email protected]>
arm64: Kconfig: Make ARM64_PSEUDO_NMI depend on BROKEN for now
Ard Biesheuvel <[email protected]>
arm64/kernel: kaslr: reduce module randomization range to 2 GB
Dan Williams <[email protected]>
libnvdimm/pmem: Bypass CONFIG_HARDENED_USERCOPY overhead
Wanpeng Li <[email protected]>
KVM: nVMX: Fix using __this_cpu_read() in preemptible context
Suthikulpanit, Suravee <[email protected]>
kvm: svm/avic: fix off-by-one in checking host APIC ID
Peter Xu <[email protected]>
kvm: Check irqchip mode before assign irqfd
Dan Williams <[email protected]>
dax: Arrange for dax_supported check to span multiple devices
Tom Zanussi <[email protected]>
tracing: Add a check_val() check before updating cond_snapshot() track_val
Trac Hoang <[email protected]>
mmc: sdhci-iproc: Set NO_HISPD bit to fix HS50 data hold time problem
Trac Hoang <[email protected]>
mmc: sdhci-iproc: cygnus: Set NO_HISPD bit to fix HS50 data hold time problem
Daniel Axtens <[email protected]>
crypto: vmx - CTR: always increment IV as quadword
Eric Biggers <[email protected]>
crypto: hash - fix incorrect HASH_MAX_DESCSIZE
Martin K. Petersen <[email protected]>
Revert "scsi: sd: Keep disk read-only when re-reading partition"
Andrea Parri <[email protected]>
sbitmap: fix improper use of smp_mb__before_atomic()
Andrea Parri <[email protected]>
bio: fix improper use of smp_mb__before_atomic()
Borislav Petkov <[email protected]>
x86/kvm/pmu: Set AMD's virt PMU version to 1
Paolo Bonzini <[email protected]>
KVM: x86: fix return value for reserved EFER
Jan Kara <[email protected]>
ext4: wait for outstanding dio during truncate in nojournal mode
Jan Kara <[email protected]>
ext4: do not delete unlinked inode from orphan list on failed truncate
Steven Rostedt (VMware) <[email protected]>
x86: Hide the int3_emulate_call/jmp functions from UML
-------------
Diffstat:
Documentation/arm64/silicon-errata.txt | 1 + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 6 +- Makefile | 4 +- arch/arm/include/asm/cp15.h | 2 + arch/arm/vdso/vgettimeofday.c | 5 +- arch/arm64/Kconfig | 19 ++ arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/futex.h | 2 +- arch/arm64/include/asm/pgtable.h | 3 +- arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/cpu_errata.c | 24 ++ arch/arm64/kernel/cpu_ops.c | 1 + arch/arm64/kernel/kaslr.c | 6 +- arch/arm64/kernel/module.c | 2 +- arch/arm64/kernel/syscall.c | 31 +++ arch/arm64/kernel/vdso.c | 3 + arch/arm64/kernel/vdso/gettimeofday.S | 7 +- arch/arm64/mm/dma-mapping.c | 10 + arch/arm64/mm/fault.c | 37 ++- arch/powerpc/boot/addnote.c | 6 +- arch/powerpc/kernel/head_64.S | 4 +- arch/powerpc/kernel/watchdog.c | 81 +++--- arch/powerpc/mm/numa.c | 18 +- arch/powerpc/perf/imc-pmu.c | 7 +- arch/powerpc/platforms/powernv/opal-imc.c | 2 +- arch/s390/kernel/kexec_elf.c | 7 +- arch/s390/mm/pgtable.c | 2 + arch/sh/include/cpu-sh4/cpu/sh7786.h | 2 +- arch/x86/Makefile | 2 +- arch/x86/events/intel/cstate.c | 2 + arch/x86/events/intel/rapl.c | 2 + arch/x86/events/msr.c | 1 + arch/x86/ia32/ia32_signal.c | 29 +- arch/x86/include/asm/text-patching.h | 4 +- arch/x86/include/asm/uaccess.h | 7 +- arch/x86/kernel/alternative.c | 28 +- arch/x86/kernel/cpu/hygon.c | 5 + arch/x86/kernel/cpu/mce/core.c | 66 +++-- arch/x86/kernel/cpu/mce/inject.c | 14 +- arch/x86/kernel/cpu/microcode/core.c | 3 +- arch/x86/kernel/ftrace.c | 8 + arch/x86/kernel/irq_64.c | 19 +- arch/x86/kernel/module.c | 2 +- arch/x86/kernel/signal.c | 29 +- arch/x86/kernel/vmlinux.lds.S | 6 +- arch/x86/kvm/irq.c | 7 + arch/x86/kvm/irq.h | 1 + arch/x86/kvm/pmu_amd.c | 2 +- arch/x86/kvm/svm.c | 6 +- arch/x86/kvm/vmx/nested.c | 4 +- arch/x86/kvm/x86.c | 2 +- arch/x86/lib/memcpy_64.S | 3 +- arch/x86/mm/fault.c | 2 - arch/x86/platform/uv/tlb_uv.c | 7 +- block/bio.c | 2 + block/blk-mq-sched.c | 12 +- block/blk-mq.c | 139 +++++----- block/blk.h | 2 +- block/genhd.c | 19 ++ block/partition-generic.c | 7 + block/sed-opal.c | 9 +- crypto/hmac.c | 2 + drivers/acpi/arm64/iort.c | 19 +- drivers/acpi/property.c | 8 + drivers/base/power/main.c | 4 + drivers/bluetooth/btbcm.c | 4 +- drivers/bluetooth/btmtkuart.c | 2 +- drivers/bluetooth/hci_qca.c | 5 +- drivers/char/hw_random/omap-rng.c | 1 + drivers/char/random.c | 57 ++-- drivers/char/virtio_console.c | 3 +- drivers/clk/renesas/r8a774a1-cpg-mssr.c | 8 +- drivers/clk/renesas/r8a774c0-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7795-cpg-mssr.c | 8 +- drivers/clk/renesas/r8a7796-cpg-mssr.c | 8 +- drivers/clk/renesas/r8a77965-cpg-mssr.c | 8 +- drivers/clk/renesas/r8a77990-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 +- drivers/clk/rockchip/clk-rk3288.c | 21 +- drivers/clk/zynqmp/divider.c | 9 +- drivers/cpufreq/armada-8k-cpufreq.c | 1 + drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_governor.c | 2 + drivers/cpufreq/imx6q-cpufreq.c | 4 +- drivers/cpufreq/kirkwood-cpufreq.c | 19 +- drivers/cpufreq/pasemi-cpufreq.c | 1 + drivers/cpufreq/pmac32-cpufreq.c | 2 + drivers/cpufreq/ppc_cbe_cpufreq.c | 1 + drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 +- drivers/crypto/vmx/aesp8-ppc.pl | 2 +- drivers/dax/super.c | 88 ++++--- drivers/devfreq/devfreq.c | 4 +- drivers/dma/at_xdmac.c | 6 +- drivers/dma/pl330.c | 10 +- drivers/dma/tegra210-adma.c | 28 +- drivers/extcon/Kconfig | 2 +- drivers/extcon/extcon-arizona.c | 10 + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 24 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 81 +++++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 51 +--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 2 + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 4 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 20 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 19 +- .../drm/amd/display/modules/color/color_gamma.c | 2 + drivers/gpu/drm/arm/display/komeda/Makefile | 4 +- drivers/gpu/drm/drm_atomic_state_helper.c | 4 + drivers/gpu/drm/drm_drv.c | 5 +- drivers/gpu/drm/drm_file.c | 1 + drivers/gpu/drm/drm_writeback.c | 14 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 5 + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + drivers/gpu/drm/i915/gvt/Makefile | 2 +- drivers/gpu/drm/msm/Makefile | 6 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 15 +- drivers/gpu/drm/msm/msm_gem_vma.c | 2 +- drivers/gpu/drm/nouveau/Kbuild | 8 +- drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c | 12 +- drivers/gpu/drm/omapdrm/dss/dsi.c | 60 +++-- drivers/gpu/drm/omapdrm/omap_connector.c | 28 +- drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 3 + drivers/gpu/drm/pl111/pl111_versatile.c | 4 + drivers/gpu/drm/rcar-du/rcar_lvds.c | 10 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 8 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 2 + drivers/gpu/drm/tinydrm/ili9225.c | 6 +- drivers/gpu/drm/tinydrm/mipi-dbi.c | 58 ++-- drivers/gpu/drm/v3d/v3d_drv.c | 8 +- drivers/gpu/drm/v3d/v3d_drv.h | 2 +- drivers/gpu/drm/v3d/v3d_irq.c | 13 +- drivers/hid/hid-core.c | 36 ++- drivers/hid/hid-logitech-hidpp.c | 23 +- drivers/hwmon/f71805f.c | 15 +- drivers/hwmon/pc87427.c | 14 +- drivers/hwmon/smsc47b397.c | 13 +- drivers/hwmon/smsc47m1.c | 28 +- drivers/hwmon/vt1211.c | 15 +- drivers/iio/adc/Kconfig | 1 + drivers/iio/adc/ad_sigma_delta.c | 16 +- drivers/iio/adc/ti-ads7950.c | 19 +- drivers/iio/common/ssp_sensors/ssp_iio.c | 2 +- drivers/iio/magnetometer/hmc5843_i2c.c | 7 +- drivers/iio/magnetometer/hmc5843_spi.c | 7 +- drivers/infiniband/core/cma.c | 25 +- drivers/infiniband/hw/cxgb4/cm.c | 2 + drivers/infiniband/hw/hfi1/init.c | 3 +- drivers/infiniband/hw/hns/hns_roce_ah.c | 2 +- drivers/infiniband/hw/mlx5/odp.c | 11 +- drivers/infiniband/sw/rxe/rxe_mr.c | 11 +- drivers/md/bcache/alloc.c | 5 +- drivers/md/bcache/journal.c | 26 +- drivers/md/bcache/super.c | 25 +- drivers/md/dm-table.c | 17 +- drivers/md/dm.c | 20 ++ drivers/md/dm.h | 1 + drivers/media/common/videobuf2/videobuf2-core.c | 22 ++ drivers/media/dvb-frontends/m88ds3103.c | 9 +- drivers/media/dvb-frontends/si2165.c | 8 +- drivers/media/i2c/ov2659.c | 6 +- drivers/media/i2c/ov6650.c | 25 +- drivers/media/i2c/ov7670.c | 1 + drivers/media/pci/saa7146/hexium_gemini.c | 5 +- drivers/media/pci/saa7146/hexium_orion.c | 5 +- drivers/media/platform/coda/coda-bit.c | 3 + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 8 +- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 10 +- drivers/media/platform/stm32/stm32-dcmi.c | 20 +- drivers/media/platform/vicodec/codec-fwht.c | 29 +- drivers/media/platform/vicodec/vicodec-core.c | 24 +- drivers/media/platform/video-mux.c | 5 + drivers/media/platform/vim2m.c | 35 ++- drivers/media/platform/vimc/vimc-core.c | 2 + drivers/media/platform/vimc/vimc-streamer.c | 2 +- drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- drivers/media/radio/wl128x/fmdrv_common.c | 7 +- drivers/media/rc/serial_ir.c | 9 +- drivers/media/usb/au0828/au0828-video.c | 16 +- drivers/media/usb/cpia2/cpia2_v4l.c | 3 +- drivers/media/usb/dvb-usb-v2/dvbsky.c | 18 +- drivers/media/usb/go7007/go7007-fw.c | 4 +- drivers/media/usb/gspca/gspca.c | 12 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 + drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 1 + drivers/media/v4l2-core/v4l2-fwnode.c | 6 +- drivers/misc/fastrpc.c | 44 +++- drivers/misc/habanalabs/device.c | 32 ++- drivers/misc/habanalabs/goya/goya.c | 6 + drivers/misc/habanalabs/memory.c | 11 +- drivers/mmc/core/pwrseq_emmc.c | 38 +-- drivers/mmc/core/sd.c | 8 + drivers/mmc/host/mmc_spi.c | 4 + drivers/mmc/host/sdhci-iproc.c | 6 +- drivers/mmc/host/sdhci-of-esdhc.c | 8 + drivers/net/ethernet/amazon/ena/ena_netdev.c | 27 +- drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 15 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 7 +- drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 20 +- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 5 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 11 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 5 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 13 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 12 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 7 +- drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 22 +- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_lib.c | 4 + drivers/net/ethernet/intel/ice/ice_main.c | 25 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 292 +++++++++++++++++++-- drivers/net/ethernet/intel/ice/ice_txrx.h | 6 + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 20 +- drivers/net/ethernet/intel/igb/igb_main.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 38 ++- drivers/net/ethernet/ti/cpsw.c | 12 +- drivers/net/ethernet/ti/cpsw_ale.c | 19 +- drivers/net/ethernet/ti/cpsw_ale.h | 3 +- drivers/net/hyperv/netvsc.c | 15 +- drivers/net/phy/phy_device.c | 16 +- drivers/net/usb/qmi_wwan.c | 65 +++-- drivers/net/wireless/ath/wil6210/cfg80211.c | 5 + drivers/net/wireless/ath/wil6210/wmi.c | 11 +- drivers/net/wireless/atmel/at76c50x-usb.c | 4 +- drivers/net/wireless/broadcom/b43/phy_lp.c | 6 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 10 +- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 42 +-- .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 27 +- .../wireless/broadcom/brcm80211/brcmfmac/vendor.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 3 +- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 7 +- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 +- drivers/net/wireless/marvell/mwifiex/cfp.c | 3 + drivers/net/wireless/mediatek/mt76/dma.c | 3 +- drivers/net/wireless/mediatek/mt76/mt76.h | 4 +- drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 6 +- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 4 +- drivers/net/wireless/mediatek/mt76/tx.c | 10 +- drivers/net/wireless/mediatek/mt76/usb.c | 3 +- drivers/net/wireless/realtek/rtlwifi/base.c | 5 + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 2 + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 4 + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 30 ++- drivers/net/wireless/st/cw1200/main.c | 5 + drivers/nvdimm/pmem.c | 11 +- drivers/nvme/host/core.c | 7 +- drivers/nvme/host/rdma.c | 10 +- drivers/nvme/host/tcp.c | 8 +- drivers/perf/arm-cci.c | 21 +- drivers/phy/allwinner/phy-sun4i-usb.c | 4 + drivers/phy/motorola/Kconfig | 2 +- drivers/phy/ti/Kconfig | 2 +- drivers/pinctrl/pinctrl-pistachio.c | 2 + drivers/pinctrl/pinctrl-st.c | 15 +- drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 1 + drivers/pinctrl/zte/pinctrl-zx.c | 1 + drivers/regulator/core.c | 4 +- drivers/regulator/da9055-regulator.c | 2 + drivers/regulator/da9062-regulator.c | 2 + drivers/regulator/da9063-regulator.c | 5 +- drivers/regulator/da9211-regulator.c | 4 + drivers/regulator/lp8755.c | 15 +- drivers/regulator/ltc3589.c | 10 +- drivers/regulator/ltc3676.c | 10 +- drivers/regulator/pv88060-regulator.c | 4 + drivers/regulator/pv88080-regulator.c | 4 + drivers/regulator/pv88090-regulator.c | 4 + drivers/regulator/wm831x-dcdc.c | 4 + drivers/regulator/wm831x-isink.c | 2 + drivers/regulator/wm831x-ldo.c | 2 + drivers/rtc/rtc-88pm860x.c | 2 +- drivers/rtc/rtc-stm32.c | 9 +- drivers/rtc/rtc-xgene.c | 18 +- drivers/s390/block/dcssblk.c | 1 + drivers/s390/cio/cio.h | 2 +- drivers/s390/cio/vfio_ccw_drv.c | 32 ++- drivers/s390/cio/vfio_ccw_ops.c | 11 +- drivers/s390/crypto/zcrypt_api.c | 4 + drivers/s390/net/qeth_core.h | 10 +- drivers/s390/net/qeth_core_main.c | 14 +- drivers/scsi/libsas/sas_expander.c | 5 + drivers/scsi/lpfc/lpfc_ct.c | 22 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 15 +- drivers/scsi/lpfc/lpfc_init.c | 11 +- drivers/scsi/lpfc/lpfc_nvme.c | 8 +- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 14 +- drivers/scsi/qedf/qedf_io.c | 1 + drivers/scsi/qedi/qedi_iscsi.c | 3 + drivers/scsi/qla2xxx/qla_isr.c | 6 +- drivers/scsi/qla2xxx/qla_target.c | 25 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 7 +- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/sd.c | 3 +- drivers/scsi/ufs/ufs-hisi.c | 4 + drivers/scsi/ufs/ufshcd.c | 28 +- drivers/slimbus/qcom-ngd-ctrl.c | 4 + drivers/spi/atmel-quadspi.c | 6 +- drivers/spi/spi-imx.c | 2 +- drivers/spi/spi-pxa2xx.c | 8 +- drivers/spi/spi-rspi.c | 9 +- drivers/spi/spi-stm32-qspi.c | 46 ++-- drivers/spi/spi-tegra114.c | 32 ++- drivers/spi/spi-topcliff-pch.c | 15 +- drivers/spi/spi.c | 43 +-- drivers/ssb/bridge_pcmcia_80211.c | 9 +- drivers/staging/media/davinci_vpfe/Kconfig | 2 +- drivers/staging/media/imx/imx-media-vdic.c | 6 + drivers/staging/media/ipu3/ipu3.c | 2 +- drivers/staging/media/sunxi/cedrus/cedrus.h | 3 + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 3 +- drivers/staging/mt7621-mmc/sd.c | 27 +- .../interface/vchiq_arm/vchiq_2835_arm.c | 3 + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 2 + drivers/thunderbolt/icm.c | 5 + drivers/thunderbolt/property.c | 12 +- drivers/thunderbolt/switch.c | 67 ++--- drivers/thunderbolt/tb.h | 3 +- drivers/thunderbolt/xdomain.c | 8 +- drivers/tty/ipwireless/main.c | 8 + drivers/usb/core/hcd.c | 3 + drivers/usb/core/hub.c | 5 +- drivers/usb/dwc2/gadget.c | 27 +- drivers/usb/dwc3/core.c | 2 + drivers/usb/dwc3/gadget.c | 2 - drivers/usb/gadget/function/f_fs.c | 3 +- drivers/video/fbdev/core/fbcmap.c | 2 + drivers/video/fbdev/core/modedb.c | 3 + drivers/video/fbdev/efifb.c | 3 +- drivers/w1/w1_io.c | 3 +- drivers/xen/biomerge.c | 5 +- fs/afs/xattr.c | 15 +- fs/btrfs/compression.c | 1 + fs/btrfs/extent-tree.c | 28 +- fs/btrfs/file.c | 19 +- fs/btrfs/relocation.c | 31 ++- fs/btrfs/root-tree.c | 17 +- fs/btrfs/sysfs.c | 7 +- fs/btrfs/tree-log.c | 1 + fs/char_dev.c | 6 + fs/crypto/crypto.c | 2 +- fs/crypto/fname.c | 4 +- fs/crypto/keyinfo.c | 4 +- fs/crypto/policy.c | 6 +- fs/ext4/inode.c | 23 +- fs/gfs2/glock.c | 23 +- fs/gfs2/incore.h | 1 + fs/gfs2/lock_dlm.c | 9 +- fs/gfs2/log.c | 3 +- fs/gfs2/lops.c | 6 +- fs/gfs2/super.c | 8 +- fs/internal.h | 2 - fs/io_uring.c | 2 +- fs/nfs/client.c | 7 +- fs/nfs/nfs4file.c | 2 +- fs/overlayfs/dir.c | 2 +- fs/overlayfs/inode.c | 3 +- include/crypto/hash.h | 8 +- include/drm/tinydrm/mipi-dbi.h | 5 +- include/linux/bio.h | 2 +- include/linux/cgroup-defs.h | 5 + include/linux/dax.h | 26 ++ include/linux/filter.h | 1 + include/linux/fscrypt.h | 3 +- include/linux/genhd.h | 1 + include/linux/hid.h | 1 + include/linux/iio/adc/ad_sigma_delta.h | 1 + include/linux/mlx5/eswitch.h | 2 +- include/linux/mount.h | 2 + include/linux/overflow.h | 12 +- include/linux/rcupdate.h | 6 +- include/linux/regulator/consumer.h | 5 + include/linux/smpboot.h | 2 +- include/linux/time64.h | 21 ++ include/media/videobuf2-core.h | 1 + include/net/bluetooth/hci.h | 1 + include/xen/xen.h | 4 +- kernel/acct.c | 4 +- kernel/auditfilter.c | 12 +- kernel/auditsc.c | 10 +- kernel/bpf/devmap.c | 3 + kernel/cgroup/cgroup.c | 6 + kernel/irq_work.c | 75 +++--- kernel/jump_label.c | 21 +- kernel/module.c | 5 + kernel/rcu/rcuperf.c | 5 + kernel/rcu/rcutorture.c | 5 + kernel/sched/core.c | 9 +- kernel/sched/fair.c | 16 +- kernel/sched/rt.c | 5 + kernel/time/time.c | 2 +- kernel/time/timekeeping.c | 6 +- kernel/trace/trace_branch.c | 4 + kernel/trace/trace_events_hist.c | 6 + lib/kobject_uevent.c | 11 +- lib/sbitmap.c | 2 +- lib/strncpy_from_user.c | 5 +- lib/strnlen_user.c | 4 +- net/batman-adv/distributed-arp-table.c | 4 +- net/batman-adv/main.c | 1 + net/batman-adv/multicast.c | 11 +- net/batman-adv/types.h | 5 + net/bluetooth/hci_core.c | 5 + net/bluetooth/hci_event.c | 12 + net/bluetooth/hci_request.c | 5 + net/bluetooth/hci_request.h | 1 + net/mac80211/mlme.c | 3 - net/netfilter/nf_conntrack_netlink.c | 2 +- net/wireless/nl80211.c | 5 + samples/bpf/asm_goto_workaround.h | 1 + security/selinux/netlabel.c | 14 +- sound/pci/hda/hda_codec.c | 8 +- sound/soc/codecs/hdmi-codec.c | 6 +- sound/soc/codecs/wcd9335.c | 1 + sound/soc/fsl/Kconfig | 9 +- sound/soc/fsl/eukrea-tlv320.c | 4 +- sound/soc/fsl/fsl_sai.c | 2 + sound/soc/fsl/fsl_utils.c | 1 + sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- sound/soc/soc-core.c | 11 + sound/soc/ti/Kconfig | 4 +- sound/soc/ti/davinci-mcasp.c | 2 + tools/bpf/bpftool/.gitignore | 2 +- tools/lib/bpf/bpf.c | 2 + tools/lib/bpf/bpf.h | 1 + tools/lib/bpf/xsk.c | 77 +++--- tools/testing/selftests/bpf/test_libbpf_open.c | 2 + tools/testing/selftests/bpf/trace_helpers.c | 4 + tools/testing/selftests/cgroup/test_memcontrol.c | 38 +-- virt/kvm/eventfd.c | 9 + 444 files changed, 3433 insertions(+), 1514 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 55/405 i40e: Fix of memory leak and integer truncation in i40e_virtchnl.c
[ Upstream commit 24474f2709af6729b9b1da1c5e160ab62e25e3a4 ]
Fixed possible memory leak in i40e_vc_add_cloud_filter function:
cfilter is being allocated and in some error conditions the function returns without freeing the memory.
Fix of integer truncation from u16 (type of queue_id value) to u8 when calling i40e_vc_isvalid_queue_id function.
--- .../net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +10 -6
@@ -181,7 +181,7 @@ static inline bool i40e_vc_isvalid_vsi_id(struct i40e_vf *vf, u16 vsi_id)* check for the valid queue id **/ static inline bool i40e_vc_isvalid_queue_id (struct i40e_vf *vf,u16 vsi_id, -u8 qid) +u16 qid) {struct i40e_pf *pf = vf->pf;struct i40e_vsi *vsi =i40e_find_vsi_from_id (pf, vsi_id);
@@ -3374,7 +3374,7 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)if (!test_bit (I40E_VF_STATE_ACTIVE , &vf->vf_states)) { aq_ret =I40E_ERR_PARAM ; - goto err; + goto err_out; }if (!vf->adq_enabled) {
@@ -3382,7 +3382,7 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)"VF %d: ADq is not enabled, can't apply cloud filter\n" , vf->vf_id); aq_ret =I40E_ERR_PARAM ; - goto err; + goto err_out; }if (i40e_validate_cloud_filter (vf, vcf)) {
@@ -3390,7 +3390,7 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)"VF %d: Invalid input/s, can't apply cloud filter\n" , vf->vf_id); aq_ret =I40E_ERR_PARAM ; - goto err; + goto err_out; } cfilter =kzalloc (sizeof (*cfilter),GFP_KERNEL );
@@ -3451,13 +3451,17 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)"VF %d: Failed to add cloud filter, err %s aq_err %s\n" , vf->vf_id,i40e_stat_str (&pf->hw, ret), i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); - goto err; + goto err_free; }INIT_HLIST_NODE (&cfilter->cloud_node);hlist_add_head (&cfilter->cloud_node, &vf->cloud_filter_list); +/* release the pointer passing it to the collection */ + cfilter =NULL ; vf->num_cloud_filters++; -err: +err_free: +kfree (cfilter); +err_out:return i40e_vc_send_resp_to_vf (vf,VIRTCHNL_OP_ADD_CLOUD_FILTER , aq_ret); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/405 ice: Separate if conditions for ice_set_features()
In reply to Greg Kroah-Hartman[ Upstream commit 8f529ff912073f778e3cd74e87fb69a36499fc2f ]
Set features can have multiple features turned on|off in a single call. Grouping these all in an if/else means after one condition is met, other conditions/features will not be evaluated. Break the if/else statements by feature to ensure all features will be handled properly.
--- drivers/net/ethernet/intel/ice/ice_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +6 -2
@@ -2545,6 +2545,9 @@ static int ice_set_features(struct net_device *netdev,struct ice_vsi *vsi = np->vsi;int ret =0 ; +/* Multiple features can be changed in one call so keep features in +* separate if/else statements to guarantee each feature is checked +*/ if (features &NETIF_F_RXHASH && !(netdev->features &NETIF_F_RXHASH )) ret =ice_vsi_manage_rss_lut (vsi, true); else if (!(features & NETIF_F_RXHASH) &&
@@ -2557,8 +2560,9 @@ static int ice_set_features(struct net_device *netdev,else if (!(features &NETIF_F_HW_VLAN_CTAG_RX ) && (netdev->features &NETIF_F_HW_VLAN_CTAG_RX )) ret =ice_vsi_manage_vlan_stripping (vsi, false); -else if ((features &NETIF_F_HW_VLAN_CTAG_TX ) && - !(netdev->features &NETIF_F_HW_VLAN_CTAG_TX )) + +if ((features &NETIF_F_HW_VLAN_CTAG_TX ) && + !(netdev->features &NETIF_F_HW_VLAN_CTAG_TX )) ret =ice_vsi_manage_vlan_insertion (vsi);else if (!(features &NETIF_F_HW_VLAN_CTAG_TX ) && (netdev->features &NETIF_F_HW_VLAN_CTAG_TX ))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/405 ASoC: fsl_sai: Update is_slave_mode with correct value
In reply to Greg Kroah-Hartman[ Upstream commit ddb351145a967ee791a0fb0156852ec2fcb746ba ]
is_slave_mode defaults to false because sai structure that contains it is kzalloc'ed.
Anyhow, if we decide to set the following configuration SAI slave -> SAI master, is_slave_mode will remain set on true although SAI being master it should be set to false.
Fix this by updating is_slave_mode for each call of fsl_sai_set_dai_fmt.
--- sound/soc/fsl/fsl_sai.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/fsl/fsl_sai.c +2 -0
@@ -268,12 +268,14 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,case SND_SOC_DAIFMT_CBS_CFS : val_cr2 |=FSL_SAI_CR2_BCD_MSTR ; val_cr4 |=FSL_SAI_CR4_FSD_MSTR ; + sai->is_slave_mode = false;break ;case SND_SOC_DAIFMT_CBM_CFM : sai->is_slave_mode = true;break ;case SND_SOC_DAIFMT_CBS_CFM : val_cr2 |=FSL_SAI_CR2_BCD_MSTR ; + sai->is_slave_mode = false;break ;case SND_SOC_DAIFMT_CBM_CFS : val_cr4 |=FSL_SAI_CR4_FSD_MSTR ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/405 Fix nfs4.2 return -EINVAL when do dedupe operation
In reply to Greg Kroah-Hartman[ Upstream commit ce96e888fe48ecfa868c9a39adc03292c78a80ff ]
dedupe_file_range operations is combiled into remap_file_range. But in nfs42_remap_file_range, it's skiped for dedupe operations. Before this patch:
# dd if=/dev/zero of=nfs/file bs=1M count=1 # xfs_io -c "dedupe nfs/file 4k 64k 4k" nfs/file XFS_IOC_FILE_EXTENT_SAME: Invalid argument After this patch: # dd if=/dev/zero of=nfs/file bs=1M count=1 # xfs_io -c "dedupe nfs/file 4k 64k 4k" nfs/file deduped 4096/4096 bytes at offset 65536 4 KiB, 1 ops; 0.0046 sec (865.988 KiB/sec and 216.4971 ops/sec)
--- fs/nfs/nfs4file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4file.c +1 -1
@@ -187,7 +187,7 @@ static loff_t nfs42_remap_file_range(struct file *src_file, loff_t src_off,bool same_inode = false;int ret; -if (remap_flags & ~REMAP_FILE_ADVISORY ) +if (remap_flags & ~(REMAP_FILE_DEDUP |REMAP_FILE_ADVISORY ))return -EINVAL ;/* check alignment w.r.t. clone_blksize */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/405 crypto: sun4i-ss - Fix invalid calculation of hash end
In reply to Greg Kroah-Hartman[ Upstream commit f87391558acf816b48f325a493d81d45dec40da0 ]
When nbytes < 4, end is wronlgy set to a negative value which, due to uint, is then interpreted to a large value leading to a deadlock in the following code.
This patch fix this problem.
--- drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/sunxi-ss/sun4i-ss-hash.c +4 -1
@@ -240,7 +240,10 @@ static int sun4i_hash(struct ahash_request *areq) } }else {/* Since we have the flag final, we can go up to modulo 4 */ - end = ((areq->nbytes + op->len) /4 ) *4 - op->len; +if (areq->nbytes <4 ) + end =0 ; +else + end = ((areq->nbytes + op->len) /4 ) *4 - op->len; }/* TODO if SGlen % 4 and !op->len then DMA */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/405 bcache: avoid potential memleak of list of journal_replay(s) in the CACHE_SYNC branch of run_cache_set
In reply to Greg Kroah-Hartman[ Upstream commit 95f18c9d1310730d075499a75aaf13bcd60405a7 ]
In the CACHE_SYNC branch of run_cache_set(), LIST_HEAD(journal) is used to collect journal_replay(s) and filled by bch_journal_read().
If all goes well, bch_journal_replay() will release the list of jounal_replay(s) at the end of the branch.
If something goes wrong, code flow will jump to the label "err:" and leave the list unreleased.
This patch will release the list of journal_replay(s) in the case of error detected.
v1 -> v2:
* Move the release code to the location after label 'err:' to simply the change.
--- drivers/md/bcache/super.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/md/bcache/super.c +8 -0
@@ -1782,6 +1782,8 @@ static void run_cache_set(struct cache_set *c)struct cache *ca;struct closure cl;unsigned int i; +LIST_HEAD (journal); +struct journal_replay *l;closure_init_stack (&cl);
@@ -1939,6 +1941,12 @@ static void run_cache_set(struct cache_set *c)set_bit (CACHE_SET_RUNNING , &c->flags);return ; err: +while (!list_empty (&journal)) { + l = list_first_entry(&journal, struct journal_replay, list); +list_del (&l->list); +kfree (l); + } +closure_sync (&cl);/* XXX: test this, it's broken */ bch_cache_set_error (c,"%s" , err);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/405 smpboot: Place the __percpu annotation correctly
In reply to Greg Kroah-Hartman[ Upstream commit d4645d30b50d1691c26ff0f8fa4e718b08f8d3bb ]
The test robot reported a wrong assignment of a per-CPU variable which it detected by using sparse and sent a report. The assignment itself is correct. The annotation for sparse was wrong and hence the report. The first pointer is a "normal" pointer and points to the per-CPU memory area. That means that the __percpu annotation has to be moved.
Move the __percpu annotation to pointer which points to the per-CPU area. This change affects only the sparse tool (and is ignored by the compiler).
--- include/linux/smpboot.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/smpboot.h +1 -1
@@ -29,7 +29,7 @@ struct smpboot_thread_data;* @thread_comm: The base name of the thread */ struct smp_hotplug_thread { -struct task_struct __percpu **store; +struct task_struct *__percpu *store;struct list_head list;int (*thread_should_run)(unsigned int cpu);void (*thread_fn)(unsigned int cpu);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/405 brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler()
In reply to Greg Kroah-Hartman[ Upstream commit e025da3d7aa4770bb1d1b3b0aa7cc4da1744852d ]
If "ret_len" is negative then it could lead to a NULL dereference.
The "ret_len" value comes from nl80211_vendor_cmd(), if it's negative then we don't allocate the "dcmd_buf" buffer. Then we pass "ret_len" to brcmf_fil_cmd_data_set() where it is cast to a very high u32 value. Most of the functions in that call tree check whether the buffer we pass is NULL but there are at least a couple places which don't such as brcmf_dbg_hex_dump() and brcmf_msgbuf_query_dcmd(). We memcpy() to and from the buffer so it would result in a NULL dereference.
The fix is to change the types so that "ret_len" can't be negative. (If we memcpy() zero bytes to NULL, that's a no-op and doesn't cause an issue).
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c +3 -2
@@ -35,9 +35,10 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy,struct brcmf_if *ifp;const struct brcmf_vndr_dcmd_hdr *cmdhdr = data;struct sk_buff *reply; -int ret, payload, ret_len; +unsigned int payload, ret_len;void *dcmd_buf =NULL , *wr_pointer;u16 msglen, maxmsglen =PAGE_SIZE -0x100 ; +int ret;if (len <sizeof (*cmdhdr)) {brcmf_err ("vendor command too short: %d\n" , len);
@@ -65,7 +66,7 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy,brcmf_err ("oversize return buffer %d\n" , ret_len); ret_len =BRCMF_DCMD_MAXLEN ; } - payload =max (ret_len, len) +1 ; + payload = max_t(unsigned int, ret_len, len) + 1; dcmd_buf =vzalloc (payload);if (NULL == dcmd_buf)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/405 btrfs: fix panic during relocation after ENOSPC before writeback happens
In reply to Greg Kroah-Hartman[ Upstream commit ff612ba7849964b1898fd3ccd1f56941129c6aab ]
We've been seeing the following sporadically throughout our fleet
panic: kernel BUG at fs/btrfs/relocation.c:4584!
netversion: 5.0-0
Backtrace:
#0 [ffffc90003adb880] machine_kexec at ffffffff81041da8
#1 [ffffc90003adb8c8] __crash_kexec at ffffffff8110396c
#2 [ffffc90003adb988] crash_kexec at ffffffff811048ad
#3 [ffffc90003adb9a0] oops_end at ffffffff8101c19a
#4 [ffffc90003adb9c0] do_trap at ffffffff81019114
#5 [ffffc90003adba00] do_error_trap at ffffffff810195d0
#6 [ffffc90003adbab0] invalid_op at ffffffff81a00a9b
[exception RIP: btrfs_reloc_cow_block+692]
RIP: ffffffff8143b614 RSP: ffffc90003adbb68 RFLAGS: 00010246
RAX: fffffffffffffff7 RBX: ffff8806b9c32000 RCX: ffff8806aad00690
RDX: ffff880850b295e0 RSI: ffff8806b9c32000 RDI: ffff88084f205bd0
RBP: ffff880849415000 R8: ffffc90003adbbe0 R9: ffff88085ac90000
R10: ffff8805f7369140 R11: 0000000000000000 R12: ffff880850b295e0
R13: ffff88084f205bd0 R14: 0000000000000000 R15: 0000000000000000
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
#7 [ffffc90003adbbb0] __btrfs_cow_block at ffffffff813bf1cd
#8 [ffffc90003adbc28] btrfs_cow_block at ffffffff813bf4b3
#9 [ffffc90003adbc78] btrfs_search_slot at ffffffff813c2e6cThe way relocation moves data extents is by creating a reloc inode and preallocating extents in this inode and then copying the data into these preallocated extents. Once we've done this for all of our extents, we'll write out these dirty pages, which marks the extent written, and goes into btrfs_reloc_cow_block(). From here we get our current reloc_control, which _should_ match the reloc_control for the current block group we're relocating.
However if we get an ENOSPC in this path at some point we'll bail out, never initiating writeback on this inode. Not a huge deal, unless we happen to be doing relocation on a different block group, and this block group is now rc->stage == UPDATE_DATA_PTRS. This trips the BUG_ON() in btrfs_reloc_cow_block(), because we expect to be done modifying the data inode. We are in fact done modifying the metadata for the data inode we're currently using, but not the one from the failed block group, and thus we BUG_ON().
(This happens when writeback finishes for extents from the previous group, when we are at btrfs_finish_ordered_io() which updates the data reloc tree (inode item, drops/adds extent items, etc).)
Fix this by writing out the reloc data inode always, and then breaking out of the loop after that point to keep from tripping this BUG_ON() later.
--- fs/btrfs/relocation.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
fs/btrfs/relocation.c +20 -11
@@ -4330,27 +4330,36 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)mutex_lock (&fs_info->cleaner_mutex); ret =relocate_block_group (rc);mutex_unlock (&fs_info->cleaner_mutex); -if (ret <0 ) { +if (ret <0 ) err = ret; - goto out; - } - -if (rc->extents_found ==0 ) -break ; - -btrfs_info (fs_info,"found %llu extents" , rc->extents_found); +/* +* We may have gotten ENOSPC after we already dirtied some +* extents. If writeout happens while we're relocating a +* different block group we could end up hitting the +* BUG_ON(rc->stage == UPDATE_DATA_PTRS) in +* btrfs_reloc_cow_block. Make sure we write everything out +* properly so we don't trip over this problem, and then break +* out of the loop if we hit an error. +*/ if (rc->stage ==MOVE_DATA_EXTENTS && rc->found_file_extent) { ret =btrfs_wait_ordered_range (rc->data_inode,0 , (u64)-1 ); -if (ret) { +if (ret) err = ret; - goto out; - }invalidate_mapping_pages (rc->data_inode->i_mapping,0 ,-1 ); rc->stage =UPDATE_DATA_PTRS ; } + +if (err <0 ) + goto out; + +if (rc->extents_found ==0 ) +break ; + +btrfs_info (fs_info,"found %llu extents" , rc->extents_found); + }WARN_ON (rc->block_group->pinned >0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/405 iwlwifi: pcie: dont crash on invalid RX interrupt
In reply to Greg Kroah-Hartman[ Upstream commit 30f24eabab8cd801064c5c37589d803cb4341929 ]
If for some reason the device gives us an RX interrupt before we're ready for it, perhaps during device power-on with misconfigured IRQ causes mapping or so, we can crash trying to access the queues.
Prevent that by checking that we actually have RXQs and that they were properly allocated.
--- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/pcie/rx.c +6 -1
@@ -1434,10 +1434,15 @@ static struct iwl_rx_mem_buffer *iwl_pcie_get_rxb(struct iwl_trans *trans,static void iwl_pcie_rx_handle (struct iwl_trans *trans,int queue) {struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans); -struct iwl_rxq *rxq = &trans_pcie->rxq[queue]; +struct iwl_rxq *rxq;u32 r, i, count =0 ;bool emergency = false; +if (WARN_ON_ONCE (!trans_pcie->rxq || !trans_pcie->rxq[queue].bd)) +return ; + + rxq = &trans_pcie->rxq[queue]; + restart:spin_lock (&rxq->lock);/* uCode's read index (stored in shared DRAM) indicates the last Rx
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/405 iio: adc: stm32-dfsdm: fix unmet direct dependencies detected
In reply to Greg Kroah-Hartman[ Upstream commit ba7ecfe43d6bf12e2aa76705c45f7d187ae3d7c0 ]
This fixes unmet direct dependencies seen when CONFIG_STM32_DFSDM_ADC is selected:
WARNING: unmet direct dependencies detected for IIO_BUFFER_HW_CONSUMER
Depends on [n]: IIO [=y] && IIO_BUFFER [=n]
Selected by [y]:
- STM32_DFSDM_ADC [=y] && IIO [=y] && (ARCH_STM32 [=y] && OF [=y] ||
COMPILE_TEST [=n])
--- drivers/iio/adc/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/iio/adc/Kconfig +1 -0
@@ -809,6 +809,7 @@ config STM32_DFSDM_ADC depends on (ARCH_STM32 && OF) || COMPILE_TEST select STM32_DFSDM_CORE select REGMAP_MMIO + select IIO_BUFFER select IIO_BUFFER_HW_CONSUMER help Select this option to support ADCSigma delta modulator for
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/405 powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX
In reply to Greg Kroah-Hartman[ Upstream commit 56c46bba9bbfe229b4472a5be313c44c5b714a39 ]
With STRICT_KERNEL_RWX enabled anything marked __init is placed at a 16M boundary. This is necessary so that it can be repurposed later with different permissions. However, in kernels with text larger than 16M, this pushes early_setup past 32M, incapable of being reached by the branch instruction.
Fix this by setting the CTR and branching there instead.
--- arch/powerpc/kernel/head_64.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/kernel/head_64.S +3 -1
@@ -968,7 +968,9 @@ start_here_multiplatform: /* Restore parameters passed from prom_init/kexec */ mr r3,r31 - bl early_setup /* also sets r13 and SPRG_PACA */ + LOAD_REG_ADDR(r12, DOTSYM(early_setup)) + mtctr r12 + bctrl /* also sets r13 and SPRG_PACA */ LOAD_REG_ADDR(r3, start_here_common) ld r4,PACAKMSR(r13)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 165/405 random: fix CRNG initialization when random.trust_cpu=1
In reply to Greg Kroah-Hartman[ Upstream commit fe6f1a6a8eedc1aa538fee0baa612b6a59639cf8 ]
When the system boots with random.trust_cpu=1 it doesn't initialize the per-NUMA CRNGs because it skips the rest of the CRNG startup code. This means that the code from 1e7f583af67b ("random: make /dev/urandom scalable for silly userspace programs") is not used when random.trust_cpu=1.
crash> dmesg | grep random:
[ 0.000000] random: get_random_bytes called from start_kernel+0x94/0x530 with crng_init=0 [ 0.314029] random: crng done (trusting CPU's manufacturer)
crash> print crng_node_pool
$6 = (struct crng_state **) 0x0
After adding the missing call to numa_crng_init() the per-NUMA CRNGs are initialized again:
crash> dmesg | grep random:
[ 0.000000] random: get_random_bytes called from start_kernel+0x94/0x530 with crng_init=0 [ 0.314031] random: crng done (trusting CPU's manufacturer)
crash> print crng_node_pool
$1 = (struct crng_state **) 0xffff9a915f4014a0
The call to invalidate_batched_entropy() was also missing. This is important for architectures like PPC and S390 which only have the arch_get_random_seed_* functions.
--- drivers/char/random.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/char/random.c +4 -1
@@ -777,6 +777,7 @@ static struct crng_state **crng_node_pool __read_mostly;#endif static void invalidate_batched_entropy (void ); +static void numa_crng_init (void );static bool trust_cpu__ro_after_init =IS_ENABLED (CONFIG_RANDOM_TRUST_CPU );static int __init parse_trust_cpu (char *arg)
@@ -805,7 +806,9 @@ static void crng_initialize(struct crng_state *crng) } crng->state[i] ^= rv; } -if (trust_cpu && arch_init) { +if (trust_cpu && arch_init && crng == &primary_crng) { +invalidate_batched_entropy (); +numa_crng_init (); crng_init =2 ;pr_notice ("random: crng done (trusting CPU's manufacturer)\n" ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/405 arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable
In reply to Greg Kroah-Hartman[ Upstream commit 74dd022f9e6260c3b5b8d15901d27ebcc5f21eda ]
When building with -Wunused-but-set-variable, the compiler shouts about a number of pte_unmap() users, since this expands to an empty macro on arm64:
| mm/gup.c: In function 'gup_pte_range': | mm/gup.c:1727:16: warning: variable 'ptem' set but not used | [-Wunused-but-set-variable] | mm/gup.c: At top level: | mm/memory.c: In function 'copy_pte_range': | mm/memory.c:821:24: warning: variable 'orig_dst_pte' set but not used | [-Wunused-but-set-variable] | mm/memory.c:821:9: warning: variable 'orig_src_pte' set but not used | [-Wunused-but-set-variable] | mm/swap_state.c: In function 'swap_ra_info': | mm/swap_state.c:641:15: warning: variable 'orig_pte' set but not used | [-Wunused-but-set-variable] | mm/madvise.c: In function 'madvise_free_pte_range': | mm/madvise.c:318:9: warning: variable 'orig_pte' set but not used | [-Wunused-but-set-variable]
Rewrite pte_unmap() as a static inline function, which silences the warnings.
--- arch/arm64/include/asm/pgtable.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/pgtable.h +2 -1
@@ -478,6 +478,8 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)return __pmd_to_phys (pmd); } +static inline void pte_unmap (pte_t *pte) { } +/* Find an entry in the third-level page table. */ #define pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
@@ -486,7 +488,6 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)#define pte_offset_map (dir,addr) pte_offset_kernel((dir), (addr))#define pte_offset_map_nested (dir,addr) pte_offset_kernel((dir), (addr)) -#define pte_unmap (pte) do { } while (0)#define pte_unmap_nested (pte) do { } while (0)#define pte_set_fixmap (addr) ((pte_t *)set_fixmap_offset(FIX_PTE, addr))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 174/405 drm/msm: dpu: Dont set frame_busy_mask for async updates
In reply to Greg Kroah-Hartman[ Upstream commit f98baa3109cea46083d2361ab14a0207d1b1bd16 ]
The frame_busy mask is used in frame_done event handling, which is not invoked for async commits. So an async commit will leave the frame_busy mask populated after it completes and future commits will start with the busy mask incorrect.
This showed up on disable after cursor move. I was hitting the "this should not happen" comment in the frame event worker since frame_busy was set, we queued the event, but there were no frames pending (since async also doesn't set that).
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +7 -1
@@ -1550,8 +1550,14 @@ static void _dpu_encoder_kickoff_phys(struct dpu_encoder_virt *dpu_enc,if (!ctl)continue ; -if (phys->split_role !=ENC_ROLE_SLAVE ) +/* +* This is cleared in frame_done worker, which isn't invoked +* for async commits. So don't set this for async, since it'll +* roll over to the next commit. +*/ +if (!async && phys->split_role !=ENC_ROLE_SLAVE )set_bit (i, dpu_enc->frame_busy_mask); +if (!phys->ops.needs_single_flush || !phys->ops.needs_single_flush (phys)) _dpu_encoder_trigger_flush(&dpu_enc->base, phys, 0x0,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/405 mt76: remove mt76_queue dependency from tx_queue_skb function pointer
In reply to Greg Kroah-Hartman[ Upstream commit 89a37842b0c13c9e568bf12f4fcbe6507147e41d ]
Remove mt76_queue dependency from tx_queue_skb function pointer and rely on mt76_tx_qid instead. This is a preliminary patch to introduce mt76_sw_queue support
--- drivers/net/wireless/mediatek/mt76/dma.c | 3 ++- drivers/net/wireless/mediatek/mt76/mt76.h | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 4 ++-- drivers/net/wireless/mediatek/mt76/tx.c | 10 +++++----- drivers/net/wireless/mediatek/mt76/usb.c | 3 ++- 6 files changed, 16 insertions(+), 14 deletions(-)
drivers/net/wireless/mediatek/mt76/dma.c +2 -1
@@ -271,10 +271,11 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid,return 0 ; } -int mt76_dma_tx_queue_skb (struct mt76_dev *dev,struct mt76_queue *q, +int mt76_dma_tx_queue_skb (struct mt76_dev *dev,enum mt76_txq_id qid,struct sk_buff *skb,struct mt76_wcid *wcid,struct ieee80211_sta *sta) { +struct mt76_queue *q = &dev->q_tx[qid];struct mt76_queue_entry e;struct mt76_txwi_cache *t;struct mt76_queue_buf buf[32 ];
drivers/net/wireless/mediatek/mt76/mt76.h +2 -2
@@ -156,7 +156,7 @@ struct mt76_queue_ops { struct mt76_queue_buf *buf, int nbufs, u32 info, struct sk_buff *skb, void *txwi); -int (*tx_queue_skb)(struct mt76_dev *dev,struct mt76_queue *q, +int (*tx_queue_skb)(struct mt76_dev *dev,enum mt76_txq_id qid,struct sk_buff *skb,struct mt76_wcid *wcid,struct ieee80211_sta *sta);
@@ -645,7 +645,7 @@ static inline struct mt76_tx_cb *mt76_tx_skb_cb(struct sk_buff *skb)return ((void *)IEEE80211_SKB_CB (skb)->status.status_driver_data); } -int mt76_dma_tx_queue_skb (struct mt76_dev *dev,struct mt76_queue *q, +int mt76_dma_tx_queue_skb (struct mt76_dev *dev,enum mt76_txq_id qid,struct sk_buff *skb,struct mt76_wcid *wcid,struct ieee80211_sta *sta);
drivers/net/wireless/mediatek/mt76/mt7603/beacon.c +3 -3
@@ -23,7 +23,7 @@ mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)if (!skb)return ; -mt76_dma_tx_queue_skb (&dev->mt76, &dev->mt76.q_tx[MT_TXQ_BEACON ], skb, +mt76_dma_tx_queue_skb (&dev->mt76,MT_TXQ_BEACON , skb, &mvif->sta.wcid,NULL );spin_lock_bh (&dev->ps_lock);
@@ -118,8 +118,8 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)struct ieee80211_vif *vif = info->control.vif;struct mt7603_vif *mvif = (struct mt7603_vif *)vif->drv_priv; -mt76_dma_tx_queue_skb (&dev->mt76, q, skb, &mvif->sta.wcid, -NULL ); +mt76_dma_tx_queue_skb (&dev->mt76,MT_TXQ_CAB , skb, + &mvif->sta.wcid,NULL ); }mt76_queue_kick (dev, q);spin_unlock_bh (&q->lock);
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +2 -2
@@ -146,8 +146,8 @@ static void mt76x02_pre_tbtt_tasklet(unsigned long arg)struct ieee80211_vif *vif = info->control.vif;struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv; -mt76_dma_tx_queue_skb (&dev->mt76, q, skb, &mvif->group_wcid, -NULL ); +mt76_dma_tx_queue_skb (&dev->mt76,MT_TXQ_PSD , skb, + &mvif->group_wcid,NULL ); }spin_unlock_bh (&q->lock); }
drivers/net/wireless/mediatek/mt76/tx.c +5 -5
@@ -286,7 +286,7 @@ mt76_tx(struct mt76_dev *dev, struct ieee80211_sta *sta, q = &dev->q_tx[qid];spin_lock_bh (&q->lock); - dev->queue_ops->tx_queue_skb (dev, q, skb, wcid, sta); + dev->queue_ops->tx_queue_skb (dev, qid, skb, wcid, sta); dev->queue_ops->kick (dev, q);if (q->queued > q->ndesc -8 && !q->stopped) {
@@ -327,7 +327,6 @@ mt76_queue_ps_skb(struct mt76_dev *dev, struct ieee80211_sta *sta, {struct mt76_wcid *wcid = (struct mt76_wcid *) sta->drv_priv;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); -struct mt76_queue *hwq = &dev->q_tx[MT_TXQ_PSD ]; info->control.flags |=IEEE80211_TX_CTRL_PS_RESPONSE ;if (last)
@@ -335,7 +334,7 @@ mt76_queue_ps_skb(struct mt76_dev *dev, struct ieee80211_sta *sta,IEEE80211_TX_CTL_REQ_TX_STATUS ;mt76_skb_set_moredata (skb, !last); - dev->queue_ops->tx_queue_skb (dev, hwq, skb, wcid, sta); + dev->queue_ops->tx_queue_skb (dev,MT_TXQ_PSD , skb, wcid, sta); }void
@@ -390,6 +389,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq, struct mt76_txq *mtxq, bool *empty) { struct ieee80211_txq *txq = mtxq_to_txq(mtxq); +enum mt76_txq_id qid =mt76_txq_get_qid (txq);struct ieee80211_tx_info *info;struct mt76_wcid *wcid = mtxq->wcid;struct sk_buff *skb;
@@ -423,7 +423,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq,if (ampdu)mt76_check_agg_ssn (mtxq, skb); - idx = dev->queue_ops->tx_queue_skb (dev, hwq, skb, wcid, txq->sta); + idx = dev->queue_ops->tx_queue_skb (dev, qid, skb, wcid, txq->sta);if (idx <0 )return idx;
@@ -458,7 +458,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq,if (cur_ampdu)mt76_check_agg_ssn (mtxq, skb); - idx = dev->queue_ops->tx_queue_skb (dev, hwq, skb, wcid, + idx = dev->queue_ops->tx_queue_skb (dev, qid, skb, wcid, txq->sta);if (idx <0 )return idx;
drivers/net/wireless/mediatek/mt76/usb.c +2 -1
@@ -726,10 +726,11 @@ mt76u_tx_build_sg(struct mt76_dev *dev, struct sk_buff *skb, }static int -mt76u_tx_queue_skb (struct mt76_dev *dev,struct mt76_queue *q, +mt76u_tx_queue_skb (struct mt76_dev *dev,enum mt76_txq_id qid,struct sk_buff *skb,struct mt76_wcid *wcid,struct ieee80211_sta *sta) { +struct mt76_queue *q = &dev->q_tx[qid];struct mt76u_buf *buf;u16 idx = q->tail;int err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 143/405 Bluetooth: hci_qca: Give enough time to ROME controller to bootup.
In reply to Greg Kroah-Hartman[ Upstream commit 7f09d5a6c33be66a5ca19bf9dd1c2d90c5dfcf0d ]
This patch enables enough time to ROME controller to bootup after we bring the enable pin out of reset.
--- drivers/bluetooth/hci_qca.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/bluetooth/hci_qca.c +2 -0
@@ -508,6 +508,8 @@ static int qca_open(struct hci_uart *hu) qcadev =serdev_device_get_drvdata (hu->serdev);if (qcadev->btsoc_type !=QCA_WCN3990 ) {gpiod_set_value_cansleep (qcadev->bt_en,1 ); +/* Controller needs time to bootup. */ +msleep (150 ); }else { hu->init_speed = qcadev->init_speed; hu->oper_speed = qcadev->oper_speed;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 178/405 s390/qeth: handle error from qeth_update_from_chp_desc()
In reply to Greg Kroah-Hartman[ Upstream commit a4cdc9baee0740748f16e50cd70c2607510df492 ]
Subsequent code relies on the values that qeth_update_from_chp_desc() reads from the CHP descriptor. Rather than dealing with weird errors later on, just handle it properly here.
--- drivers/s390/net/qeth_core_main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_core_main.c +10 -4
@@ -1308,7 +1308,7 @@ static void qeth_set_multiple_write_queues(struct qeth_card *card) card->qdio.no_out_queues =4 ; } -static void qeth_update_from_chp_desc (struct qeth_card *card) +static int qeth_update_from_chp_desc (struct qeth_card *card) {struct ccw_device *ccwdev;struct channel_path_desc_fmt0 *chp_dsc;
@@ -1318,7 +1318,7 @@ static void qeth_update_from_chp_desc(struct qeth_card *card) ccwdev = card->data.ccwdev; chp_dsc =ccw_device_get_chp_desc (ccwdev,0 );if (!chp_dsc) - goto out; +return -ENOMEM ; card->info.func_level =0x4100 + chp_dsc->desc;if (card->info.type ==QETH_CARD_TYPE_IQD )
@@ -1333,6 +1333,7 @@ static void qeth_update_from_chp_desc(struct qeth_card *card)kfree (chp_dsc);QETH_DBF_TEXT_ (SETUP ,2 ,"nr:%x" , card->qdio.no_out_queues);QETH_DBF_TEXT_ (SETUP ,2 ,"lvl:%02x" , card->info.func_level); +return 0 ; }static void qeth_init_qdio_info (struct qeth_card *card)
@@ -4986,7 +4987,9 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok)QETH_DBF_TEXT (SETUP ,2 ,"hrdsetup" );atomic_set (&card->force_alloc_skb,0 ); -qeth_update_from_chp_desc (card); + rc =qeth_update_from_chp_desc (card); +if (rc) +return rc; retry:if (retries <3 ) QETH_DBF_MESSAGE(2, "Retrying to do IDX activates on device %x.\n",
@@ -5641,7 +5644,9 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) }qeth_setup_card (card); -qeth_update_from_chp_desc (card); + rc =qeth_update_from_chp_desc (card); +if (rc) + goto err_chp_desc; card->dev =qeth_alloc_netdev (card);if (!card->dev) {
@@ -5676,6 +5681,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)qeth_core_free_discipline (card); err_load:free_netdev (card->dev); +err_chp_desc: err_card:qeth_core_free_card (card); err_dev:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/405 gfs2: Fix occasional glock use-after-free
In reply to Greg Kroah-Hartman[ Upstream commit 9287c6452d2b1f24ea8e84bd3cf6f3c6f267f712 ]
This patch has to do with the life cycle of glocks and buffers. When gfs2 metadata or journaled data is queued to be written, a gfs2_bufdata object is assigned to track the buffer, and that is queued to various lists, including the glock's gl_ail_list to indicate it's on the active items list. Once the page associated with the buffer has been written, it is removed from the ail list, but its life isn't over until a revoke has been successfully written.
So after the block is written, its bufdata object is moved from the glock's gl_ail_list to a file-system-wide list of pending revokes, sd_log_le_revoke. At that point the glock still needs to track how many revokes it contributed to that list (in gl_revokes) so that things like glock go_sync can ensure all the metadata has been not only written, but also revoked before the glock is granted to a different node. This is to guarantee journal replay doesn't replay the block once the glock has been granted to another node.
Ross Lagerwall recently discovered a race in which an inode could be evicted, and its glock freed after its ail list had been synced, but while it still had unwritten revokes on the sd_log_le_revoke list. The evict decremented the glock reference count to zero, which allowed the glock to be freed. After the revoke was written, function revoke_lo_after_commit tried to adjust the glock's gl_revokes counter and clear its GLF_LFLUSH flag, at which time it referenced the freed glock.
This patch fixes the problem by incrementing the glock reference count in gfs2_add_revoke when the glock's first bufdata object is moved from the glock to the global revokes list. Later, when the glock's last such bufdata object is freed, the reference count is decremented. This guarantees that whichever process finishes last (the revoke writing or the evict) will properly free the glock, and neither will reference the glock after it has been freed.
--- fs/gfs2/glock.c | 1 + fs/gfs2/log.c | 3 ++- fs/gfs2/lops.c | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-)
fs/gfs2/glock.c +1 -0
@@ -140,6 +140,7 @@ void gfs2_glock_free(struct gfs2_glock *gl) {struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; +BUG_ON (atomic_read (&gl->gl_revokes));rhashtable_remove_fast (&gl_hash_table, &gl->gl_node, ht_parms);smp_mb ();wake_up_glock (gl);
fs/gfs2/log.c +2 -1
@@ -606,7 +606,8 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)gfs2_remove_from_ail (bd);/* drops ref on bh */ bd->bd_bh =NULL ; sdp->sd_log_num_revoke++; -atomic_inc (&gl->gl_revokes); +if (atomic_inc_return (&gl->gl_revokes) ==1 ) +gfs2_glock_hold (gl);set_bit (GLF_LFLUSH , &gl->gl_flags);list_add (&bd->bd_list, &sdp->sd_log_le_revoke); }
fs/gfs2/lops.c +4 -2
@@ -669,8 +669,10 @@ static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) bd = list_entry(head->next, struct gfs2_bufdata, bd_list);list_del_init (&bd->bd_list); gl = bd->bd_gl; -atomic_dec (&gl->gl_revokes); -clear_bit (GLF_LFLUSH , &gl->gl_flags); +if (atomic_dec_return (&gl->gl_revokes) ==0 ) { +clear_bit (GLF_LFLUSH , &gl->gl_flags); +gfs2_glock_queue_put (gl); + }kmem_cache_free (gfs2_bufdata_cachep, bd); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 203/405 mmc: core: make pwrseq_emmc (partially) support sleepy GPIO controllers
In reply to Greg Kroah-Hartman[ Upstream commit 002ee28e8b322d4d4b7b83234b5d0f4ebd428eda ]
pwrseq_emmc.c implements a HW reset procedure for eMMC chip by driving a GPIO line.
It registers the .reset() cb on mmc_pwrseq_ops and it registers a system restart notification handler; both of them perform reset by unconditionally calling gpiod_set_value().
If the eMMC reset line is tied to a GPIO controller whose driver can sleep (i.e. I2C GPIO controller), then the kernel would spit warnings when trying to reset the eMMC chip by means of .reset() mmc_pwrseq_ops cb (that is exactly what I'm seeing during boot).
Furthermore, on system reset we would gets to the system restart notification handler with disabled interrupts - local_irq_disable() is called in machine_restart() at least on ARM/ARM64 - and we would be in trouble when the GPIO driver tries to sleep (which indeed doesn't happen here, likely because in my case the machine specific code doesn't call do_kernel_restart(), I guess..).
This patch fixes the .reset() cb to make use of gpiod_set_value_cansleep(), so that the eMMC gets reset on boot without complaints, while, since there isn't that much we can do, we avoid register the restart handler if the GPIO controller has a sleepy driver (and we spit a dev_notice() message to let people know)..
This had been tested on a downstream 4.9 kernel with backported commit 83f37ee7ba33 ("mmc: pwrseq: Add reset callback to the struct mmc_pwrseq_ops") and commit ae60fb031cf2 ("mmc: core: Don't do eMMC HW reset when resuming the eMMC card"), because I couldn't boot my board otherwise. Maybe worth to RFT.
--- drivers/mmc/core/pwrseq_emmc.c | 38 ++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-)
drivers/mmc/core/pwrseq_emmc.c +20 -18
@@ -30,19 +30,14 @@ struct mmc_pwrseq_emmc {#define to_pwrseq_emmc (p) container_of(p, struct mmc_pwrseq_emmc, pwrseq) -static void __mmc_pwrseq_emmc_reset (struct mmc_pwrseq_emmc *pwrseq) -{ -gpiod_set_value (pwrseq->reset_gpio,1 ); -udelay (1 ); -gpiod_set_value (pwrseq->reset_gpio,0 ); -udelay (200 ); -} -static void mmc_pwrseq_emmc_reset (struct mmc_host *host) {struct mmc_pwrseq_emmc *pwrseq =to_pwrseq_emmc (host->pwrseq); -__mmc_pwrseq_emmc_reset (pwrseq); +gpiod_set_value_cansleep (pwrseq->reset_gpio,1 ); +udelay (1 ); +gpiod_set_value_cansleep (pwrseq->reset_gpio,0 ); +udelay (200 ); } static int mmc_pwrseq_emmc_reset_nb(struct notifier_block *this,
@@ -50,8 +45,11 @@ static int mmc_pwrseq_emmc_reset_nb(struct notifier_block *this, {struct mmc_pwrseq_emmc *pwrseq =container_of (this, struct mmc_pwrseq_emmc, reset_nb); +gpiod_set_value (pwrseq->reset_gpio,1 ); +udelay (1 ); +gpiod_set_value (pwrseq->reset_gpio,0 ); +udelay (200 ); -__mmc_pwrseq_emmc_reset (pwrseq);return NOTIFY_DONE ; }
@@ -72,14 +70,18 @@ static int mmc_pwrseq_emmc_probe(struct platform_device *pdev)if (IS_ERR (pwrseq->reset_gpio))return PTR_ERR (pwrseq->reset_gpio); -/* -* register reset handler to ensure emmc reset also from -* emergency_reboot(), priority 255 is the highest priority -* so it will be executed before any system reboot handler. -*/ - pwrseq->reset_nb.notifier_call = mmc_pwrseq_emmc_reset_nb; - pwrseq->reset_nb.priority =255 ; -register_restart_handler (&pwrseq->reset_nb); +if (!gpiod_cansleep (pwrseq->reset_gpio)) { +/* +* register reset handler to ensure emmc reset also from +* emergency_reboot(), priority 255 is the highest priority +* so it will be executed before any system reboot handler. +*/ + pwrseq->reset_nb.notifier_call = mmc_pwrseq_emmc_reset_nb; + pwrseq->reset_nb.priority =255 ; +register_restart_handler (&pwrseq->reset_nb); + }else { +dev_notice (dev,"EMMC reset pin tied to a sleepy GPIO driver; reset on emergency-reboot disabled\n" ); + } pwrseq->pwrseq.ops = &mmc_pwrseq_emmc_ops; pwrseq->pwrseq.dev = dev;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/405 libbpf: fix samples/bpf build failure due to undefined UINT32_MAX
In reply to Greg Kroah-Hartman[ Upstream commit 32e621e55496a0009f44fe4914cd4a23cade4984 ]
Currently, building bpf samples will cause the following error.
./tools/lib/bpf/bpf.h:132:27: error: 'UINT32_MAX' undeclared here (not in a function) ..
#define BPF_LOG_BUF_SIZE (UINT32_MAX >> 8) /* verifier maximum in kernels <= 5.1 */
^
./samples/bpf/bpf_load.h:31:25: note: in expansion of macro 'BPF_LOG_BUF_SIZE'
extern char bpf_log_buf[BPF_LOG_BUF_SIZE];
^~~~~~~~~~~~~~~~Due to commit 4519efa6f8ea ("libbpf: fix BPF_LOG_BUF_SIZE off-by-one error") hard-coded size of BPF_LOG_BUF_SIZE has been replaced with UINT32_MAX which is defined in <stdint.h> header.
Even with this change, bpf selftests are running fine since these are built with clang and it includes header(-idirafter) from clang/6.0.0/include. (it has <stdint.h>)
clang -I. -I./include/uapi -I../../../include/uapi -idirafter /usr/local/include -idirafter /usr/include \
-idirafter /usr/lib/llvm-6.0/lib/clang/6.0.0/include -idirafter /usr/include/x86_64-linux-gnu \
-Wno-compare-distinct-pointer-types -O2 -target bpf -emit-llvm -c progs/test_sysctl_prog.c -o - | \
llc -march=bpf -mcpu=generic -filetype=obj -o /linux/tools/testing/selftests/bpf/test_sysctl_prog.oBut bpf samples are compiled with GCC, and it only searches and includes headers declared at the target file. As '#include <stdint.h>' hasn't been declared in tools/lib/bpf/bpf.h, it causes build failure of bpf samples.
gcc -Wp,-MD,./samples/bpf/.sockex3_user.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes \
-O2 -fomit-frame-pointer -std=gnu89 -I./usr/include -I./tools/lib/ -I./tools/testing/selftests/bpf/ \
-I./tools/ lib/ -I./tools/include -I./tools/perf -c -o ./samples/bpf/sockex3_user.o ./samples/bpf/sockex3_user.c;This commit add declaration of '#include <stdint.h>' to tools/lib/bpf/bpf.h to fix this problem.
--- tools/lib/bpf/bpf.h | 1 + 1 file changed, 1 insertion(+)
tools/lib/bpf/bpf.h +1 -0
@@ -26,6 +26,7 @@#include <linux/bpf.h> #include <stdbool.h> #include <stddef.h> +#include <stdint.h> #ifdef __cplusplusextern "C" {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/405 slimbus: fix a potential NULL pointer dereference in of_qcom_slim_ngd_register
In reply to Greg Kroah-Hartman[ Upstream commit 06d5d6b7f9948a89543e1160ef852d57892c750d ]
In case platform_device_alloc fails, the fix returns an error code to avoid the NULL pointer dereference.
--- drivers/slimbus/qcom-ngd-ctrl.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/slimbus/qcom-ngd-ctrl.c +4 -0
@@ -1342,6 +1342,10 @@ static int of_qcom_slim_ngd_register(struct device *parent,return -ENOMEM ; ngd->pdev =platform_device_alloc (QCOM_SLIM_NGD_DRV_NAME , id); +if (!ngd->pdev) { +kfree (ngd); +return -ENOMEM ; + } ngd->id = id; ngd->pdev->dev.parent = parent; ngd->pdev->driver_override =QCOM_SLIM_NGD_DRV_NAME ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 190/405 arm64: vdso: Fix clock_getres() for CLOCK_REALTIME
In reply to Greg Kroah-Hartman[ Upstream commit 81fb8736dd81da3fe94f28968dac60f392ec6746 ]
clock_getres() in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res().
In particular, posix_get_hrtimer_res() does:
sec = 0;
ns = hrtimer_resolution;where 'hrtimer_resolution' depends on whether or not high resolution timers are enabled, which is a runtime decision.
The vDSO incorrectly returns the constant CLOCK_REALTIME_RES. Fix this by exposing 'hrtimer_resolution' in the vDSO datapage and returning that instead.
--- arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/vdso.c | 3 +++ arch/arm64/kernel/vdso/gettimeofday.S | 7 +++---- 4 files changed, 8 insertions(+), 5 deletions(-)
arch/arm64/include/asm/vdso_datapage.h +1 -0
@@ -38,6 +38,7 @@ struct vdso_data {__u32 tz_minuteswest;/* Whacky timezone stuff */ __u32 tz_dsttime;__u32 use_syscall; + __u32 hrtimer_res; };#endif /* !__ASSEMBLY__ */
arch/arm64/kernel/asm-offsets.c +1 -1
@@ -94,7 +94,7 @@ int main(void)DEFINE (CLOCK_REALTIME ,CLOCK_REALTIME );DEFINE (CLOCK_MONOTONIC ,CLOCK_MONOTONIC );DEFINE (CLOCK_MONOTONIC_RAW ,CLOCK_MONOTONIC_RAW ); -DEFINE (CLOCK_REALTIME_RES ,MONOTONIC_RES_NSEC ); +DEFINE (CLOCK_REALTIME_RES , offsetof(struct vdso_data , hrtimer_res));DEFINE (CLOCK_REALTIME_COARSE ,CLOCK_REALTIME_COARSE );DEFINE (CLOCK_MONOTONIC_COARSE ,CLOCK_MONOTONIC_COARSE );DEFINE (CLOCK_COARSE_RES ,LOW_RES_NSEC );
arch/arm64/kernel/vdso.c +3 -0
@@ -232,6 +232,9 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->wtm_clock_sec = tk->wall_to_monotonic.tv_sec; vdso_data->wtm_clock_nsec = tk->wall_to_monotonic.tv_nsec; +/* Read without the seqlock held by clock_getres() */ +WRITE_ONCE (vdso_data->hrtimer_res, hrtimer_resolution); +if (!use_syscall) {/* tkr_mono.cycle_last == tkr_raw.cycle_last */ vdso_data->cs_cycle_last = tk->tkr_mono.cycle_last;
arch/arm64/kernel/vdso/gettimeofday.S +3 -4
@@ -308,13 +308,14 @@ ENTRY(__kernel_clock_getres) ccmp w0, #CLOCK_MONOTONIC_RAW, #0x4, ne b.ne 1f - ldr x2, 5f + adr vdso_data, _vdso_data + ldr w2, [vdso_data, #CLOCK_REALTIME_RES] b 2f 1: cmp w0, #CLOCK_REALTIME_COARSE ccmp w0, #CLOCK_MONOTONIC_COARSE, #0x4, ne b.ne 4f - ldr x2, 6f + ldr x2, 5f 2: cbz x1, 3f stp xzr, x2, [x1]
@@ -328,8 +329,6 @@ ENTRY(__kernel_clock_getres) svc #0 ret 5: - .quad CLOCK_REALTIME_RES -6: .quad CLOCK_COARSE_RES .cfi_endproc ENDPROC(__kernel_clock_getres)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 223/405 qmi_wwan: Add quirk for Quectel dynamic config
In reply to Greg Kroah-Hartman[ Upstream commit e4bf63482c309287ca84d91770ffa7dcc18e37eb ]
Most, if not all, Quectel devices use dynamic interface numbers, and users are able to change the USB configuration at will. Matching on for example interface number is therefore not possible.
Instead, the QMI device can be identified by looking at the interface class, subclass and protocol (all 0xff), as well as the number of endpoints. The reason we need to look at the number of endpoints, is that the diagnostic port interface has the same class, subclass and protocol as QMI. However, the diagnostic port only has two endpoints, while QMI has three.
Until now, we have identified the QMI device by combining a match on class, subclass and protocol, with a call to the function quectel_diag_detect(). In quectel_diag_detect(), we check if the number of endpoints matches for known Quectel vendor/product ids.
Adding new vendor/product ids to quectel_diag_detect() is not a good long-term solution. This commit replaces the function with a quirk, and applies the quirk to affected Quectel devices that I have been able to test the change with (EP06, EM12 and EC25). If the quirk is set and the number of endpoints equal two, we return from qmi_wwan_probe() with -ENODEV.
--- drivers/net/usb/qmi_wwan.c | 65 ++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 34 deletions(-)
drivers/net/usb/qmi_wwan.c +31 -34
@@ -63,6 +63,7 @@ enum qmi_wwan_flags {enum qmi_wwan_quirks {QMI_WWAN_QUIRK_DTR =1 <<0 ,/* needs "set DTR" request */ +QMI_WWAN_QUIRK_QUECTEL_DYNCFG =1 <<1 ,/* check num. endpoints */ };struct qmimux_hdr {
@@ -845,6 +846,16 @@ static const struct driver_info qmi_wwan_info_quirk_dtr = { .data = QMI_WWAN_QUIRK_DTR, }; +static const struct driver_info qmi_wwan_info_quirk_quectel_dyncfg = { + .description ="WWAN/QMI device" , + .flags =FLAG_WWAN |FLAG_SEND_ZLP , + .bind = qmi_wwan_bind, + .unbind = qmi_wwan_unbind, + .manage_power = qmi_wwan_manage_power, + .rx_fixup = qmi_wwan_rx_fixup, + .data =QMI_WWAN_QUIRK_DTR |QMI_WWAN_QUIRK_QUECTEL_DYNCFG , +}; +#define HUAWEI_VENDOR_ID 0x12D1/* map QMI/wwan function by a fixed interface number */
@@ -865,6 +876,15 @@ static const struct driver_info qmi_wwan_info_quirk_dtr = {#define QMI_GOBI_DEVICE (vend, prod) \ QMI_FIXED_INTF(vend, prod, 0) +/* Quectel does not use fixed interface numbers on at least some of their +* devices. We need to check the number of endpoints to ensure that we bind to +* the correct interface. +*/ +#define QMI_QUIRK_QUECTEL_DYNCFG (vend, prod) \ + USB_DEVICE_AND_INTERFACE_INFO(vend, prod, USB_CLASS_VENDOR_SPEC, \ + USB_SUBCLASS_VENDOR_SPEC, 0xff), \ + .driver_info = (unsigned long)&qmi_wwan_info_quirk_quectel_dyncfg +static const struct usb_device_id products[] = {/* 1. CDC ECM like devices match on the control interface */ {/* Huawei E392, E398 and possibly others sharing both device id and more... */
@@ -969,20 +989,9 @@ static const struct usb_device_id products[] = { USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7), .driver_info = (unsigned long )&qmi_wwan_info, }, - { /* Quectel EP06/EG06/EM06 */ -USB_DEVICE_AND_INTERFACE_INFO (0x2c7c ,0x0306 , -USB_CLASS_VENDOR_SPEC , -USB_SUBCLASS_VENDOR_SPEC , -0xff ), - .driver_info = (unsigned long)&qmi_wwan_info_quirk_dtr, - }, - { /* Quectel EG12/EM12 */ -USB_DEVICE_AND_INTERFACE_INFO (0x2c7c ,0x0512 , -USB_CLASS_VENDOR_SPEC , -USB_SUBCLASS_VENDOR_SPEC , -0xff ), - .driver_info = (unsigned long)&qmi_wwan_info_quirk_dtr, - }, + {QMI_QUIRK_QUECTEL_DYNCFG(0x2c7c, 0x0125)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */ + {QMI_QUIRK_QUECTEL_DYNCFG(0x2c7c, 0x0306)}, /* Quectel EP06/EG06/EM06 */ + {QMI_QUIRK_QUECTEL_DYNCFG(0x2c7c, 0x0512)}, /* Quectel EG12/EM12 *//* 3. Combined interface devices matching on interface number */ {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
@@ -1283,7 +1292,6 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ - {QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */ {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */
@@ -1363,27 +1371,12 @@ static bool quectel_ec20_detected(struct usb_interface *intf)return false; } -static bool quectel_diag_detected (struct usb_interface *intf) -{ -struct usb_device *dev =interface_to_usbdev (intf); -struct usb_interface_descriptor intf_desc = intf->cur_altsetting->desc; -u16 id_vendor =le16_to_cpu (dev->descriptor.idVendor); -u16 id_product =le16_to_cpu (dev->descriptor.idProduct); - -if (id_vendor !=0x2c7c || intf_desc.bNumEndpoints !=2 ) -return false; - -if (id_product ==0x0306 || id_product ==0x0512 ) -return true; -else -return false; -} -static int qmi_wwan_probe (struct usb_interface *intf,const struct usb_device_id *prod) {struct usb_device_id *id = (struct usb_device_id *)prod;struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc; +const struct driver_info *info;/* Workaround to enable dynamic IDs. This disables usbnet * blacklisting functionality. Which, if required, can be
@@ -1417,10 +1410,14 @@ static int qmi_wwan_probe(struct usb_interface *intf,* we need to match on class/subclass/protocol. These values are * identical for the diagnostic- and QMI-interface, but bNumEndpoints is * different. Ignore the current interface if the number of endpoints -* the number for the diag interface (two). +* equals the number for the diag interface (two). */ -if (quectel_diag_detected (intf)) -return -ENODEV ; + info = (void *)&id->driver_info; + +if (info->data &QMI_WWAN_QUIRK_QUECTEL_DYNCFG ) { +if (desc->bNumEndpoints ==2 ) +return -ENODEV ; + }return usbnet_probe (intf, id); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 234/405 samples/bpf: fix build with new clang
In reply to Greg Kroah-Hartman[ Upstream commit 636e78b1cdb40b77a79b143dbd9d94847b360efa ]
clang started to error on invalid asm clobber usage in x86 headers and many bpf program samples failed to build with the message:
CLANG-bpf /data/users/ast/bpf-next/samples/bpf/xdp_redirect_kern.o
In file included from /data/users/ast/bpf-next/samples/bpf/xdp_redirect_kern.c:14:
In file included from ../include/linux/in.h:23:
In file included from ../include/uapi/linux/in.h:24:
In file included from ../include/linux/socket.h:8:
In file included from ../include/linux/uio.h:14:
In file included from ../include/crypto/hash.h:16:
In file included from ../include/linux/crypto.h:26:
In file included from ../include/linux/uaccess.h:5:
In file included from ../include/linux/sched.h:15:
In file included from ../include/linux/sem.h:5:
In file included from ../include/uapi/linux/sem.h:5:
In file included from ../include/linux/ipc.h:9:
In file included from ../include/linux/refcount.h:72:../arch/x86/include/asm/refcount.h:72:36: error: asm-specifier for input or output variable conflicts with asm clobber list
r->refs.counter, e, "er", i, "cx");
^
../arch/x86/include/asm/refcount.h:86:27: error: asm-specifier for input or output variable conflicts with asm clobber list
r->refs.counter, e, "cx");
^2 errors generated.
Override volatile() to workaround the problem.
--- samples/bpf/asm_goto_workaround.h | 1 + 1 file changed, 1 insertion(+)
samples/bpf/asm_goto_workaround.h +1 -0
@@ -13,4 +13,5 @@ #define asm_volatile_goto(x...) asm volatile("invalid use of asm_volatile_goto")#endif +#define volatile(x...) volatile("")#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 193/405 perf/x86/msr: Add Icelake support
In reply to Greg Kroah-Hartman[ Upstream commit cf50d79a8cfe5adae37fec026220b009559bbeed ]
Icelake is the same as the existing Skylake parts.
--- arch/x86/events/msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/msr.c +1 -0
@@ -89,6 +89,7 @@ static bool test_intel(int idx)case INTEL_FAM6_SKYLAKE_X :case INTEL_FAM6_KABYLAKE_MOBILE :case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_ICELAKE_MOBILE :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 246/405 selftests/bpf: ksym_search wont check symbols exists
In reply to Greg Kroah-Hartman[ Upstream commit 0979ff7992fb6f4eb837995b12f4071dcafebd2d ]
Currently, ksym_search located at trace_helpers won't check symbols are existing or not.
In ksym_search, when symbol is not found, it will return &syms[0](_stext). But when the kernel symbols are not loaded, it will return NULL, which is not a desired action.
This commit will add verification logic whether symbols are loaded prior to the symbol search.
--- tools/testing/selftests/bpf/trace_helpers.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/testing/selftests/bpf/trace_helpers.c +4 -0
@@ -52,6 +52,10 @@ struct ksym *ksym_search(long key)int start =0 , end = sym_cnt;int result; +/* kallsyms not loaded. return NULL */ +if (sym_cnt <=0 ) +return NULL ; +while (start < end) {size_t mid = start + (end - start) /2 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 253/405 brcmfmac: fix race during disconnect when USB completion is in progress
In reply to Greg Kroah-Hartman[ Upstream commit db3b9e2e1d58080d0754bdf9293dabf8c6491b67 ]
It was observed that rarely during USB disconnect happening shortly after connect (before full initialization completes) usb_hub_wq would wait forever for the dev_init_lock to be unlocked. dev_init_lock would remain locked though because of infinite wait during usb_kill_urb:
[ 2730.656472] kworker/0:2 D 0 260 2 0x00000000 [ 2730.660700] Workqueue: events request_firmware_work_func [ 2730.664807] [<809dca20>] (__schedule) from [<809dd164>] (schedule+0x4c/0xac) [ 2730.670587] [<809dd164>] (schedule) from [<8069af44>] (usb_kill_urb+0xdc/0x114) [ 2730.676815] [<8069af44>] (usb_kill_urb) from [<7f258b50>] (brcmf_usb_free_q+0x34/0xa8 [brcmfmac]) [ 2730.684833] [<7f258b50>] (brcmf_usb_free_q [brcmfmac]) from [<7f2517d4>] (brcmf_detach+0xa0/0xb8 [brcmfmac]) [ 2730.693557] [<7f2517d4>] (brcmf_detach [brcmfmac]) from [<7f251a34>] (brcmf_attach+0xac/0x3d8 [brcmfmac]) [ 2730.702094] [<7f251a34>] (brcmf_attach [brcmfmac]) from [<7f2587ac>] (brcmf_usb_probe_phase2+0x468/0x4a0 [brcmfmac]) [ 2730.711601] [<7f2587ac>] (brcmf_usb_probe_phase2 [brcmfmac]) from [<7f252888>] (brcmf_fw_request_done+0x194/0x220 [brcmfmac]) [ 2730.721795] [<7f252888>] (brcmf_fw_request_done [brcmfmac]) from [<805748e4>] (request_firmware_work_func+0x4c/0x88) [ 2730.731125] [<805748e4>] (request_firmware_work_func) from [<80141474>] (process_one_work+0x228/0x808) [ 2730.739223] [<80141474>] (process_one_work) from [<80141a80>] (worker_thread+0x2c/0x564) [ 2730.746105] [<80141a80>] (worker_thread) from [<80147bcc>] (kthread+0x13c/0x16c) [ 2730.752227] [<80147bcc>] (kthread) from [<801010b4>] (ret_from_fork+0x14/0x20)
[ 2733.099695] kworker/0:3 D 0 1065 2 0x00000000 [ 2733.103926] Workqueue: usb_hub_wq hub_event [ 2733.106914] [<809dca20>] (__schedule) from [<809dd164>] (schedule+0x4c/0xac) [ 2733.112693] [<809dd164>] (schedule) from [<809e2a8c>] (schedule_timeout+0x214/0x3e4) [ 2733.119621] [<809e2a8c>] (schedule_timeout) from [<809dde2c>] (wait_for_common+0xc4/0x1c0) [ 2733.126810] [<809dde2c>] (wait_for_common) from [<7f258d00>] (brcmf_usb_disconnect+0x1c/0x4c [brcmfmac]) [ 2733.135206] [<7f258d00>] (brcmf_usb_disconnect [brcmfmac]) from [<8069e0c8>] (usb_unbind_interface+0x5c/0x1e4) [ 2733.143943] [<8069e0c8>] (usb_unbind_interface) from [<8056d3e8>] (device_release_driver_internal+0x164/0x1fc) [ 2733.152769] [<8056d3e8>] (device_release_driver_internal) from [<8056c078>] (bus_remove_device+0xd0/0xfc) [ 2733.161138] [<8056c078>] (bus_remove_device) from [<8056977c>] (device_del+0x11c/0x310) [ 2733.167939] [<8056977c>] (device_del) from [<8069cba8>] (usb_disable_device+0xa0/0x1cc) [ 2733.174743] [<8069cba8>] (usb_disable_device) from [<8069507c>] (usb_disconnect+0x74/0x1dc) [ 2733.181823] [<8069507c>] (usb_disconnect) from [<80695e88>] (hub_event+0x478/0xf88) [ 2733.188278] [<80695e88>] (hub_event) from [<80141474>] (process_one_work+0x228/0x808) [ 2733.194905] [<80141474>] (process_one_work) from [<80141a80>] (worker_thread+0x2c/0x564) [ 2733.201724] [<80141a80>] (worker_thread) from [<80147bcc>] (kthread+0x13c/0x16c) [ 2733.207913] [<80147bcc>] (kthread) from [<801010b4>] (ret_from_fork+0x14/0x20)
It was traced down to a case where usb_kill_urb would be called on an URB structure containing more or less random data, including large number in its use_count. During the debugging it appeared that in brcmf_usb_free_q() the traversal over URBs' lists is not synchronized with operations on those lists in brcmf_usb_rx_complete() leading to handling brcmf_usbdev_info structure (holding lists' head) as lists' element and in result causing above problem.
Fix it by walking through all URBs during brcmf_cancel_all_urbs using the arrays of requests instead of linked lists.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +8 -2
@@ -682,12 +682,18 @@ static int brcmf_usb_up(struct device *dev)static void brcmf_cancel_all_urbs (struct brcmf_usbdev_info *devinfo) { +int i; +if (devinfo->ctl_urb)usb_kill_urb (devinfo->ctl_urb);if (devinfo->bulk_urb)usb_kill_urb (devinfo->bulk_urb); -brcmf_usb_free_q (&devinfo->tx_postq, true); -brcmf_usb_free_q (&devinfo->rx_postq, true); +if (devinfo->tx_reqs) +for (i =0 ; i < devinfo->bus_pub.ntxq; i++) +usb_kill_urb (devinfo->tx_reqs[i].urb); +if (devinfo->rx_reqs) +for (i =0 ; i < devinfo->bus_pub.nrxq; i++) +usb_kill_urb (devinfo->rx_reqs[i].urb); }static void brcmf_usb_down (struct device *dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 230/405 cpufreq: ap806: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit b623fa320f8360f049a6f3c3ccc487cb85af4c5b ]
The call to of_find_compatible_node returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/cpufreq/armada-8k-cpufreq.c:187:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 130, but without a corresponding object release within this function. ./drivers/cpufreq/armada-8k-cpufreq.c:191:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 130, but without a corresponding object release within this function.
--- drivers/cpufreq/armada-8k-cpufreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/armada-8k-cpufreq.c +1 -0
@@ -132,6 +132,7 @@ static int __init armada_8k_cpufreq_init(void)of_node_put (node);return -ENODEV ; } +of_node_put (node); nb_cpus =num_possible_cpus (); freq_tables =kcalloc (nb_cpus,sizeof (*freq_tables),GFP_KERNEL );
Signature · 9 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 254/405 brcmfmac: fix Oops when bringing up interface during USB disconnect
In reply to Greg Kroah-Hartman[ Upstream commit 24d413a31afaee9bbbf79226052c386b01780ce2 ]
Fix a race which leads to an Oops with NULL pointer dereference. The dereference is in brcmf_config_dongle() when cfg_to_ndev() attempts to get net_device structure of interface with index 0 via if2bss mapping. This shouldn't fail because of check for bus being ready in brcmf_netdev_open(), but it's not synchronised with USB disconnect and there is a race: after the check the bus can be marked down and the mapping for interface 0 may be gone.
Solve this by modifying disconnect handling so that the removal of mapping of ifidx to brcmf_if structure happens after netdev removal (which is synchronous with brcmf_netdev_open() thanks to rtln being locked in devinet_ioctl()). This assures brcmf_netdev_open() returns before the mapping is removed during disconnect.
Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = bcae2612 [00000008] *pgd=8be73831 Internal error: Oops: 17 [#1] PREEMPT SMP ARM Modules linked in: brcmfmac brcmutil nf_log_ipv4 nf_log_common xt_LOG xt_limit
iptable_mangle xt_connmark xt_tcpudp xt_conntrack nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 iptable_filter ip_tables x_tables usb_f_mass_storage usb_f_rndis u_ether usb_serial_simple usbserial cdc_acm smsc95xx usbnet ci_hdrc_imx ci_hdrc usbmisc_imx ulpi 8250_exar 8250_pci 8250 8250_base libcomposite configfs udc_core [last unloaded: brcmutil]
CPU: 2 PID: 24478 Comm: ifconfig Not tainted 4.19.23-00078-ga62866d-dirty #115 Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) PC is at brcmf_cfg80211_up+0x94/0x29c [brcmfmac] LR is at brcmf_cfg80211_up+0x8c/0x29c [brcmfmac] pc : [<7f26a91c>] lr : [<7f26a914>] psr: a0070013
sp : eca99d28 ip : 00000000 fp : ee9c6c00
r10: 00000036 r9 : 00000000 r8 : ece4002c
r7 : edb5b800 r6 : 00000000 r5 : 80f08448 r4 : edb5b968 r3 : ffffffff r2 : 00000000 r1 : 00000002 r0 : 00000000
Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
Control: 10c5387d Table: 7ca0c04a DAC: 00000051 Process ifconfig (pid: 24478, stack limit = 0xd9e85a0e)
Stack: (0xeca99d28 to 0xeca9a000)
9d20: 00000000 80f873b0 0000000d 80f08448 eca99d68 50d45f32
9d40: 7f27de94 ece40000 80f08448 80f08448 7f27de94 ece4002c 00000000 00000036
9d60: ee9c6c00 7f27262c 00001002 50d45f32 ece40000 00000000 80f08448 80772008
9d80: 00000001 00001043 00001002 ece40000 00000000 50d45f32 ece40000 00000001
9da0: 80f08448 00001043 00001002 807723d0 00000000 50d45f32 80f08448 eca99e58
9dc0: 80f87113 50d45f32 80f08448 ece40000 ece40138 00001002 80f08448 00000000
9de0: 00000000 80772434 edbd5380 eca99e58 edbd5380 80f08448 ee9c6c0c 80805f70
9e00: 00000000 ede08e00 00008914 ece40000 00000014 ee9c6c0c 600c0013 00001043
9e20: 0208a8c0 ffffffff 00000000 50d45f32 eca98000 80f08448 7ee9fc38 00008914
9e40: 80f68e40 00000051 eca98000 00000036 00000003 80808b9c 6e616c77 00000030
9e60: 00000000 00000000 00001043 0208a8c0 ffffffff 00000000 80f08448 00000000
9e80: 00000000 816d8b20 600c0013 00000001 ede09320 801763d4 00000000 50d45f32
9ea0: eca98000 80f08448 7ee9fc38 50d45f32 00008914 80f08448 7ee9fc38 80f68e40
9ec0: ed531540 8074721c 00000800 00000001 00000000 6e616c77 00000030 00000000
9ee0: 00000000 00001002 0208a8c0 ffffffff 00000000 50d45f32 80f08448 7ee9fc38
9f00: ed531560 ec8fc900 80285a6c 80285138 edb910c0 00000000 ecd91008 ede08e00
9f20: 80f08448 00000000 00000000 816d8b20 600c0013 00000001 ede09320 801763d4
9f40: 00000000 50d45f32 00021000 edb91118 edb910c0 80f08448 01b29000 edb91118
9f60: eca99f7c 50d45f32 00021000 ec8fc900 00000003 ec8fc900 00008914 7ee9fc38
9f80: eca98000 00000036 00000003 80285a6c 00086364 7ee9fe1c 000000c3 00000036
9fa0: 801011c4 80101000 00086364 7ee9fe1c 00000003 00008914 7ee9fc38 00086364
9fc0: 00086364 7ee9fe1c 000000c3 00000036 0008630c 7ee9fe1c 7ee9fc38 00000003
9fe0: 000a42b8 7ee9fbd4 00019914 76e09acc 600c0010 00000003 00000000 00000000 [<7f26a91c>] (brcmf_cfg80211_up [brcmfmac]) from [<7f27262c>] (brcmf_netdev_open+0x74/0xe8 [brcmfmac]) [<7f27262c>] (brcmf_netdev_open [brcmfmac]) from [<80772008>] (__dev_open+0xcc/0x150) [<80772008>] (__dev_open) from [<807723d0>] (__dev_change_flags+0x168/0x1b4) [<807723d0>] (__dev_change_flags) from [<80772434>] (dev_change_flags+0x18/0x48) [<80772434>] (dev_change_flags) from [<80805f70>] (devinet_ioctl+0x67c/0x79c) [<80805f70>] (devinet_ioctl) from [<80808b9c>] (inet_ioctl+0x210/0x3d4)
[<80808b9c>] (inet_ioctl) from [<8074721c>] (sock_ioctl+0x350/0x524)
[<8074721c>] (sock_ioctl) from [<80285138>] (do_vfs_ioctl+0xb0/0x9b0)
[<80285138>] (do_vfs_ioctl) from [<80285a6c>] (ksys_ioctl+0x34/0x5c)
[<80285a6c>] (ksys_ioctl) from [<80101000>] (ret_fast_syscall+0x0/0x28)
Exception stack(0xeca99fa8 to 0xeca99ff0) 9fa0: 00086364 7ee9fe1c 00000003 00008914 7ee9fc38 00086364 9fc0: 00086364 7ee9fe1c 000000c3 00000036 0008630c 7ee9fe1c 7ee9fc38 00000003 9fe0: 000a42b8 7ee9fbd4 00019914 76e09acc Code: e5970328 eb002021 e1a02006 e3a01002 (e5909008) ---[ end trace 5cbac2333f3ac5df ]---
--- .../net/wireless/broadcom/brcm80211/brcmfmac/core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +7 -3
@@ -841,17 +841,17 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx, bool rtnl_locked) {struct brcmf_if *ifp; +int ifidx; ifp = drvr->iflist[bsscfgidx]; - drvr->iflist[bsscfgidx] =NULL ;if (!ifp) {bphy_err (drvr,"Null interface, bsscfgidx=%d\n" , bsscfgidx);return ; }brcmf_dbg (TRACE ,"Enter, bsscfgidx=%d, ifidx=%d\n" , bsscfgidx, ifp->ifidx); -if (drvr->if2bss[ifp->ifidx] == bsscfgidx) - drvr->if2bss[ifp->ifidx] =BRCMF_BSSIDX_INVALID ; + ifidx = ifp->ifidx; +if (ifp->ndev) {if (bsscfgidx ==0 ) {if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {
@@ -879,6 +879,10 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx,brcmf_p2p_ifp_removed (ifp, rtnl_locked);kfree (ifp); } + + drvr->iflist[bsscfgidx] =NULL ; +if (drvr->if2bss[ifidx] == bsscfgidx) + drvr->if2bss[ifidx] =BRCMF_BSSIDX_INVALID ; }void brcmf_remove_interface (struct brcmf_if *ifp,bool rtnl_locked)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/405 bcache: return error immediately in bch_journal_replay()
In reply to Greg Kroah-Hartman[ Upstream commit 68d10e6979a3b59e3cd2e90bfcafed79c4cf180a ]
When failure happens inside bch_journal_replay(), calling cache_set_err_on() and handling the failure in async way is not a good idea. Because after bch_journal_replay() returns, registering code will continue to execute following steps, and unregistering code triggered by cache_set_err_on() is running in same time. First it is unnecessary to handle failure and unregister cache set in an async way, second there might be potential race condition to run register and unregister code for same cache set.
So in this patch, if failure happens in bch_journal_replay(), we don't call cache_set_err_on(), and just print out the same error message to kernel message buffer, then return -EIO immediately caller. Then caller can detect such failure and handle it in synchrnozied way.
--- drivers/md/bcache/journal.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/md/bcache/journal.c +6 -3
@@ -330,9 +330,12 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list)list_for_each_entry (i, list, list) {BUG_ON (i->pin &&atomic_read (i->pin) !=1 ); -cache_set_err_on (n != i->j.seq, s, -"bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)" , - n, i->j.seq -1 , start, end); +if (n != i->j.seq) { +pr_err ("bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)" , + n, i->j.seq -1 , start, end); + ret = -EIO ; + goto err; + } for (k = i->j.start; k < bset_bkey_last(&i->j);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 260/405 drm/panel: otm8009a: Add delay at the end of initialization
In reply to Greg Kroah-Hartman[ Upstream commit 0084c3c71126fc878c6dab8a6ab8ecc484c2be02 ]
At the end of initialization, a delay is required by the panel. Without this delay, the panel could received a frame early & generate a crash of panel (black screen).
--- drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/panel/panel-orisetech-otm8009a.c +3 -0
@@ -248,6 +248,9 @@ static int otm8009a_init_sequence(struct otm8009a *ctx)/* Send Command GRAM memory write (no parameters) */ dcs_write_seq (ctx,MIPI_DCS_WRITE_MEMORY_START ); +/* Wait a short while to let the panel be ready before the 1st frame */ +mdelay (10 ); +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 229/405 cpufreq: imx6q: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit ddb64c5db3cc8fb9c1242214d5798b2c2865681c ]
The call to of_node_get returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/cpufreq/imx6q-cpufreq.c:391:4-10: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 348, but without a corresponding object release within this function. ./drivers/cpufreq/imx6q-cpufreq.c:395:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 348, but without a corresponding object release within this function.
--- drivers/cpufreq/imx6q-cpufreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/cpufreq/imx6q-cpufreq.c +2 -2
@@ -388,11 +388,11 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) ret =imx6ul_opp_check_speed_grading (cpu_dev);if (ret) {if (ret == -EPROBE_DEFER ) -return ret; + goto put_node;dev_err (cpu_dev,"failed to read ocotp: %d\n" , ret); -return ret; + goto put_node; } }else {imx6q_opp_check_speed_grading (cpu_dev);
Signature · 9 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 265/405 x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP
In reply to Greg Kroah-Hartman[ Upstream commit 4a6c91fbdef846ec7250b82f2eeeb87ac5f18cf9 ]
For CONFIG_TRACE_BRANCH_PROFILING=y the likely/unlikely things get overloaded and generate callouts to this code, and thus also when AC=1.
Make it safe.
--- kernel/trace/trace_branch.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/trace/trace_branch.c +4 -0
@@ -205,6 +205,8 @@ void trace_likely_condition(struct ftrace_likely_data *f, int val, int expect)void ftrace_likely_update (struct ftrace_likely_data *f,int val,int expect,int is_constant) { +unsigned long flags =user_access_save (); +/* A constant is always correct */ if (is_constant) { f->constant++;
@@ -223,6 +225,8 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, f->data.correct++; else f->data.incorrect++; + +user_access_restore (flags); }EXPORT_SYMBOL (ftrace_likely_update);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/405 vfio-ccw: Do not call flush_workqueue while holding the spinlock
In reply to Greg Kroah-Hartman[ Upstream commit cea5dde42a83b5f0a039da672f8686455936b8d8 ]
Currently we call flush_workqueue while holding the subchannel spinlock. But flush_workqueue function can go to sleep, so do not call the function while holding the spinlock.
Fixes the following bug:
[ 285.203430] BUG: scheduling while atomic: bash/14193/0x00000002 [ 285.203434] INFO: lockdep is turned off. .... [ 285.203485] Preemption disabled at: [ 285.203488] [<000003ff80243e5c>] vfio_ccw_sch_quiesce+0xbc/0x120 [vfio_ccw] [ 285.203496] CPU: 7 PID: 14193 Comm: bash Tainted: G W .... [ 285.203504] Call Trace: [ 285.203510] ([<0000000000113772>] show_stack+0x82/0xd0) [ 285.203514] [<0000000000b7a102>] dump_stack+0x92/0xd0 [ 285.203518] [<000000000017b8be>] __schedule_bug+0xde/0xf8 [ 285.203524] [<0000000000b95b5a>] __schedule+0x7a/0xc38 [ 285.203528] [<0000000000b9678a>] schedule+0x72/0xb0 [ 285.203533] [<0000000000b9bfbc>] schedule_timeout+0x34/0x528 [ 285.203538] [<0000000000b97608>] wait_for_common+0x118/0x1b0 [ 285.203544] [<0000000000166d6a>] flush_workqueue+0x182/0x548 [ 285.203550] [<000003ff80243e6e>] vfio_ccw_sch_quiesce+0xce/0x120 [vfio_ccw] [ 285.203556] [<000003ff80245278>] vfio_ccw_mdev_reset+0x38/0x70 [vfio_ccw] [ 285.203562] [<000003ff802458b0>] vfio_ccw_mdev_remove+0x40/0x78 [vfio_ccw] [ 285.203567] [<000003ff801a499c>] mdev_device_remove_ops+0x3c/0x80 [mdev] [ 285.203573] [<000003ff801a4d5c>] mdev_device_remove+0xc4/0x130 [mdev] [ 285.203578] [<000003ff801a5074>] remove_store+0x6c/0xa8 [mdev] [ 285.203582] [<000000000046f494>] kernfs_fop_write+0x14c/0x1f8 [ 285.203588] [<00000000003c1530>] __vfs_write+0x38/0x1a8 [ 285.203593] [<00000000003c187c>] vfs_write+0xb4/0x198 [ 285.203597] [<00000000003c1af2>] ksys_write+0x5a/0xb0 [ 285.203601] [<0000000000b9e270>] system_call+0xdc/0x2d8
Message-Id: <626bab8bb2958ae132452e1ddaf1b20882ad5a9d.1554756534.git.alifm@linux.ibm.com>
--- drivers/s390/cio/vfio_ccw_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/cio/vfio_ccw_drv.c +1 -1
@@ -54,9 +54,9 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch)wait_for_completion_timeout (&completion,3 *HZ ); -spin_lock_irq (sch->lock); private->completion =NULL ;flush_workqueue (vfio_ccw_work_q); +spin_lock_irq (sch->lock); ret =cio_cancel_halt_clear (sch, &iretry); };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 239/405 drm/pl111: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit bc29d3a69d4c1bd1a103e8b3c1ed81b807c1870b ]
The call to of_find_matching_node_and_match returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
drivers/gpu/drm/pl111/pl111_versatile.c:333:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function. drivers/gpu/drm/pl111/pl111_versatile.c:340:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function. drivers/gpu/drm/pl111/pl111_versatile.c:346:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function. drivers/gpu/drm/pl111/pl111_versatile.c:354:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function. drivers/gpu/drm/pl111/pl111_versatile.c:395:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function. drivers/gpu/drm/pl111/pl111_versatile.c:402:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function.
--- drivers/gpu/drm/pl111/pl111_versatile.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/pl111/pl111_versatile.c +4 -0
@@ -330,6 +330,7 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv) ret =vexpress_muxfpga_init ();if (ret) {dev_err (dev,"unable to initialize muxfpga driver\n" ); +of_node_put (np);return ret; }
@@ -337,17 +338,20 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv) pdev =of_find_device_by_node (np);if (!pdev) {dev_err (dev,"can't find the sysreg device, deferring\n" ); +of_node_put (np);return -EPROBE_DEFER ; } map =dev_get_drvdata (&pdev->dev);if (!map) {dev_err (dev,"sysreg has not yet probed\n" );platform_device_put (pdev); +of_node_put (np);return -EPROBE_DEFER ; } }else { map =syscon_node_to_regmap (np); } +of_node_put (np);if (IS_ERR (map)) {dev_err (dev,"no Versatile syscon regmap\n" );
Signature · 8 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Greg Kroah-Hartman
maintainerPATCH 273/405 HID: core: move Usage Page concatenation to Main item
In reply to Greg Kroah-Hartman[ Upstream commit 58e75155009cc800005629955d3482f36a1e0eec ]
As seen on some USB wireless keyboards manufactured by Primax, the HID parser was using some assumptions that are not always true. In this case it's s the fact that, inside the scope of a main item, an Usage Page will always precede an Usage.
The spec is not pretty clear as 6.2.2.7 states "Any usage that follows is interpreted as a Usage ID and concatenated with the Usage Page". While 6.2.2.8 states "When the parser encounters a main item it concatenates the last declared Usage Page with a Usage to form a complete usage value." Being somewhat contradictory it was decided to match Window's implementation, which follows 6.2.2.8.
In summary, the patch moves the Usage Page concatenation from the local item parsing function to the main item parsing function.
--- drivers/hid/hid-core.c | 36 ++++++++++++++++++++++++------------ include/linux/hid.h | 1 + 2 files changed, 25 insertions(+), 12 deletions(-)
drivers/hid/hid-core.c +24 -12
@@ -218,13 +218,14 @@ static unsigned hid_lookup_collection(struct hid_parser *parser, unsigned type)* Add a usage to the temporary parser table. */ -static int hid_add_usage (struct hid_parser *parser,unsigned usage) +static int hid_add_usage (struct hid_parser *parser,unsigned usage,u8 size) {if (parser->local.usage_index >=HID_MAX_USAGES ) {hid_err (parser->device,"usage index exceeded\n" );return -1 ; } parser->local.usage[parser->local.usage_index] = usage; + parser->local.usage_size[parser->local.usage_index] = size; parser->local.collection_index[parser->local.usage_index] = parser->collection_stack_ptr ? parser->collection_stack[parser->collection_stack_ptr -1 ] :0 ;
@@ -486,10 +487,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)return 0 ; } -if (item->size <=2 ) - data = (parser->global.usage_page <<16 ) + data; - -return hid_add_usage (parser, data); +return hid_add_usage (parser, data, item->size);case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM :
@@ -498,9 +496,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)return 0 ; } -if (item->size <=2 ) - data = (parser->global.usage_page <<16 ) + data; - parser->local.usage_minimum = data;return 0 ;
@@ -511,9 +506,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)return 0 ; } -if (item->size <=2 ) - data = (parser->global.usage_page <<16 ) + data; - count = data - parser->local.usage_minimum;if (count + parser->local.usage_index >=HID_MAX_USAGES ) {/*
@@ -533,7 +525,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item) }for (n = parser->local.usage_minimum; n <= data; n++) -if (hid_add_usage (parser, n)) { +if (hid_add_usage (parser, n, item->size)) {dbg_hid ("hid_add_usage failed\n" );return -1 ; }
@@ -547,6 +539,22 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)return 0 ; } +/* +* Concatenate Usage Pages into Usages where relevant: +* As per specification, 6.2.2.8: "When the parser encounters a main item it +* concatenates the last declared Usage Page with a Usage to form a complete +* usage value." +*/ + +static void hid_concatenate_usage_page (struct hid_parser *parser) +{ +int i; + +for (i =0 ; i < parser->local.usage_index; i++) +if (parser->local.usage_size[i] <=2 ) + parser->local.usage[i] += parser->global.usage_page <<16 ; +} +/* * Process a main item. */
@@ -556,6 +564,8 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)__u32 data;int ret; +hid_concatenate_usage_page (parser); + data =item_udata (item);switch (item->tag) {
@@ -765,6 +775,8 @@ static int hid_scan_main(struct hid_parser *parser, struct hid_item *item)__u32 data;int i; +hid_concatenate_usage_page (parser); + data =item_udata (item);switch (item->tag) {
include/linux/hid.h +1 -0
@@ -417,6 +417,7 @@ struct hid_global {struct hid_local {unsigned usage[HID_MAX_USAGES ];/* usage array */ +u8 usage_size[HID_MAX_USAGES ];/* usage size array */ unsigned collection_index[HID_MAX_USAGES ];/* collection index array */ unsigned usage_index;unsigned usage_minimum;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 274/405 ASoC: eukrea-tlv320: fix a leaked reference by adding missing of_node_put
In reply to Greg Kroah-Hartman[ Upstream commit b820d52e7eed7b30b2dfef5f4213a2bc3cbea6f3 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./sound/soc/fsl/eukrea-tlv320.c:121:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 102, but without a correspo nding object release within this function.
./sound/soc/fsl/eukrea-tlv320.c:127:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 102, but without a correspo nding object release within this function.
--- sound/soc/fsl/eukrea-tlv320.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/fsl/eukrea-tlv320.c +2 -2
@@ -118,13 +118,13 @@ static int eukrea_tlv320_probe(struct platform_device *pdev)if (ret) {dev_err (&pdev->dev,"fsl,mux-int-port node missing or invalid.\n" ); -return ret; + goto err; } ret =of_property_read_u32 (np,"fsl,mux-ext-port" , &ext_port);if (ret) {dev_err (&pdev->dev,"fsl,mux-ext-port node missing or invalid.\n" ); -return ret; + goto err; }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 276/405 ASoC: wcd9335: fix a leaked reference by adding missing of_node_put
In reply to Greg Kroah-Hartman[ Upstream commit 64b92de9603f22b5455da925ee57268ef7fb4e80 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./sound/soc/codecs/wcd9335.c:5193:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 5183, but without a correspon ding object release within this function.
--- sound/soc/codecs/wcd9335.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/wcd9335.c +1 -0
@@ -5188,6 +5188,7 @@ static int wcd9335_slim_status(struct slim_device *sdev, wcd->slim = sdev; wcd->slim_ifc_dev =of_slim_get_device (sdev->ctrl, ifc_dev_np); +of_node_put (ifc_dev_np);if (!wcd->slim_ifc_dev) {dev_err (dev,"Unable to get SLIM Interface device\n" );return -EINVAL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 279/405 block: avoid to break XEN by multi-page bvec
In reply to Greg Kroah-Hartman[ Upstream commit db5ebd6edd2627d7e81a031643cf43587f63e66c ]
XEN has special page merge requirement, see xen_biovec_phys_mergeable(). We can't merge pages into one bvec simply for XEN.
So move XEN's specific check on page merge into __bio_try_merge_page(), then abvoid to break XEN by multi-page bvec.
--- block/bio.c | 2 ++ 1 file changed, 2 insertions(+)
block/bio.c +2 -0
@@ -776,6 +776,8 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,if (vec_end_addr +1 != page_addr + off)return false; +if (xen_domain () && !xen_biovec_phys_mergeable (bv, page)) +return false;if (same_page && (vec_end_addr &PAGE_MASK ) != page_addr)return false;
Signature · 9 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Greg Kroah-Hartman
maintainerPATCH 280/405 block: pass page to xen_biovec_phys_mergeable
In reply to Greg Kroah-Hartman[ Upstream commit 0383ad4374f7ad7edd925a2ee4753035c3f5508a ]
xen_biovec_phys_mergeable() only needs .bv_page of the 2nd bio bvec for checking if the two bvecs can be merged, so pass page to xen_biovec_phys_mergeable() directly.
No function change.
--- block/blk.h | 2 +- drivers/xen/biomerge.c | 5 +++-- include/xen/xen.h | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-)
block/blk.h +1 -1
@@ -75,7 +75,7 @@ static inline bool biovec_phys_mergeable(struct request_queue *q,if (addr1 + vec1->bv_len != addr2)return false; -if (xen_domain () && !xen_biovec_phys_mergeable (vec1, vec2)) +if (xen_domain () && !xen_biovec_phys_mergeable (vec1, vec2->bv_page))return false;if ((addr1 | mask) != ((addr2 + vec2->bv_len -1 ) | mask))return false;
drivers/xen/biomerge.c +3 -2
@@ -4,12 +4,13 @@#include <xen/xen.h> #include <xen/page.h> +/* check if @page can be merged with 'vec1' */ bool xen_biovec_phys_mergeable (const struct bio_vec *vec1, -const struct bio_vec *vec2) +const struct page *page) {#if XEN_PAGE_SIZE ==PAGE_SIZE unsigned long bfn1 =pfn_to_bfn (page_to_pfn (vec1->bv_page)); -unsigned long bfn2 =pfn_to_bfn (page_to_pfn (vec2->bv_page)); +unsigned long bfn2 =pfn_to_bfn (page_to_pfn (page));return bfn1 +PFN_DOWN (vec1->bv_offset + vec1->bv_len) == bfn2;#else
include/xen/xen.h +3 -1
@@ -43,8 +43,10 @@ extern struct hvm_start_info pvh_start_info;#endif /* CONFIG_XEN_DOM0 */ struct bio_vec ; +struct page ; +bool xen_biovec_phys_mergeable (const struct bio_vec *vec1, -const struct bio_vec *vec2); +const struct page *page);#if defined(CONFIG_MEMORY_HOTPLUG ) && defined(CONFIG_XEN_BALLOON )extern u64 xen_saved_max_mem_size;
Signature · 9 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Greg Kroah-Hartman
maintainerPATCH 96/405 Btrfs: fix data bytes_may_use underflow with fallocate due to failed quota reserve
In reply to Greg Kroah-Hartman[ Upstream commit 39ad317315887c2cb9a4347a93a8859326ddf136 ]
When doing fallocate, we first add the range to the reserve_list and then reserve the quota. If quota reservation fails, we'll release all reserved parts of reserve_list.
However, cur_offset is not updated to indicate that this range is already been inserted into the list. Therefore, the same range is freed twice. Once at list_for_each_entry loop, and once at the end of the function. This will result in WARN_ON on bytes_may_use when we free the remaining space.
At the end, under the 'out' label we have a call to:
btrfs_free_reserved_data_space(inode, data_reserved, alloc_start, alloc_end - cur_offset);
The start offset, third argument, should be cur_offset.
Everything from alloc_start to cur_offset was freed by the list_for_each_entry_safe_loop.
--- fs/btrfs/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/file.c +2 -1
@@ -3142,6 +3142,7 @@ static long btrfs_fallocate(struct file *file, int mode, ret =btrfs_qgroup_reserve_data (inode, &data_reserved, cur_offset, last_byte - cur_offset);if (ret <0 ) { + cur_offset = last_byte;free_extent_map (em);break ; }
@@ -3191,7 +3192,7 @@ static long btrfs_fallocate(struct file *file, int mode,/* Let go of our reservation. */ if (ret !=0 && !(mode &FALLOC_FL_ZERO_RANGE ))btrfs_free_reserved_data_space (inode, data_reserved, - alloc_start, alloc_end - cur_offset); + cur_offset, alloc_end - cur_offset);extent_changeset_free (data_reserved);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 278/405 clk: renesas: rcar-gen3: Correct parent clock of SYS-DMAC
In reply to Greg Kroah-Hartman[ Upstream commit 3c772f71a552d343a96868ed9a809f9047be94f5 ]
The clock sources of the AXI BUS clock (266.66 MHz) used for SYS-DMAC DMA transfers are:
Channel R-Car H3 R-Car M3-W R-Car M3-N
-------------------------------------------------
SYS-DMAC0 S0D3 S0D3 S0D3
SYS-DMAC1 S3D1 S3D1 S3D1
SYS-DMAC2 S3D1 S3D1 S3D1
As a result, change the parent clocks of the SYS-DMAC{1,2} module clocks on R-Car H3, R-Car M3-W, and R-Car M3-N to S3D1.
NOTE: This information will be reflected in a future revision of the
R-Car Gen3 Hardware Manual.
--- drivers/clk/renesas/r8a774a1-cpg-mssr.c | 4 ++-- drivers/clk/renesas/r8a7795-cpg-mssr.c | 4 ++-- drivers/clk/renesas/r8a7796-cpg-mssr.c | 4 ++-- drivers/clk/renesas/r8a77965-cpg-mssr.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/clk/renesas/r8a774a1-cpg-mssr.c +2 -2
@@ -123,8 +123,8 @@ static const struct mssr_mod_clk r8a774a1_mod_clks[] __initconst = {DEF_MOD ("msiof2" ,209 ,R8A774A1_CLK_MSO ),DEF_MOD ("msiof1" ,210 ,R8A774A1_CLK_MSO ),DEF_MOD ("msiof0" ,211 ,R8A774A1_CLK_MSO ), -DEF_MOD ("sys-dmac2" ,217 ,R8A774A1_CLK_S0D3 ), -DEF_MOD ("sys-dmac1" ,218 ,R8A774A1_CLK_S0D3 ), +DEF_MOD ("sys-dmac2" ,217 ,R8A774A1_CLK_S3D1 ), +DEF_MOD ("sys-dmac1" ,218 ,R8A774A1_CLK_S3D1 ),DEF_MOD ("sys-dmac0" ,219 ,R8A774A1_CLK_S0D3 ),DEF_MOD ("cmt3" ,300 ,R8A774A1_CLK_R ), DEF_MOD("cmt2", 301, R8A774A1_CLK_R),
drivers/clk/renesas/r8a7795-cpg-mssr.c +2 -2
@@ -129,8 +129,8 @@ static struct mssr_mod_clk r8a7795_mod_clks[] __initdata = {DEF_MOD ("msiof2" ,209 ,R8A7795_CLK_MSO ),DEF_MOD ("msiof1" ,210 ,R8A7795_CLK_MSO ),DEF_MOD ("msiof0" ,211 ,R8A7795_CLK_MSO ), -DEF_MOD ("sys-dmac2" ,217 ,R8A7795_CLK_S0D3 ), -DEF_MOD ("sys-dmac1" ,218 ,R8A7795_CLK_S0D3 ), +DEF_MOD ("sys-dmac2" ,217 ,R8A7795_CLK_S3D1 ), +DEF_MOD ("sys-dmac1" ,218 ,R8A7795_CLK_S3D1 ),DEF_MOD ("sys-dmac0" ,219 ,R8A7795_CLK_S0D3 ),DEF_MOD ("sceg-pub" ,229 ,R8A7795_CLK_CR ), DEF_MOD("cmt3", 300, R8A7795_CLK_R),
drivers/clk/renesas/r8a7796-cpg-mssr.c +2 -2
@@ -126,8 +126,8 @@ static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {DEF_MOD ("msiof2" ,209 ,R8A7796_CLK_MSO ),DEF_MOD ("msiof1" ,210 ,R8A7796_CLK_MSO ),DEF_MOD ("msiof0" ,211 ,R8A7796_CLK_MSO ), -DEF_MOD ("sys-dmac2" ,217 ,R8A7796_CLK_S0D3 ), -DEF_MOD ("sys-dmac1" ,218 ,R8A7796_CLK_S0D3 ), +DEF_MOD ("sys-dmac2" ,217 ,R8A7796_CLK_S3D1 ), +DEF_MOD ("sys-dmac1" ,218 ,R8A7796_CLK_S3D1 ),DEF_MOD ("sys-dmac0" ,219 ,R8A7796_CLK_S0D3 ),DEF_MOD ("cmt3" ,300 ,R8A7796_CLK_R ), DEF_MOD("cmt2", 301, R8A7796_CLK_R),
drivers/clk/renesas/r8a77965-cpg-mssr.c +2 -2
@@ -123,8 +123,8 @@ static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = {DEF_MOD ("msiof2" ,209 ,R8A77965_CLK_MSO ),DEF_MOD ("msiof1" ,210 ,R8A77965_CLK_MSO ),DEF_MOD ("msiof0" ,211 ,R8A77965_CLK_MSO ), -DEF_MOD ("sys-dmac2" ,217 ,R8A77965_CLK_S0D3 ), -DEF_MOD ("sys-dmac1" ,218 ,R8A77965_CLK_S0D3 ), +DEF_MOD ("sys-dmac2" ,217 ,R8A77965_CLK_S3D1 ), +DEF_MOD ("sys-dmac1" ,218 ,R8A77965_CLK_S3D1 ),DEF_MOD ("sys-dmac0" ,219 ,R8A77965_CLK_S0D3 ), DEF_MOD("cmt3", 300, R8A77965_CLK_R),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 241/405 iio: hmc5843: fix potential NULL pointer dereferences
In reply to Greg Kroah-Hartman[ Upstream commit 536cc27deade8f1ec3c1beefa60d5fbe0f6fcb28 ]
devm_regmap_init_i2c may fail and return NULL. The fix returns the error when it fails.
--- drivers/iio/magnetometer/hmc5843_i2c.c | 7 ++++++- drivers/iio/magnetometer/hmc5843_spi.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/iio/magnetometer/hmc5843_i2c.c +6 -1
@@ -58,8 +58,13 @@ static const struct regmap_config hmc5843_i2c_regmap_config = {static int hmc5843_i2c_probe (struct i2c_client *cli,const struct i2c_device_id *id) { +struct regmap *regmap =devm_regmap_init_i2c (cli, + &hmc5843_i2c_regmap_config); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); +return hmc5843_common_probe (&cli->dev, -devm_regmap_init_i2c (cli, &hmc5843_i2c_regmap_config), + regmap, id->driver_data, id->name); }
drivers/iio/magnetometer/hmc5843_spi.c +6 -1
@@ -58,6 +58,7 @@ static const struct regmap_config hmc5843_spi_regmap_config = {static int hmc5843_spi_probe (struct spi_device *spi) {int ret; +struct regmap *regmap;const struct spi_device_id *id =spi_get_device_id (spi); spi->mode =SPI_MODE_3 ;
@@ -67,8 +68,12 @@ static int hmc5843_spi_probe(struct spi_device *spi)if (ret)return ret; + regmap =devm_regmap_init_spi (spi, &hmc5843_spi_regmap_config); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); +return hmc5843_common_probe (&spi->dev, -devm_regmap_init_spi (spi, &hmc5843_spi_regmap_config), + regmap, id->driver_data, id->name); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 295/405 timekeeping: Force upper bound for setting CLOCK_REALTIME
In reply to Greg Kroah-Hartman[ Upstream commit 7a8e61f8478639072d402a26789055a4a4de8f77 ]
Several people reported testing failures after setting CLOCK_REALTIME close to the limits of the kernel internal representation in nanoseconds, i.e. year 2262.
The failures are exposed in subsequent operations, i.e. when arming timers or when the advancing CLOCK_MONOTONIC makes the calculation of CLOCK_REALTIME overflow into negative space.
Now people start to paper over the underlying problem by clamping calculations to the valid range, but that's just wrong because such workarounds will prevent detection of real issues as well.
It is reasonable to force an upper bound for the various methods of setting CLOCK_REALTIME. Year 2262 is the absolute upper bound. Assume a maximum uptime of 30 years which is plenty enough even for esoteric embedded systems. That results in an upper bound of year 2232 for setting the time.
Once that limit is reached in reality this limit is only a small part of the problem space. But until then this stops people from trying to paper over the problem at the wrong places.
--- include/linux/time64.h | 21 +++++++++++++++++++++ kernel/time/time.c | 2 +- kernel/time/timekeeping.c | 6 +++--- 3 files changed, 25 insertions(+), 4 deletions(-)
include/linux/time64.h +21 -0
@@ -33,6 +33,17 @@ struct itimerspec64 {#define KTIME_MAX ((s64)~((u64)1 << 63))#define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC) +/* +* Limits for settimeofday(): +* +* To prevent setting the time close to the wraparound point time setting +* is limited so a reasonable uptime can be accomodated. Uptime of 30 years +* should be really sufficient, which means the cutoff is 2232. At that +* point the cutoff is just a small part of the larger problem. +*/ +#define TIME_UPTIME_SEC_MAX (30LL * 365 * 24 *3600) +#define TIME_SETTOD_SEC_MAX (KTIME_SEC_MAX - TIME_UPTIME_SEC_MAX) +static inline int timespec64_equal (const struct timespec64 *a,const struct timespec64 *b) {
@@ -100,6 +111,16 @@ static inline bool timespec64_valid_strict(const struct timespec64 *ts)return true; } +static inline bool timespec64_valid_settod (const struct timespec64 *ts) +{ +if (!timespec64_valid (ts)) +return false; +/* Disallow values which cause overflow issues vs. CLOCK_REALTIME */ +if ((unsigned long long )ts->tv_sec >=TIME_SETTOD_SEC_MAX ) +return false; +return true; +} +/** * timespec64_to_ns - Convert timespec64 to nanoseconds * @ts: pointer to the timespec64 variable to be converted
kernel/time/time.c +1 -1
@@ -171,7 +171,7 @@ int do_sys_settimeofday64(const struct timespec64 *tv, const struct timezone *tzstatic int firsttime =1 ;int error =0 ; -if (tv && !timespec64_valid (tv)) +if (tv && !timespec64_valid_settod (tv))return -EINVAL ; error =security_settime64 (tv, tz);
kernel/time/timekeeping.c +3 -3
@@ -1221,7 +1221,7 @@ int do_settimeofday64(const struct timespec64 *ts)unsigned long flags;int ret =0 ; -if (!timespec64_valid_strict (ts)) +if (!timespec64_valid_settod (ts))return -EINVAL ;raw_spin_lock_irqsave (&timekeeper_lock, flags);
@@ -1278,7 +1278,7 @@ static int timekeeping_inject_offset(const struct timespec64 *ts)/* Make sure the proposed value is valid */ tmp =timespec64_add (tk_xtime (tk), *ts);if (timespec64_compare (&tk->wall_to_monotonic, ts) >0 || - !timespec64_valid_strict (&tmp)) { + !timespec64_valid_settod (&tmp)) { ret = -EINVAL ; goto error; }
@@ -1527,7 +1527,7 @@ void __init timekeeping_init(void)unsigned long flags;read_persistent_wall_and_boot_offset (&wall_time, &boot_offset); -if (timespec64_valid_strict (&wall_time) && +if (timespec64_valid_settod (&wall_time) &×pec64_to_ns (&wall_time) >0 ) { persistent_clock_exists = true; }else if (timespec64_to_ns (&wall_time) !=0 ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/405 x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault()
In reply to Greg Kroah-Hartman[ Upstream commit a65c88e16f32aa9ef2e8caa68ea5c29bd5eb0ff0 ]
In-NMI warnings have been added to vmalloc_fault() via:
ebc8827f75 ("x86: Barf when vmalloc and kmemcheck faults happen in NMI")
back in the time when our NMI entry code could not cope with nested NMIs.
These days, it's perfectly fine to take a fault in NMI context and we don't have to care about the fact that IRET from the fault handler might cause NMI nesting.
This warning has already been removed from 32-bit implementation of vmalloc_fault() in:
6863ea0cda8 ("x86/mm: Remove in_nmi() warning from vmalloc_fault()")
but the 64-bit version was omitted.
Remove the bogus warning also from 64-bit implementation of vmalloc_fault().
--- arch/x86/mm/fault.c | 2 -- 1 file changed, 2 deletions(-)
arch/x86/mm/fault.c +0 -2
@@ -359,8 +359,6 @@ static noinline int vmalloc_fault(unsigned long address)if (!(address >=VMALLOC_START && address <VMALLOC_END ))return -1 ; -WARN_ON_ONCE (in_nmi ()); -/* * Copy kernel mappings over when needed. This can also * happen within a race in page table update. In the later
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 301/405 virtio_console: initialize vtermno value for ports
In reply to Greg Kroah-Hartman[ Upstream commit 4b0a2c5ff7215206ea6135a405f17c5f6fca7d00 ]
For regular serial ports we do not initialize value of vtermno variable. A garbage value is assigned for non console ports. The value can be observed as a random integer with [1].
[1] vim /sys/kernel/debug/virtio-ports/vport*p*
This patch initialize the value of vtermno for console serial ports to '1' and regular serial ports are initiaized to '0'.
--- drivers/char/virtio_console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/char/virtio_console.c +2 -1
@@ -75,7 +75,7 @@ struct ports_driver_data {/* All the console devices handled by this driver */ struct list_head consoles; }; -static struct ports_driver_data pdrvdata; +static struct ports_driver_data pdrvdata = { .next_vtermno =1 };static DEFINE_SPINLOCK (pdrvdata_lock);static DECLARE_COMPLETION (early_console_added);
@@ -1394,6 +1394,7 @@ static int add_port(struct ports_device *portdev, u32 id) port->async_queue =NULL ; port->cons.ws.ws_row = port->cons.ws.ws_col =0 ; + port->cons.vtermno =0 ; port->host_connected = port->guest_connected = false; port->stats = (struct port_stats ) {0 };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/405 audit: fix a memory leak bug
In reply to Greg Kroah-Hartman[ Upstream commit 70c4cf17e445264453bc5323db3e50aa0ac9e81f ]
In audit_rule_change(), audit_data_to_entry() is firstly invoked to translate the payload data to the kernel's rule representation. In audit_data_to_entry(), depending on the audit field type, an audit tree may be created in audit_make_tree(), which eventually invokes kmalloc() to allocate the tree. Since this tree is a temporary tree, it will be then freed in the following execution, e.g., audit_add_rule() if the message type is AUDIT_ADD_RULE or audit_del_rule() if the message type is AUDIT_DEL_RULE. However, if the message type is neither AUDIT_ADD_RULE nor AUDIT_DEL_RULE, i.e., the default case of the switch statement, this temporary tree is not freed.
To fix this issue, only allocate the tree when the type is AUDIT_ADD_RULE or AUDIT_DEL_RULE.
--- kernel/auditfilter.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
kernel/auditfilter.c +7 -5
@@ -1114,22 +1114,24 @@ int audit_rule_change(int type, int seq, void *data, size_t datasz)int err =0 ;struct audit_entry *entry; - entry =audit_data_to_entry (data, datasz); -if (IS_ERR (entry)) -return PTR_ERR (entry); -switch (type) {case AUDIT_ADD_RULE : + entry =audit_data_to_entry (data, datasz); +if (IS_ERR (entry)) +return PTR_ERR (entry); err =audit_add_rule (entry);audit_log_rule_change ("add_rule" , &entry->rule, !err);break ;case AUDIT_DEL_RULE : + entry =audit_data_to_entry (data, datasz); +if (IS_ERR (entry)) +return PTR_ERR (entry); err =audit_del_rule (entry);audit_log_rule_change ("remove_rule" , &entry->rule, !err);break ;default : - err = -EINVAL ;WARN_ON (1 ); +return -EINVAL ; }if (err || type ==AUDIT_DEL_RULE ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 262/405 arm64: cpu_ops: fix a leaked reference by adding missing of_node_put
In reply to Greg Kroah-Hartman[ Upstream commit 92606ec9285fb84cd9b5943df23f07d741384bfc ]
The call to of_get_next_child returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./arch/arm64/kernel/cpu_ops.c:102:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 69, but without a corresponding object release within this function.
--- arch/arm64/kernel/cpu_ops.c | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kernel/cpu_ops.c +1 -0
@@ -85,6 +85,7 @@ static const char *__init cpu_read_enable_method(int cpu)pr_err ("%pOF: missing enable-method property\n" , dn); } +of_node_put (dn); }else { enable_method =acpi_get_enable_method (cpu);if (!enable_method) {
Signature · 9 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 311/405 RDMA/rxe: Fix slab-out-bounds access which lead to kernel crash later
In reply to Greg Kroah-Hartman[ Upstream commit a4b7013db23e93824ac53083eeb3e4efdef4b5b0 ]
BUG: KASAN: slab-out-of-bounds in rxe_mem_init_user+0x6c1/0x740 [rdma_rxe] Read of size 8 at addr ffff88805c01a608 by task ib_send_bw/573 CPU: 24 PID: 573 Comm: ib_send_bw Not tainted 5.0.0-rc5+ #189 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.11.0-0-g63451fca13-prebuilt.qemu-project.org 04/01/2014 Call Trace: rxe_mem_init_user+0x6c1/0x740 [rdma_rxe] rxe_reg_user_mr+0x9b/0x110 [rdma_rxe] ib_uverbs_reg_mr+0x428/0x9c0 [ib_uverbs] ib_uverbs_handler_UVERBS_METHOD_INVOKE_WRITE+0x2b0/0x410 [ib_uverbs] ib_uverbs_run_method+0x79c/0x1da0 [ib_uverbs] rxe_mem_init_user+0x6c1/0x740 [rdma_rxe] rxe_reg_user_mr+0x9b/0x110 [rdma_rxe] ib_uverbs_reg_mr+0x428/0x9c0 [ib_uverbs] ib_uverbs_handler_UVERBS_METHOD_INVOKE_WRITE+0x2b0/0x410 [ib_uverbs] ib_uverbs_run_method+0x79c/0x1da0 [ib_uverbs] ib_uverbs_cmd_verbs+0x5f2/0xf20 [ib_uverbs] ib_uverbs_ioctl+0x202/0x310 [ib_uverbs] do_vfs_ioctl+0x193/0x1440 ksys_ioctl+0x3a/0x70 __x64_sys_ioctl+0x6f/0xb0 do_syscall_64+0x13f/0x570 entry_SYSCALL_64_after_hwframe+0x49/0xbe Allocated by task 573: __kasan_kmalloc.constprop.5+0xc1/0xd0 __kmalloc+0x161/0x310 rxe_mem_alloc+0x52/0x470 [rdma_rxe] rxe_mem_init_user+0x113/0x740 [rdma_rxe] rxe_reg_user_mr+0x9b/0x110 [rdma_rxe] ib_uverbs_reg_mr+0x428/0x9c0 [ib_uverbs] ib_uverbs_handler_UVERBS_METHOD_INVOKE_WRITE+0x2b0/0x410 [ib_uverbs] ib_uverbs_run_method+0x79c/0x1da0 [ib_uverbs] ib_uverbs_cmd_verbs+0x5f2/0xf20 [ib_uverbs] ib_uverbs_ioctl+0x202/0x310 [ib_uverbs] do_vfs_ioctl+0x193/0x1440 ksys_ioctl+0x3a/0x70 __x64_sys_ioctl+0x6f/0xb0 do_syscall_64+0x13f/0x570 entry_SYSCALL_64_after_hwframe+0x49/0xbe Freed by task 0: __kasan_slab_free+0x12e/0x180 kfree+0x10a/0x2c0 rcu_process_callbacks+0xa77/0x1260 __do_softirq+0x2ad/0xacb
Test scenario:
ib_send_bw -x 1 -d rxe0 -a &
ib_send_bw -x 1 -d rxe0 -a localhost
--- drivers/infiniband/sw/rxe/rxe_mr.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/infiniband/sw/rxe/rxe_mr.c +6 -5
@@ -199,6 +199,12 @@ int rxe_mem_init_user(struct rxe_pd *pd, u64 start, buf = map[0 ]->buf;for_each_sg_page (umem->sg_head.sgl, &sg_iter, umem->nmap,0 ) { +if (num_buf >=RXE_BUF_PER_MAP ) { + map++; + buf = map[0 ]->buf; + num_buf =0 ; + } + vaddr =page_address (sg_page_iter_page (&sg_iter));if (!vaddr) {pr_warn ("null vaddr\n" );
@@ -211,11 +217,6 @@ int rxe_mem_init_user(struct rxe_pd *pd, u64 start, num_buf++; buf++; -if (num_buf >=RXE_BUF_PER_MAP ) { - map++; - buf = map[0 ]->buf; - num_buf =0 ; - } } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/405 media: au0828: Fix NULL pointer dereference in au0828_analog_stream_enable()
In reply to Greg Kroah-Hartman[ Upstream commit 898bc40bfcc26abb6e06e960d6d4754c36c58b50 ]
Fix au0828_analog_stream_enable() to check if device is in the right state first. When unbind happens while bind is in progress, usbdev pointer could be invalid in au0828_analog_stream_enable() and a call to usb_ifnum_to_if() will result in the null pointer dereference.
This problem is found with the new media_dev_allocator.sh test.
kernel: [ 590.359623] BUG: unable to handle kernel NULL pointer dereference at 00000000000004e8
kernel: [ 590.359627] #PF error: [normal kernel read fault]
kernel: [ 590.359629] PGD 0 P4D 0
kernel: [ 590.359632] Oops: 0000 [#1] SMP PTI
kernel: [ 590.359634] CPU: 3 PID: 1458 Comm: v4l_id Not tainted 5.1.0-rc2+ #30
kernel: [ 590.359636] Hardware name: Dell Inc. OptiPlex 7 90/0HY9JP, BIOS A18 09/24/2013
kernel: [ 590.359641] RIP: 0010:usb_ifnum_to_if+0x6/0x60
kernel: [ 590.359643] Code: 5d 41 5e 41 5f 5d c3 48 83 c4
10 b8 fa ff ff ff 5b 41 5c 41 5d 41 5e 41 5f 5d c3 b8 fa ff ff ff c3 0f 1f 00 6
6 66 66 66 90 55 <48> 8b 97 e8 04 00 00 48 89 e5 48 85 d2 74 41 0f b6 4a 04 84 c
9 74
kernel: [ 590.359645] RSP: 0018:ffffad3cc3c1fc00 EFLAGS: 00010246
kernel: [ 590.359646] RAX: 0000000000000000 RBX: ffff8ded b1f3c000 RCX: 1f377e4500000000
kernel: [ 590.359648] RDX: ffff8dedfa3a6b50 RSI: 00000000 00000000 RDI: 0000000000000000
kernel: [ 590.359649] RBP: ffffad3cc3c1fc28 R08: 00000000 8574acc2 R09: ffff8dedfa3a6b50
kernel: [ 590.359650] R10: 0000000000000001 R11: 00000000 00000000 R12: 0000000000000000
kernel: [ 590.359652] R13: ffff8dedb1f3f0f0 R14: ffffffff adcf7ec0 R15: 0000000000000000
kernel: [ 590.359654] FS: 00007f7917198540(0000) GS:ffff 8dee258c0000(0000) knlGS:0000000000000000
kernel: [ 590.359655] CS: 0010 DS: 0000 ES: 0000 CR0: 00 00000080050033
kernel: [ 590.359657] CR2: 00000000000004e8 CR3: 00000001 a388e002 CR4: 00000000000606e0
kernel: [ 590.359658] Call Trace:
kernel: [ 590.359664] ? au0828_analog_stream_enable+0x2c/0x180
kernel: [ 590.359666] au0828_v4l2_open+0xa4/0x110
kernel: [ 590.359670] v4l2_open+0x8b/0x120
kernel: [ 590.359674] chrdev_open+0xa6/0x1c0
kernel: [ 590.359676] ? cdev_put.part.3+0x20/0x20
kernel: [ 590.359678] do_dentry_open+0x1f6/0x360
kernel: [ 590.359681] vfs_open+0x2f/0x40
kernel: [ 590.359684] path_openat+0x299/0xc20
kernel: [ 590.359688] do_filp_open+0x9b/0x110
kernel: [ 590.359695] ? _raw_spin_unlock+0x27/0x40
kernel: [ 590.359697] ? __alloc_fd+0xb2/0x160
kernel: [ 590.359700] do_sys_open+0x1ba/0x260
kernel: [ 590.359702] ? do_sys_open+0x1ba/0x260
kernel: [ 590.359712] __x64_sys_openat+0x20/0x30
kernel: [ 590.359715] do_syscall_64+0x5a/0x120
kernel: [ 590.359718] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/media/usb/au0828/au0828-video.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/usb/au0828/au0828-video.c +3 -0
@@ -758,6 +758,9 @@ static int au0828_analog_stream_enable(struct au0828_dev *d)dprintk (1 ,"au0828_analog_stream_enable called\n" ); +if (test_bit (DEV_DISCONNECTED , &d->dev_state)) +return -ENODEV ; + iface =usb_ifnum_to_if (d->usbdev,0 );if (iface && iface->cur_altsetting->desc.bAlternateSetting !=5 ) {dprintk (1 ,"Changing intf#0 to alt 5\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 314/405 ice: Fix for adaptive interrupt moderation
In reply to Greg Kroah-Hartman[ Upstream commit 64a59d05a4b3ddb37eb5ad3a3be0f17148f449f5 ]
commit 63f545ed1285 ("ice: Add support for adaptive interrupt moderation") was meant to add support for adaptive interrupt moderation but there was an error on my part while formatting the patch, and thus only part of the patch ended up being submitted.
This patch rectifies the error by adding the rest of the code.
--- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_txrx.c | 292 ++++++++++++++++++++-- drivers/net/ethernet/intel/ice/ice_txrx.h | 6 + 3 files changed, 275 insertions(+), 24 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +1 -0
@@ -277,6 +277,7 @@ struct ice_q_vector {* value to the device */ u8 intrl; +u8 itr_countdown;/* when 0 should adjust adaptive ITR */ }____cacheline_internodealigned_in_smp ;enum ice_pf_flags {
drivers/net/ethernet/intel/ice/ice_txrx.c +268 -24
331 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_txrx.h +6 -0
@@ -128,6 +128,12 @@ enum ice_rx_dtype {#define ICE_ITR_MASK 0x1FFE/* ITR register value alignment mask */ #define ITR_REG_ALIGN (setting) __ALIGN_MASK(setting, ~ICE_ITR_MASK) +#define ICE_ITR_ADAPTIVE_MIN_INC 0x0002 +#define ICE_ITR_ADAPTIVE_MIN_USECS 0x0002 +#define ICE_ITR_ADAPTIVE_MAX_USECS 0x00FA +#define ICE_ITR_ADAPTIVE_LATENCY 0x8000 +#define ICE_ITR_ADAPTIVE_BULK 0x0000 +#define ICE_DFLT_INTRL 0/* Legacy or Advanced Mode Queue */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 160/405 media: pvrusb2: Prevent a buffer overflow
In reply to Greg Kroah-Hartman[ Upstream commit c1ced46c7b49ad7bc064e68d966e0ad303f917fb ]
The ctrl_check_input() function is called from pvr2_ctrl_range_check(). It's supposed to validate user supplied input and return true or false depending on whether the input is valid or not. The problem is that negative shifts or shifts greater than 31 are undefined in C. In practice with GCC they result in shift wrapping so this function returns true for some inputs which are not valid and this could result in a buffer overflow:
drivers/media/usb/pvrusb2/pvrusb2-ctrl.c:205 pvr2_ctrl_get_valname()
warn: uncapped user index 'names[val]'
The cptr->hdw->input_allowed_mask mask is configured in pvr2_hdw_create() and the highest valid bit is BIT(4).
--- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 ++ drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 1 + 2 files changed, 3 insertions(+)
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +2 -0
@@ -666,6 +666,8 @@ static int ctrl_get_input(struct pvr2_ctrl *cptr,int *vp)static int ctrl_check_input (struct pvr2_ctrl *cptr,int v) { +if (v <0 || v >PVR2_CVAL_INPUT_MAX ) +return 0 ;return ((1 << v) & cptr->hdw->input_allowed_mask) !=0 ; }
drivers/media/usb/pvrusb2/pvrusb2-hdw.h +1 -0
@@ -50,6 +50,7 @@#define PVR2_CVAL_INPUT_COMPOSITE 2#define PVR2_CVAL_INPUT_SVIDEO 3#define PVR2_CVAL_INPUT_RADIO 4 +#define PVR2_CVAL_INPUT_MAX PVR2_CVAL_INPUT_RADIOenum pvr2_config { pvr2_config_empty,/* No configuration */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 167/405 cgroup: protect cgroup->nr_(dying_)descendants by css_set_lock
In reply to Greg Kroah-Hartman[ Upstream commit 4dcabece4c3a9f9522127be12cc12cc120399b2f ]
The number of descendant cgroups and the number of dying descendant cgroups are currently synchronized using the cgroup_mutex.
The number of descendant cgroups will be required by the cgroup v2 freezer, which will use it to determine if a cgroup is frozen (depending on total number of descendants and number of frozen descendants). It's not always acceptable to grab the cgroup_mutex, especially from quite hot paths (e.g. exit()).
To avoid this, let's additionally synchronize these counters using the css_set_lock.
So, it's safe to read these counters with either cgroup_mutex or css_set_lock locked, and for changing both locks should be acquired.
--- include/linux/cgroup-defs.h | 5 +++++ kernel/cgroup/cgroup.c | 6 ++++++ 2 files changed, 11 insertions(+)
include/linux/cgroup-defs.h +5 -0
@@ -349,6 +349,11 @@ struct cgroup {* Dying cgroups are cgroups which were deleted by a user, * but are still existing because someone else is holding a reference. * max_descendants is a maximum allowed number of descent cgroups. +* +* nr_descendants and nr_dying_descendants are protected +* by cgroup_mutex and css_set_lock. It's fine to read them holding +* any of cgroup_mutex and css_set_lock; for writing both locks +* should be held. */ int nr_descendants;int nr_dying_descendants;
kernel/cgroup/cgroup.c +6 -0
@@ -4781,9 +4781,11 @@ static void css_release_work_fn(struct work_struct *work)if (cgroup_on_dfl (cgrp))cgroup_rstat_flush (cgrp); +spin_lock_irq (&css_set_lock);for (tcgrp =cgroup_parent (cgrp); tcgrp; tcgrp =cgroup_parent (tcgrp)) tcgrp->nr_dying_descendants--; +spin_unlock_irq (&css_set_lock);cgroup_idr_remove (&cgrp->root->cgroup_idr, cgrp->id); cgrp->id =-1 ;
@@ -5001,12 +5003,14 @@ static struct cgroup *cgroup_create(struct cgroup *parent)if (ret) goto out_psi_free; +spin_lock_irq (&css_set_lock);for (tcgrp = cgrp; tcgrp; tcgrp =cgroup_parent (tcgrp)) { cgrp->ancestor_ids[tcgrp->level] = tcgrp->id;if (tcgrp != cgrp) tcgrp->nr_descendants++; } +spin_unlock_irq (&css_set_lock);if (notify_on_release (parent))set_bit (CGRP_NOTIFY_ON_RELEASE , &cgrp->flags);
@@ -5291,10 +5295,12 @@ static int cgroup_destroy_locked(struct cgroup *cgrp)if (parent &&cgroup_is_threaded (cgrp)) parent->nr_threaded_children--; +spin_lock_irq (&css_set_lock);for (tcgrp =cgroup_parent (cgrp); tcgrp; tcgrp =cgroup_parent (tcgrp)) { tcgrp->nr_descendants--; tcgrp->nr_dying_descendants++; } +spin_unlock_irq (&css_set_lock);cgroup1_check_for_release (parent);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/405 Bluetooth: hci_qca: Fix crash with non-serdev devices
In reply to Greg Kroah-Hartman[ Upstream commit ecf2b768bd11e2ff09ecbe621b387d0d58e970cf ]
qca_set_baudrate() calls serdev_device_wait_until_sent() assuming that the HCI is always associated with a serdev device. This isn't true for ROME controllers instantiated through ldisc, where the call causes a crash due to a NULL pointer dereferentiation. Only call the function when we have a serdev device. The timeout for ROME devices at the end of qca_set_baudrate() is long enough to be reasonably sure that the command was sent.
--- drivers/bluetooth/hci_qca.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_qca.c +2 -1
@@ -992,7 +992,8 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)while (!skb_queue_empty (&qca->txq))usleep_range (100 ,200 ); -serdev_device_wait_until_sent (hu->serdev, +if (hu->serdev) +serdev_device_wait_until_sent (hu->serdev,msecs_to_jiffies (CMD_TRANS_TIMEOUT_MS ));/* Give the controller time to process the request */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 179/405 USB: core: Dont unbind interfaces following device reset failure
In reply to Greg Kroah-Hartman[ Upstream commit 381419fa720060ba48b7bbc483be787d5b1dca6f ]
The SCSI core does not like to have devices or hosts unregistered while error recovery is in progress. Trying to do so can lead to
self-deadlock: Part of the removal code tries to obtain a lock already held by the error handler.
This can cause problems for the usb-storage and uas drivers, because their error handler routines perform a USB reset, and if the reset fails then the USB core automatically goes on to unbind all drivers from the device's interfaces -- all while still in the context of the SCSI error handler.
As it turns out, practically all the scenarios leading to a USB reset failure end up causing a device disconnect (the main error pathway in usb_reset_and_verify_device(), at the end of the routine, calls hub_port_logical_disconnect() before returning). As a result, the hub_wq thread will soon become aware of the problem and will unbind all the device's drivers in its own context, not in the error-handler's context.
This means that usb_reset_device() does not need to call usb_unbind_and_rebind_marked_interfaces() in cases where usb_reset_and_verify_device() has returned an error, because hub_wq will take care of everything anyway.
This particular problem was observed in somewhat artificial circumstances, by using usbfs to tell a hub to power-down a port connected to a USB-3 mass storage device using the UAS protocol. With the port turned off, the currently executing command timed out and the error handler started running. The USB reset naturally failed, because the hub port was off, and the error handler deadlocked as described above. Not carrying out the call to usb_unbind_and_rebind_marked_interfaces() fixes this issue.
--- drivers/usb/core/hub.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/core/hub.c +4 -1
@@ -5902,7 +5902,10 @@ int usb_reset_device(struct usb_device *udev) cintf->needs_binding =1 ; } } -usb_unbind_and_rebind_marked_interfaces (udev); + +/* If the reset failed, hub_wq will unbind drivers later */ +if (ret ==0 ) +usb_unbind_and_rebind_marked_interfaces (udev); }usb_autosuspend_device (udev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 185/405 phy: ti: usb2: fix OMAP_CONTROL_PHY dependency
In reply to Greg Kroah-Hartman[ Upstream commit d41ce98a122c13ea77938af04ef06fb12ae0c69e ]
With randconfig build testing on arm64, we can run into a configuration that has CONFIG_OMAP_CONTROL_PHY=m and CONFIG_OMAP_USB2=y, which in turn causes a link failure:
drivers/phy/ti/phy-omap-usb2.o: In function `omap_usb_phy_power':
phy-omap-usb2.c:(.text+0x17c): undefined reference to `omap_control_phy_power'
I could not come up with a good way to correctly describe the relation of the two symbols, but if we just select CONFIG_OMAP_CONTROL_PHY during compile testing, we can no longer run into the broken configuration.
--- drivers/phy/ti/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/ti/Kconfig +1 -1
@@ -37,7 +37,7 @@ config OMAP_USB2 depends on USB_SUPPORT select GENERIC_PHY select USB_PHY - select OMAP_CONTROL_PHY if ARCH_OMAP2PLUS + select OMAP_CONTROL_PHY if ARCH_OMAP2PLUS || COMPILE_TEST help Enable this to support the transceiver that is part of SOC. This driver takes care of all the PHY functionality apart from comparator.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 197/405 hwmon: (vt1211) Use request_muxed_region for Super-IO accesses
In reply to Greg Kroah-Hartman[ Upstream commit 14b97ba5c20056102b3dd22696bf17b057e60976 ]
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.
--- drivers/hwmon/vt1211.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/hwmon/vt1211.c +12 -3
@@ -226,15 +226,21 @@ static inline void superio_select(int sio_cip, int ldn)outb (ldn, sio_cip +1 ); } -static inline void superio_enter (int sio_cip) +static inline int superio_enter (int sio_cip) { +if (!request_muxed_region (sio_cip,2 ,DRVNAME )) +return -EBUSY ; +outb (0x87 , sio_cip);outb (0x87 , sio_cip); + +return 0 ; }static inline void superio_exit (int sio_cip) {outb (0xaa , sio_cip); +release_region (sio_cip,2 ); }/* ---------------------------------------------------------------------
@@ -1282,11 +1288,14 @@ static int __init vt1211_device_add(unsigned short address)static int __init vt1211_find (int sio_cip,unsigned short *address) { -int err = -ENODEV ; +int err;int devid; -superio_enter (sio_cip); + err =superio_enter (sio_cip); +if (err) +return err; + err = -ENODEV ; devid = force_id ? force_id :superio_inb (sio_cip,SIO_VT1211_DEVID );if (devid !=SIO_VT1211_ID ) goto EXIT;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 202/405 scsi: libsas: Do discovery on empty PHY to update PHY info
In reply to Greg Kroah-Hartman[ Upstream commit d8649fc1c5e40e691d589ed825998c36a947491c ]
When we discover the PHY is empty in sas_rediscover_dev(), the PHY information (like negotiated linkrate) is not updated.
As such, for a user examining sysfs for that PHY, they would see incorrect values:
root@(none)$ cd /sys/class/sas_phy/phy-0:0:20 root@(none)$ more negotiated_linkrate 3.0 Gbit root@(none)$ echo 0 > enable root@(none)$ more negotiated_linkrate 3.0 Gbit
So fix this, simply discover the PHY again, even though we know it's empty; in the above example, this gives us:
root@(none)$ more negotiated_linkrate Phy disabled
We must do this after unregistering the device associated with the PHY (in sas_unregister_devs_sas_addr()).
--- drivers/scsi/libsas/sas_expander.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/libsas/sas_expander.c +5 -0
@@ -2052,6 +2052,11 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)if ((SAS_ADDR (sas_addr) ==0 ) || (res == -ECOMM )) { phy->phy_state =PHY_EMPTY ;sas_unregister_devs_sas_addr (dev, phy_id, last); +/* +* Even though the PHY is empty, for convenience we discover +* the PHY to update the PHY info, like negotiated linkrate. +*/ +sas_ex_phy_discover (dev, phy_id);return res; }else if (SAS_ADDR (sas_addr) ==SAS_ADDR (phy->attached_sas_addr) &&dev_type_flutter (type, phy->attached_dev_type)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 213/405 clk: rockchip: Make rkpwm a critical clock on rk3288
In reply to Greg Kroah-Hartman[ Upstream commit dfe7fb21cd9e730230d55a79bc72cf2ece67cdd5 ]
Most rk3288-based boards are derived from the EVB and thus use a PWM regulator for the logic rail. However, most rk3288-based boards don't specify the PWM regulator in their device tree. We'll deal with that by making it critical.
NOTE: it's important to make it critical and not just IGNORE_UNUSED because all PWMs in the system share the same clock. We don't want another PWM user to turn the clock on and off and kill the logic rail.
This change is in preparation for actually having the PWMs in the rk3288 device tree actually point to the proper PWM clock. Up until now they've all pointed to the clock for the old IP block and they've all worked due to the fact that rkpwm was IGNORE_UNUSED and that the clock rates for both clocks were the same.
--- drivers/clk/rockchip/clk-rk3288.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clk/rockchip/clk-rk3288.c +3 -1
@@ -697,7 +697,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {GATE (PCLK_TZPC ,"pclk_tzpc" ,"pclk_cpu" ,0 ,RK3288_CLKGATE_CON (11 ),3 ,GFLAGS ),GATE (PCLK_UART2 ,"pclk_uart2" ,"pclk_cpu" ,0 ,RK3288_CLKGATE_CON (11 ),9 ,GFLAGS ),GATE (PCLK_EFUSE256 ,"pclk_efuse_256" ,"pclk_cpu" ,0 ,RK3288_CLKGATE_CON (11 ),10 ,GFLAGS ), -GATE (PCLK_RKPWM ,"pclk_rkpwm" ,"pclk_cpu" ,CLK_IGNORE_UNUSED ,RK3288_CLKGATE_CON (11 ),11 ,GFLAGS ), +GATE (PCLK_RKPWM ,"pclk_rkpwm" ,"pclk_cpu" ,0 ,RK3288_CLKGATE_CON (11 ),11 ,GFLAGS ),/* ddrctrl [DDR Controller PHY clock] gates */ GATE(0, "nclk_ddrupctl0", "ddrphy", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(11), 4, GFLAGS),
@@ -838,6 +838,8 @@ static const char *const rk3288_critical_clocks[] __initconst = {"pclk_pd_pmu" ,"pclk_pmu_niu" ,"pmu_hclk_otg0" , +/* pwm-regulators on some boards, so handoff-critical later */ + "pclk_rkpwm", };static void __iomem *rk3288_cru_base;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 396/405 drm/amd/display: Reset planes that were disabled in init_pipes
In reply to Greg Kroah-Hartman[ Upstream commit 4bc46da4a3aeeb4d55e83dd276cf72756e908286 ]
[Why]
Seamless boot tries to reuse planes that were enabled for the first commit applied.
In the case where Raven is booting with two monitors connected and the first commit contains two streams the screen corruption would occur because the second stream was trying to re-use a tg and plane that weren't previously enabled.
The state on the first commit looks something like the following:
TG0: enabled=1
TG1: enabled=0
TG2: enabled=0
TG3: enabled=0
New state: pipe=0, stream=0, plane=0, new_tg=0
New state: pipe=1, stream=1, plane=1, new_tg=1
New state: pipe=2, stream=NULL, plane=NULL, new_tg=NULL
New state: pipe=3, stream=NULL, plane=NULL, new_tg=NULL
Only one plane/tg is setup before we enter accelerated mode so we really want to disabling everything but that first plane.
[How]
Check if the stream is not NULL and if the tg is enabled before deciding whether to skip the plane disable.
Also ensure we're also disabling on the current state's pipe_ctx so we don't overwrite the fields in the new pending state.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +6 -1
@@ -1008,9 +1008,14 @@ static void dcn10_init_pipes(struct dc *dc, struct dc_state *context)* to non-preferred front end. If pipe_ctx->stream is not NULL, * we will use the pipe, so don't disable */ -if (pipe_ctx->stream !=NULL ) +if (pipe_ctx->stream !=NULL && + pipe_ctx->stream_res.tg->funcs->is_tg_enabled ( + pipe_ctx->stream_res.tg))continue ; +/* Disable on the current state so the new one isn't cleared. */ + pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[i]; + dpp->funcs->dpp_reset (dpp); pipe_ctx->stream_res.tg = tg;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 405/405 NFS: Fix a double unlock from nfs_match,get_client
In reply to Greg Kroah-Hartman[ Upstream commit c260121a97a3e4df6536edbc2f26e166eff370ce ]
Now that nfs_match_client drops the nfs_client_lock, we should be careful
to always return it in the same condition: locked.
--- fs/nfs/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/client.c +1 -1
@@ -299,9 +299,9 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *datspin_unlock (&nn->nfs_client_lock); error =nfs_wait_client_init_complete (clp);nfs_put_client (clp); +spin_lock (&nn->nfs_client_lock);if (error <0 )return ERR_PTR (error); -spin_lock (&nn->nfs_client_lock); goto again; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 387/405 regulator: wm831x: Fix notifier mutex lock warning
In reply to Greg Kroah-Hartman[ Upstream commit 119c4f5085c45b60cb23c5595e45d06135b89518 ]
The mutex for the regulator_dev must be controlled by the caller of the regulator_notifier_call_chain(), as described in the comment for that function.
Failure to mutex lock and unlock surrounding the notifier call results in a kernel WARN_ON_ONCE() which will dump a backtrace for the regulator_notifier_call_chain() when that function call is first made. The mutex can be controlled using the regulator_lock/unlock() API.
--- drivers/regulator/wm831x-dcdc.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/regulator/wm831x-dcdc.c +4 -0
@@ -183,9 +183,11 @@ static irqreturn_t wm831x_dcdc_uv_irq(int irq, void *data) {struct wm831x_dcdc *dcdc = data; +regulator_lock (dcdc->regulator);regulator_notifier_call_chain (dcdc->regulator,REGULATOR_EVENT_UNDER_VOLTAGE ,NULL ); +regulator_unlock (dcdc->regulator);return IRQ_HANDLED ; }
@@ -194,9 +196,11 @@ static irqreturn_t wm831x_dcdc_oc_irq(int irq, void *data) {struct wm831x_dcdc *dcdc = data; +regulator_lock (dcdc->regulator);regulator_notifier_call_chain (dcdc->regulator,REGULATOR_EVENT_OVER_CURRENT ,NULL ); +regulator_unlock (dcdc->regulator);return IRQ_HANDLED ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 389/405 regulator: da9062: Fix notifier mutex lock warning
In reply to Greg Kroah-Hartman[ Upstream commit 978995def0f6030aa6b3b494682f673aca13881b ]
The mutex for the regulator_dev must be controlled by the caller of the regulator_notifier_call_chain(), as described in the comment for that function.
Failure to mutex lock and unlock surrounding the notifier call results in a kernel WARN_ON_ONCE() which will dump a backtrace for the regulator_notifier_call_chain() when that function call is first made. The mutex can be controlled using the regulator_lock/unlock() API.
--- drivers/regulator/da9062-regulator.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/regulator/da9062-regulator.c +2 -0
@@ -974,8 +974,10 @@ static irqreturn_t da9062_ldo_lim_event(int irq, void *data)continue ;if (BIT (regl->info->oc_event.lsb) & bits) { +regulator_lock (regl->rdev);regulator_notifier_call_chain (regl->rdev,REGULATOR_EVENT_OVER_CURRENT ,NULL ); +regulator_unlock (regl->rdev); handled =IRQ_HANDLED ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 232/405 habanalabs: prevent device PTE read/write during hard-reset
In reply to Greg Kroah-Hartman[ Upstream commit 9f201aba56b92c3daa4b76efae056ddbb80d91e6 ]
During hard-reset, contexts are closed as part of the tear-down process. After a context is closed, the driver cleans up the page tables of that context in the device's DRAM. This action is both dangerous and unnecessary.
It is unnecessary, because the device is going through a hard-reset, which means the device's DRAM contents are no longer valid and the device's MMU is being reset.
It is dangerous, because if the hard-reset came as a result of a PCI freeze, this action may cause the entire host machine to hang.
Therefore, prevent all device PTE updates when a hard-reset operation is pending.
--- drivers/misc/habanalabs/goya/goya.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/misc/habanalabs/goya/goya.c +6 -0
@@ -4407,6 +4407,9 @@ static u64 goya_read_pte(struct hl_device *hdev, u64 addr) {struct goya_device *goya = hdev->asic_specific; +if (hdev->hard_reset_pending) +return U64_MAX ; +return readq (hdev->pcie_bar[DDR_BAR_ID ] + (addr - goya->ddr_bar_cur_addr)); }
@@ -4415,6 +4418,9 @@ static void goya_write_pte(struct hl_device *hdev, u64 addr, u64 val) {struct goya_device *goya = hdev->asic_specific; +if (hdev->hard_reset_pending) +return ; +writeq (val, hdev->pcie_bar[DDR_BAR_ID ] + (addr - goya->ddr_bar_cur_addr)); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 233/405 habanalabs: all FD must be closed before removing device
In reply to Greg Kroah-Hartman[ Upstream commit caa3c8e52582fc4d2ed82afd5e7ea164c18ef4fe ]
This patch fixes a bug in the implementation of the function that removes the device.
The bug can happen when the device is removed but not the driver itself (e.g. remove by the OS due to PCI freeze in Power architecture).
In that case, there maybe open users that are calling IOCTLs while the device is removed. This is a possible race condition that the driver must handle. Otherwise, a kernel panic may occur.
This race is prevented in the hard-reset flow, because the driver makes sure the users are closed before continuing with the hard-reset. This race can not occur when the driver itself is removed because the OS makes sure all the file descriptors are closed.
The fix is to make sure the open users close their file descriptors and if they don't (after a certain amount of time), the driver sends them a SIGKILL, because the remove of the device can't be stopped.
The patch re-uses the same code that is called from the hard-reset flow.
--- drivers/misc/habanalabs/device.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
drivers/misc/habanalabs/device.c +27 -5
@@ -498,11 +498,8 @@ int hl_device_resume(struct hl_device *hdev)return rc; } -static void hl_device_hard_reset_pending (struct work_struct *work) +static void device_kill_open_processes (struct hl_device *hdev) { -struct hl_device_reset_work *device_reset_work = - container_of(work, struct hl_device_reset_work, reset_work); -struct hl_device *hdev = device_reset_work->hdev;u16 pending_total, pending_cnt;struct task_struct *task =NULL ;
@@ -537,6 +534,12 @@ static void hl_device_hard_reset_pending(struct work_struct *work) } } +/* We killed the open users, but because the driver cleans up after the +* user contexts are closed (e.g. mmu mappings), we need to wait again +* to make sure the cleaning phase is finished before continuing with +* the reset +*/ + pending_cnt = pending_total;while ((atomic_read (&hdev->fd_open_cnt)) && (pending_cnt)) {
@@ -552,6 +555,16 @@ static void hl_device_hard_reset_pending(struct work_struct *work)mutex_unlock (&hdev->fd_open_cnt_lock); +} + +static void device_hard_reset_pending (struct work_struct *work) +{ +struct hl_device_reset_work *device_reset_work = + container_of(work, struct hl_device_reset_work, reset_work); +struct hl_device *hdev = device_reset_work->hdev; + +device_kill_open_processes (hdev); +hl_device_reset (hdev, true, true);kfree (device_reset_work);
@@ -635,7 +648,7 @@ int hl_device_reset(struct hl_device *hdev, bool hard_reset,* from a dedicated work */ INIT_WORK (&device_reset_work->reset_work, - hl_device_hard_reset_pending); + device_hard_reset_pending); device_reset_work->hdev = hdev;schedule_work (&device_reset_work->reset_work);
@@ -1035,6 +1048,15 @@ void hl_device_fini(struct hl_device *hdev)/* Mark device as disabled */ hdev->disabled = true; +/* +* Flush anyone that is inside the critical section of enqueue +* jobs to the H/W +*/ + hdev->asic_funcs->hw_queues_lock (hdev); + hdev->asic_funcs->hw_queues_unlock (hdev); + +device_kill_open_processes (hdev); +hl_hwmon_fini (hdev);device_late_fini (hdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 192/405 fscrypt: use READ_ONCE() to access ->i_crypt_info
In reply to Greg Kroah-Hartman[ Upstream commit e37a784d8b6a1e726de5ddc7b4809c086a08db09 ]
->i_crypt_info starts out NULL and may later be locklessly set to a non-NULL value by the cmpxchg() in fscrypt_get_encryption_info().
But ->i_crypt_info is used directly, which technically is incorrect. It's a data race, and it doesn't include the data dependency barrier needed to safely dereference the pointer on at least one architecture.
Fix this by using READ_ONCE() instead. Note: we don't need to use smp_load_acquire(), since dereferencing the pointer only requires a data dependency barrier, which is already included in READ_ONCE(). We also don't need READ_ONCE() in places where ->i_crypt_info is unconditionally dereferenced, since it must have already been checked.
Also downgrade the cmpxchg() to cmpxchg_release(), since RELEASE semantics are sufficient on the write side.
--- fs/crypto/crypto.c | 2 +- fs/crypto/fname.c | 4 ++-- fs/crypto/keyinfo.c | 4 ++-- fs/crypto/policy.c | 6 +++--- include/linux/fscrypt.h | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-)
fs/crypto/crypto.c +1 -1
@@ -334,7 +334,7 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)spin_lock (&dentry->d_lock); cached_with_key = dentry->d_flags &DCACHE_ENCRYPTED_WITH_KEY ;spin_unlock (&dentry->d_lock); - dir_has_key = (d_inode (dir)->i_crypt_info !=NULL ); + dir_has_key =fscrypt_has_encryption_key (d_inode (dir));dput (dir);/*
fs/crypto/fname.c +2 -2
@@ -269,7 +269,7 @@ int fscrypt_fname_disk_to_usr(struct inode *inode,if (iname->len <FS_CRYPTO_BLOCK_SIZE )return -EUCLEAN ; -if (inode->i_crypt_info) +if (fscrypt_has_encryption_key (inode))return fname_decrypt (inode, iname, oname);if (iname->len <=FSCRYPT_FNAME_MAX_UNDIGESTED_SIZE ) {
@@ -336,7 +336,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname,if (ret)return ret; -if (dir->i_crypt_info) { +if (fscrypt_has_encryption_key (dir)) {if (!fscrypt_fname_encrypted_size (dir, iname->len, dir->i_sb->s_cop->max_namelen, &fname->crypto_buf.len))
fs/crypto/keyinfo.c +2 -2
@@ -509,7 +509,7 @@ int fscrypt_get_encryption_info(struct inode *inode)u8 *raw_key =NULL ;int res; -if (inode->i_crypt_info) +if (fscrypt_has_encryption_key (inode))return 0 ; res =fscrypt_initialize (inode->i_sb->s_cop->flags);
@@ -573,7 +573,7 @@ int fscrypt_get_encryption_info(struct inode *inode)if (res) goto out; -if (cmpxchg (&inode->i_crypt_info,NULL , crypt_info) ==NULL ) +if (cmpxchg_release (&inode->i_crypt_info,NULL , crypt_info) ==NULL ) crypt_info =NULL ; out:if (res == -ENOKEY )
fs/crypto/policy.c +3 -3
@@ -194,8 +194,8 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child) res =fscrypt_get_encryption_info (child);if (res)return 0 ; - parent_ci = parent->i_crypt_info; - child_ci = child->i_crypt_info; + parent_ci =READ_ONCE (parent->i_crypt_info); + child_ci =READ_ONCE (child->i_crypt_info);if (parent_ci && child_ci) { return memcmp(parent_ci->ci_master_key_descriptor,
@@ -246,7 +246,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child,if (res <0 )return res; - ci = parent->i_crypt_info; + ci =READ_ONCE (parent->i_crypt_info);if (ci ==NULL )return -ENOKEY ;
include/linux/fscrypt.h +2 -1
@@ -79,7 +79,8 @@ struct fscrypt_ctx {static inline bool fscrypt_has_encryption_key (const struct inode *inode) { -return (inode->i_crypt_info !=NULL ); +/* pairs with cmpxchg_release() in fscrypt_get_encryption_info() */ +return READ_ONCE (inode->i_crypt_info) !=NULL ; }static inline bool fscrypt_dummy_context_enabled (struct inode *inode)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 252/405 brcmfmac: fix WARNING during USB disconnect in case of unempty psq
In reply to Greg Kroah-Hartman[ Upstream commit c80d26e81ef1802f30364b4ad1955c1443a592b9 ]
brcmu_pkt_buf_free_skb emits WARNING when attempting to free a sk_buff which is part of any queue. After USB disconnect this may have happened when brcmf_fws_hanger_cleanup() is called as per-interface psq was never cleaned when removing the interface.
Change brcmf_fws_macdesc_cleanup() in a way that it removes the corresponding packets from hanger table (to avoid double-free when brcmf_fws_hanger_cleanup() is called) and add a call to clean-up the interface specific packet queue.
Below is a WARNING during USB disconnect with Raspberry Pi WiFi dongle running in AP mode. This was reproducible when the interface was transmitting during the disconnect and is fixed with this commit.
------------[ cut here ]------------ WARNING: CPU: 0 PID: 1171 at drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c:49 brcmu_pkt_buf_free_skb+0x3c/0x40 Modules linked in: nf_log_ipv4 nf_log_common xt_LOG xt_limit iptable_mangle xt_connmark xt_tcpudp xt_conntrack nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 iptable_filter ip_tables x_tables usb_f_mass_storage usb_f_rndis u_ether cdc_acm smsc95xx usbnet ci_hdrc_imx ci_hdrc ulpi usbmisc_imx 8250_exar 8250_pci 8250 8250_base libcomposite configfs udc_core CPU: 0 PID: 1171 Comm: kworker/0:0 Not tainted 4.19.23-00075-gde33ed8 #99 Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) Workqueue: usb_hub_wq hub_event [<8010ff84>] (unwind_backtrace) from [<8010bb64>] (show_stack+0x10/0x14) [<8010bb64>] (show_stack) from [<80840278>] (dump_stack+0x88/0x9c) [<80840278>] (dump_stack) from [<8011f5ec>] (__warn+0xfc/0x114) [<8011f5ec>] (__warn) from [<8011f71c>] (warn_slowpath_null+0x40/0x48) [<8011f71c>] (warn_slowpath_null) from [<805a476c>] (brcmu_pkt_buf_free_skb+0x3c/0x40) [<805a476c>] (brcmu_pkt_buf_free_skb) from [<805bb6c4>] (brcmf_fws_cleanup+0x1e4/0x22c) [<805bb6c4>] (brcmf_fws_cleanup) from [<805bc854>] (brcmf_fws_del_interface+0x58/0x68) [<805bc854>] (brcmf_fws_del_interface) from [<805b66ac>] (brcmf_remove_interface+0x40/0x150) [<805b66ac>] (brcmf_remove_interface) from [<805b6870>] (brcmf_detach+0x6c/0xb0) [<805b6870>] (brcmf_detach) from [<805bdbb8>] (brcmf_usb_disconnect+0x30/0x4c) [<805bdbb8>] (brcmf_usb_disconnect) from [<805e5d64>] (usb_unbind_interface+0x5c/0x1e0) [<805e5d64>] (usb_unbind_interface) from [<804aab10>] (device_release_driver_internal+0x154/0x1ec) [<804aab10>] (device_release_driver_internal) from [<804a97f4>] (bus_remove_device+0xcc/0xf8) [<804a97f4>] (bus_remove_device) from [<804a6fc0>] (device_del+0x118/0x308) [<804a6fc0>] (device_del) from [<805e488c>] (usb_disable_device+0xa0/0x1c8) [<805e488c>] (usb_disable_device) from [<805dcf98>] (usb_disconnect+0x70/0x1d8) [<805dcf98>] (usb_disconnect) from [<805ddd84>] (hub_event+0x464/0xf50) [<805ddd84>] (hub_event) from [<80135a70>] (process_one_work+0x138/0x3f8) [<80135a70>] (process_one_work) from [<80135d5c>] (worker_thread+0x2c/0x554) [<80135d5c>] (worker_thread) from [<8013b1a0>] (kthread+0x124/0x154) [<8013b1a0>] (kthread) from [<801010e8>] (ret_from_fork+0x14/0x2c) Exception stack(0xecf8dfb0 to 0xecf8dff8) dfa0: 00000000 00000000 00000000 00000000 dfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 dfe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end trace 38d234018e9e2a90 ]--- ------------[ cut here ]------------
--- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +24 -18
@@ -580,24 +580,6 @@ static bool brcmf_fws_ifidx_match(struct sk_buff *skb, void *arg)return ifidx == *(int *)arg; } -static void brcmf_fws_psq_flush (struct brcmf_fws_info *fws,struct pktq *q, -int ifidx) -{ -bool (*matchfn)(struct sk_buff *,void *) =NULL ; -struct sk_buff *skb; -int prec; - -if (ifidx !=-1 ) - matchfn = brcmf_fws_ifidx_match; -for (prec =0 ; prec < q->num_prec; prec++) { - skb =brcmu_pktq_pdeq_match (q, prec, matchfn, &ifidx); -while (skb) { -brcmu_pkt_buf_free_skb (skb); - skb =brcmu_pktq_pdeq_match (q, prec, matchfn, &ifidx); - } - } -} -static void brcmf_fws_hanger_init (struct brcmf_fws_hanger *hanger) {int i;
@@ -669,6 +651,28 @@ static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h,return 0 ; } +static void brcmf_fws_psq_flush (struct brcmf_fws_info *fws,struct pktq *q, +int ifidx) +{ +bool (*matchfn)(struct sk_buff *,void *) =NULL ; +struct sk_buff *skb; +int prec; +u32 hslot; + +if (ifidx !=-1 ) + matchfn = brcmf_fws_ifidx_match; +for (prec =0 ; prec < q->num_prec; prec++) { + skb =brcmu_pktq_pdeq_match (q, prec, matchfn, &ifidx); +while (skb) { + hslot =brcmf_skb_htod_tag_get_field (skb,HSLOT ); +brcmf_fws_hanger_poppkt (&fws->hanger, hslot, &skb, + true); +brcmu_pkt_buf_free_skb (skb); + skb =brcmu_pktq_pdeq_match (q, prec, matchfn, &ifidx); + } + } +} +static int brcmf_fws_hanger_mark_suppressed (struct brcmf_fws_hanger *h,u32 slot_id) {
@@ -2200,6 +2204,8 @@ void brcmf_fws_del_interface(struct brcmf_if *ifp)brcmf_fws_lock (fws); ifp->fws_desc =NULL ;brcmf_dbg (TRACE ,"deleting %s\n" , entry->name); +brcmf_fws_macdesc_cleanup (fws, &fws->desc.iface[ifp->ifidx], + ifp->ifidx);brcmf_fws_macdesc_deinit (entry);brcmf_fws_cleanup (fws, ifp->ifidx);brcmf_fws_unlock (fws);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 261/405 drm/amd/display: Prevent cursor hotspot overflow for RV overlay planes
In reply to Greg Kroah-Hartman[ Upstream commit 6752bea8b03e77c98be7d8d25b0a9d86a00b3cf7 ]
[Why]
The actual position for the cursor on the screen is essentially:
x_out = x - x_plane - x_hotspoty_out = y - y_plane - y_hotspot
The register values for cursor position and cursor hotspot need to be greater than zero when programmed, but we also need to subtract off the plane position to display the cursor at the correct position.
Since we don't want x or y to be less than zero, we add the plane position as a positive value to x_hotspot or y_hotspot. However, what this doesn't take into account is that the hotspot registers are limited by the maximum cursor size.
On DCN10 the cursor hotspot regitsers are masked to 0xFF, so they have a maximum value of 0-255. Values greater this will wrap, causing the cursor to display in the wrong position.
In practice this means that for sufficiently large plane positions, the cursor will be drawn twice on the screen, and can cause screen flashes or p-state WARNS depending on what the wrapped value is.
So we need a way to remove the value from x_plane and y_plane without exceeding the maximum cursor size.
[How]
Subtract as much as x_plane/y_plane as possible from x and y and place the remainder in the cursor hotspot register.
The value for x_hotspot and y_hotspot can still wrap around but it won't happen in a case where the cursor is actually enabled.
The cursor plane needs to intersect at least one pixel of the plane's rectangle to be enabled, so the cursor position + hotspot provided by userspace must always be strictly less than the maximum cursor size for the cursor to actually be enabled.
--- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +9 -3
@@ -2692,9 +2692,15 @@ static void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx) .rotation = pipe_ctx->plane_state->rotation, .mirror = pipe_ctx->plane_state->horizontal_mirror }; - - pos_cpy.x_hotspot += pipe_ctx->plane_state->dst_rect.x; - pos_cpy.y_hotspot += pipe_ctx->plane_state->dst_rect.y; +uint32_t x_plane = pipe_ctx->plane_state->dst_rect.x; +uint32_t y_plane = pipe_ctx->plane_state->dst_rect.y; +uint32_t x_offset =min (x_plane, pos_cpy.x); +uint32_t y_offset =min (y_plane, pos_cpy.y); + + pos_cpy.x -= x_offset; + pos_cpy.y -= y_offset; + pos_cpy.x_hotspot += (x_plane - x_offset); + pos_cpy.y_hotspot += (y_plane - y_offset);if (pipe_ctx->plane_state->address.type ==PLN_ADDR_TYPE_VIDEO_PROGRESSIVE )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 277/405 cxgb3/l2t: Fix undefined behaviour
In reply to Greg Kroah-Hartman[ Upstream commit 76497732932f15e7323dc805e8ea8dc11bb587cf ]
The use of zero-sized array causes undefined behaviour when it is not the last member in a structure. As it happens to be in this case.
Also, the current code makes use of a language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as this one is a flexible array member, introduced in C99:
struct foo {
int stuff;
struct boo array[];
};By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last. Which is beneficial to cultivate a high-quality code.
--- drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb3/l2t.h +1 -1
@@ -75,8 +75,8 @@ struct l2t_data {struct l2t_entry *rover;/* starting point for next allocation */ atomic_t nfree;/* number of free entries */ rwlock_t lock; -struct l2t_entry l2tab[0 ];struct rcu_head rcu_head;/* to handle rcu cleanup */ +struct l2t_entry l2tab[]; }; typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 240/405 iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion
In reply to Greg Kroah-Hartman[ Upstream commit df1d80aee963480c5c2938c64ec0ac3e4a0df2e0 ]
For devices from the SigmaDelta family we need to keep CS low when doing a conversion, since the device will use the MISO line as a interrupt to indicate that the conversion is complete.
This is why the driver locks the SPI bus and when the SPI bus is locked keeps as long as a conversion is going on. The current implementation gets one small detail wrong though. CS is only de-asserted after the SPI bus is unlocked. This means it is possible for a different SPI device on the same bus to send a message which would be wrongfully be addressed to the SigmaDelta device as well. Make sure that the last SPI transfer that is done while holding the SPI bus lock de-asserts the CS signal.
--- drivers/iio/adc/ad_sigma_delta.c | 16 +++++++++++----- include/linux/iio/adc/ad_sigma_delta.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-)
drivers/iio/adc/ad_sigma_delta.c +11 -5
@@ -62,7 +62,7 @@ int ad_sd_write_reg(struct ad_sigma_delta *sigma_delta, unsigned int reg,struct spi_transfer t = { .tx_buf = data, .len = size +1 , - .cs_change = sigma_delta->bus_locked, + .cs_change = sigma_delta->keep_cs_asserted, };struct spi_message m;int ret;
@@ -218,6 +218,7 @@ static int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,spi_bus_lock (sigma_delta->spi->master); sigma_delta->bus_locked = true; + sigma_delta->keep_cs_asserted = true;reinit_completion (&sigma_delta->completion); ret =ad_sigma_delta_set_mode (sigma_delta, mode);
@@ -235,9 +236,10 @@ static int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta, ret =0 ; } out: + sigma_delta->keep_cs_asserted = false; +ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_IDLE ); sigma_delta->bus_locked = false;spi_bus_unlock (sigma_delta->spi->master); -ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_IDLE );return ret; }
@@ -290,6 +292,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,spi_bus_lock (sigma_delta->spi->master); sigma_delta->bus_locked = true; + sigma_delta->keep_cs_asserted = true;reinit_completion (&sigma_delta->completion);ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_SINGLE );
@@ -299,9 +302,6 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev, ret =wait_for_completion_interruptible_timeout ( &sigma_delta->completion,HZ ); - sigma_delta->bus_locked = false; -spi_bus_unlock (sigma_delta->spi->master); -if (ret ==0 ) ret = -EIO ;if (ret <0 )
@@ -322,7 +322,10 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev, sigma_delta->irq_dis = true; } + sigma_delta->keep_cs_asserted = false;ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_IDLE ); + sigma_delta->bus_locked = false; +spi_bus_unlock (sigma_delta->spi->master);mutex_unlock (&indio_dev->mlock);if (ret)
@@ -359,6 +362,8 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)spi_bus_lock (sigma_delta->spi->master); sigma_delta->bus_locked = true; + sigma_delta->keep_cs_asserted = true; + ret =ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_CONTINUOUS );if (ret) goto err_unlock;
@@ -387,6 +392,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev *indio_dev) sigma_delta->irq_dis = true; } + sigma_delta->keep_cs_asserted = false;ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_IDLE ); sigma_delta->bus_locked = false;
include/linux/iio/adc/ad_sigma_delta.h +1 -0
@@ -69,6 +69,7 @@ struct ad_sigma_delta {bool irq_dis;bool bus_locked; +bool keep_cs_asserted;uint8_t comm;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 294/405 drm: rcar-du: lvds: Fix post-DLL divider calculation
In reply to Greg Kroah-Hartman[ Upstream commit 167e535438ecc73d299340bb1269616432020dfb ]
The PLL parameters are computed by looping over the range of acceptable M, N and E values, and selecting the combination that produces the output frequency closest to the target. The internal frequency constraints are taken into account by restricting the tested values for the PLL parameters, reducing the search space. The target frequency, however, is only taken into account when computing the post-PLL divider, which can result in a 0 value for the divider when the PLL output frequency being tested is lower than half of the target frequency. Subsequent loops will produce a better set of PLL parameters, but for some of the iterations this can result in a division by 0.
Fix it by clamping the divider value. We could instead restrict the E values being tested in the inner loop, but that would require additional calculation that would likely be less efficient as the E parameter can only take three different values.
--- drivers/gpu/drm/rcar-du/rcar_lvds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rcar-du/rcar_lvds.c +1 -1
@@ -283,7 +283,7 @@ static void rcar_lvds_d3_e3_pll_calc(struct rcar_lvds *lvds, struct clk *clk,* divider. */ fout = fvco / (1 << e) / div7; - div =DIV_ROUND_CLOSEST (fout, target); + div =max (1UL ,DIV_ROUND_CLOSEST (fout, target)); diff =abs (fout / div - target);if (diff < pll->diff) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 297/405 scsi: qedf: Add missing return in qedf_post_io_req() in the fcport offload check
In reply to Greg Kroah-Hartman[ Upstream commit c5e06ba2f76809ad1492fdad312e81335df46bc5 ]
Fixes the following crash as the return was missing from the check if an fcport is offloaded. If we hit this code we continue to try to post an invalid task which can lead to the crash:
[30259.616411] [0000:61:00.3]:[qedf_post_io_req:989]:3: Session not offloaded yet. [30259.616413] [0000:61:00.3]:[qedf_upload_connection:1340]:3: Uploading connection port_id=490020. [30259.623769] BUG: unable to handle kernel NULL pointer dereference at 0000000000000198 [30259.631645] IP: [<ffffffffc035b1ed>] qedf_init_task.isra.16+0x3d/0x450 [qedf] [30259.638816] PGD 0 [30259.640841] Oops: 0000 [#1] SMP [30259.644098] Modules linked in: fuse xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ipt_REJECT nf_reject_ipv4 tun bridge stp llc ebtable_filter ebtables devlink ip6table_filter ip6_tables iptable_filter vfat fat ib_isert iscsi_target_mod ib_srpt target_core_mod ib_srp scsi_transport_srp ib_ipoib ib_ucm ib_umad dm_service_time skx_edac intel_powerclamp coretemp intel_rapl iosf_mbi kvm_intel kvm irqbypass crc32_pclmul ghash_clmulni_intel aesni_intel rpcrdma sunrpc rdma_ucm ib_uverbs lrw gf128mul ib_iser rdma_cm iw_cm ib_cm libiscsi scsi_transport_iscsi qedr(OE) glue_helper ablk_helper cryptd ib_core dm_round_robin joydev pcspkr ipmi_ssif ses enclosure ipmi_si ipmi_devintf ipmi_msghandler mei_me [30259.715529] mei sg hpilo hpwdt shpchp wmi lpc_ich acpi_power_meter dm_multipath ip_tables xfs libcrc32c sd_mod crc_t10dif crct10dif_generic uas usb_storage mgag200 qedf(OE) i2c_algo_bit libfcoe drm_kms_helper libfc syscopyarea sysfillrect scsi_transport_fc qede(OE) sysimgblt fb_sys_fops ptp ttm pps_core drm qed(OE) smartpqi crct10dif_pclmul crct10dif_common crc32c_intel i2c_core scsi_transport_sas scsi_tgt dm_mirror dm_region_hash dm_log dm_mod [30259.754237] CPU: 9 PID: 977 Comm: kdmwork-253:7 Kdump: loaded Tainted: G W OE ------------ 3.10.0-862.el7.x86_64 #1 [30259.765664] Hardware name: HPE Synergy 480 Gen10/Synergy 480 Gen10 Compute Module, BIOS I42 04/04/2018 [30259.775000] task: ffff8c801efd0000 ti: ffff8c801efd8000 task.ti: ffff8c801efd8000 [30259.782505] RIP: 0010:[<ffffffffc035b1ed>] [<ffffffffc035b1ed>] qedf_init_task.isra.16+0x3d/0x450 [qedf] [30259.792116] RSP: 0018:ffff8c801efdbbb0 EFLAGS: 00010046 [30259.797444] RAX: 0000000000000000 RBX: ffffa7f1450948d8 RCX: ffff8c7fe5bc40c8 [30259.804600] RDX: ffff8c800715b300 RSI: ffffa7f1450948d8 RDI: ffff8c80169c2480 [30259.811755] RBP: ffff8c801efdbc30 R08: 00000000000000ae R09: ffff8c800a314540 [30259.818911] R10: ffff8c7fe5bc40c8 R11: ffff8c801efdb8ae R12: 0000000000000000 [30259.826068] R13: ffff8c800715b300 R14: ffff8c80169c2480 R15: ffff8c8005da28e0 [30259.833223] FS: 0000000000000000(0000) GS:ffff8c803f840000(0000) knlGS:0000000000000000 [30259.841338] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [30259.847100] CR2: 0000000000000198 CR3: 000000081242e000 CR4: 00000000007607e0 [30259.854256] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [30259.861412] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [30259.868568] PKRU: 00000000 [30259.871278] Call Trace: [30259.873737] [<ffffffffc035c948>] qedf_post_io_req+0x148/0x680 [qedf] [30259.880201] [<ffffffffc035d070>] qedf_queuecommand+0x1f0/0x240 [qedf] [30259.886749] [<ffffffffa329b050>] scsi_dispatch_cmd+0xb0/0x240 [30259.892600] [<ffffffffa32a45bc>] scsi_request_fn+0x4cc/0x680 [30259.898364] [<ffffffffa3118ad9>] __blk_run_queue+0x39/0x50 [30259.903954] [<ffffffffa3114393>] __elv_add_request+0xd3/0x260 [30259.909805] [<ffffffffa311baf0>] blk_insert_cloned_request+0xf0/0x1b0 [30259.916358] [<ffffffffc010b622>] map_request+0x142/0x220 [dm_mod] [30259.922560] [<ffffffffc010b716>] map_tio_request+0x16/0x40 [dm_mod] [30259.928932] [<ffffffffa2ebb1f5>] kthread_worker_fn+0x85/0x180 [30259.934782] [<ffffffffa2ebb170>] ? kthread_stop+0xf0/0xf0 [30259.940284] [<ffffffffa2ebae31>] kthread+0xd1/0xe0 [30259.945176] [<ffffffffa2ebad60>] ? insert_kthread_work+0x40/0x40 [30259.951290] [<ffffffffa351f61d>] ret_from_fork_nospec_begin+0x7/0x21 [30259.957750] [<ffffffffa2ebad60>] ? insert_kthread_work+0x40/0x40 [30259.963860] Code: fe 41 55 49 89 d5 41 54 53 48 89 f3 48 83 ec 58 4c 8b 67 28 4c 8b 4e 18 65 48 8b 04 25 28 00 00 00 48 89 45 d0 31 c0 4c 8b 7e 58 <49> 8b 84 24 98 01 00 00 48 8b 00 f6 80 31 01 00 00 10 0f 85 0b [30259.983372] RIP [<ffffffffc035b1ed>] qedf_init_task.isra.16+0x3d/0x450 [qedf] [30259.990630] RSP <ffff8c801efdbbb0> [30259.994127] CR2: 0000000000000198
--- drivers/scsi/qedf/qedf_io.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qedf/qedf_io.c +1 -0
@@ -902,6 +902,7 @@ int qedf_post_io_req(struct qedf_rport *fcport, struct qedf_ioreq *io_req)if (!test_bit (QEDF_RPORT_SESSION_READY , &fcport->flags)) {QEDF_ERR (&(qedf->dbg_ctx),"Session not offloaded yet.\n" );kref_put (&io_req->refcount, qedf_release_cmd); +return -EINVAL ; }/* Obtain free SQE */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 285/405 kobject: Dont trigger kobject_uevent(KOBJ_REMOVE) twice.
In reply to Greg Kroah-Hartman[ Upstream commit c03a0fd0b609e2f5c669c2b7f27c8e1928e9196e ]
syzbot is hitting use-after-free bug in uinput module [1]. This is because kobject_uevent(KOBJ_REMOVE) is called again due to commit 0f4dafc0563c6c49 ("Kobject: auto-cleanup on final unref") after memory allocation fault injection made kobject_uevent(KOBJ_REMOVE) from device_del() from input_unregister_device() fail, while uinput_destroy_device() is expecting that kobject_uevent(KOBJ_REMOVE) is not called after device_del() from input_unregister_device() completed.
That commit intended to catch cases where nobody even attempted to send "remove" uevents. But there is no guarantee that an event will ultimately be sent. We are at the point of no return as far as the rest of the kernel is concerned; there are no repeats or do-overs.
Also, it is not clear whether some subsystem depends on that commit. If no subsystem depends on that commit, it will be better to remove the state_{add,remove}_uevent_sent logic. But we don't want to risk a regression (in a patch which will be backported) by trying to remove that logic. Therefore, as a first step, let's avoid the use-after-free bug by making sure that kobject_uevent(KOBJ_REMOVE) won't be triggered twice.
[1] https://syzkaller.appspot.com/bug?id=8b17c134fe938bbddd75a45afaa9e68af43a362d
--- lib/kobject_uevent.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
lib/kobject_uevent.c +7 -4
@@ -466,6 +466,13 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,int i =0 ;int retval =0 ; +/* +* Mark "remove" event done regardless of result, for some subsystems +* do not want to re-trigger "remove" event via automatic cleanup. +*/ +if (action ==KOBJ_REMOVE ) + kobj->state_remove_uevent_sent =1 ; +pr_debug ("kobject: '%s' (%p): %s\n" ,kobject_name (kobj), kobj, __func__);
@@ -567,10 +574,6 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, kobj->state_add_uevent_sent =1 ;break ; -case KOBJ_REMOVE : - kobj->state_remove_uevent_sent =1 ; -break ; -case KOBJ_UNBIND :zap_modalias_env (env);break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 305/405 x86/mce: Fix machine_check_poll() tests for error types
In reply to Greg Kroah-Hartman[ Upstream commit f19501aa07f18268ab14f458b51c1c6b7f72a134 ]
There has been a lurking "TBD" in the machine check poll routine ever since it was first split out from the machine check handler. The potential issue is that the poll routine may have just begun a read from the STATUS register in a machine check bank when the hardware logs an error in that bank and signals a machine check.
That race used to be pretty small back when machine checks were broadcast, but the addition of local machine check means that the poll code could continue running and clear the error from the bank before the local machine check handler on another CPU gets around to reading it.
Fix the code to be sure to only process errors that need to be processed in the poll code, leaving other logged errors alone for the machine check handler to find and process.
[ bp: Massage a bit and flip the "== 0" check to the usual !(..) test. ]
--- arch/x86/kernel/cpu/mce/core.c | 44 ++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/mce/core.c +37 -7
@@ -712,19 +712,49 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b)barrier (); m.status =mce_rdmsrl (msr_ops.status (i)); + +/* If this entry is not valid, ignore it */ if (!(m.status &MCI_STATUS_VAL ))continue ;/* -* Uncorrected or signalled events are handled by the exception -* handler when it is enabled, so don't process those here. -* -* TBD do the same check for MCI_STATUS_EN here? +* If we are logging everything (at CPU online) or this +* is a corrected error, then we must log it. */ -if (!(flags &MCP_UC ) && - (m.status & (mca_cfg.ser ?MCI_STATUS_S :MCI_STATUS_UC ))) -continue ; +if ((flags &MCP_UC ) || !(m.status &MCI_STATUS_UC )) + goto log_it; + +/* +* Newer Intel systems that support software error +* recovery need to make additional checks. Other +* CPUs should skip over uncorrected errors, but log +* everything else. +*/ +if (!mca_cfg.ser) { +if (m.status &MCI_STATUS_UC ) +continue ; + goto log_it; + } + +/* Log "not enabled" (speculative) errors */ +if (!(m.status &MCI_STATUS_EN )) + goto log_it; + +/* +* Log UCNA (SDM: 15.6.3 "UCR Error Classification") +* UC == 1 && PCC == 0 && S == 0 +*/ +if (!(m.status &MCI_STATUS_PCC ) && !(m.status &MCI_STATUS_S )) + goto log_it; + +/* +* Skip anything else. Presumption is that our read of this +* bank is racing with a machine check. Leave the log alone +* for do_machine_check() to deal with it. +*/ +continue ; +log_it: error_seen = true;mce_read_aux (&m, i);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 309/405 rcu: Do a single rhp->func read in rcu_head_after_call_rcu()
In reply to Greg Kroah-Hartman[ Upstream commit b699cce1604e828f19c39845252626eb78cdf38a ]
The rcu_head_after_call_rcu() function reads the rhp->func pointer twice, which can result in a false-positive WARN_ON_ONCE() if the callback were passed to call_rcu() between the two reads. Although racing rcu_head_after_call_rcu() with call_rcu() is to be a dubious use case (the return value is not reliable in that case), intermittent and irreproducible warnings are also quite dubious. This commit therefore uses a single READ_ONCE() to pick up the value of rhp->func once, then tests that value twice, thus guaranteeing consistent processing within rcu_head_after_call_rcu()().
Neverthless, racing rcu_head_after_call_rcu() with call_rcu() is still a dubious use case.
--- include/linux/rcupdate.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/linux/rcupdate.h +4 -2
@@ -878,9 +878,11 @@ static inline void rcu_head_init(struct rcu_head *rhp)static inline bool rcu_head_after_call_rcu (struct rcu_head *rhp,rcu_callback_t f) { -if (READ_ONCE (rhp->func) == f) +rcu_callback_t func =READ_ONCE (rhp->func); + +if (func == f)return true; -WARN_ON_ONCE (READ_ONCE (rhp->func) != (rcu_callback_t )~0L ); +WARN_ON_ONCE (func != (rcu_callback_t )~0L );return false; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 312/405 spi: stm32-qspi: add spi_master_put in release function
In reply to Greg Kroah-Hartman[ Upstream commit a88eceb17ac7e8dc4ad9995681af61c8371668f4 ]
This patch adds spi_master_put in release function to drop the controller's refcount.
--- drivers/spi/spi-stm32-qspi.c | 46 ++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 18 deletions(-)
drivers/spi/spi-stm32-qspi.c +28 -18
@@ -93,6 +93,7 @@ struct stm32_qspi_flash {struct stm32_qspi {struct device *dev; +struct spi_controller *ctrl;void __iomem *io_base;void __iomem *mm_base;resource_size_t mm_size;
@@ -397,6 +398,7 @@ static void stm32_qspi_release(struct stm32_qspi *qspi)writel_relaxed (0 , qspi->io_base +QSPI_CR );mutex_destroy (&qspi->lock);clk_disable_unprepare (qspi->clk); +spi_master_put (qspi->ctrl); }static int stm32_qspi_probe (struct platform_device *pdev)
@@ -413,43 +415,54 @@ static int stm32_qspi_probe(struct platform_device *pdev)return -ENOMEM ; qspi =spi_controller_get_devdata (ctrl); + qspi->ctrl = ctrl; res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"qspi" ); qspi->io_base =devm_ioremap_resource (dev, res); -if (IS_ERR (qspi->io_base)) -return PTR_ERR (qspi->io_base); +if (IS_ERR (qspi->io_base)) { + ret =PTR_ERR (qspi->io_base); + goto err; + } res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"qspi_mm" ); qspi->mm_base =devm_ioremap_resource (dev, res); -if (IS_ERR (qspi->mm_base)) -return PTR_ERR (qspi->mm_base); +if (IS_ERR (qspi->mm_base)) { + ret =PTR_ERR (qspi->mm_base); + goto err; + } qspi->mm_size =resource_size (res); -if (qspi->mm_size >STM32_QSPI_MAX_MMAP_SZ ) -return -EINVAL ; +if (qspi->mm_size >STM32_QSPI_MAX_MMAP_SZ ) { + ret = -EINVAL ; + goto err; + } irq =platform_get_irq (pdev,0 ); ret =devm_request_irq (dev, irq, stm32_qspi_irq,0 ,dev_name (dev), qspi);if (ret) {dev_err (dev,"failed to request irq\n" ); -return ret; + goto err; }init_completion (&qspi->data_completion); qspi->clk =devm_clk_get (dev,NULL ); -if (IS_ERR (qspi->clk)) -return PTR_ERR (qspi->clk); +if (IS_ERR (qspi->clk)) { + ret =PTR_ERR (qspi->clk); + goto err; + } qspi->clk_rate =clk_get_rate (qspi->clk); -if (!qspi->clk_rate) -return -EINVAL ; +if (!qspi->clk_rate) { + ret = -EINVAL ; + goto err; + } ret =clk_prepare_enable (qspi->clk);if (ret) {dev_err (dev,"can not enable the clock\n" ); -return ret; + goto err; } rstc =devm_reset_control_get_exclusive (dev,NULL );
@@ -472,14 +485,11 @@ static int stm32_qspi_probe(struct platform_device *pdev) ctrl->dev.of_node = dev->of_node; ret =devm_spi_register_master (dev, ctrl); -if (ret) - goto err_spi_register; - -return 0 ; +if (!ret) +return 0 ; -err_spi_register: +err:stm32_qspi_release (qspi); -return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 327/405 thunderbolt: Fix to check for kmemdup failure
In reply to Greg Kroah-Hartman[ Upstream commit 2cc12751cf464a722ff57b54d17d30c84553f9c0 ]
Memory allocated via kmemdup might fail and return a NULL pointer. This patch adds a check on the return value of kmemdup and passes the error upstream.
--- drivers/thunderbolt/switch.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/thunderbolt/switch.c +16 -6
@@ -1287,13 +1287,14 @@ int tb_switch_configure(struct tb_switch *sw)return tb_plug_events_active (sw, true); } -static void tb_switch_set_uuid (struct tb_switch *sw) +static int tb_switch_set_uuid (struct tb_switch *sw) {u32 uuid[4 ]; -int cap; +int cap, ret; + ret =0 ;if (sw->uuid) -return ; +return ret;/* * The newer controllers include fused UUID as part of link
@@ -1301,7 +1302,9 @@ static void tb_switch_set_uuid(struct tb_switch *sw)*/ cap =tb_switch_find_vse_cap (sw,TB_VSE_CAP_LINK_CONTROLLER );if (cap >0 ) { -tb_sw_read (sw, uuid,TB_CFG_SWITCH , cap +3 ,4 ); + ret =tb_sw_read (sw, uuid,TB_CFG_SWITCH , cap +3 ,4 ); +if (ret) +return ret; }else {/* * ICM generates UUID based on UID and fills the upper
@@ -1316,6 +1319,9 @@ static void tb_switch_set_uuid(struct tb_switch *sw) } sw->uuid =kmemdup (uuid,sizeof (uuid),GFP_KERNEL ); +if (!sw->uuid) + ret = -ENOMEM ; +return ret; }static int tb_switch_add_dma_port (struct tb_switch *sw)
@@ -1365,7 +1371,9 @@ static int tb_switch_add_dma_port(struct tb_switch *sw)if (status) {tb_sw_info (sw,"switch flash authentication failed\n" ); -tb_switch_set_uuid (sw); + ret =tb_switch_set_uuid (sw); +if (ret) +return ret;nvm_set_auth_status (sw, status); }
@@ -1415,7 +1423,9 @@ int tb_switch_add(struct tb_switch *sw) }tb_sw_dbg (sw,"uid: %#llx\n" , sw->uid); -tb_switch_set_uuid (sw); + ret =tb_switch_set_uuid (sw); +if (ret) +return ret;for (i =0 ; i <= sw->config.max_port_number; i++) {if (sw->ports[i].disabled) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 290/405 media: mtk-vcodec: fix access to incorrect planes member
In reply to Greg Kroah-Hartman[ Upstream commit 52fafc58c3535c9f4f53864686dbaee3bcbadcb4 ]
Commit 0650a91499e0 ("media: mtk-vcodec: Correct return type for mem2mem buffer helpers") fixed the return types for mem2mem buffer helper functions by changing a few local variables from vb2_buffer to vb2_v4l2_buffer. However, it left a few accesses to vb2_buffer::planes as-is, accidentally turning them into accesses to vb2_v4l2_buffer::planes and resulting in values being read from/written to the wrong place.
Fix this by inserting vb2_buf into these accesses so they mimic their original behavior.
--- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++-- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +2 -2
@@ -388,7 +388,7 @@ static void mtk_vdec_worker(struct work_struct *work) } buf.va =vb2_plane_vaddr (&src_buf->vb2_buf,0 ); buf.dma_addr =vb2_dma_contig_plane_dma_addr (&src_buf->vb2_buf,0 ); - buf.size = (size_t )src_buf->planes[0 ].bytesused; + buf.size = (size_t )src_buf->vb2_buf.planes[0 ].bytesused;if (!buf.va) {v4l2_m2m_job_finish (dev->m2m_dev_dec, ctx->m2m_ctx); mtk_v4l2_err("[%d] id=%d src_addr is NULL!!",
@@ -1155,7 +1155,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb) src_mem.va =vb2_plane_vaddr (&src_buf->vb2_buf,0 ); src_mem.dma_addr =vb2_dma_contig_plane_dma_addr (&src_buf->vb2_buf,0 ); - src_mem.size = (size_t )src_buf->planes[0 ].bytesused; + src_mem.size = (size_t )src_buf->vb2_buf.planes[0 ].bytesused; mtk_v4l2_debug(2, "[%d] buf id=%d va=%p dma=%pad size=%zx", ctx->id, src_buf->index,
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +5 -5
@@ -894,7 +894,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q)if (q->type ==V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) {while ((dst_buf =v4l2_m2m_dst_buf_remove (ctx->m2m_ctx))) { - dst_buf->planes[0 ].bytesused =0 ; + dst_buf->vb2_buf.planes[0 ].bytesused =0 ;v4l2_m2m_buf_done (dst_buf,VB2_BUF_STATE_ERROR ); } }else {
@@ -947,7 +947,7 @@ static int mtk_venc_encode_header(void *priv) bs_buf.va =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); bs_buf.dma_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 ); - bs_buf.size = (size_t )dst_buf->planes[0 ].length; + bs_buf.size = (size_t )dst_buf->vb2_buf.planes[0 ].length; mtk_v4l2_debug(1, "[%d] buf id=%d va=0x%p dma_addr=0x%llx size=%zu",
@@ -976,7 +976,7 @@ static int mtk_venc_encode_header(void *priv) } ctx->state =MTK_STATE_HEADER ; - dst_buf->planes[0 ].bytesused = enc_result.bs_size; + dst_buf->vb2_buf.planes[0 ].bytesused = enc_result.bs_size;v4l2_m2m_buf_done (dst_buf,VB2_BUF_STATE_DONE );return 0 ;
@@ -1107,12 +1107,12 @@ static void mtk_venc_worker(struct work_struct *work)if (ret) {v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_ERROR ); - dst_buf->planes[0 ].bytesused =0 ; + dst_buf->vb2_buf.planes[0 ].bytesused =0 ;v4l2_m2m_buf_done (dst_buf,VB2_BUF_STATE_ERROR );mtk_v4l2_err ("venc_if_encode failed=%d" , ret); }else {v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_DONE ); - dst_buf->planes[0 ].bytesused = enc_result.bs_size; + dst_buf->vb2_buf.planes[0 ].bytesused = enc_result.bs_size;v4l2_m2m_buf_done (dst_buf,VB2_BUF_STATE_DONE );mtk_v4l2_debug (2 ,"venc_if_encode bs size=%d" , enc_result.bs_size);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 291/405 thunderbolt: property: Fix a missing check of kzalloc
In reply to Greg Kroah-Hartman[ Upstream commit 6183d5a51866f3acdeeb66b75e87d44025b01a55 ]
No check is enforced for the return value of kzalloc, which may lead to NULL-pointer dereference.
The patch fixes this issue.
--- drivers/thunderbolt/property.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/thunderbolt/property.c +6 -1
@@ -578,7 +578,12 @@ int tb_property_add_text(struct tb_property_dir *parent, const char *key,return -ENOMEM ; property->length = size /4 ; - property->value.data =kzalloc (size,GFP_KERNEL ); + property->value.text =kzalloc (size,GFP_KERNEL ); +if (!property->value.text) { +kfree (property); +return -ENOMEM ; + } +strcpy (property->value.text, text);list_add_tail (&property->list, &parent->properties);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 292/405 thunderbolt: Fix to check the return value of kmemdup
In reply to Greg Kroah-Hartman[ Upstream commit fd21b79e541e4666c938a344f3ad2df74b4f5120 ]
uuid in add_switch is allocted via kmemdup which can fail. The patch logs the error and cleans up the allocated memory for switch.
--- drivers/thunderbolt/icm.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/thunderbolt/icm.c +5 -0
@@ -473,6 +473,11 @@ static void add_switch(struct tb_switch *parent_sw, u64 route, goto out; sw->uuid =kmemdup (uuid,sizeof (*uuid),GFP_KERNEL ); +if (!sw->uuid) { +tb_sw_warn (sw,"cannot allocate memory for switch\n" ); +tb_switch_put (sw); + goto out; + } sw->connection_id = connection_id; sw->connection_key = connection_key; sw->link = link;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 227/405 cpufreq: pmac32: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit 8d10dc28a9ea6e8c02e825dab28699f3c72b02d9 ]
The call to of_find_node_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/cpufreq/pmac32-cpufreq.c:557:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 552, but without a corresponding object release within this function. ./drivers/cpufreq/pmac32-cpufreq.c:569:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 552, but without a corresponding object release within this function. ./drivers/cpufreq/pmac32-cpufreq.c:598:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 587, but without a corresponding object release within this function.
--- drivers/cpufreq/pmac32-cpufreq.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/cpufreq/pmac32-cpufreq.c +2 -0
@@ -552,6 +552,7 @@ static int pmac_cpufreq_init_7447A(struct device_node *cpunode) volt_gpio_np =of_find_node_by_name (NULL ,"cpu-vcore-select" );if (volt_gpio_np) voltage_gpio =read_gpio (volt_gpio_np); +of_node_put (volt_gpio_np);if (!voltage_gpio){pr_err ("missing cpu-vcore-select gpio\n" );return 1 ;
@@ -588,6 +589,7 @@ static int pmac_cpufreq_init_750FX(struct device_node *cpunode)if (volt_gpio_np) voltage_gpio =read_gpio (volt_gpio_np); +of_node_put (volt_gpio_np); pvr =mfspr (SPRN_PVR ); has_cpu_l2lve = !((pvr &0xf00 ) ==0x100 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 347/405 media: staging: davinci_vpfe: disallow building with COMPILE_TEST
In reply to Greg Kroah-Hartman[ Upstream commit 49dc762cffd8305a861ca649e82dc5533b3e3344 ]
The driver should really call dm365_isif_setup_pinmux() through a callback, but uses a hack to include a davinci specific machine header file when compile testing instead. This works almost everywhere, but not on the ARM omap1 platform, which has another header named mach/mux.h. This causes a build failure:
drivers/staging/media/davinci_vpfe/dm365_isif.c:2028:2: error: implicit declaration of function 'davinci_cfg_reg' [-Werror,-Wimplicit-function-declaration]
davinci_cfg_reg(DM365_VIN_CAM_WEN);
^
drivers/staging/media/davinci_vpfe/dm365_isif.c:2028:2: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
drivers/staging/media/davinci_vpfe/dm365_isif.c:2028:18: error: use of undeclared identifier 'DM365_VIN_CAM_WEN'
davinci_cfg_reg(DM365_VIN_CAM_WEN);
^
drivers/staging/media/davinci_vpfe/dm365_isif.c:2029:18: error: use of undeclared identifier 'DM365_VIN_CAM_VD'
davinci_cfg_reg(DM365_VIN_CAM_VD);
^
drivers/staging/media/davinci_vpfe/dm365_isif.c:2030:18: error: use of undeclared identifier 'DM365_VIN_CAM_HD'
davinci_cfg_reg(DM365_VIN_CAM_HD);
^
drivers/staging/media/davinci_vpfe/dm365_isif.c:2031:18: error: use of undeclared identifier 'DM365_VIN_YIN4_7_EN'
davinci_cfg_reg(DM365_VIN_YIN4_7_EN);
^
drivers/staging/media/davinci_vpfe/dm365_isif.c:2032:18: error: use of undeclared identifier 'DM365_VIN_YIN0_3_EN'
davinci_cfg_reg(DM365_VIN_YIN0_3_EN);
^7 errors generated.
Exclude omap1 from compile-testing, under the assumption that all others still work.
--- drivers/staging/media/davinci_vpfe/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/davinci_vpfe/Kconfig +1 -1
@@ -1,7 +1,7 @@ config VIDEO_DM365_VPFE tristate "DM365 VPFE Media Controller Capture Driver" depends on VIDEO_V4L2 - depends on (ARCH_DAVINCI_DM365 && !VIDEO_DM365_ISIF) || COMPILE_TEST + depends on (ARCH_DAVINCI_DM365 && !VIDEO_DM365_ISIF) || (COMPILE_TEST && !ARCH_OMAP1) depends on VIDEO_V4L2_SUBDEV_API depends on VIDEO_DAVINCI_VPBE_DISPLAY select VIDEOBUF2_DMA_CONTIG
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 350/405 drm/amd/display: half bandwidth for YCbCr420 during validation
In reply to Greg Kroah-Hartman[ Upstream commit 162f807858d15bde60cf373a3ad46e03200ad9d8 ]
[Why]
used to be unable to run 4:2:0 if using a dongle because 4k60 bandwidth exceeded dongle caps
[How]
half pixel clock during comparison to dongle cap. *Could get stuck on black screen on monitor that don't support 420 but will be selecting 420 as preferred mode*
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +20 -13
@@ -2074,11 +2074,28 @@ static void disable_link(struct dc_link *link, enum signal_type signal) } } +static uint32_t get_timing_pixel_clock_100hz (const struct dc_crtc_timing *timing) +{ + +uint32_t pxl_clk = timing->pix_clk_100hz; + +if (timing->pixel_encoding ==PIXEL_ENCODING_YCBCR420 ) + pxl_clk /=2 ; +else if (timing->pixel_encoding ==PIXEL_ENCODING_YCBCR422 ) + pxl_clk = pxl_clk *2 /3 ; + +if (timing->display_color_depth ==COLOR_DEPTH_101010 ) + pxl_clk = pxl_clk *10 /8 ; +else if (timing->display_color_depth ==COLOR_DEPTH_121212 ) + pxl_clk = pxl_clk *12 /8 ; + +return pxl_clk; +} +static bool dp_active_dongle_validate_timing (const struct dc_crtc_timing *timing,const struct dpcd_caps *dpcd_caps) { -unsigned int required_pix_clk_100hz = timing->pix_clk_100hz;const struct dc_dongle_caps *dongle_caps = &dpcd_caps->dongle_caps;switch (dpcd_caps->dongle_type) {
@@ -2115,13 +2132,6 @@ static bool dp_active_dongle_validate_timing(return false; } - -/* Check Color Depth and Pixel Clock */ -if (timing->pixel_encoding ==PIXEL_ENCODING_YCBCR420 ) - required_pix_clk_100hz /=2 ; -else if (timing->pixel_encoding ==PIXEL_ENCODING_YCBCR422 ) - required_pix_clk_100hz = required_pix_clk_100hz *2 /3 ; -switch (timing->display_color_depth) {case COLOR_DEPTH_666 :case COLOR_DEPTH_888 :
@@ -2130,14 +2140,11 @@ static bool dp_active_dongle_validate_timing(case COLOR_DEPTH_101010 :if (dongle_caps->dp_hdmi_max_bpc <10 )return false; - required_pix_clk_100hz = required_pix_clk_100hz *10 /8 ;break ;case COLOR_DEPTH_121212 :if (dongle_caps->dp_hdmi_max_bpc <12 )return false; - required_pix_clk_100hz = required_pix_clk_100hz *12 /8 ;break ; -case COLOR_DEPTH_141414 :case COLOR_DEPTH_161616 :default :
@@ -2145,7 +2152,7 @@ static bool dp_active_dongle_validate_timing(return false; } -if (required_pix_clk_100hz > (dongle_caps->dp_hdmi_max_pixel_clk *10 )) +if (get_timing_pixel_clock_100hz (timing) > (dongle_caps->dp_hdmi_max_pixel_clk *10 ))return false;return true;
@@ -2166,7 +2173,7 @@ enum dc_status dc_link_validate_mode_timing(return DC_OK ;/* Passive Dongle */ -if (0 != max_pix_clk && timing->pix_clk_100hz > max_pix_clk) +if (max_pix_clk !=0 &&get_timing_pixel_clock_100hz (timing) > max_pix_clk)return DC_EXCEED_DONGLE_CAP ;/* Active Dongle*/
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 334/405 thunderbolt: property: Fix a NULL pointer dereference
In reply to Greg Kroah-Hartman[ Upstream commit 106204b56f60abf1bead7dceb88f2be3e34433da ]
In case kzalloc fails, the fix releases resources and returns -ENOMEM to avoid the NULL pointer dereference.
--- drivers/thunderbolt/property.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/thunderbolt/property.c +5 -0
@@ -548,6 +548,11 @@ int tb_property_add_data(struct tb_property_dir *parent, const char *key, property->length = size /4 ; property->value.data =kzalloc (size,GFP_KERNEL ); +if (!property->value.data) { +kfree (property); +return -ENOMEM ; + } +memcpy (property->value.data, buf, buflen);list_add_tail (&property->list, &parent->properties);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 367/405 scsi: lpfc: Fix mailbox hang on adapter init
In reply to Greg Kroah-Hartman[ Upstream commit e8869f5b0a7273fcf20ef99066fd8129e58ba5b7 ]
The adapter initialization sequence enables interrupts, initializes the adapter link_state to LINK_DOWN, then issues commands to initialize the adapter. The interrupt handler on the adapter validates the link_state (has to be at least LINK_DOWN) and if invalid, will discard the interrupting event.
In most cases, there is not a command completion, thus an interrupt until the initialization commands have been sent which is post the setting of state to LINK_DOWN. However, in cases of firmware reset, the reset will modify the link_state to an invalid value (indicating a reset of the adapter) and there occasionally are cases where the adapter will generate an asynchronous event which shares the eq/cq used for mailbox commands. In the failure case, an interrupt is generated immediately after enabling them due to the async event. As link_state is invalid, the eq is list and the CQ not serviced. At this point link_state is initialized and the mailbox command sent. As the CQ has not been serviced, it is not armed, so no interrupt event is generated when the mailbox command completes.
Modify the initialization sequence so that interrupts are enabled after link_state is properly initialized, which avoids the race condition with the async event.
--- drivers/scsi/lpfc/lpfc_sli.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +6 -6
@@ -7652,12 +7652,6 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba) phba->cfg_xri_rebalancing =0 ; } -/* Arm the CQs and then EQs on device */ -lpfc_sli4_arm_cqeq_intr (phba); - -/* Indicate device interrupt mode */ - phba->sli4_hba.intr_enable =1 ; -/* Allow asynchronous mailbox command to go through */ spin_lock_irq (&phba->hbalock); phba->sli.sli_flag &= ~LPFC_SLI_ASYNC_MBX_BLK ;
@@ -7726,6 +7720,12 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba) phba->trunk_link.link3.state =LPFC_LINK_DOWN ;spin_unlock_irq (&phba->hbalock); +/* Arm the CQs and then EQs on device */ +lpfc_sli4_arm_cqeq_intr (phba); + +/* Indicate device interrupt mode */ + phba->sli4_hba.intr_enable =1 ; +if (!(phba->hba_flag &HBA_FCOE_MODE ) && (phba->hba_flag &LINK_DISABLED )) { lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_SLI,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 376/405 spi: rspi: Fix sequencer reset during initialization
In reply to Greg Kroah-Hartman[ Upstream commit 26843bb128590edd7eba1ad7ce22e4b9f1066ce3 ]
While the sequencer is reset after each SPI message since commit 880c6d114fd79a69 ("spi: rspi: Add support for Quad and Dual SPI Transfers on QSPI"), it was never reset for the first message, thus relying on reset state or bootloader settings.
Fix this by initializing it explicitly during configuration.
--- drivers/spi/spi-rspi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/spi/spi-rspi.c +6 -3
@@ -271,7 +271,8 @@ static int rspi_set_config_register(struct rspi_data *rspi, int access_size)/* Sets parity, interrupt mask */ rspi_write8 (rspi,0x00 ,RSPI_SPCR2 ); -/* Sets SPCMD */ +/* Resets sequencer */ +rspi_write8 (rspi,0 ,RSPI_SPSCR ); rspi->spcmd |=SPCMD_SPB_8_TO_16 (access_size);rspi_write16 (rspi, rspi->spcmd,RSPI_SPCMD0 );
@@ -315,7 +316,8 @@ static int rspi_rz_set_config_register(struct rspi_data *rspi, int access_size)rspi_write8 (rspi,0x00 ,RSPI_SSLND );rspi_write8 (rspi,0x00 ,RSPI_SPND ); -/* Sets SPCMD */ +/* Resets sequencer */ +rspi_write8 (rspi,0 ,RSPI_SPSCR ); rspi->spcmd |=SPCMD_SPB_8_TO_16 (access_size);rspi_write16 (rspi, rspi->spcmd,RSPI_SPCMD0 );
@@ -366,7 +368,8 @@ static int qspi_set_config_register(struct rspi_data *rspi, int access_size)/* Sets buffer to allow normal operation */ rspi_write8 (rspi,0x00 ,QSPI_SPBFCR ); -/* Sets SPCMD */ +/* Resets sequencer */ +rspi_write8 (rspi,0 ,RSPI_SPSCR );rspi_write16 (rspi, rspi->spcmd,RSPI_SPCMD0 );/* Sets RSPI mode */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 338/405 media: vicodec: reset last_src/dst_buf based on the IS_OUTPUT
In reply to Greg Kroah-Hartman[ Upstream commit 76eb24fc233b8c94b2156ead5811e08d2046ad58 ]
When start_streaming was called both last_src_buf and last_dst_buf pointers were set to NULL, but this depends on whether the capture or output queue starts streaming.
When decoding with resolution changes in between the capture queue has to restart streaming whenever a resolution change occurs. And that would reset last_src_buf as well, which causes a problem if the decoder was stopped by the application. Since last_src_buf is now NULL, the LAST flag is never set for the last capture buffer.
--- drivers/media/platform/vicodec/vicodec-core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/vicodec/vicodec-core.c +5 -2
@@ -1339,8 +1339,11 @@ static int vicodec_start_streaming(struct vb2_queue *q, chroma_div = info->width_div * info->height_div; q_data->sequence =0 ; - ctx->last_src_buf =NULL ; - ctx->last_dst_buf =NULL ; +if (V4L2_TYPE_IS_OUTPUT (q->type)) + ctx->last_src_buf =NULL ; +else + ctx->last_dst_buf =NULL ; + state->gop_cnt =0 ; if ((V4L2_TYPE_IS_OUTPUT(q->type) && !ctx->is_enc) ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 226/405 cpufreq/pasemi: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit a9acc26b75f652f697e02a9febe2ab0da648a571 ]
The call to of_get_cpu_node returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/cpufreq/pasemi-cpufreq.c:212:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 147, but without a corresponding object release within this function. ./drivers/cpufreq/pasemi-cpufreq.c:220:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 147, but without a corresponding object release within this function.
--- drivers/cpufreq/pasemi-cpufreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/pasemi-cpufreq.c +1 -0
@@ -146,6 +146,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) cpu =of_get_cpu_node (policy->cpu,NULL ); +of_node_put (cpu);if (!cpu) goto out;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/405 media: ov2659: make S_FMT succeed even if requested format doesnt match
In reply to Greg Kroah-Hartman[ Upstream commit bccb89cf9cd07a0690d519696a00c00a973b3fe4 ]
This driver returns an error if unsupported media bus pixel code is requested by VIDIOC_SUBDEV_S_FMT.
But according to Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst,
Drivers must not return an error solely because the requested format doesn't match the device capabilities. They must instead modify the format to match what the hardware can provide.
So select default format code and return success in that case.
This is detected by v4l2-compliance.
--- drivers/media/i2c/ov2659.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/i2c/ov2659.c +4 -2
@@ -1117,8 +1117,10 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,if (ov2659_formats[index].code == mf->code)break ; -if (index <0 ) -return -EINVAL ; +if (index <0 ) { + index =0 ; + mf->code = ov2659_formats[index].code; + } mf->colorspace =V4L2_COLORSPACE_SRGB ; mf->field =V4L2_FIELD_NONE ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 151/405 perf/arm-cci: Remove broken race mitigation
In reply to Greg Kroah-Hartman[ Upstream commit 0d2e2a82d4de298d006bf8eddc86829e3c7da820 ]
Uncore PMU drivers face an awkward cyclic dependency wherein:
- They have to pick a valid online CPU to associate with before registering the PMU device, since it will get exposed to userspace immediately.
- The PMU registration has to be be at least partly complete before hotplug events can be handled, since trying to migrate an uninitialised context would be bad.
- The hotplug handler has to be ready as soon as a CPU is chosen, lest it go offline without the user-visible cpumask value getting updated.
The arm-cci driver has tried to solve this by using get_cpu() to pick the current CPU and prevent it from disappearing while both registrations are performed, but that results in taking mutexes with preemption disabled, which makes certain configurations very unhappy:
[ 1.983337] BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:2004 [ 1.983340] in_atomic(): 1, irqs_disabled(): 0, pid: 1, name: swapper/0 [ 1.983342] Preemption disabled at: [ 1.983353] [<ffffff80089801f4>] cci_pmu_probe+0x1dc/0x488 [ 1.983360] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.18.20-rt8-yocto-preempt-rt #1 [ 1.983362] Hardware name: ZynqMP ZCU102 Rev1.0 (DT) [ 1.983364] Call trace: [ 1.983369] dump_backtrace+0x0/0x158 [ 1.983372] show_stack+0x24/0x30 [ 1.983378] dump_stack+0x80/0xa4 [ 1.983383] ___might_sleep+0x138/0x160 [ 1.983386] __might_sleep+0x58/0x90 [ 1.983391] __rt_mutex_lock_state+0x30/0xc0 [ 1.983395] _mutex_lock+0x24/0x30 [ 1.983400] perf_pmu_register+0x2c/0x388 [ 1.983404] cci_pmu_probe+0x2bc/0x488 [ 1.983409] platform_drv_probe+0x58/0xa8
It is not feasible to resolve all the possible races outside of the perf core itself, so address the immediate bug by following the example of nearly every other PMU driver and not even trying to do so. Registering the hotplug notifier first should minimise the window in which things can go wrong, so that's about as much as we can reasonably do here. This also revealed an additional race in assigning the global pointer too late relative to the hotplug notifier, which gets fixed in the process.
--- drivers/perf/arm-cci.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/perf/arm-cci.c +12 -9
@@ -1684,21 +1684,24 @@ static int cci_pmu_probe(struct platform_device *pdev)raw_spin_lock_init (&cci_pmu->hw_events.pmu_lock);mutex_init (&cci_pmu->reserve_mutex);atomic_set (&cci_pmu->active_events,0 ); - cci_pmu->cpu =get_cpu (); - - ret =cci_pmu_init (cci_pmu, pdev); -if (ret) { -put_cpu (); -return ret; - } + cci_pmu->cpu =raw_smp_processor_id (); + g_cci_pmu = cci_pmu;cpuhp_setup_state_nocalls (CPUHP_AP_PERF_ARM_CCI_ONLINE ,"perf/arm/cci:online" ,NULL , cci_pmu_offline_cpu); -put_cpu (); - g_cci_pmu = cci_pmu; + + ret =cci_pmu_init (cci_pmu, pdev); +if (ret) + goto error_pmu_init; +pr_info ("ARM %s PMU driver probed" , cci_pmu->model->name);return 0 ; + +error_pmu_init: +cpuhp_remove_state (CPUHP_AP_PERF_ARM_CCI_ONLINE ); + g_cci_pmu =NULL ; +return ret; }static int cci_pmu_remove (struct platform_device *pdev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 402/405 extcon: axp288: Add a depends on ACPI to the Kconfig entry
In reply to Greg Kroah-Hartman[ Upstream commit fa3c098c2d52a268f6372fa053932e11f50cecb1 ]
As Hans de Goede pointed, using this driver without ACPI makes little sense, so add ACPI dependency to Kconfig entry to fix a build error while CONFIG_ACPI is not set.
drivers/extcon/extcon-axp288.c: In function 'axp288_extcon_probe':drivers/extcon/extcon-axp288.c:363:20: error: dereferencing pointer to incomplete type
put_device(&adev->dev);
--- drivers/extcon/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/extcon/Kconfig +1 -1
@@ -30,7 +30,7 @@ config EXTCON_ARIZONA config EXTCON_AXP288 tristate "X-Power AXP288 EXTCON support" - depends on MFD_AXP20X && USB_SUPPORT && X86 + depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI select USB_ROLE_SWITCH help Say Y here to enable support for USB peripheral detection
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 399/405 drm/sun4i: dsi: Change the start delay calculation
In reply to Greg Kroah-Hartman[ Upstream commit da676c6aa6413d59ab0a80c97bbc273025e640b2 ]
The current calculation for the video start delay in the current DSI driver is that it is the total vertical size, minus the front porch and sync length, plus 1. This equals to the active vertical size plus the back porch plus 1.
That 1 is coming in the Allwinner BSP from an variable that is set to 1. However, if we look at the Allwinner BSP more closely, and especially in the "legacy" code for the display (in drivers/video/sunxi/legacy/), we can see that this variable is actually computed from the porches and the sync minus 10, clamped between 8 and 100.
This fixes the start delay symptom we've seen on some panels (vblank timeouts with vertical white stripes at the bottom of the panel).
--- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +3 -1
@@ -358,7 +358,9 @@ static void sun6i_dsi_inst_init(struct sun6i_dsi *dsi,static u16 sun6i_dsi_get_video_start_delay (struct sun6i_dsi *dsi,struct drm_display_mode *mode) { -return mode->vtotal - (mode->vsync_end - mode->vdisplay) +1 ; +u16 start =clamp (mode->vtotal - mode->vdisplay -10 ,8 ,100 ); + +return mode->vtotal - (mode->vsync_end - mode->vdisplay) + start; } static void sun6i_dsi_setup_burst(struct sun6i_dsi *dsi,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 398/405 drm: Wake up next in drm_read() chain if we are forced to putback the event
In reply to Greg Kroah-Hartman[ Upstream commit 60b801999c48b6c1dd04e653a38e2e613664264e ]
After an event is sent, we try to copy it into the user buffer of the first waiter in drm_read() and if the user buffer doesn't have enough room we put it back onto the list. However, we didn't wake up any subsequent waiter, so that event may sit on the list until either a new vblank event is sent or a new waiter appears. Rare, but in the worst case may lead to a stuck process.
Testcase: igt/drm_read/short-buffer-wakeup
--- drivers/gpu/drm/drm_file.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_file.c +1 -0
@@ -577,6 +577,7 @@ ssize_t drm_read(struct file *filp, char __user *buffer, file_priv->event_space -= length;list_add (&e->link, &file_priv->event_list);spin_unlock_irq (&dev->event_lock); +wake_up_interruptible (&file_priv->event_wait);break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 393/405 ASoC: ti: fix davinci_mcasp_probe dependencies
In reply to Greg Kroah-Hartman[ Upstream commit 7d7b25d05ef1c5a1a9320190e1eeb55534847558 ]
The SND_SOC_DAVINCI_MCASP driver can use either edma or sdma as a back-end, and it takes the presence of the respective dma engine drivers in the configuration as an indication to which ones should be built. However, this is flawed in multiple ways:
- With CONFIG_TI_EDMA=m and CONFIG_SND_SOC_DAVINCI_MCASP=y,
is enabled as =m, and we get a link error:
sound/soc/ti/davinci-mcasp.o: In function `davinci_mcasp_probe':
davinci-mcasp.c:(.text+0x930): undefined reference to `edma_pcm_platform_register'
- When CONFIG_SND_SOC_DAVINCI_MCASP=m has already been selected by another driver, the same link error appears even if CONFIG_TI_EDMA is disabled
There are possibly other issues here, but it seems that the only reasonable solution is to always build both SND_SOC_TI_EDMA_PCM and SND_SOC_TI_SDMA_PCM as a dependency here. Both are fairly small and do not have any other compile-time dependencies, so the cost is very small, and makes the configuration stage much more consistent.
--- sound/soc/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/ti/Kconfig +2 -2
@@ -21,8 +21,8 @@ config SND_SOC_DAVINCI_ASP config SND_SOC_DAVINCI_MCASP tristate "Multichannel Audio Serial Port (McASP) support" - select SND_SOC_TI_EDMA_PCM if TI_EDMA - select SND_SOC_TI_SDMA_PCM if DMA_OMAP + select SND_SOC_TI_EDMA_PCM + select SND_SOC_TI_SDMA_PCM help Say Y or M here if you want to have support for McASP IP found in various Texas Instruments SoCs like:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 392/405 ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM
In reply to Greg Kroah-Hartman[ Upstream commit 8ca5104715cfd14254ea5aecc390ae583b707607 ]
Building with clang shows a variable that is only used by the suspend/resume functions but defined outside of their #ifdef block:
sound/soc/ti/davinci-mcasp.c:48:12: error: variable 'context_regs' is not needed and will not be emitted
We commonly fix these by marking the PM functions as __maybe_unused, but here that would grow the davinci_mcasp structure, so instead add another #ifdef here.
--- sound/soc/ti/davinci-mcasp.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/ti/davinci-mcasp.c +2 -0
@@ -45,6 +45,7 @@#define MCASP_MAX_AFIFO_DEPTH 64 +#ifdef CONFIG_PM static u32 context_regs[] = {DAVINCI_MCASP_TXFMCTL_REG , DAVINCI_MCASP_RXFMCTL_REG,
@@ -68,6 +69,7 @@ struct davinci_mcasp_context {u32 *xrsr_regs;/* for serializer configuration */ bool pm_state; }; +#endif struct davinci_mcasp_ruledata {struct davinci_mcasp *mcasp;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 391/405 spi: Fix zero length xfer bug
In reply to Greg Kroah-Hartman[ Upstream commit 5442dcaa0d90fc376bdfc179a018931a8f43dea4 ]
This fixes a bug for messages containing both zero length and unidirectional xfers.
The function spi_map_msg will allocate dummy tx and/or rx buffers for use with unidirectional transfers when the hardware can only do a bidirectional transfer. That dummy buffer will be used in place of a NULL buffer even when the xfer length is 0.
Then in the function __spi_map_msg, if he hardware can dma, the zero length xfer will have spi_map_buf called on the dummy buffer.
Eventually, __sg_alloc_table is called and returns -EINVAL because nents == 0.
This fix prevents the error by not using the dummy buffer when the xfer length is zero.
--- drivers/spi/spi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi.c +2 -0
@@ -1041,6 +1041,8 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg)if (max_tx || max_rx) {list_for_each_entry (xfer, &msg->transfers, transfer_list) { +if (!xfer->len) +continue ;if (!xfer->tx_buf) xfer->tx_buf = ctlr->dummy_tx;if (!xfer->rx_buf)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 379/405 regulator: ltc3676: Fix notifier mutex lock warning
In reply to Greg Kroah-Hartman[ Upstream commit 769fc8d4182c1d1875db7859852afeb436714c5c ]
The mutex for the regulator_dev must be controlled by the caller of the regulator_notifier_call_chain(), as described in the comment for that function.
Failure to mutex lock and unlock surrounding the notifier call results in a kernel WARN_ON_ONCE() which will dump a backtrace for the regulator_notifier_call_chain() when that function call is first made. The mutex can be controlled using the regulator_lock/unlock() API.
--- drivers/regulator/ltc3676.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/regulator/ltc3676.c +8 -2
@@ -285,17 +285,23 @@ static irqreturn_t ltc3676_isr(int irq, void *dev_id)if (irqstat <C3676_IRQSTAT_THERMAL_WARN ) {dev_warn (dev,"Over-temperature Warning\n" ); event =REGULATOR_EVENT_OVER_TEMP ; -for (i =0 ; i <LTC3676_NUM_REGULATORS ; i++) +for (i =0 ; i <LTC3676_NUM_REGULATORS ; i++) { +regulator_lock (ltc3676->regulators[i]);regulator_notifier_call_chain (ltc3676->regulators[i], event,NULL ); +regulator_unlock (ltc3676->regulators[i]); + } }if (irqstat <C3676_IRQSTAT_UNDERVOLT_WARN ) {dev_info (dev,"Undervoltage Warning\n" ); event =REGULATOR_EVENT_UNDER_VOLTAGE ; -for (i =0 ; i <LTC3676_NUM_REGULATORS ; i++) +for (i =0 ; i <LTC3676_NUM_REGULATORS ; i++) { +regulator_lock (ltc3676->regulators[i]);regulator_notifier_call_chain (ltc3676->regulators[i], event,NULL ); +regulator_unlock (ltc3676->regulators[i]); + } }/* Clear warning condition */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 364/405 scsi: lpfc: Fix io lost on host resets
In reply to Greg Kroah-Hartman[ Upstream commit c66a91974634bfdf9d8e8736219d3b27621fa704 ]
If the driver undergoes repeated host resets it starts losing exchange structures and eventually returns SCSI_MLQUEUE_HOST_BUSY and does not recover. The offline path is not reclaiming the outstanding ios on the fcp pring txcmplq before calling lpfc_destroy_multixripool, which causes the txmcplq to be reinit and the resources lost.
Flush the fcp rings before destroying the multixripools.
--- drivers/scsi/lpfc/lpfc_init.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/scsi/lpfc/lpfc_init.c +7 -0
@@ -3245,6 +3245,13 @@ void lpfc_destroy_multixri_pools(struct lpfc_hba *phba)if (phba->cfg_enable_fc4_type &LPFC_ENABLE_NVME )lpfc_destroy_expedite_pool (phba); +if (!(phba->pport->load_flag &FC_UNLOADING )) { +lpfc_sli_flush_fcp_rings (phba); + +if (phba->cfg_enable_fc4_type &LPFC_ENABLE_NVME ) +lpfc_sli_flush_nvme_rings (phba); + } + hwq_count = phba->cfg_hdw_queue;for (i =0 ; i < hwq_count; i++) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 362/405 scsi: lpfc: Fix FDMI manufacturer attribute value
In reply to Greg Kroah-Hartman[ Upstream commit d67f935b79a76ac9d86dde1a27bdd413feb5d987 ]
The FDMI manufacturer value being reported on Linux is inconsistent with other OS's.
Set the value to "Emulex Corporation" for consistency.
--- drivers/scsi/lpfc/lpfc_ct.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_ct.c +4 -1
@@ -2005,8 +2005,11 @@ lpfc_fdmi_hba_attr_manufacturer(struct lpfc_vport *vport, ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;memset (ae,0 ,256 ); +/* This string MUST be consistent with other FC platforms +* supported by Broadcom. +*/ strncpy (ae->un.AttrString, -"Broadcom Inc." , +"Emulex Corporation" ,sizeof (ae->un.AttrString)); len =strnlen (ae->un.AttrString,sizeof (ae->un.AttrString));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 360/405 media: vim2m: replace devm_kzalloc by kzalloc
In reply to Greg Kroah-Hartman[ Upstream commit ea6c7e34f3b28e165988aa7391310752969842e8 ]
It is not possible to use devm_kzalloc since that memory is freed immediately when the device instance is unbound.
Various objects like the video device may still be in use since someone has the device node open, and when that is closed it expects the memory to be around.
So use kzalloc and release it at the appropriate time.
--- drivers/media/platform/vim2m.c | 35 +++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)
drivers/media/platform/vim2m.c +22 -13
@@ -1262,6 +1262,15 @@ static int vim2m_release(struct file *file)return 0 ; } +static void vim2m_device_release (struct video_device *vdev) +{ + struct vim2m_dev *dev = container_of(vdev, struct vim2m_dev, vfd); + +v4l2_device_unregister (&dev->v4l2_dev); +v4l2_m2m_release (dev->m2m_dev); +kfree (dev); +} +static const struct v4l2_file_operations vim2m_fops = { .owner =THIS_MODULE , .open = vim2m_open,
@@ -1277,7 +1286,7 @@ static const struct video_device vim2m_videodev = { .fops = &vim2m_fops, .ioctl_ops = &vim2m_ioctl_ops, .minor = -1, - .release = video_device_release_empty, + .release = vim2m_device_release, .device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING, };
@@ -1298,13 +1307,13 @@ static int vim2m_probe(struct platform_device *pdev)struct video_device *vfd;int ret; - dev =devm_kzalloc (&pdev->dev,sizeof (*dev),GFP_KERNEL ); + dev =kzalloc (sizeof (*dev),GFP_KERNEL );if (!dev)return -ENOMEM ; ret =v4l2_device_register (&pdev->dev, &dev->v4l2_dev);if (ret) -return ret; + goto error_free;atomic_set (&dev->num_inst,0 );mutex_init (&dev->dev_mutex);
@@ -1317,7 +1326,7 @@ static int vim2m_probe(struct platform_device *pdev) ret =video_register_device (vfd,VFL_TYPE_GRABBER ,0 );if (ret) {v4l2_err (&dev->v4l2_dev,"Failed to register video device\n" ); - goto unreg_v4l2; + goto error_v4l2; }video_set_drvdata (vfd, dev);
@@ -1330,7 +1339,7 @@ static int vim2m_probe(struct platform_device *pdev)if (IS_ERR (dev->m2m_dev)) {v4l2_err (&dev->v4l2_dev,"Failed to init mem2mem device\n" ); ret =PTR_ERR (dev->m2m_dev); - goto unreg_dev; + goto error_dev; }#ifdef CONFIG_MEDIA_CONTROLLER
@@ -1346,27 +1355,29 @@ static int vim2m_probe(struct platform_device *pdev) MEDIA_ENT_F_PROC_VIDEO_SCALER);if (ret) {v4l2_err (&dev->v4l2_dev,"Failed to init mem2mem media controller\n" ); - goto unreg_m2m; + goto error_m2m; } ret =media_device_register (&dev->mdev);if (ret) {v4l2_err (&dev->v4l2_dev,"Failed to register mem2mem media device\n" ); - goto unreg_m2m_mc; + goto error_m2m_mc; }#endif return 0 ;#ifdef CONFIG_MEDIA_CONTROLLER -unreg_m2m_mc: +error_m2m_mc:v4l2_m2m_unregister_media_controller (dev->m2m_dev); -unreg_m2m: +error_m2m:v4l2_m2m_release (dev->m2m_dev);#endif -unreg_dev: +error_dev:video_unregister_device (&dev->vfd); -unreg_v4l2: +error_v4l2:v4l2_device_unregister (&dev->v4l2_dev); +error_free: +kfree (dev);return ret; }
@@ -1382,9 +1393,7 @@ static int vim2m_remove(struct platform_device *pdev)v4l2_m2m_unregister_media_controller (dev->m2m_dev);media_device_cleanup (&dev->mdev);#endif -v4l2_m2m_release (dev->m2m_dev);video_unregister_device (&dev->vfd); -v4l2_device_unregister (&dev->v4l2_dev);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 352/405 scsi: ufs: fix a missing check of devm_reset_control_get
In reply to Greg Kroah-Hartman[ Upstream commit 63a06181d7ce169d09843645c50fea1901bc9f0a ]
devm_reset_control_get could fail, so the fix checks its return value and passes the error code upstream in case it fails.
--- drivers/scsi/ufs/ufs-hisi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/ufs/ufs-hisi.c +4 -0
@@ -587,6 +587,10 @@ static int ufs_hisi_init_common(struct ufs_hba *hba)ufshcd_set_variant (hba, host); host->rst =devm_reset_control_get (dev,"rst" ); +if (IS_ERR (host->rst)) { +dev_err (dev,"%s: failed to get reset control\n" , __func__); +return PTR_ERR (host->rst); + }ufs_hisi_set_pm_lvl (hba);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 344/405 media: dvbsky: Avoid leaking dvb frontend
In reply to Greg Kroah-Hartman[ Upstream commit fdfa59cd63b184e1e96d51ff170fcac739bc6f6f ]
Commit 14f4eaeddabc ("media: dvbsky: fix driver unregister logic") fixed a use-after-free by removing the reference to the frontend after deleting the backing i2c device.
This has the unfortunate side effect the frontend device is never freed in the dvb core leaving a dangling device, leading to errors when the dvb core tries to register the frontend after e.g. a replug as reported
here: https://www.spinics.net/lists/linux-media/msg138181.html
media: dvbsky: issues with DVBSky T680CI
===
[ 561.119145] sp2 8-0040: CIMaX SP2 successfully attached [ 561.119161] usb 2-3: DVB: registering adapter 0 frontend 0 (Silicon Labs Si2168)... [ 561.119174] sysfs: cannot create duplicate filename '/class/dvb/
dvb0.frontend0'
===
The use after free happened as dvb_usbv2_disconnect calls in this order:
- dvb_usb_device::props->exit(...)
- dvb_usbv2_adapter_frontend_exit(...)
+ if (fe) dvb_unregister_frontend(fe)
+ dvb_usb_device::props->frontend_detach(...)
Moving the release of the i2c device from exit() to frontend_detach() avoids the dangling pointer access and allows the core to unregister the frontend.
This was originally reported for a DVBSky T680CI, but it also affects the MyGica T230C. As all supported devices structure the registration/ unregistration identically, apply the change for all device types.
--- drivers/media/usb/dvb-usb-v2/dvbsky.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/media/usb/dvb-usb-v2/dvbsky.c +10 -8
@@ -615,16 +615,18 @@ static int dvbsky_init(struct dvb_usb_device *d)return 0 ; } -static void dvbsky_exit (struct dvb_usb_device *d) +static int dvbsky_frontend_detach (struct dvb_usb_adapter *adap) { +struct dvb_usb_device *d =adap_to_d (adap);struct dvbsky_state *state =d_to_priv (d); -struct dvb_usb_adapter *adap = &d->adapter[0 ]; + +dev_dbg (&d->udev->dev,"%s: adap=%d\n" , __func__, adap->id);dvb_module_release (state->i2c_client_tuner);dvb_module_release (state->i2c_client_demod);dvb_module_release (state->i2c_client_ci); - adap->fe[0 ] =NULL ; +return 0 ; }/* DVB USB Driver stuff */
@@ -640,11 +642,11 @@ static struct dvb_usb_device_properties dvbsky_s960_props = { .i2c_algo = &dvbsky_i2c_algo, .frontend_attach = dvbsky_s960_attach, + .frontend_detach = dvbsky_frontend_detach, .init = dvbsky_init, .get_rc_config = dvbsky_get_rc_config, .streaming_ctrl = dvbsky_streaming_ctrl, .identify_state = dvbsky_identify_state, - .exit = dvbsky_exit, .read_mac_address = dvbsky_read_mac_addr, .num_adapters = 1,
@@ -667,11 +669,11 @@ static struct dvb_usb_device_properties dvbsky_s960c_props = { .i2c_algo = &dvbsky_i2c_algo, .frontend_attach = dvbsky_s960c_attach, + .frontend_detach = dvbsky_frontend_detach, .init = dvbsky_init, .get_rc_config = dvbsky_get_rc_config, .streaming_ctrl = dvbsky_streaming_ctrl, .identify_state = dvbsky_identify_state, - .exit = dvbsky_exit, .read_mac_address = dvbsky_read_mac_addr, .num_adapters = 1,
@@ -694,11 +696,11 @@ static struct dvb_usb_device_properties dvbsky_t680c_props = { .i2c_algo = &dvbsky_i2c_algo, .frontend_attach = dvbsky_t680c_attach, + .frontend_detach = dvbsky_frontend_detach, .init = dvbsky_init, .get_rc_config = dvbsky_get_rc_config, .streaming_ctrl = dvbsky_streaming_ctrl, .identify_state = dvbsky_identify_state, - .exit = dvbsky_exit, .read_mac_address = dvbsky_read_mac_addr, .num_adapters = 1,
@@ -721,11 +723,11 @@ static struct dvb_usb_device_properties dvbsky_t330_props = { .i2c_algo = &dvbsky_i2c_algo, .frontend_attach = dvbsky_t330_attach, + .frontend_detach = dvbsky_frontend_detach, .init = dvbsky_init, .get_rc_config = dvbsky_get_rc_config, .streaming_ctrl = dvbsky_streaming_ctrl, .identify_state = dvbsky_identify_state, - .exit = dvbsky_exit, .read_mac_address = dvbsky_read_mac_addr, .num_adapters = 1,
@@ -748,11 +750,11 @@ static struct dvb_usb_device_properties mygica_t230c_props = { .i2c_algo = &dvbsky_i2c_algo, .frontend_attach = dvbsky_mygica_t230c_attach, + .frontend_detach = dvbsky_frontend_detach, .init = dvbsky_init, .get_rc_config = dvbsky_get_rc_config, .streaming_ctrl = dvbsky_streaming_ctrl, .identify_state = dvbsky_identify_state, - .exit = dvbsky_exit, .num_adapters = 1, .adapter = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 342/405 igb: Exclude device from suspend direct complete optimization
In reply to Greg Kroah-Hartman[ Upstream commit 5b6e13216be29ced7350d9c354a1af8fe0ad9a3e ]
igb sets different WoL settings in system suspend callback and runtime suspend callback.
The suspend direct complete optimization leaves igb in runtime suspended state with wrong WoL setting during system suspend.
To fix this, we need to disable suspend direct complete optimization to let igb always use suspend callback to set correct WoL during system suspend.
--- drivers/net/ethernet/intel/igb/igb_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/igb/igb_main.c +3 -0
@@ -3452,6 +3452,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)break ; } } + +dev_pm_set_driver_flags (&pdev->dev,DPM_FLAG_NEVER_SKIP ); +pm_runtime_put_noidle (&pdev->dev);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 332/405 drm/amd/display: Update ABM crtc state on non-modeset
In reply to Greg Kroah-Hartman[ Upstream commit b05e2c5e81f9a0be4a145e0926b1dfe62f6347d4 ]
[Why]
Somewhere in the atomic check reshuffle ABM got lost. ABM is a crtc property (copied from a connector property). It can change without a modeset, just like underscan.
[How]
In the skip_modeset branch of atomic check crtc updates, copy over the abm property.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -5661,6 +5661,9 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,update_stream_scaling_settings ( &new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream); +/* ABM settings */ + dm_new_crtc_state->abm_level = dm_new_conn_state->abm_level; +/* * Color management settings. We also update color properties * when a modeset is needed, to ensure it gets reprogrammed.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 287/405 media: wl128x: prevent two potential buffer overflows
In reply to Greg Kroah-Hartman[ Upstream commit 9c2ccc324b3a6cbc865ab8b3e1a09e93d3c8ade9 ]
Smatch marks skb->data as untrusted so it warns that "evt_hdr->dlen" can copy up to 255 bytes and we only have room for two bytes. Even if this comes from the firmware and we trust it, the new policy generally is just to fix it as kernel hardenning.
I can't test this code so I tried to be very conservative. I considered not allowing "evt_hdr->dlen == 1" because it doesn't initialize the whole variable but in the end I decided to allow it and manually initialized "asic_id" and "asic_ver" to zero.
--- drivers/media/radio/wl128x/fmdrv_common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/radio/wl128x/fmdrv_common.c +5 -2
@@ -489,7 +489,8 @@ int fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,return -EIO ; }/* Send response data to caller */ -if (response !=NULL && response_len !=NULL && evt_hdr->dlen) { +if (response !=NULL && response_len !=NULL && evt_hdr->dlen && + evt_hdr->dlen <= payload_len) {/* Skip header info and copy only response data */ skb_pull (skb,sizeof (struct fm_event_msg_hdr ));memcpy (response, skb->data, evt_hdr->dlen);
@@ -583,6 +584,8 @@ static void fm_irq_handle_flag_getcmd_resp(struct fmdev *fmdev)return ; fm_evt_hdr = (void *)skb->data; +if (fm_evt_hdr->dlen >sizeof (fmdev->irq_info.flag)) +return ;/* Skip header info and copy only response data */ skb_pull (skb,sizeof (struct fm_event_msg_hdr ));
@@ -1308,7 +1311,7 @@ static int load_default_rx_configuration(struct fmdev *fmdev)static int fm_power_up (struct fmdev *fmdev,u8 mode) {u16 payload; -__be16 asic_id, asic_ver; +__be16 asic_id =0 , asic_ver =0 ;int resp_len, ret;u8 fw_name[50 ];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 317/405 media: vicodec: bugfix - call v4l2_m2m_buf_copy_metadata also if decoding fails
In reply to Greg Kroah-Hartman[ Upstream commit 8eead25cbdf911e17cff321903bd3397bc6ea22c ]
The function 'v4l2_m2m_buf_copy_metadata' should be called even if decoding/encoding ends with status VB2_BUF_STATE_ERROR, so that the metadata is copied from the source buffer to the dest buffer.
--- drivers/media/platform/vicodec/vicodec-core.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/media/platform/vicodec/vicodec-core.c +9 -8
@@ -159,12 +159,10 @@ static int device_process(struct vicodec_ctx *ctx, struct vb2_v4l2_buffer *dst_vb) {struct vicodec_dev *dev = ctx->dev; -struct vicodec_q_data *q_dst;struct v4l2_fwht_state *state = &ctx->state;u8 *p_src, *p_dst;int ret; - q_dst =get_q_data (ctx,V4L2_BUF_TYPE_VIDEO_CAPTURE );if (ctx->is_enc) p_src =vb2_plane_vaddr (&src_vb->vb2_buf,0 );else
@@ -186,8 +184,10 @@ static int device_process(struct vicodec_ctx *ctx,return ret;vb2_set_plane_payload (&dst_vb->vb2_buf,0 , ret); }else { +struct vicodec_q_data *q_dst;unsigned int comp_frame_size =ntohl (ctx->state.header.size); + q_dst =get_q_data (ctx,V4L2_BUF_TYPE_VIDEO_CAPTURE );if (comp_frame_size > ctx->comp_max_size)return -EINVAL ; state->info = q_dst->info;
@@ -196,11 +196,6 @@ static int device_process(struct vicodec_ctx *ctx,return ret;vb2_set_plane_payload (&dst_vb->vb2_buf,0 , q_dst->sizeimage); } - - dst_vb->sequence = q_dst->sequence++; - dst_vb->flags &= ~V4L2_BUF_FLAG_LAST ; -v4l2_m2m_buf_copy_metadata (src_vb, dst_vb, !ctx->is_enc); -return 0 ; }
@@ -274,16 +269,22 @@ static void device_run(void *priv)struct vicodec_ctx *ctx = priv;struct vicodec_dev *dev = ctx->dev;struct vb2_v4l2_buffer *src_buf, *dst_buf; -struct vicodec_q_data *q_src; +struct vicodec_q_data *q_src, *q_dst;u32 state; src_buf =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); q_src =get_q_data (ctx,V4L2_BUF_TYPE_VIDEO_OUTPUT ); + q_dst =get_q_data (ctx,V4L2_BUF_TYPE_VIDEO_CAPTURE ); state =VB2_BUF_STATE_DONE ;if (device_process (ctx, src_buf, dst_buf)) state =VB2_BUF_STATE_ERROR ; +else + dst_buf->sequence = q_dst->sequence++; + dst_buf->flags &= ~V4L2_BUF_FLAG_LAST ; +v4l2_m2m_buf_copy_metadata (src_buf, dst_buf, !ctx->is_enc); + ctx->last_dst_buf = dst_buf;spin_lock (ctx->lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 318/405 ice: Prevent unintended multiple chain resets
In reply to Greg Kroah-Hartman[ Upstream commit 2ebd4428d93a2f6ce0c813b10a1a43b6a8241fe5 ]
In the current implementation of ice_reset_subtask, if multiple reset types are set in the pf->state, the most intrusive one is meant to be performed only, but the bits requesting the other types are not being cleared. This would lead to another reset being performed the next time the service task is scheduled.
Change the flow of ice_reset_subtask so that all reset request bits in pf->state are cleared, and we still perform the most intrusive of the resets requested.
--- drivers/net/ethernet/intel/ice/ice_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +8 -2
@@ -416,8 +416,14 @@ static void ice_reset_subtask(struct ice_pf *pf)* for the reset now), poll for reset done, rebuild and return. */ if (test_bit (__ICE_RESET_OICR_RECV, pf->state)) { -clear_bit (__ICE_GLOBR_RECV, pf->state); -clear_bit (__ICE_CORER_RECV, pf->state); +/* Perform the largest reset requested */ +if (test_and_clear_bit (__ICE_CORER_RECV, pf->state)) + reset_type =ICE_RESET_CORER ; +if (test_and_clear_bit (__ICE_GLOBR_RECV, pf->state)) + reset_type =ICE_RESET_GLOBR ; +/* return if no valid reset type requested */ +if (reset_type ==ICE_RESET_INVAL ) +return ;if (!test_bit (__ICE_PREPARED_FOR_RESET, pf->state))ice_prepare_for_reset (pf);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 315/405 scsi: qla4xxx: avoid freeing unallocated dma memory
In reply to Greg Kroah-Hartman[ Upstream commit 608f729c31d4caf52216ea00d20092a80959256d ]
Clang -Wuninitialized notices that on is_qla40XX we never allocate any DMA memory in get_fw_boot_info() but attempt to free it anyway:
drivers/scsi/qla4xxx/ql4_os.c:5915:7: error: variable 'buf_dma' is used uninitialized whenever 'if' condition is false
[-Werror,-Wsometimes-uninitialized]
if (!(val & 0x07)) {
^~~~~~~~~~~~~
drivers/scsi/qla4xxx/ql4_os.c:5985:47: note: uninitialized use occurs here
dma_free_coherent(&ha->pdev->dev, size, buf, buf_dma);
^~~~~~~
drivers/scsi/qla4xxx/ql4_os.c:5915:3: note: remove the 'if' if its condition is always true
if (!(val & 0x07)) {
^~~~~~~~~~~~~~~~~~~
drivers/scsi/qla4xxx/ql4_os.c:5885:20: note: initialize the variable 'buf_dma' to silence this warning
dma_addr_t buf_dma;
^
= 0Skip the call to dma_free_coherent() here.
--- drivers/scsi/qla4xxx/ql4_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla4xxx/ql4_os.c +1 -1
@@ -5930,7 +5930,7 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[]) val =rd_nvram_byte (ha, sec_addr);if (val &BIT_7 ) ddb_index[1 ] = (val &0x7f ); - + goto exit_boot_info; }else if (is_qla80XX (ha)) { buf =dma_alloc_coherent (&ha->pdev->dev, size, &buf_dma,GFP_KERNEL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 303/405 staging: mt7621-mmc: Initialize completions a single time during probe
In reply to Greg Kroah-Hartman[ Upstream commit 7ca8c2c8bbeda2a2a2a9898cd35066bc1dc83836 ]
The module was initializing completions whenever it was going to wait on them, and not when the completion was allocated. This is incorrect according to the completion docs:
Calling init_completion() on the same completion object twice is most likely a bug [...]
Re-initialization is also unnecessary because the module never uses complete_all(). Fix this by only ever initializing the completion a single time, and log if the completions are not consumed as intended (this is not a fatal problem, but should not go unnoticed).
--- drivers/staging/mt7621-mmc/sd.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/staging/mt7621-mmc/sd.c +14 -4
@@ -468,7 +468,11 @@ static unsigned int msdc_command_start(struct msdc_host *host, host->cmd = cmd; host->cmd_rsp = resp; -init_completion (&host->cmd_done); +// The completion should have been consumed by the previous command +// response handler, because the mmc requests should be serialized +if (completion_done (&host->cmd_done)) +dev_err (mmc_dev (host->mmc), +"previous command was not handled\n" );sdr_set_bits (host->base +MSDC_INTEN , wints);sdc_send_cmd (rawcmd, cmd->arg);
@@ -490,7 +494,6 @@ static unsigned int msdc_command_resp(struct msdc_host *host,MSDC_INT_ACMD19_DONE ;BUG_ON (in_interrupt ()); -//init_completion(&host->cmd_done); //sdr_set_bits(host->base + MSDC_INTEN, wints); spin_unlock (&host->lock);
@@ -674,7 +677,13 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq)//msdc_clr_fifo(host); /* no need */ msdc_dma_on ();/* enable DMA mode first!! */ -init_completion (&host->xfer_done); + +// The completion should have been consumed by the previous +// xfer response handler, because the mmc requests should be +// serialized +if (completion_done (&host->cmd_done)) +dev_err (mmc_dev (host->mmc), +"previous transfer was not handled\n" );/* start the command first*/ if (msdc_command_start (host, cmd,CMD_TIMEOUT ) !=0 )
@@ -693,7 +702,6 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq)/* for read, the data coming too fast, then CRC error * start DMA no business with CRC. */ -//init_completion(&host->xfer_done); msdc_dma_start (host);spin_unlock (&host->lock);
@@ -1688,6 +1696,8 @@ static int msdc_drv_probe(struct platform_device *pdev) }msdc_init_gpd_bd (host, &host->dma); +init_completion (&host->cmd_done); +init_completion (&host->xfer_done);INIT_DELAYED_WORK (&host->card_delaywork, msdc_tasklet_card);spin_lock_init (&host->lock);msdc_init_hw (host);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 302/405 tty: ipwireless: fix missing checks for ioremap
In reply to Greg Kroah-Hartman[ Upstream commit 1bbb1c318cd8a3a39e8c3e2e83d5e90542d6c3e3 ]
ipw->attr_memory and ipw->common_memory are assigned with the return value of ioremap. ioremap may fail, but no checks are enforced. The fix inserts the checks to avoid potential NULL pointer dereferences.
--- drivers/tty/ipwireless/main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/tty/ipwireless/main.c +8 -0
@@ -114,6 +114,10 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, void *priv_data) ipw->common_memory =ioremap (p_dev->resource[2 ]->start,resource_size (p_dev->resource[2 ])); +if (!ipw->common_memory) { + ret = -ENOMEM ; + goto exit1; + }if (!request_mem_region (p_dev->resource[2 ]->start,resource_size (p_dev->resource[2 ]),IPWIRELESS_PCCARD_NAME )) {
@@ -134,6 +138,10 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, void *priv_data) ipw->attr_memory =ioremap (p_dev->resource[3 ]->start,resource_size (p_dev->resource[3 ])); +if (!ipw->attr_memory) { + ret = -ENOMEM ; + goto exit3; + }if (!request_mem_region (p_dev->resource[3 ]->start,resource_size (p_dev->resource[3 ]),IPWIRELESS_PCCARD_NAME )) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 296/405 IB/mlx5: Compare only index part of a memory window rkey
In reply to Greg Kroah-Hartman[ Upstream commit d623dfd2836114507d647c9793a80d213d8bffe8 ]
The InfiniBand Architecture Specification section 10.6.7.2.4 TYPE 2 MEMORY WINDOWS says that if the CI supports the Base Memory Management Extensions defined in this specification, the R_Key format for a Type 2 Memory Window must consist of:
* 24 bit index in the most significant bits of the R_Key, which is owned by the CI, and
* 8 bit key in the least significant bits of the R_Key, which is owned by the Consumer.
This means that the kernel should compare only the index part of a R_Key to determine equality with another R_Key.
--- drivers/infiniband/hw/mlx5/odp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/odp.c +10 -1
@@ -711,6 +711,15 @@ struct pf_frame {int depth; }; +static bool mkey_is_eq (struct mlx5_core_mkey *mmkey,u32 key) +{ +if (!mmkey) +return false; +if (mmkey->type ==MLX5_MKEY_MW ) +return mlx5_base_mkey (mmkey->key) ==mlx5_base_mkey (key); +return mmkey->key == key; +} +static int get_indirect_num_descs (struct mlx5_core_mkey *mmkey) {struct mlx5_ib_mw *mw;
@@ -760,7 +769,7 @@ static int pagefault_single_data_segment(struct mlx5_ib_dev *dev, next_mr: mmkey =__mlx5_mr_lookup (dev->mdev,mlx5_base_mkey (key)); -if (!mmkey || mmkey->key != key) { +if (!mkey_is_eq (mmkey, key)) {mlx5_ib_dbg (dev,"failed to find mkey %x\n" , key); ret = -EFAULT ; goto srcu_unlock;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 293/405 drm: rcar-du: lvds: Set LVEN and LVRES bits together on D3
In reply to Greg Kroah-Hartman[ Upstream commit 00d082cc4ea6e42ec4fed832a1020231bb1ca150 ]
On the D3 SoC the LVDS PHY must be enabled in the same register write that enables the LVDS output. Skip writing the LVEN bit independently on that platform, it will be set by the write that sets LVRES.
--- drivers/gpu/drm/rcar-du/rcar_lvds.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/rcar-du/rcar_lvds.c +6 -2
@@ -485,9 +485,13 @@ static void rcar_lvds_enable(struct drm_bridge *bridge) }if (lvds->info->quirks &RCAR_LVDS_QUIRK_GEN3_LVEN ) { -/* Turn on the LVDS PHY. */ +/* +* Turn on the LVDS PHY. On D3, the LVEN and LVRES bit must be +* set at the same time, so don't write the register yet. +*/ lvdcr0 |=LVDCR0_LVEN ; -rcar_lvds_write (lvds,LVDCR0 , lvdcr0); +if (!(lvds->info->quirks &RCAR_LVDS_QUIRK_PWD )) +rcar_lvds_write (lvds,LVDCR0 , lvdcr0); }if (!(lvds->info->quirks &RCAR_LVDS_QUIRK_EXT_PLL )) {
Signature · 1 line
2.20.1