- Kernel - mailweb.openeuler.org

[PATCH 1/2] arm64: arch_timer: only do cntvct workaround on VDSO path on D05
by Yang Yingliang 16 Dec '20

16 Dec '20

hulk inclusion category: bugfix bugzilla: NA CVE: NA -------------------------------- On other board do do cntvct workaround on VDSO path may cause unexpected error, so we do this only on D05. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/clocksource/arm_arch_timer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 443079810300..50030326d27b 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -551,9 +551,14 @@ void arch_timer_enable_workaround(const struct arch_timer_erratum_workaround *wa * change both the default value and the vdso itself. */ if (wa->read_cntvct_el0) { - clocksource_counter.archdata.vdso_direct = true; - vdso_default = true; - vdso_fix = true; + if (wa->read_cntvct_el0 == hisi_161010101_read_cntvct_el0) { + clocksource_counter.archdata.vdso_direct = true; + vdso_default = true; + vdso_fix = true; + } else { + clocksource_counter.archdata.vdso_direct = false; + vdso_default = false; + } } } -- 2.25.1

1 1

[PATCH] scsi: libiscsi: Fix cmds hung when sd_shutdown
by Yang Yingliang 15 Dec '20

15 Dec '20

From: Wu Bo <wubo40(a)huawei.com> hulk inclusion category: bugfix bugzilla: NA CVE: NA https://gitee.com/src-openeuler/kernel/issues/I28N9J --------------------------- For some reason, during reboot the system, iscsi.service failed to logout all sessions. kernel will hang forever on its sd_sync_cache() logic, after issuing the SYNCHRONIZE_CACHE cmd to all still existent paths. [ 1044.098991] reboot: Mddev shutdown finished. [ 1044.099311] reboot: Usermodehelper disable finished. [ 1050.611244] connection2:0: ping timeout of 5 secs expired, recv timeout 5, last rx 4295152378, last ping 4295153633, now 4295154944 [ 1348.599676] Call trace: [ 1348.599887] __switch_to+0xe8/0x150 [ 1348.600113] __schedule+0x33c/0xa08 [ 1348.600372] schedule+0x2c/0x88 [ 1348.600567] schedule_timeout+0x184/0x3a8 [ 1348.600820] io_schedule_timeout+0x28/0x48 [ 1348.601089] wait_for_common_io.constprop.2+0x168/0x258 [ 1348.601425] wait_for_completion_io_timeout+0x28/0x38 [ 1348.601762] blk_execute_rq+0x98/0xd8 [ 1348.602006] __scsi_execute+0xe0/0x1e8 [ 1348.602262] sd_sync_cache+0xd0/0x220 [sd_mod] [ 1348.602551] sd_shutdown+0x6c/0xf8 [sd_mod] [ 1348.602826] device_shutdown+0x13c/0x250 [ 1348.603078] kernel_restart_prepare+0x5c/0x68 [ 1348.603400] kernel_restart+0x20/0x98 [ 1348.603683] __se_sys_reboot+0x214/0x260 [ 1348.603987] __arm64_sys_reboot+0x24/0x30 [ 1348.604300] el0_svc_common+0x80/0x1b8 [ 1348.604590] el0_svc_handler+0x78/0xe0 [ 1348.604877] el0_svc+0x10/0x260 d754941225 (scsi: libiscsi: Allow sd_shutdown on bad transport) Once solved this problem. The iscsi_eh_cmd_timed_out() function add system_state judgment, and will return BLK_EH_DONE and mark the result as DID_NO_CONNECT when system_state is not SYSTEM_RUNNING, To tell upper layers that the command was handled during the transport layer error handler helper. The scsi Mid Layer timeout handler function(scsi_times_out) will be abort the cmd if the scsi LLD timeout handler return BLK_EH_DONE. if abort cmd failed, will enter scsi EH logic. Scsi EH will do reset target logic, if reset target failed, Will call iscsi_eh_session_reset() function to drop the session. The iscsi_eh_session_reset function will wait for a relogin, session termination from userspace, or a recovery/replacement timeout. But at this time, the app iscsid has exited, and the session was marked as ISCSI_STATE_FAILED, So the SCSI EH process will never be scheduled back again. PID: 9123 TASK: ffff80020c1b4d80 CPU: 3 COMMAND: "scsi_eh_2" #0 [ffff00008632bb70] __switch_to at ffff000080088738 #1 [ffff00008632bb90] __schedule at ffff000080a00480 #2 [ffff00008632bc20] schedule at ffff000080a00b58 #3 [ffff00008632bc30] iscsi_eh_session_reset at ffff000000d1ab9c [libiscsi] #4 [ffff00008632bcb0] iscsi_eh_recover_target at ffff000000d1d1fc [libiscsi] #5 [ffff00008632bd00] scsi_try_target_reset at ffff0000806f0bac #6 [ffff00008632bd30] scsi_eh_ready_devs at ffff0000806f2724 #7 [ffff00008632bde0] scsi_error_handler at ffff0000806f41d4 #8 [ffff00008632be70] kthread at ffff000080119ae0 Reported-by: Tianxiong Lu <lutianxiong(a)huawei.com> Signed-off-by: Wu Bo <wubo40(a)huawei.com> Signed-off-by: Yu Kuai <yukuai3(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/scsi/libiscsi.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index ec356e035c5f..35d603db33bb 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -2441,7 +2441,17 @@ int iscsi_eh_session_reset(struct scsi_cmnd *sc) mutex_lock(&session->eh_mutex); spin_lock_bh(&session->frwd_lock); - if (session->state == ISCSI_STATE_TERMINATE) { + + /* + * During shutdown, if session is prematurely disconnected, recovery + * won't happen and there will be hung cmds. To solve this case, all + * cmds would be enter scsi EH, but the EH path will wait for + * wait_event_interruptible() to complete until the state of the + * session is ISCSI_STATE_TERMINATE, ISCSI_STATE_LOGGED_IN or + * ISCSI_STATE_RECOVERY_FAILED. + */ + if (session->state == ISCSI_STATE_TERMINATE || + unlikely(system_state != SYSTEM_RUNNING)) { failed: ISCSI_DBG_EH(session, "failing session reset: Could not log back into " -- 2.25.1

