November 2022 - Kernel - mailweb.openeuler.org

[PATCH openEuler-5.10 00/52] Backport 5.10.135 LTS
by Zheng Zengkai 10 Nov '22

10 Nov '22

Backport 5.10.135 LTS patches from upstream. git cherry-pick v5.10.134..v5.10.135~1 -s Already merged(-10): 8008e797ec6f ipv6/addrconf: fix a null-ptr-deref bug for ip6_ptr 440dccd80f62 netfilter: nf_queue: do not allow packet truncation below transport header offset 41fbfdaba94a xfs: refactor xfs_file_fsync 6d3605f84edd xfs: xfs_log_force_lsn isn't passed a LSN eccacbcbfd70 xfs: fix log intent recovery ENOSPC shutdowns when inactivating inodes d8f5bb0a09b7 xfs: force the log offline when log intent item recovery fails c85cbb0b21a1 xfs: hold buffer across unpin and potential shutdown processing c1268acaa0dd xfs: remove dead stale buf unpin handling code e5f9d4e0f895 xfs: logging the on disk inode LSN can make it go backwards 14b494b7aaf2 xfs: Enforce attr3 buffer recovery order Context Conflict and Defered(-3): 6aad811b37ee bpf: Consolidate shared test timing code 6d3fad2b44eb bpf: Add PROG_TEST_RUN support for sk_lookup programs 4bfc9dc60873 selftests: bpf: Don't run sk_lookup in verifier tests Total patches: 65 - 13 = 52 Alejandro Lucero (1): sfc: disable softirqs for ptp TX Alistair Popple (1): nouveau/svm: Fix to migrate all requested pages ChenXiaoSong (1): ntfs: fix use-after-free in ntfs_ucsncmp() Darrick J. Wong (1): xfs: prevent UAF in xfs_log_item_in_current_chkpt David Howells (1): watch_queue: Fix missing rcu annotation Duoming Zhou (1): sctp: fix sleep in atomic context bug in timer handlers Eiichi Tsukata (1): docs/kernel-parameters: Update descriptions for "mitigations=" param with retbleed Florian Fainelli (1): ARM: 9216/1: Fix MAX_DMA_ADDRESS overflow Greg Kroah-Hartman (1): ARM: crypto: comment out gcc warning that breaks clang builds Harald Freudenberger (1): s390/archrandom: prevent CPACF trng invocations in interrupt context Jaewon Kim (1): page_alloc: fix invalid watermark check on a negative value Jason Wang (1): virtio-net: fix the race between refill work and close Jianglei Nie (1): net: macsec: fix potential resource leak in macsec_add_rxsa() and macsec_add_txsa() Junxiao Bi (1): Revert "ocfs2: mount shared volume without ha stack" Kuniyuki Iwashima (19): tcp: Fix data-races around sysctl_tcp_dsack. tcp: Fix a data-race around sysctl_tcp_app_win. tcp: Fix a data-race around sysctl_tcp_adv_win_scale. tcp: Fix a data-race around sysctl_tcp_frto. tcp: Fix a data-race around sysctl_tcp_nometrics_save. tcp: Fix data-races around sysctl_tcp_no_ssthresh_metrics_save. tcp: Fix data-races around sysctl_tcp_moderate_rcvbuf. tcp: Fix a data-race around sysctl_tcp_limit_output_bytes. tcp: Fix a data-race around sysctl_tcp_challenge_ack_limit. net: ping6: Fix memleak in ipv6_renew_options(). igmp: Fix data-races around sysctl_igmp_qrv. tcp: Fix a data-race around sysctl_tcp_min_tso_segs. tcp: Fix a data-race around sysctl_tcp_min_rtt_wlen. tcp: Fix a data-race around sysctl_tcp_autocorking. tcp: Fix a data-race around sysctl_tcp_invalid_ratelimit. tcp: Fix a data-race around sysctl_tcp_comp_sack_delay_ns. tcp: Fix a data-race around sysctl_tcp_comp_sack_slack_ns. tcp: Fix a data-race around sysctl_tcp_comp_sack_nr. tcp: Fix data-races around sysctl_tcp_reflect_tos. Leo Yan (1): perf symbol: Correct address for bss symbols Liang He (2): scsi: ufs: host: Hold reference returned by of_parse_phandle() net: sungem_phy: Add of_node_put() for reference returned by of_get_parent() Linus Torvalds (1): watch_queue: Fix missing locking in add_watch_to_object() Luiz Augusto von Dentz (1): Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put Maciej Fijalkowski (2): ice: check (DD | EOF) bits on Rx descriptor rather than (EOP | RS) ice: do not setup vlan for loopback VSI Maxim Mikityanskiy (1): net/tls: Remove the context from the list in tls_device_down Michal Maloszewski (1): i40e: Fix interface init with MSI interrupts (no MSI-X) Sabrina Dubroca (4): macsec: fix NULL deref in macsec_add_rxsa macsec: fix error message in macsec_add_rxsa and _txsa macsec: limit replay window size with XPN macsec: always read MACSEC_SA_ATTR_PN as a u64 Thadeu Lima de Souza Cascardo (1): x86/bugs: Do not enable IBPB at firmware entry when IBPB is not available Toshi Kani (1): EDAC/ghes: Set the DIMM label unconditionally Wei Mingzhi (1): mt7601u: add USB device ID for some versions of XiaoDu WiFi Dongle. Wei Wang (1): Revert "tcp: change pingpong threshold to 3" Xin Long (2): Documentation: fix sctp_wmem in ip-sysctl.rst sctp: leave the err path free in sctp_stream_init to sctp_stream_free .../admin-guide/kernel-parameters.txt | 2 + Documentation/networking/ip-sysctl.rst | 9 ++- arch/arm/include/asm/dma.h | 2 +- arch/arm/lib/xor-neon.c | 3 +- arch/s390/include/asm/archrandom.h | 9 ++- arch/x86/kernel/cpu/bugs.c | 1 + drivers/edac/ghes_edac.c | 11 +++- drivers/gpu/drm/nouveau/nouveau_dmem.c | 6 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++ drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +- drivers/net/ethernet/intel/ice/ice_main.c | 8 ++- drivers/net/ethernet/sfc/ptp.c | 22 +++++++ drivers/net/macsec.c | 33 ++++++---- drivers/net/sungem_phy.c | 1 + drivers/net/virtio_net.c | 37 ++++++++++- drivers/net/wireless/mediatek/mt7601u/usb.c | 1 + drivers/scsi/ufs/ufshcd-pltfrm.c | 15 ++++- fs/ntfs/attrib.c | 8 ++- fs/ocfs2/ocfs2.h | 4 +- fs/ocfs2/slot_map.c | 46 ++++++-------- fs/ocfs2/super.c | 21 ------- fs/xfs/xfs_log_cil.c | 6 +- include/net/bluetooth/l2cap.h | 1 + include/net/inet_connection_sock.h | 10 +-- include/net/tcp.h | 2 +- kernel/watch_queue.c | 58 +++++++++++------- mm/page_alloc.c | 12 ++-- net/bluetooth/l2cap_core.c | 61 +++++++++++++++---- net/ipv4/igmp.c | 24 ++++---- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 24 ++++---- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/tcp_metrics.c | 10 +-- net/ipv4/tcp_output.c | 19 +++--- net/ipv6/ping.c | 6 ++ net/ipv6/tcp_ipv6.c | 4 +- net/mptcp/protocol.c | 2 +- net/sctp/associola.c | 5 +- net/sctp/stream.c | 19 +----- net/sctp/stream_sched.c | 2 +- net/tls/tls_device.c | 7 ++- tools/perf/util/symbol-elf.c | 45 ++++++++++++-- 42 files changed, 364 insertions(+), 205 deletions(-) -- 2.20.1

