April 2021 - Kernel - mailweb.openeuler.org

[PATCH kernel-4.19 31/57] ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook
by Yang Yingliang 15 Apr '21

15 Apr '21

From: Hui Wang <hui.wang(a)canonical.com> commit e54f30befa7990b897189b44a56c1138c6bfdbb5 upstream. We found the alc_update_headset_mode() is not called on some machines when unplugging the headset, as a result, the mode of the ALC_HEADSET_MODE_UNPLUGGED can't be set, then the current_headset_type is not cleared, if users plug a differnt type of headset next time, the determine_headset_type() will not be called and the audio jack is set to the headset type of previous time. On the Dell machines which connect the dmic to the PCH, if we open the gnome-sound-setting and unplug the headset, this issue will happen. Those machines disable the auto-mute by ucm and has no internal mic in the input source, so the update_headset_mode() will not be called by cap_sync_hook or automute_hook when unplugging, and because the gnome-sound-setting is opened, the codec will not enter the runtime_suspend state, so the update_headset_mode() will not be called by alc_resume when unplugging. In this case the hp_automute_hook is called when unplugging, so add update_headset_mode() calling to this function. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> Link: https://lore.kernel.org/r/20210320091542.6748-2-hui.wang@canonical.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index d94cfae2920f4..f456e5f67824c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5054,6 +5054,7 @@ static void alc_update_headset_jack_cb(struct hda_codec *codec, struct alc_spec *spec = codec->spec; spec->current_headset_type = ALC_HEADSET_TYPE_UNKNOWN; snd_hda_gen_hp_automute(codec, jack); + alc_update_headset_mode(codec); } static void alc_probe_headset_mode(struct hda_codec *codec) -- 2.25.1

1 0

[PATCH kernel-4.19 30/57] ALSA: hda/realtek: fix a determine_headset_type issue for a Dell AIO
by Yang Yingliang 15 Apr '21

15 Apr '21

From: Hui Wang <hui.wang(a)canonical.com> commit febf22565549ea7111e7d45e8f2d64373cc66b11 upstream. We found a recording issue on a Dell AIO, users plug a headset-mic and select headset-mic from UI, but can't record any sound from headset-mic. The root cause is the determine_headset_type() returns a wrong type, e.g. users plug a ctia type headset, but that function returns omtp type. On this machine, the internal mic is not connected to the codec, the "Input Source" is headset mic by default. And when users plug a headset, the determine_headset_type() will be called immediately, the codec on this AIO is alc274, the delay time for this codec in the determine_headset_type() is only 80ms, the delay is too short to correctly determine the headset type, the fail rate is nearly 99% when users plug the headset with the normal speed. Other codecs set several hundred ms delay time, so here I change the delay time to 850ms for alc2x4 series, after this change, the fail rate is zero unless users plug the headset slowly on purpose. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> Link: https://lore.kernel.org/r/20210320091542.6748-1-hui.wang@canonical.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6a419b23adbc8..d94cfae2920f4 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4870,7 +4870,7 @@ static void alc_determine_headset_type(struct hda_codec *codec) case 0x10ec0274: case 0x10ec0294: alc_process_coef_fw(codec, coef0274); - msleep(80); + msleep(850); val = alc_read_coef_idx(codec, 0x46); is_ctia = (val & 0x00f0) == 0x00f0; break; -- 2.25.1

1 0

[PATCH kernel-4.19 28/57] bpf: Remove MTU check in __bpf_skb_max_len
by Yang Yingliang 15 Apr '21

15 Apr '21