1 0

[PATCH] scsi: iscsi: Perform connection failure entirely in kernel space
by Yang Yingliang 15 Dec '20

15 Dec '20

From: Bharath Ravi <rbharath(a)google.com> mainline inclusion from mainline-v5.7-rc1 commit 0ab710458da113a71c461c4df27e7f1353d9f864 category: bugfix bugzilla: NA CVE: NA https://gitee.com/src-openeuler/kernel/issues/I28N9J -------------------------------- Connection failure processing depends on a daemon being present to (at least) stop the connection and start recovery. This is a problem on a multipath scenario, where if the daemon failed for whatever reason, the SCSI path is never marked as down, multipath won't perform the failover and IO to the device will be forever waiting for that connection to come back. This patch performs the connection failure entirely inside the kernel. This way, the failover can happen and pending IO can continue even if the daemon is dead. Once the daemon comes alive again, it can execute recovery procedures if applicable. Cc: Mike Christie <mchristi(a)redhat.com> Cc: Lee Duncan <LDuncan(a)suse.com> Cc: Bart Van Assche <bvanassche(a)acm.org> Link: https://lore.kernel.org/r/20200125061925.191601-1-krisman@collabora.com Co-developed-by: Dave Clausen <dclausen(a)google.com> Co-developed-by: Nick Black <nlb(a)google.com> Co-developed-by: Vaibhav Nagarnaik <vnagarnaik(a)google.com> Co-developed-by: Anatol Pomazau <anatol(a)google.com> Co-developed-by: Tahsin Erdogan <tahsin(a)google.com> Co-developed-by: Frank Mayhar <fmayhar(a)google.com> Co-developed-by: Junho Ryu <jayr(a)google.com> Co-developed-by: Khazhismel Kumykov <khazhy(a)google.com> Reviewed-by: Reviewed-by: Khazhismel Kumykov <khazhy(a)google.com> Co-developed-by: Gabriel Krisman Bertazi <krisman(a)collabora.com> Reviewed-by: Lee Duncan <lduncan(a)suse.com> Signed-off-by: Bharath Ravi <rbharath(a)google.com> Signed-off-by: Dave Clausen <dclausen(a)google.com> Signed-off-by: Nick Black <nlb(a)google.com> Signed-off-by: Vaibhav Nagarnaik <vnagarnaik(a)google.com> Signed-off-by: Anatol Pomazau <anatol(a)google.com> Signed-off-by: Tahsin Erdogan <tahsin(a)google.com> Signed-off-by: Frank Mayhar <fmayhar(a)google.com> Signed-off-by: Junho Ryu <jayr(a)google.com> Signed-off-by: Khazhismel Kumykov <khazhy(a)google.com> Signed-off-by: Gabriel Krisman Bertazi <krisman(a)collabora.com> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/scsi/scsi_transport_iscsi.c | 68 +++++++++++++++++++++++++++++ include/scsi/scsi_transport_iscsi.h | 1 + 2 files changed, 69 insertions(+) diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 698347301198..e1ac96b8940b 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -81,6 +81,12 @@ struct iscsi_internal { struct transport_container session_cont; }; +/* Worker to perform connection failure on unresponsive connections + * completely in kernel space. + */ +static void stop_conn_work_fn(struct work_struct *work); +static DECLARE_WORK(stop_conn_work, stop_conn_work_fn); + static atomic_t iscsi_session_nr; /* sysfs session id for next new session */ static struct workqueue_struct *iscsi_eh_timer_workq; @@ -1609,6 +1615,7 @@ static DEFINE_MUTEX(rx_queue_mutex); static LIST_HEAD(sesslist); static DEFINE_SPINLOCK(sesslock); static LIST_HEAD(connlist); +static LIST_HEAD(connlist_err); static DEFINE_SPINLOCK(connlock); static uint32_t iscsi_conn_get_sid(struct iscsi_cls_conn *conn) @@ -2247,6 +2254,7 @@ iscsi_create_conn(struct iscsi_cls_session *session, int dd_size, uint32_t cid) mutex_init(&conn->ep_mutex); INIT_LIST_HEAD(&conn->conn_list); + INIT_LIST_HEAD(&conn->conn_list_err); conn->transport = transport; conn->cid = cid; @@ -2293,6 +2301,7 @@ int iscsi_destroy_conn(struct iscsi_cls_conn *conn) spin_lock_irqsave(&connlock, flags); list_del(&conn->conn_list); + list_del(&conn->conn_list_err); spin_unlock_irqrestore(&connlock, flags); transport_unregister_device(&conn->dev); @@ -2407,6 +2416,51 @@ int iscsi_offload_mesg(struct Scsi_Host *shost, } EXPORT_SYMBOL_GPL(iscsi_offload_mesg); +static void stop_conn_work_fn(struct work_struct *work) +{ + struct iscsi_cls_conn *conn, *tmp; + unsigned long flags; + LIST_HEAD(recovery_list); + + spin_lock_irqsave(&connlock, flags); + if (list_empty(&connlist_err)) { + spin_unlock_irqrestore(&connlock, flags); + return; + } + list_splice_init(&connlist_err, &recovery_list); + spin_unlock_irqrestore(&connlock, flags); + + list_for_each_entry_safe(conn, tmp, &recovery_list, conn_list_err) { + uint32_t sid = iscsi_conn_get_sid(conn); + struct iscsi_cls_session *session; + + mutex_lock(&rx_queue_mutex); + + session = iscsi_session_lookup(sid); + if (session) { + if (system_state != SYSTEM_RUNNING) { + session->recovery_tmo = 0; + conn->transport->stop_conn(conn, + STOP_CONN_TERM); + } else { + conn->transport->stop_conn(conn, + STOP_CONN_RECOVER); + } + } + + list_del_init(&conn->conn_list_err); + + mutex_unlock(&rx_queue_mutex); + + /* we don't want to hold rx_queue_mutex for too long, + * for instance if many conns failed at the same time, + * since this stall other iscsi maintenance operations. + * Give other users a chance to proceed. + */ + cond_resched(); + } +} + void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error) { struct nlmsghdr *nlh; @@ -2414,6 +2468,12 @@ void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error) struct iscsi_uevent *ev; struct iscsi_internal *priv; int len = nlmsg_total_size(sizeof(*ev)); + unsigned long flags; + + spin_lock_irqsave(&connlock, flags); + list_add(&conn->conn_list_err, &connlist_err); + spin_unlock_irqrestore(&connlock, flags); + queue_work(system_unbound_wq, &stop_conn_work); priv = iscsi_if_transport_lookup(conn->transport); if (!priv) @@ -2743,11 +2803,19 @@ static int iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev) { struct iscsi_cls_conn *conn; + unsigned long flags; conn = iscsi_conn_lookup(ev->u.d_conn.sid, ev->u.d_conn.cid); if (!conn) return -EINVAL; + spin_lock_irqsave(&connlock, flags); + if (!list_empty(&conn->conn_list_err)) { + spin_unlock_irqrestore(&connlock, flags); + return -EAGAIN; + } + spin_unlock_irqrestore(&connlock, flags); + ISCSI_DBG_TRANS_CONN(conn, "Destroying transport conn\n"); if (transport->destroy_conn) transport->destroy_conn(conn); diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h index b266d2a3bcb1..7de0bf6a9b60 100644 --- a/include/scsi/scsi_transport_iscsi.h +++ b/include/scsi/scsi_transport_iscsi.h @@ -203,6 +203,7 @@ extern void iscsi_ping_comp_event(uint32_t host_no, struct iscsi_cls_conn { struct list_head conn_list; /* item in connlist */ + struct list_head conn_list_err; /* item in connlist_err */ void *dd_data; /* LLD private data */ struct iscsi_transport *transport; uint32_t cid; /* connection id */ -- 2.25.1

