5.4.7-stable review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 155/434 Bluetooth: hci_core: fix init for HCI_USER_CHANNEL
In reply to Greg Kroah-HartmanFrom: Mattijs Korpershoek <[email protected]>
[ Upstream commit eb8c101e28496888a0dcfe16ab86a1bee369e820 ]
During the setup() stage, HCI device drivers expect the chip to acknowledge its setup() completion via vendor specific frames.
If userspace opens() such HCI device in HCI_USER_CHANNEL [1] mode, the vendor specific frames are never tranmitted to the driver, as they are filtered in hci_rx_work().
Allow HCI devices which operate in HCI_USER_CHANNEL mode to receive frames if the HCI device is is HCI_INIT state.
[1] https://www.spinics.net/lists/linux-bluetooth/msg37345.html
--- net/bluetooth/hci_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/bluetooth/hci_core.c +8 -1
@@ -4440,7 +4440,14 @@ static void hci_rx_work(struct work_struct *work)hci_send_to_sock (hdev, skb); } -if (hci_dev_test_flag (hdev,HCI_USER_CHANNEL )) { +/* If the device has been opened in HCI_USER_CHANNEL, +* the userspace has exclusive access to device. +* When device is HCI_INIT, we still need to process +* the data packets to the driver in order +* to complete its setup(). +*/ +if (hci_dev_test_flag (hdev,HCI_USER_CHANNEL ) && + !test_bit (HCI_INIT , &hdev->flags)) {kfree_skb (skb);continue ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/434 bpf/stackmap: Fix deadlock with rq_lock in bpf_get_stack()
In reply to Greg Kroah-HartmanFrom: Song Liu <[email protected]>
[ Upstream commit eac9153f2b584c702cea02c1f1a57d85aa9aea42 ]
bpf stackmap with build-id lookup (BPF_F_STACK_BUILD_ID) can trigger A-A deadlock on rq_lock():
rcu: INFO: rcu_sched detected stalls on CPUs/tasks: [...] Call Trace: try_to_wake_up+0x1ad/0x590 wake_up_q+0x54/0x80 rwsem_wake+0x8a/0xb0 bpf_get_stack+0x13c/0x150 bpf_prog_fbdaf42eded9fe46_on_event+0x5e3/0x1000 bpf_overflow_handler+0x60/0x100 __perf_event_overflow+0x4f/0xf0 perf_swevent_overflow+0x99/0xc0 ___perf_sw_event+0xe7/0x120 __schedule+0x47d/0x620 schedule+0x29/0x90 futex_wait_queue_me+0xb9/0x110 futex_wait+0x139/0x230 do_futex+0x2ac/0xa50 __x64_sys_futex+0x13c/0x180 do_syscall_64+0x42/0x100 entry_SYSCALL_64_after_hwframe+0x44/0xa9
This can be reproduced by:
1. Start a multi-thread program that does parallel mmap() and malloc();
2. taskset the program to 2 CPUs;
3. Attach bpf program to trace_sched_switch and gather stackmap with build-id, e.g. with trace.py from bcc tools:
trace.py -U -p <pid> -s <some-bin,some-lib> t:sched:sched_switch
A sample reproducer is attached at the end.
This could also trigger deadlock with other locks that are nested with rq_lock.
Fix this by checking whether irqs are disabled. Since rq_lock and all other nested locks are irq safe, it is safe to do up_read() when irqs are not disable. If the irqs are disabled, postpone up_read() in irq_work.
Reproducer:
============================ 8< ============================
char *filename;
void *worker(void *p)
{
void *ptr;
int fd;
char *pptr;
fd = open(filename, O_RDONLY);
if (fd < 0)
return NULL;
while (1) {
struct timespec ts = {0, 1000 + rand() % 2000};
ptr = mmap(NULL, 4096 * 64, PROT_READ, MAP_PRIVATE, fd, 0);
usleep(1);
if (ptr == MAP_FAILED) {
printf("failed to mmap\n");
break;
}
munmap(ptr, 4096 * 64);
usleep(1);
pptr = malloc(1);
usleep(1);
pptr[0] = 1;
usleep(1);
free(pptr);
usleep(1);
nanosleep(&ts, NULL);
}
close(fd);
return NULL;
}int main(int argc, char *argv[])
{
void *ptr;
int i;
pthread_t threads[THREAD_COUNT];
if (argc < 2)
return 0;
filename = argv[1];
for (i = 0; i < THREAD_COUNT; i++) {
if (pthread_create(threads + i, NULL, worker, NULL)) {
fprintf(stderr, "Error creating thread\n");
return 0;
}
}
for (i = 0; i < THREAD_COUNT; i++)
pthread_join(threads[i], NULL);
return 0;
}============================ 8< ============================
--- kernel/bpf/stackmap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/bpf/stackmap.c +4 -3
@@ -287,7 +287,7 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs,bool irq_work_busy = false;struct stack_map_irq_work *work =NULL ; -if (in_nmi ()) { +if (irqs_disabled ()) { work =this_cpu_ptr (&up_read_work);if (work->irq_work.flags &IRQ_WORK_BUSY )/* cannot queue more up_read, fallback */
@@ -295,8 +295,9 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs, }/* -* We cannot do up_read() in nmi context. To do build_id lookup -* in nmi context, we need to run up_read() in irq_work. We use +* We cannot do up_read() when the irq is disabled, because of +* risk to deadlock with rq_lock. To do build_id lookup when the +* irqs are disabled, we need to run up_read() in irq_work. We use * a percpu variable to do the irq_work. If the irq_work is * already used by another lookup, we fall back to report ips. *
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/434 x86/mce: Lower throttling MCE messages priority to warning
In reply to Greg Kroah-HartmanFrom: Benjamin Berg <[email protected]>
[ Upstream commit 9c3bafaa1fd88e4dd2dba3735a1f1abb0f2c7bb7 ]
On modern CPUs it is quite normal that the temperature limits are reached and the CPU is throttled. In fact, often the thermal design is not sufficient to cool the CPU at full load and limits can quickly be reached when a burst in load happens. This will even happen with technologies like RAPL limitting the long term power consumption of the package.
Also, these limits are "softer", as Srinivas explains:
"CPU temperature doesn't have to hit max(TjMax) to get these warnings. OEMs ha[ve] an ability to program a threshold where a thermal interrupt can be generated. In some systems the offset is 20C+ (Read only value).
In recent systems, there is another offset on top of it which can be programmed by OS, once some agent can adjust power limits dynamically. By default this is set to low by the firmware, which I guess the prime motivation of Benjamin to submit the patch."
So these messages do not usually indicate a hardware issue (e.g. insufficient cooling). Log them as warnings to avoid confusion about their severity.
[ bp: Massage commit mesage. ]
--- arch/x86/kernel/cpu/mce/therm_throt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/mce/therm_throt.c +1 -1
@@ -188,7 +188,7 @@ static void therm_throt_process(bool new_event, int event, int level)/* if we just entered the thermal event */ if (new_event) {if (event ==THERMAL_THROTTLING_EVENT ) -pr_crit ("CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\n" , +pr_warn ("CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\n" , this_cpu, level ==CORE_LEVEL ?"Core" :"Package" , state->count);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 158/434 drm/amd/display: enable hostvm based on roimmu active for dcn2.1
In reply to Greg Kroah-HartmanFrom: Dmytro Laktyushkin <[email protected]>
[ Upstream commit 48d92e8eda3d9b61978377e7539bfc5958e850cf ]
Enabling hostvm when ROIMMU is not active seems to break GPUVM. This fixes the issue by not enabling hostvm if ROIMMU is not activated.
--- .../drm/amd/display/dc/dcn21/dcn21_hubbub.c | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c +25 -15
@@ -22,6 +22,7 @@* Authors: AMD * */ +#include <linux/delay.h> #include "dm_services.h" #include "dcn20/dcn20_hubbub.h" #include "dcn21_hubbub.h"
@@ -71,30 +72,39 @@ static uint32_t convert_and_clamp(void dcn21_dchvm_init (struct hubbub *hubbub) {struct dcn20_hubbub *hubbub1 =TO_DCN20_HUBBUB (hubbub); +uint32_t riommu_active; +int i;//Init DCHVM block REG_UPDATE (DCHVM_CTRL0 ,HOSTVM_INIT_REQ ,1 );//Poll until RIOMMU_ACTIVE = 1 -//TODO: Figure out interval us and retry count -REG_WAIT (DCHVM_RIOMMU_STAT0 ,RIOMMU_ACTIVE ,1 ,5 ,100 ); +for (i =0 ; i <100 ; i++) { +REG_GET (DCHVM_RIOMMU_STAT0 ,RIOMMU_ACTIVE , &riommu_active); -//Reflect the power status of DCHUBBUB -REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_POWERSTATUS ,1 ); +if (riommu_active) +break ; +else +udelay (5 ); + } + +if (riommu_active) { +//Reflect the power status of DCHUBBUB +REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_POWERSTATUS ,1 ); -//Start rIOMMU prefetching -REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_PREFETCH_REQ ,1 ); +//Start rIOMMU prefetching +REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_PREFETCH_REQ ,1 ); -// Enable dynamic clock gating -REG_UPDATE_4 (DCHVM_CLK_CTRL , -HVM_DISPCLK_R_GATE_DIS ,0 , -HVM_DISPCLK_G_GATE_DIS ,0 , -HVM_DCFCLK_R_GATE_DIS ,0 , -HVM_DCFCLK_G_GATE_DIS ,0 ); +// Enable dynamic clock gating +REG_UPDATE_4 (DCHVM_CLK_CTRL , +HVM_DISPCLK_R_GATE_DIS ,0 , +HVM_DISPCLK_G_GATE_DIS ,0 , +HVM_DCFCLK_R_GATE_DIS ,0 , +HVM_DCFCLK_G_GATE_DIS ,0 ); -//Poll until HOSTVM_PREFETCH_DONE = 1 -//TODO: Figure out interval us and retry count -REG_WAIT (DCHVM_RIOMMU_STAT0 ,HOSTVM_PREFETCH_DONE ,1 ,5 ,100 ); +//Poll until HOSTVM_PREFETCH_DONE = 1 +REG_WAIT (DCHVM_RIOMMU_STAT0 ,HOSTVM_PREFETCH_DONE ,1 ,5 ,100 ); + } } static int hubbub21_init_dchub(struct hubbub *hubbub,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/434 drm/amd/display: fix header for RN clk mgr
In reply to Greg Kroah-HartmanFrom: joseph gravenor <[email protected]>
[ Upstream commit cd83fa1ea9b9431cf1d57ac4179a11bc4393a5b6 ]
[why]
Should always MP0_BASE for any register definition from MP per-IP header files. I belive the reason the linux version of MP1_BASE works is The 0th element of the 0th table of that is identical to the corrisponding value of MP0_BASE in the renoir offset header file. The reason we should only use MP0_BASE is There is only one set of per-IP headers MP that includes all register definitions related to SMU IP block. This IP includes MP0, MP1, MP2 and an ecryption engine that can be used only by MP0. As a result all register definitions from MP file should be based only on MP0_BASE data.
[How]
Change MP1_BASE to MP0_BASE
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c +1 -1
@@ -33,7 +33,7 @@#include "mp/mp_12_0_0_sh_mask.h" #define REG (reg_name) \ - (MP1_BASE.instance[0].segment[mm ## reg_name ## _BASE_IDX] + mm ## reg_name) + (MP0_BASE.instance[0].segment[mm ## reg_name ## _BASE_IDX] + mm ## reg_name)#define FN (reg_name, field) \ FD(reg_name##__##field)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 160/434 drm/amdgpu: fix amdgpu trace event print string format error
In reply to Greg Kroah-HartmanFrom: Kevin Wang <[email protected]>
[ Upstream commit 2c2fdb8bca290c439e383cfb6857b0c65e528964 ]
the trace event print string format error.
(use integer type to handle string)
before:
amdgpu_test_kev-1556 [002] 138.508781: amdgpu_cs_ioctl:
sched_job=8, timeline=gfx_0.0.0, context=177, seqno=1, ring_name=ffff94d01c207bf0, num_ibs=2
after:
amdgpu_test_kev-1506 [004] 370.703783: amdgpu_cs_ioctl:
sched_job=12, timeline=gfx_0.0.0, context=234, seqno=2, ring_name=gfx_0.0.0, num_ibs=1
change trace event list:
1.amdgpu_cs_ioctl
2.amdgpu_sched_run_job
3.amdgpu_ib_pipe_sync
--- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +9 -9
@@ -170,7 +170,7 @@ TRACE_EVENT(amdgpu_cs_ioctl, __field(unsigned int, context) __field(unsigned int, seqno) __field(struct dma_fence *, fence) - __field(char *, ring_name) + __string(ring, to_amdgpu_ring(job->base.sched)->name) __field(u32, num_ibs) ),
@@ -179,12 +179,12 @@ TRACE_EVENT(amdgpu_cs_ioctl,__assign_str (timeline,AMDGPU_JOB_GET_TIMELINE_NAME (job)) __entry->context = job->base.s_fence->finished.context; __entry->seqno = job->base.s_fence->finished.seqno; - __entry->ring_name =to_amdgpu_ring (job->base.sched)->name; +__assign_str (ring,to_amdgpu_ring (job->base.sched)->name) __entry->num_ibs = job->num_ibs; ),TP_printk ("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u" , __entry->sched_job_id,__get_str (timeline), __entry->context, - __entry->seqno, __entry->ring_name, __entry->num_ibs) + __entry->seqno,__get_str (ring), __entry->num_ibs) ); TRACE_EVENT(amdgpu_sched_run_job,
@@ -195,7 +195,7 @@ TRACE_EVENT(amdgpu_sched_run_job, __string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) __field(unsigned int, context) __field(unsigned int, seqno) - __field(char *, ring_name) + __string(ring, to_amdgpu_ring(job->base.sched)->name) __field(u32, num_ibs) ),
@@ -204,12 +204,12 @@ TRACE_EVENT(amdgpu_sched_run_job,__assign_str (timeline,AMDGPU_JOB_GET_TIMELINE_NAME (job)) __entry->context = job->base.s_fence->finished.context; __entry->seqno = job->base.s_fence->finished.seqno; - __entry->ring_name =to_amdgpu_ring (job->base.sched)->name; +__assign_str (ring,to_amdgpu_ring (job->base.sched)->name) __entry->num_ibs = job->num_ibs; ),TP_printk ("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u" , __entry->sched_job_id,__get_str (timeline), __entry->context, - __entry->seqno, __entry->ring_name, __entry->num_ibs) + __entry->seqno,__get_str (ring), __entry->num_ibs) );
@@ -468,7 +468,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, TP_PROTO(struct amdgpu_job *sched_job, struct dma_fence *fence),TP_ARGS (sched_job, fence),TP_STRUCT__entry ( - __field(const char *,name) + __string(ring, sched_job->base.sched->name);__field (uint64_t ,id ) __field(struct dma_fence *, fence) __field(uint64_t, ctx)
@@ -476,14 +476,14 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, ),TP_fast_assign ( - __entry->name = sched_job->base.sched->name; +__assign_str (ring, sched_job->base.sched->name) __entry->id = sched_job->base.id; __entry->fence = fence; __entry->ctx = fence->context; __entry->seqno = fence->seqno; ),TP_printk ("job ring=%s, id=%llu, need pipe sync to fence=%p, context=%llu, seq=%u" , - __entry->name, __entry->id, +__get_str (ring), __entry->id, __entry->fence, __entry->ctx, __entry->seqno) );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/434 staging: iio: ad9834: add a check for devm_clk_get
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit a96de139301385e5992768c0f60240ddfbb33325 ]
ad9834_probe misses a check for devm_clk_get and may cause problems. Add a check like what ad9832 does to fix it.
--- drivers/staging/iio/frequency/ad9834.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/iio/frequency/ad9834.c +4 -0
@@ -417,6 +417,10 @@ static int ad9834_probe(struct spi_device *spi) st =iio_priv (indio_dev);mutex_init (&st->lock); st->mclk =devm_clk_get (&spi->dev,NULL ); +if (IS_ERR (st->mclk)) { + ret =PTR_ERR (st->mclk); + goto error_disable_reg; + } ret =clk_prepare_enable (st->mclk);if (ret) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/434 power: supply: cpcap-battery: Check voltage before orderly_poweroff
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 639c1524da3b273d20c42ff2387d08eb4b12e903 ]
We can get the low voltage interrupt trigger sometimes way too early, maybe because of CPU load spikes. This causes orderly_poweroff() be called too easily.
Let's check the voltage before orderly_poweroff in case it was not yet a permanent condition. We will be getting more interrupts anyways if the condition persists.
Let's also show the measured voltages for low battery and battery empty warnings since we have them.
--- drivers/power/supply/cpcap-battery.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/power/supply/cpcap-battery.c +5 -3
@@ -562,12 +562,14 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)switch (d->action) {case CPCAP_BATTERY_IRQ_ACTION_BATTERY_LOW :if (latest->current_ua >=0 ) -dev_warn (ddata->dev,"Battery low at 3.3V!\n" ); +dev_warn (ddata->dev,"Battery low at %imV!\n" , + latest->voltage /1000 );break ;case CPCAP_BATTERY_IRQ_ACTION_POWEROFF : -if (latest->current_ua >=0 ) { +if (latest->current_ua >=0 && latest->voltage <=3200000 ) {dev_emerg (ddata->dev, -"Battery empty at 3.1V, powering off\n" ); +"Battery empty at %imV, powering off\n" , + latest->voltage /1000 );orderly_poweroff (true); }break ;
Signature · 1 line
2.20.1
Re: [PATCH 5.4 162/434] power: supply: cpcap-battery: Check voltage before orderly_poweroff
Quoted 8 lines · Greg Kroah-Hartman
From: Tony Lindgren <[email protected]>
[ Upstream commit
639c1524da3b273d20c42ff2387d08eb4b12e903]We can get the low voltage interrupt trigger sometimes way too early, maybe because of CPU load spikes. This causes
orderly_poweroff()be called too easily.
Quoted 6 lines
Let's check the voltage before
orderly_poweroffin case it was not yet a permanent condition. We will be getting more interrupts anyways if the condition persists.Let's also show the measured voltages for low battery and battery empty warnings since we have them.
I don't believe this is good idea for stable.
Yes, it may be useful on older batteries, but may cause too late shutdowns on new batteries, or something like that. Certainly needs a lot more testing than it got.
Best regards,
Pavel
Quoted 31 lines
Cc Merlijn Wajer <[email protected]>Cc Pavel Machek <[email protected]>Signed-off-by Tony Lindgren <[email protected]>Signed-off-by Sebastian Reichel <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/power/supply/cpcap-battery.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/power/supply/cpcap-battery.c +5
-3@@ -562,12 +562,14 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)switch (d->action) {case CPCAP_BATTERY_IRQ_ACTION_BATTERY_LOW :if (latest->current_ua >=0 ) -dev_warn (ddata->dev,"Battery low at 3.3V!\n" ); +dev_warn (ddata->dev,"Battery low at %imV!\n" , + latest->voltage /1000 );break ;case CPCAP_BATTERY_IRQ_ACTION_POWEROFF : -if (latest->current_ua >=0 ) { +if (latest->current_ua >=0 && latest->voltage <=3200000 ) {dev_emerg (ddata->dev, -"Battery empty at 3.1V, powering off\n" ); +"Battery empty at %imV, powering off\n" , + latest->voltage /1000 );orderly_poweroff (true); }break ;
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 163/434 perf tests: Disable bp_signal testing for arm64
In reply to Greg Kroah-HartmanFrom: Leo Yan <[email protected]>
[ Upstream commit 6a5f3d94cb69a185b921cb92c39888dc31009acb ]
As there are several discussions for enabling perf breakpoint signal testing on arm64 platform: arm64 needs to rely on single-step to execute the breakpointed instruction and then reinstall the breakpoint exception handler. But if we hook the breakpoint with a signal, the signal handler will do the stepping rather than the breakpointed instruction, this causes infinite loops as below:
Kernel space | Userspace
---------------------------------|--------------------------------
| __test_function() -> hit
| breakpoint
breakpoint_handler() |
`-> user_enable_single_step() |
do_signal() |
| sig_handler() -> Step one
| instruction and
| trap to kernel
single_step_handler() |
`-> reinstall_suspended_bps() |
| __test_function() -> hit
| breakpoint again and
| repeat up flow infinitelyAs Will Deacon mentioned [1]: "that we require the overflow handler to do the stepping on arm/arm64, which is relied upon by GDB/ptrace. The hw_breakpoint code is a complete disaster so my preference would be to rip out the perf part and just implement something directly in ptrace, but it's a pretty horrible job". Though Will commented this on arm architecture, but the comment also can apply on arm64 architecture.
For complete information, I searched online and found a few years back, Wang Nan sent one patch 'arm64: Store breakpoint single step state into pstate' [2]; the patch tried to resolve this issue by avoiding single stepping in signal handler and defer to enable the signal stepping when return to __test_function(). The fixing was not merged due to the concern for missing to handle different usage cases.
Based on the info, the most feasible way is to skip Perf breakpoint signal testing for arm64 and this could avoid the duplicate investigation efforts when people see the failure. This patch skips this case on arm64 platform, which is same with arm architecture.
[1] https://lkml.org/lkml/2018/11/15/205
[2] https://lkml.org/lkml/2015/12/23/477
--- tools/perf/tests/bp_signal.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
tools/perf/tests/bp_signal.c +6 -9
@@ -49,14 +49,6 @@ asm ("__test_function:\n" "incq (%rdi)\n" "ret\n"); -#elif defined (__aarch64__) -extern void __test_function (volatile long *ptr); -asm ( -".globl __test_function\n" -"__test_function:\n" -"str x30, [x0]\n" -"ret\n" ); -#else static void __test_function (volatile long *ptr) {
@@ -302,10 +294,15 @@ bool test__bp_signal_is_supported(void)* stepping into the SIGIO handler and getting stuck on the * breakpointed instruction. * +* Since arm64 has the same issue with arm for the single-step +* handling, this case also gets suck on the breakpointed +* instruction. +* * Just disable the test for these architectures until these * issues are resolved. */ -#if defined(__powerpc__) || defined(__s390x__) || defined(__arm__) +#if defined(__powerpc__) || defined(__s390x__) || defined(__arm__) || \ + defined(__aarch64__)return false;#else return true;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/434 selftests/bpf: Make a copy of subtest name
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit f90415e9600c5227131531c0ed11514a2d3bbe62 ]
test_progs never created a copy of subtest name, rather just stored pointer to whatever string test provided. This is bad as that string might be freed or modified by the end of subtest. Fix this by creating a copy of given subtest name when subtest starts.
--- tools/testing/selftests/bpf/test_progs.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/test_progs.c +12 -5
@@ -20,7 +20,7 @@ struct prog_test_def {bool tested;bool need_cgroup_cleanup; -const char *subtest_name; +char *subtest_name;int subtest_num;/* store counts before subtest started */
@@ -81,16 +81,17 @@ void test__end_subtest()fprintf (env.stdout,"#%d/%d %s:%s\n" , test->test_num, test->subtest_num, test->subtest_name, sub_error_cnt ?"FAIL" :"OK" ); + +free (test->subtest_name); + test->subtest_name =NULL ; }bool test__start_subtest (const char *name) {struct prog_test_def *test = env.test; -if (test->subtest_name) { +if (test->subtest_name)test__end_subtest (); - test->subtest_name =NULL ; - } test->subtest_num++;
@@ -104,7 +105,13 @@ bool test__start_subtest(const char *name)if (!should_run (&env.subtest_selector, test->subtest_num, name))return false; - test->subtest_name = name; + test->subtest_name =strdup (name); +if (!test->subtest_name) { +fprintf (env.stderr, +"Subtest #%d: failed to copy subtest name!\n" , + test->subtest_num); +return false; + } env.test->old_error_cnt = env.test->error_cnt;return true;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 165/434 net: hns3: log and clear hardware error after reset complete
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 4fdd0bca6152aa201898454e63cbb255a18ae6e9 ]
When device is resetting, the CMDQ service may be stopped until reset completed. If a new RAS error occurs at this moment, it will no be able to clear the RAS source. This patch fixes it by clear the RAS source after reset complete.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +3 -0
@@ -9443,6 +9443,9 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev)return ret; } +/* Log and clear the hw errors those already occurred */ +hclge_handle_all_hns_hw_errors (ae_dev); +/* Re-enable the hw error interrupts because * the interrupts get disabled on global reset. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 166/434 RDMA/hns: Fix wrong parameters when initial mtt of srq->idx_que
In reply to Greg Kroah-HartmanFrom: Weihang Li <[email protected]>
[ Upstream commit e8a07de57ea4ca7c2d604871c52826e66899fc70 ]
The parameters npages used to initial mtt of srq->idx_que shouldn't be same with srq's. And page_shift should be calculated from idx_buf_pg_sz. This patch fixes above issues and use field named npage and page_shift in hns_roce_buf instead of two temporary variables to let us use them anywhere.
--- drivers/infiniband/hw/hns/hns_roce_srq.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/infiniband/hw/hns/hns_roce_srq.c +14 -10
@@ -180,8 +180,7 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata, {struct hns_roce_dev *hr_dev =to_hr_dev (srq->ibsrq.device);struct hns_roce_ib_create_srq ucmd; -u32 page_shift; -u32 npages; +struct hns_roce_buf *buf;int ret;if (ib_copy_from_udata (&ucmd, udata,sizeof (ucmd)))
@@ -191,11 +190,13 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata,if (IS_ERR (srq->umem))return PTR_ERR (srq->umem); - npages = (ib_umem_page_count (srq->umem) + - (1 << hr_dev->caps.srqwqe_buf_pg_sz) -1 ) / - (1 << hr_dev->caps.srqwqe_buf_pg_sz); - page_shift =PAGE_SHIFT + hr_dev->caps.srqwqe_buf_pg_sz; - ret =hns_roce_mtt_init (hr_dev, npages, page_shift, &srq->mtt); + buf = &srq->buf; + buf->npages = (ib_umem_page_count (srq->umem) + + (1 << hr_dev->caps.srqwqe_buf_pg_sz) -1 ) / + (1 << hr_dev->caps.srqwqe_buf_pg_sz); + buf->page_shift =PAGE_SHIFT + hr_dev->caps.srqwqe_buf_pg_sz; + ret =hns_roce_mtt_init (hr_dev, buf->npages, buf->page_shift, + &srq->mtt);if (ret) goto err_user_buf;
@@ -212,9 +213,12 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata, goto err_user_srq_mtt; } - ret =hns_roce_mtt_init (hr_dev,ib_umem_page_count (srq->idx_que.umem), -PAGE_SHIFT , &srq->idx_que.mtt); - + buf = &srq->idx_que.idx_buf; + buf->npages =DIV_ROUND_UP (ib_umem_page_count (srq->idx_que.umem), +1 << hr_dev->caps.idx_buf_pg_sz); + buf->page_shift =PAGE_SHIFT + hr_dev->caps.idx_buf_pg_sz; + ret =hns_roce_mtt_init (hr_dev, buf->npages, buf->page_shift, + &srq->idx_que.mtt);if (ret) {dev_err (hr_dev->dev,"hns_roce_mtt_init error for idx que\n" ); goto err_user_idx_mtt;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 167/434 drm/gma500: fix memory disclosures due to uninitialized bytes
In reply to Greg Kroah-HartmanFrom: Kangjie Lu <[email protected]>
[ Upstream commit ec3b7b6eb8c90b52f61adff11b6db7a8db34de19 ]
"clock" may be copied to "best_clock". Initializing best_clock is not sufficient. The fix initializes clock as well to avoid memory disclosures and informaiton leaks.
--- drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/gma500/oaktrail_crtc.c +2 -0
@@ -129,6 +129,7 @@ static bool mrst_sdvo_find_best_pll(const struct gma_limit_t *limit,s32 freq_error, min_error =100000 ;memset (best_clock,0 ,sizeof (*best_clock)); +memset (&clock,0 ,sizeof (clock));for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) { for (clock.n = limit->n.min; clock.n <= limit->n.max;
@@ -185,6 +186,7 @@ static bool mrst_lvds_find_best_pll(const struct gma_limit_t *limit,int err = target;memset (best_clock,0 ,sizeof (*best_clock)); +memset (&clock,0 ,sizeof (clock));for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) { for (clock.p1 = limit->p1.min; clock.p1 <= limit->p1.max;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 168/434 ASoC: soc-pcm: fixup dpcm_prune_paths() loop continue
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit bed646dc3f7bcec91178c278deaf969cce0700a8 ]
dpcm_prune_paths() is checking widget at 2 parts.
(A) is for CPU, (B) is for Codec.
If we focus to (A) part, continue at (a) is for (1) loop. But, if we focus to (B) part, continue at (b) is for (2) loop, not for (1). This is bug.
This patch fixup this issue.
static int dpcm_prune_paths(...)
{
...
(1) for_each_dpcm_be(fe, stream, dpcm) {
... ^ widget = dai_get_widget(...);
|
(A) if (widget && widget_in_list(...))
| (a) continue;
v
^ (2) for_each_rtd_codec_dai(...) {
| widget = dai_get_widget(...);
(B)
| if (widget && widget_in_list(...))
v (b) continue; } ...
--- sound/soc/soc-pcm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/soc-pcm.c +5 -1
@@ -1385,6 +1385,7 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,struct snd_soc_dapm_widget *widget;struct snd_soc_dai *dai;int prune =0 ; +int do_prune;/* Destroy any old FE <--> BE connections */ for_each_dpcm_be (fe, stream, dpcm) {
@@ -1398,13 +1399,16 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,continue ;/* is there a valid CODEC DAI widget for this BE */ + do_prune =1 ;for_each_rtd_codec_dai (dpcm->be, i, dai) { widget =dai_get_widget (dai, stream);/* prune the BE if it's no longer in our active list */ if (widget &&widget_in_list (list, widget)) -continue ; + do_prune =0 ; } +if (!do_prune) +continue ; dev_dbg(fe->dev, "ASoC: pruning %s BE %s for %s\n", stream ? "capture" : "playback",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 169/434 rtl8xxxu: fix RTL8723BU connection failure issue after warm reboot
In reply to Greg Kroah-HartmanFrom: Chris Chiu <[email protected]>
[ Upstream commit 0eeb91ade90ce06d2fa1e2fcb55e3316b64c203c ]
The RTL8723BU has problems connecting to AP after each warm reboot. Sometimes it returns no scan result, and in most cases, it fails the authentication for unknown reason. However, it works totally fine after cold reboot.
Compare the value of register SYS_CR and SYS_CLK_MAC_CLK_ENABLE for cold reboot and warm reboot, the registers imply that the MAC is already powered and thus some procedures are skipped during driver initialization. Double checked the vendor driver, it reads the SYS_CR and SYS_CLK_MAC_CLK_ENABLE also but doesn't skip any during initialization based on them. This commit only tells the RTL8723BU to do full initialization without checking MAC status.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 1 + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 +++ 3 files changed, 5 insertions(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +1 -0
@@ -1341,6 +1341,7 @@ struct rtl8xxxu_fileops { u8 has_s0s1:1; u8 has_tx_report:1; u8 gen2_thermal_meter:1; + u8 needs_full_init:1;u32 adda_1t_init;u32 adda_1t_path_on;u32 adda_2t_path_on_a;
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +1 -0
@@ -1670,6 +1670,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops = { .has_s0s1 = 1, .has_tx_report = 1, .gen2_thermal_meter = 1, + .needs_full_init = 1, .adda_1t_init = 0x01c00014, .adda_1t_path_on = 0x01c00014, .adda_2t_path_on_a = 0x01c00014,
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +3 -0
@@ -3902,6 +3902,9 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)else macpower = true; +if (fops->needs_full_init) + macpower = false; + ret = fops->power_on (priv);if (ret <0 ) {dev_warn (dev,"%s: Failed power on\n" , __func__);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 170/434 RDMA/siw: Fix SQ/RQ drain logic
In reply to Greg Kroah-HartmanFrom: Bernard Metzler <[email protected]>
[ Upstream commit cf049bb31f7101d9672eaf97ade4fdd5171ddf26 ]
Storage ULPs (e.g. iSER & NVMeOF) use ib_drain_qp() to drain QP/CQ. Current SIW's own drain routines do not properly wait until all SQ/RQ elements are completed and reaped from the CQ. This may cause touch after free issues. New logic relies on generic __ib_drain_sq()/__ib_drain_rq() posting a final work request, which SIW immediately flushes to CQ.
--- drivers/infiniband/sw/siw/siw_main.c | 20 ---- drivers/infiniband/sw/siw/siw_verbs.c | 144 ++++++++++++++++++++++---- 2 files changed, 122 insertions(+), 42 deletions(-)
drivers/infiniband/sw/siw/siw_main.c +0 -20
@@ -248,24 +248,6 @@ static struct ib_qp *siw_get_base_qp(struct ib_device *base_dev, int id)return NULL ; } -static void siw_verbs_sq_flush (struct ib_qp *base_qp) -{ -struct siw_qp *qp =to_siw_qp (base_qp); - -down_write (&qp->state_lock); -siw_sq_flush (qp); -up_write (&qp->state_lock); -} - -static void siw_verbs_rq_flush (struct ib_qp *base_qp) -{ -struct siw_qp *qp =to_siw_qp (base_qp); - -down_write (&qp->state_lock); -siw_rq_flush (qp); -up_write (&qp->state_lock); -} -static const struct ib_device_ops siw_device_ops = { .owner =THIS_MODULE , .uverbs_abi_ver =SIW_ABI_VERSION ,
@@ -284,8 +266,6 @@ static const struct ib_device_ops siw_device_ops = { .destroy_cq = siw_destroy_cq, .destroy_qp = siw_destroy_qp, .destroy_srq = siw_destroy_srq, - .drain_rq = siw_verbs_rq_flush, - .drain_sq = siw_verbs_sq_flush, .get_dma_mr = siw_get_dma_mr, .get_port_immutable = siw_get_port_immutable, .iw_accept = siw_accept,
drivers/infiniband/sw/siw/siw_verbs.c +122 -22
178 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 171/434 ipmi: Dont allow device module unload when in use
In reply to Greg Kroah-HartmanFrom: Corey Minyard <[email protected]>
[ Upstream commit cbb79863fc3175ed5ac506465948b02a893a8235 ]
If something has the IPMI driver open, don't allow the device module to be unloaded. Before it would unload and the user would get errors on use.
This change is made on user request, and it makes it consistent with the I2C driver, which has the same behavior.
It does change things a little bit with respect to kernel users. If the ACPI or IPMI watchdog (or any other kernel user) has created a user, then the device module cannot be unloaded. Before it could be unloaded,
This does not affect hot-plug. If the device goes away (it's on something removable that is removed or is hot-removed via sysfs) then it still behaves as it did before.
--- drivers/char/ipmi/ipmi_msghandler.c | 23 ++++++++++++++++------- include/linux/ipmi_smi.h | 12 ++++++++---- 2 files changed, 24 insertions(+), 11 deletions(-)
drivers/char/ipmi/ipmi_msghandler.c +16 -7
@@ -448,6 +448,8 @@ enum ipmi_stat_indexes {#define IPMI_IPMB_NUM_SEQ 64struct ipmi_smi { +struct module *owner; +/* What interface number are we? */ int intf_num;
@@ -1220,6 +1222,11 @@ int ipmi_create_user(unsigned int if_num,if (rv) goto out_kfree; +if (!try_module_get (intf->owner)) { + rv = -ENODEV ; + goto out_kfree; + } +/* Note that each existing user holds a refcount to the interface. */ kref_get (&intf->refcount);
@@ -1349,6 +1356,7 @@ static void _ipmi_destroy_user(struct ipmi_user *user) }kref_put (&intf->refcount, intf_free); +module_put (intf->owner); }int ipmi_destroy_user (struct ipmi_user *user)
@@ -2459,7 +2467,7 @@ static int __get_device_id(struct ipmi_smi *intf, struct bmc_device *bmc)* been recently fetched, this will just use the cached data. Otherwise * it will run a new fetch. * -* Except for the first time this is called (in ipmi_register_smi()), +* Except for the first time this is called (in ipmi_add_smi()), * this will always return good data; */ static int __bmc_get_device_id(struct ipmi_smi *intf, struct bmc_device *bmc,
@@ -3377,10 +3385,11 @@ static void redo_bmc_reg(struct work_struct *work)kref_put (&intf->refcount, intf_free); } -int ipmi_register_smi (const struct ipmi_smi_handlers *handlers, -void *send_info, -struct device *si_dev, -unsigned char slave_addr) +int ipmi_add_smi (struct module *owner, +const struct ipmi_smi_handlers *handlers, +void *send_info, +struct device *si_dev, +unsigned char slave_addr) {int i, j;int rv;
@@ -3406,7 +3415,7 @@ int ipmi_register_smi(const struct ipmi_smi_handlers *handlers,return rv; } - + intf->owner = owner; intf->bmc = &intf->tmp_bmc;INIT_LIST_HEAD (&intf->bmc->intfs);mutex_init (&intf->bmc->dyn_mutex);
@@ -3514,7 +3523,7 @@ int ipmi_register_smi(const struct ipmi_smi_handlers *handlers,return rv; } -EXPORT_SYMBOL (ipmi_register_smi); +EXPORT_SYMBOL (ipmi_add_smi); static void deliver_smi_err_response(struct ipmi_smi *intf, struct ipmi_smi_msg *msg,
include/linux/ipmi_smi.h +8 -4
@@ -224,10 +224,14 @@ static inline int ipmi_demangle_device_id(uint8_t netfn, uint8_t cmd,* is called, and the lower layer must get the interface from that * call. */ -int ipmi_register_smi (const struct ipmi_smi_handlers *handlers, -void *send_info, -struct device *dev, -unsigned char slave_addr); +int ipmi_add_smi (struct module *owner, +const struct ipmi_smi_handlers *handlers, +void *send_info, +struct device *dev, +unsigned char slave_addr); + +#define ipmi_register_smi (handlers, send_info, dev, slave_addr) \ + ipmi_add_smi(THIS_MODULE, handlers, send_info, dev, slave_addr)/* * Remove a low-level interface from the IPMI driver. This will
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 172/434 x86/ioapic: Prevent inconsistent state when moving an interrupt
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit df4393424af3fbdcd5c404077176082a8ce459c4 ]
There is an issue with threaded interrupts which are marked ONESHOT and using the fasteoi handler:
if (IS_ONESHOT())
mask_irq();
....
cond_unmask_eoi_irq()
chip->irq_eoi();
if (setaffinity_pending) {
mask_ioapic();
...
move_affinity();
unmask_ioapic();
}So if setaffinity is pending the interrupt will be moved and then unconditionally unmasked at the ioapic level, which is wrong in two aspects:
1) It should be kept masked up to the point where the threaded handler finished.
2) The physical chip state and the software masked state are inconsistent
Guard both the mask and the unmask with a check for the software masked state. If the line is marked masked then the ioapic line is also masked, so both mask_ioapic() and unmask_ioapic() can be skipped safely.
--- arch/x86/kernel/apic/io_apic.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/io_apic.c +6 -3
@@ -1727,9 +1727,10 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)static inline bool ioapic_irqd_mask (struct irq_data *data) { -/* If we are moving the irq we need to mask it */ +/* If we are moving the IRQ we need to mask it */ if (unlikely (irqd_is_setaffinity_pending (data))) { -mask_ioapic_irq (data); +if (!irqd_irq_masked (data)) +mask_ioapic_irq (data);return true; }return false;
@@ -1766,7 +1767,9 @@ static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked)*/ if (!io_apic_level_ack_pending (data->chip_data))irq_move_masked_irq (data); - unmask_ioapic_irq(data); +/* If the IRQ is masked in the core, leave it: */ +if (!irqd_irq_masked (data)) + unmask_ioapic_irq(data); } }#else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 173/434 media: cedrus: Fix undefined shift with a SHIFT_AND_MASK_BITS macro
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 06eff2150d4db991ca236f3d05a9dc0101475aea ]
We need to shift and mask values at different occasions to fill up cedrus registers. This was done using macros that don't explicitly treat arguments as unsigned, leading to possibly undefined behavior.
Introduce the SHIFT_AND_MASK_BITS macro and use it where possible. In cases where it doesn't apply as-is, explicitly cast to unsigned instead.
This macro should be moved to include/linux/bits.h eventually.
--- .../staging/media/sunxi/cedrus/cedrus_regs.h | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/staging/media/sunxi/cedrus/cedrus_regs.h +17 -14
@@ -10,6 +10,9 @@#ifndef _CEDRUS_REGS_H_#define _CEDRUS_REGS_H_ +#define SHIFT_AND_MASK_BITS (v, h, l) \ + (((unsigned long)(v) << (l)) & GENMASK(h, l)) +/* * Common acronyms and contractions used in register descriptions: * * VLD : Variable-Length Decoder
@@ -37,8 +40,8 @@#define VE_PRIMARY_CHROMA_BUF_LEN 0xc4#define VE_PRIMARY_FB_LINE_STRIDE 0xc8 -#define VE_PRIMARY_FB_LINE_STRIDE_CHROMA (s) (((s) << 16) & GENMASK(31, 16)) -#define VE_PRIMARY_FB_LINE_STRIDE_LUMA (s) (((s) << 0) & GENMASK(15, 0)) +#define VE_PRIMARY_FB_LINE_STRIDE_CHROMA (s) SHIFT_AND_MASK_BITS(s, 31, 16) +#define VE_PRIMARY_FB_LINE_STRIDE_LUMA (s) SHIFT_AND_MASK_BITS(s, 15, 0)#define VE_CHROMA_BUF_LEN 0xe8
@@ -46,7 +49,7 @@#define VE_SECONDARY_OUT_FMT_EXT (0x01 << 30)#define VE_SECONDARY_OUT_FMT_YU12 (0x02 << 30)#define VE_SECONDARY_OUT_FMT_YV12 (0x03 << 30) -#define VE_CHROMA_BUF_LEN_SDRT (l) ((l) & GENMASK(27, 0)) +#define VE_CHROMA_BUF_LEN_SDRT (l) SHIFT_AND_MASK_BITS(l, 27, 0)#define VE_PRIMARY_OUT_FMT 0xec
@@ -69,15 +72,15 @@#define VE_DEC_MPEG_MP12HDR (VE_ENGINE_DEC_MPEG + 0x00) -#define VE_DEC_MPEG_MP12HDR_SLICE_TYPE (t) (((t) << 28) & GENMASK(30, 28)) +#define VE_DEC_MPEG_MP12HDR_SLICE_TYPE (t) SHIFT_AND_MASK_BITS(t, 30, 28)#define VE_DEC_MPEG_MP12HDR_F_CODE_SHIFT (x, y) (24 - 4 * (y) - 8 * (x))#define VE_DEC_MPEG_MP12HDR_F_CODE (__x, __y, __v) \ - (((__v) & GENMASK(3, 0)) << VE_DEC_MPEG_MP12HDR_F_CODE_SHIFT(__x, __y)) + (((unsigned long)(__v) & GENMASK(3, 0)) << VE_DEC_MPEG_MP12HDR_F_CODE_SHIFT(__x, __y))#define VE_DEC_MPEG_MP12HDR_INTRA_DC_PRECISION (p) \ - (((p) << 10) & GENMASK(11, 10)) + SHIFT_AND_MASK_BITS(p, 11, 10)#define VE_DEC_MPEG_MP12HDR_INTRA_PICTURE_STRUCTURE (s) \ - (((s) << 8) & GENMASK(9, 8)) + SHIFT_AND_MASK_BITS(s, 9, 8)#define VE_DEC_MPEG_MP12HDR_TOP_FIELD_FIRST (v) \ ((v) ? BIT(7) : 0)#define VE_DEC_MPEG_MP12HDR_FRAME_PRED_FRAME_DCT (v) \
@@ -98,19 +101,19 @@#define VE_DEC_MPEG_PICCODEDSIZE (VE_ENGINE_DEC_MPEG + 0x08)#define VE_DEC_MPEG_PICCODEDSIZE_WIDTH (w) \ - ((DIV_ROUND_UP((w), 16) << 8) & GENMASK(15, 8)) + SHIFT_AND_MASK_BITS(DIV_ROUND_UP((w), 16), 15, 8)#define VE_DEC_MPEG_PICCODEDSIZE_HEIGHT (h) \ - ((DIV_ROUND_UP((h), 16) << 0) & GENMASK(7, 0)) + SHIFT_AND_MASK_BITS(DIV_ROUND_UP((h), 16), 7, 0)#define VE_DEC_MPEG_PICBOUNDSIZE (VE_ENGINE_DEC_MPEG + 0x0c) -#define VE_DEC_MPEG_PICBOUNDSIZE_WIDTH (w) (((w) << 16) & GENMASK(27, 16)) -#define VE_DEC_MPEG_PICBOUNDSIZE_HEIGHT (h) (((h) << 0) & GENMASK(11, 0)) +#define VE_DEC_MPEG_PICBOUNDSIZE_WIDTH (w) SHIFT_AND_MASK_BITS(w, 27, 16) +#define VE_DEC_MPEG_PICBOUNDSIZE_HEIGHT (h) SHIFT_AND_MASK_BITS(h, 11, 0)#define VE_DEC_MPEG_MBADDR (VE_ENGINE_DEC_MPEG + 0x10) -#define VE_DEC_MPEG_MBADDR_X (w) (((w) << 8) & GENMASK(15, 8)) -#define VE_DEC_MPEG_MBADDR_Y (h) (((h) << 0) & GENMASK(7, 0)) +#define VE_DEC_MPEG_MBADDR_X (w) SHIFT_AND_MASK_BITS(w, 15, 8) +#define VE_DEC_MPEG_MBADDR_Y (h) SHIFT_AND_MASK_BITS(h, 7, 0)#define VE_DEC_MPEG_CTRL (VE_ENGINE_DEC_MPEG + 0x14)
@@ -225,7 +228,7 @@#define VE_DEC_MPEG_IQMINPUT_FLAG_INTRA (0x01 << 14)#define VE_DEC_MPEG_IQMINPUT_FLAG_NON_INTRA (0x00 << 14)#define VE_DEC_MPEG_IQMINPUT_WEIGHT (i, v) \ - (((v) & GENMASK(7, 0)) | (((i) << 8) & GENMASK(13, 8))) + (SHIFT_AND_MASK_BITS(i, 13, 8) | SHIFT_AND_MASK_BITS(v, 7, 0))#define VE_DEC_MPEG_ERROR (VE_ENGINE_DEC_MPEG + 0xc4)#define VE_DEC_MPEG_CRTMBADDR (VE_ENGINE_DEC_MPEG + 0xc8)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 174/434 media: aspeed: set hsync and vsync polarities to normal before starting mode detection
In reply to Greg Kroah-HartmanFrom: Jae Hyun Yoo <[email protected]>
[ Upstream commit 5b3f3c41c5c791c1c22cd91655e7ef4b2a1dff7c ]
Sometimes it detects a weird resolution such as 1024x287 when the actual resolution is 1024x768. To resolve such an issue, this commit adds clearing for hsync and vsync polarity register bits at the beginning of the first mode detection. This is recommended in the datasheet.
--- drivers/media/platform/aspeed-video.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/aspeed-video.c +2 -0
@@ -741,6 +741,8 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) }set_bit (VIDEO_RES_DETECT , &video->flags); +aspeed_video_update (video,VE_CTRL , +VE_CTRL_VSYNC_POL |VE_CTRL_HSYNC_POL ,0 );aspeed_video_enable_mode_detect (video); rc = wait_event_interruptible_timeout(video->wait,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 175/434 drm/nouveau: Dont grab runtime PM refs for HPD IRQs
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
[ Upstream commit 09e530657e1c982d3dbc5e4302bf9207950c3d0a ]
In order for suspend/resume reprobing to work, we need to be able to perform sideband communications during suspend/resume, along with runtime PM suspend/resume. In order to do so, we also need to make sure that nouveau doesn't bother grabbing a runtime PM reference to do so, since otherwise we'll start deadlocking runtime PM again.
Note that we weren't able to do this before, because of the DP MST helpers processing UP requests from topologies in the same context as drm_dp_mst_hpd_irq() which would have caused us to open ourselves up to receiving hotplug events and deadlocking with runtime suspend/resume. Now that those requests are handled asynchronously, this change should be completely safe.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 33 +++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +17 -16
@@ -1131,6 +1131,16 @@ nouveau_connector_hotplug(struct nvif_notify *notify)const char *name = connector->name;struct nouveau_encoder *nv_encoder;int ret; +bool plugged = (rep->mask !=NVIF_NOTIFY_CONN_V0_UNPLUG ); + +if (rep->mask &NVIF_NOTIFY_CONN_V0_IRQ ) { +NV_DEBUG (drm,"service %s\n" , name); +drm_dp_cec_irq (&nv_connector->aux); +if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) +nv50_mstm_service (nv_encoder->dp.mstm); + +return NVIF_NOTIFY_KEEP ; + } ret =pm_runtime_get (drm->dev->dev);if (ret ==0 ) {
@@ -1151,25 +1161,16 @@ nouveau_connector_hotplug(struct nvif_notify *notify)return NVIF_NOTIFY_DROP ; } -if (rep->mask &NVIF_NOTIFY_CONN_V0_IRQ ) { -NV_DEBUG (drm,"service %s\n" , name); -drm_dp_cec_irq (&nv_connector->aux); -if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) -nv50_mstm_service (nv_encoder->dp.mstm); - }else { -bool plugged = (rep->mask !=NVIF_NOTIFY_CONN_V0_UNPLUG ); - +if (!plugged) +drm_dp_cec_unset_edid (&nv_connector->aux); +NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , name); +if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) {if (!plugged) -drm_dp_cec_unset_edid (&nv_connector->aux); -NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , name); -if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) { -if (!plugged) -nv50_mstm_remove (nv_encoder->dp.mstm); - } - -drm_helper_hpd_irq_event (connector->dev); +nv50_mstm_remove (nv_encoder->dp.mstm); } +drm_helper_hpd_irq_event (connector->dev); +pm_runtime_mark_last_busy (drm->dev->dev);pm_runtime_put_autosuspend (drm->dev->dev);return NVIF_NOTIFY_KEEP ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 176/434 media: ov6650: Fix stored frame interval not in sync with hardware
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 57822068dd120386b98891cb151dc20107b63ba7 ]
The driver stores a frame interval value supposed to be in line with hardware state in a device private structure. Since the driver initial submission, the respective field of the structure has never been initialised on device probe. Moreover, if updated from .s_frame_interval(), a new value is stored before it is applied on hardware. If an error occurs during device update, the stored value may no longer reflect hardware state and consecutive calls to .g_frame_interval() may return incorrect information.
Assuming a failed update of the device means its actual state hasn't changed, update the frame interval field of the device private structure with a new value only after it is successfully applied on hardware so it always reflects actual hardware state to the extent possible. Also, initialise the field with hardware default frame interval on device probe.
--- drivers/media/i2c/ov6650.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/media/i2c/ov6650.c +12 -9
@@ -130,6 +130,7 @@#define CLKRC_24MHz 0xc0#define CLKRC_DIV_MASK 0x3f#define GET_CLKRC_DIV (x) (((x) & CLKRC_DIV_MASK) + 1) +#define DEF_CLKRC 0x00#define COMA_RESET BIT(7)#define COMA_QCIF BIT(5)
@@ -758,19 +759,17 @@ static int ov6650_s_frame_interval(struct v4l2_subdev *sd,else if (div >GET_CLKRC_DIV (CLKRC_DIV_MASK )) div =GET_CLKRC_DIV (CLKRC_DIV_MASK ); -/* -* Keep result to be used as tpf limit -* for subsequent clock divider calculations -*/ - priv->tpf.numerator = div; - priv->tpf.denominator =FRAME_RATE_MAX ; + tpf->numerator = div; + tpf->denominator =FRAME_RATE_MAX ; - clkrc =to_clkrc (&priv->tpf, priv->pclk_limit, priv->pclk_max); + clkrc =to_clkrc (tpf, priv->pclk_limit, priv->pclk_max); ret =ov6650_reg_rmw (client,REG_CLKRC , clkrc,CLKRC_DIV_MASK );if (!ret) { - tpf->numerator =GET_CLKRC_DIV (clkrc); - tpf->denominator =FRAME_RATE_MAX ; + priv->tpf.numerator =GET_CLKRC_DIV (clkrc); + priv->tpf.denominator =FRAME_RATE_MAX ; + + *tpf = priv->tpf; }return ret;
@@ -1011,6 +1010,10 @@ static int ov6650_probe(struct i2c_client *client, priv->code =MEDIA_BUS_FMT_YUYV8_2X8 ; priv->colorspace =V4L2_COLORSPACE_JPEG ; +/* Hardware default frame interval */ + priv->tpf.numerator =GET_CLKRC_DIV (DEF_CLKRC ); + priv->tpf.denominator =FRAME_RATE_MAX ; + priv->subdev.internal_ops = &ov6650_internal_ops; ret =v4l2_async_register_subdev (&priv->subdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 177/434 media: ad5820: Define entity function
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda Delgado <[email protected]>
[ Upstream commit 801ef7c4919efba6b96b5aed1e72844ca69e26d3 ]
Without this patch, media_device_register_entity throws a warning:
dev_warn(mdev->dev,
"Entity type for entity %s was not initialized!\n", entity->name);
--- drivers/media/i2c/ad5820.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/ad5820.c +1 -0
@@ -309,6 +309,7 @@ static int ad5820_probe(struct i2c_client *client,v4l2_i2c_subdev_init (&coil->subdev, client, &ad5820_ops); coil->subdev.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; coil->subdev.internal_ops = &ad5820_internal_ops; + coil->subdev.entity.function =MEDIA_ENT_F_LENS ;strscpy (coil->subdev.name,"ad5820 focus" ,sizeof (coil->subdev.name)); ret =media_entity_pads_init (&coil->subdev.entity,0 ,NULL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 178/434 media: ov5640: Make 2592x1944 mode only available at 15 fps
In reply to Greg Kroah-HartmanFrom: Benoit Parrot <[email protected]>
[ Upstream commit 981e445454531c9d5ac5d3fa8c0f1bd55262d001 ]
The sensor data sheet clearly state that 2592x1944 only works at 15 fps make sure we don't try to miss configure the pll out of acceptable range.
--- drivers/media/i2c/ov5640.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/ov5640.c +5 -0
@@ -1611,6 +1611,11 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr, !(mode->hact == 640 && mode->vact == 480))return NULL ; +/* 2592x1944 only works at 15fps max */ +if ((mode->hact ==2592 && mode->vact ==1944 ) && + fr >OV5640_15_FPS ) +return NULL ; +return mode; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 179/434 media: st-mipid02: add a check for devm_gpiod_get_optional
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 61c03b631b74a38ab53753f3ee971a55886d4843 ]
mipid02_probe misses a check for devm_gpiod_get_optional and may miss the failure.
Add a check to fix the problem.
--- drivers/media/i2c/st-mipid02.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/st-mipid02.c +5 -0
@@ -971,6 +971,11 @@ static int mipid02_probe(struct i2c_client *client) bridge->reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_HIGH ); +if (IS_ERR (bridge->reset_gpio)) { +dev_err (dev,"failed to get reset GPIO\n" ); +return PTR_ERR (bridge->reset_gpio); + } + ret =mipid02_get_regulators (bridge);if (ret) {dev_err (dev,"failed to get regulators %d" , ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 180/434 media: imx7-mipi-csis: Add a check for devm_regulator_get
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit a0219deefe9ee5006a28d48522f76b217d198c51 ]
devm_regulator_get may return an error but mipi_csis_phy_init misses a check for it.
This may lead to problems when regulator_set_voltage uses the unchecked pointer.
This patch adds a check for devm_regulator_get to avoid potential risk.
--- drivers/staging/media/imx/imx7-mipi-csis.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +6 -1
@@ -350,6 +350,8 @@ static void mipi_csis_sw_reset(struct csi_state *state)static int mipi_csis_phy_init (struct csi_state *state) { state->mipi_phy_regulator =devm_regulator_get (state->dev,"phy" ); +if (IS_ERR (state->mipi_phy_regulator)) +return PTR_ERR (state->mipi_phy_regulator);return regulator_set_voltage (state->mipi_phy_regulator,1000000 ,1000000 );
@@ -966,7 +968,10 @@ static int mipi_csis_probe(struct platform_device *pdev)return ret; } -mipi_csis_phy_init (state); + ret =mipi_csis_phy_init (state); +if (ret <0 ) +return ret; +mipi_csis_phy_reset (state); mem_res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 181/434 media: aspeed: clear garbage interrupts
In reply to Greg Kroah-HartmanFrom: Jae Hyun Yoo <[email protected]>
[ Upstream commit 65d270acb2d662c3346793663ac3a759eb4491b8 ]
CAPTURE_COMPLETE and FRAME_COMPLETE interrupts come even when these are disabled in the VE_INTERRUPT_CTRL register and eventually this behavior causes disabling irq itself like below:
[10055.108784] irq 23: nobody cared (try booting with the "irqpoll" option) [10055.115525] CPU: 0 PID: 331 Comm: swampd Tainted: G W 5.3.0-4fde000-dirty-d683e2e #1 [10055.124565] Hardware name: Generic DT based system [10055.129355] Backtrace: [10055.131854] [<80107d7c>] (dump_backtrace) from [<80107fb0>] (show_stack+0x20/0x24) [10055.139431] r7:00000017 r6:00000001 r5:00000000 r4:9d51dc00 [10055.145120] [<80107f90>] (show_stack) from [<8074bf50>] (dump_stack+0x20/0x28) [10055.152361] [<8074bf30>] (dump_stack) from [<80150ffc>] (__report_bad_irq+0x40/0xc0) [10055.160109] [<80150fbc>] (__report_bad_irq) from [<80150f2c>] (note_interrupt+0x23c/0x294) [10055.168374] r9:015b6e60 r8:00000000 r7:00000017 r6:00000001 r5:00000000 r4:9d51dc00 [10055.176136] [<80150cf0>] (note_interrupt) from [<8014df1c>] (handle_irq_event_percpu+0x88/0x98) [10055.184835] r10:7eff7910 r9:015b6e60 r8:00000000 r7:9d417600 r6:00000001 r5:00000002 [10055.192657] r4:9d51dc00 r3:00000000 [10055.196248] [<8014de94>] (handle_irq_event_percpu) from [<8014df64>] (handle_irq_event+0x38/0x4c) [10055.205113] r5:80b56d50 r4:9d51dc00 [10055.208697] [<8014df2c>] (handle_irq_event) from [<80151f1c>] (handle_level_irq+0xbc/0x12c) [10055.217037] r5:80b56d50 r4:9d51dc00 [10055.220623] [<80151e60>] (handle_level_irq) from [<8014d4b8>] (generic_handle_irq+0x30/0x44) [10055.229052] r5:80b56d50 r4:00000017 [10055.232648] [<8014d488>] (generic_handle_irq) from [<8014d524>] (__handle_domain_irq+0x58/0xb4) [10055.241356] [<8014d4cc>] (__handle_domain_irq) from [<801021e4>] (avic_handle_irq+0x68/0x70) [10055.249797] r9:015b6e60 r8:00c5387d r7:00c5387d r6:ffffffff r5:9dd33fb0 r4:9d402380 [10055.257539] [<8010217c>] (avic_handle_irq) from [<80101e34>] (__irq_usr+0x54/0x80) [10055.265105] Exception stack(0x9dd33fb0 to 0x9dd33ff8) [10055.270152] 3fa0: 015d0530 00000000 00000000 015d0538 [10055.278328] 3fc0: 015d0530 015b6e60 00000000 00000000 0052c5d0 015b6e60 7eff7910 7eff7918 [10055.286496] 3fe0: 76ce5614 7eff7908 0050e2f4 76a3a08c 20000010 ffffffff [10055.293104] r5:20000010 r4:76a3a08c [10055.296673] handlers: [10055.298967] [<79f218a5>] irq_default_primary_handler threaded [<1de88514>] aspeed_video_irq [10055.307344] Disabling IRQ #23
To fix this issue, this commit makes the interrupt handler clear these garbage interrupts. This driver enables and uses only COMP_COMPLETE interrupt instead for frame handling.
--- drivers/media/platform/aspeed-video.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/media/platform/aspeed-video.c +10 -0
@@ -606,6 +606,16 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)aspeed_video_start_frame (video); } +/* +* CAPTURE_COMPLETE and FRAME_COMPLETE interrupts come even when these +* are disabled in the VE_INTERRUPT_CTRL register so clear them to +* prevent unnecessary interrupt calls. +*/ +if (sts &VE_INTERRUPT_CAPTURE_COMPLETE ) + sts &= ~VE_INTERRUPT_CAPTURE_COMPLETE ; +if (sts &VE_INTERRUPT_FRAME_COMPLETE ) + sts &= ~VE_INTERRUPT_FRAME_COMPLETE ; +return sts ?IRQ_NONE :IRQ_HANDLED ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 182/434 media: smiapp: Register sensor after enabling runtime PM on the device
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit 90c9e4a4dba9f4de331372e745fb1991c1faa598 ]
Earlier it was possible that the parts of the driver that assumed runtime PM was enabled were being called before runtime PM was enabled in the driver's probe function. So enable runtime PM before registering the sub-device.
--- drivers/media/i2c/smiapp/smiapp-core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +8 -4
@@ -3101,19 +3101,23 @@ static int smiapp_probe(struct i2c_client *client)if (rval <0 ) goto out_media_entity_cleanup; - rval =v4l2_async_register_subdev_sensor_common (&sensor->src->sd); -if (rval <0 ) - goto out_media_entity_cleanup; -pm_runtime_set_active (&client->dev);pm_runtime_get_noresume (&client->dev);pm_runtime_enable (&client->dev); + + rval =v4l2_async_register_subdev_sensor_common (&sensor->src->sd); +if (rval <0 ) + goto out_disable_runtime_pm; +pm_runtime_set_autosuspend_delay (&client->dev,1000 );pm_runtime_use_autosuspend (&client->dev);pm_runtime_put_autosuspend (&client->dev);return 0 ; +out_disable_runtime_pm: +pm_runtime_disable (&client->dev); + out_media_entity_cleanup:media_entity_cleanup (&sensor->src->sd.entity);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 183/434 md: no longer compare spare disk superblock events in super_load
In reply to Greg Kroah-HartmanFrom: Yufen Yu <[email protected]>
[ Upstream commit 6a5cb53aaa4ef515ddeffa04ce18b771121127b4 ]
We have a test case as follow:
mdadm -CR /dev/md1 -l 1 -n 4 /dev/sd[a-d] \ --assume-clean --bitmap=internal
mdadm -S /dev/md1
mdadm -A /dev/md1 /dev/sd[b-c] --run --force
mdadm --zero /dev/sda mdadm /dev/md1 -a /dev/sda
echo offline > /sys/block/sdc/device/state
echo offline > /sys/block/sdb/device/state
sleep 5
mdadm -S /dev/md1
echo running > /sys/block/sdb/device/state echo running > /sys/block/sdc/device/state mdadm -A /dev/md1 /dev/sd[a-c] --run --force
When we readd /dev/sda to the array, it started to do recovery. After offline the other two disks in md1, the recovery have been interrupted and superblock update info cannot be written to the offline disks. While the spare disk (/dev/sda) can continue to update superblock info.
After stopping the array and assemble it, we found the array run fail, with the follow kernel message:
[ 172.986064] md: kicking non-fresh sdb from array! [ 173.004210] md: kicking non-fresh sdc from array! [ 173.022383] md/raid1:md1: active with 0 out of 4 mirrors [ 173.022406] md1: failed to create bitmap (-5) [ 173.023466] md: md1 stopped.
Since both sdb and sdc have the value of 'sb->events' smaller than that in sda, they have been kicked from the array. However, the only remained disk sda is in 'spare' state before stop and it cannot be added to conf->mirrors[] array. In the end, raid array assemble and run fail.
In fact, we can use the older disk sdb or sdc to assemble the array. That means we should not choose the 'spare' disk as the fresh disk in analyze_sbs().
To fix the problem, we do not compare superblock events when it is a spare disk, as same as validate_super.
--- drivers/md/md.c | 57 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-)
drivers/md/md.c +51 -6
@@ -1156,7 +1156,15 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor rdev->desc_nr = sb->this_disk.number;if (!refdev) { - ret =1 ; +/* +* Insist on good event counter while assembling, except +* for spares (which don't need an event count) +*/ +if (sb->disks[rdev->desc_nr].state & ( + (1 <<MD_DISK_SYNC ) | (1 <<MD_DISK_ACTIVE ))) + ret =1 ; +else + ret =0 ; }else {__u64 ev1, ev2;mdp_super_t *refsb =page_address (refdev->sb_page);
@@ -1172,7 +1180,14 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor } ev1 =md_event (sb); ev2 =md_event (refsb); -if (ev1 > ev2) + +/* +* Insist on good event counter while assembling, except +* for spares (which don't need an event count) +*/ +if (sb->disks[rdev->desc_nr].state & ( + (1 <<MD_DISK_SYNC ) | (1 <<MD_DISK_ACTIVE )) && + (ev1 > ev2)) ret =1 ;else ret =0 ;
@@ -1532,6 +1547,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_sector_t sectors;char b[BDEVNAME_SIZE ], b2[BDEVNAME_SIZE ];int bmask; +__u64 role;/* * Calculate the position of the superblock in 512byte sectors.
@@ -1665,8 +1681,20 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ sb->level != 0)return -EINVAL ; + role =le16_to_cpu (sb->dev_roles[rdev->desc_nr]); +if (!refdev) { - ret =1 ; +/* +* Insist of good event counter while assembling, except for +* spares (which don't need an event count) +*/ +if (rdev->desc_nr >=0 && + rdev->desc_nr <le32_to_cpu (sb->max_dev) && + (role <MD_DISK_ROLE_MAX || + role ==MD_DISK_ROLE_JOURNAL )) + ret =1 ; +else + ret =0 ; }else {__u64 ev1, ev2;struct mdp_superblock_1 *refsb =page_address (refdev->sb_page);
@@ -1683,7 +1711,14 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ ev1 =le64_to_cpu (sb->events); ev2 =le64_to_cpu (refsb->events); -if (ev1 > ev2) +/* +* Insist of good event counter while assembling, except for +* spares (which don't need an event count) +*/ +if (rdev->desc_nr >=0 && + rdev->desc_nr <le32_to_cpu (sb->max_dev) && + (role <MD_DISK_ROLE_MAX || + role ==MD_DISK_ROLE_JOURNAL ) && ev1 > ev2) ret =1 ;else ret =0 ;
@@ -3604,7 +3639,7 @@ abort_free:* Check a full RAID array for plausibility */ -static void analyze_sbs (struct mddev *mddev) +static int analyze_sbs (struct mddev *mddev) {int i;struct md_rdev *rdev, *freshest, *tmp;
@@ -3625,6 +3660,12 @@ static void analyze_sbs(struct mddev *mddev)md_kick_rdev_from_array (rdev); } +/* Cannot find a valid fresh disk */ +if (!freshest) { +pr_warn ("md: cannot find a valid disk\n" ); +return -EINVAL ; + } + super_types[mddev->major_version].validate_super (mddev, freshest);
@@ -3659,6 +3700,8 @@ static void analyze_sbs(struct mddev *mddev)clear_bit (In_sync, &rdev->flags); } } + +return 0 ; }/* Read a fixed-point number.
@@ -5577,7 +5620,9 @@ int md_run(struct mddev *mddev)if (!mddev->raid_disks) {if (!mddev->persistent)return -EINVAL ; -analyze_sbs (mddev); + err =analyze_sbs (mddev); +if (err) +return -EINVAL ; }if (mddev->level !=LEVEL_NONE )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 184/434 staging: wilc1000: potential corruption in wilc_parse_join_bss_param()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d59dc92f1bccd5acde793aebdbb4f7121cf3f9af ]
The "rates_len" value needs to be capped so that the memcpy() doesn't copy beyond the end of the array.
--- drivers/staging/wilc1000/wilc_hif.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/wilc1000/wilc_hif.c +2 -0
@@ -473,6 +473,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, rates_ie =cfg80211_find_ie (WLAN_EID_SUPP_RATES , ies->data, ies->len);if (rates_ie) { rates_len = rates_ie[1 ]; +if (rates_len >WILC_MAX_RATES_SUPPORTED ) + rates_len =WILC_MAX_RATES_SUPPORTED ; param->supp_rates[0 ] = rates_len;memcpy (¶m->supp_rates[1 ], rates_ie +2 , rates_len); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 185/434 md/bitmap: avoid race window between md_bitmap_resize and bitmap_file_clear_bit
In reply to Greg Kroah-HartmanFrom: Guoqing Jiang <[email protected]>
[ Upstream commit fadcbd2901a0f7c8721f3bdb69eac95c272dc8ed ]
We need to move "spin_lock_irq(&bitmap->counts.lock)" before unmap previous storage, otherwise panic like belows could happen as follows.
[ 902.353802] sdl: detected capacity change from 1077936128 to 3221225472 [ 902.616948] general protection fault: 0000 [#1] SMP [snip] [ 902.618588] CPU: 12 PID: 33698 Comm: md0_raid1 Tainted: G O 4.14.144-1-pserver #4.14.144-1.1~deb10 [ 902.618870] Hardware name: Supermicro SBA-7142G-T4/BHQGE, BIOS 3.00 10/24/2012 [ 902.619120] task: ffff9ae1860fc600 task.stack: ffffb52e4c704000 [ 902.619301] RIP: 0010:bitmap_file_clear_bit+0x90/0xd0 [md_mod] [ 902.619464] RSP: 0018:ffffb52e4c707d28 EFLAGS: 00010087 [ 902.619626] RAX: ffe8008b0d061000 RBX: ffff9ad078c87300 RCX: 0000000000000000 [ 902.619792] RDX: ffff9ad986341868 RSI: 0000000000000803 RDI: ffff9ad078c87300 [ 902.619986] RBP: ffff9ad0ed7a8000 R08: 0000000000000000 R09: 0000000000000000 [ 902.620154] R10: ffffb52e4c707ec0 R11: ffff9ad987d1ed44 R12: ffff9ad0ed7a8360 [ 902.620320] R13: 0000000000000003 R14: 0000000000060000 R15: 0000000000000800 [ 902.620487] FS: 0000000000000000(0000) GS:ffff9ad987d00000(0000) knlGS:0000000000000000 [ 902.620738] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 902.620901] CR2: 000055ff12aecec0 CR3: 0000001005207000 CR4: 00000000000406e0 [ 902.621068] Call Trace: [ 902.621256] bitmap_daemon_work+0x2dd/0x360 [md_mod] [ 902.621429] ? find_pers+0x70/0x70 [md_mod] [ 902.621597] md_check_recovery+0x51/0x540 [md_mod] [ 902.621762] raid1d+0x5c/0xeb0 [raid1] [ 902.621939] ? try_to_del_timer_sync+0x4d/0x80 [ 902.622102] ? del_timer_sync+0x35/0x40 [ 902.622265] ? schedule_timeout+0x177/0x360 [ 902.622453] ? call_timer_fn+0x130/0x130 [ 902.622623] ? find_pers+0x70/0x70 [md_mod] [ 902.622794] ? md_thread+0x94/0x150 [md_mod] [ 902.622959] md_thread+0x94/0x150 [md_mod] [ 902.623121] ? wait_woken+0x80/0x80 [ 902.623280] kthread+0x119/0x130 [ 902.623437] ? kthread_create_on_node+0x60/0x60 [ 902.623600] ret_from_fork+0x22/0x40 [ 902.624225] RIP: bitmap_file_clear_bit+0x90/0xd0 [md_mod] RSP: ffffb52e4c707d28
Because mdadm was running on another cpu to do resize, so bitmap_resize was called to replace bitmap as below shows.
PID: 38801 TASK: ffff9ad074a90e00 CPU: 0 COMMAND: "mdadm"
[exception RIP: queued_spin_lock_slowpath+56]
[snip]
-- <NMI exception stack> --
#5 [ffffb52e60f17c58] queued_spin_lock_slowpath at ffffffff9c0b27b8 #6 [ffffb52e60f17c58] bitmap_resize at ffffffffc0399877 [md_mod] #7 [ffffb52e60f17d30] raid1_resize at ffffffffc0285bf9 [raid1] #8 [ffffb52e60f17d50] update_size at ffffffffc038a31a [md_mod] #9 [ffffb52e60f17d70] md_ioctl at ffffffffc0395ca4 [md_mod]
And the procedure to keep resize bitmap safe is allocate new storage space, then quiesce, copy bits, replace bitmap, and re-start.
However the daemon (bitmap_daemon_work) could happen even the array is quiesced, which means when bitmap_file_clear_bit is triggered by raid1d, then it thinks it should be fine to access store->filemap since counts->lock is held, but resize could change the storage without the protection of the lock.
--- drivers/md/md-bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/md-bitmap.c +1 -1
@@ -2139,6 +2139,7 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks,memcpy (page_address (store.sb_page),page_address (bitmap->storage.sb_page),sizeof (bitmap_super_t)); +spin_lock_irq (&bitmap->counts.lock);md_bitmap_file_unmap (&bitmap->storage); bitmap->storage = store;
@@ -2154,7 +2155,6 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks, blocks =min (old_counts.chunks << old_counts.chunkshift, chunks << chunkshift); -spin_lock_irq (&bitmap->counts.lock);/* For cluster raid, need to pre-allocate bitmap */ if (mddev_is_clustered (bitmap->mddev)) {unsigned long page;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 186/434 drm: Dont free jobs in wait_event_interruptible()
In reply to Greg Kroah-HartmanFrom: Steven Price <[email protected]>
[ Upstream commit 588b9828f0744ca13555c4a35cd0251ac8ad8ad2 ]
drm_sched_cleanup_jobs() attempts to free finished jobs, however because it is called as the condition of wait_event_interruptible() it must not sleep. Unfortunately some free callbacks (notably for Panfrost) do sleep.
Instead let's rename drm_sched_cleanup_jobs() to drm_sched_get_cleanup_job() and simply return a job for processing if there is one. The caller can then call the free_job() callback outside the wait_event_interruptible() where sleeping is possible before re-checking and returning to sleep if necessary.
--- drivers/gpu/drm/scheduler/sched_main.c | 43 ++++++++++++++------------ 1 file changed, 24 insertions(+), 19 deletions(-)
drivers/gpu/drm/scheduler/sched_main.c +24 -19
@@ -632,43 +632,41 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb) }/** -* drm_sched_cleanup_jobs - destroy finished jobs +* drm_sched_get_cleanup_job - fetch the next finished job to be destroyed * * @sched: scheduler instance * -* Remove all finished jobs from the mirror list and destroy them. +* Returns the next finished job from the mirror list (if there is one) +* ready for it to be destroyed. */ -static void drm_sched_cleanup_jobs (struct drm_gpu_scheduler *sched) +static struct drm_sched_job * +drm_sched_get_cleanup_job (struct drm_gpu_scheduler *sched) { +struct drm_sched_job *job;unsigned long flags;/* Don't destroy jobs while the timeout worker is running */ if (sched->timeout !=MAX_SCHEDULE_TIMEOUT && !cancel_delayed_work (&sched->work_tdr)) -return ; - +return NULL ; -while (!list_empty (&sched->ring_mirror_list)) { -struct drm_sched_job *job; +spin_lock_irqsave (&sched->job_list_lock, flags); - job =list_first_entry (&sched->ring_mirror_list, + job =list_first_entry_or_null (&sched->ring_mirror_list, struct drm_sched_job, node); -if (!dma_fence_is_signaled (&job->s_fence->finished)) -break ; -spin_lock_irqsave (&sched->job_list_lock, flags); +if (job &&dma_fence_is_signaled (&job->s_fence->finished)) {/* remove job from ring_mirror_list */ list_del_init (&job->node); -spin_unlock_irqrestore (&sched->job_list_lock, flags); - - sched->ops->free_job (job); + }else { + job =NULL ; +/* queue timeout for next job */ +drm_sched_start_timeout (sched); } -/* queue timeout for next job */ -spin_lock_irqsave (&sched->job_list_lock, flags); -drm_sched_start_timeout (sched);spin_unlock_irqrestore (&sched->job_list_lock, flags); +return job; }/**
@@ -708,12 +706,19 @@ static int drm_sched_main(void *param)struct drm_sched_fence *s_fence;struct drm_sched_job *sched_job;struct dma_fence *fence; +struct drm_sched_job *cleanup_job =NULL ;wait_event_interruptible (sched->wake_up_worker, - (drm_sched_cleanup_jobs (sched), + (cleanup_job =drm_sched_get_cleanup_job (sched)) || (!drm_sched_blocked (sched) && (entity =drm_sched_select_entity (sched))) || -kthread_should_stop ())); +kthread_should_stop ()); + +if (cleanup_job) { + sched->ops->free_job (cleanup_job); +/* queue timeout for next job */ +drm_sched_start_timeout (sched); + }if (!entity)continue ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 187/434 EDAC/amd64: Set grain per DIMM
In reply to Greg Kroah-HartmanFrom: Yazen Ghannam <[email protected]>
[ Upstream commit 466503d6b1b33be46ab87c6090f0ade6c6011cbc ]
The following commit introduced a warning on error reports without a non-zero grain value.
3724ace582d9 ("EDAC/mc: Fix grain_bits calculation")
The amd64_edac_mod module does not provide a value, so the warning will be given on the first reported memory error.
Set the grain per DIMM to cacheline size (64 bytes). This is the current recommendation.
--- drivers/edac/amd64_edac.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/edac/amd64_edac.c +2 -0
@@ -2936,6 +2936,7 @@ static int init_csrows_df(struct mem_ctl_info *mci) dimm->mtype = pvt->dram_type; dimm->edac_mode = edac_mode; dimm->dtype = dev_type; + dimm->grain =64 ; } }
@@ -3012,6 +3013,7 @@ static int init_csrows(struct mem_ctl_info *mci) dimm = csrow->channels[j]->dimm; dimm->mtype = pvt->dram_type; dimm->edac_mode = edac_mode; + dimm->grain =64 ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 188/434 arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill()
In reply to Greg Kroah-HartmanFrom: Yunfeng Ye <[email protected]>
[ Upstream commit bfcef4ab1d7ee8921bc322109b1692036cc6cbe0 ]
In cases like suspend-to-disk and suspend-to-ram, a large number of CPU cores need to be shut down. At present, the CPU hotplug operation is serialised, and the CPU cores can only be shut down one by one. In this process, if PSCI affinity_info() does not return LEVEL_OFF quickly, cpu_psci_cpu_kill() needs to wait for 10ms. If hundreds of CPU cores need to be shut down, it will take a long time.
Normally, there is no need to wait 10ms in cpu_psci_cpu_kill(). So change the wait interval from 10 ms to max 1 ms and use usleep_range() instead of msleep() for more accurate timer.
In addition, reducing the time interval will increase the messages output, so remove the "Retry ..." message, instead, track time and output to the the sucessful message.
--- arch/arm64/kernel/psci.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
arch/arm64/kernel/psci.c +9 -6
@@ -81,7 +81,8 @@ static void cpu_psci_cpu_die(unsigned int cpu)static int cpu_psci_cpu_kill (unsigned int cpu) { -int err, i; +int err; +unsigned long start, end;if (!psci_ops.affinity_info)return 0 ;
@@ -91,16 +92,18 @@ static int cpu_psci_cpu_kill(unsigned int cpu)* while it is dying. So, try again a few times. */ -for (i =0 ; i <10 ; i++) { + start = jiffies; + end = start +msecs_to_jiffies (100 ); +do { err = psci_ops.affinity_info (cpu_logical_map (cpu),0 );if (err ==PSCI_0_2_AFFINITY_LEVEL_OFF ) { -pr_info ("CPU%d killed.\n" , cpu); +pr_info ("CPU%d killed (polled %d ms)\n" , cpu, +jiffies_to_msecs (jiffies - start));return 0 ; } -msleep (10 ); -pr_info ("Retrying again to check for CPU kill\n" ); - } +usleep_range (100 ,1000 ); + }while (time_before (jiffies, end));pr_warn ("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n" , cpu, err);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 189/434 drm/amd/display: setting the DIG_MODE to the correct value.
In reply to Greg Kroah-HartmanFrom: Zhan liu <[email protected]>
[ Upstream commit 967a3b85bac91c55eff740e61bf270c2732f48b2 ]
[Why]
This patch is for fixing Navi14 HDMI display pink screen issue.
[How]
Call stream->link->link_enc->funcs->setup twice. This is setting the DIG_MODE to the correct value after having been overridden by the call to transmitter control.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +9 -0
@@ -2769,6 +2769,15 @@ void core_link_enable_stream( CONTROLLER_DP_TEST_PATTERN_VIDEOMODE, COLOR_DEPTH_UNDEFINED); +/* This second call is needed to reconfigure the DIG +* as a workaround for the incorrect value being applied +* from transmitter control. +*/ +if (!dc_is_virtual_signal (pipe_ctx->stream->signal)) + stream->link->link_enc->funcs->setup ( + stream->link->link_enc, + pipe_ctx->stream->signal); +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT if (pipe_ctx->stream->timing.flags.DSC) { if (dc_is_dp_signal(pipe_ctx->stream->signal) ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 190/434 i40e: initialize ITRN registers with correct values
In reply to Greg Kroah-HartmanFrom: Nicholas Nunley <[email protected]>
[ Upstream commit 998e5166e604fd37afe94352f7b8c2d816b11049 ]
Since commit 92418fb14750 ("i40e/i40evf: Use usec value instead of reg value for ITR defines") the driver tracks the interrupt throttling intervals in single usec units, although the actual ITRN/ITR0 registers are programmed in 2 usec units. Most register programming flows in the driver correctly handle the conversion, although it is currently not applied when the registers are initialized to their default values. Most of the time this doesn't present a problem since the default values are usually immediately overwritten through the standard adaptive throttling mechanism, or updated manually by the user, but if adaptive throttling is disabled and the interval values are left alone then the incorrect value will persist.
Since the intended default interval of 50 usecs (vs. 100 usecs as programmed) performs better for most traffic workloads, this can lead to performance regressions.
This patch adds the correct conversion when writing the initial values to the ITRN registers.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -5
@@ -3534,14 +3534,14 @@ static void i40e_vsi_configure_msix(struct i40e_vsi *vsi) q_vector->rx.target_itr =ITR_TO_REG (vsi->rx_rings[i]->itr_setting);wr32 (hw,I40E_PFINT_ITRN (I40E_RX_ITR , vector -1 ), - q_vector->rx.target_itr); + q_vector->rx.target_itr >>1 ); q_vector->rx.current_itr = q_vector->rx.target_itr; q_vector->tx.next_update = jiffies +1 ; q_vector->tx.target_itr =ITR_TO_REG (vsi->tx_rings[i]->itr_setting);wr32 (hw,I40E_PFINT_ITRN (I40E_TX_ITR , vector -1 ), - q_vector->tx.target_itr); + q_vector->tx.target_itr >>1 ); q_vector->tx.current_itr = q_vector->tx.target_itr; wr32(hw, I40E_PFINT_RATEN(vector - 1),
@@ -3646,11 +3646,11 @@ static void i40e_configure_msi_and_legacy(struct i40e_vsi *vsi)/* set the ITR configuration */ q_vector->rx.next_update = jiffies +1 ; q_vector->rx.target_itr =ITR_TO_REG (vsi->rx_rings[0 ]->itr_setting); -wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ), q_vector->rx.target_itr); +wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ), q_vector->rx.target_itr >>1 ); q_vector->rx.current_itr = q_vector->rx.target_itr; q_vector->tx.next_update = jiffies +1 ; q_vector->tx.target_itr =ITR_TO_REG (vsi->tx_rings[0 ]->itr_setting); -wr32 (hw,I40E_PFINT_ITR0 (I40E_TX_ITR ), q_vector->tx.target_itr); +wr32 (hw,I40E_PFINT_ITR0 (I40E_TX_ITR ), q_vector->tx.target_itr >>1 ); q_vector->tx.current_itr = q_vector->tx.target_itr;i40e_enable_misc_int_causes (pf);
@@ -11396,7 +11396,7 @@ static int i40e_setup_misc_vector(struct i40e_pf *pf)/* associate no queues to the misc vector */ wr32 (hw,I40E_PFINT_LNKLST0 ,I40E_QUEUE_END_OF_LIST ); -wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ),I40E_ITR_8K ); +wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ),I40E_ITR_8K >>1 );i40e_flush (hw);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 191/434 drm/amd/display: correctly populate dpp refclk in fpga
In reply to Greg Kroah-HartmanFrom: Anthony Koo <[email protected]>
[ Upstream commit 952f6c4b5d72d40f93f3deb61239290b357d434e ]
[Why]
In diags environment we are not programming the DPP DTO correctly.
[How]
Populate the dpp refclk in dccg so it can be used to correctly program DPP DTO.
--- .../drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +8 -2
@@ -320,6 +320,8 @@ void dcn2_update_clocks_fpga(struct clk_mgr *clk_mgr, struct dc_state *context, bool safe_to_lower) { +struct clk_mgr_internal *clk_mgr_int =TO_CLK_MGR_INTERNAL (clk_mgr); +struct dc_clocks *new_clocks = &context->bw_ctx.bw.dcn.clk;/* Min fclk = 1.2GHz since all the extra scemi logic seems to run off of it */ int fclk_adj = new_clocks->fclk_khz >1200000 ? new_clocks->fclk_khz :1200000 ;
@@ -357,14 +359,18 @@ void dcn2_update_clocks_fpga(struct clk_mgr *clk_mgr, clk_mgr->clks.dispclk_khz = new_clocks->dispclk_khz; } -/* Both fclk and dppclk ref are run on the same scemi clock so we -* need to keep the same value for both +/* Both fclk and ref_dppclk run on the same scemi clock. +* So take the higher value since the DPP DTO is typically programmed +* such that max dppclk is 1:1 with ref_dppclk. */ if (clk_mgr->clks.fclk_khz > clk_mgr->clks.dppclk_khz) clk_mgr->clks.dppclk_khz = clk_mgr->clks.fclk_khz;if (clk_mgr->clks.dppclk_khz > clk_mgr->clks.fclk_khz) clk_mgr->clks.fclk_khz = clk_mgr->clks.dppclk_khz; +// Both fclk and ref_dppclk run on the same scemi clock. + clk_mgr_int->dccg->ref_dppclk = clk_mgr->clks.fclk_khz; +dm_set_dcn_clocks (clk_mgr->ctx, &clk_mgr->clks); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 192/434 i40e: Wrong Advertised FEC modes after set FEC to AUTO
In reply to Greg Kroah-HartmanFrom: Jaroslaw Gawin <[email protected]>
[ Upstream commit e42b7e9cefca9dd008cbafffca97285cf264f72d ]
Fix display of parameters "Configured FEC encodings:" and "Advertised FEC modes:" in ethtool. Implemented by setting proper FEC bits in “advertising” bitmask of link_modes struct and “fec” bitmask in ethtool_fecparam struct. Without this patch wrong FEC settings can be shown.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 13 ++++++-- .../net/ethernet/intel/i40e/i40e_ethtool.c | 32 +++++++++---------- 2 files changed, 26 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +10 -3
@@ -2571,9 +2571,16 @@ noinline_for_stack i40e_status i40e_update_link_info(struct i40e_hw *hw)if (status)return status; - hw->phy.link_info.req_fec_info = - abilities.fec_cfg_curr_mod_ext_info & - (I40E_AQ_REQUEST_FEC_KR |I40E_AQ_REQUEST_FEC_RS ); +if (abilities.fec_cfg_curr_mod_ext_info & +I40E_AQ_ENABLE_FEC_AUTO ) + hw->phy.link_info.req_fec_info = + (I40E_AQ_REQUEST_FEC_KR | +I40E_AQ_REQUEST_FEC_RS ); +else + hw->phy.link_info.req_fec_info = + abilities.fec_cfg_curr_mod_ext_info & + (I40E_AQ_REQUEST_FEC_KR | +I40E_AQ_REQUEST_FEC_RS );memcpy (hw->phy.link_info.module_type, &abilities.module_type,sizeof (hw->phy.link_info.module_type));
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +16 -16
@@ -722,7 +722,14 @@ static void i40e_get_settings_link_up_fec(u8 req_fec_info,ethtool_link_ksettings_add_link_mode (ks, supported,FEC_RS );ethtool_link_ksettings_add_link_mode (ks, supported,FEC_BASER ); -if (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) { +if ((I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) && + (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info)) { +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_NONE ); +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_BASER ); +ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); + }else if (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) {ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); }else if (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info) { ethtool_link_ksettings_add_link_mode(ks, advertising,
@@ -730,12 +737,6 @@ static void i40e_get_settings_link_up_fec(u8 req_fec_info, }else {ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_NONE ); -if (I40E_AQ_SET_FEC_AUTO & req_fec_info) { -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_BASER ); - } } }
@@ -1437,6 +1438,7 @@ static int i40e_get_fec_param(struct net_device *netdev,struct i40e_hw *hw = &pf->hw;i40e_status status =0 ;int err =0 ; +u8 fec_cfg;/* Get the current phy config */ memset (&abilities,0 ,sizeof (abilities));
@@ -1448,18 +1450,16 @@ static int i40e_get_fec_param(struct net_device *netdev, } fecparam->fec =0 ; -if (abilities.fec_cfg_curr_mod_ext_info &I40E_AQ_SET_FEC_AUTO ) + fec_cfg = abilities.fec_cfg_curr_mod_ext_info; +if (fec_cfg &I40E_AQ_SET_FEC_AUTO ) fecparam->fec |=ETHTOOL_FEC_AUTO ; -if ((abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_SET_FEC_REQUEST_RS ) || - (abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_SET_FEC_ABILITY_RS )) +else if (fec_cfg & (I40E_AQ_SET_FEC_REQUEST_RS | +I40E_AQ_SET_FEC_ABILITY_RS )) fecparam->fec |=ETHTOOL_FEC_RS ; -if ((abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_SET_FEC_REQUEST_KR ) || - (abilities.fec_cfg_curr_mod_ext_info &I40E_AQ_SET_FEC_ABILITY_KR )) +else if (fec_cfg & (I40E_AQ_SET_FEC_REQUEST_KR | +I40E_AQ_SET_FEC_ABILITY_KR )) fecparam->fec |=ETHTOOL_FEC_BASER ; -if (abilities.fec_cfg_curr_mod_ext_info ==0 ) +if (fec_cfg ==0 ) fecparam->fec |=ETHTOOL_FEC_OFF ;if (hw->phy.link_info.fec_info &I40E_AQ_CONFIG_FEC_KR_ENA )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 193/434 net: phy: dp83867: enable robust auto-mdix
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 5a7f08c2abb0efc9d17aff2fc75d6d3b85e622e4 ]
The link detection timeouts can be observed (or link might not be detected at all) when dp83867 PHY is configured in manual mode (speed/duplex).
CFG3[9] Robust Auto-MDIX option allows to significantly improve link detection in case dp83867 is configured in manual mode and reduce link detection time.
As per DM: "If link partners are configured to operational modes that are not supported by normal Auto MDI/MDIX mode (like Auto-Neg versus Force 100Base-TX or Force 100Base-TX versus Force 100Base-TX), this Robust Auto MDI/MDIX mode allows MDI/MDIX resolution and prevents deadlock."
Hence, enable this option by default as there are no known reasons not to do so.
--- drivers/net/phy/dp83867.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/net/phy/dp83867.c +10 -5
@@ -95,6 +95,10 @@#define DP83867_IO_MUX_CFG_CLK_O_SEL_MASK (0x1f << 8)#define DP83867_IO_MUX_CFG_CLK_O_SEL_SHIFT 8 +/* CFG3 bits */ +#define DP83867_CFG3_INT_OE BIT(7) +#define DP83867_CFG3_ROBUST_AUTO_MDIX BIT(9) +/* CFG4 bits */ #define DP83867_CFG4_PORT_MIRROR_EN BIT(0)
@@ -410,12 +414,13 @@ static int dp83867_config_init(struct phy_device *phydev)phy_write_mmd (phydev,DP83867_DEVADDR ,DP83867_SGMIICTL , val); } + val =phy_read (phydev,DP83867_CFG3 );/* Enable Interrupt output INT_OE in CFG3 register */ -if (phy_interrupt_is_valid (phydev)) { - val =phy_read (phydev,DP83867_CFG3 ); - val |=BIT (7 ); -phy_write (phydev,DP83867_CFG3 , val); - } +if (phy_interrupt_is_valid (phydev)) + val |=DP83867_CFG3_INT_OE ; + + val |=DP83867_CFG3_ROBUST_AUTO_MDIX ; +phy_write (phydev,DP83867_CFG3 , val);if (dp83867->port_mirroring !=DP83867_PORT_MIRROING_KEEP )dp83867_config_port_mirroring (phydev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 194/434 drm/tegra: sor: Use correct SOR index on Tegra210
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit 24e64f86da40e68c5f58af08796110f147b12193 ]
The device tree bindings for the Tegra210 SOR don't require the controller instance to be defined, since the instance can be derived from the compatible string. The index is never used on Tegra210, so we got away with it not getting set. However, subsequent patches will change that, so make sure the proper index is used.
--- drivers/gpu/drm/tegra/sor.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/tegra/sor.c +5 -0
@@ -3200,6 +3200,11 @@ static int tegra_sor_parse_dt(struct tegra_sor *sor)* earlier */ sor->pad =TEGRA_IO_PAD_HDMI_DP0 + sor->index; + }else { +if (sor->soc->supports_edp) + sor->index =0 ; +else + sor->index =1 ; } err =of_property_read_u32_array (np,"nvidia,xbar-cfg" , xbar_cfg,5 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 195/434 regulator: core: Release coupled_rdevs on regulator_init_coupling() error
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit 26c2c997aa1a6c5522f6619910ba025e53e69763 ]
This patch fixes memory leak which should happen if regulator's coupling fails to initialize.
--- drivers/regulator/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/core.c +1 -0
@@ -5198,6 +5198,7 @@ unset_supplies:regulator_remove_coupling (rdev);mutex_unlock (®ulator_list_mutex); wash: +kfree (rdev->coupling_desc.coupled_rdevs);kfree (rdev->constraints);mutex_lock (®ulator_list_mutex);regulator_ena_gpio_free (rdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 196/434 ubsan, x86: Annotate and allow __ubsan_handle_shift_out_of_bounds() in uaccess regions
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 9a50dcaf0416a43e1fe411dc61a99c8333c90119 ]
The new check_zeroed_user() function uses variable shifts inside of a user_access_begin()/user_access_end() section and that results in GCC emitting __ubsan_handle_shift_out_of_bounds() calls, even though through value range analysis it would be able to see that the UB in question is impossible.
Annotate and whitelist this UBSAN function; continued use of user_access_begin()/user_access_end() will undoubtedly result in further uses of function.
--- lib/ubsan.c | 5 ++++- tools/objtool/check.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
lib/ubsan.c +4 -1
@@ -374,9 +374,10 @@ void __ubsan_handle_shift_out_of_bounds(struct shift_out_of_bounds_data *data,struct type_descriptor *lhs_type = data->lhs_type;char rhs_str[VALUE_LENGTH ];char lhs_str[VALUE_LENGTH ]; +unsigned long ua_flags =user_access_save ();if (suppress_report (&data->location)) -return ; + goto out;ubsan_prologue (&data->location, &flags);
@@ -402,6 +403,8 @@ void __ubsan_handle_shift_out_of_bounds(struct shift_out_of_bounds_data *data, lhs_type->type_name);ubsan_epilogue (&flags); +out: +user_access_restore (ua_flags); }EXPORT_SYMBOL (__ubsan_handle_shift_out_of_bounds);
tools/objtool/check.c +1 -0
@@ -481,6 +481,7 @@ static const char *uaccess_safe_builtin[] = {"ubsan_type_mismatch_common" ,"__ubsan_handle_type_mismatch" ,"__ubsan_handle_type_mismatch_v1" , +"__ubsan_handle_shift_out_of_bounds" ,/* misc */ "csum_partial_copy_generic" , "__memcpy_mcsafe",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 197/434 spi: sprd: adi: Add missing lock protection when rebooting
In reply to Greg Kroah-HartmanFrom: Lingling Xu <[email protected]>
[ Upstream commit 91ea1d70607e374b014b4b9bea771ce661f9f64b ]
When rebooting the system, we should lock the watchdog after configuration to make sure the watchdog can reboot the system successfully.
--- drivers/spi/spi-sprd-adi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spi-sprd-adi.c +3 -0
@@ -393,6 +393,9 @@ static int sprd_adi_restart_handler(struct notifier_block *this, val |=BIT_WDG_RUN |BIT_WDG_RST ;sprd_adi_write (sadi, sadi->slave_pbase +REG_WDG_CTRL , val); +/* Lock the watchdog */ +sprd_adi_write (sadi, sadi->slave_pbase +REG_WDG_LOCK , ~WDG_UNLOCK_KEY ); +mdelay (1000 );dev_emerg (sadi->dev,"Unable to restart system\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 198/434 ACPI: button: Add DMI quirk for Medion Akoya E2215T
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 932e1ba486117de2fcea3df27ad8218ad6c11470 ]
The Medion Akoya E2215T's ACPI _LID implementation is quite broken:
1. For notifications it uses an ActiveLow Edge GpioInt, rather then an ActiveBoth one, meaning that the device is only notified when the lid is closed, not when it is opened.
2. Matching with this its _LID method simply always returns 0 (closed)
In order for the Linux LID code to work properly with this implementation, the lid_init_state selection needs to be set to ACPI_BUTTON_LID_INIT_OPEN.
This commit adds a DMI quirk for this.
--- drivers/acpi/button.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/acpi/button.c +11 -0
@@ -78,6 +78,17 @@ static const struct dmi_system_id lid_blacklst[] = { DMI_MATCH(DMI_BIOS_VERSION, "BYT70A.YNCHENG.WIN.007"), }, }, + { + /* + * Medion Akoya E2215T, notification of the LID device only + * happens on close, not on open and _LID always returns closed. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), + DMI_MATCH(DMI_PRODUCT_NAME, "E2215T MD60198"), + }, + .driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN, + }, {} };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 199/434 RDMA/qedr: Fix memory leak in user qp and mr
In reply to Greg Kroah-HartmanFrom: Michal Kalderon <[email protected]>
[ Upstream commit 24e412c1e00ebfe73619e6b88cbc26c2c7d41b85 ]
User QPs pbl's weren't freed properly.
MR pbls weren't freed properly.
--- drivers/infiniband/hw/qedr/verbs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/infiniband/hw/qedr/verbs.c +10 -2
@@ -1577,6 +1577,14 @@ static void qedr_cleanup_user(struct qedr_dev *dev, struct qedr_qp *qp)ib_umem_release (qp->urq.umem); qp->urq.umem =NULL ; + +if (rdma_protocol_roce (&dev->ibdev,1 )) { +qedr_free_pbl (dev, &qp->usq.pbl_info, qp->usq.pbl_tbl); +qedr_free_pbl (dev, &qp->urq.pbl_info, qp->urq.pbl_tbl); + }else { +kfree (qp->usq.pbl_tbl); +kfree (qp->urq.pbl_tbl); + } } static int qedr_create_user_qp(struct qedr_dev *dev,
@@ -2673,8 +2681,8 @@ int qedr_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata) dev->ops->rdma_free_tid (dev->rdma_ctx, mr->hw_mr.itid); -if ((mr->type !=QEDR_MR_DMA ) && (mr->type !=QEDR_MR_FRMR )) -qedr_free_pbl (dev, &mr->info.pbl_info, mr->info.pbl_table); +if (mr->type !=QEDR_MR_DMA ) +free_mr_info (dev, &mr->info);/* it could be user registered memory. */ ib_umem_release (mr->umem);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 200/434 RDMA/hns: Fix memory leak on context on error return path
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 994195e1537074f56df216a9309f6e366cb35b67 ]
Currently, the error return path when the call to function dev->dfx->query_cqc_info fails will leak object 'context'. Fix this by making the error return path via 'err' return return codes rather than -EMSGSIZE, set ret appropriately for all error return paths and for the memory leak now return via 'err' rather than just returning without freeing context.
Addresses-Coverity: ("Resource leak")
--- drivers/infiniband/hw/hns/hns_roce_restrack.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hns/hns_roce_restrack.c +7 -3
@@ -98,11 +98,15 @@ static int hns_roce_fill_res_cq_entry(struct sk_buff *msg, goto err; table_attr =nla_nest_start (msg,RDMA_NLDEV_ATTR_DRIVER ); -if (!table_attr) +if (!table_attr) { + ret = -EMSGSIZE ; goto err; + } -if (hns_roce_fill_cq (msg, context)) +if (hns_roce_fill_cq (msg, context)) { + ret = -EMSGSIZE ; goto err_cancel_table; + }nla_nest_end (msg, table_attr);kfree (context);
@@ -113,7 +117,7 @@ err_cancel_table:nla_nest_cancel (msg, table_attr); err:kfree (context); -return -EMSGSIZE ; +return ret; } int hns_roce_fill_res_entry(struct sk_buff *msg,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 201/434 RDMA/qedr: Fix srqs xarray initialization
In reply to Greg Kroah-HartmanFrom: Michal Kalderon <[email protected]>
[ Upstream commit 73ab512f720298aabe23b34110e3f6a8545b0ba5 ]
There was a missing initialization for the srqs xarray. SRQs xarray can also be called from irq context when searching for an element and uses the xa_XXX_irq apis, therefore should be initialized with IRQ flags.
--- drivers/infiniband/hw/qedr/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/qedr/main.c +1 -0
@@ -357,6 +357,7 @@ static int qedr_alloc_resources(struct qedr_dev *dev)return -ENOMEM ;spin_lock_init (&dev->sgid_lock); +xa_init_flags (&dev->srqs,XA_FLAGS_LOCK_IRQ );if (IS_IWARP (dev)) {xa_init_flags (&dev->qps,XA_FLAGS_LOCK_IRQ );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 202/434 RDMA/core: Set DMA parameters correctly
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit c9121262d57b8a3be4f08073546436ba0128ca6a ]
The dma_set_max_seg_size() call in setup_dma_device() does not have any effect since device->dev.dma_parms is NULL. Fix this by initializing device->dev.dma_parms first.
--- drivers/infiniband/core/device.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/infiniband/core/device.c +14 -2
@@ -1199,9 +1199,21 @@ static void setup_dma_device(struct ib_device *device)WARN_ON_ONCE (!parent); device->dma_device = parent; } -/* Setup default max segment size for all IB devices */ -dma_set_max_seg_size (device->dma_device,SZ_2G ); +if (!device->dev.dma_parms) { +if (parent) { +/* +* The caller did not provide DMA parameters, so +* 'parent' probably represents a PCI device. The PCI +* core sets the maximum segment size to 64 +* KB. Increase this parameter to 2 GB. +*/ + device->dev.dma_parms = parent->dma_parms; +dma_set_max_seg_size (device->dma_device,SZ_2G ); + }else { +WARN_ON_ONCE (true); + } + } }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 203/434 staging: wilc1000: check if device is initialzied before changing vif
In reply to Greg Kroah-HartmanFrom: Adham Abozaeid <[email protected]>
[ Upstream commit 6df6f3849bb8f317bf2d52711aacea4292237ede ]
When killing hostapd, the interface is closed which deinitializes the device, then change virtual interface is called.
This change checks if the device is initialized before sending the interface change command to the device
--- .../staging/wilc1000/wilc_wfi_cfgoperations.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +12 -6
@@ -1419,8 +1419,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,if (vif->iftype ==WILC_AP_MODE || vif->iftype ==WILC_GO_MODE )wilc_wfi_deinit_mon_interface (wl, true); vif->iftype =WILC_STATION_MODE ; -wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), -WILC_STATION_MODE , vif->idx); + +if (wl->initialized) +wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), +WILC_STATION_MODE , vif->idx);memset (priv->assoc_stainfo.sta_associated_bss,0 ,WILC_MAX_NUM_STA *ETH_ALEN );
@@ -1432,8 +1434,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, priv->wdev.iftype = type; vif->monitor_flag =0 ; vif->iftype =WILC_CLIENT_MODE ; -wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), -WILC_STATION_MODE , vif->idx); + +if (wl->initialized) +wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), +WILC_STATION_MODE , vif->idx);break ;case NL80211_IFTYPE_AP :
@@ -1450,8 +1454,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, dev->ieee80211_ptr->iftype = type; priv->wdev.iftype = type; vif->iftype =WILC_GO_MODE ; -wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), -WILC_AP_MODE , vif->idx); + +if (wl->initialized) +wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), +WILC_AP_MODE , vif->idx);break ;default :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 204/434 gpu: host1x: Allocate gather copy for host1x
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit b78e70c04c149299bd210759d7c7af7c86b89ca8 ]
Currently when the gather buffers are copied, they are copied to a buffer that is allocated for the host1x client that wants to execute the command streams in the buffers. However, the gather buffers will be read by the host1x device, which causes SMMU faults if the DMA API is backed by an IOMMU.
Fix this by allocating the gather buffer copy for the host1x device, which makes sure that it will be mapped into the host1x's IOVA space if the DMA API is backed by an IOMMU.
--- drivers/gpu/host1x/job.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/host1x/job.c +6 -5
@@ -436,7 +436,8 @@ out:return err; } -static inline int copy_gathers (struct host1x_job *job,struct device *dev) +static inline int copy_gathers (struct device *host,struct host1x_job *job, +struct device *dev) {struct host1x_firewall fw;size_t size =0 ;
@@ -459,12 +460,12 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev)* Try a non-blocking allocation from a higher priority pools first, * as awaiting for the allocation here is a major performance hit. */ - job->gather_copy_mapped =dma_alloc_wc (dev, size, &job->gather_copy, + job->gather_copy_mapped =dma_alloc_wc (host, size, &job->gather_copy,GFP_NOWAIT );/* the higher priority allocation failed, try the generic-blocking */ if (!job->gather_copy_mapped) - job->gather_copy_mapped =dma_alloc_wc (dev, size, + job->gather_copy_mapped =dma_alloc_wc (host, size, &job->gather_copy,GFP_KERNEL );if (!job->gather_copy_mapped)
@@ -512,7 +513,7 @@ int host1x_job_pin(struct host1x_job *job, struct device *dev) goto out;if (IS_ENABLED (CONFIG_TEGRA_HOST1X_FIREWALL )) { - err =copy_gathers (job, dev); + err =copy_gathers (host->dev, job, dev);if (err) goto out; }
@@ -573,7 +574,7 @@ void host1x_job_unpin(struct host1x_job *job) job->num_unpins =0 ;if (job->gather_copy_size) -dma_free_wc (job->channel->dev, job->gather_copy_size, +dma_free_wc (host->dev, job->gather_copy_size, job->gather_copy_mapped, job->gather_copy); }EXPORT_SYMBOL (host1x_job_unpin);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 205/434 net: dsa: LAN9303: select REGMAP when LAN9303 enable
In reply to Greg Kroah-HartmanFrom: Mao Wenan <[email protected]>
[ Upstream commit b6989d248a2d13f02895bae1a9321b3bbccc0283 ]
When NET_DSA_SMSC_LAN9303=y and NET_DSA_SMSC_LAN9303_MDIO=y, below errors can be seen:drivers/net/dsa/lan9303_mdio.c:87:23: error: REGMAP_ENDIAN_LITTLE undeclared here (not in a function)
.reg_format_endian = REGMAP_ENDIAN_LITTLE,drivers/net/dsa/lan9303_mdio.c:93:3: error: const struct regmap_config has no member named reg_read
.reg_read = lan9303_mdio_read,
It should select REGMAP in config NET_DSA_SMSC_LAN9303.
--- drivers/net/dsa/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/dsa/Kconfig +1 -0
@@ -77,6 +77,7 @@ config NET_DSA_REALTEK_SMI config NET_DSA_SMSC_LAN9303 tristate select NET_DSA_TAG_LAN9303 + select REGMAP ---help--- This enables support for the SMSC/Microchip LAN9303 3 port ethernet switch chips.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 206/434 ALSA: hda/hdmi - implement mst_no_extra_pcms flag
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit 2a2edfbbfee47947dd05f5860c66c0e80ee5e09d ]
To support the DP-MST multiple streams via single connector feature, the HDMI driver was extended with the concept of backup PCMs. See commit 9152085defb6 ("ALSA: hda - add DP MST audio support").
This implementation works fine with snd_hda_intel.c as PCM topology is fully managed within the single driver.
When the HDA codec driver is used from ASoC components, the concept of backup PCMs no longer fits. For ASoC topologies, the physical HDMI converters are presented as backend DAIs and these should match with hardware capabilities. The ASoC topology may define arbitrary PCMs (i.e. frontend DAIs) and have processing elements before eventual routing to the HDMI BE DAIs. With backup PCMs, the link between FE and BE DAIs would become dynamic and change when monitors are (un)plugged. This would lead to modifying the topology every time hotplug events happen, which is not currently possible in ASoC and there does not seem to be any obvious benefits from this design.
To overcome above problems and enable the HDMI driver to be used from ASoC, this patch adds a new mode (mst_no_extra_pcms flags) to patch_hdmi.c. In this mode, the codec driver does not assume the backup PCMs to be created.
--- include/sound/hda_codec.h | 1 + sound/pci/hda/patch_hdmi.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-)
include/sound/hda_codec.h +1 -0
@@ -254,6 +254,7 @@ struct hda_codec { unsigned int force_pin_prefix:1; /* Add location prefix */ unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ + unsigned int mst_no_extra_pcms:1; /* no backup PCMs for DP-MST */#ifdef CONFIG_PM unsigned long power_on_acct;
sound/pci/hda/patch_hdmi.c +14 -5
@@ -2082,15 +2082,24 @@ static bool is_hdmi_pcm_attached(struct hdac_device *hdac, int pcm_idx)static int generic_hdmi_build_pcms (struct hda_codec *codec) {struct hdmi_spec *spec = codec->spec; -int idx; +int idx, pcm_num;/* * for non-mst mode, pcm number is the same as before -* for DP MST mode, pcm number is (nid number + dev_num - 1) -* dev_num is the device entry number in a pin -* +* for DP MST mode without extra PCM, pcm number is same +* for DP MST mode with extra PCMs, pcm number is +* (nid number + dev_num - 1) +* dev_num is the device entry number in a pin */ -for (idx =0 ; idx < spec->num_nids + spec->dev_num -1 ; idx++) { + +if (codec->mst_no_extra_pcms) + pcm_num = spec->num_nids; +else + pcm_num = spec->num_nids + spec->dev_num -1 ; + +codec_dbg (codec,"hdmi: pcm_num set to %d\n" , pcm_num); + +for (idx =0 ; idx < pcm_num; idx++) {struct hda_pcm *info;struct hda_pcm_stream *pstr;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 207/434 phy: renesas: phy-rcar-gen2: Fix the array off by one warning
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
[ Upstream commit c9baab38fe0e28762d0d67611cbe2aef0fb3fc72 ]
Fix the below smatch warning by adding variable check rather than the hardcoded value.
warn: array off by one? 'data->select_value[channel_num]'
--- drivers/phy/renesas/phy-rcar-gen2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/phy/renesas/phy-rcar-gen2.c +4 -1
@@ -71,6 +71,7 @@ struct rcar_gen2_phy_driver {struct rcar_gen2_phy_data {const struct phy_ops *gen2_phy_ops;const u32 (*select_value)[PHYS_PER_CHANNEL ]; +const u32 num_channels; };static int rcar_gen2_phy_init (struct phy *p)
@@ -271,11 +272,13 @@ static const u32 usb20_select_value[][PHYS_PER_CHANNEL] = {static const struct rcar_gen2_phy_data rcar_gen2_usb_phy_data = { .gen2_phy_ops = &rcar_gen2_phy_ops, .select_value = pci_select_value, + .num_channels =ARRAY_SIZE (pci_select_value), };static const struct rcar_gen2_phy_data rz_g1c_usb_phy_data = { .gen2_phy_ops = &rz_g1c_phy_ops, .select_value = usb20_select_value, + .num_channels =ARRAY_SIZE (usb20_select_value), };static const struct of_device_id rcar_gen2_phy_match_table[] = {
@@ -389,7 +392,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) channel->selected_phy =-1 ; error =of_property_read_u32 (np,"reg" , &channel_num); -if (error || channel_num >2 ) { +if (error || channel_num >= data->num_channels) {dev_err (dev,"Invalid \"reg\" property\n" );of_node_put (np);return error;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 208/434 phy: qcom-usb-hs: Fix extcon double register after power cycle
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 64f86b9978449ff05bfa6c64b4c5439e21e9c80b ]
Commit f0b5c2c96370 ("phy: qcom-usb-hs: Replace the extcon API") switched from extcon_register_notifier() to the resource-managed API, i.e. devm_extcon_register_notifier().
This is problematic in this case, because the extcon notifier is dynamically registered/unregistered whenever the PHY is powered on/off. The resource-managed API does not unregister the notifier until the driver is removed, so as soon as the PHY is power cycled, attempting to register the notifier again results in:
double register detected WARNING: CPU: 1 PID: 182 at kernel/notifier.c:26 notifier_chain_register+0x74/0xa0 Call trace: ... extcon_register_notifier+0x74/0xb8 devm_extcon_register_notifier+0x54/0xb8 qcom_usb_hs_phy_power_on+0x1fc/0x208 ...
... and USB stops working after plugging the cable out and in another time.
The easiest way to fix this is to make a partial revert of commit f0b5c2c96370 ("phy: qcom-usb-hs: Replace the extcon API") and avoid using the resource-managed API in this case.
--- drivers/phy/qualcomm/phy-qcom-usb-hs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/phy/qualcomm/phy-qcom-usb-hs.c +5 -2
@@ -158,8 +158,8 @@ static int qcom_usb_hs_phy_power_on(struct phy *phy)/* setup initial state */ qcom_usb_hs_phy_vbus_notifier (&uphy->vbus_notify, state, uphy->vbus_edev); - ret =devm_extcon_register_notifier (&ulpi->dev, uphy->vbus_edev, -EXTCON_USB , &uphy->vbus_notify); + ret =extcon_register_notifier (uphy->vbus_edev,EXTCON_USB , + &uphy->vbus_notify);if (ret) goto err_ulpi; }
@@ -180,6 +180,9 @@ static int qcom_usb_hs_phy_power_off(struct phy *phy) {struct qcom_usb_hs_phy *uphy =phy_get_drvdata (phy); +if (uphy->vbus_edev) +extcon_unregister_notifier (uphy->vbus_edev,EXTCON_USB , + &uphy->vbus_notify);regulator_disable (uphy->v3p3);regulator_disable (uphy->v1p8);clk_disable_unprepare (uphy->sleep_clk);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 209/434 s390/time: ensure get_clock_monotonic() returns monotonic values
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
[ Upstream commit 011620688a71f2f1fe9901dbc2479a7c01053196 ]
The current implementation of get_clock_monotonic() leaves it up to the caller to call the function with preemption disabled. The only core kernel caller (sched_clock) however does not disable preemption.
In order to make sure that all callers of this function see monotonic values handle disabling preemption within the function itself.
--- arch/s390/include/asm/timex.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/s390/include/asm/timex.h +10 -6
@@ -10,8 +10,9 @@#ifndef _ASM_S390_TIMEX_H#define _ASM_S390_TIMEX_H -#include <asm/lowcore.h> +#include <linux/preempt.h> #include <linux/time64.h> +#include <asm/lowcore.h> /* The value of the TOD clock for 1.1.1970. */ #define TOD_UNIX_EPOCH 0x7d91048bca000000ULL
@@ -186,15 +187,18 @@ extern unsigned char tod_clock_base[16] __aligned(8);/** * get_clock_monotonic - returns current time in clock rate units * -* The caller must ensure that preemption is disabled. * The clock and tod_clock_base get changed via stop_machine. -* Therefore preemption must be disabled when calling this -* function, otherwise the returned value is not guaranteed to -* be monotonic. +* Therefore preemption must be disabled, otherwise the returned +* value is not guaranteed to be monotonic. */ static inline unsigned long long get_tod_clock_monotonic (void ) { -return get_tod_clock () - *(unsigned long long *) &tod_clock_base[1 ]; +unsigned long long tod; + +preempt_disable (); + tod =get_tod_clock () - *(unsigned long long *) &tod_clock_base[1 ]; +preempt_enable (); +return tod; }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 210/434 s390: add error handling to perf_callchain_kernel
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit effb83ccc83a97dbbe5214f4c443522719f05f3a ]
perf_callchain_kernel stops neither when it encounters a garbage address, nor when it runs out of space. Fix both issues using x86 version as an inspiration.
--- arch/s390/kernel/perf_event.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/s390/kernel/perf_event.c +6 -2
@@ -224,9 +224,13 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) {struct unwind_state state; +unsigned long addr; -unwind_for_each_frame (&state, current, regs,0 ) -perf_callchain_store (entry, state.ip); +unwind_for_each_frame (&state, current, regs,0 ) { + addr =unwind_get_return_address (&state); +if (!addr ||perf_callchain_store (entry, addr)) +return ; + } }/* Perf definitions for PMU event attributes in sysfs */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 211/434 s390/mm: add mm_pxd_folded() checks to pxd_free()
In reply to Greg Kroah-HartmanFrom: Gerald Schaefer <[email protected]>
[ Upstream commit 2416cefc504ba8ae9b17e3e6b40afc72708f96be ]
Unlike pxd_free_tlb(), the pxd_free() functions do not check for folded page tables. This is not an issue so far, as those functions will actually never be called, since no code will reach them when page tables are folded.
In order to avoid future issues, and to make the s390 code more similar to other architectures, add mm_pxd_folded() checks, similar to how it is done in pxd_free_tlb().
This was found by testing a patch from from Anshuman Khandual, which is currently discussed on LKML ("mm/debug: Add tests validating architecture page table helpers").
--- arch/s390/include/asm/pgalloc.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
arch/s390/include/asm/pgalloc.h +14 -2
@@ -56,7 +56,12 @@ static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long address)crst_table_init (table, _REGION2_ENTRY_EMPTY);return (p4d_t *) table; } -#define p4d_free (mm, p4d) crst_table_free(mm, (unsigned long *) p4d) + +static inline void p4d_free (struct mm_struct *mm,p4d_t *p4d) +{ +if (!mm_p4d_folded (mm)) +crst_table_free (mm, (unsigned long *) p4d); +}static inline pud_t *pud_alloc_one (struct mm_struct *mm,unsigned long address) {
@@ -65,7 +70,12 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)crst_table_init (table, _REGION3_ENTRY_EMPTY);return (pud_t *) table; } -#define pud_free (mm, pud) crst_table_free(mm, (unsigned long *) pud) + +static inline void pud_free (struct mm_struct *mm,pud_t *pud) +{ +if (!mm_pud_folded (mm)) +crst_table_free (mm, (unsigned long *) pud); +}static inline pmd_t *pmd_alloc_one (struct mm_struct *mm,unsigned long vmaddr) {
@@ -83,6 +93,8 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)static inline void pmd_free (struct mm_struct *mm,pmd_t *pmd) { +if (mm_pmd_folded (mm)) +return ;pgtable_pmd_page_dtor (virt_to_page (pmd));crst_table_free (mm, (unsigned long *) pmd); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 212/434 net: hns3: add struct netdev_queue debug info for TX timeout
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 647522a5ef6401dcdb8ec417421e43fb21910167 ]
When there is a TX timeout, we can tell if the driver or stack has stopped the queue by looking at state field, and when has the last packet transmited by looking at trans_start field.
So this patch prints these two field in thehns3_get_tx_timeo_queue_info().
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +3 -0
@@ -1692,6 +1692,9 @@ static bool hns3_get_tx_timeo_queue_info(struct net_device *ndev) time_after(jiffies, (trans_start + ndev->watchdog_timeo))) { timeout_queue = i; +netdev_info (ndev,"queue state: 0x%lx, delta msecs: %u\n" , + q->state, +jiffies_to_msecs (jiffies - trans_start));break ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 213/434 libata: Ensure ata_port probe has completed before detach
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
[ Upstream commit 130f4caf145c3562108b245a576db30b916199d2 ]
With CONFIG_DEBUG_TEST_DRIVER_REMOVE set, we may find the following WARN:
[ 23.452574] ------------[ cut here ]------------ [ 23.457190] WARNING: CPU: 59 PID: 1 at drivers/ata/libata-core.c:6676 ata_host_detach+0x15c/0x168 [ 23.466047] Modules linked in: [ 23.469092] CPU: 59 PID: 1 Comm: swapper/0 Not tainted 5.4.0-rc1-00010-g5b83fd27752b-dirty #296 [ 23.477776] Hardware name: Huawei D06 /D06, BIOS Hisilicon D06 UEFI RC0 - V1.16.01 03/15/2019 [ 23.486286] pstate: a0c00009 (NzCv daif +PAN +UAO) [ 23.491065] pc : ata_host_detach+0x15c/0x168 [ 23.495322] lr : ata_host_detach+0x88/0x168 [ 23.499491] sp : ffff800011cabb50 [ 23.502792] x29: ffff800011cabb50 x28: 0000000000000007 [ 23.508091] x27: ffff80001137f068 x26: ffff8000112c0c28 [ 23.513390] x25: 0000000000003848 x24: ffff0023ea185300 [ 23.518689] x23: 0000000000000001 x22: 00000000000014c0 [ 23.523987] x21: 0000000000013740 x20: ffff0023bdc20000 [ 23.529286] x19: 0000000000000000 x18: 0000000000000004 [ 23.534584] x17: 0000000000000001 x16: 00000000000000f0 [ 23.539883] x15: ffff0023eac13790 x14: ffff0023eb76c408 [ 23.545181] x13: 0000000000000000 x12: ffff0023eac13790 [ 23.550480] x11: ffff0023eb76c228 x10: 0000000000000000 [ 23.555779] x9 : ffff0023eac13798 x8 : 0000000040000000 [ 23.561077] x7 : 0000000000000002 x6 : 0000000000000001 [ 23.566376] x5 : 0000000000000002 x4 : 0000000000000000 [ 23.571674] x3 : ffff0023bf08a0bc x2 : 0000000000000000 [ 23.576972] x1 : 3099674201f72700 x0 : 0000000000400284 [ 23.582272] Call trace: [ 23.584706] ata_host_detach+0x15c/0x168 [ 23.588616] ata_pci_remove_one+0x10/0x18 [ 23.592615] ahci_remove_one+0x20/0x40 [ 23.596356] pci_device_remove+0x3c/0xe0 [ 23.600267] really_probe+0xdc/0x3e0 [ 23.603830] driver_probe_device+0x58/0x100 [ 23.608000] device_driver_attach+0x6c/0x90 [ 23.612169] __driver_attach+0x84/0xc8 [ 23.615908] bus_for_each_dev+0x74/0xc8 [ 23.619730] driver_attach+0x20/0x28 [ 23.623292] bus_add_driver+0x148/0x1f0 [ 23.627115] driver_register+0x60/0x110 [ 23.630938] __pci_register_driver+0x40/0x48 [ 23.635199] ahci_pci_driver_init+0x20/0x28 [ 23.639372] do_one_initcall+0x5c/0x1b0 [ 23.643199] kernel_init_freeable+0x1a4/0x24c [ 23.647546] kernel_init+0x10/0x108 [ 23.651023] ret_from_fork+0x10/0x18 [ 23.654590] ---[ end trace 634a14b675b71c13 ]---
With KASAN also enabled, we may also get many use-after-free reports.
The issue is that when CONFIG_DEBUG_TEST_DRIVER_REMOVE is set, we may attempt to detach the ata_port before it has been probed.
This is because the ata_ports are async probed, meaning that there is no guarantee that the ata_port has probed prior to detach. When the ata_port does probe in this scenario, we get all sorts of issues as the detach may have already happened.
Fix by ensuring synchronisation with async_synchronize_full(). We could alternatively use the cookie returned from the ata_port probe async_schedule() call, but that means managing the cookie, so more complicated.
--- drivers/ata/libata-core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ata/libata-core.c +3 -0
@@ -6708,6 +6708,9 @@ void ata_host_detach(struct ata_host *host) {int i; +/* Ensure ata_port probe has completed */ +async_synchronize_full (); +for (i =0 ; i < host->n_ports; i++)ata_port_detach (host->ports[i]);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 214/434 loop: fix no-unmap write-zeroes request behavior
In reply to Greg Kroah-HartmanFrom: Darrick J. Wong <[email protected]>
[ Upstream commit efcfec579f6139528c9e6925eca2bc4a36da65c6 ]
Currently, if the loop device receives a WRITE_ZEROES request, it asks the underlying filesystem to punch out the range. This behavior is correct if unmapping is allowed. However, a NOUNMAP request means that the caller doesn't want us to free the storage backing the range, so punching out the range is incorrect behavior.
To satisfy a NOUNMAP | WRITE_ZEROES request, loop should ask the underlying filesystem to FALLOC_FL_ZERO_RANGE, which is (according to the fallocate documentation) required to ensure that the entire range is backed by real storage, which suffices for our purposes.
--- drivers/block/loop.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/block/loop.c +18 -8
@@ -417,18 +417,20 @@ out_free_page:return ret; } -static int lo_discard (struct loop_device *lo,struct request *rq,loff_t pos) +static int lo_fallocate (struct loop_device *lo,struct request *rq,loff_t pos, +int mode) {/* -* We use punch hole to reclaim the free space used by the -* image a.k.a. discard. However we do not support discard if -* encryption is enabled, because it may give an attacker -* useful information. +* We use fallocate to manipulate the space mappings used by the image +* a.k.a. discard/zerorange. However we do not support this if +* encryption is enabled, because it may give an attacker useful +* information. */ struct file *file = lo->lo_backing_file; -int mode =FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE ;int ret; + mode |=FALLOC_FL_KEEP_SIZE ; +if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { ret = -EOPNOTSUPP ; goto out;
@@ -596,9 +598,17 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)switch (req_op (rq)) {case REQ_OP_FLUSH :return lo_req_flush (lo, rq); -case REQ_OP_DISCARD :case REQ_OP_WRITE_ZEROES : -return lo_discard (lo, rq, pos); +/* +* If the caller doesn't want deallocation, call zeroout to +* write zeroes the range. Otherwise, punch them out. +*/ +return lo_fallocate (lo, rq, pos, + (rq->cmd_flags &REQ_NOUNMAP ) ? +FALLOC_FL_ZERO_RANGE : +FALLOC_FL_PUNCH_HOLE ); +case REQ_OP_DISCARD : +return lo_fallocate (lo, rq, pos,FALLOC_FL_PUNCH_HOLE );case REQ_OP_WRITE :if (lo->transfer)return lo_write_transfer (lo, rq, pos);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 215/434 net/mlx5e: Verify that rule has at least one fwd/drop action
In reply to Greg Kroah-HartmanFrom: Vlad Buslov <[email protected]>
[ Upstream commit ae2741e2b6ce2bf1b656b1152c4ef147ff35b096 ]
Currently, mlx5 tc layer doesn't verify that rule has at least one forward or drop action which leads to following firmware syndrome when user tries to offload such action:
[ 1824.860501] mlx5_core 0000:81:00.0: mlx5_cmd_check:753:(pid 29458): SET_FLOW_TABLE_ENTRY(0x936) op_mod(0x0) failed, status bad parameter(0x3), syndrome (0x144b7a)
Add check at the end of parse_tc_fdb_actions() that verifies that resulting attribute has action fwd or drop flag set.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +6 -0
@@ -3443,6 +3443,12 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, attr->action |=MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ; } +if (!(attr->action & + (MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |MLX5_FLOW_CONTEXT_ACTION_DROP ))) { +NL_SET_ERR_MSG (extack,"Rule must have at least one forward/drop action" ); +return -EOPNOTSUPP ; + } +if (attr->split_count >0 && !mlx5_esw_has_fwd_fdb (priv->mdev)) {NL_SET_ERR_MSG_MOD (extack,"current firmware doesn't support split rule for port mirroring" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 216/434 pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 884caadad128efad8e00c1cdc3177bc8912ee8ec ]
The definitions for bit field [19:18] of the Peripheral Function Select Register 3 were accidentally copied from bit field [20], leading to duplicates for the TCLK1_B function, and missing TCLK0, CAN_CLK_B, and ET0_ETXD4 functions.
Fix this by adding the missing GPIO_FN_CAN_CLK_B and GPIO_FN_ET0_ETXD4 enum values, and correcting the functions.
--- arch/sh/include/cpu-sh4/cpu/sh7734.h | 2 +- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/sh/include/cpu-sh4/cpu/sh7734.h +1 -1
@@ -134,7 +134,7 @@ enum {GPIO_FN_EX_WAIT1 ,GPIO_FN_SD1_DAT0_A ,GPIO_FN_DREQ2 ,GPIO_FN_CAN1_TX_C ,GPIO_FN_ET0_LINK_C ,GPIO_FN_ET0_ETXD5_A ,GPIO_FN_EX_WAIT0 ,GPIO_FN_TCLK1_B , -GPIO_FN_RD_WR ,GPIO_FN_TCLK0 , +GPIO_FN_RD_WR ,GPIO_FN_TCLK0 ,GPIO_FN_CAN_CLK_B ,GPIO_FN_ET0_ETXD4 ,GPIO_FN_EX_CS5 ,GPIO_FN_SD1_CMD_A ,GPIO_FN_ATADIR ,GPIO_FN_QSSL_B ,GPIO_FN_ET0_ETXD3_A , GPIO_FN_EX_CS4, GPIO_FN_SD1_WP_A, GPIO_FN_ATAWR, GPIO_FN_QMI_QIO1_B,
drivers/pinctrl/sh-pfc/pfc-sh7734.c +2 -2
@@ -1450,7 +1450,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {GPIO_FN (ET0_ETXD2_A ),GPIO_FN (EX_CS5 ),GPIO_FN (SD1_CMD_A ),GPIO_FN (ATADIR ),GPIO_FN (QSSL_B ),GPIO_FN (ET0_ETXD3_A ), -GPIO_FN (RD_WR ),GPIO_FN (TCLK1_B ), +GPIO_FN (RD_WR ),GPIO_FN (TCLK0 ),GPIO_FN (CAN_CLK_B ),GPIO_FN (ET0_ETXD4 ),GPIO_FN (EX_WAIT0 ),GPIO_FN (TCLK1_B ),GPIO_FN (EX_WAIT1 ),GPIO_FN (SD1_DAT0_A ),GPIO_FN (DREQ2 ), GPIO_FN(CAN1_TX_C), GPIO_FN(ET0_LINK_C), GPIO_FN(ET0_ETXD5_A),
@@ -1949,7 +1949,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {/* IP3_20 [1] */ FN_EX_WAIT0 ,FN_TCLK1_B ,/* IP3_19_18 [2] */ -FN_RD_WR ,FN_TCLK1_B ,0 ,0 , +FN_RD_WR ,FN_TCLK0 ,FN_CAN_CLK_B ,FN_ET0_ETXD4 ,/* IP3_17_15 [3] */ FN_EX_CS5 ,FN_SD1_CMD_A ,FN_ATADIR ,FN_QSSL_B , FN_ET0_ETXD3_A, 0, 0, 0,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 217/434 ALSA: bebob: expand sleep just after breaking connections for protocol version 1
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit d3eabe939aee3ffd5b133766a932629a9746298c ]
As long as I investigated, some devices with BeBoB protocol version 1 can be freezed during several hundreds milliseconds after breaking connections. When accessing during the freezed time, any transaction is corrupted. In the worst case, the device is going to reboot.
I can see this issue in:
* Roland FA-66
* M-Audio FireWire Solo
This commit expands sleep just after breaking connections to avoid the freezed time as much as possible. I note that the freeze/reboot behaviour is similar to below models:
* Focusrite Saffire Pro 10 I/O
* Focusrite Saffire Pro 26 I/O
The above models certainly reboot after breaking connections.
--- sound/firewire/bebob/bebob_stream.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
sound/firewire/bebob/bebob_stream.c +6 -5
@@ -415,15 +415,16 @@ static int make_both_connections(struct snd_bebob *bebob)return 0 ; } -static void -break_both_connections (struct snd_bebob *bebob) +static void break_both_connections (struct snd_bebob *bebob) {cmp_connection_break (&bebob->in_conn);cmp_connection_break (&bebob->out_conn); -/* These models seems to be in transition state for a longer time. */ -if (bebob->maudio_special_quirk !=NULL ) -msleep (200 ); +// These models seem to be in transition state for a longer time. When +// accessing in the state, any transactions is corrupted. In the worst +// case, the device is going to reboot. +if (bebob->version <2 ) +msleep (600 ); } static int
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 218/434 iio: dln2-adc: fix iio_triggered_buffer_postenable() position
In reply to Greg Kroah-HartmanFrom: Alexandru Ardelean <[email protected]>
[ Upstream commit a7bddfe2dfce1d8859422124abe1964e0ecd386e ]
The iio_triggered_buffer_postenable() hook should be called first to attach the poll function. The iio_triggered_buffer_predisable() hook is called last (as is it should).
This change moves iio_triggered_buffer_postenable() to be called first. It adds iio_triggered_buffer_predisable() on the error paths of the postenable hook.
For the predisable hook, some code-paths have been changed to make sure that the iio_triggered_buffer_predisable() hook gets called in case there is an error before it.
--- drivers/iio/adc/dln2-adc.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/iio/adc/dln2-adc.c +14 -6
@@ -524,6 +524,10 @@ static int dln2_adc_triggered_buffer_postenable(struct iio_dev *indio_dev)u16 conflict;unsigned int trigger_chan; + ret =iio_triggered_buffer_postenable (indio_dev); +if (ret) +return ret; +mutex_lock (&dln2->mutex);/* Enable ADC */
@@ -537,6 +541,7 @@ static int dln2_adc_triggered_buffer_postenable(struct iio_dev *indio_dev) (int)conflict); ret = -EBUSY ; } +iio_triggered_buffer_predisable (indio_dev);return ret; }
@@ -550,6 +555,7 @@ static int dln2_adc_triggered_buffer_postenable(struct iio_dev *indio_dev)mutex_unlock (&dln2->mutex);if (ret <0 ) {dev_dbg (&dln2->pdev->dev,"Problem in %s\n" , __func__); +iio_triggered_buffer_predisable (indio_dev);return ret; } }else {
@@ -557,12 +563,12 @@ static int dln2_adc_triggered_buffer_postenable(struct iio_dev *indio_dev)mutex_unlock (&dln2->mutex); } -return iio_triggered_buffer_postenable (indio_dev); +return 0 ; }static int dln2_adc_triggered_buffer_predisable (struct iio_dev *indio_dev) { -int ret; +int ret, ret2;struct dln2_adc *dln2 =iio_priv (indio_dev);mutex_lock (&dln2->mutex);
@@ -577,12 +583,14 @@ static int dln2_adc_triggered_buffer_predisable(struct iio_dev *indio_dev) ret =dln2_adc_set_port_enabled (dln2, false,NULL );mutex_unlock (&dln2->mutex); -if (ret <0 ) { +if (ret <0 )dev_dbg (&dln2->pdev->dev,"Problem in %s\n" , __func__); -return ret; - } -return iio_triggered_buffer_predisable (indio_dev); + ret2 =iio_triggered_buffer_predisable (indio_dev); +if (ret ==0 ) + ret = ret2; + +return ret; }static const struct iio_buffer_setup_ops dln2_adc_buffer_setup_ops = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 219/434 libbpf: Fix error handling in bpf_map__reuse_fd()
In reply to Greg Kroah-HartmanFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit d1b4574a4b86565325ef2e545eda8dfc9aa07c60 ]
bpf_map__reuse_fd() was calling close() in the error path before returning an error value based on errno. However, close can change errno, so that can lead to potentially misleading error messages. Instead, explicitly store errno in the err variable before each goto.
--- tools/lib/bpf/libbpf.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +10 -4
@@ -1897,16 +1897,22 @@ int bpf_map__reuse_fd(struct bpf_map *map, int fd)return -errno; new_fd =open ("/" ,O_RDONLY |O_CLOEXEC ); -if (new_fd <0 ) +if (new_fd <0 ) { + err = -errno; goto err_free_new_name; + } new_fd =dup3 (fd, new_fd,O_CLOEXEC ); -if (new_fd <0 ) +if (new_fd <0 ) { + err = -errno; goto err_close_new_fd; + } err =zclose (map->fd); -if (err) +if (err) { + err = -errno; goto err_close_new_fd; + }free (map->name); map->fd = new_fd;
@@ -1925,7 +1931,7 @@ err_close_new_fd:close (new_fd); err_free_new_name:free (new_name); -return -errno; +return err; }int bpf_map__resize (struct bpf_map *map,__u32 max_entries)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 220/434 Bluetooth: Fix advertising duplicated flags
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 6012b9346d8959194c239fd60a62dfec98d43048 ]
Instances may have flags set as part of its data in which case the code should not attempt to add it again otherwise it can cause duplication:
< HCI Command: LE Set Extended Advertising Data (0x08|0x0037) plen 35
Handle: 0x00
Operation: Complete extended advertising data (0x03)
Fragment preference: Minimize fragmentation (0x01)
Data length: 0x06
Flags: 0x04
BR/EDR Not Supported
Flags: 0x06
LE General Discoverable Mode
BR/EDR Not Supported--- net/bluetooth/hci_request.c | 9 +++++++++ 1 file changed, 9 insertions(+)
net/bluetooth/hci_request.c +9 -0
@@ -1273,6 +1273,14 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) instance_flags =get_adv_instance_flags (hdev, instance); +/* If instance already has the flags set skip adding it once +* again. +*/ +if (adv_instance &&eir_get_data (adv_instance->adv_data, + adv_instance->adv_data_len,EIR_FLAGS , +NULL )) + goto skip_flags; +/* The Add Advertising command allows userspace to set both the general * and limited discoverable flags. */
@@ -1305,6 +1313,7 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) } } +skip_flags:if (adv_instance) {memcpy (ptr, adv_instance->adv_data, adv_instance->adv_data_len);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 221/434 ALSA: pcm: Fix missing check of the new non-cached buffer type
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 6111fd2370eecae9f11bfdc08ba097e0b51fcfd3 ]
The check for the mmap support via hw_support_mmap() function misses the case where the device is with SNDRV_DMA_TYPE_DEV_UC, which should have been treated equally as SNDRV_DMA_TYPE_DEV. Let's fix it.
Note that this bug doesn't hit any practical problem, because SNDRV_DMA_TYPE_DEV_UC is used only for x86-specific drivers (snd-hda-intel and snd-intel8x0) for the specific platforms that need the non-cached buffers. And, on such platforms, hw_support_mmap() already returns true in anyway. That's the reason I didn't put Cc-to-stable mark here. This is only for any theoretical future extension.
--- sound/core/pcm_native.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/core/pcm_native.c +2 -1
@@ -222,7 +222,8 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream)return false;if (substream->ops->mmap || - substream->dma_buffer.dev.type !=SNDRV_DMA_TYPE_DEV ) + (substream->dma_buffer.dev.type !=SNDRV_DMA_TYPE_DEV && + substream->dma_buffer.dev.type !=SNDRV_DMA_TYPE_DEV_UC ))return true;return dma_can_mmap (substream->dma_buffer.dev.dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 222/434 spi: sifive: disable clk when probe fails and remove
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit a725272bda77e61c1b4de85c7b0c875b2ea639b6 ]
The driver forgets to disable and unprepare clk when probe fails and remove.
Add the calls to fix the problem.
--- drivers/spi/spi-sifive.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/spi/spi-sifive.c +7 -4
@@ -357,14 +357,14 @@ static int sifive_spi_probe(struct platform_device *pdev)if (!cs_bits) {dev_err (&pdev->dev,"Could not auto probe CS lines\n" ); ret = -EINVAL ; - goto put_master; + goto disable_clk; } num_cs =ilog2 (cs_bits) +1 ;if (num_cs >SIFIVE_SPI_MAX_CS ) {dev_err (&pdev->dev,"Invalid number of spi slaves\n" ); ret = -EINVAL ; - goto put_master; + goto disable_clk; }/* Define our master */
@@ -393,7 +393,7 @@ static int sifive_spi_probe(struct platform_device *pdev) dev_name(&pdev->dev), spi);if (ret) {dev_err (&pdev->dev,"Unable to bind to interrupt\n" ); - goto put_master; + goto disable_clk; } dev_info(&pdev->dev, "mapped; irq=%d, cs=%d\n",
@@ -402,11 +402,13 @@ static int sifive_spi_probe(struct platform_device *pdev) ret =devm_spi_register_master (&pdev->dev, master);if (ret <0 ) {dev_err (&pdev->dev,"spi_register_master failed\n" ); - goto put_master; + goto disable_clk; }return 0 ; +disable_clk: +clk_disable_unprepare (spi->clk); put_master:spi_master_put (master);
@@ -420,6 +422,7 @@ static int sifive_spi_remove(struct platform_device *pdev)/* Disable all the interrupts just in case */ sifive_spi_write (spi,SIFIVE_SPI_REG_IE ,0 ); +clk_disable_unprepare (spi->clk);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 223/434 ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit f9ad75468453b019b92c5296e6a04bf7c37f49e4 ]
updated solution to the problem reported with randconfig:
CONFIG_SND_SOC_SOF_IMX depends on CONFIG_SND_SOC_SOF, but is in turn referenced by the sof-of-dev driver. This creates a reverse dependency that manifests in a link error when CONFIG_SND_SOC_SOF_OF is built-in but CONFIG_SND_SOC_SOF_IMX=m:
sound/soc/sof/sof-of-dev.o:(.data+0x118): undefined reference to `sof_imx8_ops'
use def_trisate to propagate the right settings without select.
--- sound/soc/sof/imx/Kconfig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/soc/sof/imx/Kconfig +6 -2
@@ -11,8 +11,8 @@ config SND_SOC_SOF_IMX_TOPLEVEL if SND_SOC_SOF_IMX_TOPLEVEL -config SND_SOC_SOF_IMX8 - tristate "SOF support for i.MX8" +config SND_SOC_SOF_IMX8_SUPPORT + bool "SOF support for i.MX8" depends on IMX_SCU depends on IMX_DSP help
@@ -20,4 +20,8 @@ config SND_SOC_SOF_IMX8 Say Y if you have such a device. If unsure select "N". +config SND_SOC_SOF_IMX8 + def_tristate SND_SOC_SOF_OF + depends on SND_SOC_SOF_IMX8_SUPPORT + endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 224/434 pinctrl: qcom: sc7180: Add missing tile info in SDC_QDSD_PINGROUP/UFS_RESET
In reply to Greg Kroah-HartmanFrom: Rajendra Nayak <[email protected]>
[ Upstream commit 81898a44f288607cb3b11a42aed6efb646891c19 ]
The SDC_QDSD_PINGROUP/UFS_RESET macros are missing the .tile info needed to calculate the right register offsets. Adding them here and also adjusting the offsets accordingly.
--- drivers/pinctrl/qcom/pinctrl-sc7180.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/pinctrl/qcom/pinctrl-sc7180.c +10 -8
@@ -77,6 +77,7 @@ enum { .intr_cfg_reg = 0, \ .intr_status_reg = 0, \ .intr_target_reg = 0, \ + .tile = SOUTH, \ .mux_bit = -1, \ .pull_bit = pull, \ .drv_bit = drv, \
@@ -102,6 +103,7 @@ enum { .intr_cfg_reg = 0, \ .intr_status_reg = 0, \ .intr_target_reg = 0, \ + .tile = SOUTH, \ .mux_bit = -1, \ .pull_bit = 3, \ .drv_bit = 0, \
@@ -1087,14 +1089,14 @@ static const struct msm_pingroup sc7180_groups[] = { [116] = PINGROUP(116, WEST, qup04, qup04, _, _, _, _, _, _, _), [117] = PINGROUP(117, WEST, dp_hot, _, _, _, _, _, _, _, _), [118] = PINGROUP(118, WEST, _, _, _, _, _, _, _, _, _), - [119] = UFS_RESET(ufs_reset, 0x97f000), - [120] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x97a000, 15, 0), - [121] = SDC_QDSD_PINGROUP(sdc1_clk, 0x97a000, 13, 6), - [122] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x97a000, 11, 3), - [123] = SDC_QDSD_PINGROUP(sdc1_data, 0x97a000, 9, 0), - [124] = SDC_QDSD_PINGROUP(sdc2_clk, 0x97b000, 14, 6), - [125] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x97b000, 11, 3), - [126] = SDC_QDSD_PINGROUP(sdc2_data, 0x97b000, 9, 0), + [119] = UFS_RESET(ufs_reset, 0x7f000), + [120] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x7a000, 15, 0), + [121] = SDC_QDSD_PINGROUP(sdc1_clk, 0x7a000, 13, 6), + [122] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x7a000, 11, 3), + [123] = SDC_QDSD_PINGROUP(sdc1_data, 0x7a000, 9, 0), + [124] = SDC_QDSD_PINGROUP(sdc2_clk, 0x7b000, 14, 6), + [125] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x7b000, 11, 3), + [126] = SDC_QDSD_PINGROUP(sdc2_data, 0x7b000, 9, 0), };static const struct msm_pinctrl_soc_data sc7180_pinctrl = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 225/434 pinctrl: amd: fix __iomem annotation in amd_gpio_irq_handler()
In reply to Greg Kroah-HartmanFrom: Ben Dooks (Codethink) <[email protected]>
[ Upstream commit 10ff58aa3c2e2a093b6ad615a7e3d8bb0dc613e5 ]
The regs pointer in amd_gpio_irq_handler() should have __iomem on it, so add that to fix the following sparse warnings:
drivers/pinctrl/pinctrl-amd.c:555:14: warning: incorrect type in assignment (different address spaces)drivers/pinctrl/pinctrl-amd.c:555:14: expected unsigned int [usertype] *regsdrivers/pinctrl/pinctrl-amd.c:555:14: got void [noderef] <asn:2> *basedrivers/pinctrl/pinctrl-amd.c:563:34: warning: incorrect type in argument 1 (different address spaces)drivers/pinctrl/pinctrl-amd.c:563:34: expected void const volatile [noderef] <asn:2> *addrdrivers/pinctrl/pinctrl-amd.c:563:34: got unsigned int [usertype] *drivers/pinctrl/pinctrl-amd.c:580:34: warning: incorrect type in argument 1 (different address spaces)drivers/pinctrl/pinctrl-amd.c:580:34: expected void const volatile [noderef] <asn:2> *addrdrivers/pinctrl/pinctrl-amd.c:580:34: got unsigned int [usertype] *drivers/pinctrl/pinctrl-amd.c:587:25: warning: incorrect type in argument 2 (different address spaces)drivers/pinctrl/pinctrl-amd.c:587:25: expected void volatile [noderef] <asn:2> *addrdrivers/pinctrl/pinctrl-amd.c:587:25: got unsigned int [usertype] *
--- drivers/pinctrl/pinctrl-amd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/pinctrl-amd.c +2 -1
@@ -540,7 +540,8 @@ static irqreturn_t amd_gpio_irq_handler(int irq, void *dev_id)irqreturn_t ret =IRQ_NONE ;unsigned int i, irqnr;unsigned long flags; -u32 *regs, regval; +u32 __iomem *regs; +u32 regval;u64 status, mask;/* Read the wake status */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 226/434 ixgbe: protect TX timestamping from API misuse
In reply to Greg Kroah-HartmanFrom: Manjunath Patil <[email protected]>
[ Upstream commit 07066d9dc3d2326fbad8f7b0cb0120cff7b7dedb ]
HW timestamping can only be requested for a packet if the NIC is first setup via ioctl(SIOCSHWTSTAMP). If this step was skipped, then the ixgbe driver still allowed TX packets to request HW timestamping. In this situation, we see 'clearing Tx Timestamp hang' noise in the log.
Fix this by checking that the NIC is configured for HW TX timestamping before accepting a HW TX timestamping request.
Similar-to:
commit 26bd4e2db06b ("igb: protect TX timestamping from API misuse") commit 0a6f2f05a2f5 ("igb: Fix a test with HWTSTAMP_TX_ON")
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -1
@@ -8639,7 +8639,8 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP ) && adapter->ptp_clock) { -if (!test_and_set_bit_lock (__IXGBE_PTP_TX_IN_PROGRESS, +if (adapter->tstamp_config.tx_type ==HWTSTAMP_TX_ON && + !test_and_set_bit_lock (__IXGBE_PTP_TX_IN_PROGRESS, &adapter->state)) {skb_shinfo (skb)->tx_flags |=SKBTX_IN_PROGRESS ; tx_flags |=IXGBE_TX_FLAGS_TSTAMP ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 227/434 cpufreq: sun50i: Fix CPU speed bin detection
In reply to Greg Kroah-HartmanFrom: Ondrej Jirman <[email protected]>
[ Upstream commit c23734487fb44ee16c1b007ba72d793c085e4ec4 ]
I have observed failures to boot on Orange Pi 3, because this driver determined that my SoC is from the normal bin, but my SoC only works reliably with the OPP values for the slowest bin.
By querying H6 owners, it was found that e-fuse values found in the wild are in the range of 1-3, value of 7 was not reported, yet. From this and from unused defines in BSP code, it can be assumed that meaning of efuse values on H6 actually is:
- 1 = slowest bin
- 2 = normal bin
- 3 = fastest bin
Vendor code actually treats 0 and 2 as invalid efuse values, but later treats all invalid values as a normal bin. This looks like a mistake in bin detection code, that was plastered over by a hack in cpufreq code, so let's not repeat it here. It probably only works because there are no SoCs in the wild with efuse value of 0, and fast bin SoCs are made to use normal bin OPP tables, which is also safe.
Let's play it safe and interpret 0 as the slowest bin, but fix detection of other bins to match this research. More research will be done before actual OPP tables are merged.
--- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/cpufreq/sun50i-cpufreq-nvmem.c +10 -15
@@ -25,7 +25,7 @@static struct platform_device *cpufreq_dt_pdev, *sun50i_cpufreq_pdev;/** -* sun50i_cpufreq_get_efuse() - Parse and return efuse value present on SoC +* sun50i_cpufreq_get_efuse() - Determine speed grade from efuse value * @versions: Set to the value parsed from efuse * * Returns 0 if success.
@@ -69,21 +69,16 @@ static int sun50i_cpufreq_get_efuse(u32 *versions)return PTR_ERR (speedbin); efuse_value = (*speedbin >>NVMEM_SHIFT ) &NVMEM_MASK ; -switch (efuse_value) { -case 0b0001 : - *versions =1 ; -break ; -case 0b0011 : - *versions =2 ; -break ; -default : -/* -* For other situations, we treat it as bin0. -* This vf table can be run for any good cpu. -*/ + +/* +* We treat unexpected efuse values as if the SoC was from +* the slowest bin. Expected efuse values are 1-3, slowest +* to fastest. +*/ +if (efuse_value >=1 && efuse_value <=3 ) + *versions = efuse_value -1 ; +else *versions =0 ; -break ; - }kfree (speedbin);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 228/434 media: rcar_drif: fix a memory disclosure
In reply to Greg Kroah-HartmanFrom: Kangjie Lu <[email protected]>
[ Upstream commit d39083234c60519724c6ed59509a2129fd2aed41 ]
"f->fmt.sdr.reserved" is uninitialized. As other peer drivers like msi2500 and airspy do, the fix initializes it to avoid memory disclosures.
--- drivers/media/platform/rcar_drif.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/rcar_drif.c +1 -0
@@ -912,6 +912,7 @@ static int rcar_drif_g_fmt_sdr_cap(struct file *file, void *priv, {struct rcar_drif_sdr *sdr =video_drvdata (file); +memset (f->fmt.sdr.reserved,0 ,sizeof (f->fmt.sdr.reserved)); f->fmt.sdr.pixelformat = sdr->fmt->pixelformat; f->fmt.sdr.buffersize = sdr->fmt->buffersize;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 229/434 media: v4l2-core: fix touch support in v4l_g_fmt
In reply to Greg Kroah-HartmanFrom: Vandana BN <[email protected]>
[ Upstream commit 545b618cfb5cadacd00c25066b9a36540e5ca9e9 ]
v4l_s_fmt, for VFL_TYPE_TOUCH, sets unneeded members of the v4l2_pix_format structure to default values.This was missing in v4l_g_fmt, which would lead to failures in v4l2-compliance tests.
--- drivers/media/v4l2-core/v4l2-ioctl.c | 33 +++++++++++++++------------- 1 file changed, 18 insertions(+), 15 deletions(-)
drivers/media/v4l2-core/v4l2-ioctl.c +18 -15
@@ -1466,10 +1466,26 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,return ret; } +static void v4l_pix_format_touch (struct v4l2_pix_format *p) +{ +/* +* The v4l2_pix_format structure contains fields that make no sense for +* touch. Set them to default values in this case. +*/ + + p->field =V4L2_FIELD_NONE ; + p->colorspace =V4L2_COLORSPACE_RAW ; + p->flags =0 ; + p->ycbcr_enc =0 ; + p->quantization =0 ; + p->xfer_func =0 ; +} +static int v4l_g_fmt (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) {struct v4l2_format *p = arg; +struct video_device *vfd =video_devdata (file);int ret =check_fmt (file, p->type);if (ret)
@@ -1507,6 +1523,8 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops, ret = ops->vidioc_g_fmt_vid_cap (file, fh, arg);/* just in case the driver zeroed it again */ p->fmt.pix.priv =V4L2_PIX_FMT_PRIV_MAGIC ; +if (vfd->vfl_type ==VFL_TYPE_TOUCH ) +v4l_pix_format_touch (&p->fmt.pix);return ret;case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :return ops->vidioc_g_fmt_vid_cap_mplane (file, fh, arg);
@@ -1544,21 +1562,6 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,return -EINVAL ; } -static void v4l_pix_format_touch (struct v4l2_pix_format *p) -{ -/* -* The v4l2_pix_format structure contains fields that make no sense for -* touch. Set them to default values in this case. -*/ - - p->field =V4L2_FIELD_NONE ; - p->colorspace =V4L2_COLORSPACE_RAW ; - p->flags =0 ; - p->ycbcr_enc =0 ; - p->quantization =0 ; - p->xfer_func =0 ; -} -static int v4l_s_fmt (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 230/434 nvme: introduce "Command Aborted By host" status code
In reply to Greg Kroah-HartmanFrom: Max Gurtovoy <[email protected]>
[ Upstream commit 2dc3947b53f573e8a75ea9cbec5588df88ca502e ]
Fix the status code of canceled requests initiated by the host according to TP4028 (Status Code 0x371):
"Command Aborted By host: The command was aborted as a result of host action (e.g., the host disconnected the Fabric connection)."
Also in a multipath environment, unless otherwise specified, errors of this type (path related) should be retried using a different path, if one is available.
--- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/multipath.c | 1 + include/linux/nvme.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -313,7 +313,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)if (blk_mq_request_completed (req))return true; -nvme_req (req)->status =NVME_SC_HOST_PATH_ERROR ; +nvme_req (req)->status =NVME_SC_HOST_ABORTED_CMD ;blk_mq_complete_request (req);return true; }
drivers/nvme/host/multipath.c +1 -0
@@ -95,6 +95,7 @@ void nvme_failover_req(struct request *req) }break ;case NVME_SC_HOST_PATH_ERROR : +case NVME_SC_HOST_ABORTED_CMD :/* * Temporary transport disruption in talking to the controller. * Try to send on a new path.
include/linux/nvme.h +1 -0
@@ -1368,6 +1368,7 @@ enum {NVME_SC_ANA_INACCESSIBLE =0x302 ,NVME_SC_ANA_TRANSITION =0x303 ,NVME_SC_HOST_PATH_ERROR =0x370 , +NVME_SC_HOST_ABORTED_CMD =0x371 ,NVME_SC_CRD =0x1800 , NVME_SC_DNR = 0x4000,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 231/434 media: staging/imx: Use a shorter name for driver
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit ce22c6f242b6d7b5e0318da2c92b5b00b5bbc698 ]
Currently v4l2-compliance tool returns the following output:
Compliance test for imx-media-captu device /dev/video0:
Driver Info:
Driver name : imx-media-captu
Card type : imx-media-capture
...
The driver name string is limited to 16 characters, so provide a shorter name so that we can have a better output.
While at it, use the same shorter name for driver and card.
--- drivers/staging/media/imx/imx-media-capture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/media/imx/imx-media-capture.c +4 -2
@@ -26,6 +26,8 @@#include <media/imx.h> #include "imx-media.h" +#define IMX_CAPTURE_NAME "imx-capture" +struct capture_priv {struct imx_media_video_dev vdev;
@@ -69,8 +71,8 @@ static int vidioc_querycap(struct file *file, void *fh, {struct capture_priv *priv =video_drvdata (file); -strscpy (cap->driver,"imx-media-capture" ,sizeof (cap->driver)); -strscpy (cap->card,"imx-media-capture" ,sizeof (cap->card)); +strscpy (cap->driver,IMX_CAPTURE_NAME ,sizeof (cap->driver)); +strscpy (cap->card,IMX_CAPTURE_NAME ,sizeof (cap->card));snprintf (cap->bus_info,sizeof (cap->bus_info),"platform:%s" , priv->src_sd->name);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 232/434 nvmem: imx-ocotp: reset error status on probe
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
[ Upstream commit c33c585f1b3a99d53920bdac614aca461d8db06f ]
If software running before the OCOTP driver is loaded left the controller with the error status pending, the driver will never be able to complete the read timing setup. Reset the error status on probe to make sure the controller is in usable state.
--- drivers/nvmem/imx-ocotp.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/nvmem/imx-ocotp.c +4 -0
@@ -521,6 +521,10 @@ static int imx_ocotp_probe(struct platform_device *pdev)if (IS_ERR (priv->clk))return PTR_ERR (priv->clk); +clk_prepare_enable (priv->clk); +imx_ocotp_clr_err_if_set (priv->base); +clk_disable_unprepare (priv->clk); + priv->params =of_device_get_match_data (&pdev->dev); imx_ocotp_nvmem_config.size =4 * priv->params->nregs; imx_ocotp_nvmem_config.dev = dev;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 233/434 nvmem: core: fix nvmem_cell_write inline function
In reply to Greg Kroah-HartmanFrom: Sebastian Reichel <[email protected]>
[ Upstream commit 9b8303fc6efa724bd6a90656434fbde2cc6ceb2c ]
nvmem_cell_write's buf argument uses different types based on the configuration of CONFIG_NVMEM. The function prototype for enabled NVMEM uses 'void *' type, but the static dummy function for disabled NVMEM uses 'const char *' instead. Fix the different behaviour by always expecting a 'void *' typed buf argument.
--- include/linux/nvmem-consumer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/nvmem-consumer.h +1 -1
@@ -118,7 +118,7 @@ static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len) }static inline int nvmem_cell_write (struct nvmem_cell *cell, -const char *buf,size_t len) +void *buf,size_t len) {return -EOPNOTSUPP ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 234/434 ASoC: SOF: topology: set trigger order for FE DAI link
In reply to Greg Kroah-HartmanFrom: Ranjani Sridharan <[email protected]>
[ Upstream commit 5eee2b3f60065a2530d13f28e771be48b989eb4c ]
Set trigger order for FE DAI links to SND_SOC_DPCM_TRIGGER_POST to trigger the BE DAI's before the FE DAI's. This prevents the xruns seen on playback pipelines using the link DMA.
--- sound/soc/sof/topology.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/sof/topology.c +4 -0
@@ -2828,6 +2828,10 @@ static int sof_link_load(struct snd_soc_component *scomp, int index,if (!link->no_pcm) { link->nonatomic = true; +/* set trigger order */ + link->trigger[0 ] =SND_SOC_DPCM_TRIGGER_POST ; + link->trigger[1 ] =SND_SOC_DPCM_TRIGGER_POST ; +/* nothing more to do for FE dai links */ return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 235/434 media: vivid: media_device_cleanup was called too early
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 8ffd573c25e5fac1daeeffc592e2ed6bc6a3d947 ]
Running the contrib/test/test-media script in v4l-utils with the vivid argument will cause this kernel warning:
[ 104.748720] videodev: v4l2_release [ 104.748731] ------------[ cut here ]------------ [ 104.748750] DEBUG_LOCKS_WARN_ON(lock->magic != lock) [ 104.748790] WARNING: CPU: 6 PID: 1823 at kernel/locking/mutex.c:938 __mutex_lock+0x919/0xc10 [ 104.748800] Modules linked in: rc_cec vivid v4l2_tpg videobuf2_dma_contig cec rc_core v4l2_dv_timings videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_common videodev mc vmw_balloon vmw_vmci button vmwgfx [ 104.748845] CPU: 6 PID: 1823 Comm: sleep Not tainted 5.4.0-rc1-test-no #150 [ 104.748853] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/29/2019 [ 104.748867] RIP: 0010:__mutex_lock+0x919/0xc10 [ 104.748878] Code: 59 83 e8 9a fc 16 ff 44 8b 05 23 61 38 01 45 85 c0 0f 85 ef f7 ff ff 48 c7 c6 a0 1f 87 82 48 c7 c7 a0 1e 87 82 e8 cd bb f7 fe <0f> 0b e9 d5 f7 ff ff f6 c3 04 0f 84 3b fd ff ff 49 89 df 41 83 e7 [ 104.748886] RSP: 0018:ffff88811a357b80 EFLAGS: 00010286 [ 104.748895] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 [ 104.748902] RDX: 0000000000000003 RSI: 0000000000000004 RDI: ffffed102346af62 [ 104.748910] RBP: ffff88811a357cf0 R08: ffffffff81217c91 R09: fffffbfff061c271 [ 104.748917] R10: fffffbfff061c270 R11: ffffffff830e1383 R12: ffff8881a46103c0 [ 104.748924] R13: 0000000000000000 R14: ffff8881a4614f90 R15: ffff8881a46153d0 [ 104.748933] FS: 0000000000000000(0000) GS:ffff8881b6780000(0000) knlGS:0000000000000000 [ 104.748940] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 104.748949] CR2: 00007f163fc9ca20 CR3: 0000000003013004 CR4: 00000000001606e0 [ 104.749036] Call Trace: [ 104.749051] ? _raw_spin_unlock+0x1f/0x30 [ 104.749067] ? llist_add_batch+0x33/0x50 [ 104.749081] ? tick_nohz_tick_stopped+0x19/0x30 [ 104.749130] ? v4l2_release.cold+0x6c/0xd6 [videodev] [ 104.749143] ? mutex_lock_io_nested+0xb80/0xb80 [ 104.749153] ? vprintk_emit+0xf2/0x220 [ 104.749191] ? vivid_req_validate+0x40/0x40 [vivid] [ 104.749201] ? printk+0xad/0xde [ 104.749211] ? kmsg_dump_rewind_nolock+0x54/0x54 [ 104.749226] ? locks_remove_file+0x78/0x2b0 [ 104.749248] ? __fsnotify_update_child_dentry_flags.part.0+0x170/0x170 [ 104.749281] ? vivid_req_validate+0x40/0x40 [vivid] [ 104.749321] ? v4l2_release.cold+0x6c/0xd6 [videodev] [ 104.749361] v4l2_release.cold+0x6c/0xd6 [videodev] [ 104.749378] __fput+0x15a/0x390 [ 104.749393] task_work_run+0xb2/0xe0 [ 104.749407] do_exit+0x4d0/0x1200 [ 104.749422] ? do_user_addr_fault+0x367/0x610 [ 104.749431] ? release_task+0x990/0x990 [ 104.749449] ? rwsem_spin_on_owner+0x170/0x170 [ 104.749463] ? vmacache_find+0xb2/0x100 [ 104.749476] do_group_exit+0x85/0x130 [ 104.749487] __x64_sys_exit_group+0x23/0x30 [ 104.749500] do_syscall_64+0x5e/0x1c0 [ 104.749511] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 104.749520] RIP: 0033:0x7f163fc5c9d6 [ 104.749536] Code: Bad RIP value. [ 104.749543] RSP: 002b:00007ffe6f3bec58 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 [ 104.749553] RAX: ffffffffffffffda RBX: 00007f163fd4d760 RCX: 00007f163fc5c9d6 [ 104.749560] RDX: 0000000000000000 RSI: 000000000000003c RDI: 0000000000000000 [ 104.749567] RBP: 0000000000000000 R08: 00000000000000e7 R09: ffffffffffffff80 [ 104.749574] R10: 00007ffe6f3beb24 R11: 0000000000000246 R12: 00007f163fd4d760 [ 104.749581] R13: 0000000000000002 R14: 00007f163fd56428 R15: 0000000000000000 [ 104.749597] ---[ end trace 66f20f73fc0daf79 ]---
This is caused by media_device_cleanup() which destroys v4l2_dev->mdev->req_queue_mutex. But v4l2_release() tries to lock that mutex after media_device_cleanup() is called.
By moving media_device_cleanup() to the v4l2_device's release function it is guaranteed that the mutex is valid whenever v4l2_release is called.
--- drivers/media/platform/vivid/vivid-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/vivid/vivid-core.c +3 -1
@@ -616,6 +616,9 @@ static void vivid_dev_release(struct v4l2_device *v4l2_dev)vivid_free_controls (dev);v4l2_device_unregister (&dev->v4l2_dev); +#ifdef CONFIG_MEDIA_CONTROLLER +media_device_cleanup (&dev->mdev); +#endif vfree (dev->scaled_line);vfree (dev->blended_line);vfree (dev->edid);
@@ -1580,7 +1583,6 @@ static int vivid_remove(struct platform_device *pdev)#ifdef CONFIG_MEDIA_CONTROLLER media_device_unregister (&dev->mdev); -media_device_cleanup (&dev->mdev);#endif if (dev->has_vid_cap) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 236/434 spi: dw: Fix Designware SPI loopback
In reply to Greg Kroah-HartmanFrom: Thor Thayer <[email protected]>
[ Upstream commit 1403cfa69d310781f9548951c97725c67ffcf613 ]
The SPI_LOOP is set in spi->mode but not propagated to the register. A previous patch removed the bit during a cleanup.
--- drivers/spi/spi-dw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-dw.c +2 -1
@@ -308,7 +308,8 @@ static int dw_spi_transfer_one(struct spi_controller *master, cr0 = (transfer->bits_per_word -1 ) | (chip->type <<SPI_FRF_OFFSET ) | ((((spi->mode &SPI_CPOL ) ?1 :0 ) <<SPI_SCOL_OFFSET ) | - (((spi->mode &SPI_CPHA ) ?1 :0 ) <<SPI_SCPH_OFFSET )) + (((spi->mode &SPI_CPHA ) ?1 :0 ) <<SPI_SCPH_OFFSET ) | + (((spi->mode &SPI_LOOP ) ?1 :0 ) <<SPI_SRL_OFFSET )) | (chip->tmode <<SPI_TMOD_OFFSET );/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 237/434 bnx2x: Fix PF-VF communication over multi-cos queues.
In reply to Greg Kroah-HartmanFrom: Manish Chopra <[email protected]>
[ Upstream commit dc5a3d79c345871439ffe72550b604fcde9770e1 ]
PF driver doesn't enable tx-switching for all cos queues/clients, which causes packets drop from PF to VF. Fix this by enabling tx-switching on all cos queues/clients.
--- .../net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +11 -5
@@ -2397,15 +2397,21 @@ static int bnx2x_set_pf_tx_switching(struct bnx2x *bp, bool enable)/* send the ramrod on all the queues of the PF */ for_each_eth_queue (bp, i) {struct bnx2x_fastpath *fp = &bp->fp[i]; +int tx_idx;/* Set the appropriate Queue object */ q_params.q_obj = &bnx2x_sp_obj (bp, fp).q_obj; -/* Update the Queue state */ - rc =bnx2x_queue_state_change (bp, &q_params); -if (rc) { -BNX2X_ERR ("Failed to configure Tx switching\n" ); -return rc; +for (tx_idx =FIRST_TX_COS_INDEX ; + tx_idx < fp->max_cos; tx_idx++) { + q_params.params.update.cid_index = tx_idx; + +/* Update the Queue state */ + rc =bnx2x_queue_state_change (bp, &q_params); +if (rc) { +BNX2X_ERR ("Failed to configure Tx switching\n" ); +return rc; + } } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 238/434 spi: img-spfi: fix potential double release
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit e9a8ba9769a0e354341bc6cc01b98aadcea1dfe9 ]
The channels spfi->tx_ch and spfi->rx_ch are not set to NULL after they are released. As a result, they will be released again, either on the error handling branch in the same function or in the corresponding remove function, i.e. img_spfi_remove(). This patch fixes the bug by setting the two members to NULL.
--- drivers/spi/spi-img-spfi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi-img-spfi.c +2 -0
@@ -673,6 +673,8 @@ static int img_spfi_probe(struct platform_device *pdev)dma_release_channel (spfi->tx_ch);if (spfi->rx_ch)dma_release_channel (spfi->rx_ch); + spfi->tx_ch =NULL ; + spfi->rx_ch =NULL ;dev_warn (spfi->dev,"Failed to get DMA channels, falling back to PIO mode\n" ); }else { master->dma_tx = spfi->tx_ch;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 239/434 ALSA: timer: Limit max amount of slave instances
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit fdea53fe5de532969a332d6e5e727f2ad8bf084d ]
The fuzzer tries to open the timer instances as much as possible, and this may cause a system hiccup easily. We've already introduced the cap for the max number of available instances for the h/w timers, and we should put such a limit also to the slave timers, too.
This patch introduces the limit to the multiple opened slave timers. The upper limit is hard-coded to 1000 for now, which should suffice for any practical usages up to now.
--- sound/core/timer.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/core/timer.c +10 -0
@@ -74,6 +74,9 @@ static LIST_HEAD(snd_timer_slave_list);/* lock for slave active lists */ static DEFINE_SPINLOCK (slave_active_lock); +#define MAX_SLAVE_INSTANCES 1000 +static int num_slaves; +static DEFINE_MUTEX (register_mutex);static int snd_timer_free (struct snd_timer *timer);
@@ -252,6 +255,10 @@ int snd_timer_open(struct snd_timer_instance **ti, err = -EINVAL ; goto unlock; } +if (num_slaves >=MAX_SLAVE_INSTANCES ) { + err = -EBUSY ; + goto unlock; + } timeri =snd_timer_instance_new (owner,NULL );if (!timeri) { err = -ENOMEM ;
@@ -261,6 +268,7 @@ int snd_timer_open(struct snd_timer_instance **ti, timeri->slave_id = tid->device; timeri->flags |=SNDRV_TIMER_IFLG_SLAVE ;list_add_tail (&timeri->open_list, &snd_timer_slave_list); + num_slaves++; err =snd_timer_check_slave (timeri);if (err <0 ) {snd_timer_close_locked (timeri, &card_dev_to_put);
@@ -356,6 +364,8 @@ static int snd_timer_close_locked(struct snd_timer_instance *timeri, }list_del (&timeri->open_list); +if (timeri->flags &SNDRV_TIMER_IFLG_SLAVE ) + num_slaves--;/* force to stop the timer */ snd_timer_stop (timeri);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 240/434 RDMA/core: Fix return code when modify_port isnt supported
In reply to Greg Kroah-HartmanFrom: Kamal Heib <[email protected]>
[ Upstream commit 55bfe905fa97633438c13fb029aed85371d85480 ]
Improve return code from ib_modify_port() by doing the following:
- Use "-EOPNOTSUPP" instead "-ENOSYS" which is the proper return code
- Allow only fake IB_PORT_CM_SUP manipulation for RoCE providers that didn't implement the modify_port callback, otherwise return "-EOPNOTSUPP"
--- drivers/infiniband/core/device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/infiniband/core/device.c +5 -1
@@ -2409,8 +2409,12 @@ int ib_modify_port(struct ib_device *device, rc = device->ops.modify_port (device, port_num, port_modify_mask, port_modify); + else if (rdma_protocol_roce(device, port_num) && + ((port_modify->set_port_cap_mask & ~IB_PORT_CM_SUP) == 0 || + (port_modify->clr_port_cap_mask & ~IB_PORT_CM_SUP) == 0)) + rc =0 ; else - rc =rdma_protocol_roce (device, port_num) ?0 : -ENOSYS ; + rc = -EOPNOTSUPP ;return rc; }EXPORT_SYMBOL (ib_modify_port);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 241/434 drm: msm: a6xx: fix debug bus register configuration
In reply to Greg Kroah-HartmanFrom: Sharat Masetty <[email protected]>
[ Upstream commit 7f4009c4bbea4438b50f3b12d1c57da3f5cd8db3 ]
Fix the cx debugbus related register configuration, to collect accurate bus data during gpu snapshot. This helps with complete snapshot dump and also complete proper GPU recovery.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +12 -12
@@ -352,26 +352,26 @@ static void a6xx_get_debugbus(struct msm_gpu *gpu, cxdbg =ioremap (res->start,resource_size (res));if (cxdbg) { -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLT , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLT ,A6XX_DBGC_CFG_DBGBUS_CNTLT_SEGT (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLM , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLM ,A6XX_DBGC_CFG_DBGBUS_CNTLM_ENABLE (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_0 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0 ,0x76543210 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_1 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1 ,0xFEDCBA98 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); } a6xx_state->debugbus = state_kcalloc(a6xx_state,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 242/434 rtlwifi: fix memory leak in rtl92c_set_fw_rsvdpagepkt()
In reply to Greg Kroah-HartmanFrom: Ping-Ke Shih <[email protected]>
[ Upstream commit 5174f1e41074b5186608badc2e89441d021e8c08 ]
This leak was found by testing the EDIMAX EW-7612 on Raspberry Pi 3B+ with Linux 5.4-rc5 (multi_v7_defconfig + rtlwifi + kmemleak) and noticed a single memory leak during probe:
unreferenced object 0xec13ee40 (size 176):
comm "kworker/u8:1", pid 36, jiffies 4294939321 (age 5580.790s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<fc1bbb3e>] __netdev_alloc_skb+0x9c/0x164
[<863dfa6e>] rtl92c_set_fw_rsvdpagepkt+0x254/0x340 [rtl8192c_common]
[<9572be0d>] rtl92cu_set_hw_reg+0xf48/0xfa4 [rtl8192cu]
[<116df4d8>] rtl_op_bss_info_changed+0x234/0x96c [rtlwifi]
[<8933575f>] ieee80211_bss_info_change_notify+0xb8/0x264 [mac80211]
[<d4061e86>] ieee80211_assoc_success+0x934/0x1798 [mac80211]
[<e55adb56>] ieee80211_rx_mgmt_assoc_resp+0x174/0x314 [mac80211]
[<5974629e>] ieee80211_sta_rx_queued_mgmt+0x3f4/0x7f0 [mac80211]
[<d91091c6>] ieee80211_iface_work+0x208/0x318 [mac80211]
[<ac5fcae4>] process_one_work+0x22c/0x564
[<f5e6d3b6>] worker_thread+0x44/0x5d8
[<82c7b073>] kthread+0x150/0x154
[<b43e1b7d>] ret_from_fork+0x14/0x2c
[<794dff30>] 0x0It is because 8192cu doesn't implement usb_cmd_send_packet(), and this patch just frees the skb within the function to resolve memleak problem by now. Since 8192cu doesn't turn on fwctrl_lps that needs to download command packet for firmware via the function, applying this patch doesn't affect driver behavior.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c +2 -0
@@ -1540,6 +1540,8 @@ static bool usb_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb)* This is maybe necessary: * rtlpriv->cfg->ops->fill_tx_cmddesc(hw, buffer, 1, 1, skb); */ +dev_kfree_skb (skb); +return true; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 243/434 perf probe: Fix to find range-only function instance
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit b77afa1f810f37bd8a36cb1318178dfe2d7af6b6 ]
Fix die_is_func_instance() to find range-only function instance.
In some case, a function instance can be made without any low PC or entry PC, but only with address ranges by optimization. (e.g. cold text partially in "text.unlikely" section) To find such function instance, we have to check the range attribute too.
--- tools/perf/util/dwarf-aux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +5 -1
@@ -318,10 +318,14 @@ bool die_is_func_def(Dwarf_Die *dw_die)bool die_is_func_instance (Dwarf_Die *dw_die) {Dwarf_Addr tmp; +Dwarf_Attribute attr_mem;/* Actually gcc optimizes non-inline as like as inlined */ -return !dwarf_func_inline (dw_die) &&dwarf_entrypc (dw_die, &tmp) ==0 ; +return !dwarf_func_inline (dw_die) && + (dwarf_entrypc (dw_die, &tmp) ==0 || +dwarf_attr (dw_die, DW_AT_ranges, &attr_mem) !=NULL ); } +/** * die_get_data_member_location - Get the data-member offset * @mb_die: a DIE of a member of a data structure
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 244/434 perf cs-etm: Fix definition of macro TO_CS_QUEUE_NR
In reply to Greg Kroah-HartmanFrom: Leo Yan <[email protected]>
[ Upstream commit 9d604aad4bb022e848dec80d6fe5f73fe87061a2 ]
Macro TO_CS_QUEUE_NR definition has a typo, which uses 'trace_id_chan' as its parameter, this doesn't match with its definition body which uses 'trace_chan_id'. So renames the parameter to 'trace_chan_id'.
It's luck to have a local variable 'trace_chan_id' in the function cs_etm__setup_queue(), even we wrongly define the macro TO_CS_QUEUE_NR, the local variable 'trace_chan_id' is used rather than the macro's parameter 'trace_id_chan'; so the compiler doesn't complain for this before.
After renaming the parameter, it leads to a compiling error due cs_etm__setup_queue() has no variable 'trace_id_chan'. This patch uses the variable 'trace_chan_id' for the macro so that fixes the compiling error.
--- tools/perf/util/cs-etm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/cs-etm.c +2 -2
@@ -110,7 +110,7 @@ static int cs_etm__decode_data_block(struct cs_etm_queue *etmq);* encode the etm queue number as the upper 16 bit and the channel as * the lower 16 bit. */ -#define TO_CS_QUEUE_NR (queue_nr, trace_id_chan) \ +#define TO_CS_QUEUE_NR (queue_nr, trace_chan_id) \ (queue_nr << 16 | trace_chan_id)#define TO_QUEUE_NR (cs_queue_nr) (cs_queue_nr >> 16)#define TO_TRACE_CHAN_ID (cs_queue_nr) (cs_queue_nr & 0x0000ffff)
@@ -819,7 +819,7 @@ static int cs_etm__setup_queue(struct cs_etm_auxtrace *etm,* Note that packets decoded above are still in the traceID's packet * queue and will be processed in cs_etm__process_queues(). */ - cs_queue_nr =TO_CS_QUEUE_NR (queue_nr, trace_id_chan); + cs_queue_nr =TO_CS_QUEUE_NR (queue_nr, trace_chan_id); ret =auxtrace_heap__add (&etm->heap, cs_queue_nr, timestamp); out:return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 245/434 perf probe: Fix to list probe event with correct line number
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 3895534dd78f0fd4d3f9e05ee52b9cdd444a743e ]
Since debuginfo__find_probe_point() uses dwarf_entrypc() for finding the entry address of the function on which a probe is, it will fail when the function DIE has only ranges attribute.
To fix this issue, use die_entrypc() instead of dwarf_entrypc().
Without this fix, perf probe -l shows incorrect offset:
# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask+18446744071579263632@work/linux/linux/kernel/cpu.c)
probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask+18446744071579263752@work/linux/linux/kernel/cpu.c)With this:
# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@work/linux/linux/kernel/cpu.c)
probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:21@work/linux/linux/kernel/cpu.c)Committer testing:
Before:
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask+18446744071579765152@kernel/cpu.c)
[root@quaco ~]#
After:
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@kernel/cpu.c)
[root@quaco ~]#
--- tools/perf/util/probe-finder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/probe-finder.c +2 -2
@@ -1578,7 +1578,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr,/* Get function entry information */ func = basefunc =dwarf_diename (&spdie);if (!func || -dwarf_entrypc (&spdie, &baseaddr) !=0 || +die_entrypc (&spdie, &baseaddr) !=0 ||dwarf_decl_line (&spdie, &baseline) !=0 ) { lineno =0 ; goto post;
@@ -1595,7 +1595,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr,while (die_find_top_inlinefunc (&spdie, (Dwarf_Addr )addr, &indie)) {/* There is an inline function */ -if (dwarf_entrypc (&indie, &_addr) ==0 && +if (die_entrypc (&indie, &_addr) ==0 && _addr == addr) {/* * addr is at an inline function entry.
Signature · 1 line
2.20.1
Re: [PATCH 5.4 245/434] perf probe: Fix to list probe event with correct line number
Den 29-12-2019 kl. 19:24, skrev Greg Kroah-Hartman:
Quoted 63 lines
From: Masami Hiramatsu <[email protected]>
[ Upstream commit
3895534dd78f0fd4d3f9e05ee52b9cdd444a743e]Since
debuginfo__find_probe_point()usesdwarf_entrypc()for finding the entry address of the function on which a probe is, it will fail when the function DIE has only ranges attribute.To fix this issue, use
die_entrypc()instead ofdwarf_entrypc().Without this fix, perf probe -l shows incorrect offset:
# perf probe -l probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask+18446744071579263632@work/linux/linux/kernel/cpu.c) probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask+18446744071579263752@work/linux/linux/kernel/cpu.c)With this:
# perf probe -l probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@work/linux/linux/kernel/cpu.c) probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:21@work/linux/linux/kernel/cpu.c)Committer testing:
Before:
[root@quaco ~]# perf probe -l probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask+18446744071579765152@kernel/cpu.c) [root@quaco ~]#After:
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (onclear_tasks_mm_cpumask@kernel/cpu.c)
[root@quaco ~]#Fixes 1d46ea2a6a40 ("perf probe: Fix listing incorrect line number with inline function")Signed-off-by Masami Hiramatsu <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- tools/perf/util/probe-finder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/probe-finder.c +1
-1@@ -1578,7 +1578,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr,/* Get function entry information */ func = basefunc =dwarf_diename (&spdie);if (!func || -dwarf_entrypc (&spdie, &baseaddr) !=0 || +die_entrypc (&spdie, &baseaddr) !=0 ||dwarf_decl_line (&spdie, &baseline) !=0 ) { lineno =0 ; goto post;
tools/perf/util/probe-finder.c int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, · line 1601
Quoted 8 lines
tools/perf/util/probe-finder.c +1
-1@@ -1595,7 +1595,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr,while (die_find_top_inlinefunc (&spdie, (Dwarf_Addr )addr, &indie)) {/* There is an inline function */ -if (dwarf_entrypc (&indie, &_addr) ==0 && +if (die_entrypc (&indie, &_addr) ==0 && _addr == addr) {/* * addr is at an inline function entry.
still broken
/usr/bin/ld: perf-in.o: in function `debuginfo__find_probe_point':
/work/rpmbuild/BUILD/kernel-x86_64/linux-5.4/tools/perf/util/probe-finder.c:1616: undefined reference to `die_entrypc'
--
Thomas
Re: [PATCH 5.4 245/434] perf probe: Fix to list probe event with correct line number
Den 29-12-2019 kl. 20:42, skrev Thomas Backlund:
Quoted 81 lines
Den 29-12-2019 kl. 19:24, skrev Greg Kroah-Hartman:
Quoted 74 lines
From: Masami Hiramatsu <[email protected]>
[ Upstream commit
3895534dd78f0fd4d3f9e05ee52b9cdd444a743e]Since
debuginfo__find_probe_point()usesdwarf_entrypc()for finding the entry address of the function on which a probe is, it will fail when the function DIE has only ranges attribute.To fix this issue, use
die_entrypc()instead ofdwarf_entrypc().Without this fix, perf probe -l shows incorrect offset:
# perf probe -l probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask+18446744071579263632@work/linux/linux/kernel/cpu.c)probe:clear_tasks_mm_cpumask_1 (on
clear_tasks_mm_cpumask+18446744071579263752@work/linux/linux/kernel/cpu.c)With this:
# perf probe -l probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@work/linux/linux/kernel/cpu.c) probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:21@work/linux/linux/kernel/cpu.c)Committer testing:
Before:
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (onclear_tasks_mm_cpumask+18446744071579765152@kernel/cpu.c) [root@quaco ~]#After:
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (onclear_tasks_mm_cpumask@kernel/cpu.c) [root@quaco ~]#Fixes 1d46ea2a6a40 ("perf probe: Fix listing incorrect line number with inline function")Signed-off-by Masami Hiramatsu <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Sasha Levin <[email protected]>---
tools/perf/util/probe-finder.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/probe-finder.c +0
-0@@ -1578,7 +1578,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, /* Get function entry information */ func = basefunc = dwarf_diename(&spdie);if (!func ||
-dwarf_entrypc(&spdie, &baseaddr)!= 0 || +die_entrypc(&spdie, &baseaddr)!= 0 ||dwarf_decl_line(&spdie, &baseline)!= 0) { lineno = 0;
goto post;tools/perf/util/probe-finder.c +1
-1@@ -1595,7 +1595,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, while (die_find_top_inlinefunc(&spdie, (Dwarf_Addr)addr, &indie)) { /* There is an inline function */ - if (dwarf_entrypc(&indie, &_addr) == 0 && + if (die_entrypc(&indie, &_addr) == 0 && _addr == addr) { /*Quoted 2 lines
* addr is at an inline function entry.
still broken
Quoted 3 lines
/usr/bin/ld: perf-in.o: in function `debuginfo__find_probe_point':
/work/rpmbuild/BUILD/kernel-x86_64/linux-5.4/tools/perf/util/probe-finder.c:1616: undefined reference to `die_entrypc'
And the fix for the perf build errors I reported against:
[PATCH 5.4 245/434] perf probe: Fix to list probe event with correct line number [PATCH 5.4 248/434] perf probe: Fix to probe an inline function which has no entry pc [PATCH 5.4 249/434] perf probe: Fix to show ranges of variables in functions without entry_pc [PATCH 5.4 250/434] perf probe: Fix to show inlined function callsite without entry_pc [PATCH 5.4 252/434] perf probe: Fix to probe a function which has no entry pc
is to add the missing:
From 91e2f539eeda26ab00bd03fae8dc434c128c85ed Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <[email protected]>
Date: Thu, 24 Oct 2019 18:12:54 +0900
Subject: [PATCH] perf probe: Fix to show function entry line as probe-able
--
Thomas
Re: [PATCH 5.4 245/434] perf probe: Fix to list probe event with correct line number
Quoted 109 lines · On Mon, 30 Dec 2019 01:00:14 +0200 Thomas Backlund <[email protected]> wrote:
Den 29-12-2019 kl. 20:42, skrev Thomas Backlund:
Quoted 90 lines
Den 29-12-2019 kl. 19:24, skrev Greg Kroah-Hartman:
Quoted 83 lines
From: Masami Hiramatsu <[email protected]>
[ Upstream commit
3895534dd78f0fd4d3f9e05ee52b9cdd444a743e]Since
debuginfo__find_probe_point()usesdwarf_entrypc()for finding the entry address of the function on which a probe is, it will fail when the function DIE has only ranges attribute.To fix this issue, use
die_entrypc()instead ofdwarf_entrypc().Without this fix, perf probe -l shows incorrect offset:
# perf probe -l probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask+18446744071579263632@work/linux/linux/kernel/cpu.c)probe:clear_tasks_mm_cpumask_1 (on
clear_tasks_mm_cpumask+18446744071579263752@work/linux/linux/kernel/cpu.c)With this:
# perf probe -l probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@work/linux/linux/kernel/cpu.c) probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:21@work/linux/linux/kernel/cpu.c)Committer testing:
Before:
[root@quaco ~]# perf probe -l probe:clear_tasks_mm_cpumask (on
clear_tasks_mm_cpumask+18446744071579765152@kernel/cpu.c) [root@quaco ~]#After:
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (onclear_tasks_mm_cpumask@kernel/cpu.c)
[root@quaco ~]#Fixes 1d46ea2a6a40 ("perf probe: Fix listing incorrect line numberwith inline function")
Signed-off-by Masami Hiramatsu <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Link:
http://lore.kernel.org/lkml/157199321227.8075.14655572419136993015.stgit@devnote2Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Sasha Levin <[email protected]>---
tools/perf/util/probe-finder.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/probe-finder.c +0
-0@@ -1578,7 +1578,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, /* Get function entry information */ func = basefunc = dwarf_diename(&spdie);if (!func ||
-dwarf_entrypc(&spdie, &baseaddr)!= 0 || +die_entrypc(&spdie, &baseaddr)!= 0 ||dwarf_decl_line(&spdie, &baseline)!= 0) { lineno = 0;
goto post;tools/perf/util/probe-finder.c +1
-1@@ -1595,7 +1595,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, while (die_find_top_inlinefunc(&spdie, (Dwarf_Addr)addr, &indie)) { /* There is an inline function */ - if (dwarf_entrypc(&indie, &_addr) == 0 && + if (die_entrypc(&indie, &_addr) == 0 && _addr == addr) { /*Quoted 2 lines
* addr is at an inline function entry.
still broken
Quoted 4 lines
/usr/bin/ld: perf-in.o: in function `debuginfo__find_probe_point':
/work/rpmbuild/BUILD/kernel-x86_64/linux-5.4/tools/perf/util/probe-finder.c:1616:
undefined reference to `die_entrypc'And the fix for the perf build errors I reported against:
[PATCH 5.4 245/434] perf probe: Fix to list probe event with correct line number
[PATCH 5.4 248/434] perf probe: Fix to probe an inline function which has no entry pc
[PATCH 5.4 249/434] perf probe: Fix to show ranges of variables in functions withoutentry_pc
[PATCH 5.4 250/434] perf probe: Fix to show inlined function callsite withoutentry_pc
[PATCH 5.4 252/434] perf probe: Fix to probe a function which has no entry pc
Quoted 6 lines
is to add the missing:
From
91e2f539eeda26ab00bd03fae8dc434c128c85edMon Sep 17 00:00:00 2001
From: Masami Hiramatsu <[email protected]>
Date: Thu, 24 Oct 2019 18:12:54 +0900
Subject: [PATCH] perf probe: Fix to show function entry line as probe-able
Thanks Thomas, you're right.
The die_entrypc() was newly added by that commit for finding correct entry PC of functions.
Greg, could you please apply above fix too?
Thank you,
Signature · 1 line
Masami Hiramatsu <[email protected]>
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 245/434] perf probe: Fix to list probe event with correct line number
In reply to Thomas BacklundQuoted 106 lines · Thomas Backlund
Den 29-12-2019 kl. 20:42, skrev Thomas Backlund:
Quoted 87 lines
Den 29-12-2019 kl. 19:24, skrev Greg Kroah-Hartman:
Quoted 80 lines
From: Masami Hiramatsu <[email protected]>
[ Upstream commit
3895534dd78f0fd4d3f9e05ee52b9cdd444a743e]Since
debuginfo__find_probe_point()usesdwarf_entrypc()for finding the entry address of the function on which a probe is, it will fail when the function DIE has only ranges attribute.To fix this issue, use
die_entrypc()instead ofdwarf_entrypc().Without this fix, perf probe -l shows incorrect offset:
# perf probe -l probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask+18446744071579263632@work/linux/linux/kernel/cpu.c)probe:clear_tasks_mm_cpumask_1 (on
clear_tasks_mm_cpumask+18446744071579263752@work/linux/linux/kernel/cpu.c)With this:
# perf probe -l probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@work/linux/linux/kernel/cpu.c) probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:21@work/linux/linux/kernel/cpu.c)Committer testing:
Before:
[root@quaco ~]# perf probe -l probe:clear_tasks_mm_cpumask (on
clear_tasks_mm_cpumask+18446744071579765152@kernel/cpu.c) [root@quaco ~]#After:
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (onclear_tasks_mm_cpumask@kernel/cpu.c)
[root@quaco ~]#Fixes 1d46ea2a6a40 ("perf probe: Fix listing incorrect line numberwith inline function")
Signed-off-by Masami Hiramatsu <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Sasha Levin <[email protected]>---
tools/perf/util/probe-finder.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/probe-finder.c +0
-0@@ -1578,7 +1578,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, /* Get function entry information */ func = basefunc = dwarf_diename(&spdie);if (!func ||
-dwarf_entrypc(&spdie, &baseaddr)!= 0 || +die_entrypc(&spdie, &baseaddr)!= 0 ||dwarf_decl_line(&spdie, &baseline)!= 0) { lineno = 0;
goto post;tools/perf/util/probe-finder.c +1
-1@@ -1595,7 +1595,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, while (die_find_top_inlinefunc(&spdie, (Dwarf_Addr)addr, &indie)) { /* There is an inline function */ - if (dwarf_entrypc(&indie, &_addr) == 0 && + if (die_entrypc(&indie, &_addr) == 0 && _addr == addr) { /*Quoted 2 lines
* addr is at an inline function entry.
still broken
Quoted 4 lines
/usr/bin/ld: perf-in.o: in function `debuginfo__find_probe_point':
/work/rpmbuild/BUILD/kernel-x86_64/linux-5.4/tools/perf/util/probe-finder.c:1616:
undefined reference to `die_entrypc'And the fix for the perf build errors I reported against:
[PATCH 5.4 245/434] perf probe: Fix to list probe event with correct line number
[PATCH 5.4 248/434] perf probe: Fix to probe an inline function which has no entry pc
[PATCH 5.4 249/434] perf probe: Fix to show ranges of variables in functions withoutentry_pc
[PATCH 5.4 250/434] perf probe: Fix to show inlined function callsite withoutentry_pc
[PATCH 5.4 252/434] perf probe: Fix to probe a function which has no entry pc
Quoted 6 lines
is to add the missing:
From
91e2f539eeda26ab00bd03fae8dc434c128c85edMon Sep 17 00:00:00 2001
From: Masami Hiramatsu <[email protected]>
Date: Thu, 24 Oct 2019 18:12:54 +0900
Subject: [PATCH] perf probe: Fix to show function entry line as probe-able
Thanks for this, now queued up.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 246/434 perf jevents: Fix resource leak in process_mapfile() and main()
In reply to Greg Kroah-HartmanFrom: Yunfeng Ye <[email protected]>
[ Upstream commit 1785fbb73896dbd9d27a406f0d73047df42db710 ]
There are memory leaks and file descriptor resource leaks in process_mapfile() and main().
Fix this by adding free(), fclose() and free_arch_std_events() on the error paths.
--- tools/perf/pmu-events/jevents.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
tools/perf/pmu-events/jevents.c +11 -2
@@ -758,6 +758,7 @@ static int process_mapfile(FILE *outfp, char *fpath)char *line, *p;int line_num;char *tblname; +int ret =0 ;pr_info ("%s: Processing mapfile %s\n" , prog, fpath);
@@ -769,6 +770,7 @@ static int process_mapfile(FILE *outfp, char *fpath)if (!mapfp) {pr_info ("%s: Error %s opening %s\n" , prog,strerror (errno), fpath); +free (line);return -1 ; }
@@ -795,7 +797,8 @@ static int process_mapfile(FILE *outfp, char *fpath)/* TODO Deal with lines longer than 16K */ pr_info ("%s: Mapfile %s: line %d too long, aborting\n" , prog, fpath, line_num); -return -1 ; + ret =-1 ; + goto out; } line[strlen (line)-1 ] ='\0' ;
@@ -825,7 +828,9 @@ static int process_mapfile(FILE *outfp, char *fpath) out:print_mapping_table_suffix (outfp); -return 0 ; +fclose (mapfp); +free (line); +return ret; }/*
@@ -1122,6 +1127,7 @@ int main(int argc, char *argv[]) goto empty_map; }else if (rc <0 ) {/* Make build fail */ +fclose (eventsfp);free_arch_std_events ();return 1 ; }else if (rc) {
@@ -1134,6 +1140,7 @@ int main(int argc, char *argv[]) goto empty_map; }else if (rc <0 ) {/* Make build fail */ +fclose (eventsfp);free_arch_std_events ();return 1 ; }else if (rc) {
@@ -1151,6 +1158,8 @@ int main(int argc, char *argv[])if (process_mapfile (eventsfp, mapfile)) {pr_info ("%s: Error processing mapfile %s\n" , prog, mapfile);/* Make build fail */ +fclose (eventsfp); +free_arch_std_events ();return 1 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 247/434 perf probe: Walk function lines in lexical blocks
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit acb6a7047ac2146b723fef69ee1ab6b7143546bf ]
Since some inlined functions are in lexical blocks of given function, we have to recursively walk through the DIE tree. Without this fix, perf-probe -L can miss the inlined functions which is in a lexical block (like if (..) { func() } case.)
However, even though, to walk the lines in a given function, we don't need to follow the children DIE of inlined functions because those do not have any lines in the specified function.
We need to walk though whole trees only if we walk all lines in a given file, because an inlined function can include another inlined function in the same file.
--- tools/perf/util/dwarf-aux.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
tools/perf/util/dwarf-aux.c +9 -5
@@ -678,10 +678,9 @@ static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data)if (lw->retval !=0 )return DIE_FIND_CB_END ; } +if (!lw->recursive) +return DIE_FIND_CB_SIBLING ; } -if (!lw->recursive) -/* Don't need to search recursively */ -return DIE_FIND_CB_SIBLING ;if (addr) { fname =dwarf_decl_file (in_die);
@@ -728,6 +727,10 @@ static int __die_walk_culines_cb(Dwarf_Die *sp_die, void *data) {struct __line_walk_param *lw = data; +/* +* Since inlined function can include another inlined function in +* the same file, we need to walk in it recursively. +*/ lw->retval =__die_walk_funclines (sp_die, true, lw->callback, lw->data);if (lw->retval !=0 )return DWARF_CB_ABORT ;
@@ -817,8 +820,9 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data)*/ if (rt_die != cu_die)/* -* Don't need walk functions recursively, because nested -* inlined functions don't have lines of the specified DIE. +* Don't need walk inlined functions recursively, because +* inner inlined functions don't have the lines of the +* specified function. */ ret =__die_walk_funclines (rt_die, false, callback, data);else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 248/434 perf probe: Fix to probe an inline function which has no entry pc
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit eb6933b29d20bf2c3053883d409a53f462c1a3ac ]
Fix perf probe to probe an inlne function which has no entry pc or low pc but only has ranges attribute.
This seems very rare case, but I could find a few examples, as same as probe_point_search_cb(), use die_entrypc() to get the entry address in probe_point_inline_cb() too.
Without this patch:
# perf probe -D __amd_put_nb_event_constraints
Failed to get entry address of __amd_put_nb_event_constraints.
Probe point '__amd_put_nb_event_constraints' not found.
Error: Failed to add events.With this patch:
# perf probe -D __amd_put_nb_event_constraints p:probe/__amd_put_nb_event_constraints amd_put_event_constraints+43
Committer testing:
Before:
[root@quaco ~]# perf probe -D __amd_put_nb_event_constraints Failed to get entry address of __amd_put_nb_event_constraints. Probe point '__amd_put_nb_event_constraints' not found.
Error: Failed to add events.
[root@quaco ~]#
After:
[root@quaco ~]# perf probe -D __amd_put_nb_event_constraints p:probe/__amd_put_nb_event_constraints _text+33789 [root@quaco ~]#
--- tools/perf/util/probe-finder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/probe-finder.c +1 -1
@@ -942,7 +942,7 @@ static int probe_point_inline_cb(Dwarf_Die *in_die, void *data) ret =find_probe_point_lazy (in_die, pf); else {/* Get probe address */ -if (dwarf_entrypc (in_die, &addr) !=0 ) { +if (die_entrypc (in_die, &addr) !=0 ) {pr_warning ("Failed to get entry address of %s.\n" ,dwarf_diename (in_die));return -ENOENT ;
Signature · 1 line
2.20.1
Re: [PATCH 5.4 248/434] perf probe: Fix to probe an inline function which has no entry pc
Den 29-12-2019 kl. 19:25, skrev Greg Kroah-Hartman:
Quoted 57 lines
From: Masami Hiramatsu <[email protected]>
[ Upstream commit
eb6933b29d20bf2c3053883d409a53f462c1a3ac]Fix perf probe to probe an inlne function which has no entry pc or low pc but only has ranges attribute.
This seems very rare case, but I could find a few examples, as same as
probe_point_search_cb(), usedie_entrypc()to get the entry address inprobe_point_inline_cb()too.Without this patch:
# perf probe -D __amd_put_nb_event_constraints Failed to get entry address of __amd_put_nb_event_constraints. Probe point '__amd_put_nb_event_constraints' not found. Error: Failed to add events.With this patch:
# perf probe -D __amd_put_nb_event_constraints p:probe/__amd_put_nb_event_constraints amd_put_event_constraints+43Committer testing:
Before:
[root@quaco ~]# perf probe -D
__amd_put_nb_event_constraintsFailed to get entry address of__amd_put_nb_event_constraints. Probe point '__amd_put_nb_event_constraints' not found.
Error: Failed to add events.
[root@quaco ~]#After:
[root@quaco ~]# perf probe -D __amd_put_nb_event_constraints p:probe/__amd_put_nb_event_constraints _text+33789 [root@quaco ~]#Fixes 4ea42b181434 ("perf: Add perf probe subcommand, a kprobe-event setup helper")Signed-off-by Masami Hiramatsu <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- tools/perf/util/probe-finder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/probe-finder.c +0
-0
tools/perf/util/probe-finder.c static int probe_point_inline_cb(Dwarf_Die *in_die, void *data) · line 948
Quoted 8 lines
tools/perf/util/probe-finder.c +1
-1@@ -942,7 +942,7 @@ static int probe_point_inline_cb(Dwarf_Die *in_die, void *data) ret =find_probe_point_lazy (in_die, pf); else {/* Get probe address */ -if (dwarf_entrypc (in_die, &addr) !=0 ) { +if (die_entrypc (in_die, &addr) !=0 ) {pr_warning ("Failed to get entry address of %s.\n" ,dwarf_diename (in_die));return -ENOENT ;
Still broken...
/usr/bin/ld: perf-in.o: in function `probe_point_inline_cb':
/work/rpmbuild/BUILD/kernel-x86_64/linux-5.4/tools/perf/util/probe-finder.c:960: undefined reference to `die_entrypc'
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile.perf:609: perf] Error 1
--
Thomas
Greg Kroah-Hartman
maintainerPATCH 249/434 perf probe: Fix to show ranges of variables in functions without entry_pc
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit af04dd2f8ebaa8fbd46f698714acbf43da14da45 ]
Fix to show ranges of variables (--range and --vars option) in functions which DIE has only ranges but no entry_pc attribute.
Without this fix:
# perf probe --range -V clear_tasks_mm_cpumask Available variables at clear_tasks_mm_cpumask @<clear_tasks_mm_cpumask+0> (No matched variables)
With this fix:
# perf probe --range -V clear_tasks_mm_cpumask Available variables at clear_tasks_mm_cpumask @<clear_tasks_mm_cpumask+0> [VAL] int cpu @<clear_tasks_mm_cpumask+[0-35,317-317,2052-2059]>
Committer testing:
Before:
[root@quaco ~]# perf probe --range -V clear_tasks_mm_cpumask
Available variables at clear_tasks_mm_cpumask
@<clear_tasks_mm_cpumask+0>
(No matched variables)
[root@quaco ~]#After:
[root@quaco ~]# perf probe --range -V clear_tasks_mm_cpumask
Available variables at clear_tasks_mm_cpumask
@<clear_tasks_mm_cpumask+0>
[VAL] int cpu @<clear_tasks_mm_cpumask+[0-23,23-105,105-106,106-106,1843-1850,1850-1862]>
[root@quaco ~]#Using it:
[root@quaco ~]# perf probe clear_tasks_mm_cpumask cpu Added new event:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask with cpu)
You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@kernel/cpu.c with cpu)
[root@quaco ~]#
[root@quaco ~]# perf trace -e probe:*cpumask
^C[root@quaco ~]#
--- tools/perf/util/dwarf-aux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/dwarf-aux.c +2 -2
@@ -997,7 +997,7 @@ static int die_get_var_innermost_scope(Dwarf_Die *sp_die, Dwarf_Die *vr_die,bool first = true;const char *name; - ret =dwarf_entrypc (sp_die, &entry); + ret =die_entrypc (sp_die, &entry);if (ret)return ret;
@@ -1060,7 +1060,7 @@ int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf)bool first = true;const char *name; - ret =dwarf_entrypc (sp_die, &entry); + ret =die_entrypc (sp_die, &entry);if (ret)return ret;
Signature · 1 line
2.20.1
Re: [PATCH 5.4 249/434] perf probe: Fix to show ranges of variables in functions without entry_pc
Den 29-12-2019 kl. 19:25, skrev Greg Kroah-Hartman:
Quoted 82 lines
From: Masami Hiramatsu <[email protected]>
[ Upstream commit
af04dd2f8ebaa8fbd46f698714acbf43da14da45]Fix to show ranges of variables (--range and --vars option) in functions which DIE has only ranges but no
entry_pcattribute.Without this fix:
# perf probe --range -V clear_tasks_mm_cpumask Available variables at clear_tasks_mm_cpumask @<clear_tasks_mm_cpumask+0> (No matched variables)With this fix:
# perf probe --range -V clear_tasks_mm_cpumask Available variables at clear_tasks_mm_cpumask @<clear_tasks_mm_cpumask+0> [VAL] int cpu @<clear_tasks_mm_cpumask+[0-35,317-317,2052-2059]>Committer testing:
Before:
[root@quaco ~]# perf probe --range -V clear_tasks_mm_cpumask Available variables at clear_tasks_mm_cpumask @<clear_tasks_mm_cpumask+0> (No matched variables) [root@quaco ~]#After:
[root@quaco ~]# perf probe --range -V clear_tasks_mm_cpumask Available variables at clear_tasks_mm_cpumask @<clear_tasks_mm_cpumask+0> [VAL] int cpu @<clear_tasks_mm_cpumask+[0-23,23-105,105-106,106-106,1843-1850,1850-1862]> [root@quaco ~]#Using it:
[root@quaco ~]# perf probe
clear_tasks_mm_cpumaskcpu Added new event:
probe:clear_tasks_mm_cpumask (onclear_tasks_mm_cpumaskwith cpu)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (onclear_tasks_mm_cpumask@kernel/cpu.cwith cpu)
[root@quaco ~]#
[root@quaco ~]# perf trace -e probe:*cpumask
^C[root@quaco ~]#Fixes 349e8d261131 ("perf probe: Add --range option to show a variable's location range")Signed-off-by Masami Hiramatsu <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- tools/perf/util/dwarf-aux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/dwarf-aux.c +1
-1@@ -997,7 +997,7 @@ static int die_get_var_innermost_scope(Dwarf_Die *sp_die, Dwarf_Die *vr_die,bool first = true;const char *name; - ret =dwarf_entrypc (sp_die, &entry); + ret =die_entrypc (sp_die, &entry);if (ret)return ret;
tools/perf/util/dwarf-aux.c int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf) · line 1066
Quoted 8 lines
tools/perf/util/dwarf-aux.c +1
-1@@ -1060,7 +1060,7 @@ int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf)bool first = true;const char *name; - ret =dwarf_entrypc (sp_die, &entry); + ret =die_entrypc (sp_die, &entry);if (ret)return ret;
Still broken...
/usr/bin/ld: perf-in.o: in function `die_get_var_range':
/work/rpmbuild/BUILD/kernel-x86_64/linux-5.4/tools/perf/util/dwarf-aux.c:1085: undefined reference to die_entrypc' /usr/bin/ld: perf-in.o: in function die_get_var_innermost_scope':
/work/rpmbuild/BUILD/kernel-x86_64/linux-5.4/tools/perf/util/dwarf-aux.c:1022: undefined reference to `die_entrypc'
collect2: error: ld returned 1 exit status
--
Thomas
Greg Kroah-Hartman
maintainerPATCH 250/434 perf probe: Fix to show inlined function callsite without entry_pc
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 18e21eb671dc87a4f0546ba505a89ea93598a634 ]
Fix 'perf probe --line' option to show inlined function callsite lines even if the function DIE has only ranges.
Without this:
# perf probe -L amd_put_event_constraints
...
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
__amd_put_nb_event_constraints(cpuc, event);
5 }With this patch:
# perf probe -L amd_put_event_constraints
...
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
4 __amd_put_nb_event_constraints(cpuc, event);
5 }Committer testing:
Before:
[root@quaco ~]# perf probe -L amd_put_event_constraints
<amd_put_event_constraints@/usr/src/debug/kernel-5.2.fc30/linux-5.2.18-200.fc30.x86_64/arch/x86/events/amd/core.c:0>
0 static void amd_put_event_constraints(struct cpu_hw_events *cpuc,
struct perf_event *event)
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
__amd_put_nb_event_constraints(cpuc, event);
5 } PMU_FORMAT_ATTR(event, "config:0-7,32-35");
PMU_FORMAT_ATTR(umask, "config:8-15" );[root@quaco ~]#
After:
[root@quaco ~]# perf probe -L amd_put_event_constraints
<amd_put_event_constraints@/usr/src/debug/kernel-5.2.fc30/linux-5.2.18-200.fc30.x86_64/arch/x86/events/amd/core.c:0>
0 static void amd_put_event_constraints(struct cpu_hw_events *cpuc,
struct perf_event *event)
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
4 __amd_put_nb_event_constraints(cpuc, event);
5 } PMU_FORMAT_ATTR(event, "config:0-7,32-35");
PMU_FORMAT_ATTR(umask, "config:8-15" ); [root@quaco ~]# perf probe amd_put_event_constraints:4 Added new event:
probe:amd_put_event_constraints (on amd_put_event_constraints:4)
You can now use it in all perf tools, such as:
perf record -e probe:amd_put_event_constraints -aR sleep 1
[root@quaco ~]#
[root@quaco ~]# perf probe -l
probe:amd_put_event_constraints (on amd_put_event_constraints:4@arch/x86/events/amd/core.c) probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@kernel/cpu.c)
[root@quaco ~]#
Using it:
[root@quaco ~]# perf trace -e probe:*
^C[root@quaco ~]#
Ok, Intel system here... :-)
--- tools/perf/util/dwarf-aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +1 -1
@@ -673,7 +673,7 @@ static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data)if (dwarf_tag (in_die) == DW_TAG_inlined_subroutine) { fname =die_get_call_file (in_die); lineno =die_get_call_lineno (in_die); -if (fname && lineno >0 &&dwarf_entrypc (in_die, &addr) ==0 ) { +if (fname && lineno >0 &&die_entrypc (in_die, &addr) ==0 ) { lw->retval = lw->callback (fname, lineno, addr, lw->data);if (lw->retval !=0 )return DIE_FIND_CB_END ;
Signature · 1 line
2.20.1
Re: [PATCH 5.4 250/434] perf probe: Fix to show inlined function callsite without entry_pc
Den 29-12-2019 kl. 19:25, skrev Greg Kroah-Hartman:
Quoted 97 lines
From: Masami Hiramatsu <[email protected]>
[ Upstream commit
18e21eb671dc87a4f0546ba505a89ea93598a634]Fix 'perf probe --line' option to show inlined function callsite lines even if the function DIE has only ranges.
Without this:
# perf probe -L amd_put_event_constraints ... 2 { 3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw)) __amd_put_nb_event_constraints(cpuc, event); 5 }With this patch:
# perf probe -L amd_put_event_constraints ... 2 { 3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw)) 4 __amd_put_nb_event_constraints(cpuc, event); 5 }Committer testing:
Before:
[root@quaco ~]# perf probe -L amd_put_event_constraints <amd_put_event_constraints@/usr/src/debug/kernel-5.2.fc30/linux-5.2.18-200.fc30.x86_64/arch/x86/events/amd/core.c:0> 0 static void amd_put_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event) 2 { 3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw)) __amd_put_nb_event_constraints(cpuc, event); 5 }PMU_FORMAT_ATTR(event, "config:0-7,32-35"); PMU_FORMAT_ATTR(umask, "config:8-15" );[root@quaco ~]#After:
[root@quaco ~]# perf probe -L amd_put_event_constraints <amd_put_event_constraints@/usr/src/debug/kernel-5.2.fc30/linux-5.2.18-200.fc30.x86_64/arch/x86/events/amd/core.c:0> 0 static void amd_put_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event) 2 { 3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw)) 4 __amd_put_nb_event_constraints(cpuc, event); 5 }PMU_FORMAT_ATTR(event, "config:0-7,32-35"); PMU_FORMAT_ATTR(umask, "config:8-15" );[root@quaco ~]# perf probe amd_put_event_constraints:4 Added new event:
probe:amd_put_event_constraints (on amd_put_event_constraints:4)You can now use it in all perf tools, such as:
perf record -e probe:amd_put_event_constraints -aR sleep 1
[root@quaco ~]#
[root@quaco ~]# perf probe -l
probe:amd_put_event_constraints (on amd_put_event_constraints:4@arch/x86/events/amd/core.c) probe:clear_tasks_mm_cpumask (onclear_tasks_mm_cpumask@kernel/cpu.c)
[root@quaco ~]#Using it:
[root@quaco ~]# perf trace -e probe:*
^C[root@quaco ~]#Ok, Intel system here... :-)
Fixes 4cc9cec636e7 ("perf probe: Introduce lines walker interface")Signed-off-by Masami Hiramatsu <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- tools/perf/util/dwarf-aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/dwarf-aux.c +0
-0
tools/perf/util/dwarf-aux.c static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data) · line 679
Quoted 8 lines
tools/perf/util/dwarf-aux.c +1
-1@@ -673,7 +673,7 @@ static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data)if (dwarf_tag (in_die) == DW_TAG_inlined_subroutine) { fname =die_get_call_file (in_die); lineno =die_get_call_lineno (in_die); -if (fname && lineno >0 &&dwarf_entrypc (in_die, &addr) ==0 ) { +if (fname && lineno >0 &&die_entrypc (in_die, &addr) ==0 ) { lw->retval = lw->callback (fname, lineno, addr, lw->data);if (lw->retval !=0 )return DIE_FIND_CB_END ;
Still broken...
util/dwarf-aux.c: In function '__die_walk_funclines_cb':util/dwarf-aux.c:683:30: warning: implicit declaration of function 'die_entrypc'; did you mean 'dwarf_entrypc'? [-Wimplicit-function-declaration]
683 | if (fname && lineno > 0 && die_entrypc(in_die, &addr) == 0) {
--
Thomas
Greg Kroah-Hartman
maintainerPATCH 251/434 libsubcmd: Use -O0 with DEBUG=1
In reply to Greg Kroah-HartmanFrom: James Clark <[email protected]>
[ Upstream commit 22bd8f1b5a1dd168ba4eba27cb17643a11012f5d ]
When a 'make DEBUG=1' build is done, the command parser is still built with -O6 and is hard to step through, fix it making it use -O0 in that case.
--- tools/lib/subcmd/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/lib/subcmd/Makefile +3 -1
@@ -28,7 +28,9 @@ ifeq ($(DEBUG),0) endif endif -ifeq ($(CC_NO_CLANG), 0) +ifeq ($(DEBUG),1) + CFLAGS += -O0 +else ifeq ($(CC_NO_CLANG), 0) CFLAGS += -O3 else CFLAGS += -O6
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 252/434 perf probe: Fix to probe a function which has no entry pc
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 5d16dbcc311d91267ddb45c6da4f187be320ecee ]
Fix 'perf probe' to probe a function which has no entry pc or low pc but only has ranges attribute.
probe_point_search_cb() uses dwarf_entrypc() to get the probe address, but that doesn't work for the function DIE which has only ranges attribute. Use die_entrypc() instead.
Without this fix:
# perf probe -k ../build-x86_64/vmlinux -D clear_tasks_mm_cpumask:0
Probe point 'clear_tasks_mm_cpumask' not found.
Error: Failed to add events.With this:
# perf probe -k ../build-x86_64/vmlinux -D clear_tasks_mm_cpumask:0 p:probe/clear_tasks_mm_cpumask clear_tasks_mm_cpumask+0
Committer testing:
Before:
[root@quaco ~]# perf probe clear_tasks_mm_cpumask:0 Probe point 'clear_tasks_mm_cpumask' not found.
Error: Failed to add events.
[root@quaco ~]#
After:
[root@quaco ~]# perf probe clear_tasks_mm_cpumask:0 Added new event:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask)
You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
[root@quaco ~]#
Using it with 'perf trace':
[root@quaco ~]# perf trace -e probe:clear_tasks_mm_cpumask
Doesn't seem to be used in x86_64:
$ find . -name "*.c" | xargs grep clear_tasks_mm_cpumask ./kernel/cpu.c: * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU ./kernel/cpu.c:void clear_tasks_mm_cpumask(int cpu) ./arch/xtensa/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/csky/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/sh/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/arm/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/powerpc/mm/nohash/mmu_context.c: clear_tasks_mm_cpumask(cpu); $ find . -name "*.h" | xargs grep clear_tasks_mm_cpumask ./include/linux/cpu.h:void clear_tasks_mm_cpumask(int cpu); $ find . -name "*.S" | xargs grep clear_tasks_mm_cpumask $
--- tools/perf/util/probe-finder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/probe-finder.c +1 -1
@@ -994,7 +994,7 @@ static int probe_point_search_cb(Dwarf_Die *sp_die, void *data) param->retval =find_probe_point_by_line (pf); }else if (die_is_func_instance (sp_die)) {/* Instances always have the entry address */ -dwarf_entrypc (sp_die, &pf->addr); +die_entrypc (sp_die, &pf->addr);/* But in some case the entry address is 0 */ if (pf->addr ==0 ) { pr_debug("%s has no entry PC. Skipped\n",
Signature · 1 line
2.20.1
Re: [PATCH 5.4 252/434] perf probe: Fix to probe a function which has no entry pc
Den 29-12-2019 kl. 19:25, skrev Greg Kroah-Hartman:
Quoted 81 lines
From: Masami Hiramatsu <[email protected]>
[ Upstream commit
5d16dbcc311d91267ddb45c6da4f187be320ecee]Fix 'perf probe' to probe a function which has no entry pc or low pc but only has ranges attribute.
probe_point_search_cb()usesdwarf_entrypc()to get the probe address, but that doesn't work for the function DIE which has only ranges attribute. Usedie_entrypc()instead.Without this fix:
# perf probe -k ../build-x86_64/vmlinux -D clear_tasks_mm_cpumask:0 Probe point 'clear_tasks_mm_cpumask' not found. Error: Failed to add events.With this:
# perf probe -k ../build-x86_64/vmlinux -D clear_tasks_mm_cpumask:0 p:probe/clear_tasks_mm_cpumask clear_tasks_mm_cpumask+0Committer testing:
Before:
[root@quaco ~]# perf probe clear_tasks_mm_cpumask:0 Probe point '
clear_tasks_mm_cpumask' not found.
Error: Failed to add events.
[root@quaco ~]#After:
[root@quaco ~]# perf probe clear_tasks_mm_cpumask:0 Added new event:
probe:clear_tasks_mm_cpumask (onclear_tasks_mm_cpumask)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
[root@quaco ~]#Using it with 'perf trace':
[root@quaco ~]# perf trace -e probe:clear_tasks_mm_cpumask
Doesn't seem to be used in
x86_64:$ find . -name "*.c" | xargs grep clear_tasks_mm_cpumask ./kernel/cpu.c: * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU ./kernel/cpu.c:void clear_tasks_mm_cpumask(int cpu) ./arch/xtensa/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/csky/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/sh/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/arm/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/powerpc/mm/nohash/mmu_context.c: clear_tasks_mm_cpumask(cpu); $ find . -name "*.h" | xargs grep clear_tasks_mm_cpumask ./include/linux/cpu.h:void clear_tasks_mm_cpumask(int cpu); $ find . -name "*.S" | xargs grep clear_tasks_mm_cpumask $Fixes e1ecbbc3fa83 ("perf probe: Fix to handle optimized not-inlined functions")Reported-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Masami Hiramatsu <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- tools/perf/util/probe-finder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/probe-finder.c +0
-0
tools/perf/util/probe-finder.c static int probe_point_search_cb(Dwarf_Die *sp_die, void *data) · line 1000
Quoted 8 lines
tools/perf/util/probe-finder.c +1
-1@@ -994,7 +994,7 @@ static int probe_point_search_cb(Dwarf_Die *sp_die, void *data) param->retval =find_probe_point_by_line (pf); }else if (die_is_func_instance (sp_die)) {/* Instances always have the entry address */ -dwarf_entrypc (sp_die, &pf->addr); +die_entrypc (sp_die, &pf->addr);/* But in some case the entry address is 0 */ if (pf->addr ==0 ) { pr_debug("%s has no entry PC. Skipped\n",
Still broken...
/usr/bin/ld: perf-in.o: in function `probe_point_search_cb':
/work/rpmbuild/BUILD/kernel-x86_64/linux-5.4/tools/perf/util/probe-finder.c:1012: undefined reference to `die_entrypc'
--
Thomas
Greg Kroah-Hartman
maintainerPATCH 253/434 perf tools: Fix cross compile for ARM64
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
[ Upstream commit 71f699078b154fcb1c9162fd0208ada9ce532ffc ]
Currently when cross compiling perf tool for ARM64 on my x86 machine I get this error:
arch/arm64/util/sym-handling.c:9:10: fatal error: gelf.h: No such file or directory
#include <gelf.h>
For the build, libelf is reported off:
Auto-detecting system features:
...
... libelf: [ OFF ]
Indeed, test-libelf is not built successfully:
more ./build/feature/test-libelf.make.output test-libelf.c:2:10: fatal error: libelf.h: No such file or directory
#include <libelf.h>
^~~~~~~~~~compilation terminated.
I have no such problems natively compiling on ARM64, and I did not previously have this issue for cross compiling. Fix by relocating the gelf.h include.
--- tools/perf/arch/arm64/util/sym-handling.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/arch/arm64/util/sym-handling.c +2 -1
@@ -6,9 +6,10 @@#include "symbol.h" // for the elf__needs_adjust_symbols() prototype #include <stdbool.h> -#include <gelf.h> #ifdef HAVE_LIBELF_SUPPORT +#include <gelf.h> +bool elf__needs_adjust_symbols (GElf_Ehdr ehdr) { return ehdr.e_type == ET_EXEC ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 254/434 perf tools: Splice events onto evlist even on error
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
[ Upstream commit 8e8714c3d157568b7a769917a5e05573bbaf5af0 ]
If event parsing fails the event list is leaked, instead splice the list onto the out result and let the caller cleanup.
An example input for parse_events found by libFuzzer that reproduces this memory leak is 'm{'.
--- tools/perf/util/parse-events.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
tools/perf/util/parse-events.c +11 -6
@@ -1927,15 +1927,20 @@ int parse_events(struct evlist *evlist, const char *str, ret =parse_events__scanner (str, &parse_state,PE_START_EVENTS );perf_pmu__parse_cleanup (); + +if (!ret &&list_empty (&parse_state.list)) { +WARN_ONCE (true,"WARNING: event parser found nothing\n" ); +return -1 ; + } + +/* +* Add list to the evlist even with errors to allow callers to clean up. +*/ +perf_evlist__splice_list_tail (evlist, &parse_state.list); +if (!ret) {struct evsel *last; -if (list_empty (&parse_state.list)) { -WARN_ONCE (true,"WARNING: event parser found nothing\n" ); -return -1 ; - } - -perf_evlist__splice_list_tail (evlist, &parse_state.list); evlist->nr_groups += parse_state.nr_groups; last =evlist__last (evlist); last->cmdline_group_boundary = true;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 255/434 drm/amdgpu: disallow direct upload save restore list from gfx driver
In reply to Greg Kroah-HartmanFrom: Hawking Zhang <[email protected]>
[ Upstream commit 58f46d4b65021083ef4b4d49c6e2c58e5783f626 ]
Direct uploading save/restore list via mmio register writes breaks the security policy. Instead, the driver should pass s&r list to psp.
For all the ASICs that use rlc v2_1 headers, the driver actually upload s&r list twice, in non-psp ucode front door loading phase and gfx pg initialization phase. The latter is not allowed.
VG12 is the only exception where the driver still keeps legacy approach for S&R list uploading. In theory, this can be elimnated if we have valid srcntl ucode for VG12.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -1
@@ -2930,7 +2930,8 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)* And it's needed by gfxoff feature. */ if (adev->gfx.rlc.is_rlc_v2_1) { -gfx_v9_1_init_rlc_save_restore_list (adev); +if (adev->asic_type ==CHIP_VEGA12 ) +gfx_v9_1_init_rlc_save_restore_list (adev);gfx_v9_0_enable_save_restore_machine (adev); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 256/434 drm/amd/powerplay: fix struct init in renoir_print_clk_levels
In reply to Greg Kroah-HartmanFrom: Raul E Rangel <[email protected]>
[ Upstream commit d942070575910fdb687b9c8fd5467704b2f77c24 ]
drivers/gpu/drm/amd/powerplay/renoir_ppt.c:186:2: error: missing braces around initializer [-Werror=missing-braces]
SmuMetrics_t metrics = {0};
^--- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +3 -1
@@ -183,11 +183,13 @@ static int renoir_print_clk_levels(struct smu_context *smu,int i, size =0 , ret =0 ;uint32_t cur_value =0 , value =0 , count =0 , min =0 , max =0 ;DpmClocks_t *clk_table = smu->smu_table.clocks_table; -SmuMetrics_t metrics = {0 }; +SmuMetrics_t metrics;if (!clk_table || clk_type >=SMU_CLK_COUNT )return -EINVAL ; +memset (&metrics,0 ,sizeof (metrics)); + ret =smu_update_table (smu,SMU_TABLE_SMU_METRICS ,0 , (void *)&metrics, false);if (ret)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 257/434 drm/amdgpu: fix potential double drop fence reference
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit 946ab8db6953535a3a88c957db8328beacdfed9d ]
The object fence is not set to NULL after its reference is dropped. As a result, its reference may be dropped again if error occurs after that, which may lead to a use after free bug. To avoid the issue, fence is explicitly set to NULL after dropping its reference.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_test.c +2 -0
@@ -138,6 +138,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) }dma_fence_put (fence); + fence =NULL ; r =amdgpu_bo_kmap (vram_obj, &vram_map);if (r) {
@@ -183,6 +184,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) }dma_fence_put (fence); + fence =NULL ; r =amdgpu_bo_kmap (gtt_obj[i], >t_map);if (r) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 258/434 ice: Check for null pointer dereference when setting rings
In reply to Greg Kroah-HartmanFrom: Michal Swiatkowski <[email protected]>
[ Upstream commit eb0ee8abfeb9ff4b98e8e40217b8667bfb08587a ]
Without this check rebuild vsi can lead to kernel panic.
--- drivers/net/ethernet/intel/ice/ice_main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +14 -4
@@ -3970,8 +3970,13 @@ int ice_vsi_setup_tx_rings(struct ice_vsi *vsi) }ice_for_each_txq (vsi, i) { - vsi->tx_rings[i]->netdev = vsi->netdev; - err =ice_setup_tx_ring (vsi->tx_rings[i]); +struct ice_ring *ring = vsi->tx_rings[i]; + +if (!ring) +return -EINVAL ; + + ring->netdev = vsi->netdev; + err =ice_setup_tx_ring (ring);if (err)break ; }
@@ -3996,8 +4001,13 @@ int ice_vsi_setup_rx_rings(struct ice_vsi *vsi) }ice_for_each_rxq (vsi, i) { - vsi->rx_rings[i]->netdev = vsi->netdev; - err =ice_setup_rx_ring (vsi->rx_rings[i]); +struct ice_ring *ring = vsi->rx_rings[i]; + +if (!ring) +return -EINVAL ; + + ring->netdev = vsi->netdev; + err =ice_setup_rx_ring (ring);if (err)break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 259/434 xen/gntdev: Use select for DMA_SHARED_BUFFER
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit fa6614d8ef13c63aac52ad7c07c5e69ce4aba3dd ]
DMA_SHARED_BUFFER can not be enabled by the user (it represents a library set in the kernel). The kconfig convention is to use select for such symbols so they are turned on implicitly when the user enables a kconfig that needs them.
Otherwise the XEN_GNTDEV_DMABUF kconfig is overly difficult to enable.
--- drivers/xen/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/xen/Kconfig +2 -1
@@ -141,7 +141,8 @@ config XEN_GNTDEV config XEN_GNTDEV_DMABUF bool "Add support for dma-buf grant access device driver extension" - depends on XEN_GNTDEV && XEN_GRANT_DMA_ALLOC && DMA_SHARED_BUFFER + depends on XEN_GNTDEV && XEN_GRANT_DMA_ALLOC + select DMA_SHARED_BUFFER help Allows userspace processes and kernel modules to use Xen backed dma-buf implementation. With this extension grant references to
Signature · 9 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Greg Kroah-Hartman
maintainerPATCH 260/434 perf parse: If pmu configuration fails free terms
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
[ Upstream commit 38f2c4226e6bc3e8c41c318242821ba5dc825aba ]
Avoid a memory leak when the configuration fails.
--- tools/perf/util/parse-events.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
tools/perf/util/parse-events.c +8 -1
@@ -1365,8 +1365,15 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (get_config_terms (head_config, &config_terms))return -ENOMEM ; -if (perf_pmu__config (pmu, &attr, head_config, parse_state->error)) +if (perf_pmu__config (pmu, &attr, head_config, parse_state->error)) { +struct perf_evsel_config_term *pos, *tmp; + +list_for_each_entry_safe (pos, tmp, &config_terms, list) { +list_del_init (&pos->list); +free (pos); + }return -EINVAL ; + } evsel = __add_event(list, &parse_state->idx, &attr, get_config_name(head_config), pmu,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 261/434 perf probe: Skip overlapped location on searching variables
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit dee36a2abb67c175265d49b9a8c7dfa564463d9a ]
Since debuginfo__find_probes() callback function can be called with the location which already passed, the callback function must filter out such overlapped locations.
add_probe_trace_event() has already done it by commit 1a375ae7659a ("perf probe: Skip same probe address for a given line"), but add_available_vars() doesn't. Thus perf probe -v shows same address repeatedly as below:
# perf probe -V vfs_read:18
Available variables at vfs_read:18
@<vfs_read+217>
char* buf
loff_t* pos
ssize_t ret
struct file* file
@<vfs_read+217>
char* buf
loff_t* pos
ssize_t ret
struct file* file
@<vfs_read+226>
char* buf
loff_t* pos
ssize_t ret
struct file* fileWith this fix, perf probe -V shows it correctly:
# perf probe -V vfs_read:18
Available variables at vfs_read:18
@<vfs_read+217>
char* buf
loff_t* pos
ssize_t ret
struct file* file
@<vfs_read+226>
char* buf
loff_t* pos
ssize_t ret
struct file* file--- tools/perf/util/probe-finder.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
tools/perf/util/probe-finder.c +20 -0
@@ -1425,6 +1425,18 @@ error:return DIE_FIND_CB_END ; } +static bool available_var_finder_overlap (struct available_var_finder *af) +{ +int i; + +for (i =0 ; i < af->nvls; i++) { +if (af->pf.addr == af->vls[i].point.address) +return true; + } +return false; + +} +/* Add a found vars into available variables list */ static int add_available_vars (Dwarf_Die *sc_die,struct probe_finder *pf) {
@@ -1435,6 +1447,14 @@ static int add_available_vars(Dwarf_Die *sc_die, struct probe_finder *pf)Dwarf_Die die_mem;int ret; +/* +* For some reason (e.g. different column assigned to same address), +* this callback can be called with the address which already passed. +* Ignore it first. +*/ +if (available_var_finder_overlap (af)) +return 0 ; +/* Check number of tevs */ if (af->nvls == af->max_vls) {pr_warning ("Too many( > %d) probe point found.\n" , af->max_vls);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 262/434 net: avoid potential false sharing in neighbor related code
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 25c7a6d1f90e208ec27ca854b1381ed39842ec57 ]
There are common instances of the following construct :
if (n->confirmed != now) n->confirmed = now;
A C compiler could legally remove the conditional.
Use READ_ONCE()/WRITE_ONCE() to avoid this problem.
--- include/net/arp.h | 4 ++-- include/net/ndisc.h | 8 ++++---- include/net/sock.h | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-)
include/net/arp.h +2 -2
@@ -57,8 +57,8 @@ static inline void __ipv4_confirm_neigh(struct net_device *dev, u32 key)unsigned long now = jiffies;/* avoid dirtying neighbour */ -if (n->confirmed != now) - n->confirmed = now; +if (READ_ONCE (n->confirmed) != now) +WRITE_ONCE (n->confirmed, now); }rcu_read_unlock_bh (); }
include/net/ndisc.h +4 -4
@@ -414,8 +414,8 @@ static inline void __ipv6_confirm_neigh(struct net_device *dev,unsigned long now = jiffies;/* avoid dirtying neighbour */ -if (n->confirmed != now) - n->confirmed = now; +if (READ_ONCE (n->confirmed) != now) +WRITE_ONCE (n->confirmed, now); }rcu_read_unlock_bh (); }
@@ -431,8 +431,8 @@ static inline void __ipv6_confirm_neigh_stub(struct net_device *dev,unsigned long now = jiffies;/* avoid dirtying neighbour */ -if (n->confirmed != now) - n->confirmed = now; +if (READ_ONCE (n->confirmed) != now) +WRITE_ONCE (n->confirmed, now); }rcu_read_unlock_bh (); }
include/net/sock.h +6 -6
@@ -1940,8 +1940,8 @@ struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie);static inline void sk_dst_confirm (struct sock *sk) { -if (!sk->sk_dst_pending_confirm) - sk->sk_dst_pending_confirm =1 ; +if (!READ_ONCE (sk->sk_dst_pending_confirm)) +WRITE_ONCE (sk->sk_dst_pending_confirm,1 ); }static inline void sock_confirm_neigh (struct sk_buff *skb,struct neighbour *n)
@@ -1951,10 +1951,10 @@ static inline void sock_confirm_neigh(struct sk_buff *skb, struct neighbour *n)unsigned long now = jiffies;/* avoid dirtying neighbour */ -if (n->confirmed != now) - n->confirmed = now; -if (sk && sk->sk_dst_pending_confirm) - sk->sk_dst_pending_confirm =0 ; +if (READ_ONCE (n->confirmed) != now) +WRITE_ONCE (n->confirmed, now); +if (sk &&READ_ONCE (sk->sk_dst_pending_confirm)) +WRITE_ONCE (sk->sk_dst_pending_confirm,0 ); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 263/434 perf probe: Return a better scope DIE if there is no best scope
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit c701636aeec4c173208697d68da6e4271125564b ]
Make find_best_scope() returns innermost DIE at given address if there is no best matched scope DIE. Since Gcc sometimes generates intuitively strange line info which is out of inlined function address range, we need this fixup.
Without this, sometimes perf probe failed to probe on a line inside an inlined function:
# perf probe -D ksys_open:3
Failed to find scope of probe point.
Error: Failed to add events.With this fix, 'perf probe' can probe it:
# perf probe -D ksys_open:3 p:probe/ksys_open _text+25707308 p:probe/ksys_open_1 _text+25710596 p:probe/ksys_open_2 _text+25711114 p:probe/ksys_open_3 _text+25711343 p:probe/ksys_open_4 _text+25714058 p:probe/ksys_open_5 _text+2819653 p:probe/ksys_open_6 _text+2819701
--- tools/perf/util/probe-finder.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
tools/perf/util/probe-finder.c +16 -1
@@ -756,6 +756,16 @@ static int find_best_scope_cb(Dwarf_Die *fn_die, void *data)return 0 ; } +/* Return innermost DIE */ +static int find_inner_scope_cb (Dwarf_Die *fn_die,void *data) +{ +struct find_scope_param *fsp = data; + +memcpy (fsp->die_mem, fn_die,sizeof (Dwarf_Die)); + fsp->found = true; +return 1 ; +} +/* Find an appropriate scope fits to given conditions */ static Dwarf_Die *find_best_scope (struct probe_finder *pf,Dwarf_Die *die_mem) {
@@ -767,8 +777,13 @@ static Dwarf_Die *find_best_scope(struct probe_finder *pf, Dwarf_Die *die_mem) .die_mem = die_mem, .found = false, }; +int ret; -cu_walk_functions_at (&pf->cu_die, pf->addr, find_best_scope_cb, &fsp); + ret =cu_walk_functions_at (&pf->cu_die, pf->addr, find_best_scope_cb, + &fsp); +if (!ret && !fsp.found) +cu_walk_functions_at (&pf->cu_die, pf->addr, + find_inner_scope_cb, &fsp);return fsp.found ? die_mem :NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 264/434 perf probe: Fix to show calling lines of inlined functions
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 86c0bf8539e7f46d91bd105e55eda96e0064caef ]
Fix to show calling lines of inlined functions (where an inline function is called).
die_walk_lines() filtered out the lines inside inlined functions based on the address. However this also filtered out the lines which call those inlined functions from the target function.
To solve this issue, check the call_file and call_line attributes and do not filter out if it matches to the line information.
Without this fix, perf probe -L doesn't show some lines correctly. (don't see the lines after 17)
# perf probe -L vfs_read
<vfs_read@/home/mhiramat/ksrc/linux/fs/read_write.c:0>
0 ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
1 {
2 ssize_t ret; 4 if (!(file->f_mode & FMODE_READ))
return -EBADF;
6 if (!(file->f_mode & FMODE_CAN_READ))
return -EINVAL;
8 if (unlikely(!access_ok(buf, count)))
return -EFAULT;
11 ret = rw_verify_area(READ, file, pos, count);
12 if (!ret) {
13 if (count > MAX_RW_COUNT)
count = MAX_RW_COUNT;
15 ret = __vfs_read(file, buf, count, pos);
16 if (ret > 0) {
fsnotify_access(file);
add_rchar(current, ret);
}With this fix:
# perf probe -L vfs_read
<vfs_read@/home/mhiramat/ksrc/linux/fs/read_write.c:0>
0 ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
1 {
2 ssize_t ret; 4 if (!(file->f_mode & FMODE_READ))
return -EBADF;
6 if (!(file->f_mode & FMODE_CAN_READ))
return -EINVAL;
8 if (unlikely(!access_ok(buf, count)))
return -EFAULT;
11 ret = rw_verify_area(READ, file, pos, count);
12 if (!ret) {
13 if (count > MAX_RW_COUNT)
count = MAX_RW_COUNT;
15 ret = __vfs_read(file, buf, count, pos);
16 if (ret > 0) {
17 fsnotify_access(file);
18 add_rchar(current, ret);
}
20 inc_syscr(current);
}--- tools/perf/util/dwarf-aux.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +9 -1
@@ -755,7 +755,7 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data)Dwarf_Lines *lines;Dwarf_Line *line;Dwarf_Addr addr; -const char *fname, *decf =NULL ; +const char *fname, *decf =NULL , *inf =NULL ;int lineno, ret =0 ;int decl =0 , inl;Dwarf_Die die_mem, *cu_die;
@@ -799,13 +799,21 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data)*/ if (!dwarf_haspc (rt_die, addr))continue ; +if (die_find_inlinefunc (rt_die, addr, &die_mem)) { +/* Call-site check */ + inf =die_get_call_file (&die_mem); +if ((inf && !strcmp (inf, decf)) && +die_get_call_lineno (&die_mem) == lineno) + goto found; +dwarf_decl_line (&die_mem, &inl);if (inl != decl || decf !=dwarf_decl_file (&die_mem))continue ; } } +found:/* Get source line */ fname =dwarf_linesrc (line,NULL ,NULL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 265/434 perf probe: Skip end-of-sequence and non statement lines
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit f4d99bdfd124823a81878b44b5e8750b97f73902 ]
Skip end-of-sequence and non-statement lines while walking through lines list.
The "end-of-sequence" line information means:
"the current address is that of the first byte after the
end of a sequence of target machine instructions."
(DWARF version 4 spec 6.2.2)
This actually means out of scope and we can not probe on it.
On the other hand, the statement lines (is_stmt) means:
"the current instruction is a recommended breakpoint location.
A recommended breakpoint location is intended to “represent” a line, a statement and/or a semantically distinct subpart of a statement."
(DWARF version 4 spec 6.2.2)
So, non-statement line info also should be skipped.
These can reduce unneeded probe points and also avoid an error.
E.g. without this patch:
# perf probe -a "clear_tasks_mm_cpumask:1"
Added new events:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_2 (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_3 (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_4 (on clear_tasks_mm_cpumask:1)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask_4 -aR sleep 1
#
This puts 5 probes on one line, but acutally it's not inlined function. This is because there are many non statement instructions at the function prologue.
With this patch:
# perf probe -a "clear_tasks_mm_cpumask:1"
Added new event:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask:1)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
#
Now perf-probe skips unneeded addresses.
Committer testing:
Slightly different results, but similar:
Before:
# uname -a
Linux quaco 5.3.8-200.fc30.x86_64 #1 SMP Tue Oct 29 14:46:22 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
#
# perf probe -a "clear_tasks_mm_cpumask:1"
Added new events:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_2 (on clear_tasks_mm_cpumask:1)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask_2 -aR sleep 1
#
After:
# perf probe -a "clear_tasks_mm_cpumask:1"
Added new event:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask:1)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@kernel/cpu.c)
#--- tools/perf/util/dwarf-aux.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/util/dwarf-aux.c +7 -0
@@ -760,6 +760,7 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data)int decl =0 , inl;Dwarf_Die die_mem, *cu_die;size_t nlines, i; +bool flag;/* Get the CU die */ if (dwarf_tag (rt_die) != DW_TAG_compile_unit) {
@@ -790,6 +791,12 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data) "Possible error in debuginfo.\n");continue ; } +/* Skip end-of-sequence */ +if (dwarf_lineendsequence (line, &flag) !=0 || flag) +continue ; +/* Skip Non statement line-info */ +if (dwarf_linebeginstatement (line, &flag) !=0 || !flag) +continue ;/* Filter lines based on address */ if (rt_die != cu_die) {/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 266/434 perf probe: Filter out instances except for inlined subroutine and subprogram
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit da6cb952a89efe24bb76c4971370d485737a2d85 ]
Filter out instances except for inlined_subroutine and subprogram DIE in die_walk_instances() and die_is_func_instance().
This fixes an issue that perf probe sets some probes on calling address instead of a target function itself.
When perf probe walks on instances of an abstruct origin (a kind of function prototype of inlined function), die_walk_instances() can also pass a GNU_call_site (a GNU extension for call site) to callback. Since it is not an inlined instance of target function, we have to filter out when searching a probe point.
Without this patch, perf probe sets probes on call site address too.This can happen on some function which is marked "inlined", but has actual symbol. (I'm not sure why GCC mark it "inlined"):
# perf probe -D vfs_read p:probe/vfs_read _text+2500017 p:probe/vfs_read_1 _text+2499468 p:probe/vfs_read_2 _text+2499563 p:probe/vfs_read_3 _text+2498876 p:probe/vfs_read_4 _text+2498512 p:probe/vfs_read_5 _text+2498627
With this patch:
Slightly different results, similar tho:
# perf probe -D vfs_read p:probe/vfs_read _text+2498512
Committer testing:
# uname -a Linux quaco 5.3.8-200.fc30.x86_64 #1 SMP Tue Oct 29 14:46:22 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
Before:
# perf probe -D vfs_read p:probe/vfs_read _text+3131557 p:probe/vfs_read_1 _text+3130975 p:probe/vfs_read_2 _text+3131047 p:probe/vfs_read_3 _text+3130380 p:probe/vfs_read_4 _text+3130000 # uname -a Linux quaco 5.3.8-200.fc30.x86_64 #1 SMP Tue Oct 29 14:46:22 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux #
After:
# perf probe -D vfs_read p:probe/vfs_read _text+3130000 #
--- tools/perf/util/dwarf-aux.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
tools/perf/util/dwarf-aux.c +13 -6
@@ -312,18 +312,22 @@ bool die_is_func_def(Dwarf_Die *dw_die)* @dw_die: a DIE * * Ensure that this DIE is an instance (which has an entry address). -* This returns true if @dw_die is a function instance. If not, you need to -* call die_walk_instances() to find actual instances. +* This returns true if @dw_die is a function instance. If not, the @dw_die +* must be a prototype. You can use die_walk_instances() to find actual +* instances. **/ bool die_is_func_instance (Dwarf_Die *dw_die) {Dwarf_Addr tmp;Dwarf_Attribute attr_mem; +int tag =dwarf_tag (dw_die); -/* Actually gcc optimizes non-inline as like as inlined */ -return !dwarf_func_inline (dw_die) && - (dwarf_entrypc (dw_die, &tmp) ==0 || -dwarf_attr (dw_die, DW_AT_ranges, &attr_mem) !=NULL ); +if (tag != DW_TAG_subprogram && + tag != DW_TAG_inlined_subroutine) +return false; + +return dwarf_entrypc (dw_die, &tmp) ==0 || +dwarf_attr (dw_die, DW_AT_ranges, &attr_mem) !=NULL ; }/**
@@ -602,6 +606,9 @@ static int __die_walk_instances_cb(Dwarf_Die *inst, void *data)Dwarf_Die *origin;int tmp; +if (!die_is_func_instance (inst)) +return DIE_FIND_CB_CONTINUE ; + attr =dwarf_attr (inst, DW_AT_abstract_origin, &attr_mem);if (attr ==NULL )return DIE_FIND_CB_CONTINUE ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 267/434 libbpf: Fix negative FD close() in xsk_setup_xdp_prog()
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 9656b346b280c3e49c8a116c3a715f966633b161 ]
Fix issue reported by static analysis (Coverity). If bpf_prog_get_fd_by_id() fails, xsk_lookup_bpf_maps() will fail as well and clean-up code will attempt close() with fd=-1. Fix by checking bpf_prog_get_fd_by_id() return result and exiting early.
--- tools/lib/bpf/xsk.c | 2 ++ 1 file changed, 2 insertions(+)
tools/lib/bpf/xsk.c +2 -0
@@ -466,6 +466,8 @@ static int xsk_setup_xdp_prog(struct xsk_socket *xsk) } }else { xsk->prog_fd =bpf_prog_get_fd_by_id (prog_id); +if (xsk->prog_fd <0 ) +return -errno; err =xsk_lookup_bpf_maps (xsk);if (err) {close (xsk->prog_fd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 268/434 s390/bpf: Use kvcalloc for addrs array
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit 166f11d11f6f70439830d09bfa5552ec1b368494 ]
A BPF program may consist of 1m instructions, which means JIT instruction-address mapping can be as large as 4m. s390 has FORCE_MAX_ZONEORDER=9 (for memory hotplug reasons), which means maximum kmalloc size is 1m. This makes it impossible to JIT programs with more than 256k instructions.
Fix by using kvcalloc, which falls back to vmalloc for larger allocations. An alternative would be to use a radix tree, but that is not supported by bpf_prog_fill_jited_linfo.
--- arch/s390/net/bpf_jit_comp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/s390/net/bpf_jit_comp.c +3 -2
@@ -23,6 +23,7 @@#include <linux/filter.h> #include <linux/init.h> #include <linux/bpf.h> +#include <linux/mm.h> #include <asm/cacheflush.h> #include <asm/dis.h> #include <asm/facility.h>
@@ -1369,7 +1370,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) }memset (&jit,0 ,sizeof (jit)); - jit.addrs =kcalloc (fp->len +1 ,sizeof (*jit.addrs),GFP_KERNEL ); + jit.addrs =kvcalloc (fp->len +1 ,sizeof (*jit.addrs),GFP_KERNEL );if (jit.addrs ==NULL ) { fp = orig_fp; goto out;
@@ -1422,7 +1423,7 @@ skip_init_ctx:if (!fp->is_func || extra_pass) {bpf_prog_fill_jited_linfo (fp, jit.addrs +1 ); free_addrs: -kfree (jit.addrs); +kvfree (jit.addrs);kfree (jit_data); fp->aux->jit_data =NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 269/434 cgroup: freezer: dont change task and cgroups status unnecessarily
In reply to Greg Kroah-HartmanFrom: Honglei Wang <[email protected]>
[ Upstream commit 742e8cd3e1ba6f19cad6d912f8d469df5557d0fd ]
It's not necessary to adjust the task state and revisit the state of source and destination cgroups if the cgroups are not in freeze state and the task itself is not frozen.
And in this scenario, it wakes up the task who's not supposed to be ready to run.
Don't do the unnecessary task state adjustment can help stop waking up the task without a reason.
--- kernel/cgroup/freezer.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/cgroup/freezer.c +9 -0
@@ -230,6 +230,15 @@ void cgroup_freezer_migrate_task(struct task_struct *task,if (task->flags &PF_KTHREAD )return ; +/* +* It's not necessary to do changes if both of the src and dst cgroups +* are not freezing and task is not frozen. +*/ +if (!test_bit (CGRP_FREEZE , &src->flags) && + !test_bit (CGRP_FREEZE , &dst->flags) && + !task->frozen) +return ; +/* * Adjust counters of freezing and frozen tasks. * Note, that if the task is frozen, but the destination cgroup is not
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 270/434 selftests: proc: Make va_max 1MB
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 2f3571ea71311bbb2cbb9c3bbefc9c1969a3e889 ]
Currently proc-self-map-files-002.c sets va_max (max test address of user virtual address) to 4GB, but it is too big for 32bit arch and 1UL << 32 is overflow on 32bit long.
Also since this value should be enough bigger than vm.mmap_min_addr (64KB or 32KB by default), 1MB should be enough.
Make va_max 1MB unconditionally.
--- tools/testing/selftests/proc/proc-self-map-files-002.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/testing/selftests/proc/proc-self-map-files-002.c +5 -1
@@ -47,7 +47,11 @@ static void fail(const char *fmt, unsigned long a, unsigned long b)int main (void ) {const int PAGE_SIZE =sysconf (_SC_PAGESIZE); -const unsigned long va_max =1UL <<32 ; +/* +* va_max must be enough bigger than vm.mmap_min_addr, which is +* 64KB/32KB by default. (depends on CONFIG_LSM_MMAP_MIN_ADDR) +*/ +const unsigned long va_max =1UL <<20 ;unsigned long va;void *p;int fd;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 271/434 drm/amdgpu: Avoid accidental thread reactivation.
In reply to Greg Kroah-HartmanFrom: Andrey Grodzovsky <[email protected]>
[ Upstream commit a28fda312a9fabdf0e5f5652449d6197c9fb0a90 ]
Problem:
During GPU reset we call the GPU scheduler to suspend it's thread, those two functions in amdgpu also suspend and resume the sceduler for their needs but this can collide with GPU reset in progress and accidently restart a suspended thread before time.
Fix:
Serialize with GPU reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +10 -0
@@ -859,6 +859,9 @@ static int amdgpu_debugfs_test_ib(struct seq_file *m, void *data)struct amdgpu_device *adev = dev->dev_private;int r =0 , i; +/* Avoid accidently unparking the sched thread during GPU reset */ +mutex_lock (&adev->lock_reset); +/* hold on the scheduler */ for (i =0 ; i <AMDGPU_MAX_RINGS ; i++) {struct amdgpu_ring *ring = adev->rings[i];
@@ -884,6 +887,8 @@ static int amdgpu_debugfs_test_ib(struct seq_file *m, void *data)kthread_unpark (ring->sched.thread); } +mutex_unlock (&adev->lock_reset); +return 0 ; }
@@ -1036,6 +1041,9 @@ static int amdgpu_debugfs_ib_preempt(void *data, u64 val)if (!fences)return -ENOMEM ; +/* Avoid accidently unparking the sched thread during GPU reset */ +mutex_lock (&adev->lock_reset); +/* stop the scheduler */ kthread_park (ring->sched.thread);
@@ -1075,6 +1083,8 @@ failure:/* restart the scheduler */ kthread_unpark (ring->sched.thread); +mutex_unlock (&adev->lock_reset); +ttm_bo_unlock_delayed_workqueue (&adev->mman.bdev, resched);if (fences)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 272/434 media: exynos4-is: fix wrong mdev and v4l2 dev order in error path
In reply to Greg Kroah-HartmanFrom: Seung-Woo Kim <[email protected]>
[ Upstream commit 4d741cbd58bf889c8a68cf6e592a7892b5c2802e ]
When driver is built as module and probe during insmod is deferred because of sensor subdevs, there is NULL pointer deference because mdev is cleaned up and then access it from v4l2_device_unregister(). Fix the wrong mdev and v4l2 dev order in error path of probe.
This fixes below null pointer deference:
Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = ca026f68 [00000000] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT SMP ARM [...] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) PC is at ida_free+0x7c/0x160 LR is at xas_start+0x44/0x204 [...] [<c0dafd60>] (ida_free) from [<c083c20c>] (__media_device_unregister_entity+0x18/0xc0) [<c083c20c>] (__media_device_unregister_entity) from [<c083c2e0>] (media_device_unregister_entity+0x2c/0x38) [<c083c2e0>] (media_device_unregister_entity) from [<c0843404>] (v4l2_device_release+0xd0/0x104) [<c0843404>] (v4l2_device_release) from [<c0632558>] (device_release+0x28/0x98) [<c0632558>] (device_release) from [<c0db1204>] (kobject_put+0xa4/0x208) [<c0db1204>] (kct_put) from [<bf00bac4>] (fimc_capture_subdev_unregistered+0x58/0x6c [s5p_fimc]) [<bf00bac4>] (fimc_capture_subdev_unregistered [s5p_fimc]) from [<c084a1cc>] (v4l2_device_unregister_subdev+0x6c/0xa8) [<c084a1cc>] (v4l2_device_unregister_subdev) from [<c084a350>] (v4l2_device_unregister+0x64/0x94) [<c084a350>] (v4l2_device_unregister) from [<bf0101ac>] (fimc_md_probe+0x4ec/0xaf8 [s5p_fimc]) [...]
--- drivers/media/platform/exynos4-is/media-dev.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/media/platform/exynos4-is/media-dev.c +4 -3
@@ -1457,12 +1457,12 @@ static int fimc_md_probe(struct platform_device *pdev) ret =v4l2_device_register (dev, &fmd->v4l2_dev);if (ret <0 ) {v4l2_err (v4l2_dev,"Failed to register v4l2_device: %d\n" , ret); -return ret; + goto err_md; } ret =fimc_md_get_clocks (fmd);if (ret) - goto err_md; + goto err_v4l2dev; ret =fimc_md_get_pinctrl (fmd);if (ret <0 ) {
@@ -1519,9 +1519,10 @@ err_m_ent:fimc_md_unregister_entities (fmd); err_clk:fimc_md_put_clocks (fmd); +err_v4l2dev: +v4l2_device_unregister (&fmd->v4l2_dev); err_md:media_device_cleanup (&fmd->media_dev); -v4l2_device_unregister (&fmd->v4l2_dev);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 273/434 ath10k: fix get invalid tx rate for Mesh metric
In reply to Greg Kroah-HartmanFrom: Miaoqing Pan <[email protected]>
[ Upstream commit 05a11003a56507023f18d3249a4d4d119c0a3e9c ]
ath10k does not provide transmit rate info per MSDU in tx completion, mark that as -1 so mac80211 will ignore the rates. This fixes mac80211 update Mesh link metric with invalid transmit rate info.
Tested HW: QCA9984
Tested FW: 10.4-3.9.0.2-00035
--- drivers/net/wireless/ath/ath10k/txrx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath10k/txrx.c +2 -0
@@ -95,6 +95,8 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt, info =IEEE80211_SKB_CB (msdu);memset (&info->status,0 ,sizeof (info->status)); + info->status.rates[0 ].idx =-1 ; +trace_ath10k_txrx_tx_unref (ar, tx_done->msdu_id);if (!(info->flags &IEEE80211_TX_CTL_NO_ACK ))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 274/434 fsi: core: Fix small accesses and unaligned offsets via sysfs
In reply to Greg Kroah-HartmanFrom: Andrew Jeffery <[email protected]>
[ Upstream commit 9f4c2b516b4f031e3cd0e45957f4150b3c1a083d ]
Subtracting the offset delta from four-byte alignment lead to wrapping of the requested length where count is less than off. Generalise the length handling to enable and optimise aligned access sizes for all offset and size combinations. The new formula produces the following results for given offset and count values:
offset count | length
--------------+-------
0 1 | 1
0 2 | 2
0 3 | 2
0 4 | 4
0 5 | 4
1 1 | 1
1 2 | 1
1 3 | 1
1 4 | 1
1 5 | 1
2 1 | 1
2 2 | 2
2 3 | 2
2 4 | 2
2 5 | 2
3 1 | 1
3 2 | 1
3 3 | 1
3 4 | 1
3 5 | 1
We might need something like this for the cfam chardevs as well, for example we don't currently implement any alignment restrictions / handling in the hardware master driver.
--- drivers/fsi/fsi-core.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)
drivers/fsi/fsi-core.c +27 -4
@@ -544,6 +544,31 @@ static int fsi_slave_scan(struct fsi_slave *slave)return 0 ; } +static unsigned long aligned_access_size (size_t offset,size_t count) +{ +unsigned long offset_unit, count_unit; + +/* Criteria: +* +* 1. Access size must be less than or equal to the maximum access +* width or the highest power-of-two factor of offset +* 2. Access size must be less than or equal to the amount specified by +* count +* +* The access width is optimal if we can calculate 1 to be strictly +* equal while still satisfying 2. +*/ + +/* Find 1 by the bottom bit of offset (with a 4 byte access cap) */ + offset_unit =BIT (__builtin_ctzl (offset |4 )); + +/* Find 2 by the top bit of count */ + count_unit =BIT (8 *sizeof (unsigned long ) -1 -__builtin_clzl (count)); + +/* Constrain the maximum access width to the minimum of both criteria */ +return BIT (__builtin_ctzl (offset_unit | count_unit)); +} +static ssize_t fsi_slave_sysfs_raw_read (struct file *file,struct kobject *kobj,struct bin_attribute *attr,char *buf,loff_t off,size_t count)
@@ -559,8 +584,7 @@ static ssize_t fsi_slave_sysfs_raw_read(struct file *file,return -EINVAL ;for (total_len =0 ; total_len < count; total_len += read_len) { - read_len =min_t (size_t, count,4 ); - read_len -= off &0x3 ; + read_len =aligned_access_size (off, count - total_len); rc =fsi_slave_read (slave, off, buf + total_len, read_len);if (rc)
@@ -587,8 +611,7 @@ static ssize_t fsi_slave_sysfs_raw_write(struct file *file,return -EINVAL ;for (total_len =0 ; total_len < count; total_len += write_len) { - write_len =min_t (size_t, count,4 ); - write_len -= off &0x3 ; + write_len =aligned_access_size (off, count - total_len); rc =fsi_slave_write (slave, off, buf + total_len, write_len);if (rc)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 275/434 selftests: net: Fix printf format warnings on arm
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 670cd6849ea36ea4df2f2941cf4717dff8755abe ]
Fix printf format warnings on arm (and other 32bit arch).
- udpgso.c and udpgso_bench_tx use %lu for size_t but it should be unsigned long long on 32bit arch.
- so_txtime.c uses %ld for int64_t, but it should be unsigned long long on 32bit arch.
--- tools/testing/selftests/net/so_txtime.c | 4 ++-- tools/testing/selftests/net/udpgso.c | 3 ++- tools/testing/selftests/net/udpgso_bench_tx.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-)
tools/testing/selftests/net/so_txtime.c +2 -2
@@ -105,8 +105,8 @@ static void do_recv_one(int fdr, struct timed_send *ts) tstop = (gettime_ns () - glob_tstart) /1000 ; texpect = ts->delay_us >=0 ? ts->delay_us :0 ; -fprintf (stderr,"payload:%c delay:%ld expected:%ld (us)\n" , - rbuf[0 ], tstop, texpect); +fprintf (stderr,"payload:%c delay:%lld expected:%lld (us)\n" , + rbuf[0 ], (long long )tstop, (long long )texpect);if (rbuf[0 ] != ts->data)error (1 ,0 ,"payload mismatch. expected %c" , ts->data);
tools/testing/selftests/net/udpgso.c +2 -1
@@ -440,7 +440,8 @@ static bool __send_one(int fd, struct msghdr *msg, int flags)if (ret ==-1 )error (1 , errno,"sendmsg" );if (ret != msg->msg_iov->iov_len) -error (1 ,0 ,"sendto: %d != %lu" , ret, msg->msg_iov->iov_len); +error (1 ,0 ,"sendto: %d != %llu" , ret, + (unsigned long long )msg->msg_iov->iov_len);if (msg->msg_flags)error (1 ,0 ,"sendmsg: return flags 0x%x\n" , msg->msg_flags);
tools/testing/selftests/net/udpgso_bench_tx.c +2 -1
@@ -405,7 +405,8 @@ static int send_udp_segment(int fd, char *data)if (ret ==-1 )error (1 , errno,"sendmsg" );if (ret != iov.iov_len) -error (1 ,0 ,"sendmsg: %u != %lu\n" , ret, iov.iov_len); +error (1 ,0 ,"sendmsg: %u != %llu\n" , ret, + (unsigned long long )iov.iov_len);return 1 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 276/434 media: pvrusb2: Fix oops on tear-down when radio support is not present
In reply to Greg Kroah-HartmanFrom: Mike Isely <[email protected]>
[ Upstream commit 7f404ae9cf2a285f73b3c18ab9303d54b7a3d8e1 ]
In some device configurations there's no radio or radio support in the driver. That's OK, as the driver sets itself up accordingly. However on tear-down in these caes it's still trying to tear down radio related context when there isn't anything there, leading to dereferences through a null pointer and chaos follows.
How this bug survived unfixed for 11 years in the pvrusb2 driver is a mystery to me.
[hverkuil: fix two checkpatch warnings]
--- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c +7 -2
@@ -898,8 +898,12 @@ static void pvr2_v4l2_internal_check(struct pvr2_channel *chp)pvr2_v4l2_dev_disassociate_parent (vp->dev_video);pvr2_v4l2_dev_disassociate_parent (vp->dev_radio);if (!list_empty (&vp->dev_video->devbase.fh_list) || - !list_empty (&vp->dev_radio->devbase.fh_list)) + (vp->dev_radio && + !list_empty (&vp->dev_radio->devbase.fh_list))) { +pvr2_trace (PVR2_TRACE_STRUCT , +"pvr2_v4l2 internal_check exit-empty id=%p" , vp);return ; + }pvr2_v4l2_destroy_no_lock (vp); }
@@ -935,7 +939,8 @@ static int pvr2_v4l2_release(struct file *file)kfree (fhp);if (vp->channel.mc_head->disconnect_flag &&list_empty (&vp->dev_video->devbase.fh_list) && -list_empty (&vp->dev_radio->devbase.fh_list)) { + (!vp->dev_radio || +list_empty (&vp->dev_radio->devbase.fh_list))) {pvr2_v4l2_destroy_no_lock (vp); }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 277/434 soundwire: intel: fix PDI/stream mapping for Bulk
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit c134f914e9f55b7817e2bae625ec0e5f1379f7cd ]
The previous formula is incorrect for PDI0/1, the mapping is not linear but has a discontinuity between PDI1 and PDI2.
This change has no effect on PCM PDIs (same mapping).
--- drivers/soundwire/intel.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/soundwire/intel.c +8 -2
@@ -479,7 +479,10 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)unsigned int link_id = sdw->instance;int pdi_conf =0 ; - pdi->intel_alh_id = (link_id *16 ) + pdi->num +5 ; +/* the Bulk and PCM streams are not contiguous */ + pdi->intel_alh_id = (link_id *16 ) + pdi->num +3 ; +if (pdi->num >=2 ) + pdi->intel_alh_id +=2 ;/* * Program stream parameters to stream SHIM register
@@ -508,7 +511,10 @@ intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)unsigned int link_id = sdw->instance;unsigned int conf; - pdi->intel_alh_id = (link_id *16 ) + pdi->num +5 ; +/* the Bulk and PCM streams are not contiguous */ + pdi->intel_alh_id = (link_id *16 ) + pdi->num +3 ; +if (pdi->num >=2 ) + pdi->intel_alh_id +=2 ;/* Program Stream config ALH register */ conf =intel_readl (alh,SDW_ALH_STRMZCFG (pdi->intel_alh_id));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 278/434 crypto: atmel - Fix authenc support when it is set to m
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 1520c72596dde7f22b8bd6bed3ef7df2b8b7ef39 ]
As it is if CONFIG_CRYPTO_DEV_ATMEL_AUTHENC is set to m it is in effect disabled. This patch fixes it by using IS_ENABLED instead of ifdef.
--- drivers/crypto/atmel-aes.c | 18 +++++++++--------- drivers/crypto/atmel-authenc.h | 2 +- drivers/crypto/atmel-sha.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-)
drivers/crypto/atmel-aes.c +9 -9
@@ -145,7 +145,7 @@ struct atmel_aes_xts_ctx {u32 key2[AES_KEYSIZE_256 /sizeof (u32)]; }; -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC) struct atmel_aes_authenc_ctx { struct atmel_aes_base_ctx base; struct atmel_sha_authenc_ctx *auth;
@@ -157,7 +157,7 @@ struct atmel_aes_reqctx {u32 lastc[AES_BLOCK_SIZE /sizeof (u32)]; }; -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC) struct atmel_aes_authenc_reqctx { struct atmel_aes_reqctx base;
@@ -486,7 +486,7 @@ static inline bool atmel_aes_is_encrypt(const struct atmel_aes_dev *dd)return (dd->flags &AES_FLAGS_ENCRYPT ); } -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )static void atmel_aes_authenc_complete (struct atmel_aes_dev *dd,int err);#endif
@@ -515,7 +515,7 @@ static void atmel_aes_set_iv_as_last_ciphertext_block(struct atmel_aes_dev *dd)static inline int atmel_aes_complete (struct atmel_aes_dev *dd,int err) { -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )if (dd->ctx->is_aead)atmel_aes_authenc_complete (dd, err);#endif
@@ -1980,7 +1980,7 @@ static struct crypto_alg aes_xts_alg = { } }; -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )/* authenc aead functions */ static int atmel_aes_authenc_start (struct atmel_aes_dev *dd);
@@ -2467,7 +2467,7 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd) {int i; -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )if (dd->caps.has_authenc)for (i =0 ; i <ARRAY_SIZE (aes_authenc_algs); i++)crypto_unregister_aead (&aes_authenc_algs[i]);
@@ -2514,7 +2514,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) goto err_aes_xts_alg; } -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )if (dd->caps.has_authenc) {for (i =0 ; i <ARRAY_SIZE (aes_authenc_algs); i++) { err =crypto_register_aead (&aes_authenc_algs[i]);
@@ -2526,7 +2526,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd)return 0 ; -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )/* i = ARRAY_SIZE(aes_authenc_algs); */ err_aes_authenc_alg:for (j =0 ; j < i; j++)
@@ -2716,7 +2716,7 @@ static int atmel_aes_probe(struct platform_device *pdev)atmel_aes_get_cap (aes_dd); -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )if (aes_dd->caps.has_authenc && !atmel_sha_authenc_is_ready ()) { err = -EPROBE_DEFER ; goto iclk_unprepare;
drivers/crypto/atmel-authenc.h +1 -1
@@ -12,7 +12,7 @@#ifndef __ATMEL_AUTHENC_H__#define __ATMEL_AUTHENC_H__ -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )#include <crypto/authenc.h> #include <crypto/hash.h>
drivers/crypto/atmel-sha.c +1 -1
@@ -2212,7 +2212,7 @@ static struct ahash_alg sha_hmac_algs[] = { }, }; -#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )/* authenc functions */ static int atmel_sha_authenc_init2 (struct atmel_sha_dev *dd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 279/434 ice: delay less
In reply to Greg Kroah-HartmanFrom: Mitch Williams <[email protected]>
[ Upstream commit 88bb432a55de8ae62106305083a8bfbb23b01ad2 ]
Shorten the delay for SQ responses, but increase the number of loops. Max delay time is unchanged, but some operations complete much more quickly.
In the process, add a new define to make the delay count and delay time more explicit. Add comments to make things more explicit.
This fixes a problem with VF resets failing on with many VFs.
--- drivers/net/ethernet/intel/ice/ice_controlq.c | 2 +- drivers/net/ethernet/intel/ice/ice_controlq.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ice/ice_controlq.c +1 -1
@@ -948,7 +948,7 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,if (ice_sq_done (hw, cq))break ; -mdelay (1 ); +udelay (ICE_CTL_Q_SQ_CMD_USEC ); total_delay++; }while (total_delay < cq->sq_cmd_timeout);
drivers/net/ethernet/intel/ice/ice_controlq.h +3 -2
@@ -31,8 +31,9 @@ enum ice_ctl_q { ICE_CTL_Q_MAILBOX, }; -/* Control Queue default settings */ -#define ICE_CTL_Q_SQ_CMD_TIMEOUT 250/* msecs */ +/* Control Queue timeout settings - max delay 250ms */ +#define ICE_CTL_Q_SQ_CMD_TIMEOUT 2500/* Count 2500 times */ +#define ICE_CTL_Q_SQ_CMD_USEC 100/* Check every 100usec */ struct ice_ctl_q_ring {void *dma_head;/* Virtual address to DMA head */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 280/434 media: si470x-i2c: add missed operations in remove
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 2df200ab234a86836a8879a05a8007d6b884eb14 ]
The driver misses calling v4l2_ctrl_handler_free and v4l2_device_unregister in remove like what is done in probe failure. Add the calls to fix it.
--- drivers/media/radio/si470x/radio-si470x-i2c.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/radio/si470x/radio-si470x-i2c.c +2 -0
@@ -482,6 +482,8 @@ static int si470x_i2c_remove(struct i2c_client *client)if (radio->gpio_reset)gpiod_set_value (radio->gpio_reset,0 ); +v4l2_ctrl_handler_free (&radio->hdl); +v4l2_device_unregister (&radio->v4l2_dev);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 281/434 media: cedrus: Use helpers to access capture queue
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit 1fd50a2c294457508f06b8b631d01a58de81cdd2 ]
Accessing capture queue structue directly is not safe. Use helpers for that.
--- drivers/staging/media/sunxi/cedrus/cedrus.h | 8 ++++++-- drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-)
drivers/staging/media/sunxi/cedrus/cedrus.h +6 -2
@@ -179,12 +179,16 @@ static inline dma_addr_t cedrus_buf_addr(struct vb2_buffer *buf,static inline dma_addr_t cedrus_dst_buf_addr (struct cedrus_ctx *ctx,int index,unsigned int plane) { -struct vb2_buffer *buf; +struct vb2_buffer *buf =NULL ; +struct vb2_queue *vq;if (index <0 )return 0 ; - buf = ctx->fh.m2m_ctx->cap_q_ctx.q.bufs[index]; + vq =v4l2_m2m_get_vq (ctx->fh.m2m_ctx,V4L2_BUF_TYPE_VIDEO_CAPTURE ); +if (vq) + buf =vb2_get_buffer (vq, index); +return buf ?cedrus_buf_addr (buf, &ctx->dst_fmt, plane) :0 ; }
drivers/staging/media/sunxi/cedrus/cedrus_h264.c +6 -2
@@ -96,7 +96,7 @@ static void cedrus_write_frame_list(struct cedrus_ctx *ctx,const struct v4l2_ctrl_h264_decode_params *decode = run->h264.decode_params;const struct v4l2_ctrl_h264_slice_params *slice = run->h264.slice_params;const struct v4l2_ctrl_h264_sps *sps = run->h264.sps; -struct vb2_queue *cap_q = &ctx->fh.m2m_ctx->cap_q_ctx.q; +struct vb2_queue *cap_q;struct cedrus_buffer *output_buf;struct cedrus_dev *dev = ctx->dev;unsigned long used_dpbs =0 ;
@@ -104,6 +104,8 @@ static void cedrus_write_frame_list(struct cedrus_ctx *ctx,unsigned int output =0 ;unsigned int i; + cap_q =v4l2_m2m_get_vq (ctx->fh.m2m_ctx,V4L2_BUF_TYPE_VIDEO_CAPTURE ); +memset (pic_list,0 ,sizeof (pic_list));for (i =0 ; i <ARRAY_SIZE (decode->dpb); i++) {
@@ -167,12 +169,14 @@ static void _cedrus_write_ref_list(struct cedrus_ctx *ctx, enum cedrus_h264_sram_off sram) {const struct v4l2_ctrl_h264_decode_params *decode = run->h264.decode_params; -struct vb2_queue *cap_q = &ctx->fh.m2m_ctx->cap_q_ctx.q; +struct vb2_queue *cap_q;struct cedrus_dev *dev = ctx->dev;u8 sram_array[CEDRUS_MAX_REF_IDX ];unsigned int i;size_t size; + cap_q =v4l2_m2m_get_vq (ctx->fh.m2m_ctx,V4L2_BUF_TYPE_VIDEO_CAPTURE ); +memset (sram_array,0 ,sizeof (sram_array));for (i =0 ; i < num_ref; i++) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 282/434 media: v4l2-ctrl: Lock main_hdl on operations of requests_queued.
In reply to Greg Kroah-HartmanFrom: Pi-Hsun Shih <[email protected]>
[ Upstream commit df4a3e7f88e3b0d7ae46d70b9ff8e3c0ea730785 ]
There's a race condition between the list_del_init in the v4l2_ctrl_request_complete, and the list_add_tail in the v4l2_ctrl_request_queue, since they can be called in different thread and the requests_queued list is not protected by a lock. This can lead to that the v4l2_ctrl_handler is still in the requests_queued list while the request_is_queued is already set to false, which would cause use-after-free if the v4l2_ctrl_handler is later released.
Fix this by locking the ->lock of main_hdl (which is the owner of the requests_queued list) when doing list operations on the ->requests_queued list.
--- drivers/media/v4l2-core/v4l2-ctrls.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/v4l2-core/v4l2-ctrls.c +7 -0
@@ -3144,6 +3144,7 @@ static void v4l2_ctrl_request_queue(struct media_request_object *obj)struct v4l2_ctrl_handler *prev_hdl =NULL ;struct v4l2_ctrl_ref *ref_ctrl, *ref_ctrl_prev =NULL ; +mutex_lock (main_hdl->lock);if (list_empty (&main_hdl->requests_queued)) goto queue;
@@ -3175,18 +3176,22 @@ static void v4l2_ctrl_request_queue(struct media_request_object *obj) queue:list_add_tail (&hdl->requests_queued, &main_hdl->requests_queued); hdl->request_is_queued = true; +mutex_unlock (main_hdl->lock); }static void v4l2_ctrl_request_unbind (struct media_request_object *obj) {struct v4l2_ctrl_handler *hdl = container_of(obj, struct v4l2_ctrl_handler, req_obj); +struct v4l2_ctrl_handler *main_hdl = obj->priv;list_del_init (&hdl->requests); +mutex_lock (main_hdl->lock);if (hdl->request_is_queued) {list_del_init (&hdl->requests_queued); hdl->request_is_queued = false; } +mutex_unlock (main_hdl->lock); }static void v4l2_ctrl_request_release (struct media_request_object *obj)
@@ -4128,9 +4133,11 @@ void v4l2_ctrl_request_complete(struct media_request *req,v4l2_ctrl_unlock (ctrl); } +mutex_lock (main_hdl->lock);WARN_ON (!hdl->request_is_queued);list_del_init (&hdl->requests_queued); hdl->request_is_queued = false; +mutex_unlock (main_hdl->lock);media_request_object_complete (obj);media_request_object_put (obj); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 283/434 iio: cros_ec_baro: set info_mask_shared_by_all_available field
In reply to Greg Kroah-HartmanFrom: Gwendal Grignou <[email protected]>
[ Upstream commit e9a4cbcaaa391ef44d623d548ee715e77265030c ]
Field was already set for light/proximity and
accelerometer/gyroscope/magnetometer sensors.
--- drivers/iio/pressure/cros_ec_baro.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iio/pressure/cros_ec_baro.c +3 -0
@@ -114,6 +114,7 @@ static int cros_ec_baro_write(struct iio_dev *indio_dev,static const struct iio_info cros_ec_baro_info = { .read_raw = &cros_ec_baro_read, .write_raw = &cros_ec_baro_write, + .read_avail = &cros_ec_sensors_core_read_avail, };static int cros_ec_baro_probe (struct platform_device *pdev)
@@ -149,6 +150,8 @@ static int cros_ec_baro_probe(struct platform_device *pdev)BIT (IIO_CHAN_INFO_SCALE ) |BIT (IIO_CHAN_INFO_SAMP_FREQ ) |BIT (IIO_CHAN_INFO_FREQUENCY ); + channel->info_mask_shared_by_all_available = +BIT (IIO_CHAN_INFO_SAMP_FREQ ); channel->scan_type.realbits =CROS_EC_SENSOR_BITS ; channel->scan_type.storagebits =CROS_EC_SENSOR_BITS ; channel->scan_type.shift =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 284/434 EDAC/ghes: Fix grain calculation
In reply to Greg Kroah-HartmanFrom: Robert Richter <[email protected]>
[ Upstream commit 7088e29e0423d3195e09079b4f849ec4837e5a75 ]
The current code to convert a physical address mask to a grain (defined as granularity in bytes) is:
e->grain = ~(mem_err->physical_addr_mask & ~PAGE_MASK);
This is broken in several ways:
1) It calculates to wrong grain values. E.g., a physical address mask of ~0xfff should give a grain of 0x1000. Without considering PAGE_MASK, there is an off-by-one. Things are worse when also filtering it with ~PAGE_MASK. This will calculate to a grain with the upper bits set. In the example it even calculates to ~0.
2) The grain does not depend on and is unrelated to the kernel's page-size. The page-size only matters when unmapping memory in memory_failure(). Smaller grains are wrongly rounded up to the page-size, on architectures with a configurable page-size (e.g. arm64) this could round up to the even bigger page-size of the hypervisor.
Fix this with:
e->grain = ~mem_err->physical_addr_mask + 1;
The grain_bits are defined as:
grain = 1 << grain_bits;
Change also the grain_bits calculation accordingly, it is the same formula as in edac_mc.c now and the code can be unified.
The value in ->physical_addr_mask coming from firmware is assumed to be contiguous, but this is not sanity-checked. However, in case the mask is non-contiguous, a conversion to grain_bits effectively converts the grain bit mask to a power of 2 by rounding it up.
--- drivers/edac/ghes_edac.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/edac/ghes_edac.c +8 -2
@@ -231,6 +231,7 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)/* Cleans the error report buffer */ memset (e,0 ,sizeof (*e)); e->error_count =1 ; + e->grain =1 ;strcpy (e->label,"unknown label" ); e->msg = pvt->msg; e->other_detail = pvt->other_detail;
@@ -326,7 +327,7 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)/* Error grain */ if (mem_err->validation_bits &CPER_MEM_VALID_PA_MASK ) - e->grain = ~(mem_err->physical_addr_mask & ~PAGE_MASK ); + e->grain = ~mem_err->physical_addr_mask +1 ;/* Memory error location, mapped on e->location */ p = e->location;
@@ -442,8 +443,13 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)if (p > pvt->other_detail) *(p -1 ) ='\0' ; +/* Sanity-check driver-supplied grain value. */ +if (WARN_ON_ONCE (!e->grain)) + e->grain =1 ; + + grain_bits =fls_long (e->grain -1 ); +/* Generate the trace event */ - grain_bits =fls_long (e->grain);snprintf (pvt->detail_location,sizeof (pvt->detail_location),"APEI location: %s %s" , e->location, e->other_detail); trace_mc_event(type, e->msg, e->label, e->error_count,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 285/434 media: vicodec: media_device_cleanup was called too early
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 693c5f144aeb9636ae161a3c61a838c50b2ae41c ]
Running the contrib/test/test-media script in v4l-utils with the vicodec argument will cause this kernel warning:
[ 372.298824] ------------[ cut here ]------------ [ 372.298848] DEBUG_LOCKS_WARN_ON(lock->magic != lock) [ 372.298896] WARNING: CPU: 11 PID: 2220 at kernel/locking/mutex.c:938 __mutex_lock+0x919/0xc10 [ 372.298907] Modules linked in: vicodec v4l2_mem2mem vivid rc_cec v4l2_tpg videobuf2_dma_contig cec rc_core v4l2_dv_timings videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_common videodev mc vmw_balloon vmw_vmci button vmwgfx [last unloaded: vimc] [ 372.298961] CPU: 11 PID: 2220 Comm: sleep Not tainted 5.4.0-rc1-test-no #150 [ 372.298970] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/29/2019 [ 372.298983] RIP: 0010:__mutex_lock+0x919/0xc10 [ 372.298995] Code: 59 83 e8 9a fc 16 ff 44 8b 05 23 61 38 01 45 85 c0 0f 85 ef f7 ff ff 48 c7 c6 a0 1f 87 82 48 c7 c7 a0 1e 87 82 e8 cd bb f7 fe <0f> 0b e9 d5 f7 ff ff f6 c3 04 0f 84 3b fd ff ff 49 89 df 41 83 e7 [ 372.299004] RSP: 0018:ffff8881b400fb80 EFLAGS: 00010286 [ 372.299014] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 [ 372.299022] RDX: 0000000000000003 RSI: 0000000000000004 RDI: ffffed1036801f62 [ 372.299030] RBP: ffff8881b400fcf0 R08: ffffffff81217c91 R09: fffffbfff061c271 [ 372.299038] R10: fffffbfff061c270 R11: ffffffff830e1383 R12: ffff88814761dc80 [ 372.299046] R13: 0000000000000000 R14: ffff88814761cbf0 R15: ffff88814761d030 [ 372.299055] FS: 0000000000000000(0000) GS:ffff8881b68c0000(0000) knlGS:0000000000000000 [ 372.299063] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 372.299071] CR2: 00007f606d78aa20 CR3: 0000000003013002 CR4: 00000000001606e0 [ 372.299153] Call Trace: [ 372.299176] ? __kasan_slab_free+0x12f/0x180 [ 372.299187] ? kmem_cache_free+0x9b/0x250 [ 372.299200] ? do_exit+0xcdf/0x1200 [ 372.299210] ? do_group_exit+0x85/0x130 [ 372.299220] ? __x64_sys_exit_group+0x23/0x30 [ 372.299231] ? do_syscall_64+0x5e/0x1c0 [ 372.299241] ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 372.299295] ? v4l2_release+0xed/0x190 [videodev] [ 372.299309] ? mutex_lock_io_nested+0xb80/0xb80 [ 372.299323] ? find_held_lock+0x85/0xa0 [ 372.299335] ? fsnotify+0x5b0/0x600 [ 372.299351] ? locks_remove_file+0x78/0x2b0 [ 372.299363] ? __fsnotify_update_child_dentry_flags.part.0+0x170/0x170 [ 372.299383] ? vidioc_querycap+0x50/0x50 [vicodec] [ 372.299426] ? v4l2_release+0xed/0x190 [videodev] [ 372.299467] v4l2_release+0xed/0x190 [videodev] [ 372.299484] __fput+0x15a/0x390 [ 372.299499] task_work_run+0xb2/0xe0 [ 372.299512] do_exit+0x4d0/0x1200 [ 372.299528] ? do_user_addr_fault+0x367/0x610 [ 372.299538] ? release_task+0x990/0x990 [ 372.299552] ? rwsem_spin_on_owner+0x170/0x170 [ 372.299567] ? vmacache_find+0xb2/0x100 [ 372.299580] do_group_exit+0x85/0x130 [ 372.299592] __x64_sys_exit_group+0x23/0x30 [ 372.299602] do_syscall_64+0x5e/0x1c0 [ 372.299614] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 372.299624] RIP: 0033:0x7f606d74a9d6 [ 372.299640] Code: Bad RIP value. [ 372.299648] RSP: 002b:00007fff65364468 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 [ 372.299658] RAX: ffffffffffffffda RBX: 00007f606d83b760 RCX: 00007f606d74a9d6 [ 372.299666] RDX: 0000000000000000 RSI: 000000000000003c RDI: 0000000000000000 [ 372.299673] RBP: 0000000000000000 R08: 00000000000000e7 R09: ffffffffffffff80 [ 372.299681] R10: 00007fff65364334 R11: 0000000000000246 R12: 00007f606d83b760 [ 372.299689] R13: 0000000000000002 R14: 00007f606d844428 R15: 0000000000000000 [ 372.299704] ---[ end trace add7d62ca4bc65e3 ]---
This is caused by media_device_cleanup() which destroys v4l2_dev->mdev->req_queue_mutex. But v4l2_release() tries to lock that mutex after media_device_cleanup() is called.
By moving media_device_cleanup() to the v4l2_device's release function it is guaranteed that the mutex is valid whenever v4l2_release is called.
--- drivers/media/platform/vicodec/vicodec-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/vicodec/vicodec-core.c +3 -1
@@ -2139,6 +2139,9 @@ static void vicodec_v4l2_dev_release(struct v4l2_device *v4l2_dev)v4l2_m2m_release (dev->stateful_enc.m2m_dev);v4l2_m2m_release (dev->stateful_dec.m2m_dev);v4l2_m2m_release (dev->stateless_dec.m2m_dev); +#ifdef CONFIG_MEDIA_CONTROLLER +media_device_cleanup (&dev->mdev); +#endif kfree (dev); }
@@ -2250,7 +2253,6 @@ static int vicodec_remove(struct platform_device *pdev)v4l2_m2m_unregister_media_controller (dev->stateful_enc.m2m_dev);v4l2_m2m_unregister_media_controller (dev->stateful_dec.m2m_dev);v4l2_m2m_unregister_media_controller (dev->stateless_dec.m2m_dev); -media_device_cleanup (&dev->mdev);#endif video_unregister_device (&dev->stateful_enc.vfd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 286/434 media: vim2m: media_device_cleanup was called too early
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 9f22e88a4bba270d3427684cee84dfbf67489e86 ]
Running the contrib/test/test-media script in v4l-utils with the vim2m argument will cause this kernel warning:
[ 554.430157] ------------[ cut here ]------------ [ 554.433034] DEBUG_LOCKS_WARN_ON(lock->magic != lock) [ 554.433064] WARNING: CPU: 0 PID: 616 at kernel/locking/mutex.c:938 __mutex_lock+0xd7a/0x1380 [ 554.439736] Modules linked in: vim2m v4l2_mem2mem vivid rc_cec videobuf2_dma_contig v4l2_dv_timings cec videobuf2_vmalloc videobuf2_memops v4l2_tpg videobuf2_v4l2 videobuf2_common videodev mc rc_core [last unloaded: vivid] [ 554.445794] CPU: 0 PID: 616 Comm: sleep Not tainted 5.4.0-rc1-virtme #1 [ 554.448481] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 [ 554.453088] RIP: 0010:__mutex_lock+0xd7a/0x1380 [ 554.454955] Code: d2 0f 85 de 05 00 00 44 8b 05 82 d9 f7 00 45 85 c0 0f 85 bf f3 ff ff 48 c7 c6 e0 30 a6 b7 48 c7 c7 e0 2e a6 b7 e8 5c 76 36 fe <0f> 0b e9 a5 f3 ff ff 65 48 8b 1c 25 80 ef 01 00 be 08 00 00 00 48 [ 554.462836] RSP: 0018:ffff88803a4cfad0 EFLAGS: 00010282 [ 554.465129] RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffffb5a3d24f [ 554.468143] RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffffffffb85273f4 [ 554.471000] RBP: ffff88803a4cfc50 R08: fffffbfff701e681 R09: fffffbfff701e681 [ 554.473990] R10: fffffbfff701e680 R11: ffffffffb80f3403 R12: 0000000000000000 [ 554.476831] R13: dffffc0000000000 R14: ffffffffb9714f00 R15: ffff888053103fc8 [ 554.479622] FS: 00007fac6358a540(0000) GS:ffff88805d000000(0000) knlGS:0000000000000000 [ 554.482673] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 554.484949] CR2: 00007fac6343faf0 CR3: 0000000036c22000 CR4: 00000000003406f0 [ 554.487811] Call Trace: [ 554.488860] ? v4l2_release+0x1b8/0x390 [videodev] [ 554.490818] ? do_exit+0x946/0x2980 [ 554.492269] ? mutex_lock_io_nested+0x1250/0x1250 [ 554.494128] ? __lock_acquire+0xe90/0x3c30 [ 554.495774] ? fsnotify_first_mark+0x120/0x120 [ 554.497487] ? vim2m_device_release+0x50/0x50 [vim2m] [ 554.499469] ? v4l2_release+0x1b8/0x390 [videodev] [ 554.501493] v4l2_release+0x1b8/0x390 [videodev] [ 554.503430] __fput+0x256/0x790 [ 554.504711] task_work_run+0x109/0x190 [ 554.506145] do_exit+0x95e/0x2980 [ 554.507421] ? vfs_lock_file+0x21/0xf0 [ 554.509013] ? find_held_lock+0x33/0x1c0 [ 554.510382] ? __close_fd+0xee/0x190 [ 554.511862] ? release_task.part.21+0x1310/0x1310 [ 554.513701] ? lock_downgrade+0x6d0/0x6d0 [ 554.515299] do_group_exit+0xeb/0x2d0 [ 554.516862] __x64_sys_exit_group+0x35/0x40 [ 554.518610] do_syscall_64+0x90/0x450 [ 554.520142] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 554.522289] RIP: 0033:0x7fac6348ecf6 [ 554.523876] Code: Bad RIP value. [ 554.525294] RSP: 002b:00007ffe6373dc58 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 [ 554.528555] RAX: ffffffffffffffda RBX: 00007fac6357f760 RCX: 00007fac6348ecf6 [ 554.531537] RDX: 0000000000000000 RSI: 000000000000003c RDI: 0000000000000000 [ 554.534709] RBP: 0000000000000000 R08: 00000000000000e7 R09: ffffffffffffff80 [ 554.536752] R10: 00007ffe6373db24 R11: 0000000000000246 R12: 00007fac6357f760 [ 554.538643] R13: 0000000000000002 R14: 00007fac63588428 R15: 0000000000000000 [ 554.540634] irq event stamp: 21731 [ 554.541618] hardirqs last enabled at (21731): [<ffffffffb75b3cd4>] _raw_spin_unlock_irq+0x24/0x30 [ 554.544145] hardirqs last disabled at (21730): [<ffffffffb75b3ada>] _raw_spin_lock_irq+0xa/0x40 [ 554.547027] softirqs last enabled at (20148): [<ffffffffb780064d>] __do_softirq+0x64d/0x906 [ 554.550385] softirqs last disabled at (19857): [<ffffffffb5926bd5>] irq_exit+0x175/0x1a0 [ 554.553668] ---[ end trace a389c80c2ca84244 ]---
This is caused by media_device_cleanup() which destroys v4l2_dev->mdev->req_queue_mutex. But v4l2_release() tries to lock that mutex after media_device_cleanup() is called.
By moving media_device_cleanup() to the video_device's release function it is guaranteed that the mutex is valid whenever v4l2_release is called.
--- drivers/media/platform/vim2m.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/vim2m.c +3 -1
@@ -1275,6 +1275,9 @@ static void vim2m_device_release(struct video_device *vdev)v4l2_device_unregister (&dev->v4l2_dev);v4l2_m2m_release (dev->m2m_dev); +#ifdef CONFIG_MEDIA_CONTROLLER +media_device_cleanup (&dev->mdev); +#endif kfree (dev); }
@@ -1399,7 +1402,6 @@ static int vim2m_remove(struct platform_device *pdev)#ifdef CONFIG_MEDIA_CONTROLLER media_device_unregister (&dev->mdev);v4l2_m2m_unregister_media_controller (dev->m2m_dev); -media_device_cleanup (&dev->mdev);#endif video_unregister_device (&dev->vfd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 287/434 spi: pxa2xx: Add missed security checks
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 5eb263ef08b5014cfc2539a838f39d2fd3531423 ]
pxa2xx_spi_init_pdata misses checks for devm_clk_get and platform_get_irq.
Add checks for them to fix the bugs.
Since ssp->clk and ssp->irq are used in probe, they are mandatory here. So we cannot use _optional() for devm_clk_get and platform_get_irq.
--- drivers/spi/spi-pxa2xx.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/spi/spi-pxa2xx.c +6 -0
@@ -1565,7 +1565,13 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)#endif ssp->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (ssp->clk)) +return NULL ; + ssp->irq =platform_get_irq (pdev,0 ); +if (ssp->irq <0 ) +return NULL ; + ssp->type = type; ssp->pdev = pdev; ssp->port_id =pxa2xx_spi_get_port_id (adev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 288/434 ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile
In reply to Greg Kroah-HartmanFrom: Ben Zhang <[email protected]>
[ Upstream commit eabf424f7b60246c76dcb0ea6f1e83ef9abbeaa6 ]
The codec dies when RT5677_PWR_ANLG2(MX-64h) is set to 0xACE1 while it's streaming audio over SPI. The DSP firmware turns on PLL2 (MX-64 bit 8) when SPI streaming starts. However regmap does not believe that register can change by itself. When BST1 (bit 15) is turned on with regmap_update_bits(), it doesn't read the register first before write, so PLL2 power bit is cleared by accident.
Marking MX-64h as volatile in regmap solved the issue.
--- sound/soc/codecs/rt5677.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/rt5677.c +1 -0
@@ -298,6 +298,7 @@ static bool rt5677_volatile_register(struct device *dev, unsigned int reg)case RT5677_I2C_MASTER_CTRL7 :case RT5677_I2C_MASTER_CTRL8 :case RT5677_HAP_GENE_CTRL2 : +case RT5677_PWR_ANLG2 :/* Modified by DSP firmware */ case RT5677_PWR_DSP_ST :case RT5677_PRIV_DATA :case RT5677_ASRC_22 :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 289/434 iio: dac: ad5446: Add support for new AD5600 DAC
In reply to Greg Kroah-HartmanFrom: Stefan Popa <[email protected]>
[ Upstream commit 6376cbe549fffb378403cee78efd26b8a2c8e450 ]
The AD5600 is a single channel, 16-bit resolution, voltage output digital to analog converter (DAC). The AD5600 uses a 3-wire SPI interface. It is part of the AD5541 family of DACs.
The ad5446 IIO driver implements support for some of these DACs (in the AD5441 family), so the change is a simple entry in this driver.
--- drivers/iio/dac/Kconfig | 4 ++-- drivers/iio/dac/ad5446.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/iio/dac/Kconfig +2 -2
@@ -60,8 +60,8 @@ config AD5446 help Say yes here to build support for Analog Devices AD5300, AD5301, AD5310, AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453, - AD5512A, AD5541A, AD5542A, AD5543, AD5553, AD5601, AD5602, AD5611, AD5612, - AD5620, AD5621, AD5622, AD5640, AD5641, AD5660, AD5662 DACs + AD5512A, AD5541A, AD5542A, AD5543, AD5553, AD5600, AD5601, AD5602, AD5611, + AD5612, AD5620, AD5621, AD5622, AD5640, AD5641, AD5660, AD5662 DACs as well as Texas Instruments DAC081S101, DAC101S101, DAC121S101. To compile this driver as a module, choose M here: the
drivers/iio/dac/ad5446.c +6 -0
@@ -327,6 +327,7 @@ enum ad5446_supported_spi_device_ids {ID_AD5541A ,ID_AD5512A ,ID_AD5553 , +ID_AD5600 ,ID_AD5601 ,ID_AD5611 , ID_AD5621,
@@ -381,6 +382,10 @@ static const struct ad5446_chip_info ad5446_spi_chip_info[] = { .channel = AD5446_CHANNEL(14, 16, 0), .write = ad5446_write, }, + [ID_AD5600] = { + .channel = AD5446_CHANNEL(16, 16, 0), + .write = ad5446_write, + }, [ID_AD5601] = { .channel = AD5446_CHANNEL_POWERDOWN(8, 16, 6), .write = ad5446_write,
@@ -448,6 +453,7 @@ static const struct spi_device_id ad5446_spi_ids[] = { {"ad5542a", ID_AD5541A}, /* ad5541a and ad5542a are compatible */ {"ad5543", ID_AD5541A}, /* ad5541a and ad5543 are compatible */ {"ad5553", ID_AD5553}, + {"ad5600", ID_AD5600}, {"ad5601", ID_AD5601}, {"ad5611", ID_AD5611}, {"ad5621", ID_AD5621},
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 290/434 bpf, testing: Workaround a verifier failure for test_progs
In reply to Greg Kroah-HartmanFrom: Yonghong Song <[email protected]>
[ Upstream commit b7a0d65d80a0c5034b366392624397a0915b7556 ]
With latest llvm compiler, running test_progs will have the following verifier failure for test_sysctl_loop1.o:
libbpf: load bpf program failed: Permission denied
libbpf: -- BEGIN DUMP LOG ---
libbpf:
invalid indirect read from stack var_off (0x0; 0xff)+196 size 7
...
libbpf: -- END LOG --
libbpf: failed to load program 'cgroup/sysctl'
libbpf: failed to load object 'test_sysctl_loop1.o'
The related bytecode looks as below:
0000000000000308 LBB0_8:
97: r4 = r10
98: r4 += -288
99: r4 += r7
100: w8 &= 255
101: r1 = r10
102: r1 += -488
103: r1 += r8
104: r2 = 7
105: r3 = 0
106: call 106
107: w1 = w0
108: w1 += -1
109: if w1 > 6 goto -24 <LBB0_5>
110: w0 += w8
111: r7 += 8
112: w8 = w0
113: if r7 != 224 goto -17 <LBB0_8>And source code:
for (i = 0; i < ARRAY_SIZE(tcp_mem); ++i) {
ret = bpf_strtoul(value + off, MAX_ULONG_STR_LEN, 0,
tcp_mem + i);
if (ret <= 0 || ret > MAX_ULONG_STR_LEN)
return 0;
off += ret & MAX_ULONG_STR_LEN;
}Current verifier is not able to conclude that register w0 before '+' at insn 110 has a range of 1 to 7 and thinks it is from 0 - 255. This leads to more conservative range for w8 at insn 112, and later verifier complaint.
Let us workaround this issue until we found a compiler and/or verifier solution. The workaround in this patch is to make variable 'ret' volatile, which will force a reload and then '&' operation to ensure better value range. With this patch, I got the below byte code for the loop:
0000000000000328 LBB0_9:
101: r4 = r10
102: r4 += -288
103: r4 += r7
104: w8 &= 255
105: r1 = r10
106: r1 += -488
107: r1 += r8
108: r2 = 7
109: r3 = 0
110: call 106
111: *(u32 *)(r10 - 64) = r0
112: r1 = *(u32 *)(r10 - 64)
113: if w1 s< 1 goto -28 <LBB0_5>
114: r1 = *(u32 *)(r10 - 64)
115: if w1 s> 7 goto -30 <LBB0_5>
116: r1 = *(u32 *)(r10 - 64)
117: w1 &= 7
118: w1 += w8
119: r7 += 8
120: w8 = w1
121: if r7 != 224 goto -21 <LBB0_9>Insn 117 did the '&' operation and we got more precise value range for 'w8' at insn 120. The test is happy then:
#3/17 test_sysctl_loop1.o:OK
--- tools/testing/selftests/bpf/progs/test_sysctl_loop1.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/progs/test_sysctl_loop1.c +4 -1
@@ -44,7 +44,10 @@ int sysctl_tcp_mem(struct bpf_sysctl *ctx)unsigned long tcp_mem[TCP_MEM_LOOPS ] = {};char value[MAX_VALUE_STR_LEN ];unsigned char i, off =0 ; -int ret; +/* a workaround to prevent compiler from generating +* codes verifier cannot handle yet. +*/ +volatile int ret;if (ctx->write)return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 291/434 ASoC: Intel: kbl_rt5663_rt5514_max98927: Add dmic format constraint
In reply to Greg Kroah-HartmanFrom: Yu-Hsuan Hsu <[email protected]>
[ Upstream commit e2db787bdcb4f2722ecf410168f0583764634e45 ]
On KBL platform, the microphone is attached to external codec(rt5514) instead of PCH. However, TDM slot between PCH and codec is 16 bits only. In order to avoid setting wrong format, we should add a constraint to force to use 16 bits format forever.
--- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +3 -0
@@ -400,6 +400,9 @@ static int kabylake_dmic_startup(struct snd_pcm_substream *substream)snd_pcm_hw_constraint_list (runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS , dmic_constraints); + runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (runtime,0 ,16 ,16 ); +return snd_pcm_hw_constraint_list (substream->runtime,0 ,SNDRV_PCM_HW_PARAM_RATE , &constraints_rates); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 292/434 net: dsa: sja1105: Disallow management xmit during switch reset
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit af580ae2dcb250719857b4b7024bd4bb0c2e05fb ]
The purpose here is to avoid ptp4l fail due to this condition:
timed out while polling for tx timestamp
increasing tx_timestamp_timeout may correct this issue, but it is likely caused by a driver bug port 1: send peer delay request failed
So either reset the switch before the management frame was sent, or after it was timestamped as well, but not in the middle.
The condition may arise either due to a true timeout (i.e. because re-uploading the static config takes time), or due to the TX timestamp actually getting lost due to reset. For the former we can increase tx_timestamp_timeout in userspace, for the latter we need this patch.
Locking all traffic during switch reset does not make sense at all, though. Forcing all CPU-originated traffic to potentially block waiting for a sleepable context to send > 800 bytes over SPI is not a good idea. Flows that are autonomously forwarded by the switch will get dropped anyway during switch reset no matter what. So just let all other CPU-originated traffic be dropped as well.
--- drivers/net/dsa/sja1105/sja1105_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/dsa/sja1105/sja1105_main.c +4 -0
@@ -1389,6 +1389,8 @@ int sja1105_static_config_reload(struct sja1105_private *priv)int speed_mbps[SJA1105_NUM_PORTS ];int rc, i; +mutex_lock (&priv->mgmt_lock); + mac = priv->static_config.tables[BLK_IDX_MAC_CONFIG ].entries;/* Back up the dynamic link speed changed by sja1105_adjust_port_config
@@ -1420,6 +1422,8 @@ int sja1105_static_config_reload(struct sja1105_private *priv) goto out; } out: +mutex_unlock (&priv->mgmt_lock); +return rc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 293/434 r8169: respect EEE user setting when restarting network
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit 7ec3f872bc85ada93db34448d73bb399d6b82c2c ]
Currently, if network is re-started, we advertise all supported EEE modes, thus potentially overriding a manual adjustment the user made e.g. via ethtool. Be friendly to the user and preserve a manual setting on network re-start.
--- drivers/net/ethernet/realtek/r8169_main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +15 -3
@@ -680,6 +680,7 @@ struct rtl8169_private {struct rtl8169_counters *counters;struct rtl8169_tc_offsets tc_offset;u32 saved_wolopts; +int eee_adv;const char *fw_name;struct rtl_fw *rtl_fw;
@@ -2075,6 +2076,10 @@ static int rtl8169_set_eee(struct net_device *dev, struct ethtool_eee *data) } ret =phy_ethtool_set_eee (tp->phydev, data); + +if (!ret) + tp->eee_adv =phy_read_mmd (dev->phydev,MDIO_MMD_AN , +MDIO_AN_EEE_ADV ); out:pm_runtime_put_noidle (d);return ret;
@@ -2105,10 +2110,16 @@ static const struct ethtool_ops rtl8169_ethtool_ops = {static void rtl_enable_eee (struct rtl8169_private *tp) {struct phy_device *phydev = tp->phydev; -int supported =phy_read_mmd (phydev,MDIO_MMD_PCS ,MDIO_PCS_EEE_ABLE ); +int adv; + +/* respect EEE advertisement the user may have set */ +if (tp->eee_adv >=0 ) + adv = tp->eee_adv; +else + adv =phy_read_mmd (phydev,MDIO_MMD_PCS ,MDIO_PCS_EEE_ABLE ); -if (supported >0 ) -phy_write_mmd (phydev,MDIO_MMD_AN ,MDIO_AN_EEE_ADV , supported); +if (adv >=0 ) +phy_write_mmd (phydev,MDIO_MMD_AN ,MDIO_AN_EEE_ADV , adv); }static void rtl8169_get_mac_version (struct rtl8169_private *tp)
@@ -7064,6 +7075,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->pci_dev = pdev; tp->msg_enable =netif_msg_init (debug.msg_enable,R8169_MSG_DEFAULT ); tp->supports_gmii = ent->driver_data ==RTL_CFG_NO_GBIT ?0 :1 ; + tp->eee_adv =-1 ;/* Get the *optional* external "ether_clk" used on some boards */ rc =rtl_get_ether_clk (tp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 294/434 s390/disassembler: dont hide instruction addresses
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit 544f1d62e3e6c6e6d17a5e56f6139208acb5ff46 ]
Due to kptr_restrict, JITted BPF code is now displayed like this:
000000000b6ed1b2: ebdff0800024 stmg %r13,%r15,128(%r15) 000000004cde2ba0: 41d0f040 la %r13,64(%r15) 00000000fbad41b0: a7fbffa0 aghi %r15,-96
Leaking kernel addresses to dmesg is not a concern in this case, because this happens only when JIT debugging is explicitly activated, which only root can do.
Use %px in this particular instance, and also to print an instruction address in show_code and PCREL (e.g. brasl) arguments in print_insn. While at present functionally equivalent to %016lx, %px is recommended by Documentation/core-api/printk-formats.rst for such cases.
--- arch/s390/kernel/dis.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/s390/kernel/dis.c +7 -6
@@ -461,10 +461,11 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr) ptr +=sprintf (ptr,"%%c%i" , value); else if (operand->flags & OPERAND_VR) ptr += sprintf(ptr, "%%v%i", value); - else if (operand->flags & OPERAND_PCREL) - ptr += sprintf(ptr, "%lx", (signed int) value - + addr); - else if (operand->flags & OPERAND_SIGNED) + else if (operand->flags & OPERAND_PCREL) { +void *pcrel = (void *)((int )value + addr); + + ptr +=sprintf (ptr,"%px" , pcrel); + } else if (operand->flags & OPERAND_SIGNED) ptr += sprintf(ptr, "%i", value); else ptr += sprintf(ptr, "%u", value);
@@ -536,7 +537,7 @@ void show_code(struct pt_regs *regs)else *ptr++ =' ' ; addr = regs->psw.addr + start -32 ; - ptr +=sprintf (ptr,"%016lx: " , addr); + ptr +=sprintf (ptr,"%px: " , (void *)addr);if (start + opsize >= end)break ;for (i =0 ; i < opsize; i++)
@@ -564,7 +565,7 @@ void print_fn_code(unsigned char *code, unsigned long len) opsize =insn_length (*code);if (opsize > len)break ; - ptr +=sprintf (ptr,"%p: " , code); + ptr +=sprintf (ptr,"%px: " , code);for (i =0 ; i < opsize; i++) ptr +=sprintf (ptr,"%02x" , code[i]); *ptr++ ='\t' ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 295/434 net: ethernet: ti: Add dependency for TI_DAVINCI_EMAC
In reply to Greg Kroah-HartmanFrom: Mao Wenan <[email protected]>
[ Upstream commit b2ef81dcdf3835bd55e5f97ff30131bb327be7fa ]
If TI_DAVINCI_EMAC=y and GENERIC_ALLOCATOR is not set,
below erros can be seen:drivers/net/ethernet/ti/davinci_cpdma.o: In function `cpdma_desc_pool_destroy.isra.14':
davinci_cpdma.c:(.text+0x359): undefined reference to gen_pool_size' davinci_cpdma.c:(.text+0x365): undefined reference to gen_pool_avail' davinci_cpdma.c:(.text+0x373): undefined reference to gen_pool_avail' davinci_cpdma.c:(.text+0x37f): undefined reference to gen_pool_size' drivers/net/ethernet/ti/davinci_cpdma.o: In function `__cpdma_chan_free':
davinci_cpdma.c:(.text+0x4a2): undefined reference to gen_pool_free_owner' drivers/net/ethernet/ti/davinci_cpdma.o: In function cpdma_chan_submit_si':
davinci_cpdma.c:(.text+0x66c): undefined reference to gen_pool_alloc_algo_owner' davinci_cpdma.c:(.text+0x805): undefined reference to gen_pool_free_owner' drivers/net/ethernet/ti/davinci_cpdma.o: In function `cpdma_ctlr_create':
davinci_cpdma.c:(.text+0xabd): undefined reference to devm_gen_pool_create' davinci_cpdma.c:(.text+0xb79): undefined reference to gen_pool_add_owner' drivers/net/ethernet/ti/davinci_cpdma.o: In function `cpdma_check_free_tx_desc':
davinci_cpdma.c:(.text+0x16c6): undefined reference to `gen_pool_avail'
This patch mades TI_DAVINCI_EMAC select GENERIC_ALLOCATOR.
--- drivers/net/ethernet/ti/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/ti/Kconfig +1 -0
@@ -22,6 +22,7 @@ config TI_DAVINCI_EMAC depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) || COMPILE_TEST select TI_DAVINCI_MDIO select PHYLIB + select GENERIC_ALLOCATOR ---help--- This driver supports TI's DaVinci Ethernet .
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 296/434 nvme: Discard workaround for non-conformant devices
In reply to Greg Kroah-HartmanFrom: Eduard Hasenleithner <[email protected]>
[ Upstream commit 530436c45ef2e446c12538a400e465929a0b3ade ]
Users observe IOMMU related errors when performing discard on nvme from non-compliant nvme devices reading beyond the end of the DMA mapped ranges to discard.
Two different variants of this behavior have been observed: SM22XX controllers round up the read size to a multiple of 512 bytes, and Phison E12 unconditionally reads the maximum discard size allowed by the spec (256 segments or 4kB).
Make nvme_setup_discard unconditionally allocate the maximum DSM buffer so the driver DMA maps a memory range that will always succeed.
--- drivers/nvme/host/core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/nvme/host/core.c +9 -3
@@ -611,8 +611,14 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req,struct nvme_dsm_range *range;struct bio *bio; - range =kmalloc_array (segments,sizeof (*range), -GFP_ATOMIC | __GFP_NOWARN); +/* +* Some devices do not consider the DSM 'Number of Ranges' field when +* determining how much data to DMA. Always allocate memory for maximum +* number of segments to prevent device reading beyond end of buffer. +*/ +static const size_t alloc_size =sizeof (*range) *NVME_DSM_MAX_RANGES ; + + range =kzalloc (alloc_size,GFP_ATOMIC | __GFP_NOWARN);if (!range) {/* * If we fail allocation our range, fallback to the controller
@@ -652,7 +658,7 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req, req->special_vec.bv_page =virt_to_page (range); req->special_vec.bv_offset =offset_in_page (range); - req->special_vec.bv_len =sizeof (*range) * segments; + req->special_vec.bv_len = alloc_size; req->rq_flags |=RQF_SPECIAL_PAYLOAD ;return BLK_STS_OK ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 297/434 parport: load lowlevel driver if ports not found
In reply to Greg Kroah-HartmanFrom: Sudip Mukherjee <[email protected]>
[ Upstream commit 231ec2f24dad18d021b361045bbd618ba62a274e ]
Usually all the distro will load the parport low level driver as part of their initialization. But we can get into a situation where all the parallel port drivers are built as module and we unload all the modules at a later time. Then if we just do "modprobe parport" it will only load the parport module and will not load the low level driver which will actually register the ports. So, check the bus if there is any parport registered, if not, load the low level driver.
We can get into the above situation with all distro but only Suse has setup the alias for "parport_lowlevel" and so it only works in Suse. Users of Debian based distro will need to load the lowlevel module manually.
--- drivers/parport/share.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/parport/share.c +21 -0
@@ -230,6 +230,18 @@ static int port_check(struct device *dev, void *dev_drv)return 0 ; } +/* +* Iterates through all the devices connected to the bus and return 1 +* if the device is a parallel port. +*/ + +static int port_detect (struct device *dev,void *dev_drv) +{ +if (is_parport (dev)) +return 1 ; +return 0 ; +} +/** * parport_register_driver - register a parallel port device driver * @drv: structure describing the driver
@@ -282,6 +294,15 @@ int __parport_register_driver(struct parport_driver *drv, struct module *owner,if (ret)return ret; +/* +* check if bus has any parallel port registered, if +* none is found then load the lowlevel driver. +*/ + ret =bus_for_each_dev (&parport_bus_type,NULL ,NULL , + port_detect); +if (!ret) +get_lowlevel_driver (); +mutex_lock (®istration_lock);if (drv->match_port) bus_for_each_dev(&parport_bus_type, NULL, drv,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 298/434 bcache: fix static checker warning in bcache_device_free()
In reply to Greg Kroah-HartmanFrom: Coly Li <[email protected]>
[ Upstream commit 2d8869518a525c9bce5f5268419df9dfbe3dfdeb ]
Commit cafe56359144 ("bcache: A block layer cache") leads to the following static checker warning:
./drivers/md/bcache/super.c:770 bcache_device_free()
warn: variable dereferenced before check 'd->disk' (see line 766)drivers/md/bcache/super.c
762 static void bcache_device_free(struct bcache_device *d) 763 {
764 lockdep_assert_held(&bch_register_lock);
765
766 pr_info("%s stopped", d->disk->disk_name);
^^^^^^^^^Unchecked dereference.
767
768 if (d->c)
769 bcache_device_detach(d);
770 if (d->disk && d->disk->flags & GENHD_FL_UP)
^^^^^^^
Check too late.
771 del_gendisk(d->disk);
772 if (d->disk && d->disk->queue)
773 blk_cleanup_queue(d->disk->queue);
774 if (d->disk) {
775 ida_simple_remove(&bcache_device_idx,
776 first_minor_to_idx(d->disk->first_minor));
777 put_disk(d->disk);
778 }
779It is not 100% sure that the gendisk struct of bcache device will always be there, the warning makes sense when there is problem in block core.
This patch tries to remove the static checking warning by checking d->disk to avoid NULL pointer deferences.
--- drivers/md/bcache/super.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/md/bcache/super.c +16 -8
@@ -761,20 +761,28 @@ static inline int idx_to_first_minor(int idx)static void bcache_device_free (struct bcache_device *d) { +struct gendisk *disk = d->disk; +lockdep_assert_held (&bch_register_lock); -pr_info ("%s stopped" , d->disk->disk_name); +if (disk) +pr_info ("%s stopped" , disk->disk_name); +else +pr_err ("bcache device (NULL gendisk) stopped" );if (d->c)bcache_device_detach (d); -if (d->disk && d->disk->flags &GENHD_FL_UP ) -del_gendisk (d->disk); -if (d->disk && d->disk->queue) -blk_cleanup_queue (d->disk->queue); -if (d->disk) { + +if (disk) { +if (disk->flags &GENHD_FL_UP ) +del_gendisk (disk); + +if (disk->queue) +blk_cleanup_queue (disk->queue); +ida_simple_remove (&bcache_device_idx, -first_minor_to_idx (d->disk->first_minor)); -put_disk (d->disk); +first_minor_to_idx (disk->first_minor)); +put_disk (disk); }bioset_exit (&d->bio_split);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 299/434 cpufreq: Register drivers only after CPU devices have been registered
In reply to Greg Kroah-HartmanFrom: Viresh Kumar <[email protected]>
[ Upstream commit 46770be0cf94149ca48be87719bda1d951066644 ]
The cpufreq core heavily depends on the availability of the struct device for CPUs and if they aren't available at the time cpufreq driver is registered, we will never succeed in making cpufreq work.
This happens due to following sequence of events:
- cpufreq_register_driver()
- subsys_interface_register()
- return 0; //successful registration of driver
... at a later point of time
- register_cpu();
- device_register();
- bus_probe_device();
- sif->add_dev();
- cpufreq_add_dev();
- get_cpu_device(); //FAILS
- per_cpu(cpu_sys_devices, num) = &cpu->dev; //used by get_cpu_device()
- return 0; //CPU registered successfully
Because the per-cpu variable cpu_sys_devices is set only after the CPU device is regsitered, cpufreq will never be able to get it when cpufreq_add_dev() is called.
This patch avoids this failure by making sure device structure of at least CPU0 is available when the cpufreq driver is registered, else return -EPROBE_DEFER.
--- drivers/cpufreq/cpufreq.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/cpufreq/cpufreq.c +7 -0
@@ -2634,6 +2634,13 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)if (cpufreq_disabled ())return -ENODEV ; +/* +* The cpufreq core depends heavily on the availability of device +* structure, make sure they are available before proceeding further. +*/ +if (!get_cpu_device (0 )) +return -EPROBE_DEFER ; + if (!driver_data || !driver_data->verify || !driver_data->init || !(driver_data->setpolicy || driver_data->target_index || driver_data->target) ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 300/434 qtnfmac: fix debugfs support for multiple cards
In reply to Greg Kroah-HartmanFrom: Sergey Matyukevich <[email protected]>
[ Upstream commit dd4c2260dab04f5ae7bdb79b9470e7da56f48145 ]
Fix merge artifact for commit 0b68fe10b8e8 ("qtnfmac: modify debugfs to support multiple cards") and finally add debugfs support for multiple qtnfmac wireless cards.
--- drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c +5 -1
@@ -130,6 +130,8 @@ static int qtnf_dbg_shm_stats(struct seq_file *s, void *data)int qtnf_pcie_fw_boot_done (struct qtnf_bus *bus) { +struct qtnf_pcie_bus_priv *priv =get_bus_priv (bus); +char card_id[64 ];int ret; bus->fw_state =QTNF_FW_STATE_BOOT_DONE ;
@@ -137,7 +139,9 @@ int qtnf_pcie_fw_boot_done(struct qtnf_bus *bus)if (ret) {pr_err ("failed to attach core\n" ); }else { -qtnf_debugfs_init (bus,DRV_NAME ); +snprintf (card_id,sizeof (card_id),"%s:%s" , +DRV_NAME ,pci_name (priv->pdev)); +qtnf_debugfs_init (bus, card_id);qtnf_debugfs_add_entry (bus,"mps" , qtnf_dbg_mps_show);qtnf_debugfs_add_entry (bus,"msi_enabled" , qtnf_dbg_msi_show);qtnf_debugfs_add_entry (bus,"shm_stats" , qtnf_dbg_shm_stats);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 301/434 qtnfmac: fix invalid channel information output
In reply to Greg Kroah-HartmanFrom: Sergey Matyukevich <[email protected]>
[ Upstream commit 24227a9e956a7c9913a7e6e7199a9ae3f540fe88 ]
Do not attempt to print frequency for an invalid channel provided by firmware. That channel may simply not exist.
--- drivers/net/wireless/quantenna/qtnfmac/event.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/quantenna/qtnfmac/event.c +4 -3
@@ -171,8 +171,9 @@ qtnf_event_handle_bss_join(struct qtnf_vif *vif,return -EPROTO ; } -pr_debug ("VIF%u.%u: BSSID:%pM status:%u\n" , - vif->mac->macid, vif->vifid, join_info->bssid, status); +pr_debug ("VIF%u.%u: BSSID:%pM chan:%u status:%u\n" , + vif->mac->macid, vif->vifid, join_info->bssid, +le16_to_cpu (join_info->chan.chan.center_freq), status);if (status !=WLAN_STATUS_SUCCESS ) goto done;
@@ -181,7 +182,7 @@ qtnf_event_handle_bss_join(struct qtnf_vif *vif,if (!cfg80211_chandef_valid (&chandef)) {pr_warn ("MAC%u.%u: bad channel freq=%u cf1=%u cf2=%u bw=%u\n" , vif->mac->macid, vif->vifid, - chandef.chan->center_freq, + chandef.chan ? chandef.chan->center_freq :0 , chandef.center_freq1, chandef.center_freq2, chandef.width);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 302/434 x86/crash: Add a forward declaration of struct kimage
In reply to Greg Kroah-HartmanFrom: Lianbo Jiang <[email protected]>
[ Upstream commit 112eee5d06007dae561f14458bde7f2a4879ef4e ]
Add a forward declaration of struct kimage to the crash.h header because future changes will invoke a crash-specific function from the realmode init path and the compiler will complain otherwise like this:
In file included from arch/x86/realmode/init.c:11:
./arch/x86/include/asm/crash.h:5:32: warning: ‘struct kimage’ declared inside\
parameter list will not be visible outside of this definition or declaration
5 | int crash_load_segments(struct kimage *image);
| ^~~~~~
./arch/x86/include/asm/crash.h:6:37: warning: ‘struct kimage’ declared inside\
parameter list will not be visible outside of this definition or declaration
6 | int crash_copy_backup_region(struct kimage *image);
| ^~~~~~ ./arch/x86/include/asm/crash.h:7:39: warning: ‘struct kimage’ declared inside\
parameter list will not be visible outside of this definition or declaration
7 | int crash_setup_memmap_entries(struct kimage *image,
|
[ bp: Rewrite the commit message. ]
--- arch/x86/include/asm/crash.h | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/include/asm/crash.h +2 -0
@@ -2,6 +2,8 @@#ifndef _ASM_X86_CRASH_H#define _ASM_X86_CRASH_H +struct kimage ; +int crash_load_segments (struct kimage *image);int crash_copy_backup_region (struct kimage *image); int crash_setup_memmap_entries(struct kimage *image,
Signature · 9 lines
2.20.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Greg Kroah-Hartman
maintainerPATCH 303/434 qtnfmac: fix using skb after free
In reply to Greg Kroah-HartmanFrom: Sergey Matyukevich <[email protected]>
[ Upstream commit 4a33f21cef84b1b933958c99ed5dac1726214b35 ]
KASAN reported use-after-free error:
[ 995.220767] BUG: KASAN: use-after-free in qtnf_cmd_send_with_reply+0x169/0x3e0 [qtnfmac] [ 995.221098] Read of size 2 at addr ffff888213d1ded0 by task kworker/1:1/71
The issue in qtnf_cmd_send_with_reply impacts all the commands that do not need response other then return code. For such commands, consume_skb is used for response skb and right after that return code in response skb is accessed.
--- drivers/net/wireless/quantenna/qtnfmac/commands.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/quantenna/qtnfmac/commands.c +4 -2
@@ -83,6 +83,7 @@ static int qtnf_cmd_send_with_reply(struct qtnf_bus *bus,struct qlink_cmd *cmd;struct qlink_resp *resp =NULL ;struct sk_buff *resp_skb =NULL ; +int resp_res =0 ;u16 cmd_id;u8 mac_id;u8 vif_id;
@@ -113,6 +114,7 @@ static int qtnf_cmd_send_with_reply(struct qtnf_bus *bus, } resp = (struct qlink_resp *)resp_skb->data; + resp_res =le16_to_cpu (resp->result); ret =qtnf_cmd_check_reply_header (resp, cmd_id, mac_id, vif_id, const_resp_size);if (ret)
@@ -128,8 +130,8 @@ out:else consume_skb (resp_skb); -if (!ret && resp) -return qtnf_cmd_resp_result_decode (le16_to_cpu (resp->result)); +if (!ret) +return qtnf_cmd_resp_result_decode (resp_res);pr_warn ("VIF%u.%u: cmd 0x%.4X failed: %d\n" , mac_id, vif_id, cmd_id, ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 304/434 RDMA/efa: Clear the admin command buffer prior to its submission
In reply to Greg Kroah-HartmanFrom: Gal Pressman <[email protected]>
[ Upstream commit 64c264872b8879e2ab9017eefe9514d4c045c60e ]
We cannot rely on the entry memcpy as we only copy the actual size of the command, the rest of the bytes must be memset to zero.
Currently providing non-zero memory will not have any user visible impact. However, since admin commands are extendable (in a backwards compatible way) everything beyond the size of the command must be cleared to prevent issues in the future.
--- drivers/infiniband/hw/efa/efa_com.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/infiniband/hw/efa/efa_com.c +4 -1
@@ -317,6 +317,7 @@ static struct efa_comp_ctx *__efa_com_submit_admin_cmd(struct efa_com_admin_queu struct efa_admin_acq_entry *comp, size_t comp_size_in_bytes) { +struct efa_admin_aq_entry *aqe;struct efa_comp_ctx *comp_ctx;u16 queue_size_mask;u16 cmd_id;
@@ -350,7 +351,9 @@ static struct efa_comp_ctx *__efa_com_submit_admin_cmd(struct efa_com_admin_queureinit_completion (&comp_ctx->wait_event); -memcpy (&aq->sq.entries[pi], cmd, cmd_size_in_bytes); + aqe = &aq->sq.entries[pi]; +memset (aqe,0 ,sizeof (*aqe)); +memcpy (aqe, cmd, cmd_size_in_bytes); aq->sq.pc++;atomic64_inc (&aq->stats.submitted_cmd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 305/434 tracing: use kvcalloc for tgid_map array allocation
In reply to Greg Kroah-HartmanFrom: Yuming Han <[email protected]>
[ Upstream commit 6ee40511cb838f9ced002dff7131bca87e3ccbdd ]
Fail to allocate memory for tgid_map, because it requires order-6 page. detail as:
c3 sh: page allocation failure: order:6,
mode:0x140c0c0(GFP_KERNEL), nodemask=(null)
c3 sh cpuset=/ mems_allowed=0
c3 CPU: 3 PID: 5632 Comm: sh Tainted: G W O 4.14.133+ #10
c3 Hardware name: Generic DT based system
c3 Backtrace:
c3 [<c010bdbc>] (dump_backtrace) from [<c010c08c>](show_stack+0x18/0x1c) c3 [<c010c074>] (show_stack) from [<c0993c54>](dump_stack+0x84/0xa4)
c3 [<c0993bd0>] (dump_stack) from [<c0229858>](warn_alloc+0xc4/0x19c)
c3 [<c0229798>] (warn_alloc) from [<c022a6e4>](__alloc_pages_nodemask+0xd18/0xf28) c3 [<c02299cc>] (__alloc_pages_nodemask) from [<c0248344>](kmalloc_order+0x20/0x38) c3 [<c0248324>] (kmalloc_order) from [<c0248380>](kmalloc_order_trace+0x24/0x108) c3 [<c024835c>] (kmalloc_order_trace) from [<c01e6078>](set_tracer_flag+0xb0/0x158) c3 [<c01e5fc8>] (set_tracer_flag) from [<c01e6404>](trace_options_core_write+0x7c/0xcc) c3 [<c01e6388>] (trace_options_core_write) from [<c0278b1c>](__vfs_write+0x40/0x14c) c3 [<c0278adc>] (__vfs_write) from [<c0278e10>](vfs_write+0xc4/0x198)
c3 [<c0278d4c>] (vfs_write) from [<c027906c>](SyS_write+0x6c/0xd0)
c3 [<c0279000>] (SyS_write) from [<c01079a0>](ret_fast_syscall+0x0/0x54)
Switch to use kvcalloc to avoid unexpected allocation failures.
--- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace.c +1 -1
@@ -4609,7 +4609,7 @@ int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)if (mask ==TRACE_ITER_RECORD_TGID ) {if (!tgid_map) - tgid_map =kcalloc (PID_MAX_DEFAULT +1 , + tgid_map =kvcalloc (PID_MAX_DEFAULT +1 ,sizeof (*tgid_map),GFP_KERNEL );if (!tgid_map) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 306/434 MIPS: ralink: enable PCI support only if driver for mt7621 SoC is selected
In reply to Greg Kroah-HartmanFrom: Sergio Paracuellos <[email protected]>
[ Upstream commit 3b2fa0c92686562ac0b8cf00c0326a45814f8e18 ]
Some versions of SoC MT7621 have three PCI express hosts. Some boards make use of those PCI through the staging driver mt7621-pci. Recently PCI support has been removed from MT7621 Soc kernel configuration due to a build error. This makes imposible to compile staging driver and produces a regression for gnubee based boards. Enable support for PCI again but enable it only if staging mt7621-pci driver is selected.
--- arch/mips/ralink/Kconfig | 1 + drivers/staging/mt7621-pci/Kconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
arch/mips/ralink/Kconfig +1 -0
@@ -51,6 +51,7 @@ choice select MIPS_GIC select COMMON_CLK select CLKSRC_MIPS_GIC + select HAVE_PCI if PCI_MT7621 endchoice choice
drivers/staging/mt7621-pci/Kconfig +0 -1
@@ -2,7 +2,6 @@ config PCI_MT7621 tristate "MediaTek MT7621 PCI Controller" depends on RALINK - depends on PCI select PCI_DRIVERS_GENERIC help This selects a driver for the MediaTek MT7621 PCI Controller.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 307/434 tracing/kprobe: Check whether the non-suffixed symbol is notrace
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit c7411a1a126f649be71526a36d4afac9e5aefa13 ]
Check whether the non-suffixed symbol is notrace, since suffixed symbols are generated by the compilers for optimization. Based on these suffixed symbols, notrace check might not work because some of them are just a partial code of the original function. (e.g. cold-cache (unlikely) code is separated from original
function as FUNCTION.cold.XX)
For example, without this fix,
# echo p device_add.cold.67 > /sys/kernel/debug/tracing/kprobe_events sh: write error: Invalid argument
# cat /sys/kernel/debug/tracing/error_log
[ 135.491035] trace_kprobe: error: Failed to register probe event
Command: p device_add.cold.67
^
# dmesg | tail -n 1
[ 135.488599] trace_kprobe: Could not probe notrace function device_add.cold.67With this,
# echo p device_add.cold.66 > /sys/kernel/debug/tracing/kprobe_events # cat /sys/kernel/debug/kprobes/list ffffffff81599de9 k device_add.cold.66+0x0 [DISABLED]
Actually, kprobe blacklist already did similar thing, see within_kprobe_blacklist().
--- kernel/trace/trace_kprobe.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-)
kernel/trace/trace_kprobe.c +24 -3
@@ -435,11 +435,10 @@ static int disable_trace_kprobe(struct trace_event_call *call,#if defined(CONFIG_KPROBES_ON_FTRACE ) && \ !defined(CONFIG_KPROBE_EVENTS_ON_NOTRACE ) -static bool within_notrace_func (struct trace_kprobe *tk) +static bool __within_notrace_func (unsigned long addr) { -unsigned long offset, size, addr; +unsigned long offset, size; - addr =trace_kprobe_address (tk);if (!addr || !kallsyms_lookup_size_offset (addr, &size, &offset))return false;
@@ -452,6 +451,28 @@ static bool within_notrace_func(struct trace_kprobe *tk)*/ return !ftrace_location_range(addr, addr + size - 1); } + +static bool within_notrace_func (struct trace_kprobe *tk) +{ +unsigned long addr = addr =trace_kprobe_address (tk); +char symname[KSYM_NAME_LEN ], *p; + +if (!__within_notrace_func (addr)) +return false; + +/* Check if the address is on a suffixed-symbol */ +if (!lookup_symbol_name (addr, symname)) { + p =strchr (symname,'.' ); +if (!p) +return true; + *p ='\0' ; + addr = (unsigned long )kprobe_lookup_name (symname,0 ); +if (addr) +return __within_notrace_func (addr); + } + +return true; +}#else #define within_notrace_func (tk) (false)#endif
Signature · 1 line
2.20.1