From: Jesper Dangaard Brouer <brouer(a)redhat.com> commit 6306c1189e77a513bf02720450bb43bd4ba5d8ae upstream. Multiple BPF-helpers that can manipulate/increase the size of the SKB uses __bpf_skb_max_len() as the max-length. This function limit size against the current net_device MTU (skb->dev->mtu). When a BPF-prog grow the packet size, then it should not be limited to the MTU. The MTU is a transmit limitation, and software receiving this packet should be allowed to increase the size. Further more, current MTU check in __bpf_skb_max_len uses the MTU from ingress/current net_device, which in case of redirects uses the wrong net_device. This patch keeps a sanity max limit of SKB_MAX_ALLOC (16KiB). The real limit is elsewhere in the system. Jesper's testing[1] showed it was not possible to exceed 8KiB when expanding the SKB size via BPF-helper. The limiting factor is the define KMALLOC_MAX_CACHE_SIZE which is 8192 for SLUB-allocator (CONFIG_SLUB) in-case PAGE_SIZE is 4096. This define is in-effect due to this being called from softirq context see code __gfp_pfmemalloc_flags() and __do_kmalloc_node(). Jakub's testing showed that frames above 16KiB can cause NICs to reset (but not crash). Keep this sanity limit at this level as memory layer can differ based on kernel config. [1] https://github.com/xdp-project/bpf-examples/tree/master/MTU-tests Signed-off-by: Jesper Dangaard Brouer <brouer(a)redhat.com> Signed-off-by: Daniel Borkmann <daniel(a)iogearbox.net> Acked-by: John Fastabend <john.fastabend(a)gmail.com> Link: https://lore.kernel.org/bpf/161287788936.790810.2937823995775097177.stgit@f… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- net/core/filter.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index a1077e879aa42..0aeb130aa0708 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2836,18 +2836,14 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 len_diff) return 0; } -static u32 __bpf_skb_max_len(const struct sk_buff *skb) -{ - return skb->dev ? skb->dev->mtu + skb->dev->hard_header_len : - SKB_MAX_ALLOC; -} +#define BPF_SKB_MAX_LEN SKB_MAX_ALLOC static int bpf_skb_adjust_net(struct sk_buff *skb, s32 len_diff) { bool trans_same = skb->transport_header == skb->network_header; u32 len_cur, len_diff_abs = abs(len_diff); u32 len_min = bpf_skb_net_base_len(skb); - u32 len_max = __bpf_skb_max_len(skb); + u32 len_max = BPF_SKB_MAX_LEN; __be16 proto = skb_protocol(skb, true); bool shrink = len_diff < 0; int ret; @@ -2926,7 +2922,7 @@ static int bpf_skb_trim_rcsum(struct sk_buff *skb, unsigned int new_len) static inline int __bpf_skb_change_tail(struct sk_buff *skb, u32 new_len, u64 flags) { - u32 max_len = __bpf_skb_max_len(skb); + u32 max_len = BPF_SKB_MAX_LEN; u32 min_len = __bpf_skb_min_len(skb); int ret; @@ -3002,7 +2998,7 @@ static const struct bpf_func_proto sk_skb_change_tail_proto = { static inline int __bpf_skb_change_head(struct sk_buff *skb, u32 head_room, u64 flags) { - u32 max_len = __bpf_skb_max_len(skb); + u32 max_len = BPF_SKB_MAX_LEN; u32 new_len = skb->len + head_room; int ret; -- 2.25.1

1 0

[PATCH kernel-4.19 11/57] ASoC: cs42l42: Fix channel width support
by Yang Yingliang 15 Apr '21

15 Apr '21