1 52

[PATCH openEuler-5.10 00/89] Backport 5.10.134 LTS
by Zheng Zengkai 10 Nov '22

10 Nov '22

Backport 5.10.134 LTS patches from upstream. git cherry-pick v5.10.133..v5.10.134~1 -s Already merged(-12): ab5050fd7430 lockdown: Fix kexec lockdown bypass with ima policy 2ee0cab11f66 io_uring: Use original task for req identity in io_identity_cow() ed6964ff4714 net: make free_netdev() more lenient with unregistering devices 2e11856ec379 net: make sure devices go through netdev_wait_all_refs 47b696dd6544 xfrm: xfrm_policy: fix a possible double xfrm_pols_put() in xfrm_bundle_lookup() 0adf21eec590 watchqueue: make sure to serialize 'wqueue->defunct' properly 6a8184825286 tty: drivers/tty/, stop using tty_schedule_flip() 4d374625cca2 tty: the rest, stop using tty_schedule_flip() c84986d09745 tty: drop tty_schedule_flip() a4bb7ef2d6f6 tty: extract tty_flip_buffer_commit() from tty_flip_buffer_push() 08afa87f58d8 tty: use new tty_insert_flip_string_and_push_buffer() in pty_write() bb1990a3005e watch-queue: remove spurious double semicolon Context Conflict: 2686f62fa78c docs: net: explain struct net_device lifetime bf2f3d1970c0 net: move rollback_registered_many() b7b9e5cc8b24 x86/amd: Use IBPB for firmware calls Total patches: = 101 - 12 = 89 Alex Deucher (1): drm/amdgpu/display: add quirk handling for stutter mode Alexander Aring (1): dlm: fix pending remove if msg allocation fails Alexey Kardashevskiy (1): KVM: Don't null dereference ops->destroy Ben Dooks (1): riscv: add as-options for modules with assembly compontents Biao Huang (1): net: stmmac: fix unbalanced ptp clock issue in suspend/resume flow Dawid Lukwinski (1): i40e: Fix erroneous adapter reinitialization during recovery process Demi Marie Obenour (1): xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE Eric Dumazet (1): bpf: Make sure mac_header was set before using it Fabien Dessenne (1): pinctrl: stm32: fix optional IRQ support to gpios Greg Kroah-Hartman (1): Revert "m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch" Haibo Chen (3): gpio: pca953x: only use single read/write for No AI mode gpio: pca953x: use the correct range when do regmap sync gpio: pca953x: use the correct register address when regcache sync during init Hristo Venev (1): be2net: Fix buffer overflow in be_get_module_eeprom Ido Schimmel (1): mlxsw: spectrum_router: Fix IPv4 nexthop gateway indication Jakub Kicinski (5): docs: net: explain struct net_device lifetime net: move net_set_todo inside rollback_registered() net: inline rollback_registered() net: move rollback_registered_many() net: inline rollback_registered_many() Jeffrey Hugo (4): PCI: hv: Fix multi-MSI to allow more than one MSI vector PCI: hv: Fix hv_arch_irq_unmask() for multi-MSI PCI: hv: Reuse existing IRTE allocation in compose_msi_msg() PCI: hv: Fix interrupt mapping for multi-MSI Jose Alonso (1): net: usb: ax88179_178a needs FLAG_SEND_ZLP Junxiao Chang (1): net: stmmac: fix dma queue left shift overflow issue Juri Lelli (1): sched/deadline: Fix BUG_ON condition for deboosted tasks Kees Cook (1): x86/alternative: Report missing return thunk details Kuniyuki Iwashima (37): ip: Fix data-races around sysctl_ip_no_pmtu_disc. ip: Fix data-races around sysctl_ip_fwd_use_pmtu. ip: Fix data-races around sysctl_ip_fwd_update_priority. ip: Fix data-races around sysctl_ip_nonlocal_bind. ip: Fix a data-race around sysctl_ip_autobind_reuse. ip: Fix a data-race around sysctl_fwmark_reflect. tcp/dccp: Fix a data-race around sysctl_tcp_fwmark_accept. tcp: Fix data-races around sysctl_tcp_mtu_probing. tcp: Fix data-races around sysctl_tcp_base_mss. tcp: Fix data-races around sysctl_tcp_min_snd_mss. tcp: Fix a data-race around sysctl_tcp_mtu_probe_floor. tcp: Fix a data-race around sysctl_tcp_probe_threshold. tcp: Fix a data-race around sysctl_tcp_probe_interval. igmp: Fix data-races around sysctl_igmp_llm_reports. igmp: Fix a data-race around sysctl_igmp_max_memberships. igmp: Fix data-races around sysctl_igmp_max_msf. tcp: Fix data-races around keepalive sysctl knobs. tcp: Fix data-races around sysctl_tcp_syncookies. tcp: Fix data-races around sysctl_tcp_reordering. tcp: Fix data-races around some timeout sysctl knobs. tcp: Fix a data-race around sysctl_tcp_notsent_lowat. tcp: Fix a data-race around sysctl_tcp_tw_reuse. tcp: Fix data-races around sysctl_max_syn_backlog. tcp: Fix data-races around sysctl_tcp_fastopen. tcp: Fix data-races around sysctl_tcp_fastopen_blackhole_timeout. ipv4: Fix a data-race around sysctl_fib_multipath_use_neigh. ip: Fix data-races around sysctl_ip_prot_sock. udp: Fix a data-race around sysctl_udp_l3mdev_accept. tcp: Fix data-races around sysctl knobs related to SYN option. tcp: Fix a data-race around sysctl_tcp_early_retrans. tcp: Fix data-races around sysctl_tcp_recovery. tcp: Fix a data-race around sysctl_tcp_thin_linear_timeouts. tcp: Fix data-races around sysctl_tcp_slow_start_after_idle. tcp: Fix a data-race around sysctl_tcp_retrans_collapse. tcp: Fix a data-race around sysctl_tcp_stdurg. tcp: Fix a data-race around sysctl_tcp_rfc1337. tcp: Fix data-races around sysctl_tcp_max_reordering. Lennert Buytenhek (1): igc: Reinstate IGC_REMOVED logic and implement it properly Liang He (1): drm/imx/dcss: Add missing of_node_put() in fail path Luiz Augusto von Dentz (7): Bluetooth: Add bt_skb_sendmsg helper Bluetooth: Add bt_skb_sendmmsg helper Bluetooth: SCO: Replace use of memcpy_from_msg with bt_skb_sendmsg Bluetooth: RFCOMM: Replace use of memcpy_from_msg with bt_skb_sendmmsg Bluetooth: Fix passing NULL to PTR_ERR Bluetooth: SCO: Fix sco_send_frame returning skb->len Bluetooth: Fix bt_skb_sendmmsg not allocating partial chunks Marc Kleine-Budde (1): spi: bcm2835: bcm2835_spi_handle_err(): fix NULL pointer deref for non DMA transfers Miaoqian Lin (1): power/reset: arm-versatile: Fix refcount leak in versatile_reboot_probe Pali Rohár (1): serial: mvebu-uart: correctly report configured baudrate value Pawan Gupta (1): x86/bugs: Warn when "ibrs" mitigation is selected on Enhanced IBRS parts Peter Zijlstra (3): perf/core: Fix data race between perf_event_set_output() and perf_mmap_close() bitfield.h: Fix "type of reg too small for mask" test x86/amd: Use IBPB for firmware calls Piotr Skajewski (1): ixgbe: Add locking to prevent panic when setting sriov_numvfs to zero Przemyslaw Patynowski (1): iavf: Fix handling of dummy receive descriptors Robert Hancock (1): i2c: cadence: Change large transfer count reset logic to be unconditional Takashi Iwai (1): ALSA: memalloc: Align buffer allocations in page size Tariq Toukan (1): net/tls: Fix race in TLS device down flow Wang Cheng (1): mm/mempolicy: fix uninit-value in mpol_rebind_policy() Wang ShaoBo (1): drm/imx/dcss: fix unused but set variable warnings William Dean (1): pinctrl: ralink: Check for null return of devm_kcalloc Documentation/networking/netdevices.rst | 171 +++++++++++++- arch/m68k/Kconfig.bus | 2 +- arch/riscv/Makefile | 1 + arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/mshyperv.h | 7 - arch/x86/include/asm/nospec-branch.h | 2 + arch/x86/kernel/alternative.c | 4 +- arch/x86/kernel/cpu/bugs.c | 14 +- drivers/gpio/gpio-pca953x.c | 22 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 33 +++ drivers/gpu/drm/imx/dcss/dcss-dev.c | 3 + drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 - drivers/i2c/busses/i2c-cadence.c | 30 +-- .../chelsio/inline_crypto/chtls/chtls_cm.c | 6 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 10 +- drivers/net/ethernet/emulex/benet/be_cmds.h | 2 +- .../net/ethernet/emulex/benet/be_ethtool.c | 31 ++- drivers/net/ethernet/intel/i40e/i40e_main.c | 13 +- drivers/net/ethernet/intel/iavf/iavf_txrx.c | 5 +- drivers/net/ethernet/intel/igc/igc_main.c | 3 + drivers/net/ethernet/intel/igc/igc_regs.h | 5 +- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 + .../net/ethernet/intel/ixgbe/ixgbe_sriov.c | 6 + .../ethernet/mellanox/mlxsw/spectrum_router.c | 5 +- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 3 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 17 +- .../ethernet/stmicro/stmmac/stmmac_platform.c | 8 +- drivers/net/usb/ax88179_178a.c | 20 +- drivers/pci/controller/pci-hyperv.c | 99 ++++++-- drivers/pinctrl/stm32/pinctrl-stm32.c | 18 +- drivers/power/reset/arm-versatile-reboot.c | 1 + drivers/spi/spi-bcm2835.c | 12 +- .../staging/mt7621-pinctrl/pinctrl-rt2880.c | 2 + drivers/tty/serial/mvebu-uart.c | 25 ++- drivers/xen/gntdev.c | 3 +- fs/dlm/lock.c | 3 +- include/linux/bitfield.h | 19 +- include/net/bluetooth/bluetooth.h | 65 ++++++ include/net/inet_sock.h | 5 +- include/net/ip.h | 6 +- include/net/tcp.h | 18 +- include/net/udp.h | 2 +- kernel/bpf/core.c | 8 +- kernel/events/core.c | 45 ++-- kernel/sched/deadline.c | 5 +- mm/mempolicy.c | 2 +- net/bluetooth/rfcomm/core.c | 50 ++++- net/bluetooth/rfcomm/sock.c | 46 +--- net/bluetooth/sco.c | 30 +-- net/core/dev.c | 212 ++++++++---------- net/core/filter.c | 4 +- net/core/secure_seq.c | 4 +- net/ipv4/af_inet.c | 4 +- net/ipv4/fib_semantics.c | 2 +- net/ipv4/icmp.c | 2 +- net/ipv4/igmp.c | 25 ++- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_sockglue.c | 6 +- net/ipv4/route.c | 2 +- net/ipv4/syncookies.c | 9 +- net/ipv4/sysctl_net_ipv4.c | 6 +- net/ipv4/tcp.c | 10 +- net/ipv4/tcp_fastopen.c | 9 +- net/ipv4/tcp_input.c | 51 +++-- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_metrics.c | 3 +- net/ipv4/tcp_minisocks.c | 2 +- net/ipv4/tcp_output.c | 29 +-- net/ipv4/tcp_recovery.c | 6 +- net/ipv4/tcp_timer.c | 20 +- net/ipv6/af_inet6.c | 2 +- net/ipv6/syncookies.c | 3 +- net/sctp/protocol.c | 2 +- net/smc/smc_llc.c | 2 +- net/tls/tls_device.c | 8 +- net/xfrm/xfrm_state.c | 2 +- sound/core/memalloc.c | 1 + virt/kvm/kvm_main.c | 5 +- 80 files changed, 877 insertions(+), 454 deletions(-) -- 2.20.1

