1. 14 3月, 2019 40 次提交
    • N
      selftests: netfilter: fix config fragment CONFIG_NF_TABLES_INET · 974ed365
      Naresh Kamboju 提交于
      [ Upstream commit 952b72f89ae23b316da8c1021b18d0c388ad6cc4 ]
      
      In selftests the config fragment for netfilter was added as
      NF_TABLES_INET=y and this patch correct it as CONFIG_NF_TABLES_INET=y
      Signed-off-by: NNaresh Kamboju <naresh.kamboju@linaro.org>
      Acked-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      974ed365
    • A
      dmaengine: dmatest: Abort test in case of mapping error · 0203f0c9
      Andy Shevchenko 提交于
      [ Upstream commit 6454368a804c4955ccd116236037536f81e5b1f1 ]
      
      In case of mapping error the DMA addresses are invalid and continuing
      will screw system memory or potentially something else.
      
      [  222.480310] dmatest: dma0chan7-copy0: summary 1 tests, 3 failures 6 iops 349 KB/s (0)
      ...
      [  240.912725] check: Corrupted low memory at 00000000c7c75ac9 (2940 phys) = 5656000000000000
      [  240.921998] check: Corrupted low memory at 000000005715a1cd (2948 phys) = 279f2aca5595ab2b
      [  240.931280] check: Corrupted low memory at 000000002f4024c0 (2950 phys) = 5e5624f349e793cf
      ...
      
      Abort any test if mapping failed.
      
      Fixes: 4076e755 ("dmatest: convert to dmaengine_unmap_data")
      Cc: Dan Williams <dan.j.williams@intel.com>
      Signed-off-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Signed-off-by: NVinod Koul <vkoul@kernel.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      0203f0c9
    • S
      vsock/virtio: reset connected sockets on device removal · 5eae5899
      Stefano Garzarella 提交于
      [ Upstream commit 85965487abc540368393a15491e6e7fcd230039d ]
      
      When the virtio transport device disappear, we should reset all
      connected sockets in order to inform the users.
      Signed-off-by: NStefano Garzarella <sgarzare@redhat.com>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      5eae5899
    • S
      vsock/virtio: fix kernel panic after device hot-unplug · cd201356
      Stefano Garzarella 提交于
      [ Upstream commit 22b5c0b63f32568e130fa2df4ba23efce3eb495b ]
      
      virtio_vsock_remove() invokes the vsock_core_exit() also if there
      are opened sockets for the AF_VSOCK protocol family. In this way
      the vsock "transport" pointer is set to NULL, triggering the
      kernel panic at the first socket activity.
      
      This patch move the vsock_core_init()/vsock_core_exit() in the
      virtio_vsock respectively in module_init and module_exit functions,
      that cannot be invoked until there are open sockets.
      
      Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1609699Reported-by: NYan Fu <yafu@redhat.com>
      Signed-off-by: NStefano Garzarella <sgarzare@redhat.com>
      Acked-by: NStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      cd201356
    • C
      dmaengine: at_xdmac: Fix wrongfull report of a channel as in use · f3ffd455
      Codrin Ciubotariu 提交于
      [ Upstream commit dc3f595b6617ebc0307e0ce151e8f2f2b2489b95 ]
      
      atchan->status variable is used to store two different information:
       - pass channel interrupts status from interrupt handler to tasklet;
       - channel information like whether it is cyclic or paused;
      
      This causes a bug when device_terminate_all() is called,
      (AT_XDMAC_CHAN_IS_CYCLIC cleared on atchan->status) and then a late End
      of Block interrupt arrives (AT_XDMAC_CIS_BIS), which sets bit 0 of
      atchan->status. Bit 0 is also used for AT_XDMAC_CHAN_IS_CYCLIC, so when
      a new descriptor for a cyclic transfer is created, the driver reports
      the channel as in use:
      
      if (test_and_set_bit(AT_XDMAC_CHAN_IS_CYCLIC, &atchan->status)) {
      	dev_err(chan2dev(chan), "channel currently used\n");
      	return NULL;
      }
      
      This patch fixes the bug by adding a different struct member to keep
      the interrupts status separated from the channel status bits.
      
      Fixes: e1f7c9ee ("dmaengine: at_xdmac: creation of the atmel eXtended DMA Controller driver")
      Signed-off-by: NCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
      Acked-by: NLudovic Desroches <ludovic.desroches@microchip.com>
      Signed-off-by: NVinod Koul <vkoul@kernel.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      f3ffd455
    • P
      drm/sun4i: tcon: Prepare and enable TCON channel 0 clock at init · 7cf4466d
      Paul Kocialkowski 提交于
      [ Upstream commit b14e945bda8ae227d1bf2b1837c0c4a61721cd1a ]
      
      When initializing clocks, a reference to the TCON channel 0 clock is
      obtained. However, the clock is never prepared and enabled later.
      Switching from simplefb to DRM actually disables the clock (that was
      usually configured by U-Boot) because of that.
      
      On the V3s, this results in a hang when writing to some mixer registers
      when switching over to DRM from simplefb.
      
      Fix this by preparing and enabling the clock when initializing other
      clocks. Waiting for sun4i_tcon_channel_enable to enable the clock is
      apparently too late and results in the same mixer register access hang.
      Signed-off-by: NPaul Kocialkowski <paul.kocialkowski@bootlin.com>
      Signed-off-by: NMaxime Ripard <maxime.ripard@bootlin.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20190131132550.26355-1-paul.kocialkowski@bootlin.comSigned-off-by: NSasha Levin <sashal@kernel.org>
      7cf4466d
    • M
      bpf: Fix syscall's stackmap lookup potential deadlock · ae26a710
      Martin KaFai Lau 提交于
      [ Upstream commit 7c4cd051add3d00bbff008a133c936c515eaa8fe ]
      
      The map_lookup_elem used to not acquiring spinlock
      in order to optimize the reader.
      
      It was true until commit 557c0c6e ("bpf: convert stackmap to pre-allocation")
      The syscall's map_lookup_elem(stackmap) calls bpf_stackmap_copy().
      bpf_stackmap_copy() may find the elem no longer needed after the copy is done.
      If that is the case, pcpu_freelist_push() saves this elem for reuse later.
      This push requires a spinlock.
      
      If a tracing bpf_prog got run in the middle of the syscall's
      map_lookup_elem(stackmap) and this tracing bpf_prog is calling
      bpf_get_stackid(stackmap) which also requires the same pcpu_freelist's
      spinlock, it may end up with a dead lock situation as reported by
      Eric Dumazet in https://patchwork.ozlabs.org/patch/1030266/
      
      The situation is the same as the syscall's map_update_elem() which
      needs to acquire the pcpu_freelist's spinlock and could race
      with tracing bpf_prog.  Hence, this patch fixes it by protecting
      bpf_stackmap_copy() with this_cpu_inc(bpf_prog_active)
      to prevent tracing bpf_prog from running.
      
      A later syscall's map_lookup_elem commit f1a2e44a3aec ("bpf: add queue and stack maps")
      also acquires a spinlock and races with tracing bpf_prog similarly.
      Hence, this patch is forward looking and protects the majority
      of the map lookups.  bpf_map_offload_lookup_elem() is the exception
      since it is for network bpf_prog only (i.e. never called by tracing
      bpf_prog).
      
      Fixes: 557c0c6e ("bpf: convert stackmap to pre-allocation")
      Reported-by: NEric Dumazet <eric.dumazet@gmail.com>
      Acked-by: NAlexei Starovoitov <ast@kernel.org>
      Signed-off-by: NMartin KaFai Lau <kafai@fb.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      ae26a710
    • A
      bpf: fix potential deadlock in bpf_prog_register · 3bbe6a42
      Alexei Starovoitov 提交于
      [ Upstream commit e16ec34039c701594d55d08a5aa49ee3e1abc821 ]
      
      Lockdep found a potential deadlock between cpu_hotplug_lock, bpf_event_mutex, and cpuctx_mutex:
      [   13.007000] WARNING: possible circular locking dependency detected
      [   13.007587] 5.0.0-rc3-00018-g2fa53f892422-dirty #477 Not tainted
      [   13.008124] ------------------------------------------------------
      [   13.008624] test_progs/246 is trying to acquire lock:
      [   13.009030] 0000000094160d1d (tracepoints_mutex){+.+.}, at: tracepoint_probe_register_prio+0x2d/0x300
      [   13.009770]
      [   13.009770] but task is already holding lock:
      [   13.010239] 00000000d663ef86 (bpf_event_mutex){+.+.}, at: bpf_probe_register+0x1d/0x60
      [   13.010877]
      [   13.010877] which lock already depends on the new lock.
      [   13.010877]
      [   13.011532]
      [   13.011532] the existing dependency chain (in reverse order) is:
      [   13.012129]
      [   13.012129] -> #4 (bpf_event_mutex){+.+.}:
      [   13.012582]        perf_event_query_prog_array+0x9b/0x130
      [   13.013016]        _perf_ioctl+0x3aa/0x830
      [   13.013354]        perf_ioctl+0x2e/0x50
      [   13.013668]        do_vfs_ioctl+0x8f/0x6a0
      [   13.014003]        ksys_ioctl+0x70/0x80
      [   13.014320]        __x64_sys_ioctl+0x16/0x20
      [   13.014668]        do_syscall_64+0x4a/0x180
      [   13.015007]        entry_SYSCALL_64_after_hwframe+0x49/0xbe
      [   13.015469]
      [   13.015469] -> #3 (&cpuctx_mutex){+.+.}:
      [   13.015910]        perf_event_init_cpu+0x5a/0x90
      [   13.016291]        perf_event_init+0x1b2/0x1de
      [   13.016654]        start_kernel+0x2b8/0x42a
      [   13.016995]        secondary_startup_64+0xa4/0xb0
      [   13.017382]
      [   13.017382] -> #2 (pmus_lock){+.+.}:
      [   13.017794]        perf_event_init_cpu+0x21/0x90
      [   13.018172]        cpuhp_invoke_callback+0xb3/0x960
      [   13.018573]        _cpu_up+0xa7/0x140
      [   13.018871]        do_cpu_up+0xa4/0xc0
      [   13.019178]        smp_init+0xcd/0xd2
      [   13.019483]        kernel_init_freeable+0x123/0x24f
      [   13.019878]        kernel_init+0xa/0x110
      [   13.020201]        ret_from_fork+0x24/0x30
      [   13.020541]
      [   13.020541] -> #1 (cpu_hotplug_lock.rw_sem){++++}:
      [   13.021051]        static_key_slow_inc+0xe/0x20
      [   13.021424]        tracepoint_probe_register_prio+0x28c/0x300
      [   13.021891]        perf_trace_event_init+0x11f/0x250
      [   13.022297]        perf_trace_init+0x6b/0xa0
      [   13.022644]        perf_tp_event_init+0x25/0x40
      [   13.023011]        perf_try_init_event+0x6b/0x90
      [   13.023386]        perf_event_alloc+0x9a8/0xc40
      [   13.023754]        __do_sys_perf_event_open+0x1dd/0xd30
      [   13.024173]        do_syscall_64+0x4a/0x180
      [   13.024519]        entry_SYSCALL_64_after_hwframe+0x49/0xbe
      [   13.024968]
      [   13.024968] -> #0 (tracepoints_mutex){+.+.}:
      [   13.025434]        __mutex_lock+0x86/0x970
      [   13.025764]        tracepoint_probe_register_prio+0x2d/0x300
      [   13.026215]        bpf_probe_register+0x40/0x60
      [   13.026584]        bpf_raw_tracepoint_open.isra.34+0xa4/0x130
      [   13.027042]        __do_sys_bpf+0x94f/0x1a90
      [   13.027389]        do_syscall_64+0x4a/0x180
      [   13.027727]        entry_SYSCALL_64_after_hwframe+0x49/0xbe
      [   13.028171]
      [   13.028171] other info that might help us debug this:
      [   13.028171]
      [   13.028807] Chain exists of:
      [   13.028807]   tracepoints_mutex --> &cpuctx_mutex --> bpf_event_mutex
      [   13.028807]
      [   13.029666]  Possible unsafe locking scenario:
      [   13.029666]
      [   13.030140]        CPU0                    CPU1
      [   13.030510]        ----                    ----
      [   13.030875]   lock(bpf_event_mutex);
      [   13.031166]                                lock(&cpuctx_mutex);
      [   13.031645]                                lock(bpf_event_mutex);
      [   13.032135]   lock(tracepoints_mutex);
      [   13.032441]
      [   13.032441]  *** DEADLOCK ***
      [   13.032441]
      [   13.032911] 1 lock held by test_progs/246:
      [   13.033239]  #0: 00000000d663ef86 (bpf_event_mutex){+.+.}, at: bpf_probe_register+0x1d/0x60
      [   13.033909]
      [   13.033909] stack backtrace:
      [   13.034258] CPU: 1 PID: 246 Comm: test_progs Not tainted 5.0.0-rc3-00018-g2fa53f892422-dirty #477
      [   13.034964] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2.el7 04/01/2014
      [   13.035657] Call Trace:
      [   13.035859]  dump_stack+0x5f/0x8b
      [   13.036130]  print_circular_bug.isra.37+0x1ce/0x1db
      [   13.036526]  __lock_acquire+0x1158/0x1350
      [   13.036852]  ? lock_acquire+0x98/0x190
      [   13.037154]  lock_acquire+0x98/0x190
      [   13.037447]  ? tracepoint_probe_register_prio+0x2d/0x300
      [   13.037876]  __mutex_lock+0x86/0x970
      [   13.038167]  ? tracepoint_probe_register_prio+0x2d/0x300
      [   13.038600]  ? tracepoint_probe_register_prio+0x2d/0x300
      [   13.039028]  ? __mutex_lock+0x86/0x970
      [   13.039337]  ? __mutex_lock+0x24a/0x970
      [   13.039649]  ? bpf_probe_register+0x1d/0x60
      [   13.039992]  ? __bpf_trace_sched_wake_idle_without_ipi+0x10/0x10
      [   13.040478]  ? tracepoint_probe_register_prio+0x2d/0x300
      [   13.040906]  tracepoint_probe_register_prio+0x2d/0x300
      [   13.041325]  bpf_probe_register+0x40/0x60
      [   13.041649]  bpf_raw_tracepoint_open.isra.34+0xa4/0x130
      [   13.042068]  ? __might_fault+0x3e/0x90
      [   13.042374]  __do_sys_bpf+0x94f/0x1a90
      [   13.042678]  do_syscall_64+0x4a/0x180
      [   13.042975]  entry_SYSCALL_64_after_hwframe+0x49/0xbe
      [   13.043382] RIP: 0033:0x7f23b10a07f9
      [   13.045155] RSP: 002b:00007ffdef42fdd8 EFLAGS: 00000202 ORIG_RAX: 0000000000000141
      [   13.045759] RAX: ffffffffffffffda RBX: 00007ffdef42ff70 RCX: 00007f23b10a07f9
      [   13.046326] RDX: 0000000000000070 RSI: 00007ffdef42fe10 RDI: 0000000000000011
      [   13.046893] RBP: 00007ffdef42fdf0 R08: 0000000000000038 R09: 00007ffdef42fe10
      [   13.047462] R10: 0000000000000000 R11: 0000000000000202 R12: 0000000000000000
      [   13.048029] R13: 0000000000000016 R14: 00007f23b1db4690 R15: 0000000000000000
      
      Since tracepoints_mutex will be taken in tracepoint_probe_register/unregister()
      there is no need to take bpf_event_mutex too.
      bpf_event_mutex is protecting modifications to prog array used in kprobe/perf bpf progs.
      bpf_raw_tracepoints don't need to take this mutex.
      
      Fixes: c4f6699d ("bpf: introduce BPF_RAW_TRACEPOINT")
      Acked-by: NMartin KaFai Lau <kafai@fb.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      3bbe6a42
    • A
      bpf: fix lockdep false positive in percpu_freelist · e3bc64c9
      Alexei Starovoitov 提交于
      [ Upstream commit a89fac57b5d080771efd4d71feaae19877cf68f0 ]
      
      Lockdep warns about false positive:
      [   12.492084] 00000000e6b28347 (&head->lock){+...}, at: pcpu_freelist_push+0x2a/0x40
      [   12.492696] but this lock was taken by another, HARDIRQ-safe lock in the past:
      [   12.493275]  (&rq->lock){-.-.}
      [   12.493276]
      [   12.493276]
      [   12.493276] and interrupts could create inverse lock ordering between them.
      [   12.493276]
      [   12.494435]
      [   12.494435] other info that might help us debug this:
      [   12.494979]  Possible interrupt unsafe locking scenario:
      [   12.494979]
      [   12.495518]        CPU0                    CPU1
      [   12.495879]        ----                    ----
      [   12.496243]   lock(&head->lock);
      [   12.496502]                                local_irq_disable();
      [   12.496969]                                lock(&rq->lock);
      [   12.497431]                                lock(&head->lock);
      [   12.497890]   <Interrupt>
      [   12.498104]     lock(&rq->lock);
      [   12.498368]
      [   12.498368]  *** DEADLOCK ***
      [   12.498368]
      [   12.498837] 1 lock held by dd/276:
      [   12.499110]  #0: 00000000c58cb2ee (rcu_read_lock){....}, at: trace_call_bpf+0x5e/0x240
      [   12.499747]
      [   12.499747] the shortest dependencies between 2nd lock and 1st lock:
      [   12.500389]  -> (&rq->lock){-.-.} {
      [   12.500669]     IN-HARDIRQ-W at:
      [   12.500934]                       _raw_spin_lock+0x2f/0x40
      [   12.501373]                       scheduler_tick+0x4c/0xf0
      [   12.501812]                       update_process_times+0x40/0x50
      [   12.502294]                       tick_periodic+0x27/0xb0
      [   12.502723]                       tick_handle_periodic+0x1f/0x60
      [   12.503203]                       timer_interrupt+0x11/0x20
      [   12.503651]                       __handle_irq_event_percpu+0x43/0x2c0
      [   12.504167]                       handle_irq_event_percpu+0x20/0x50
      [   12.504674]                       handle_irq_event+0x37/0x60
      [   12.505139]                       handle_level_irq+0xa7/0x120
      [   12.505601]                       handle_irq+0xa1/0x150
      [   12.506018]                       do_IRQ+0x77/0x140
      [   12.506411]                       ret_from_intr+0x0/0x1d
      [   12.506834]                       _raw_spin_unlock_irqrestore+0x53/0x60
      [   12.507362]                       __setup_irq+0x481/0x730
      [   12.507789]                       setup_irq+0x49/0x80
      [   12.508195]                       hpet_time_init+0x21/0x32
      [   12.508644]                       x86_late_time_init+0xb/0x16
      [   12.509106]                       start_kernel+0x390/0x42a
      [   12.509554]                       secondary_startup_64+0xa4/0xb0
      [   12.510034]     IN-SOFTIRQ-W at:
      [   12.510305]                       _raw_spin_lock+0x2f/0x40
      [   12.510772]                       try_to_wake_up+0x1c7/0x4e0
      [   12.511220]                       swake_up_locked+0x20/0x40
      [   12.511657]                       swake_up_one+0x1a/0x30
      [   12.512070]                       rcu_process_callbacks+0xc5/0x650
      [   12.512553]                       __do_softirq+0xe6/0x47b
      [   12.512978]                       irq_exit+0xc3/0xd0
      [   12.513372]                       smp_apic_timer_interrupt+0xa9/0x250
      [   12.513876]                       apic_timer_interrupt+0xf/0x20
      [   12.514343]                       default_idle+0x1c/0x170
      [   12.514765]                       do_idle+0x199/0x240
      [   12.515159]                       cpu_startup_entry+0x19/0x20
      [   12.515614]                       start_kernel+0x422/0x42a
      [   12.516045]                       secondary_startup_64+0xa4/0xb0
      [   12.516521]     INITIAL USE at:
      [   12.516774]                      _raw_spin_lock_irqsave+0x38/0x50
      [   12.517258]                      rq_attach_root+0x16/0xd0
      [   12.517685]                      sched_init+0x2f2/0x3eb
      [   12.518096]                      start_kernel+0x1fb/0x42a
      [   12.518525]                      secondary_startup_64+0xa4/0xb0
      [   12.518986]   }
      [   12.519132]   ... key      at: [<ffffffff82b7bc28>] __key.71384+0x0/0x8
      [   12.519649]   ... acquired at:
      [   12.519892]    pcpu_freelist_pop+0x7b/0xd0
      [   12.520221]    bpf_get_stackid+0x1d2/0x4d0
      [   12.520563]    ___bpf_prog_run+0x8b4/0x11a0
      [   12.520887]
      [   12.521008] -> (&head->lock){+...} {
      [   12.521292]    HARDIRQ-ON-W at:
      [   12.521539]                     _raw_spin_lock+0x2f/0x40
      [   12.521950]                     pcpu_freelist_push+0x2a/0x40
      [   12.522396]                     bpf_get_stackid+0x494/0x4d0
      [   12.522828]                     ___bpf_prog_run+0x8b4/0x11a0
      [   12.523296]    INITIAL USE at:
      [   12.523537]                    _raw_spin_lock+0x2f/0x40
      [   12.523944]                    pcpu_freelist_populate+0xc0/0x120
      [   12.524417]                    htab_map_alloc+0x405/0x500
      [   12.524835]                    __do_sys_bpf+0x1a3/0x1a90
      [   12.525253]                    do_syscall_64+0x4a/0x180
      [   12.525659]                    entry_SYSCALL_64_after_hwframe+0x49/0xbe
      [   12.526167]  }
      [   12.526311]  ... key      at: [<ffffffff838f7668>] __key.13130+0x0/0x8
      [   12.526812]  ... acquired at:
      [   12.527047]    __lock_acquire+0x521/0x1350
      [   12.527371]    lock_acquire+0x98/0x190
      [   12.527680]    _raw_spin_lock+0x2f/0x40
      [   12.527994]    pcpu_freelist_push+0x2a/0x40
      [   12.528325]    bpf_get_stackid+0x494/0x4d0
      [   12.528645]    ___bpf_prog_run+0x8b4/0x11a0
      [   12.528970]
      [   12.529092]
      [   12.529092] stack backtrace:
      [   12.529444] CPU: 0 PID: 276 Comm: dd Not tainted 5.0.0-rc3-00018-g2fa53f892422 #475
      [   12.530043] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2.el7 04/01/2014
      [   12.530750] Call Trace:
      [   12.530948]  dump_stack+0x5f/0x8b
      [   12.531248]  check_usage_backwards+0x10c/0x120
      [   12.531598]  ? ___bpf_prog_run+0x8b4/0x11a0
      [   12.531935]  ? mark_lock+0x382/0x560
      [   12.532229]  mark_lock+0x382/0x560
      [   12.532496]  ? print_shortest_lock_dependencies+0x180/0x180
      [   12.532928]  __lock_acquire+0x521/0x1350
      [   12.533271]  ? find_get_entry+0x17f/0x2e0
      [   12.533586]  ? find_get_entry+0x19c/0x2e0
      [   12.533902]  ? lock_acquire+0x98/0x190
      [   12.534196]  lock_acquire+0x98/0x190
      [   12.534482]  ? pcpu_freelist_push+0x2a/0x40
      [   12.534810]  _raw_spin_lock+0x2f/0x40
      [   12.535099]  ? pcpu_freelist_push+0x2a/0x40
      [   12.535432]  pcpu_freelist_push+0x2a/0x40
      [   12.535750]  bpf_get_stackid+0x494/0x4d0
      [   12.536062]  ___bpf_prog_run+0x8b4/0x11a0
      
      It has been explained that is a false positive here:
      https://lkml.org/lkml/2018/7/25/756
      Recap:
      - stackmap uses pcpu_freelist
      - The lock in pcpu_freelist is a percpu lock
      - stackmap is only used by tracing bpf_prog
      - A tracing bpf_prog cannot be run if another bpf_prog
        has already been running (ensured by the percpu bpf_prog_active counter).
      
      Eric pointed out that this lockdep splats stops other
      legit lockdep splats in selftests/bpf/test_progs.c.
      
      Fix this by calling local_irq_save/restore for stackmap.
      
      Another false positive had also been worked around by calling
      local_irq_save in commit 89ad2fa3 ("bpf: fix lockdep splat").
      That commit added unnecessary irq_save/restore to fast path of
      bpf hash map. irqs are already disabled at that point, since htab
      is holding per bucket spin_lock with irqsave.
      
      Let's reduce overhead for htab by introducing __pcpu_freelist_push/pop
      function w/o irqsave and convert pcpu_freelist_push/pop to irqsave
      to be used elsewhere (right now only in stackmap).
      It stops lockdep false positive in stackmap with a bit of acceptable overhead.
      
      Fixes: 557c0c6e ("bpf: convert stackmap to pre-allocation")
      Reported-by: NNaresh Kamboju <naresh.kamboju@linaro.org>
      Reported-by: NEric Dumazet <eric.dumazet@gmail.com>
      Acked-by: NMartin KaFai Lau <kafai@fb.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      e3bc64c9
    • M
      bpf, selftests: fix handling of sparse CPU allocations · 0ace0d28
      Martynas Pumputis 提交于
      [ Upstream commit 1bb54c4071f585ebef56ce8fdfe6026fa2cbcddd ]
      
      Previously, bpf_num_possible_cpus() had a bug when calculating a
      number of possible CPUs in the case of sparse CPU allocations, as
      it was considering only the first range or element of
      /sys/devices/system/cpu/possible.
      
      E.g. in the case of "0,2-3" (CPU 1 is not available), the function
      returned 1 instead of 3.
      
      This patch fixes the function by making it parse all CPU ranges and
      elements.
      Signed-off-by: NMartynas Pumputis <m@lambda.lt>
      Acked-by: NYonghong Song <yhs@fb.com>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      0ace0d28
    • G
      relay: check return of create_buf_file() properly · 232bd90c
      Greg Kroah-Hartman 提交于
      [ Upstream commit 2c1cf00eeacb784781cf1c9896b8af001246d339 ]
      
      If create_buf_file() returns an error, don't try to reference it later
      as a valid dentry pointer.
      
      This problem was exposed when debugfs started to return errors instead
      of just NULL for some calls when they do not succeed properly.
      
      Also, the check for WARN_ON(dentry) was just wrong :)
      Reported-by: NKees Cook <keescook@chromium.org>
      Reported-and-tested-by: syzbot+16c3a70e1e9b29346c43@syzkaller.appspotmail.com
      Reported-by: NTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: David Rientjes <rientjes@google.com>
      Fixes: ff9fb72bc077 ("debugfs: return error values, not NULL")
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      232bd90c
    • Z
      irqchip/gic-v3-its: Fix ITT_entry_size accessor · 2a5c84e1
      Zenghui Yu 提交于
      [ Upstream commit 56841070ccc87b463ac037d2d1f2beb8e5e35f0c ]
      
      According to ARM IHI 0069C (ID070116), we should use GITS_TYPER's
      bits [7:4] as ITT_entry_size instead of [8:4]. Although this is
      pretty annoying, it only results in a potential over-allocation
      of memory, and nothing bad happens.
      
      Fixes: 3dfa576b ("irqchip/gic-v3-its: Add probing for VLPI properties")
      Signed-off-by: NZenghui Yu <yuzenghui@huawei.com>
      [maz: massaged subject and commit message]
      Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      2a5c84e1
    • J
      net: stmmac: Disable EEE mode earlier in XMIT callback · fbdbb194
      Jose Abreu 提交于
      [ Upstream commit e2cd682deb231ba6f80524bb84e57e7138261149 ]
      
      In stmmac xmit callback we use a different flow for TSO packets but TSO
      xmit callback is not disabling the EEE mode.
      
      Fix this by disabling earlier the EEE mode, i.e. before calling the TSO
      xmit callback.
      Signed-off-by: NJose Abreu <joabreu@synopsys.com>
      Cc: Joao Pinto <jpinto@synopsys.com>
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
      Cc: Alexandre Torgue <alexandre.torgue@st.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      fbdbb194
    • J
      net: stmmac: Send TSO packets always from Queue 0 · 496eaed7
      Jose Abreu 提交于
      [ Upstream commit c5acdbee22a1b200dde07effd26fd1f649e9ab8a ]
      
      The number of TSO enabled channels in HW can be different than the
      number of total channels. There is no way to determined, at runtime, the
      number of TSO capable channels and its safe to assume that if TSO is
      enabled then at least channel 0 will be TSO capable.
      
      Lets always send TSO packets from Queue 0.
      Signed-off-by: NJose Abreu <joabreu@synopsys.com>
      Cc: Joao Pinto <jpinto@synopsys.com>
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
      Cc: Alexandre Torgue <alexandre.torgue@st.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      496eaed7
    • J
      net: stmmac: Fallback to Platform Data clock in Watchdog conversion · 46ba03c5
      Jose Abreu 提交于
      [ Upstream commit 4ec5302fa906ec9d86597b236f62315bacdb9622 ]
      
      If we don't have DT then stmmac_clk will not be available. Let's add a
      new Platform Data field so that we can specify the refclk by this mean.
      
      This way we can still use the coalesce command in PCI based setups.
      Signed-off-by: NJose Abreu <joabreu@synopsys.com>
      Cc: Joao Pinto <jpinto@synopsys.com>
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
      Cc: Alexandre Torgue <alexandre.torgue@st.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      46ba03c5
    • C
      drm/amdgpu: Transfer fences to dmabuf importer · 8096bc39
      Chris Wilson 提交于
      [ Upstream commit 6e11ea9de9576a644045ffdc2067c09bc2012eda ]
      
      amdgpu only uses shared-fences internally, but dmabuf importers rely on
      implicit write hazard tracking via the reservation_object.fence_excl.
      For example, the importer use the write hazard for timing a page flip to
      only occur after the exporter has finished flushing its write into the
      surface. As such, on exporting a dmabuf, we must either flush all
      outstanding fences (for we do not know which are writes and should have
      been exclusive) or alternatively create a new exclusive fence that is
      the composite of all the existing shared fences, and so will only be
      signaled when all earlier fences are signaled (ensuring that we can not
      be signaled before the completion of any earlier write).
      
      v2: reservation_object is already locked by amdgpu_bo_reserve()
      v3: Replace looping with get_fences_rcu and special case the promotion
      of a single shared fence directly to an exclusive fence, bypassing the
      fence array.
      v4: Drop the fence array ref after assigning to reservation_object
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107341
      Testcase: igt/amd_prime/amd-to-i915
      References: 8e94a46c ("drm/amdgpu: Attach exclusive fence to prime exported bo's. (v5)")
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Cc: Alex Deucher <alexander.deucher@amd.com>
      Cc: "Christian König" <christian.koenig@amd.com>
      Reviewed-by: N"Christian König" <christian.koenig@amd.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      8096bc39
    • A
      drm/radeon: check if device is root before getting pci speed caps · 4ec880d7
      Alex Deucher 提交于
      [ Upstream commit afeff4c16edaa6275b903f82b0561406259aa3a3 ]
      
      Check if the device is root rather before attempting to see what
      speeds the pcie port supports.  Fixes a crash with pci passthrough
      in a VM.
      
      Bug: https://bugs.freedesktop.org/show_bug.cgi?id=109366Reviewed-by: NEvan Quan <evan.quan@amd.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      4ec880d7
    • A
      drm/amdgpu: Add missing power attribute to APU check · 09439238
      Alex Deucher 提交于
      [ Upstream commit dc14eb12f6bb3e779c5461429c1889a339c67aab ]
      
      Add missing power_average to visible check for power
      attributes for APUs.  Was missed before.
      Reviewed-by: NEvan Quan <evan.quan@amd.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      09439238
    • L
      irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable · 1bf79102
      Lubomir Rintel 提交于
      [ Upstream commit 2380a22b60ce6f995eac806e69c66e397b59d045 ]
      
      Resetting bit 4 disables the interrupt delivery to the "secure
      processor" core. This breaks the keyboard on a OLPC XO 1.75 laptop,
      where the firmware running on the "secure processor" bit-bangs the
      PS/2 protocol over the GPIO lines.
      
      It is not clear what the rest of the bits are and Marvell was unhelpful
      when asked for documentation. Aside from the SP bit, there are probably
      priority bits.
      
      Leaving the unknown bits as the firmware set them up seems to be a wiser
      course of action compared to just turning them off.
      Signed-off-by: NLubomir Rintel <lkundrak@v3.sk>
      Acked-by: NPavel Machek <pavel@ucw.cz>
      [maz: fixed-up subject and commit message]
      Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      1bf79102
    • M
      irqchip/gic-v3-its: Gracefully fail on LPI exhaustion · 423869f8
      Marc Zyngier 提交于
      [ Upstream commit 45725e0fc3e7fe52fedb94f59806ec50e9618682 ]
      
      In the unlikely event that we cannot find any available LPI in the
      system, we should gracefully return an error instead of carrying
      on with no LPI allocated at all.
      
      Fixes: 38dd7c49 ("irqchip/gic-v3-its: Drop chunk allocation compatibility")
      Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      423869f8
    • H
      irqchip/gic-v4: Fix occasional VLPI drop · dc81cfaf
      Heyi Guo 提交于
      [ Upstream commit 6479450f72c1391c03f08affe0d0110f41ae7ca0 ]
      
      1. In current implementation, every VLPI will temporarily be mapped to
      the first CPU in system (normally CPU0) and then moved to the real
      scheduled CPU later.
      
      2. So there is a time window and a VLPI may be sent to CPU0 instead of
      the real scheduled vCPU, in a multi-CPU virtual machine.
      
      3. However, CPU0 may have not been scheduled as a virtual CPU after
      system boots up, so the value of its GICR_VPROPBASER is unknown at
      that moment.
      
      4. If the INTID of VLPI is larger than 2^(GICR_VPROPBASER.IDbits+1),
      while IDbits is also in unknown state, GIC will behave as if the VLPI
      is out of range and simply drop it, which results in interrupt missing
      in Guest.
      
      As no code will clear GICR_VPROPBASER at runtime, we can safely
      initialize the IDbits field at boot time for each CPU to get rid of
      this issue.
      
      We also clear Valid bit of GICR_VPENDBASER in case any ancient
      programming gets left in and causes memory corrupting. A new function
      its_clear_vpend_valid() is added to reuse the code in
      its_vpe_deschedule().
      
      Fixes: e643d803 ("irqchip/gic-v3-its: Add VPE scheduling")
      Signed-off-by: NHeyi Guo <guoheyi@huawei.com>
      Signed-off-by: NHeyi Guo <heyi.guo@linaro.org>
      Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      dc81cfaf
    • A
      usb: phy: fix link errors · 377ffe35
      Anders Roxell 提交于
      [ Upstream commit f2105d42597f4d10e431b195d69e96dccaf9b012 ]
      
      Fix link errors when CONFIG_FSL_USB2_OTG is enabled and USB_OTG_FSM is
      set to module then the following link error occurs.
      
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.o: in function `fsl_otg_ioctl':
      drivers/usb/phy/phy-fsl-usb.c:1083: undefined reference to `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.c:1083:(.text+0x574): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.o: in function `fsl_otg_start_srp':
      drivers/usb/phy/phy-fsl-usb.c:674: undefined reference to `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.c:674:(.text+0x61c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.o: in function `fsl_otg_set_host':
      drivers/usb/phy/phy-fsl-usb.c:593: undefined reference to `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.c:593:(.text+0x7a4): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.o: in function `fsl_otg_start_hnp':
      drivers/usb/phy/phy-fsl-usb.c:695: undefined reference to `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.c:695:(.text+0x858): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.o: in function `a_wait_enum':
      drivers/usb/phy/phy-fsl-usb.c:274: undefined reference to `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.c:274:(.text+0x16f0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `otg_statemachine'
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.o:drivers/usb/phy/phy-fsl-usb.c:619: more undefined references to `otg_statemachine' follow
      aarch64-linux-gnu-ld: drivers/usb/phy/phy-fsl-usb.o: in function `fsl_otg_set_peripheral':
      drivers/usb/phy/phy-fsl-usb.c:619:(.text+0x1fa0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `otg_statemachine'
      make[1]: *** [Makefile:1020: vmlinux] Error 1
      make[1]: Target 'Image' not remade because of errors.
      make: *** [Makefile:152: sub-make] Error 2
      make: Target 'Image' not remade because of errors.
      
      Rework so that FSL_USB2_OTG depends on that the USB_OTG_FSM is builtin.
      Signed-off-by: NAnders Roxell <anders.roxell@linaro.org>
      Signed-off-by: NFelipe Balbi <felipe.balbi@linux.intel.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      377ffe35
    • Z
      DTS: CI20: Fix bugs in ci20's device tree. · fbc3ed13
      Zhou Yanjie 提交于
      [ Upstream commit 1ca1c87f91d9dc50d6a38e2177b2032996e7901c ]
      
      According to the Schematic, the hardware of ci20 leads to uart3,
      but not to uart2. Uart2 is miswritten in the original code.
      Signed-off-by: NZhou Yanjie <zhouyanjie@cduestc.edu.cn>
      Signed-off-by: NPaul Burton <paul.burton@mips.com>
      Cc: linux-mips <linux-mips@vger.kernel.org>
      Cc: linux-kernel <linux-kernel@vger.kernel.org>
      Cc: devicetree@vger.kernel.org
      Cc: robh+dt@kernel.org
      Cc: ralf@linux-mips.org
      Cc: jhogan@kernel.org
      Cc: mark.rutland@arm.com
      Cc: malat@debian.org
      Cc: ezequiel@collabora.co.uk
      Cc: ulf.hansson@linaro.org
      Cc: syq <syq@debian.org>
      Cc: jiaxun.yang <jiaxun.yang@flygoat.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      fbc3ed13
    • F
      batman-adv: release station info tidstats · f7e3fb0a
      Felix Fietkau 提交于
      [ Upstream commit 7d652669b61d702c6e62a39579d17f6881670ab6 ]
      
      With the addition of TXQ stats in the per-tid statistics the struct
      station_info grew significantly. This resulted in stack size warnings
      due to the structure itself being above the limit for the warnings.
      
      To work around this, the TID array was allocated dynamically. Also a
      function to free this content was introduced with commit 7ea3e110
      ("cfg80211: release station info tidstats where needed") but the necessary
      changes were not provided for batman-adv's B.A.T.M.A.N. V implementation.
      Signed-off-by: NFelix Fietkau <nbd@nbd.name>
      Fixes: 8689c051 ("cfg80211: dynamically allocate per-tid stats for station info")
      [sven@narfation.org: add commit message]
      Signed-off-by: NSven Eckelmann <sven@narfation.org>
      Signed-off-by: NSimon Wunderlich <sw@simonwunderlich.de>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      f7e3fb0a
    • S
      arm64: dts: add msm8996 compatible to gicv3 · 90f0a75b
      Srinivas Kandagatla 提交于
      [ Upstream commit 2a81efb0de0e33f2d2c83154af0bd3ce389b3269 ]
      
      Add compatible to gicv3 node to enable quirk required to restrict writing
      to GICR_WAKER register which is restricted on msm8996 SoC in Hypervisor.
      
      With this quirk MSM8996 can at least boot out of mainline, which can help
      community to work with boards based on MSM8996.
      
      Without this patch Qualcomm DB820c board reboots on mainline.
      Signed-off-by: NSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
      Signed-off-by: NAndy Gross <andy.gross@linaro.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      90f0a75b
    • P
      ARM: pxa: ssp: unneeded to free devm_ allocated data · ac099734
      Peng Hao 提交于
      [ Upstream commit ba16adeb346387eb2d1ada69003588be96f098fa ]
      
      devm_ allocated data will be automatically freed. The free
      of devm_ allocated data is invalid.
      
      Fixes: 1c459de1 ("ARM: pxa: ssp: use devm_ functions")
      Signed-off-by: NPeng Hao <peng.hao2@zte.com.cn>
      [title's prefix changed]
      Signed-off-by: NRobert Jarzmik <robert.jarzmik@free.fr>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      ac099734
    • Y
      bpf: sock recvbuff must be limited by rmem_max in bpf_setsockopt() · a8795ba8
      Yafang Shao 提交于
      [ Upstream commit c9e4576743eeda8d24dedc164d65b78877f9a98c ]
      
      When sock recvbuff is set by bpf_setsockopt(), the value must by
      limited by rmem_max. It is the same with sendbuff.
      
      Fixes: 8c4b4c7e ("bpf: Add setsockopt helper function to bpf")
      Signed-off-by: NYafang Shao <laoar.shao@gmail.com>
      Acked-by: NMartin KaFai Lau <kafai@fb.com>
      Acked-by: NLawrence Brakmo <brakmo@fb.com>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      a8795ba8
    • P
      bpftool: fix percpu maps updating · 7e2b2e24
      Paolo Abeni 提交于
      [ Upstream commit b0ca5ecb8e2279d706261f525f1bd0ba9e3fe800 ]
      
      When updating a percpu map, bpftool currently copies the provided
      value only into the first per CPU copy of the specified value,
      all others instances are left zeroed.
      
      This change explicitly copies the user-provided bytes to all the
      per CPU instances, keeping the sub-command syntax unchanged.
      
      v2 -> v3:
       - drop unused argument, as per Quentin's suggestion
      v1 -> v2:
       - rename the helper as per Quentin's suggestion
      
      Fixes: 71bb428f ("tools: bpf: add bpftool")
      Signed-off-by: NPaolo Abeni <pabeni@redhat.com>
      Reviewed-by: NQuentin Monnet <quentin.monnet@netronome.com>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      7e2b2e24
    • J
      bpftool: Fix prog dump by tag · 1da961de
      Jiri Olsa 提交于
      [ Upstream commit 752bcf80f5549c9901b2e8bc77b2138de55b1026 ]
      
      Lance reported an issue with bpftool not being able to
      dump program if there are more programs loaded and you
      want to dump any but the first program, like:
      
        # bpftool prog
        28: kprobe  name trace_req_start  tag 1dfc28ba8b3dd597  gpl
        	loaded_at 2019-01-18T17:02:40+1100  uid 0
        	xlated 112B  jited 109B  memlock 4096B  map_ids 13
        29: kprobe  name trace_req_compl  tag 5b6a5ecc6030a683  gpl
        	loaded_at 2019-01-18T17:02:40+1100  uid 0
        	xlated 928B  jited 575B  memlock 4096B  map_ids 13,14
        #  bpftool prog dum jited tag 1dfc28ba8b3dd597
         0:	push   %rbp
         1:	mov    %rsp,%rbp
        ...
      
        #  bpftool prog dum jited tag 5b6a5ecc6030a683
        Error: can't get prog info (29): Bad address
      
      The problem is in the prog_fd_by_tag function not cleaning
      the struct bpf_prog_info before another request, so the
      previous program length is still in there and kernel assumes
      it needs to dump the program, which fails because there's no
      user pointer set.
      
      Moving the struct bpf_prog_info declaration into the loop,
      so it gets cleaned before each query.
      
      Fixes: 71bb428f ("tools: bpf: add bpftool")
      Reported-by: NLance Digby <ldigby@redhat.com>
      Signed-off-by: NJiri Olsa <jolsa@kernel.org>
      Reviewed-by: NQuentin Monnet <quentin.monnet@netronome.com>
      Acked-by: NJakub Kicinski <jakub.kicinski@netronome.com>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      1da961de
    • U
      wlcore: sdio: Fixup power on/off sequence · 9a0f0bba
      Ulf Hansson 提交于
      [ Upstream commit 13e62626c578d9889ebbda7c521be5adff9bef8e ]
      
      During "wlan-up", we are programming the FW into the WiFi-chip. However,
      re-programming the FW doesn't work, unless a power cycle of the WiFi-chip
      is made in-between the programmings.
      
      To conform to this requirement and to fix the regression in a simple way,
      let's start by allowing that the SDIO card (WiFi-chip) may stay powered on
      (runtime resumed) when wl12xx_sdio_power_off() returns. The intent with the
      current code is to treat this scenario as an error, but unfortunate this
      doesn't work as expected, so let's fix this.
      
      The other part is to guarantee that a power cycle of the SDIO card has been
      completed when wl12xx_sdio_power_on() returns, as to allow the FW
      programming to succeed. However, relying solely on runtime PM to deal with
      this isn't sufficient. For example, userspace may prevent runtime suspend
      via sysfs for the device that represents the SDIO card, leading to that the
      mmc core also keeps it powered on. For this reason, let's instead do a
      brute force power cycle in wl12xx_sdio_power_on().
      
      Fixes: 728a9dc6 ("wlcore: sdio: Fix flakey SDIO runtime PM handling")
      Signed-off-by: NUlf Hansson <ulf.hansson@linaro.org>
      Tested-by: NTony Lindgren <tony@atomide.com>
      Tested-by: NAnders Roxell <anders.roxell@linaro.org>
      Signed-off-by: NUlf Hansson <ulf.hansson@linaro.org>
      Signed-off-by: NKalle Valo <kvalo@codeaurora.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      9a0f0bba
    • J
      pinctrl: mcp23s08: spi: Fix regmap allocation for mcp23s18 · 26344486
      Jason Kridner 提交于
      [ Upstream commit f165988b77ef849eb0c1aebd94fe778024f88314 ]
      
      Fixes issue created by 9b3e4207.
      
      It wasn't possible for one_regmap_config to be non-NULL at the point
      it was tested for mcp23s18 devices.
      
      Applied the same pattern of allocating one_regmap_config using
      devm_kmemdump() and then initializing the local regmap structure
      from that.
      Signed-off-by: NJason Kridner <jdk@ti.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      26344486
    • M
      soc: fsl: qbman: avoid race in clearing QMan interrupt · a50434de
      Madalin Bucur 提交于
      [ Upstream commit 89857a8a5c89a406b967ab2be7bd2ccdbe75e73d ]
      
      By clearing all interrupt sources, not only those that
      already occurred, the existing code may acknowledge by
      mistake interrupts that occurred after the code checks
      for them.
      Signed-off-by: NMadalin Bucur <madalin.bucur@nxp.com>
      Signed-off-by: NRoy Pledge <roy.pledge@nxp.com>
      Signed-off-by: NLi Yang <leoyang.li@nxp.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      a50434de
    • G
      arm64: dts: renesas: r8a77965: Enable DMA for SCIF2 · 95977313
      Geert Uytterhoeven 提交于
      [ Upstream commit 05c8478abd485507c25aa565afab604af8d8fe46 ]
      
      SCIF2 on R-Car M3-N can be used with both DMAC1 and DMAC2.
      
      Fixes: 0ea5b2fd ("arm64: dts: renesas: r8a77965: Add SCIF device nodes")
      Signed-off-by: NGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      95977313
    • G
      arm64: dts: renesas: r8a7796: Enable DMA for SCIF2 · 4dc8b2e5
      Geert Uytterhoeven 提交于
      [ Upstream commit 97f26702bc95b5c3a72671d5c6675e4d6ee0a2f4 ]
      
      SCIF2 on R-Car M3-W can be used with both DMAC1 and DMAC2.
      
      Fixes: dbcae5ea ("arm64: dts: r8a7796: Enable SCIF DMA")
      Signed-off-by: NGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      4dc8b2e5
    • A
      ARM: dts: imx6sx: correct backward compatible of gpt · f02070cb
      Anson Huang 提交于
      [ Upstream commit ba0f4560526ba19300c07ed5a3c1df7592815dc6 ]
      
      i.MX6SX has same GPT type as i.MX6DL, in GPT driver, it uses
      below TIMER_OF_DECLARE, so the backward compatible should be
      "fsl,imx6dl-gpt", correct it.
      
      TIMER_OF_DECLARE(imx6sx_timer, "fsl,imx6sx-gpt", imx6dl_timer_init_dt);
      Signed-off-by: NAnson Huang <Anson.Huang@nxp.com>
      Signed-off-by: NShawn Guo <shawnguo@kernel.org>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      f02070cb
    • M
      ARM: dts: meson8m2: mxiii-plus: mark the SD card detection GPIO active-low · 3edbed0d
      Martin Blumenstingl 提交于
      [ Upstream commit 8615f5596335db0978cea593dcd0070dc5f8b116 ]
      
      After commit 89a5e15bcba87d ("gpio/mmc/of: Respect polarity in the device
      tree") SD cards are not detected anymore.
      
      The CD GPIO is "active low" on the MXIII-Plus. The MMC dt-bindings
      specify: "[...] using the "cd-inverted" property means, that the CD line
      is active high, i.e. it is high, when a card is inserted".
      
      Fix the description of the SD card by marking it as GPIO_ACTIVE_LOW and
      drop the "cd-inverted" property. This makes the definition consistent
      with the existing dt-bindings and fixes the check whether an SD card is
      inserted.
      
      Fixes: 35ee52be ("ARM: dts: meson8m2: add support for the Tronsmart MXIII Plus")
      Signed-off-by: NMartin Blumenstingl <martin.blumenstingl@googlemail.com>
      Reviewed-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NKevin Hilman <khilman@baylibre.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      3edbed0d
    • M
      ARM: dts: meson8b: odroidc1: mark the SD card detection GPIO active-low · ab2f85e5
      Martin Blumenstingl 提交于
      [ Upstream commit 3fb348e030319f20ebbde082a449d4bf8a96f2fd ]
      
      After commit 89a5e15bcba87d ("gpio/mmc/of: Respect polarity in the device
      tree") SD cards are not detected anymore.
      
      The CD GPIO is "active low" on Odroid-C1. The MMC dt-bindings specify:
      "[...] using the "cd-inverted" property means, that the CD line is active
      high, i.e. it is high, when a card is inserted".
      
      Fix the description of the SD card by marking it as GPIO_ACTIVE_LOW and
      drop the "cd-inverted" property. This makes the definition consistent
      with the existing dt-bindings and fixes the check whether an SD card is
      inserted.
      
      Fixes: e03efbce ("ARM: dts: meson8b-odroidc1: add microSD support")
      Signed-off-by: NMartin Blumenstingl <martin.blumenstingl@googlemail.com>
      Reviewed-by: NLinus Walleij <linus.walleij@linaro.org>
      Tested-by: NAnand Moon <linux.amoon@gmail.com>
      Signed-off-by: NKevin Hilman <khilman@baylibre.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      ab2f85e5
    • C
      arm: dts: meson: Fix IRQ trigger type for macirq · 94f31b4c
      Carlo Caione 提交于
      [ Upstream commit e35e26b26e955c53e61c154ba26b9bb15da6b858 ]
      
      A long running stress test on a custom board shipping an AXG SoCs and a
      Realtek RTL8211F PHY revealed that after a few hours the connection
      speed would drop drastically, from ~1000Mbps to ~3Mbps. At the same time
      the 'macirq' (eth0) IRQ would stop being triggered at all and as
      consequence the GMAC IRQs never ACKed.
      
      After a painful investigation the problem seemed to be due to a wrong
      defined IRQ type for the GMAC IRQ that should be LEVEL_HIGH instead of
      EDGE_RISING.
      
      The change in the macirq IRQ type also solved another long standing
      issue affecting this SoC/PHY where EEE was causing the network
      connection to die after stressing it with iperf3 (even though much
      sooner). It's now possible to remove the 'eee-broken-1000t' quirk as
      well.
      
      Fixes: 9c15795a ("ARM: dts: meson8b-odroidc1: ethernet support")
      Signed-off-by: NCarlo Caione <ccaione@baylibre.com>
      Reviewed-by: NMartin Blumenstingl <martin.blumenstingl@googlemail.com>
      Tested-by: NMartin Blumenstingl <martin.blumenstingl@googlemail.com>
      Signed-off-by: NKevin Hilman <khilman@baylibre.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      94f31b4c
    • J
      ARM: dts: sun8i: h3: Add ethernet0 alias to Beelink X2 · 094ed507
      Jernej Skrabec 提交于
      [ Upstream commit cc4bddade114b696ab27c1a77cfc7040151306da ]
      
      Because "ethernet0" alias is missing, U-Boot doesn't generate board
      specific MAC address. Effect of this is random MAC address every boot
      and thus new IP address is assigned to the board.
      
      Fix this by adding alias.
      
      Fixes: 7389172f ("ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Beelink X2")
      Signed-off-by: NJernej Skrabec <jernej.skrabec@siol.net>
      [Maxime: Removed unneeded comment]
      Signed-off-by: NMaxime Ripard <maxime.ripard@bootlin.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      094ed507
    • T
      ARM: dts: omap4-droid4: Fix typo in cpcap IRQ flags · ec27bcd3
      Tony Lindgren 提交于
      [ Upstream commit ef4a55b9197a8f844ea0663138e902dcce3e2f36 ]
      
      We're now getting the following error:
      
      genirq: Setting trigger mode 1 for irq 230 failed
      (regmap_irq_set_type+0x0/0x15c)
      cpcap-usb-phy cpcap-usb-phy.0: could not get irq dp: -524
      
      Cc: Sebastian Reichel <sre@kernel.org>
      Reported-by: NPavel Machek <pavel@ucw.cz>
      Tested-by: NPavel Machek <pavel@ucw.cz>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NSasha Levin <sashal@kernel.org>
      ec27bcd3