1 0

[PATCH 00/38] backport stable-4.19.163
by Yang Yingliang 14 Dec '20

14 Dec '20

Bjørn Mork (1): USB: serial: option: fix Quectel BG96 matching Bob Peterson (1): gfs2: check for empty rgrp tree in gfs2_ri_update Christian Eggers (3): i2c: imx: Don't generate STOP condition if arbitration has been lost i2c: imx: Fix reset of I2SR_IAL flag i2c: imx: Check for I2SR_IAL after every byte Florian Westphal (1): netfilter: nf_tables: avoid false-postive lockdep splat Giacinto Cifelli (1): USB: serial: option: add support for Thales Cinterion EXS82 Greg Kroah-Hartman (1): Linux 4.19.163 Hans de Goede (2): pinctrl: baytrail: Replace WARN with dev_info_once when setting direct-irq pin to output pinctrl: baytrail: Fix pin being driven low for a while on gpiod_get(..., GPIOD_OUT_HIGH) Jakub Kicinski (1): Revert "geneve: pull IP header before ECN decapsulation" Jan-Niklas Burfeind (1): USB: serial: ch341: add new Product ID for CH341A Jian-Hong Pan (1): ALSA: hda/realtek: Enable headset of ASUS UX482EG & B9400CEA with ALC294 Johan Hovold (2): USB: serial: kl5kusb105: fix memleak on open USB: serial: ch341: sort device-id entries Kailang Yang (1): ALSA: hda/realtek - Add new codec supported for ALC897 Lukas Wunner (3): spi: Introduce device-managed SPI controller allocation spi: bcm-qspi: Fix use-after-free on unbind spi: bcm2835: Fix use-after-free on unbind Luo Meng (1): Input: i8042 - fix error return code in i8042_setup_aux() Masami Hiramatsu (2): x86/uprobes: Do not use prefixes.nbytes when looping over prefixes.bytes x86/insn-eval: Use new for_each_insn_prefix() macro to loop over prefixes bytes Mike Snitzer (2): dm: remove invalid sparse __acquires and __releases annotations dm writecache: remove BUG() and fail gracefully instead Mikulas Patocka (1): dm writecache: fix the maximum number of arguments Naveen N. Rao (1): ftrace: Fix updating FTRACE_FL_TRAMP Paulo Alcantara (1): cifs: fix potential use-after-free in cifs_echo_request() Peter Ujfalusi (1): spi: bcm2835: Release the DMA channel if probe fails after dma_init Qian Cai (1): mm/swapfile: do not sleep with a spin lock held Steven Rostedt (VMware) (1): tracing: Fix userstacktrace option for instances Suganath Prabu S (1): scsi: mpt3sas: Fix ioctl timeout Suravee Suthikulpanit (1): iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs Takashi Iwai (2): ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model ALSA: hda/generic: Add option to enforce preferred_dacs pairs Vamsi Krishna Samavedam (1): usb: gadget: f_fs: Use local copy of descriptors for userspace copy Vincent Palatin (1): USB: serial: option: add Fibocom NL668 variants Yang Shi (1): mm: list_lru: set shrinker map bit when child nr_items is not zero Zhihao Cheng (1): i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc() Makefile | 2 +- arch/x86/include/asm/insn.h | 15 +++++ arch/x86/kernel/uprobes.c | 10 ++-- arch/x86/lib/insn-eval.c | 5 +- drivers/i2c/busses/i2c-imx.c | 42 +++++++++++--- drivers/i2c/busses/i2c-qup.c | 3 +- drivers/input/serio/i8042.c | 3 +- drivers/iommu/amd_iommu_types.h | 2 +- drivers/md/dm-writecache.c | 4 +- drivers/md/dm.c | 2 - drivers/net/geneve.c | 20 ++----- drivers/pinctrl/intel/pinctrl-baytrail.c | 67 ++++++++++++++++++----- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- drivers/spi/spi-bcm-qspi.c | 34 ++++-------- drivers/spi/spi-bcm2835.c | 22 +++----- drivers/spi/spi.c | 58 +++++++++++++++++++- drivers/usb/gadget/function/f_fs.c | 6 +- drivers/usb/serial/ch341.c | 5 +- drivers/usb/serial/kl5kusb105.c | 10 ++-- drivers/usb/serial/option.c | 10 ++-- fs/cifs/connect.c | 2 + fs/gfs2/rgrp.c | 4 ++ include/linux/spi/spi.h | 19 +++++++ kernel/trace/ftrace.c | 22 +++++++- kernel/trace/trace.c | 7 ++- kernel/trace/trace.h | 6 +- mm/list_lru.c | 10 ++-- mm/swapfile.c | 4 +- net/netfilter/nf_tables_api.c | 3 +- sound/pci/hda/hda_generic.c | 12 ++-- sound/pci/hda/hda_generic.h | 1 + sound/pci/hda/patch_realtek.c | 6 ++ tools/objtool/arch/x86/include/asm/insn.h | 15 +++++ tools/perf/util/intel-pt-decoder/insn.h | 15 +++++ 34 files changed, 329 insertions(+), 119 deletions(-) -- 2.25.1