From: Lucas Tanure <tanureal(a)opensource.cirrus.com> [ Upstream commit 2bdc4f5c6838f7c3feb4fe68e4edbeea158ec0a2 ] Remove the hard coded 32 bits width and replace with the correct width calculated by params_width. Signed-off-by: Lucas Tanure <tanureal(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20210305173442.195740-3-tanureal@opensource.cirru… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/cs42l42.c | 47 ++++++++++++++++++-------------------- sound/soc/codecs/cs42l42.h | 1 - 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index c7baa19bf3178..a5bd9cff70856 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -695,24 +695,6 @@ static int cs42l42_pll_config(struct snd_soc_component *component) CS42L42_CLK_OASRC_SEL_MASK, CS42L42_CLK_OASRC_SEL_12 << CS42L42_CLK_OASRC_SEL_SHIFT); - /* channel 1 on low LRCLK, 32 bit */ - snd_soc_component_update_bits(component, - CS42L42_ASP_RX_DAI0_CH1_AP_RES, - CS42L42_ASP_RX_CH_AP_MASK | - CS42L42_ASP_RX_CH_RES_MASK, - (CS42L42_ASP_RX_CH_AP_LOW << - CS42L42_ASP_RX_CH_AP_SHIFT) | - (CS42L42_ASP_RX_CH_RES_32 << - CS42L42_ASP_RX_CH_RES_SHIFT)); - /* Channel 2 on high LRCLK, 32 bit */ - snd_soc_component_update_bits(component, - CS42L42_ASP_RX_DAI0_CH2_AP_RES, - CS42L42_ASP_RX_CH_AP_MASK | - CS42L42_ASP_RX_CH_RES_MASK, - (CS42L42_ASP_RX_CH_AP_HI << - CS42L42_ASP_RX_CH_AP_SHIFT) | - (CS42L42_ASP_RX_CH_RES_32 << - CS42L42_ASP_RX_CH_RES_SHIFT)); if (pll_ratio_table[i].mclk_src_sel == 0) { /* Pass the clock straight through */ snd_soc_component_update_bits(component, @@ -828,14 +810,29 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_component *component = dai->component; struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component); - int retval; + unsigned int width = (params_width(params) / 8) - 1; + unsigned int val = 0; cs42l42->srate = params_rate(params); - cs42l42->swidth = params_width(params); - retval = cs42l42_pll_config(component); + switch(substream->stream) { + case SNDRV_PCM_STREAM_PLAYBACK: + val |= width << CS42L42_ASP_RX_CH_RES_SHIFT; + /* channel 1 on low LRCLK */ + snd_soc_component_update_bits(component, CS42L42_ASP_RX_DAI0_CH1_AP_RES, + CS42L42_ASP_RX_CH_AP_MASK | + CS42L42_ASP_RX_CH_RES_MASK, val); + /* Channel 2 on high LRCLK */ + val |= CS42L42_ASP_RX_CH_AP_HI << CS42L42_ASP_RX_CH_AP_SHIFT; + snd_soc_component_update_bits(component, CS42L42_ASP_RX_DAI0_CH2_AP_RES, + CS42L42_ASP_RX_CH_AP_MASK | + CS42L42_ASP_RX_CH_RES_MASK, val); + break; + default: + break; + } - return retval; + return cs42l42_pll_config(component); } static int cs42l42_set_sysclk(struct snd_soc_dai *dai, @@ -900,9 +897,9 @@ static int cs42l42_digital_mute(struct snd_soc_dai *dai, int mute) return 0; } -#define CS42L42_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S18_3LE | \ - SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE | \ - SNDRV_PCM_FMTBIT_S32_LE) +#define CS42L42_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ + SNDRV_PCM_FMTBIT_S24_LE |\ + SNDRV_PCM_FMTBIT_S32_LE ) static const struct snd_soc_dai_ops cs42l42_ops = { diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h index 9d04ed75e5c8f..23b1a63315cab 100644 --- a/sound/soc/codecs/cs42l42.h +++ b/sound/soc/codecs/cs42l42.h @@ -761,7 +761,6 @@ struct cs42l42_private { struct completion pdn_done; u32 sclk; u32 srate; - u32 swidth; u8 plug_state; u8 hs_type; u8 ts_inv; -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS 0/2] fix CVE-2021-29154
by Cheng Jian 14 Apr '21

14 Apr '21

fix CVE-2021-29154 Piotr Krysiuk (2): bpf, x86: Validate computation of branch displacements for x86-64 bpf, x86: Validate computation of branch displacements for x86-32 arch/x86/net/bpf_jit_comp.c | 11 ++++++++++- arch/x86/net/bpf_jit_comp32.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) -- 2.25.1

1 2

[PATCH openEuler-1.0-LTS] config: Enable CONFIG_USERSWAP
by Cheng Jian 14 Apr '21

14 Apr '21

