- Kernel - mailweb.openeuler.org

[PATCH kernel-4.19] kernel: just for testing
by Xie XiuQi 07 May '20

07 May '20

just for testing openeuler kernel ci. Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- init/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/version.c b/init/version.c index ef4012ec4375..b8871517a6b2 100644 --- a/init/version.c +++ b/init/version.c @@ -43,7 +43,7 @@ EXPORT_SYMBOL_GPL(init_uts_ns); /* FIXED STRINGS! Don't touch! */ const char linux_banner[] = - "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" + "Linux Version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n"; const char linux_proc_banner[] = -- 2.20.1

1 0

[PATCH kernel-4.19] kernel: just for testing
by Xie XiuQi 07 May '20

07 May '20

just for testing openeuler kernel ci. Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- init/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/version.c b/init/version.c index ef4012ec4375..b8871517a6b2 100644 --- a/init/version.c +++ b/init/version.c @@ -43,7 +43,7 @@ EXPORT_SYMBOL_GPL(init_uts_ns); /* FIXED STRINGS! Don't touch! */ const char linux_banner[] = - "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" + "Linux Version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n"; const char linux_proc_banner[] = -- 2.20.1

1 0

[PATCH 1/3] blk-mq: use static_rqs instead of rqs to iterate tags
by Yang Yingliang 06 May '20

06 May '20