1 38

[PATCH 1/5] scsi: hisi_sas: Delete down() when handle Block-IO
by Yang Yingliang 14 Dec '20

14 Dec '20

From: Yang Xingui <yangxingui(a)huawei.com> driver inclusion category: bugfix bugzilla: NA CVE: NA Call down() at RCU Read-Side Critical Secrion sometimes may caugh a RCU preempt Calltrace. [ 3506.800288] rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: [ 3506.806357] rcu: Tasks blocked on level-1 rcu_node (CPUs 0-15): P22895/1:b..l [ 3506.813556] (detected by 108, t=162805 jiffies, g=124209, q=59192378) [ 3506.820056] kworker/0:1H D 0 22895 2 0x00000228 [ 3506.825524] Workqueue: kblockd blk_mq_run_work_fn [ 3506.830207] Call trace: [ 3506.832644] __switch_to+0xf0/0x140 [ 3506.836118] __schedule+0x890/0xdc8 [ 3506.839590] schedule+0x80/0x120 [ 3506.842804] schedule_timeout+0x22c/0x328 [ 3506.846796] __down+0x74/0xc8 [ 3506.849751] down+0x54/0x70 [ 3506.852539] hisi_sas_task_exec.isra.25+0x840/0xf28 [hisi_sas_main] [ 3506.858780] hisi_sas_queue_command+0x40/0x84 [hisi_sas_main] [ 3506.864502] sas_queuecommand+0x144/0x1c8 [libsas] [ 3506.869271] scsi_queue_rq+0x72c/0xa20 [ 3506.873005] blk_mq_dispatch_rq_list+0x110/0x680 [ 3506.877601] blk_mq_do_dispatch_sched+0x108/0x148 [ 3506.882285] __blk_mq_sched_dispatch_requests+0x120/0x1b8 [ 3506.887659] blk_mq_sched_dispatch_requests+0x40/0x78 [ 3506.892688] __blk_mq_run_hw_queue+0xb8/0x138 [ 3506.897026] blk_mq_run_work_fn+0x28/0x38 Actually it's no need for keeping IO stopping here to wait for controller reset complete. We can directly return error code. Signed-off-by: Yang Xingui <yangxingui(a)huawei.com> Reviewed-by: Zhu Xiongxiong <zhuxiongxiong(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/scsi/hisi_sas/hisi_sas_main.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 124aa26fa4b8..0128c547e4c8 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -611,19 +611,9 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags, hisi_hba = dev_to_hisi_hba(device); dev = hisi_hba->dev; - if (unlikely(test_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags))) { - /* - * For IOs from upper layer, it may already disable preempt - * in the IO path, if disable preempt again in down(), - * function schedule() will report schedule_bug(), so check - * preemptible() before goto down(). - */ - if (!preemptible()) - return -EINVAL; + if (unlikely(test_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags))) + return -EINVAL; - down(&hisi_hba->sem); - up(&hisi_hba->sem); - } /* protect task_prep and start_delivery sequence */ rc = hisi_sas_task_prep(task, is_tmf, tmf, &pass, &dq); -- 2.25.1