From: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> hulk inclusion category: feature bugzilla: 47439 CVE: NA ------------------------------------------------- Enable CONFIG_USERSWAP for hulk_defconfg and openeuler_defconfig Signed-off-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Signed-off-by: Cheng Jian <cj.chengjian(a)huawei.com> --- arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index b385033d6192..8a85b0cf7103 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -962,6 +962,7 @@ CONFIG_TRANSPARENT_HUGE_PAGECACHE=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y CONFIG_SHRINK_PAGECACHE=y +CONFIG_USERSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index d9a43adebc16..19b1f9bc31a3 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -955,6 +955,7 @@ CONFIG_TRANSPARENT_HUGE_PAGECACHE=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y CONFIG_SHRINK_PAGECACHE=y +CONFIG_USERSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS] sched/fair: fix kabi broken due to adding idle_h_nr_running in cfs_rq
by Cheng Jian 14 Apr '21

14 Apr '21

hulk inclusion category: bugfix bugzilla: 38260, https://bugzilla.openeuler.org/show_bug.cgi?id=22 CVE: NA --------------------------- Commit 92010bb6d6b8 ("sched/fair: Start tracking SCHED_IDLE tasks count in cfs_rq") introduced kabi broken, just fix it. Fixes: 92010bb6d6b8 ("sched/fair: Start tracking SCHED_IDLE tasks count in cfs_rq") Signed-off-by: Cheng Jian <cj.chengjian(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- kernel/sched/sched.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 2e63aa145030..f8c29f1af2d0 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -490,7 +490,6 @@ struct cfs_rq { unsigned long runnable_weight; unsigned int nr_running; unsigned int h_nr_running; /* SCHED_{NORMAL,BATCH,IDLE} */ - unsigned int idle_h_nr_running; /* SCHED_IDLE */ u64 exec_clock; u64 min_vruntime; @@ -574,7 +573,15 @@ struct cfs_rq { #endif /* CONFIG_CFS_BANDWIDTH */ #endif /* CONFIG_FAIR_GROUP_SCHED */ +#ifndef __GENKSYMS__ + union { + unsigned int idle_h_nr_running; /* SCHED_IDLE */ + unsigned long idle_h_nr_running_padding; /* SCHED_IDLE padding for KABI */ + }; +#else KABI_RESERVE(1) +#endif + KABI_RESERVE(2) }; -- 2.25.1

1 1

[PATCH openEuler-1.0-LTS 000/109] update opeEuler 20.03 @ 20210414 step 1
by Cheng Jian 14 Apr '21

14 Apr '21