From: yu kuai <yukuai3(a)huawei.com> hulk inclusion category: bugfix bugzilla: 34280 CVE: NA --------------------------- tags->rqs[] will not been cleaned when free driver tag to avoid an extra store on a shared area in the per io path. But there is a window between get driver tag and write tags->rqs[], so we may see stale rq in tags->rqs[] which may have been freed, as the following case: blk_mq_get_request blk_mq_queue_tag_busy_iter -> blk_mq_get_tag -> bt_for_each -> bt_iter -> rq = tags->rqs[] -> rq->q -> blk_mq_rq_ctx_init -> data->hctx->tags->rqs[rq->tag] = rq; In additiion, tags->rqs[] only contains the requests that get driver tag. It is not accurate for io-scheduler case when account busy tags in part_in_flight. To fix both of them, the blk_mq_queue_tag_busy_iter is changed in this patch to use tags->static_rqs[] instead of tags->rqs[]. We have to identify whether there is a io scheduler attached to decide to use hctx->tags or hctx->sched_tags. And we will try to get a non-zero q_usage_counter before that, then could avoid race with update nr_hw_queues, switch io-scheduler and even queue cleanup. Add 'inflight' parameter to determine to iterate in-flight requests or just busy tags and add a new helper interface blk_mq_queue_tag_inflight_iter to iterate all of the in-flight tags and export this interface for drivers. Signed-off-by: yu kuai <yukuai3(a)huawei.com> Reviewed-by: Hou Tao <houtao1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- block/blk-mq-tag.c | 77 ++++++++++++++++++++++++++++++++++++++++---------- block/blk-mq.c | 6 ++-- include/linux/blk-mq.h | 3 +- 3 files changed, 67 insertions(+), 19 deletions(-) diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 41317c5..323bbca 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -216,37 +216,51 @@ struct bt_iter_data { busy_iter_fn *fn; void *data; bool reserved; + bool inflight; }; static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) { struct bt_iter_data *iter_data = data; struct blk_mq_hw_ctx *hctx = iter_data->hctx; - struct blk_mq_tags *tags = hctx->tags; bool reserved = iter_data->reserved; + struct blk_mq_tags *tags; struct request *rq; + tags = hctx->sched_tags ? hctx->sched_tags : hctx->tags; + if (!reserved) bitnr += tags->nr_reserved_tags; - rq = tags->rqs[bitnr]; /* - * We can hit rq == NULL here, because the tagging functions - * test and set the bit before assining ->rqs[]. + * Because tags->rqs[] will not been cleaned when free driver tag + * and there is a window between get driver tag and write tags->rqs[], + * so we may see stale rq in tags->rqs[] which may have been freed. + * Using static_rqs[] is safer. */ - if (rq && rq->q == hctx->queue) + rq = tags->static_rqs[bitnr]; + + /* + * There is a small window between get tag and blk_mq_rq_ctx_init, + * so rq->q and rq->mq_hctx maybe different. + */ + if (rq && rq->q == hctx->queue && + (!iter_data->inflight || + blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)) iter_data->fn(hctx, rq, iter_data->data, reserved); return true; } -static void bt_for_each(struct blk_mq_hw_ctx *hctx, struct sbitmap_queue *bt, - busy_iter_fn *fn, void *data, bool reserved) +static void bt_for_each(struct blk_mq_hw_ctx *hctx, + struct sbitmap_queue *bt, busy_iter_fn *fn, + void *data, bool reserved, bool inflight) { struct bt_iter_data iter_data = { .hctx = hctx, .fn = fn, .data = data, .reserved = reserved, + .inflight = inflight, }; sbitmap_for_each_set(&bt->sb, bt_iter, &iter_data); @@ -314,22 +328,23 @@ void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, } EXPORT_SYMBOL(blk_mq_tagset_busy_iter); -void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, - void *priv) +static void __blk_mq_queue_tag_busy_iter(struct request_queue *q, + busy_iter_fn *fn, void *priv, bool inflight) { struct blk_mq_hw_ctx *hctx; int i; /* - * __blk_mq_update_nr_hw_queues will update the nr_hw_queues and - * queue_hw_ctx after freeze the queue, so we use q_usage_counter - * to avoid race with it. + * Get a reference of the queue unless it has been zero. We use this + * to avoid the race with the code that would modify the hctxs after + * freeze and drain the queue, including updating nr_hw_queues, io + * scheduler switching and queue clean up. */ if (!percpu_ref_tryget(&q->q_usage_counter)) return; queue_for_each_hw_ctx(q, hctx, i) { - struct blk_mq_tags *tags = hctx->tags; + struct blk_mq_tags *tags; /* * If not software queues are currently mapped to this @@ -338,13 +353,45 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, if (!blk_mq_hw_queue_mapped(hctx)) continue; + tags = hctx->sched_tags ? hctx->sched_tags : hctx->tags; + if (tags->nr_reserved_tags) - bt_for_each(hctx, &tags->breserved_tags, fn, priv, true); - bt_for_each(hctx, &tags->bitmap_tags, fn, priv, false); + bt_for_each(hctx, &tags->breserved_tags, + fn, priv, true, inflight); + bt_for_each(hctx, &tags->bitmap_tags, + fn, priv, false, inflight); + /* + * flush_rq represents the rq with REQ_PREFLUSH and REQ_FUA + * (if FUA is not supported by device) to be issued to + * device. So we need to consider it when iterate inflight + * rqs, but needn't to count it when iterate busy tags. + */ + if (inflight && + blk_mq_rq_state(hctx->fq->flush_rq) == MQ_RQ_IN_FLIGHT) + fn(hctx, hctx->fq->flush_rq, priv, false); } blk_queue_exit(q); } +/* + * Iterate all the busy tags including pending and in-flight ones. + */ +void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, + void *priv) +{ + __blk_mq_queue_tag_busy_iter(q, fn, priv, false); +} + +/* + * Iterate all the inflight tags. + */ +void blk_mq_queue_tag_inflight_iter(struct request_queue *q, + busy_iter_fn *fn, void *priv) +{ + __blk_mq_queue_tag_busy_iter(q, fn, priv, true); +} +EXPORT_SYMBOL(blk_mq_queue_tag_inflight_iter); + static int bt_alloc(struct sbitmap_queue *bt, unsigned int depth, bool round_robin, int node) { diff --git a/block/blk-mq.c b/block/blk-mq.c index 8a7c3d8..ee07575 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -112,7 +112,7 @@ void blk_mq_in_flight(struct request_queue *q, struct hd_struct *part, struct mq_inflight mi = { .part = part, .inflight = inflight, }; inflight[0] = inflight[1] = 0; - blk_mq_queue_tag_busy_iter(q, blk_mq_check_inflight, &mi); + blk_mq_queue_tag_inflight_iter(q, blk_mq_check_inflight, &mi); } static void blk_mq_check_inflight_rw(struct blk_mq_hw_ctx *hctx, @@ -131,7 +131,7 @@ void blk_mq_in_flight_rw(struct request_queue *q, struct hd_struct *part, struct mq_inflight mi = { .part = part, .inflight = inflight, }; inflight[0] = inflight[1] = 0; - blk_mq_queue_tag_busy_iter(q, blk_mq_check_inflight_rw, &mi); + blk_mq_queue_tag_inflight_iter(q, blk_mq_check_inflight_rw, &mi); } void blk_freeze_queue_start(struct request_queue *q) @@ -875,7 +875,7 @@ static void blk_mq_timeout_work(struct work_struct *work) if (!percpu_ref_tryget(&q->q_usage_counter)) return; - blk_mq_queue_tag_busy_iter(q, blk_mq_check_expired, &next); + blk_mq_queue_tag_inflight_iter(q, blk_mq_check_expired, &next); if (next != 0) { mod_timer(&q->timeout, next); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 6578070..149d411 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -320,7 +320,8 @@ void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, void blk_mq_freeze_queue_wait(struct request_queue *q); int blk_mq_freeze_queue_wait_timeout(struct request_queue *q, unsigned long timeout); - +void blk_mq_queue_tag_inflight_iter(struct request_queue *q, busy_iter_fn *fn, + void *priv); int blk_mq_map_queues(struct blk_mq_tag_set *set); void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues); -- 1.8.3

1 2

[PATCH] perf: Make perf able to build with latest libbfd
by Yang Yingliang 06 May '20

06 May '20

From: Changbin Du <changbin.du(a)gmail.com> mainline inclusion from mainline-5.6 commit 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 category: bugfix bugzilla: 34555 CVE: NA ------------------------------------------------- libbfd has changed the bfd_section_* macros to inline functions bfd_section_<field> since 2019-09-18. See below two commits: o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html This fix make perf able to build with both old and new libbfd. Signed-off-by: Changbin Du <changbin.du(a)gmail.com> Acked-by: Jiri Olsa <jolsa(a)redhat.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> Reviewed-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- tools/perf/util/srcline.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c index af3f9b9..b8e7761 100644 --- a/tools/perf/util/srcline.c +++ b/tools/perf/util/srcline.c @@ -191,16 +191,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) bfd_vma pc, vma; bfd_size_type size; struct a2l_data *a2l = data; + flagword flags; if (a2l->found) return; - if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) +#ifdef bfd_get_section_flags + flags = bfd_get_section_flags(abfd, section); +#else + flags = bfd_section_flags(section); +#endif + if ((flags & SEC_ALLOC) == 0) return; pc = a2l->addr; +#ifdef bfd_get_section_vma vma = bfd_get_section_vma(abfd, section); +#else + vma = bfd_section_vma(section); +#endif +#ifdef bfd_get_section_size size = bfd_get_section_size(section); +#else + size = bfd_section_size(section); +#endif if (pc < vma || pc >= vma + size) return; -- 1.8.3