1 4

[PATCH v2] arm64/mpam: Avoid compilation error of enable_acpi redefinition
by Wang ShaoBo 11 Dec '20

11 Dec '20

hulk inclusion category: bugfix bugzilla: 46772 CVE: NA Reference: https://gitee.com/openeuler/kernel/issues/I28HIY ------------------------------------------------- enable_acpi is declaration as a enumerated type in mpam, where it's also defined as a static inline function in acpi.h, this following compilation error will be triggered if we use their two like this. In file included from ./include/acpi/acpi_io.h:7:0, from ./include/linux/acpi.h:47, from ./arch/arm64/include/asm/machine_t.h:26, from arch/arm64/kernel/process.c:64: ./arch/arm64/include/asm/acpi.h:82:20: error: ‘enable_acpi’ redeclared as different kind of symbol static inline void enable_acpi(void) ^~~~~~~~~~~ In file included from arch/arm64/kernel/process.c:61:0: ./arch/arm64/include/asm/mpam_sched.h:46:2: note: previous definition of ‘enable_acpi’ was here enable_acpi, We should rename enable_acpi properly for mpam. Reported-by: Zhengyuan Liu <liuzhengyuan(a)tj.kylinos.cn> Signed-off-by: Wang ShaoBo <bobo.shaobowang(a)huawei.com> --- arch/arm64/include/asm/mpam_sched.h | 6 +++--- arch/arm64/kernel/mpam.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/mpam_sched.h b/arch/arm64/include/asm/mpam_sched.h index 350296157087a..ddc7ce3e1a9e1 100644 --- a/arch/arm64/include/asm/mpam_sched.h +++ b/arch/arm64/include/asm/mpam_sched.h @@ -41,9 +41,9 @@ static inline void mpam_sched_in(void) } enum mpam_enable_type { - enable_denied = 0, - enable_default, - enable_acpi, + MPAM_ENABLE_DENIED = 0, + MPAM_ENABLE_DEFAULT, + MPAM_ENABLE_ACPI, }; extern enum mpam_enable_type __read_mostly mpam_enabled; diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 3f89cec8e2fb1..96f4d013a9034 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -252,7 +252,7 @@ int __init mpam_force_init(void) { int ret; - if (mpam_enabled != enable_default) + if (mpam_enabled != MPAM_ENABLE_DEFAULT) return 0; ret = mpam_nodes_discovery_start(); @@ -1380,9 +1380,9 @@ enum mpam_enable_type __read_mostly mpam_enabled; static int __init mpam_setup(char *str) { if (!strcmp(str, "=acpi")) - mpam_enabled = enable_acpi; + mpam_enabled = MPAM_ENABLE_ACPI; else - mpam_enabled = enable_default; + mpam_enabled = MPAM_ENABLE_DEFAULT; return 1; } __setup("mpam", mpam_setup); -- 2.17.1

1 0

【会议纪要】 Re: openEuler kernel sig meeting
by Xie XiuQi 11 Dec '20

11 Dec '20