update opeEuler 20.03 @ 20210414 step 1 Aleksandr Miloserdov (2): scsi: target: core: Add cmd length set before cmd complete scsi: target: core: Prevent underflow for service actions Anna-Maria Behnsen (1): hrtimer: Update softirq_expires_next correctly after __hrtimer_get_next_event() Arnd Bergmann (1): mm/vmalloc.c: avoid bogus -Wmaybe-uninitialized warning Cheng Jian (5): sched/fair: Optimize select_idle_cpu disable stealing by default sched/fair: introduce SCHED_STEAL config: enable CONFIG_SCHED_STEAL by default sched/fair: fix try_steal compile error Dan Carpenter (1): ocfs2: fix a use after free on error Daniel Borkmann (1): net: Fix gro aggregation for udp encaps with zero csum Daniel Kobras (1): sunrpc: fix refcount leak for rpc auth modules Daniel Wagner (2): block: Use non _rcu version of list functions for tag_set_list block: Suppress uevent for hidden device when removed David Rientjes (1): KVM: SVM: Periodically schedule when unregistering regions on destroy Eric Biggers (1): random: fix the RNDRESEEDCRNG ioctl Eric Dumazet (6): net: qrtr: fix a kernel-infoleak in qrtr_recvmsg() tcp: fix SO_RCVLOWAT related hangs under mem pressure ipv6: icmp6: avoid indirect call for icmpv6_send() tcp: annotate tp->copied_seq lockless reads tcp: annotate tp->write_seq lockless reads tcp: add sanity tests to TCP_QUEUE_SEQ Fangrui Song (1): module: Ignore _GLOBAL_OFFSET_TABLE_ when warning for undefined symbols Florian Westphal (1): netfilter: ctnetlink: fix dump of the expect mask attribute Frank Sorenson (1): NFS: Correct size calculation for create reply length Geert Uytterhoeven (1): PCI: Fix pci_register_io_range() memory leak Guo Fan (2): userswap: add a new flag 'MAP_REPLACE' for mmap() userswap: support userswap via userfaultfd Hillf Danton (1): mm/gup: Let __get_user_pages_locked() return -EINTR for fatal signal Jan Beulich (1): xen-blkback: don't leak persistent grants from xen_blkbk_map() Jan Kara (2): bfq: Avoid false bfq queue merging ext4: add reclaim checks to xattr code Jason A. Donenfeld (6): icmp: introduce helper for nat'd source address in network device context icmp: allow icmpv6_ndo_send to work with CONFIG_IPV6=n gtp: use icmp_ndo_send helper sunvnet: use icmp_ndo_send helper xfrm: interface: use icmp_ndo_send helper net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending Jeffle Xu (3): dm table: fix iterate_devices based device capability checks dm table: fix DAX iterate_devices based device capability checks dm table: fix zoned iterate_devices based device capability checks Jens Axboe (1): swap: fix swapfile read/write offset JeongHyeon Lee (1): dm verity: add root hash pkcs#7 signature verification Kefeng Wang (1): mm: slub: Expanded the scope of corrupted freelist workaround Kuppuswamy Sathyanarayanan (1): mm/vmalloc.c: fix percpu free VM area search criteria Leon Romanovsky (1): ipv6: silence compilation warning for non-IPV6 builds Li Xinhai (1): mm/hugetlb.c: fix unnecessary address expansion of pmd sharing Linus Torvalds (1): Revert "mm, slub: consider rest of partial list if acquire_slab() fails" Marc Zyngier (1): arm64: Add missing ISB after invalidating TLB in __primary_switch Marco Elver (1): net: fix up truesize of cloned skb in skb_prepare_for_shift() Mark Tomlinson (3): Revert "netfilter: x_tables: Switch synchronization to RCU" netfilter: x_tables: Use correct memory barriers. Revert "netfilter: x_tables: Update remaining dereference to RCU" Matthew Wilcox (Oracle) (1): include/linux/sched/mm.h: use rcu_dereference in in_vfork() Miaohe Lin (3): mm/memory.c: fix potential pte_unmap_unlock pte error mm/hugetlb: fix potential double free in hugetlb_register_node() error path mm/rmap: fix potential pte_unmap on an not mapped pte Michael Braun (1): gianfar: fix jumbo packets+napi+rx overrun crash Michal Hocko (1): mm, mempolicy: fix up gup usage in lookup_node Mike Kravetz (2): hugetlb: fix copy_huge_page_from_user contig page struct assumption hugetlb: fix update_and_free_page contig page struct assumption Mikulas Patocka (4): blk-settings: align max_sectors on "logical_block_size" boundary dm: fix deadlock when swapping to encrypted device dm bufio: subtract the number of initial sectors in dm_bufio_get_device_size dm ioctl: fix out of bounds array access when no devices Ming Lei (1): block: respect queue limit of max discard segment Muchun Song (1): printk: fix deadlock when kernel panic NeilBrown (1): x86: fix seq_file iteration for pat/memtype.c Oleg Nesterov (1): kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data() Pan Bian (1): isofs: release buffer head before return Paulo Alcantara (1): cifs: return proper error code in statfs(2) Pavel Tatashin (1): arm64: kdump: update ppos when reading elfcorehdr Peter Xu (4): mm: allow VM_FAULT_RETRY for multiple times mm/gup: allow VM_FAULT_RETRY for multiple times mm/gup: fix fixup_user_fault() on multiple retries mm/mempolicy: Allow lookup_node() to handle fatal signal Peter Zijlstra (2): jump_label/lockdep: Assert we hold the hotplug lock for _cpuslocked() operations locking/static_key: Fix false positive warnings on concurrent dec/inc Rafael J. Wysocki (1): ACPI: property: Fix fwnode string properties matching Rustam Kovhaev (1): KVM: fix memory leak in kvm_io_bus_unregister_dev() Sagi Grimberg (1): nvme-rdma: fix possible hang when failing to set io queues Sakari Ailus (1): media: v4l: ioctl: Fix memory leak in video_usercopy Shaoying Xu (1): arm64 module: set plt* section addresses to 0x0 Shuah Khan (1): usbip: fix stub_dev usbip_sockfd_store() races leading to gpf Steve Sistare (10): sched: Provide sparsemask, a reduced contention bitmap sched/topology: Provide hooks to allocate data shared per LLC sched/topology: Provide cfs_overload_cpus bitmap sched/fair: Dynamically update cfs_overload_cpus sched/fair: Hoist idle_stamp up from idle_balance sched/fair: Generalize the detach_task interface sched/fair: Provide can_migrate_task_llc sched/fair: Steal work from an overloaded CPU when CPU goes idle sched/fair: disable stealing if too many NUMA nodes sched/fair: Provide idle search schedstats Steven Rostedt (VMware) (1): tracepoint: Do not fail unregistering a probe due to memory failure Thomas Gleixner (1): locking/mutex: Fix non debug version of mutex_lock_io_nested() Uladzislau Rezki (Sony) (3): mm/vmalloc.c: keep track of free blocks for vmap allocation mm/vmap: add DEBUG_AUGMENT_PROPAGATE_CHECK macro mm/vmap: add DEBUG_AUGMENT_LOWEST_MATCH_CHECK macro Vasily Averin (1): netfilter: x_tables: gpf inside xt_find_revision() Vincent Whitchurch (1): cifs: Fix preauth hash corruption Viresh Kumar (4): sched/core: Create task_has_idle_policy() helper sched/fair: Start tracking SCHED_IDLE tasks count in cfs_rq sched/fair: Fall back to sched-idle CPU if idle CPU isn't found sched/fair: Make sched-idle CPU selection consistent throughout Yufen Yu (1): block: only update parent bi_status when bio fail Yumei Huang (1): xfs: Fix assert failure in xfs_setattr_size() wanglin (1): RDMA/hns: fix timer, gid_type, scc cfg zhangyi (F) (1): ext4: do not try to set xattr into ea_inode if value is empty arch/alpha/mm/fault.c | 2 +- arch/arc/mm/fault.c | 1 - arch/arm/mm/fault.c | 3 - arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/configs/storage_ci_defconfig | 1 + arch/arm64/configs/syzkaller_defconfig | 1 + arch/arm64/kernel/crash_dump.c | 2 + arch/arm64/kernel/head.S | 1 + arch/arm64/kernel/module.lds | 6 +- arch/arm64/mm/fault.c | 5 - arch/hexagon/mm/vm_fault.c | 1 - arch/ia64/mm/fault.c | 1 - arch/m68k/mm/fault.c | 3 - arch/microblaze/mm/fault.c | 1 - arch/mips/mm/fault.c | 1 - arch/nds32/mm/fault.c | 1 - arch/nios2/mm/fault.c | 3 - arch/openrisc/mm/fault.c | 1 - arch/parisc/mm/fault.c | 4 +- arch/powerpc/mm/fault.c | 6 - arch/riscv/mm/fault.c | 5 - arch/s390/mm/fault.c | 5 +- arch/sh/mm/fault.c | 1 - arch/sparc/mm/fault_32.c | 1 - arch/sparc/mm/fault_64.c | 1 - arch/um/kernel/trap.c | 1 - arch/unicore32/mm/fault.c | 4 +- arch/x86/configs/hulk_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + arch/x86/configs/storage_ci_defconfig | 1 + arch/x86/configs/syzkaller_defconfig | 1 + arch/x86/kvm/svm.c | 1 + arch/x86/mm/fault.c | 2 - arch/x86/mm/pat.c | 3 +- arch/xtensa/mm/fault.c | 1 - block/bfq-iosched.c | 1 + block/bio.c | 2 +- block/blk-merge.c | 11 +- block/blk-mq.c | 4 +- block/blk-settings.c | 12 + block/genhd.c | 4 +- drivers/acpi/property.c | 44 +- drivers/block/xen-blkback/blkback.c | 2 +- drivers/char/random.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 12 +- .../infiniband/hw/hns/hns_roce_hw_sysfs_v2.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 16 +- drivers/md/dm-bufio.c | 4 + drivers/md/dm-core.h | 4 + drivers/md/dm-crypt.c | 1 + drivers/md/dm-ioctl.c | 2 +- drivers/md/dm-table.c | 174 ++- drivers/md/dm-verity-target.c | 2 +- drivers/md/dm.c | 60 + drivers/media/v4l2-core/v4l2-ioctl.c | 19 +- drivers/net/ethernet/freescale/gianfar.c | 15 + drivers/net/ethernet/sun/sunvnet_common.c | 23 +- drivers/net/gtp.c | 5 +- drivers/nvme/host/rdma.c | 7 +- drivers/pci/pci.c | 4 + drivers/target/target_core_pr.c | 15 +- drivers/target/target_core_transport.c | 15 +- drivers/usb/usbip/stub_dev.c | 32 +- fs/cifs/cifsfs.c | 2 +- fs/cifs/transport.c | 7 +- fs/ext4/xattr.c | 6 +- fs/isofs/dir.c | 1 + fs/isofs/namei.c | 1 + fs/nfs/nfs3xdr.c | 3 +- fs/ocfs2/cluster/heartbeat.c | 8 +- fs/proc/task_mmu.c | 3 + fs/select.c | 10 +- fs/userfaultfd.c | 26 +- fs/xfs/xfs_iops.c | 2 +- include/linux/device-mapper.h | 5 + include/linux/icmpv6.h | 48 +- include/linux/ipv6.h | 2 +- include/linux/mm.h | 46 +- include/linux/mutex.h | 2 +- include/linux/netfilter/x_tables.h | 7 +- include/linux/rmap.h | 3 +- include/linux/sched/mm.h | 3 +- include/linux/sched/topology.h | 3 + include/linux/swap.h | 12 +- include/linux/thread_info.h | 13 + include/linux/userfaultfd_k.h | 4 + include/linux/vmalloc.h | 6 +- include/net/icmp.h | 10 + include/net/tcp.h | 11 +- include/target/target_core_backend.h | 1 + include/trace/events/mmflags.h | 7 + include/uapi/asm-generic/mman.h | 4 + include/uapi/linux/userfaultfd.h | 3 + init/Kconfig | 15 + kernel/futex.c | 3 +- kernel/jump_label.c | 26 +- kernel/module.c | 21 +- kernel/printk/printk_safe.c | 16 +- kernel/sched/core.c | 39 +- kernel/sched/debug.c | 2 +- kernel/sched/fair.c | 418 ++++++- kernel/sched/features.h | 8 + kernel/sched/sched.h | 28 +- kernel/sched/sparsemask.h | 210 ++++ kernel/sched/stats.c | 15 + kernel/sched/stats.h | 20 + kernel/sched/topology.c | 141 ++- kernel/time/alarmtimer.c | 2 +- kernel/time/hrtimer.c | 62 +- kernel/time/posix-cpu-timers.c | 2 +- kernel/tracepoint.c | 80 +- lib/logic_pio.c | 3 + mm/Kconfig | 9 + mm/filemap.c | 2 +- mm/gup.c | 47 +- mm/hugetlb.c | 38 +- mm/internal.h | 6 +- mm/memory.c | 35 +- mm/mempolicy.c | 4 +- mm/mmap.c | 207 ++++ mm/page_io.c | 11 +- mm/slub.c | 14 +- mm/swapfile.c | 2 +- mm/userfaultfd.c | 26 + mm/vmalloc.c | 1099 +++++++++++++---- net/core/skbuff.c | 14 +- net/ipv4/icmp.c | 34 + net/ipv4/netfilter/arp_tables.c | 16 +- net/ipv4/netfilter/ip_tables.c | 16 +- net/ipv4/tcp.c | 59 +- net/ipv4/tcp_diag.c | 5 +- net/ipv4/tcp_input.c | 6 +- net/ipv4/tcp_ipv4.c | 23 +- net/ipv4/tcp_minisocks.c | 4 +- net/ipv4/tcp_output.c | 6 +- net/ipv4/udp_offload.c | 2 +- net/ipv6/icmp.c | 19 +- net/ipv6/ip6_icmp.c | 46 +- net/ipv6/netfilter/ip6_tables.c | 16 +- net/ipv6/tcp_ipv6.c | 15 +- net/netfilter/nf_conntrack_netlink.c | 1 + net/netfilter/x_tables.c | 55 +- net/qrtr/qrtr.c | 5 + net/sunrpc/svc.c | 6 +- net/xfrm/xfrm_interface.c | 6 +- virt/kvm/kvm_main.c | 21 +- 148 files changed, 3024 insertions(+), 791 deletions(-) create mode 100644 kernel/sched/sparsemask.h -- 2.25.1

