hulk inclusion category: feature bugzilla: 38688 CVE: NA
---------------------------
set config BLK_CGROUP_IOCOST default value.
Reviewed-by: zhangyi (F) yi.zhang@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + 4 files changed, 4 insertions(+)
diff --git a/arch/arm64/configs/euleros_defconfig b/arch/arm64/configs/euleros_defconfig index 673dcb491a5ac..c0ec409e48ac7 100644 --- a/arch/arm64/configs/euleros_defconfig +++ b/arch/arm64/configs/euleros_defconfig @@ -795,6 +795,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 02090f911f17a..809f808363616 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -809,6 +809,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 49fd2e5c20185..1f18ab6957849 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -803,6 +803,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 747c6bd5967f2..912933ebd9817 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -883,6 +883,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y # CONFIG_BLK_SED_OPAL is not set
From: Xie XiuQi xiexiuqi@huawei.com
hulk inclusion category: feature feature: TIPC bugzilla: NA CVE: NA Link: https://gitee.com/openeuler/kernel/issues/I1TDS3
The Transparent Inter Process Communication (TIPC) protocol is specially designed for intra cluster communication. This protocol originates from Ericsson where it has been used in carrier grade cluster applications for many years.
Signed-off-by: Xie XiuQi xiexiuqi@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- arch/arm64/configs/openeuler_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 1f18ab6957849..d3144ca393452 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -1470,7 +1470,10 @@ CONFIG_SCTP_COOKIE_HMAC_MD5=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_INET_SCTP_DIAG=m # CONFIG_RDS is not set -# CONFIG_TIPC is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_IB=y +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_TIPC_DIAG=m CONFIG_ATM=m CONFIG_ATM_CLIP=m # CONFIG_ATM_CLIP_NO_ICMP is not set
From: Chiqijun chiqijun@huawei.com
driver inclusion category: bugfix bugzilla: 4472
-----------------------------------------------------------------------
When the first mbox/cmdq command times out, the driver reschedules the work/tasklet, but the private data is not assigned, resulting in null pointer access.
To fix this bug we delete the private data of work/tasklet, and get eq with container_of from work or setting eq as tasklet's private data.
Signed-off-by: Chiqijun chiqijun@huawei.com Reviewed-by: Zengweiliang zengweiliang.zengweiliang@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/huawei/hinic/hinic_eqs.c | 48 ++++++------------- drivers/net/ethernet/huawei/hinic/hinic_eqs.h | 12 +---- 2 files changed, 15 insertions(+), 45 deletions(-)
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_eqs.c b/drivers/net/ethernet/huawei/hinic/hinic_eqs.c index ac8240431c3c4..6cf0b9ff0aeff 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_eqs.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_eqs.c @@ -628,10 +628,8 @@ static void reschedule_eq_handler(struct hinic_eq *eq) { if (eq->type == HINIC_AEQ) { struct hinic_aeqs *aeqs = aeq_to_aeqs(eq); - struct workqueue_struct *workq = aeqs->workq; - struct hinic_eq_work *aeq_work = &eq->aeq_work;
- queue_work(workq, &aeq_work->work); + queue_work(aeqs->workq, &eq->aeq_work); } else { tasklet_schedule(&eq->ceq_tasklet); } @@ -718,11 +716,10 @@ bool hinic_eq_intr_handler(void *hwdev, int msix_entry_idx) */ static void eq_irq_work(struct work_struct *work) { - struct hinic_eq_work *aeq_work = - container_of(work, struct hinic_eq_work, work); + struct hinic_eq *eq = container_of(work, struct hinic_eq, aeq_work);
- if (eq_irq_handler(aeq_work->data)) - reschedule_eq_handler(aeq_work->data); + if (eq_irq_handler(eq)) + reschedule_eq_handler(eq); }
/** @@ -734,19 +731,13 @@ static irqreturn_t aeq_interrupt(int irq, void *data) { struct hinic_eq *aeq = (struct hinic_eq *)data; struct hinic_hwdev *hwdev = aeq->hwdev; - struct hinic_aeqs *aeqs = aeq_to_aeqs(aeq); - struct workqueue_struct *workq = aeqs->workq; - struct hinic_eq_work *aeq_work;
/* clear resend timer cnt register */ hinic_misx_intr_clear_resend_bit(hwdev, aeq->eq_irq.msix_entry_idx, EQ_MSIX_RESEND_TIMER_CLEAR);
- aeq_work = &aeq->aeq_work; - aeq_work->data = aeq; - - queue_work(workq, &aeq_work->work); + queue_work(aeqs->workq, &aeq->aeq_work);
return IRQ_HANDLED; } @@ -757,14 +748,12 @@ static irqreturn_t aeq_interrupt(int irq, void *data) */ static void ceq_tasklet(ulong ceq_data) { - struct hinic_ceq_tasklet_data *ceq_tasklet_data = - (struct hinic_ceq_tasklet_data *)ceq_data; - struct hinic_eq *eq = (struct hinic_eq *)ceq_tasklet_data->data; + struct hinic_eq *eq = (struct hinic_eq *)ceq_data;
eq->soft_intr_jif = jiffies;
- if (eq_irq_handler(ceq_tasklet_data->data)) - reschedule_eq_handler(ceq_tasklet_data->data); + if (eq_irq_handler(eq)) + reschedule_eq_handler(eq); }
/** @@ -775,7 +764,6 @@ static void ceq_tasklet(ulong ceq_data) static irqreturn_t ceq_interrupt(int irq, void *data) { struct hinic_eq *ceq = (struct hinic_eq *)data; - struct hinic_ceq_tasklet_data *ceq_tasklet_data;
ceq->hard_intr_jif = jiffies;
@@ -783,8 +771,6 @@ static irqreturn_t ceq_interrupt(int irq, void *data) hinic_misx_intr_clear_resend_bit(ceq->hwdev, ceq->eq_irq.msix_entry_idx, EQ_MSIX_RESEND_TIMER_CLEAR);
- ceq_tasklet_data = &ceq->ceq_tasklet_data; - ceq_tasklet_data->data = data; tasklet_schedule(&ceq->ceq_tasklet);
return IRQ_HANDLED; @@ -1149,14 +1135,10 @@ static int init_eq(struct hinic_eq *eq, struct hinic_hwdev *hwdev, u16 q_id, hinic_hwif_write_reg(eq->hwdev->hwif, EQ_PROD_IDX_REG_ADDR(eq), 0); set_eq_cons_idx(eq, HINIC_EQ_ARMED);
- if (type == HINIC_AEQ) { - struct hinic_eq_work *aeq_work = &eq->aeq_work; - - INIT_WORK(&aeq_work->work, eq_irq_work); - } else { - tasklet_init(&eq->ceq_tasklet, ceq_tasklet, - (ulong)(&eq->ceq_tasklet_data)); - } + if (type == HINIC_AEQ) + INIT_WORK(&eq->aeq_work, eq_irq_work); + else + tasklet_init(&eq->ceq_tasklet, ceq_tasklet, (ulong)eq);
if (type == HINIC_AEQ) { err = snprintf(eq->irq_name, sizeof(eq->irq_name), @@ -1215,9 +1197,7 @@ static void remove_eq(struct hinic_eq *eq) free_irq(entry->irq_id, eq);
if (eq->type == HINIC_AEQ) { - struct hinic_eq_work *aeq_work = &eq->aeq_work; - - cancel_work_sync(&aeq_work->work); + cancel_work_sync(&eq->aeq_work);
/* clear eq_len to avoid hw access host memory */ hinic_hwif_write_reg(eq->hwdev->hwif, @@ -1453,7 +1433,7 @@ void hinic_dump_aeq_info(struct hinic_hwdev *hwdev) pi = hinic_hwif_read_reg(hwdev->hwif, addr); aeqe_pos = GET_CURR_AEQ_ELEM(eq); sdk_err(hwdev->dev_hdl, "Aeq id: %d, ci: 0x%08x, pi: 0x%x, work_state: 0x%x, wrap: %d, desc: 0x%x\n", - q_id, ci, pi, work_busy(&eq->aeq_work.work), + q_id, ci, pi, work_busy(&eq->aeq_work), eq->wrapped, be32_to_cpu(aeqe_pos->desc)); } } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_eqs.h b/drivers/net/ethernet/huawei/hinic/hinic_eqs.h index bd2c96d9b6507..81c34ca573d4a 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_eqs.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_eqs.h @@ -63,15 +63,6 @@ enum hinic_eq_ci_arm_state { HINIC_EQ_ARMED, };
-struct hinic_eq_work { - struct work_struct work; - void *data; -}; - -struct hinic_ceq_tasklet_data { - void *data; -}; - struct hinic_eq { struct hinic_hwdev *hwdev; u16 q_id; @@ -95,9 +86,8 @@ struct hinic_eq { dma_addr_t *dma_addr_for_free; u8 **virt_addr_for_free;
- struct hinic_eq_work aeq_work; + struct work_struct aeq_work; struct tasklet_struct ceq_tasklet; - struct hinic_ceq_tasklet_data ceq_tasklet_data;
u64 hard_intr_jif; u64 soft_intr_jif;
-
Yang Yingliang