会议纪要：与会人：Zheng Zhenpeng, xiexiuqi， dukaitian, myeuler, jiaoff, Liu Yuan, Wenlong.Ding, 潘晨博 1. 网迅万兆网卡驱动合入 openEuler 内核讨论 - 郑振鹏、刘源 > > 网迅万兆网卡是国内具有完全知识产权的万兆网络控制器，相关资料请访问官方网站： > 网卡成品及资料 > https://www.net-swift.com/a/383.html > 网卡芯片 > https://www.net-swift.com/a/275.html > > 之前我们已向EulerOS发布版本提供万兆网卡驱动rpm包，此次希望能加深合作， > 将驱动源码推入openeuler内核。 > 根据开源规则（遵从GPLV2），我厂已在官网上提供源码下载 1）openEuler 欢迎网讯网卡驱动合入社区，使 openEuler 支持更丰富的设备。 2）kernel sig 同意网讯万兆网卡驱动合入 openEuler，后续驱动可以按照开源社区的规范，准备补丁； - 建议合入openEuler 20.03 LTS SP2 （kernel-4.19)，如果时间赶不上的话，与 Release sig 讨论是否可以合入后续 update 版本； - 该驱动代码量约 5w+ 行，首次合入时，不要求把所有开发历史作为补丁发出来，可以按照模块或者功能做适当的补丁拆分； 3）建议加入到兼容性sig 组，兼容性 sig 与网讯网卡确认的认证过程 4）与 Release sig 对齐 Release 节奏 5）另有针对网讯网卡针对 dpdk 的适配，也欢迎参与 openEuler，贡献社区。 On 2020/12/10 9:32, zhenpengzheng(a)net-swift.com wrote: > 收到，我会按时参加。 > > ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ > > **************************************************************** > > 郑振鹏(zheng zhenpeng) > > 北京网迅科技有限公司杭州分公司软件工程师 > > 浙江省杭州市西湖区文三路478号华星时代广场A座507室 310013 > > Beijing WangXun Technology Co., Ltd. Software Engineer. > > Room A507, HuaXing Times Square, No.478 West Wensan Road. > > West Lake District, Hangzhou City, 310013 ZHEJIANG, P.R.CHINA. > > > > Office: +86(0571)89807901-8014 > > Mobile: +86-13656681762 > > E-Mail: z <mailto:jianwang@trustnetic.com>henpengzheng(a)net-swift.com > > **************************************************************** > > > *发件人：* Xie XiuQi <mailto:xiexiuqi@huawei.com> > *发送时间：* 2020-12-09 20:09 > *收件人：* kernel(a)openeuler.org <mailto:kernel@openeuler.org> > *抄送：* tc(a)openeuler.org <mailto:tc@openeuler.org>; dev(a)openeuler.org <mailto:dev@openeuler.org>; release(a)openeuler.org <mailto:release@openeuler.org>; 郑振鹏 <mailto:zhenpengzheng@net-swift.com>; Liuyuan (Compatibility, Cloud Infrastructure Service Product Dept.) <mailto:liuyuan36@huawei.com> > *主题：* Re: [Release] Re: 【议题申报】 openEuler kernel sig meeting > 议题： > > 1）网迅万兆网卡驱动合入 openEuler 内核讨论 - 郑振鹏、刘源 > > 网迅万兆网卡是国内具有完全知识产权的万兆网络控制器，相关资料请访问官方网站： > 网卡成品及资料 > https://www.net-swift.com/a/383.html > 网卡芯片 > https://www.net-swift.com/a/275.html > > 之前我们已向EulerOS发布版本提供万兆网卡驱动rpm包，此次希望能加深合作，将驱动源码推入openeuler内核。 > 根据开源规则（遵从GPLV2），我厂已在官网上提供源码下载 > > > 欢迎继续申报议题 > > On 2020/12/2 19:52, Xie XiuQi wrote: > > > > > > On 2020/12/2 19:26, openEuler conference wrote: > >> 您好！ > >> > >> openEuler Kernel SIG 邀请您参加 2020-12-11 10:00 召开的ZOOM会议 > >> > >> 会议主题：openEuler kernel sig meeting > >> > >> 会议链接：https://zoom.us/j/95008051399?pwd=RVRzNk0zSVUxdmVaaWZjT1d4UEhVQT09 > >> > >> 更多资讯尽在：https://openeuler.org/zh/ > >> > >> > >> > >> Hello! > >> > >> openEuler Kernel SIG invites you to attend the ZOOM conference will be held at 2020-12-11 10:00, > >> > >> The subject of the conference is openEuler kernel sig meeting, > >> > >> You can join the meeting at https://zoom.us/j/95008051399?pwd=RVRzNk0zSVUxdmVaaWZjT1d4UEhVQT09. > >> > >> More information <https://openeuler.org/zh/> > >> > >> > >> _______________________________________________ > >> Release mailing list -- release(a)openeuler.org > >> To unsubscribe send an email to release-leave(a)openeuler.org > >> > > _______________________________________________ > > Release mailing list -- release(a)openeuler.org > > To unsubscribe send an email to release-leave(a)openeuler.org > > > >

1 0

[PATCH] arm64/mpam: Avoid compilation error of enable_acpi redefinition
by Wang ShaoBo 10 Dec '20

10 Dec '20