1 0

hello
by chenzy 30 Apr '20

30 Apr '20

subscribe linux-kernel

3 2

[PATCH] pcie_cae support getting chipnums of this system
by Yang Yingliang 28 Apr '20

28 Apr '20

From: Liu Yanshi <liuyanshi(a)huawei.com> driver inclusion category: feature bugzilla: NA CVE: NA pcie_cae add interface to get the chipnums of the current system. Signed-off-by: Liu Yanshi <liuyanshi(a)huawei.com> Reviewed-by: Zhu Xiongxiong <zhuxiongxiong(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- .../controller/hisi-pcie-customer/hisi_pcie_cae.c | 37 ++++++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/hisi-pcie-customer/hisi_pcie_cae.c b/drivers/pci/controller/hisi-pcie-customer/hisi_pcie_cae.c index 8d0c801..6229a54 100644 --- a/drivers/pci/controller/hisi-pcie-customer/hisi_pcie_cae.c +++ b/drivers/pci/controller/hisi-pcie-customer/hisi_pcie_cae.c @@ -3,6 +3,7 @@ #include <linux/mm.h> #include <linux/miscdevice.h> +#include <linux/uaccess.h> #include <linux/device.h> #include <linux/module.h> #include <linux/io.h> @@ -21,6 +22,7 @@ #define CHIP_INFO_REG_SIZE 4 #define TYPE_SHIFT 4 #define BIT_SHIFT_8 8 +#define PCIE_CMD_GET_CHIPNUMS 0x01 #define DEVICE_NAME "pcie_reg_dev" @@ -37,7 +39,7 @@ enum { MMAP_TYPE_VIRTIO }; -static int current_chip_nums; +static u32 current_chip_nums; static const struct vm_operations_struct mmap_pcie_mem_ops = { #ifdef CONFIG_HAVE_IOREMAP_PROT @@ -100,10 +102,10 @@ static int pcie_reg_mmap(struct file *filep, struct vm_area_struct *vma) return 0; } -int pcie_get_chipnums(u32 cpu_info) +u32 pcie_get_chipnums(u32 cpu_info) { int i; - int chip_count = 0; + u32 chip_count = 0; u32 chip_i_info; for (i = 0; i < MAX_CHIP_NUM; i++) { @@ -144,12 +146,41 @@ static int pcie_release(struct inode *inode, struct file *f) return 0; } +static long pcie_reg_ioctl(struct file *pfile, unsigned int cmd, + unsigned long arg) +{ + int ret = 0; + + switch (cmd) { + case PCIE_CMD_GET_CHIPNUMS: + if ((void *)arg == NULL) { + pr_info("[PCIe Base] invalid arg address\n"); + ret = -EINVAL; + break; + } + + if (copy_to_user((void *)arg, (void *)&current_chip_nums, + sizeof(int))) { + pr_info("[PCIe Base] copy chip_nums to usr failed\n"); + ret = -EINVAL; + } + break; + + default: + pr_info("[PCIe Base] invalid pcie ioctl cmd:%u\n", cmd); + break; + } + + return ret; +} + static const struct file_operations pcie_dfx_fops = { .owner = THIS_MODULE, .open = pcie_open, .release = pcie_release, .llseek = noop_llseek, .mmap = pcie_reg_mmap, + .unlocked_ioctl = pcie_reg_ioctl, }; static struct miscdevice pcie_dfx_misc = { -- 1.8.3

1 0

[PATCH v2] net: hns3: remove the unnecessary ccflags
by Zhengyuan Liu 28 Apr '20

28 Apr '20

category: other bugzilla: NA CVE: NA ---------------------------------- The ccflags removed in this patch shouldn't be in open kernel tree. Especially for -fstack-protector-strong, there will be a compile error when CONFIG_STACKPROTECTOR_STRONG isn't enabled. Signed-off-by: Zhengyuan Liu <liuzhengyuan(a)tj.kylinos.cn> --- drivers/net/ethernet/hisilicon/hns3/Makefile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/Makefile b/drivers/net/ethernet/hisilicon/hns3/Makefile index 6653e81..0365f1c 100644 --- a/drivers/net/ethernet/hisilicon/hns3/Makefile +++ b/drivers/net/ethernet/hisilicon/hns3/Makefile @@ -3,15 +3,6 @@ # Makefile for the HISILICON network device drivers. # -# Add security options -ccflags-y += -fstack-protector-strong -ccflags-y += -Wl,-z,relro,-z,now -ccflags-y += -Wl,-z,noexecstack -ccflags-y += -D_FORTIFY_SOURCE=2 -O2 -ccflags-y += -fvisibility=hidden -ccflags-y += -Wformat=2 -Wfloat-equal -ccflags-y += -fsigned-char - ccflags-y += -DCONFIG_IT_VALIDATION ccflags-y += -DCONFIG_HNS3_TEST -- 2.7.4

3 2

Re: [Infra] Re: [Community] 转发：gitee上已更新issue，请及时查收
by Fred Li 27 Apr '20

27 Apr '20

cc kernel(a)openeuler.org. Just for members who may not know, dwadm(a)pcl.ac.cn is from 鹏程实验室 and will help on issues related with VMs in 鹏程实验室。 On Sun, Apr 26, 2020 at 10:08 AM Xie XiuQi via Infra <infra(a)openeuler.org> wrote: > 感谢你的热心参与，我们正在和鹏程实验室的兄弟联合定位 > On 2020/4/25 13:30, Qichen Zhang wrote: > > > Qichen Zhang > 邮箱：17852657226(a)163.com > > <https://maas.mail.163.com/dashi-web-extend/html/proSignature.html?ftlId=1&n…> > > 签名由网易邮箱大师 <https://mail.163.com/dashi/dlpro.html?from=mail88> 定制 > > --------- 转发的邮件 --------- > 发件人： Qichen Zhang <17852657226(a)163.com> > 发送日期： 2020年04月25日 13:26 > 收件人： Xiehong (Cynthia) <xiehong(a)huawei.com> > 抄送人： > 主题：回复：gitee上已更新issue，请及时查收 > 各位工程师 > 你们好! > > bug依然存在，还是报Message > kernel watchdog Bug soft lockup > 在issue上已发布，昨晚上七点多一直等到今天凌晨一点，依然存在bug。 > > 请各位工程师看看如何解决? > 上周五发现的这个bug，不能这么愣着啊 > 你们需要我做什么，阔以直接给我说哈， > 我叫张琦琛，手机号同微信号17852657226 > 希望大家一起努力尽快解决这个bug > > 盼回复 > > > Qichen Zhang > 邮箱：17852657226(a)163.com > > <https://maas.mail.163.com/dashi-web-extend/html/proSignature.html?ftlId=1&n…> > > 签名由网易邮箱大师 <https://mail.163.com/dashi/dlpro.html?from=mail88> 定制 > > 在2020年04月21日 14:17，Xiehong (Cynthia) <xiehong(a)huawei.com> 写道： > > HI > > > > 多谢！ > > > > 我们会在社区上的ISSUE系统上继续跟踪。 > > > > > > *发件人:* Qichen Zhang [mailto:17852657226@163.com] > *发送时间:* 2020年4月21日 13:27 > *收件人:* Xiehong (Cynthia) <xiehong(a)huawei.com> > *主题:* gitee上已更新issue，请及时查收 > > > > 尊敬的工程师 > > 您好！ > > > > 我已在 gitee 上已更新issue，请及时查收 > > https://gitee.com/openeuler/community/issues/I1F13I?from=project-issue > > 很乐意和大家一块解决这个bug。 > > — — > > Qichen Zhang > > > _______________________________________________ > Community mailing list -- community(a)openeuler.org > To unsubscribe send an email to community-leave(a)openeuler.org > > _______________________________________________ > Infra mailing list -- infra(a)openeuler.org > To unsubscribe send an email to infra-leave(a)openeuler.org > -- Regards Fred Li (李永乐)

1 0

[PATCH 01/25] net: hns3: merge mac state HCLGE_MAC_TO_DEL and HCLGE_MAC_DEL_FAIL
by Yang Yingliang 26 Apr '20

26 Apr '20

From: shenhao <shenhao21(a)huawei.com> driver inclusion category: bugfix bugzilla: NA CVE: NA -------------------------------------------- HCLGE_MAC_DEL_FAIL is a middle state for mac address handling, it can be merged with HCLGE_MAC_TO_DEL. Btw, this patch also change the enum name from HCLGE_MAC_ADDR_STATE to HCLGE_MAC_NODE_STATE, for it's used to indicate the state of mac node. Signed-off-by: Jian Shen <shenjian15(a)huawei.com> Signed-off-by: shenhao <shenhao21(a)huawei.com> Reviewed-by: Zhong Zhaohui <zhongzhaohui(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 46 ++++++++++------------ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 9 ++--- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 478a3b5..d985c68 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -7422,14 +7422,13 @@ static void hclge_update_umv_space(struct hclge_vport *vport, bool is_free) return NULL; } -static void hclge_mac_node_convert(struct hclge_vport_mac_addr_cfg *mac_node, - enum HCLGE_MAC_ADDR_STATE state) +static void hclge_update_mac_node(struct hclge_vport_mac_addr_cfg *mac_node, + enum HCLGE_MAC_NODE_STATE state) { switch (state) { /* from set_rx_mode or tmp_add_list */ case HCLGE_MAC_TO_ADD: - if (mac_node->state == HCLGE_MAC_TO_DEL || - mac_node->state == HCLGE_MAC_DEL_FAIL) + if (mac_node->state == HCLGE_MAC_TO_DEL) mac_node->state = HCLGE_MAC_ACTIVE; break; /* only from set_rx_mode */ @@ -7442,14 +7441,7 @@ static void hclge_mac_node_convert(struct hclge_vport_mac_addr_cfg *mac_node, } break; /* only from tmp_add_list, the mac_node->state won't be - * HCLGE_MAC_ACTIVE/HCLGE_MAC_DEL_FAIL/HCLGE_MAC_ADD_FAIL - */ - case HCLGE_MAC_DEL_FAIL: - if (mac_node->state == HCLGE_MAC_TO_ADD) - mac_node->state = HCLGE_MAC_ACTIVE; - break; - /* only from tmp_add_list, the mac_node->state won't be - * HCLGE_MAC_ACTIVE/HCLGE_MAC_DEL_FAIL/HCLGE_MAC_ADD_FAIL + * ACTIVE. */ case HCLGE_MAC_ACTIVE: if (mac_node->state == HCLGE_MAC_TO_ADD) @@ -7460,7 +7452,7 @@ static void hclge_mac_node_convert(struct hclge_vport_mac_addr_cfg *mac_node, } int hclge_update_mac_list(struct hclge_vport *vport, - enum HCLGE_MAC_ADDR_STATE state, + enum HCLGE_MAC_NODE_STATE state, enum HCLGE_MAC_ADDR_TYPE mac_type, const unsigned char *addr) { @@ -7480,7 +7472,7 @@ int hclge_update_mac_list(struct hclge_vport *vport, */ mac_node = hclge_find_mac_node(list, addr); if (mac_node) { - hclge_mac_node_convert(mac_node, state); + hclge_update_mac_node(mac_node, state); spin_unlock_bh(&vport->mac_list_lock); return 0; } @@ -7731,7 +7723,6 @@ static void hclge_unsync_mac_list(struct hclge_vport *vport, list_del(&mac_node->node); kfree(mac_node); } else { - mac_node->state = HCLGE_MAC_DEL_FAIL; set_bit(HCLGE_VPORT_STATE_MAC_TBL_CHANGE, &vport->state); break; @@ -7753,13 +7744,13 @@ static bool hclge_sync_from_add_list(struct list_head *add_list, * uc/mc_mac_list, it means have received a TO_DEL request * during the time window of adding the mac address into mac * table. if mac_node state is ACTIVE, then change it to TO_DEL, - * then it will be removed at next time. else it must be TO_ADD - * or ADD_FAIL, this address hasn't been added into mac table, + * then it will be removed at next time. else it must be TO_ADD, + * this address hasn't been added into mac table, * so just remove the mac node. */ new_node = hclge_find_mac_node(mac_list, mac_node->mac_addr); if (new_node) { - hclge_mac_node_convert(new_node, mac_node->state); + hclge_update_mac_node(new_node, mac_node->state); list_del(&mac_node->node); kfree(mac_node); } else if (mac_node->state == HCLGE_MAC_ACTIVE) { @@ -7782,7 +7773,16 @@ static void hclge_sync_from_del_list(struct list_head *del_list, list_for_each_entry_safe(mac_node, tmp, del_list, node) { new_node = hclge_find_mac_node(mac_list, mac_node->mac_addr); if (new_node) { - hclge_mac_node_convert(new_node, mac_node->state); + /* If the mac addr exists in the mac list, it means + * received a new TO_ADD request during the time window + * of configuring the mac address. For the mac node + * state is TO_ADD, and the address is already in the + * in the hardware(due to delete fail), so we just need + * to change the mac node state to ACTIVE. + */ + new_node->state = HCLGE_MAC_ACTIVE; + list_del(&mac_node->node); + kfree(mac_node); } else { list_del(&mac_node->node); list_add_tail(&mac_node->node, mac_list); @@ -7850,7 +7850,6 @@ static void hclge_sync_vport_mac_table(struct hclge_vport *vport, list_for_each_entry_safe(mac_node, tmp, list, node) { switch (mac_node->state) { case HCLGE_MAC_TO_DEL: - case HCLGE_MAC_DEL_FAIL: list_del(&mac_node->node); list_add_tail(&mac_node->node, &tmp_del_list); break; @@ -7962,7 +7961,6 @@ void hclge_rm_vport_all_mac_table(struct hclge_vport *vport, bool is_del_list, list_for_each_entry_safe(mac_cfg, tmp, list, node) { switch (mac_cfg->state) { case HCLGE_MAC_TO_DEL: - case HCLGE_MAC_DEL_FAIL: case HCLGE_MAC_ACTIVE: list_del(&mac_cfg->node); list_add_tail(&mac_cfg->node, &tmp_del_list); @@ -8021,7 +8019,6 @@ static void hclge_uninit_mac_list(struct hclge_vport *vport, list_for_each_entry_safe(mac_node, tmp, list, node) { switch (mac_node->state) { case HCLGE_MAC_TO_DEL: - case HCLGE_MAC_DEL_FAIL: case HCLGE_MAC_ACTIVE: list_del(&mac_node->node); list_add_tail(&mac_node->node, &tmp_del_list); @@ -8221,7 +8218,7 @@ void hclge_replace_mac_node(struct list_head *list, const u8 *old_addr, } void hclge_modify_mac_node_state(struct list_head *list, const u8 *addr, - enum HCLGE_MAC_ADDR_STATE state) + enum HCLGE_MAC_NODE_STATE state) { struct hclge_vport_mac_addr_cfg *mac_node; @@ -8989,8 +8986,7 @@ static void hclge_mac_node_convert_for_reset(struct list_head *list) list_for_each_entry_safe(mac_node, tmp, list, node) { if (mac_node->state == HCLGE_MAC_ACTIVE) { mac_node->state = HCLGE_MAC_TO_ADD; - } else if (mac_node->state == HCLGE_MAC_TO_DEL || - mac_node->state == HCLGE_MAC_DEL_FAIL) { + } else if (mac_node->state == HCLGE_MAC_TO_DEL) { list_del(&mac_node->node); kfree(mac_node); } diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h index 5e462cf..a1fa782 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h @@ -640,16 +640,15 @@ struct hclge_fd_ad_data { u16 rule_id; }; -enum HCLGE_MAC_ADDR_STATE { +enum HCLGE_MAC_NODE_STATE { HCLGE_MAC_TO_ADD, HCLGE_MAC_TO_DEL, - HCLGE_MAC_DEL_FAIL, HCLGE_MAC_ACTIVE }; struct hclge_vport_mac_addr_cfg { struct list_head node; - enum HCLGE_MAC_ADDR_STATE state; + enum HCLGE_MAC_NODE_STATE state; u8 mac_addr[ETH_ALEN]; }; @@ -1016,13 +1015,13 @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto, int hclge_notify_client(struct hclge_dev *hdev, enum hnae3_reset_notify_type type); int hclge_update_mac_list(struct hclge_vport *vport, - enum HCLGE_MAC_ADDR_STATE state, + enum HCLGE_MAC_NODE_STATE state, enum HCLGE_MAC_ADDR_TYPE mac_type, const unsigned char *addr); void hclge_replace_mac_node(struct list_head *list, const u8 *old_addr, const u8 *new_addr, bool keep_old); void hclge_modify_mac_node_state(struct list_head *list, const u8 *addr, - enum HCLGE_MAC_ADDR_STATE state); + enum HCLGE_MAC_NODE_STATE state); void hclge_rm_vport_all_mac_table(struct hclge_vport *vport, bool is_del_list, enum HCLGE_MAC_ADDR_TYPE mac_type); void hclge_rm_vport_all_vlan_table(struct hclge_vport *vport, bool is_del_list); -- 1.8.3

1 24

[PATCH] ACPI: GED: implement powerkey evged freeze function
by Hongbo Yao 24 Apr '20

24 Apr '20

From: Huang jun <huangjun61(a)huawei.com> If we want acpi ged to support wake from freeze, we need to implement the suspend/resume function. In these two methods, ACPI's _GPO, GPP method is called to realize the setting of sleep flag and anti-shake. Signed-off-by: Huangjun <huangjun63(a)huawei.com> --- drivers/acpi/evged.c | 108 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c index f13ba2c07667..dde8fbff8d19 100644 --- a/drivers/acpi/evged.c +++ b/drivers/acpi/evged.c @@ -46,11 +46,20 @@ #include <linux/list.h> #include <linux/platform_device.h> #include <linux/acpi.h> +#include <linux/timer.h> +#include <linux/jiffies.h> #define MODULE_NAME "acpi-ged" +struct acpi_ged_handle { + struct timer_list timer;/* For 4s anti-shake of power button */ + acpi_handle gpp_handle; /* ACPI Handle: enable shutdown */ + acpi_handle gpo_handle; /* ACPI Handle: set sleep flag */ +}; + struct acpi_ged_device { struct device *dev; + struct acpi_ged_handle *wakeup_handle; struct list_head event_list; }; @@ -131,6 +140,34 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, return AE_OK; } +#ifdef CONFIG_PM_SLEEP +static void init_ged_handle(struct acpi_ged_device *geddev) { + struct acpi_ged_handle *wakeup_handle; + acpi_handle gpo_handle = NULL; + acpi_handle gpp_handle = NULL; + acpi_status acpi_ret; + + wakeup_handle = devm_kzalloc(geddev->dev, sizeof(*wakeup_handle), GFP_KERNEL); + if (!wakeup_handle) + return; + + geddev->wakeup_handle = wakeup_handle; + + /* Initialize wakeup_handle, prepare for ged suspend and resume */ + timer_setup(&wakeup_handle->timer, NULL, 0); + + acpi_ret = acpi_get_handle(ACPI_HANDLE(geddev->dev), "_GPO", &gpo_handle); + if (ACPI_FAILURE(acpi_ret)) + dev_info(geddev->dev, "cannot locate _GPO method\n"); + wakeup_handle->gpo_handle = gpo_handle; + + acpi_ret = acpi_get_handle(ACPI_HANDLE(geddev->dev), "_GPP", &gpp_handle); + if (ACPI_FAILURE(acpi_ret)) + dev_info(geddev->dev, "cannot locate _GPP method\n"); + wakeup_handle->gpp_handle = gpp_handle; +} +#endif + static int ged_probe(struct platform_device *pdev) { struct acpi_ged_device *geddev; @@ -149,6 +186,9 @@ static int ged_probe(struct platform_device *pdev) return -EINVAL; } platform_set_drvdata(pdev, geddev); +#ifdef CONFIG_PM_SLEEP + init_ged_handle(geddev); +#endif return 0; } @@ -164,6 +204,10 @@ static void ged_shutdown(struct platform_device *pdev) dev_dbg(geddev->dev, "GED releasing GSI %u @ IRQ %u\n", event->gsi, event->irq); } + + if (geddev->wakeup_handle) + del_timer(&geddev->wakeup_handle->timer); + } static int ged_remove(struct platform_device *pdev) @@ -172,6 +216,67 @@ static int ged_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP +static void ged_timer_callback(struct timer_list *t) +{ + struct acpi_ged_handle *wakeup_handle = from_timer(wakeup_handle, t, timer); + acpi_status acpi_ret; + + /* _GPP method enable power button */ + if (wakeup_handle && wakeup_handle->gpp_handle) { + acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); + if (ACPI_FAILURE(acpi_ret)) + pr_warn("_GPP method execution failed\n"); + } +} + +static int ged_suspend(struct device *dev) +{ + struct acpi_ged_device *geddev = dev_get_drvdata(dev); + struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; + struct acpi_ged_event *event, *next; + acpi_status acpi_ret; + + /* _GPO method set sleep flag */ + if (wakeup_handle && wakeup_handle->gpo_handle) { + acpi_ret = acpi_execute_simple_method(wakeup_handle->gpo_handle, NULL, ACPI_IRQ_MODEL_GIC); + if (ACPI_FAILURE(acpi_ret)) { + pr_warn("_GPO method execution failed\n"); + return AE_ERROR; + } + } + + list_for_each_entry_safe(event, next, &geddev->event_list, node) + enable_irq_wake(event->irq); + + return 0; +} + +static int ged_resume(struct device *dev) +{ + struct acpi_ged_device *geddev = dev_get_drvdata(dev); + struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; + struct acpi_ged_event *event, *next; + + /* use timer to complete 4s anti-shake */ + if (wakeup_handle && wakeup_handle->gpp_handle) { + wakeup_handle->timer.expires = jiffies + (4 * HZ); + wakeup_handle->timer.function = ged_timer_callback; + add_timer(&wakeup_handle->timer); + } + + list_for_each_entry_safe(event, next, &geddev->event_list, node) + disable_irq_wake(event->irq); + + return 0; +} + +static const struct dev_pm_ops ged_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(ged_suspend, ged_resume) +}; +#endif + + static const struct acpi_device_id ged_acpi_ids[] = { {"ACPI0013"}, {}, @@ -184,6 +289,9 @@ static struct platform_driver ged_driver = { .driver = { .name = MODULE_NAME, .acpi_match_table = ACPI_PTR(ged_acpi_ids), +#ifdef CONFIG_PM_SLEEP + .pm = &ged_pm_ops, +#endif }, }; builtin_platform_driver(ged_driver); -- 2.20.1

1 1

2024

2023

2022

2021

2020

2019

Kernel