1 89

[PATCH openEuler-5.10-LTS 01/12] scsi: libsas: Resume SAS host for phy reset or enable via sysfs
by Zheng Zengkai 10 Nov '22

10 Nov '22

From: Xiang Chen <chenxiang66(a)hisilicon.com> mainline inclusion from mainline-v5.19-rc7 commit 1e82e4627a795 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5M9GC CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… ---------------------------------------------------------------------- Currently if a phy reset or enable phy is issued via sysfs when controller is suspended, those operations will be ignored as SAS_HA_REGISTERED is cleared. If RPM is enabled then we may aggressively suspend automatically. In this case it may be difficult to enable or reset a phy via sysfs, so resume the host in these scenarios. Link: https://lore.kernel.org/r/1657823002-139010-6-git-send-email-john.garry@hua… Signed-off-by: Xiang Chen <chenxiang66(a)hisilicon.com> Signed-off-by: John Garry <john.garry(a)huawei.com> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> Signed-off-by: xiabing <xiabing12(a)h-partners.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/scsi/libsas/sas_init.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index f1989a98f511..58ffcecf1a2f 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c @@ -528,6 +528,7 @@ static int queue_phy_reset(struct sas_phy *phy, int hard_reset) if (!d) return -ENOMEM; + pm_runtime_get_sync(ha->dev); /* libsas workqueue coordinates ata-eh reset with discovery */ mutex_lock(&d->event_lock); d->reset_result = 0; @@ -541,6 +542,7 @@ static int queue_phy_reset(struct sas_phy *phy, int hard_reset) if (rc == 0) rc = d->reset_result; mutex_unlock(&d->event_lock); + pm_runtime_put_sync(ha->dev); return rc; } @@ -555,6 +557,7 @@ static int queue_phy_enable(struct sas_phy *phy, int enable) if (!d) return -ENOMEM; + pm_runtime_get_sync(ha->dev); /* libsas workqueue coordinates ata-eh reset with discovery */ mutex_lock(&d->event_lock); d->enable_result = 0; @@ -568,6 +571,7 @@ static int queue_phy_enable(struct sas_phy *phy, int enable) if (rc == 0) rc = d->enable_result; mutex_unlock(&d->event_lock); + pm_runtime_put_sync(ha->dev); return rc; } -- 2.20.1