1 66

[PATCH kernel-4.19 1/9] ext4: Fix unreport netlink message to userspace when fs abort
by Yang Yingliang 12 Apr '21

12 Apr '21

From: Ye Bin <yebin10(a)huawei.com> hulk inclusion category: bugfix bugzilla: NA CVE: NA ----------------------------------------------- Fixes: 5aa03d66d1db ("ext4: make ext4_abort() use __ext4_error()") Fixes: 12aed7b79111 ("ext4: report error to userspace by netlink") Signed-off-by: Ye Bin <yebin10(a)huawei.com> Reviewed-by: zhangyi (F) <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/ext4/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 3b2f7f7ea8cba..655ba77db225e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -89,7 +89,6 @@ static void ext4_unregister_li_request(struct super_block *sb); static void ext4_clear_request_list(void); static struct inode *ext4_get_journal_inode(struct super_block *sb, unsigned int journal_inum); -static void ext4_netlink_send_info(struct super_block *sb, int ext4_errno); static struct sock *ext4nl; /* @@ -590,7 +589,7 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error, smp_wmb(); sb->s_flags |= SB_RDONLY; out: - ext4_netlink_send_info(sb, 1); + ext4_netlink_send_info(sb, force_ro ? 2 : 1); } static void flush_stashed_error_work(struct work_struct *work) -- 2.25.1

1 8

[PATCH kernel-4.19 01/74] net: fec: ptp: avoid register access when ipg clock is disabled
by Yang Yingliang 12 Apr '21

12 Apr '21

From: Heiko Thiery <heiko.thiery(a)gmail.com> [ Upstream commit 6a4d7234ae9a3bb31181f348ade9bbdb55aeb5c5 ] When accessing the timecounter register on an i.MX8MQ the kernel hangs. This is only the case when the interface is down. This can be reproduced by reading with 'phc_ctrl eth0 get'. Like described in the change in 91c0d987a9788dcc5fe26baafd73bf9242b68900 the igp clock is disabled when the interface is down and leads to a system hang. So we check if the ptp clock status before reading the timecounter register. Signed-off-by: Heiko Thiery <heiko.thiery(a)gmail.com> Acked-by: Richard Cochran <richardcochran(a)gmail.com> Link: https://lore.kernel.org/r/20210225211514.9115-1-heiko.thiery@gmail.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/net/ethernet/freescale/fec_ptp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 7e892b1cbd3de..09a762eb4f09e 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -382,9 +382,16 @@ static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) u64 ns; unsigned long flags; + mutex_lock(&adapter->ptp_clk_mutex); + /* Check the ptp clock */ + if (!adapter->ptp_clk_on) { + mutex_unlock(&adapter->ptp_clk_mutex); + return -EINVAL; + } spin_lock_irqsave(&adapter->tmreg_lock, flags); ns = timecounter_read(&adapter->tc); spin_unlock_irqrestore(&adapter->tmreg_lock, flags); + mutex_unlock(&adapter->ptp_clk_mutex); *ts = ns_to_timespec64(ns); -- 2.25.1

1 73