hulk inclusion category: bugfix bugzilla: 46772 CVE: NA Reference: https://gitee.com/openeuler/kernel/issues/I28HIY ------------------------------------------------- enable_acpi is declaration as a enumerated type in mpam, where it's also defined as a static inline function in acpi.h, this following compilation error will be triggered if we use their two like this. In file included from ./include/acpi/acpi_io.h:7:0, from ./include/linux/acpi.h:47, from ./arch/arm64/include/asm/machine_t.h:26, from arch/arm64/kernel/process.c:64: ./arch/arm64/include/asm/acpi.h:82:20: error: ‘enable_acpi’ redeclared as different kind of symbol static inline void enable_acpi(void) ^~~~~~~~~~~ In file included from arch/arm64/kernel/process.c:61:0: ./arch/arm64/include/asm/mpam_sched.h:46:2: note: previous definition of ‘enable_acpi’ was here enable_acpi, We should rename enable_acpi properly for mpam. Signed-off-by: Wang ShaoBo <bobo.shaobowang(a)huawei.com> --- arch/arm64/include/asm/mpam_sched.h | 6 +++--- arch/arm64/kernel/mpam.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/mpam_sched.h b/arch/arm64/include/asm/mpam_sched.h index 350296157087a..ddc7ce3e1a9e1 100644 --- a/arch/arm64/include/asm/mpam_sched.h +++ b/arch/arm64/include/asm/mpam_sched.h @@ -41,9 +41,9 @@ static inline void mpam_sched_in(void) } enum mpam_enable_type { - enable_denied = 0, - enable_default, - enable_acpi, + MPAM_ENABLE_DENIED = 0, + MPAM_ENABLE_DEFAULT, + MPAM_ENABLE_ACPI, }; extern enum mpam_enable_type __read_mostly mpam_enabled; diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 3f89cec8e2fb1..96f4d013a9034 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -252,7 +252,7 @@ int __init mpam_force_init(void) { int ret; - if (mpam_enabled != enable_default) + if (mpam_enabled != MPAM_ENABLE_DEFAULT) return 0; ret = mpam_nodes_discovery_start(); @@ -1380,9 +1380,9 @@ enum mpam_enable_type __read_mostly mpam_enabled; static int __init mpam_setup(char *str) { if (!strcmp(str, "=acpi")) - mpam_enabled = enable_acpi; + mpam_enabled = MPAM_ENABLE_ACPI; else - mpam_enabled = enable_default; + mpam_enabled = MPAM_ENABLE_DEFAULT; return 1; } __setup("mpam", mpam_setup); -- 2.17.1

2 1

[PATCH 00/32] backport stable-4.19.162
by Yang Yingliang 10 Dec '20

10 Dec '20

Alexander Duyck (1): tcp: Set INET_ECN_xmit configuration in tcp_reinit_congestion_control Anmol Karn (1): rose: Fix Null pointer dereference in rose_send_frame() Antoine Tenart (2): netfilter: bridge: reset skb->pkt_type after NF_INET_POST_ROUTING traversal net: ip6_gre: set dev->hard_header_len when using header_ops Dan Carpenter (2): net/x25: prevent a couple of overflows chelsio/chtls: fix a double free in chtls_setkey() Eran Ben Elisha (1): net/mlx5: Fix wrong address reclaim when command interface is down Eric Dumazet (1): geneve: pull IP header before ECN decapsulation Greg Kroah-Hartman (1): Linux 4.19.162 Guillaume Nault (1): ipv4: Fix tos mask in inet_rtm_getroute() Hector Martin (1): ALSA: usb-audio: US16x08: fix value count for level meters Jamie Iles (1): bonding: wait for sysfs kobject destruction before freeing struct slave Jens Axboe (1): tun: honor IOCB_NOWAIT flag Julian Wiedmann (1): net/af_iucv: set correct sk_protocol for child sockets Krzysztof Kozlowski (1): dt-bindings: net: correct interrupt flags in examples Lijun Pan (1): ibmvnic: fix call_netdevice_notifiers in do_reset Maxim Mikityanskiy (1): net/tls: Protect from calling tls_dev_del for TLS RX twice Po-Hsu Lin (1): Input: i8042 - add ByteSpeed touchpad to noloop table Sanjay Govind (1): Input: xpad - support Ardwiino Controllers Shiraz Saleem (1): RDMA/i40iw: Address an mmap handler exploit in i40iw Sylwester Dziedziuch (1): i40e: Fix removing driver while bare-metal VFs pass traffic Thomas Falcon (2): ibmvnic: Ensure that SCRQ entry reads are correctly ordered ibmvnic: Fix TX completion error handling Vadim Fedorenko (1): net/tls: missing received data after fast remote close Vasily Averin (1): tracing: Remove WARN_ON in start_thread() Vinay Kumar Yadav (1): chelsio/chtls: fix panic during unload reload chtls Wang Hai (2): ipv6: addrlabel: fix possible memory leak in ip6addrlbl_net_init net: mvpp2: Fix error return code in mvpp2_open() Willem de Bruijn (1): sock: set sk_err to ee_errno on dequeue from errq Yves-Alexis Perez (1): usbnet: ipheth: fix connectivity with iOS 14 Zhang Changzhong (2): cxgb3: fix error return code in t3_sge_alloc_qset() net: pasemi: fix error return code in pasemi_mac_open() .../devicetree/bindings/net/nfc/nxp-nci.txt | 2 +- .../devicetree/bindings/net/nfc/pn544.txt | 2 +- Makefile | 2 +- drivers/crypto/chelsio/chtls/chtls_cm.c | 1 + drivers/crypto/chelsio/chtls/chtls_hw.c | 1 + drivers/infiniband/hw/i40iw/i40iw_main.c | 5 -- drivers/infiniband/hw/i40iw/i40iw_verbs.c | 36 +++-------- drivers/input/joystick/xpad.c | 2 + drivers/input/serio/i8042-x86ia64io.h | 4 ++ drivers/net/bonding/bond_main.c | 61 +++++++++++++------ drivers/net/bonding/bond_sysfs_slave.c | 18 +----- drivers/net/ethernet/chelsio/cxgb3/sge.c | 1 + drivers/net/ethernet/ibm/ibmvnic.c | 26 ++++++-- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 22 ++++--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 26 ++++---- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 1 + .../ethernet/mellanox/mlx5/core/pagealloc.c | 21 ++++++- drivers/net/ethernet/pasemi/pasemi_mac.c | 8 ++- drivers/net/geneve.c | 20 ++++-- drivers/net/tun.c | 14 ++++- drivers/net/usb/ipheth.c | 2 +- include/net/bonding.h | 8 +++ include/net/tls.h | 6 ++ kernel/trace/trace_hwlat.c | 2 +- net/bridge/br_netfilter_hooks.c | 7 ++- net/core/skbuff.c | 2 +- net/ipv4/route.c | 7 ++- net/ipv4/tcp_cong.c | 5 ++ net/ipv6/addrlabel.c | 26 +++++--- net/ipv6/ip6_gre.c | 16 ++++- net/iucv/af_iucv.c | 4 +- net/rose/rose_loopback.c | 17 ++++-- net/tls/tls_device.c | 5 +- net/tls/tls_sw.c | 6 ++ net/x25/af_x25.c | 6 +- sound/usb/mixer_us16x08.c | 2 +- 37 files changed, 260 insertions(+), 135 deletions(-) -- 2.25.1