3 13

在openeuler上我如何使用firewalld/nftables/iptables构建本机端口镜像
by wangpengyuan＠bjca.org.cn 10 Nov '22

10 Nov '22

iptables 版本为v1.8.7 不支持 --destination-to 和 --port-to 我如何解决这个问题？ wangpengyuan(a)bjca.org.cn

1 0

[PATCH OLK-5.10,v1,0/9] ROH: Support ROH basic functions and adapt ROH mode for RDMA/hns driver
by Ke Chen 09 Nov '22

09 Nov '22

[Description] The ROH module driver consists of the ROH Core and ROH DRV modules, which work with hardware to implement communication between nodes through HCCS packets. ROH Core is a protocol stack of the ROH architecture. It provides related services for upper layers by invoking operation interfaces provided by the ROH DRV. The ROH DRV implements the lower layer functions of the ROH featureand provides a series of interfaces for operating hardware for the ROH Core. This patch supports basic ROH functions, such as: sysfs file node query, abnormal interrupt handling, reset capability and dfx information query. RDMA/hns supports ROH mode, mainly adapted to the device id of ROH, and the different capabilities and features of RDMA/hns in ROH mode. [Testing] kernel options: CONFIG_ROH=m CONFIG_ROH_HNS=m Test passed with below step: 1. Using a hardware environment that supports ROH, insmod net/hns, RDMA/hns and ROH related drivers: insmod hnae3.ko insmod hclge.ko insmod hns3.ko insmod roh_core.ko insmod hns-roh-v1.ko insmod hns-roce-hw-v2.ko 2. Check whether ROH generates the corresponding sysfs node: ls /sys/class/roh/hns3_0/ 3. Check whether the abnormal interrupt information of roh is correct. The down or up of the network device link corresponding to roh will cause the roh abnormal interrupt count to increase. cat /proc/interrupts | grep roh 4. Configure the network port ip and check whether the ip/mac has the correct mapping relationship. 5. Query eid to check whether it complies with ip conversion rules: cat /sys/class/roh/hns3_0/node_eid 6. Use ping to check Ethernet communication is normal. 7. Use perftest to check RDMA communication is normal. 8. Use the "ethtool --reset eth1 all" command to trigger a reset. Ke Chen (9): roh/core: Add roh device sysfs node roh/hns3: Add support for roh abnormal interruption roh/core: Add support for inetaddr notifier roh/hns3: Add support for roh reset roh/hns3: Add support for roh dfx(debugfs) RDMA/hns: Add new device ID RDMA/hns: Add ROH basic configuration and check RDMA/hns: Support RDMA_CM in ROH mode RDMA/hns: Pass mac type to user driver for ROH mode drivers/infiniband/hw/hns/hns_roce_device.h | 1 + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 35 ++ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 1 + drivers/infiniband/hw/hns/hns_roce_main.c | 12 +- drivers/roh/core/Makefile | 2 +- drivers/roh/core/core.c | 205 ++++++++++ drivers/roh/core/core.h | 24 ++ drivers/roh/core/core_priv.h | 9 + drivers/roh/core/sysfs.c | 270 +++++++++++++ drivers/roh/hw/hns3/Makefile | 2 + drivers/roh/hw/hns3/hns3_cmdq.c | 135 +++++++ drivers/roh/hw/hns3/hns3_cmdq.h | 46 +++ drivers/roh/hw/hns3/hns3_common.h | 32 ++ drivers/roh/hw/hns3/hns3_device.h | 40 ++ drivers/roh/hw/hns3/hns3_intr.c | 136 +++++++ drivers/roh/hw/hns3/hns3_intr.h | 13 + drivers/roh/hw/hns3/hns3_main.c | 406 +++++++++++++++++++- drivers/roh/hw/hns3/hns3_verbs.c | 270 +++++++++++++ drivers/roh/hw/hns3/hns3_verbs.h | 16 + include/uapi/rdma/hns-abi.h | 2 + 20 files changed, 1651 insertions(+), 6 deletions(-) create mode 100644 drivers/roh/core/sysfs.c create mode 100644 drivers/roh/hw/hns3/hns3_device.h create mode 100644 drivers/roh/hw/hns3/hns3_intr.c create mode 100644 drivers/roh/hw/hns3/hns3_intr.h create mode 100644 drivers/roh/hw/hns3/hns3_verbs.c create mode 100644 drivers/roh/hw/hns3/hns3_verbs.h -- 2.30.0

1 9

[PATCH openEuler-5.10 1/3] Fix the header file location error and adjust the function and structure version.
by Zheng Zengkai 08 Nov '22

08 Nov '22

From: Wangming Shao <shaowangming(a)h-partners.com> driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5WGEF ------------------------------------------------------------------- Fixed the header file location error. Rectify the missing member and function name errors in the structure. Signed-off-by: Wangming Shao <shaowangming(a)h-partners.com> Reviewed-by: Yicong Yang <yangyicong(a)huawei.com> Reviewed-by: Yang Jihong <yangjihong1(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- tools/perf/arch/arm/util/auxtrace.c | 6 +++--- tools/perf/arch/arm/util/pmu.c | 2 +- tools/perf/arch/arm64/util/hisi-ptt.c | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/perf/arch/arm/util/auxtrace.c b/tools/perf/arch/arm/util/auxtrace.c index e282fcea5e05..a4e4bb1a5711 100644 --- a/tools/perf/arch/arm/util/auxtrace.c +++ b/tools/perf/arch/arm/util/auxtrace.c @@ -10,10 +10,10 @@ #include <linux/zalloc.h> #include <api/fs/fs.h> -#include "../../util/auxtrace.h" -#include "../../util/debug.h" +#include "../../../util/auxtrace.h" +#include "../../../util/debug.h" #include "../../util/evlist.h" -#include "../../util/pmu.h" +#include "../../../util/pmu.h" #include "cs-etm.h" #include "arm-spe.h" #include "hisi-ptt.h" diff --git a/tools/perf/arch/arm/util/pmu.c b/tools/perf/arch/arm/util/pmu.c index 2223083c6825..887c8addc491 100644 --- a/tools/perf/arch/arm/util/pmu.c +++ b/tools/perf/arch/arm/util/pmu.c @@ -11,7 +11,7 @@ #include "arm-spe.h" #include "hisi-ptt.h" -#include "../../util/pmu.h" +#include "../../../util/pmu.h" struct perf_event_attr *perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused) diff --git a/tools/perf/arch/arm64/util/hisi-ptt.c b/tools/perf/arch/arm64/util/hisi-ptt.c index ba97c8a562a0..110b2edf3e6b 100644 --- a/tools/perf/arch/arm64/util/hisi-ptt.c +++ b/tools/perf/arch/arm64/util/hisi-ptt.c @@ -113,7 +113,6 @@ static int hisi_ptt_recording_options(struct auxtrace_record *itr, } evsel->core.attr.freq = 0; evsel->core.attr.sample_period = 1; - evsel->needs_auxtrace_mmap = true; hisi_ptt_evsel = evsel; opts->full_auxtrace = true; } @@ -126,16 +125,16 @@ static int hisi_ptt_recording_options(struct auxtrace_record *itr, * To obtain the auxtrace buffer file descriptor, the auxtrace event * must come first. */ - evlist__to_front(evlist, hisi_ptt_evsel); + perf_evlist__to_front(evlist, hisi_ptt_evsel); evsel__set_sample_bit(hisi_ptt_evsel, TIME); /* Add dummy event to keep tracking */ - err = parse_event(evlist, "dummy:u"); + err = parse_events(evlist, "dummy:u", NULL); if (err) return err; tracking_evsel = evlist__last(evlist); - evlist__set_tracking_event(evlist, tracking_evsel); + perf_evlist__set_tracking_event(evlist, tracking_evsel); tracking_evsel->core.attr.freq = 0; tracking_evsel->core.attr.sample_period = 1; -- 2.20.1

1 2

[PATCH openEuler-1.0-LTS 01/26] of: fdt: fix off-by-one error in unflatten_dt_nodes()
by Yongqiang Liu 08 Nov '22

08 Nov '22

From: Sergey Shtylyov <s.shtylyov(a)omp.ru> stable inclusion from stable-v4.19.260 commit 2566706ac6393386a4e7c4ce23fe17f4c98d9aa0 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5ZXGL CVE: NA -------------------------------- [ Upstream commit 2f945a792f67815abca26fa8a5e863ccf3fa1181 ] Commit 78c44d910d3e ("drivers/of: Fix depth when unflattening devicetree") forgot to fix up the depth check in the loop body in unflatten_dt_nodes() which makes it possible to overflow the nps[] buffer... Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. Fixes: 78c44d910d3e ("drivers/of: Fix depth when unflattening devicetree") Signed-off-by: Sergey Shtylyov <s.shtylyov(a)omp.ru> Signed-off-by: Rob Herring <robh(a)kernel.org> Link: https://lore.kernel.org/r/7c354554-006f-6b31-c195-cdfe4caee392@omp.ru Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- drivers/of/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 800ad252cf9c..50b67e65159b 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -391,7 +391,7 @@ static int unflatten_dt_nodes(const void *blob, for (offset = 0; offset >= 0 && depth >= initial_depth; offset = fdt_next_node(blob, offset, &depth)) { - if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH)) + if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH - 1)) continue; if (!IS_ENABLED(CONFIG_OF_KOBJ) && -- 2.25.1

1 25

[PATCH openEuler-5.10-LTS] libbpf: Fix null-pointer dereference in find_prog_by_sec_insn()
by Zheng Zengkai 07 Nov '22

07 Nov '22

From: Shung-Hsi Yu <shung-hsi.yu(a)suse.com> maillist inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5WLXN CVE: CVE-2022-3606 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/… -------------------------------- When there are no program sections, obj->programs is left unallocated, and find_prog_by_sec_insn()'s search lands on &obj->programs[0] == NULL, and will cause null-pointer dereference in the following access to prog->sec_idx. Guard the search with obj->nr_programs similar to what's being done in __bpf_program__iter() to prevent null-pointer access from happening. Fixes: db2b8b06423c ("libbpf: Support CO-RE relocations for multi-prog sections") Signed-off-by: Shung-Hsi Yu <shung-hsi.yu(a)suse.com> Signed-off-by: Andrii Nakryiko <andrii(a)kernel.org> Link: https://lore.kernel.org/bpf/20221012022353.7350-4-shung-hsi.yu@suse.com Signed-off-by: Pu Lehui <pulehui(a)huawei.com> Reviewed-by: Kuohai Xu <xukuohai(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- tools/lib/bpf/libbpf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 314fb1202d08..2b997a981052 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -3479,6 +3479,9 @@ static struct bpf_program *find_prog_by_sec_insn(const struct bpf_object *obj, int l = 0, r = obj->nr_programs - 1, m; struct bpf_program *prog; + if (!obj->nr_programs) + return NULL; + while (l < r) { m = l + (r - l + 1) / 2; prog = &obj->programs[m]; -- 2.20.1

1 0

[PATCH openEuler-1.0-LTS 1/3] tcp: prohibit TCP_REPAIR_OPTIONS if data was already sent
by Yongqiang Liu 07 Nov '22

07 Nov '22

From: Lu Wei <luwei32(a)huawei.com> maillist inclusion category: bugfix bugzilla: 187792, https://gitee.com/openeuler/kernel/issues/I5ZG7O Reference: https://www.spinics.net/lists/netdev/msg856902.html -------------------------------- If setsockopt with option name of TCP_REPAIR_OPTIONS and opt_code of TCPOPT_SACK_PERM is called to enable sack after data is sent and dupacks are received , it will trigger a warning in function tcp_verify_left_out() as follows: ============================================ WARNING: CPU: 8 PID: 0 at net/ipv4/tcp_input.c:2132 tcp_timeout_mark_lost+0x154/0x160 tcp_enter_loss+0x2b/0x290 tcp_retransmit_timer+0x50b/0x640 tcp_write_timer_handler+0x1c8/0x340 tcp_write_timer+0xe5/0x140 call_timer_fn+0x3a/0x1b0 __run_timers.part.0+0x1bf/0x2d0 run_timer_softirq+0x43/0xb0 __do_softirq+0xfd/0x373 __irq_exit_rcu+0xf6/0x140 The warning is caused in the following steps: 1. a socket named socketA is created 2. socketA enters repair mode without build a connection 3. socketA calls connect() and its state is changed to TCP_ESTABLISHED directly 4. socketA leaves repair mode 5. socketA calls sendmsg() to send data, packets_out and sack_outs(dup ack receives) increase 6. socketA enters repair mode again 7. socketA calls setsockopt with TCPOPT_SACK_PERM to enable sack 8. retransmit timer expires, it calls tcp_timeout_mark_lost(), lost_out increases 9. sack_outs + lost_out > packets_out triggers since lost_out and sack_outs increase repeatly In function tcp_timeout_mark_lost(), tp->sacked_out will be cleared if Step7 not happen and the warning will not be triggered. As suggested by Denis and Eric, TCP_REPAIR_OPTIONS should be prohibited if data was already sent. socket-tcp tests in CRIU has been tested as follows: $ sudo ./test/zdtm.py run -t zdtm/static/socket-tcp* --keep-going \ --ignore-taint socket-tcp* represent all socket-tcp tests in test/zdtm/static/. Fixes: b139ba4e90dc ("tcp: Repair connection-time negotiated parameters") Signed-off-by: Lu Wei <luwei32(a)huawei.com> Reviewed-by: Eric Dumazet <edumazet(a)google.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 094cd93e50c2..6f71b6cfc1b2 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2916,7 +2916,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, case TCP_REPAIR_OPTIONS: if (!tp->repair) err = -EINVAL; - else if (sk->sk_state == TCP_ESTABLISHED) + else if (sk->sk_state == TCP_ESTABLISHED && !tp->bytes_sent) err = tcp_repair_options_est(sk, (struct tcp_repair_opt __user *)optval, optlen); -- 2.25.1

1 2

[PATCH openEuler-1.0-LTS] ext4: fix bad checksum after online resize
by Yongqiang Liu 07 Nov '22

07 Nov '22

From: Baokun Li <libaokun1(a)huawei.com> hulk inclusion category: bugfix bugzilla: 187935,https://gitee.com/src-openeuler/kernel/issues/I5ZR8Z CVE: NA -------------------------------- When online resizing is performed twice consecutively, the error message "Superblock checksum does not match superblock" is displayed for the second time. Here's the reproducer: mkfs.ext4 -F /dev/sdb 100M mount /dev/sdb /tmp/test resize2fs /dev/sdb 5G resize2fs /dev/sdb 6G To solve this issue, we moved the update of the checksum after the es->s_overhead_clusters is updated. Fixes: 026d0d27c488 ("ext4: reduce computation of overhead during resize") Fixes: de394a86658f ("ext4: update s_overhead_clusters in the superblock during an on-line resize") Signed-off-by: Baokun Li <libaokun1(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- fs/ext4/resize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index bc870561e394..f2b881aaf0b1 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1442,8 +1442,6 @@ static void ext4_update_super(struct super_block *sb, * active. */ ext4_r_blocks_count_set(es, ext4_r_blocks_count(es) + reserved_blocks); - ext4_superblock_csum_set(sb); - unlock_buffer(sbi->s_sbh); /* Update the free space counts */ percpu_counter_add(&sbi->s_freeclusters_counter, @@ -1471,6 +1469,8 @@ static void ext4_update_super(struct super_block *sb, ext4_calculate_overhead(sb); es->s_overhead_clusters = cpu_to_le32(sbi->s_overhead); + ext4_superblock_csum_set(sb); + unlock_buffer(sbi->s_sbh); if (test_opt(sb, DEBUG)) printk(KERN_DEBUG "EXT4-fs: added group %u:" "%llu blocks(%llu free %llu reserved)\n", flex_gd->count, -- 2.25.1

1 0