1 32

[PATCH] fanotify: fix merging marks masks with FAN_ONDIR
by Yang Yingliang 10 Dec '20

10 Dec '20

From: Amir Goldstein <amir73il(a)gmail.com> mainline inclusion from mainline-5.7-rc1 commit 55bf882c7f13dda8bbe624040c6d5b4fbb812d16 category: bugfix bugzilla: 46764 CVE: NA https://gitee.com/openeuler/kernel/issues/I27PTB?from=project-issue --------------------------- Change the logic of FAN_ONDIR in two ways that are similar to the logic of FAN_EVENT_ON_CHILD, that was fixed in commit 54a307ba8d3c ("fanotify: fix logic of events on child"): 1. The flag is meaningless in ignore mask 2. The flag refers only to events in the mask of the mark where it is set This is what the fanotify_mark.2 man page says about FAN_ONDIR: "Without this flag, only events for files are created." It doesn't say anything about setting this flag in ignore mask to stop getting events on directories nor can I think of any setup where this capability would be useful. Currently, when marks masks are merged, the FAN_ONDIR flag set in one mark affects the events that are set in another mark's mask and this behavior causes unexpected results. For example, a user adds a mark on a directory with mask FAN_ATTRIB | FAN_ONDIR and a mount mark with mask FAN_OPEN (without FAN_ONDIR). An opendir() of that directory (which is inside that mount) generates a FAN_OPEN event even though neither of the marks requested to get open events on directories. Link: https://lore.kernel.org/r/20200319151022.31456-10-amir73il@gmail.com Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Jan Kara <jack(a)suse.cz> Conflicts: fs/notify/fanotify/fanotify.c Signed-off-by: yangerkun <yangerkun(a)huawei.com> Reviewed-by: zhangyi (F) <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/notify/fanotify/fanotify.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index ca3405f73264..cdf0dc9ddbbb 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -117,6 +117,12 @@ static bool fanotify_should_send_event(struct fsnotify_iter_info *iter_info, /* Apply ignore mask regardless of ISDIR and ON_CHILD flags */ marks_ignored_mask |= mark->ignored_mask; + /* + * If the event is on dir and this mark doesn't care about + * events on dir, don't send it! + */ + if (d_is_dir(path->dentry) && !(mark->mask & FS_ISDIR)) + continue; /* * If the event is for a child and this mark doesn't care about @@ -130,10 +136,6 @@ static bool fanotify_should_send_event(struct fsnotify_iter_info *iter_info, marks_mask |= mark->mask; } - if (d_is_dir(path->dentry) && - !(marks_mask & FS_ISDIR & ~marks_ignored_mask)) - return false; - if (event_mask & FAN_ALL_OUTGOING_EVENTS & marks_mask & ~marks_ignored_mask) return true; -- 2.25.1

1 0