- Kernel - mailweb.openeuler.org

[PATCH openEuler-1.0-LTS 1/4] rds: rds_rm_zerocopy_callback() use list_first_entry()
by Yongqiang Liu 06 Mar '23

06 Mar '23

From: Pietro Borrello <borrello(a)diag.uniroma1.it> stable inclusion from stable-v4.19.273 commit 909d5eef5ce792bb76d7b5a9b7a6852b813d8cac category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6I7UF CVE: CVE-2023-1078 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… ------------------------------------------------- [ Upstream commit f753a68980cf4b59a80fe677619da2b1804f526d ] rds_rm_zerocopy_callback() uses list_entry() on the head of a list causing a type confusion. Use list_first_entry() to actually access the first element of the rs_zcookie_queue list. Fixes: 9426bbc6de99 ("rds: use list structure to track information for zerocopy completion notification") Reviewed-by: Willem de Bruijn <willemb(a)google.com> Signed-off-by: Pietro Borrello <borrello(a)diag.uniroma1.it> Link: https://lore.kernel.org/r/20230202-rds-zerocopy-v3-1-83b0df974f9a@diag.unir… Signed-off-by: Paolo Abeni <pabeni(a)redhat.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Lu Wei <luwei32(a)huawei.com> Reviewed-by: Liu Jian <liujian56(a)huawei.com> Reviewed-by: Wang Weiyang <wangweiyang2(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- net/rds/message.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/rds/message.c b/net/rds/message.c index 4b00b1152a5f..309b54cc62ae 100644 --- a/net/rds/message.c +++ b/net/rds/message.c @@ -104,9 +104,9 @@ static void rds_rm_zerocopy_callback(struct rds_sock *rs, spin_lock_irqsave(&q->lock, flags); head = &q->zcookie_head; if (!list_empty(head)) { - info = list_entry(head, struct rds_msg_zcopy_info, - rs_zcookie_next); - if (info && rds_zcookie_add(info, cookie)) { + info = list_first_entry(head, struct rds_msg_zcopy_info, + rs_zcookie_next); + if (rds_zcookie_add(info, cookie)) { spin_unlock_irqrestore(&q->lock, flags); kfree(rds_info_from_znotifier(znotif)); /* caller invokes rds_wake_sk_sleep() */ -- 2.25.1

1 3

[PATCH v7 OLK-5.10 0/8] Add support for hbm memory device and hbm cache
by Zhang Zekun 04 Mar '23

04 Mar '23

v7: - change there is a container(PNP0A06) has a memory device (PNP0C80) before create device attributes under container subsys v6: - get container device form container_subsys v5: - check the container have PNP0C80 before create attribute files v4: - prettify the code v3: - prettify the code - add a hisi_internal.h to hold common code v2: - remove the !adev judge in patch 9, as it will always be true. patch 1-3: Add support for iterate through the child devices in the acpi device. patch 4-9: Add support for hbm memory device and hbm cache support Rafael J. Wysocki (3): ACPI: bus: Introduce acpi_dev_for_each_child() ACPI: bus: Avoid non-ACPI device objects in walks over children ACPI: bus: Export acpi_dev_for_each_child() to modules Zhang Zekun (5): ACPI: OSL: Export the symbol of acpi_hotplug_schedule soc: hisilicon: hisi_hbmdev: Add power domain control methods ACPI: memhotplug: export the state of each hotplug device soc: hisilicon: hisi_hbmdev: Provide extra memory topology information soc: hbmcache: Add support for online and offline the hbm cache drivers/acpi/acpi_memhotplug.c | 6 + drivers/acpi/bus.c | 27 +++ drivers/acpi/internal.h | 1 - drivers/acpi/osl.c | 1 + drivers/base/container.c | 1 + drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/hisilicon/Kconfig | 33 +++ drivers/soc/hisilicon/Makefile | 4 + drivers/soc/hisilicon/hisi_hbmcache.c | 147 +++++++++++++ drivers/soc/hisilicon/hisi_hbmdev.c | 301 ++++++++++++++++++++++++++ drivers/soc/hisilicon/hisi_internal.h | 31 +++ include/acpi/acpi_bus.h | 2 + include/linux/acpi.h | 1 + include/linux/memory_hotplug.h | 2 + 15 files changed, 558 insertions(+), 1 deletion(-) create mode 100644 drivers/soc/hisilicon/Kconfig create mode 100644 drivers/soc/hisilicon/Makefile create mode 100644 drivers/soc/hisilicon/hisi_hbmcache.c create mode 100644 drivers/soc/hisilicon/hisi_hbmdev.c create mode 100644 drivers/soc/hisilicon/hisi_internal.h -- 2.17.1

1 8

[PATCH v2 OLK-5.10 00/37] backport patches of share_pool and
by Zhang Zekun 04 Mar '23

04 Mar '23

v2: - remove patch "mm/sharepool: Add mg_sp_alloc_nodemask" Chen Jun (3): mm/sharepool: Fix a double free problem caused by init_local_group mm/sharepool: extract group_add_task mm/sharepool: use delete_spg_node to replace some repetitive code Guo Mengqi (1): mm: sharepool: add static modifier to find_spg_node_by_spg() Wang Wensheng (8): mm/sharepool: Fix NULL pointer dereference in mg_sp_group_del_task mm/sharepool: Reorganize create_spg() mm/sharepool: Simplify sp_make_share_k2u() mm/sharepool: Rename sp_group operations mm/sharepool: Simplify sp_unshare_uva() mm/sharepool: Fix null-pointer-deference in sp_free_area mm/sharepool: Modify error message in mg_sp_group_del_task mm/sharepool: Fix double delete list in sp_group_exit Xu Qiang (17): mm/sharepool: Refactoring proc file interface similar code mm/sharepool: Add helper for master_list mm/sharepool: Delete unused spg_id and hugepage_failures. mm/sharepool: Delete unused mm in sp_proc_stat. mm/sharepool: Move spa_num field to sp_group. mm/sharepool: Rename sp_spg_stat to sp_meminfo. mm/sharepool: Split meminfo_update into meminfo_inc_usage and meminfo_dec_usage. mm/sharepool: split meminfo_update_k2u into meminfo_inc_k2u and meminfo_dec_k2u. mm/sharepool: Delete redundant tgid in sp_proc_stat. mm/sharepool: Move comm from sp_proc_stat to sp_group_master. mm/sharepool: replace sp_proc_stat with sp_meminfo. mm/sharepool: Delete unused tgid and spg_id in spg_proc_stat. mm/sharepool: Replace spg_proc_stat with sp_meminfo. mm/sharepool: Add meminfo_alloc_sum_byKB and meminfo_alloc_sum. mm/sharepool: Add meminfo_k2u_size. mm/sharepool: Delete unused kthread_stat. mm/sharepool: Delete redundant size and alloc_size in sp_meminfo. Zhang Zekun (6): perf: hisi: Add configs for PMU isolation driver: Add CONFIG_ACPI_APEI_GHES_TS_CORE for code isolation ACPI / APEI: Add config to isolate Notify all ras err vmalloc: Add config for Extend for hugepages mapping iommu/arm-smmu-v3: Add config to Add support for suspend and resume hugetlbfs: Add config to isolate the code of share_pool Zhou Guanghui (2): mm/sharepool: Don't display sharepool statistics in the container mm: sharepool: Charge Buddy hugepage to memcg arch/arm64/Kconfig | 2 +- arch/arm64/configs/openeuler_defconfig | 6 + drivers/acpi/apei/Kconfig | 14 + drivers/acpi/apei/ghes.c | 10 +- drivers/iommu/Kconfig | 7 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 +- drivers/perf/hisilicon/Kconfig | 19 + drivers/perf/hisilicon/Makefile | 6 +- fs/hugetlbfs/inode.c | 21 +- include/acpi/ghes.h | 2 + include/linux/cper.h | 3 + include/linux/mm.h | 2 + include/linux/vmalloc.h | 7 + mm/Kconfig | 6 + mm/hugetlb.c | 2 + mm/share_pool.c | 1027 ++++++++----------- mm/share_pool_internal.h | 22 + mm/vmalloc.c | 16 + 18 files changed, 569 insertions(+), 612 deletions(-) create mode 100644 mm/share_pool_internal.h -- 2.17.1

1 37

Re: [PATCH v5 OLK-5.10 5/8] soc: hisilicon: hisi_hbmdev: Add power domain control methods
by zhangzekun (A) 03 Mar '23

03 Mar '23

在 2023/3/3 14:19, Kefeng Wang 写道: > > > On 2023/3/3 11:49, Zhang Zekun wrote: >> Offering: HULK >> hulk inclusion >> category: feature >> bugzilla: https://gitee.com/openeuler/kernel/issues/I67QNJ >> CVE: NA >> >> ------------------------------------------------------------------ >> >> Platform devices which supports power control are often required to be >> power off/on together with the devices in the same power domain. >> However, >> there isn't a generic driver that support the power control logic of >> these devices. >> >> ACPI container seems to be a good place to hold these control logic. Add >> platform devices in the same power domain in a ACPI container, we can >> easily get the locality information about these devices and can moniter >> the power of these devices in the same power domain together. >> >> This patch provide three userspace control interface to control the >> power >> of devices together in the container: >> - state: Echo online to state to power up the devices in the >> container and >> then online these devices which will be triggered by BIOS. Echo >> offline >> to the state to offline and eject the child devices in the container >> which are ejectable. >> - pxms: show the pxms of devices which are present in the container. >> >> In our scenario, we need to control the power of HBM memory devices >> which >> can be power consuming and will only be used in some specialized >> scenarios, >> such as HPC. HBM memory devices in a socket are in the same power >> domain, >> and should be power off/on together. We have come up with an idea >> that put >> these power control logic in a specialized driver, but ACPI container >> seems >> to be a more generic place to hold these control logic. >> >> Signed-off-by: Zhang Zekun <zhangzekun11(a)huawei.com> >> --- >> v6: >> - get container dev form container_subsys >> >> v5: >> - check containers have PNP0C80 before create attibute >> files >> >> v4: >> - prettify the code >> >> v3: >> - move the common code to hisi_internal.h >> >> drivers/base/container.c | 1 + >> drivers/soc/Kconfig | 1 + >> drivers/soc/Makefile | 1 + >> drivers/soc/hisilicon/Kconfig | 19 +++ >> drivers/soc/hisilicon/Makefile | 3 + >> drivers/soc/hisilicon/hisi_hbmdev.c | 196 ++++++++++++++++++++++++++ >> drivers/soc/hisilicon/hisi_internal.h | 31 ++++ >> 7 files changed, 252 insertions(+) >> create mode 100644 drivers/soc/hisilicon/Kconfig >> create mode 100644 drivers/soc/hisilicon/Makefile >> create mode 100644 drivers/soc/hisilicon/hisi_hbmdev.c >> create mode 100644 drivers/soc/hisilicon/hisi_internal.h >> >> diff --git a/drivers/base/container.c b/drivers/base/container.c >> index 1ba42d2d3532..12e572d0c69b 100644 >> --- a/drivers/base/container.c >> +++ b/drivers/base/container.c >> @@ -30,6 +30,7 @@ struct bus_type container_subsys = { >> .online = trivial_online, >> .offline = container_offline, >> }; >> +EXPORT_SYMBOL_GPL(container_subsys); >> void __init container_dev_init(void) >> { >> diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig >> index 425ab6f7e375..f7c59b063321 100644 >> --- a/drivers/soc/Kconfig >> +++ b/drivers/soc/Kconfig >> @@ -23,5 +23,6 @@ source "drivers/soc/versatile/Kconfig" >> source "drivers/soc/xilinx/Kconfig" >> source "drivers/soc/zte/Kconfig" >> source "drivers/soc/kendryte/Kconfig" >> +source "drivers/soc/hisilicon/Kconfig" >> endmenu >> diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile >> index 36452bed86ef..68f186e00e44 100644 >> --- a/drivers/soc/Makefile >> +++ b/drivers/soc/Makefile >> @@ -29,3 +29,4 @@ obj-$(CONFIG_PLAT_VERSATILE) += versatile/ >> obj-y += xilinx/ >> obj-$(CONFIG_ARCH_ZX) += zte/ >> obj-$(CONFIG_SOC_KENDRYTE) += kendryte/ >> +obj-y += hisilicon/ >> diff --git a/drivers/soc/hisilicon/Kconfig >> b/drivers/soc/hisilicon/Kconfig >> new file mode 100644 >> index 000000000000..497787af004e >> --- /dev/null >> +++ b/drivers/soc/hisilicon/Kconfig >> @@ -0,0 +1,19 @@ >> +# SPDX-License-Identifier: GPL-2.0 >> +# >> +# Hisilicon SoC drivers >> +# >> +menu "Hisilicon SoC driver support" >> + >> +config HISI_HBMDEV >> + tristate "add extra support for hbm memory device" >> + depends on ACPI_HOTPLUG_MEMORY >> + select ACPI_CONTAINER >> + help >> + This driver add extra supports for memory devices. The driver >> + provides methods for userpace to control the power of memory >> + devices in a container. >> + >> + To compile this driver as a module, choose M here: >> + the module will be called hisi_hbmdev. >> + >> +endmenu >> diff --git a/drivers/soc/hisilicon/Makefile >> b/drivers/soc/hisilicon/Makefile >> new file mode 100644 >> index 000000000000..22e87acb1ab3 >> --- /dev/null >> +++ b/drivers/soc/hisilicon/Makefile >> @@ -0,0 +1,3 @@ >> +# SPDX-License-Identifier: GPL-2.0 >> + >> +obj-$(CONFIG_HISI_HBMDEV) += hisi_hbmdev.o >> diff --git a/drivers/soc/hisilicon/hisi_hbmdev.c >> b/drivers/soc/hisilicon/hisi_hbmdev.c >> new file mode 100644 >> index 000000000000..8485efc00684 >> --- /dev/null >> +++ b/drivers/soc/hisilicon/hisi_hbmdev.c >> @@ -0,0 +1,196 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> +/* >> + * Copyright (C) Huawei Technologies Co., Ltd. 2023. All rights >> reserved. >> + */ >> + >> +#include <linux/kobject.h> >> +#include <linux/module.h> >> +#include <linux/nodemask.h> >> +#include <linux/acpi.h> >> +#include <linux/container.h> >> + >> +#include "hisi_internal.h" >> + >> +#define ACPI_MEMORY_DEVICE_HID "PNP0C80" >> +#define ACPI_GENERIC_CONTAINER_DEVICE_HID "PNP0A06" >> + >> +struct memory_dev { >> + struct kobject *memdev_kobj; >> +}; >> + >> +static struct memory_dev *mdev; >> + >> +static int hbmdev_find(struct acpi_device *adev, void *arg) >> +{ >> + const char *hid = acpi_device_hid(adev); >> + bool *found = arg; >> + >> + if (!strcmp(hid, ACPI_MEMORY_DEVICE_HID)) { >> + *found = true; >> + return -1; >> + } >> + >> + return 0; >> +} >> + >> +static bool has_hbmdev(struct device *dev) >> +{ >> + struct acpi_device *adev = ACPI_COMPANION(dev); >> + const char *hid = acpi_device_hid(adev); >> + bool found = false; >> + >> + if (strcmp(hid, ACPI_GENERIC_CONTAINER_DEVICE_HID)) >> + return found; >> + >> + acpi_dev_for_each_child(adev, hbmdev_find, &found); >> + >> + return found; >> +} >> + >> +static int get_pxm(struct acpi_device *acpi_device, void *arg) >> +{ >> + acpi_handle handle = acpi_device->handle; >> + nodemask_t *mask = arg; >> + unsigned long long sta; >> + acpi_status status; >> + int nid; >> + >> + status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); >> + if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_ENABLED)) { >> + nid = acpi_get_node(handle); >> + if (nid >= 0) >> + node_set(nid, *mask); >> + } >> + >> + return 0; >> +} >> + >> +static ssize_t pxms_show(struct device *dev, >> + struct device_attribute *attr, >> + char *buf) >> +{ >> + struct acpi_device *adev = ACPI_COMPANION(dev); >> + nodemask_t mask; >> + >> + nodes_clear(mask); >> + acpi_dev_for_each_child(adev, get_pxm, &mask); >> + >> + return sysfs_emit(buf, "%*pbl\n", >> + nodemask_pr_args(&mask)); >> +} >> +static DEVICE_ATTR_RO(pxms); >> + >> +static int memdev_power_on(struct acpi_device *adev) >> +{ >> + acpi_handle handle = adev->handle; >> + acpi_status status; >> + >> + status = acpi_evaluate_object(handle, "_ON", NULL, NULL); >> + if (ACPI_FAILURE(status)) { >> + acpi_handle_warn(handle, "Power on failed (0x%x)\n", status); >> + return -ENODEV; >> + } >> + >> + return 0; >> +} >> + >> +static int eject_device(struct acpi_device *acpi_device, void >> *not_used) >> +{ >> + acpi_object_type unused; >> + acpi_status status; >> + >> + status = acpi_get_type(acpi_device->handle, &unused); >> + if (ACPI_FAILURE(status) || !acpi_device->flags.ejectable) >> + return -ENODEV; >> + >> + get_device(&acpi_device->dev); >> + status = acpi_hotplug_schedule(acpi_device, >> ACPI_OST_EC_OSPM_EJECT); >> + if (ACPI_SUCCESS(status)) >> + return 0; >> + >> + put_device(&acpi_device->dev); >> + acpi_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT, >> + ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL); >> + >> + return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN; >> +} >> + >> +static int memdev_power_off(struct acpi_device *adev) >> +{ >> + return acpi_dev_for_each_child(adev, eject_device, NULL); >> +} >> + >> +static ssize_t state_store(struct device *dev, struct >> device_attribute *attr, >> + const char *buf, size_t count) >> +{ >> + struct acpi_device *adev = ACPI_COMPANION(dev); >> + const int type = online_type_from_str(buf); >> + int ret = -EINVAL; >> + >> + switch (type) { >> + case STATE_ONLINE: >> + ret = memdev_power_on(adev); >> + break; >> + case STATE_OFFLINE: >> + ret = memdev_power_off(adev); >> + break; >> + default: >> + break; >> + } >> + >> + if (ret) >> + return ret; >> + >> + return count; >> +} >> +static DEVICE_ATTR_WO(state); >> + >> +static int container_add(struct device *dev, void *data) >> +{ >> + if (!has_hbmdev(dev)) >> + return 0; >> + >> + device_create_file(dev, &dev_attr_state); >> + device_create_file(dev, &dev_attr_pxms); >> + >> + return 0; >> +} >> + >> +static int container_remove(struct device *dev, void *data) >> +{ >> + if (!has_hbmdev(dev)) >> + return 0; >> + >> + device_remove_file(dev, &dev_attr_state); >> + device_remove_file(dev, &dev_attr_pxms); >> + >> + return 0; >> +} >> + >> +static int __init mdev_init(void) >> +{ >> + mdev = kzalloc(sizeof(struct memory_dev), GFP_KERNEL); >> + if (!mdev) >> + return -ENOMEM; >> + >> + mdev->memdev_kobj = kobject_create_and_add("hbm_memory", >> kernel_kobj); >> + if (!mdev->memdev_kobj) { >> + kfree(mdev); >> + return -ENOMEM; >> + } >> + >> + bus_for_each_dev(&container_subsys, NULL, NULL, container_add); >> + return 0; >> +} > > 这个还是没有解决是否加载的问题； > 1）通过遍历，你已经拿到了所有的container device， > 后面移除的时候就不需要再次遍历了；这里可以搞个链表； > 2）另外判断是否有hbm，搞个全局变量，如果有了，才继续执行后面的初始化，否则就直接返回了； > 按照这个思路这里可以改成这样： module_init 1. 首先判断所有容器中是否有hbm device，构建链表 2. 如果链表不为空那么执行模块的初始化，创建hbm_memory目录如果链表为空直接返回，释放链表 module_exit 释放链表中的资源，释放链表 >> +module_init(mdev_init); >> + >> +static void __exit mdev_exit(void) >> +{ >> + bus_for_each_dev(&container_subsys, NULL, NULL, container_remove); >> + kobject_put(mdev->memdev_kobj); >> + kfree(mdev); >> +} >> +module_exit(mdev_exit); >> + >> +MODULE_LICENSE("GPL v2"); >> +MODULE_AUTHOR("Zhang Zekun <zhangzekun11(a)huawei.com>"); >> diff --git a/drivers/soc/hisilicon/hisi_internal.h >> b/drivers/soc/hisilicon/hisi_internal.h >> new file mode 100644 >> index 000000000000..5345174f6b84 >> --- /dev/null >> +++ b/drivers/soc/hisilicon/hisi_internal.h >> @@ -0,0 +1,31 @@ >> +/* SPDX-License-Identifier: GPL-2.0 */ >> +/* >> + * Copyright (C) Huawei Technologies Co., Ltd. 2023. All rights >> reserved. >> + */ >> + >> +#ifndef _HISI_INTERNAL_H >> +#define _HISI_INTERNAL_H >> + >> +enum { >> + STATE_ONLINE, >> + STATE_OFFLINE, >> +}; >> + >> +static const char *const online_type_to_str[] = { >> + [STATE_ONLINE] = "online", >> + [STATE_OFFLINE] = "offline", >> +}; >> + >> +static inline int online_type_from_str(const char *str) >> +{ >> + int i; >> + >> + for (i = 0; i < ARRAY_SIZE(online_type_to_str); i++) { >> + if (sysfs_streq(str, online_type_to_str[i])) >> + return i; >> + } >> + >> + return -EINVAL; >> +} >> + >> +#endif

1 0

[PATCH v5 OLK-5.10 0/8] Add support for hbm memory device and hbm cache
by Zhang Zekun 03 Mar '23

03 Mar '23

v6: - get container device form container_subsys v5: - check the container have PNP0C80 before create attribute files v4: - prettify the code v3: - prettify the code - add a hisi_internal.h to hold common code v2: - remove the !adev judge in patch 9, as it will always be true. patch 1-3: Add support for iterate through the child devices in the acpi device. patch 4-9: Add support for hbm memory device and hbm cache support Rafael J. Wysocki (3): ACPI: bus: Introduce acpi_dev_for_each_child() ACPI: bus: Avoid non-ACPI device objects in walks over children ACPI: bus: Export acpi_dev_for_each_child() to modules Zhang Zekun (5): ACPI: OSL: Export the symbol of acpi_hotplug_schedule soc: hisilicon: hisi_hbmdev: Add power domain control methods ACPI: memhotplug: export the state of each hotplug device soc: hisilicon: hisi_hbmdev: Provide extra memory topology information ACPI: hbmcache: Add support for online and offline the hbm cache drivers/acpi/acpi_memhotplug.c | 6 + drivers/acpi/bus.c | 27 +++ drivers/acpi/internal.h | 1 - drivers/acpi/osl.c | 1 + drivers/base/container.c | 1 + drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/hisilicon/Kconfig | 33 ++++ drivers/soc/hisilicon/Makefile | 4 + drivers/soc/hisilicon/hisi_hbmcache.c | 147 +++++++++++++++ drivers/soc/hisilicon/hisi_hbmdev.c | 257 ++++++++++++++++++++++++++ drivers/soc/hisilicon/hisi_internal.h | 31 ++++ include/acpi/acpi_bus.h | 2 + include/linux/acpi.h | 1 + include/linux/memory_hotplug.h | 2 + 15 files changed, 514 insertions(+), 1 deletion(-) create mode 100644 drivers/soc/hisilicon/Kconfig create mode 100644 drivers/soc/hisilicon/Makefile create mode 100644 drivers/soc/hisilicon/hisi_hbmcache.c create mode 100644 drivers/soc/hisilicon/hisi_hbmdev.c create mode 100644 drivers/soc/hisilicon/hisi_internal.h -- 2.17.1

1 8

[PATCH v5 OLK-5.10 0/9] Add support for hbm memory device and hbm cache
by Zhang Zekun 02 Mar '23

02 Mar '23

v5: - check the container have PNP0C80 before create attribute files v4: - prettify the code v3: - prettify the code - add a hisi_internal.h to hold common code v2: - remove the !adev judge in patch 9, as it will always be true. patch 1-3: Add support for iterate through the child devices in the acpi device. patch 4-9: Add support for hbm memory device and hbm cache support Rafael J. Wysocki (3): ACPI: bus: Introduce acpi_dev_for_each_child() ACPI: bus: Avoid non-ACPI device objects in walks over children ACPI: bus: Export acpi_dev_for_each_child() to modules Zhang Zekun (6): ACPI: container: export the container list in the system ACPI: OSL: Export the symbol of acpi_hotplug_schedule soc: hisilicon: hisi_hbmdev: Add power domain control methods ACPI: memhotplug: export the state of each hotplug device soc: hisilicon: hisi_hbmdev: Provide extra memory topology information ACPI: hbmcache: Add support for online and offline the hbm cache drivers/acpi/acpi_memhotplug.c | 6 + drivers/acpi/bus.c | 27 +++ drivers/acpi/container.c | 51 ++++++ drivers/acpi/internal.h | 1 - drivers/acpi/osl.c | 1 + drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/hisilicon/Kconfig | 33 ++++ drivers/soc/hisilicon/Makefile | 4 + drivers/soc/hisilicon/hisi_hbmcache.c | 147 ++++++++++++++++ drivers/soc/hisilicon/hisi_hbmdev.c | 245 ++++++++++++++++++++++++++ drivers/soc/hisilicon/hisi_internal.h | 33 ++++ include/acpi/acpi_bus.h | 2 + include/linux/acpi.h | 1 + include/linux/container.h | 8 + include/linux/memory_hotplug.h | 2 + 16 files changed, 562 insertions(+), 1 deletion(-) create mode 100644 drivers/soc/hisilicon/Kconfig create mode 100644 drivers/soc/hisilicon/Makefile create mode 100644 drivers/soc/hisilicon/hisi_hbmcache.c create mode 100644 drivers/soc/hisilicon/hisi_hbmdev.c create mode 100644 drivers/soc/hisilicon/hisi_internal.h -- 2.17.1

1 9

[PATCH v4 OLK-5.10 0/9] Add support for hbm memory device and
by Zhang Zekun 02 Mar '23

02 Mar '23

v4: - prettify the code v3: - prettify the code - add a hisi_internal.h to hold common code v2: - remove the !adev judge in patch 9, as it will always be true. patch 1-3: Add support for iterate through the child devices in the acpi device. patch 4-9: Add support for hbm memory device and hbm cache support Rafael J. Wysocki (3): ACPI: bus: Introduce acpi_dev_for_each_child() ACPI: bus: Avoid non-ACPI device objects in walks over children ACPI: bus: Export acpi_dev_for_each_child() to modules Zhang Zekun (6): ACPI: container: export the container list in the system ACPI: OSL: Export the symbol of acpi_hotplug_schedule soc: hisilicon: hisi_hbmdev: Add power domain control methods ACPI: memhotplug: export the state of each hotplug device soc: hisilicon: hisi_hbmdev: Provide extra memory topology information ACPI: hbmcache: Add support for online and offline the hbm cache drivers/acpi/acpi_memhotplug.c | 6 + drivers/acpi/bus.c | 27 ++++ drivers/acpi/container.c | 51 ++++++ drivers/acpi/internal.h | 1 - drivers/acpi/osl.c | 1 + drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/hisilicon/Kconfig | 33 ++++ drivers/soc/hisilicon/Makefile | 4 + drivers/soc/hisilicon/hisi_hbmcache.c | 147 +++++++++++++++++ drivers/soc/hisilicon/hisi_hbmdev.c | 218 ++++++++++++++++++++++++++ drivers/soc/hisilicon/hisi_internal.h | 31 ++++ include/acpi/acpi_bus.h | 2 + include/linux/acpi.h | 1 + include/linux/container.h | 8 + include/linux/memory_hotplug.h | 2 + 16 files changed, 533 insertions(+), 1 deletion(-) create mode 100644 drivers/soc/hisilicon/Kconfig create mode 100644 drivers/soc/hisilicon/Makefile create mode 100644 drivers/soc/hisilicon/hisi_hbmcache.c create mode 100644 drivers/soc/hisilicon/hisi_hbmdev.c create mode 100644 drivers/soc/hisilicon/hisi_internal.h -- 2.17.1

1 9

Re: [PATCH v3 OLK-5.10 6/9] soc: hisilicon: hisi_hbmdev: Add power domain control methods
by zhangzekun (A) 02 Mar '23

02 Mar '23

在 2023/3/2 15:12, Kefeng Wang 写道: > > > On 2023/3/2 14:51, Zhang Zekun wrote: >> Offering: HULK >> hulk inclusion >> category: feature >> bugzilla: https://gitee.com/openeuler/kernel/issues/I67QNJ >> CVE: NA >> >> ------------------------------------------------------------------ >> >> Platform devices which supports power control are often required to be >> power off/on together with the devices in the same power domain. >> However, >> there isn't a generic driver that support the power control logic of >> these devices. >> >> ACPI container seems to be a good place to hold these control logic. Add >> platform devices in the same power domain in a ACPI container, we can >> easily get the locality information about these devices and can moniter >> the power of these devices in the same power domain together. >> >> This patch provide three userspace control interface to control the >> power >> of devices together in the container: >> - state: Echo online to state to power up the devices in the >> container and >> then online these devices which will be triggered by BIOS. Echo >> offline >> to the state to offline and eject the child devices in the container >> which are ejectable. >> - pxms: show the pxms of devices which are present in the container. >> >> In our scenario, we need to control the power of HBM memory devices >> which >> can be power consuming and will only be used in some specialized >> scenarios, >> such as HPC. HBM memory devices in a socket are in the same power >> domain, >> and should be power off/on together. We have come up with an idea >> that put >> these power control logic in a specialized driver, but ACPI container >> seems >> to be a more generic place to hold these control logic. >> >> Signed-off-by: Zhang Zekun <zhangzekun11(a)huawei.com> >> --- >> v3: >> - move the common code to hisi_internal.h >> >> drivers/soc/Kconfig | 1 + >> drivers/soc/Makefile | 1 + >> drivers/soc/hisilicon/Kconfig | 19 +++ >> drivers/soc/hisilicon/Makefile | 3 + >> drivers/soc/hisilicon/hisi_hbmdev.c | 166 ++++++++++++++++++++++++++ >> drivers/soc/hisilicon/hisi_internal.h | 31 +++++ >> 6 files changed, 221 insertions(+) >> create mode 100644 drivers/soc/hisilicon/Kconfig >> create mode 100644 drivers/soc/hisilicon/Makefile >> create mode 100644 drivers/soc/hisilicon/hisi_hbmdev.c >> create mode 100644 drivers/soc/hisilicon/hisi_internal.h >> >> diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig >> index 425ab6f7e375..f7c59b063321 100644 >> --- a/drivers/soc/Kconfig >> +++ b/drivers/soc/Kconfig >> @@ -23,5 +23,6 @@ source "drivers/soc/versatile/Kconfig" >> source "drivers/soc/xilinx/Kconfig" >> source "drivers/soc/zte/Kconfig" >> source "drivers/soc/kendryte/Kconfig" >> +source "drivers/soc/hisilicon/Kconfig" >> endmenu >> diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile >> index 36452bed86ef..68f186e00e44 100644 >> --- a/drivers/soc/Makefile >> +++ b/drivers/soc/Makefile >> @@ -29,3 +29,4 @@ obj-$(CONFIG_PLAT_VERSATILE) += versatile/ >> obj-y += xilinx/ >> obj-$(CONFIG_ARCH_ZX) += zte/ >> obj-$(CONFIG_SOC_KENDRYTE) += kendryte/ >> +obj-y += hisilicon/ >> diff --git a/drivers/soc/hisilicon/Kconfig >> b/drivers/soc/hisilicon/Kconfig >> new file mode 100644 >> index 000000000000..497787af004e >> --- /dev/null >> +++ b/drivers/soc/hisilicon/Kconfig >> @@ -0,0 +1,19 @@ >> +# SPDX-License-Identifier: GPL-2.0 >> +# >> +# Hisilicon SoC drivers >> +# >> +menu "Hisilicon SoC driver support" >> + >> +config HISI_HBMDEV >> + tristate "add extra support for hbm memory device" >> + depends on ACPI_HOTPLUG_MEMORY >> + select ACPI_CONTAINER >> + help >> + This driver add extra supports for memory devices. The driver >> + provides methods for userpace to control the power of memory >> + devices in a container. >> + >> + To compile this driver as a module, choose M here: >> + the module will be called hisi_hbmdev. >> + >> +endmenu >> diff --git a/drivers/soc/hisilicon/Makefile >> b/drivers/soc/hisilicon/Makefile >> new file mode 100644 >> index 000000000000..22e87acb1ab3 >> --- /dev/null >> +++ b/drivers/soc/hisilicon/Makefile >> @@ -0,0 +1,3 @@ >> +# SPDX-License-Identifier: GPL-2.0 >> + >> +obj-$(CONFIG_HISI_HBMDEV) += hisi_hbmdev.o >> diff --git a/drivers/soc/hisilicon/hisi_hbmdev.c >> b/drivers/soc/hisilicon/hisi_hbmdev.c >> new file mode 100644 >> index 000000000000..82943cd35fa2 >> --- /dev/null >> +++ b/drivers/soc/hisilicon/hisi_hbmdev.c >> @@ -0,0 +1,166 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> +/* >> + * Copyright (C) Huawei Technologies Co., Ltd. 2023. All rights >> reserved. >> + */ >> + >> +#include <linux/kobject.h> >> +#include <linux/module.h> >> +#include <linux/nodemask.h> >> +#include <linux/acpi.h> >> +#include <linux/container.h> >> + >> +#include "hisi_internal.h" >> + >> +struct memory_dev { >> + struct kobject *memdev_kobj; >> +}; >> + >> +static struct memory_dev *mdev; >> + >> +static int get_pxm(struct acpi_device *acpi_device, void *arg) >> +{ >> + int nid; >> + unsigned long long sta; >> + acpi_handle handle; >> + nodemask_t *mask; >> + acpi_status status; >> + >> + mask = arg; >> + handle = acpi_device->handle; > > 按照倒金字塔， > acpi_handle handle = acpi_device->handle; > nodemask_t *mask = arg; > unsigned long long sta; > acpi_status status; > int nid; >> + >> + status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); >> + if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_ENABLED)) { >> + nid = acpi_get_node(handle); >> + if (nid >= 0) >> + node_set(nid, *mask); >> + } >> + >> + return 0; >> +} >> + >> +static ssize_t pxms_show(struct device *dev, >> + struct device_attribute *attr, >> + char *buf) >> +{ >> + nodemask_t mask; >> + struct acpi_device *adev; >> + >> + adev = to_acpi_device(dev); > 同上 > >> + nodes_clear(mask); >> + acpi_dev_for_each_child(adev, get_pxm, &mask); >> + >> + return sysfs_emit(buf, "%*pbl\n", >> + nodemask_pr_args(&mask)); >> +} >> +static DEVICE_ATTR_RO(pxms); >> + >> +static int memdev_power_on(struct acpi_device *adev) >> +{ >> + acpi_status status; >> + acpi_handle handle; >> + >> + handle = adev->handle; > ... >> + status = acpi_evaluate_object(handle, "_ON", NULL, NULL); >> + if (ACPI_FAILURE(status)) { >> + acpi_handle_warn(handle, "Power on failed (0x%x)\n", status); >> + return -ENODEV; >> + } >> + >> + return 0; >> +} >> + >> +static int eject_device(struct acpi_device *acpi_device, void >> *not_used) >> +{ >> + acpi_object_type unused; >> + acpi_status status; >> + >> + status = acpi_get_type(acpi_device->handle, &unused); >> + if (ACPI_FAILURE(status) || !acpi_device->flags.ejectable) >> + return -ENODEV; >> + >> + get_device(&acpi_device->dev); >> + status = acpi_hotplug_schedule(acpi_device, >> ACPI_OST_EC_OSPM_EJECT); >> + if (ACPI_SUCCESS(status)) >> + return 0; >> + >> + put_device(&acpi_device->dev); >> + acpi_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT, >> + ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL); >> + >> + return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN; >> +} >> + >> +static int memdev_power_off(struct acpi_device *adev) >> +{ >> + return acpi_dev_for_each_child(adev, eject_device, NULL); >> +} >> + >> +static ssize_t state_store(struct device *d, struct device_attribute >> *attr, >> + const char *buf, size_t count) >> +{ >> + int ret; >> + struct acpi_device *adev; >> + const int online_type = online_type_from_str(buf); >> + >> + if (online_type < 0) >> + return -EINVAL; >> + >> + adev = to_acpi_device(d); > > > const int online_type = online_type_from_str(buf); > struct acpi_device *adev = to_acpi_device(d); > int ret; > ... > > >> + switch (online_type) { >> + case STATE_ONLINE: >> + ret = memdev_power_on(adev); >> + if (!ret) >> + return count; >> + break; >> + case STATE_OFFLINE: >> + ret = memdev_power_off(adev); >> + if (!ret) >> + return count; >> + break; >> + default: >> + return -EINVAL; >> + } > 这个有点奇怪，hbm cache和mem的热插拔的函数不能搞成类似的逻辑吗这里改成这样吧 { struct acpi_device *adev = to_acpi_device(d); const int type = online_type_from_str(buf); int ret = -EINVAL; switch (type) { case STATE_ONLINE: ret = memdev_power_on(adev); break; case STATE_OFFLINE: ret = memdev_power_off(adev); break; default: break; } if (ret) return ret; return count; } >> + >> + return ret; >> +} >> +static DEVICE_ATTR_WO(state); >> + >> +static int __init mdev_init(void) >> +{ >> + struct cdev_node *cnode; >> + >> + mdev = kzalloc(sizeof(struct memory_dev), GFP_KERNEL); >> + if (!mdev) >> + return -ENOMEM; >> + >> + mdev->memdev_kobj = kobject_create_and_add("hbm_memory", >> kernel_kobj); >> + if (!mdev->memdev_kobj) { >> + kfree(mdev); >> + return -ENOMEM; >> + } >> + >> + list_for_each_entry(cnode, &cdev_list->clist, clist) { >> + device_create_file(cnode->dev, &dev_attr_state); >> + device_create_file(cnode->dev, &dev_attr_pxms); >> + } >> + >> + return 0; >> +} >> +module_init(mdev_init); >> + >> +static void __exit mdev_exit(void) >> +{ >> + struct cdev_node *cnode; >> + >> + list_for_each_entry(cnode, &cdev_list->clist, clist) { >> + device_remove_file(cnode->dev, &dev_attr_state); >> + device_remove_file(cnode->dev, &dev_attr_pxms); >> + } >> + >> + kobject_put(mdev->memdev_kobj); >> + kfree(mdev); >> +} >> +module_exit(mdev_exit); >> + >> +MODULE_LICENSE("GPL v2"); >> +MODULE_AUTHOR("Zhang Zekun <zhangzekun11(a)huawei.com>"); >> diff --git a/drivers/soc/hisilicon/hisi_internal.h >> b/drivers/soc/hisilicon/hisi_internal.h >> new file mode 100644 >> index 000000000000..f14596f58a05 >> --- /dev/null >> +++ b/drivers/soc/hisilicon/hisi_internal.h >> @@ -0,0 +1,31 @@ >> +/* SPDX-License-Identifier: GPL-2.0 */ >> +/* >> + * Copyright (C) Huawei Technologies Co., Ltd. 2023. All rights >> reserved. >> + */ >> + >> +#ifndef _HISI_INTERNAL_H >> +#define _HISI_INTERNAL_H >> + >> +enum { >> + STATE_ONLINE, >> + STATE_OFFLINE, >> +}; >> + >> +static const char *const online_type_to_str[] = { >> + [STATE_ONLINE] = "online", >> + [STATE_OFFLINE] = "offline", >> +}; >> + >> +static int online_type_from_str(const char *str) > 不需要inline吗 >> +{ >> + int i; >> + >> + for (i = 0; i < ARRAY_SIZE(online_type_to_str); i++) { >> + if (sysfs_streq(str, online_type_to_str[i])) >> + return i; >> + } >> + >> + return -EINVAL; >> +} >> + >> +#endif

1 0

[PATCH v3 OLK-5.10 0/9] Add support for hbm memory device and
by Zhang Zekun 02 Mar '23

02 Mar '23

v3: - prettify the code - add a hisi_internal.h to hold common code v2: - remove the !adev judge in patch 9, as it will always be true. patch 1-3: Add support for iterate through the child devices in the acpi device. patch 4-9: Add support for hbm memory device and hbm cache support Rafael J. Wysocki (3): ACPI: bus: Introduce acpi_dev_for_each_child() ACPI: bus: Avoid non-ACPI device objects in walks over children ACPI: bus: Export acpi_dev_for_each_child() to modules Zhang Zekun (6): ACPI: container: export the container list in the system ACPI: OSL: Export the symbol of acpi_hotplug_schedule soc: hisilicon: hisi_hbmdev: Add power domain control methods ACPI: memhotplug: export the state of each hotplug device soc: hisilicon: hisi_hbmdev: Provide extra memory topology information ACPI: hbmcache: Add support for online and offline the hbm cache drivers/acpi/acpi_memhotplug.c | 6 + drivers/acpi/bus.c | 27 +++ drivers/acpi/container.c | 51 ++++++ drivers/acpi/internal.h | 1 - drivers/acpi/osl.c | 1 + drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/hisilicon/Kconfig | 33 ++++ drivers/soc/hisilicon/Makefile | 4 + drivers/soc/hisilicon/hisi_hbmcache.c | 147 +++++++++++++++++ drivers/soc/hisilicon/hisi_hbmdev.c | 229 ++++++++++++++++++++++++++ drivers/soc/hisilicon/hisi_internal.h | 31 ++++ include/acpi/acpi_bus.h | 2 + include/linux/acpi.h | 1 + include/linux/container.h | 8 + include/linux/memory_hotplug.h | 2 + 16 files changed, 544 insertions(+), 1 deletion(-) create mode 100644 drivers/soc/hisilicon/Kconfig create mode 100644 drivers/soc/hisilicon/Makefile create mode 100644 drivers/soc/hisilicon/hisi_hbmcache.c create mode 100644 drivers/soc/hisilicon/hisi_hbmdev.c create mode 100644 drivers/soc/hisilicon/hisi_internal.h -- 2.17.1

1 9

[PATCH] Revert "scsi: fix iscsi rescan fails to create block"
by Zhong Jinghua 02 Mar '23

02 Mar '23

hulk inclusion category: bugfix bugzilla: 188150, https://gitee.com/openeuler/kernel/issues/I643OL ---------------------------------------- This reverts commit 7f10ea522db56188ae46c5bbee7052a2b2797515. This commit has a soft lock problem: watchdog: BUG: soft lockup - CPU#22 stuck for 67s! [iscsid:16369] Call Trace: scsi_remove_target+0x548/0x7b0 ? sdev_store_delete+0x90/0x90 ? __mutex_lock_slowpath+0x10/0x10 ? device_remove_class_symlinks+0x1b0/0x1b0 __iscsi_unbind_session+0x16b/0x250 [scsi_transport_iscsi] iscsi_remove_session+0x1d3/0x2f0 [scsi_transport_iscsi] iscsi_session_remove+0x5c/0x80 [libiscsi] iscsi_sw_tcp_session_destroy+0xd3/0x160 [iscsi_tcp] iscsi_if_rx+0x2369/0x5060 [scsi_transport_iscsi] The reason is that if other threads hold the reference count of the kobject while waiting for the device to be released, it will keep waiting in a loop. Fixes: 7f10ea522db5 ("scsi: fix iscsi rescan fails to create block") Signed-off-by: Zhong Jinghua <zhongjinghua(a)huawei.com> --- drivers/scsi/scsi_sysfs.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 4468b92bf83b..6433476d3e67 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1507,13 +1507,6 @@ void scsi_remove_device(struct scsi_device *sdev) } EXPORT_SYMBOL(scsi_remove_device); -static int scsi_device_try_get(struct scsi_device *sdev) -{ - if (!kobject_get_unless_zero(&sdev->sdev_gendev.kobj)) - return -ENXIO; - return 0; -} - static void __scsi_remove_target(struct scsi_target *starget) { struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); @@ -1532,7 +1525,9 @@ static void __scsi_remove_target(struct scsi_target *starget) if (sdev->channel != starget->channel || sdev->id != starget->id) continue; - if (scsi_device_try_get(sdev)) + if (sdev->sdev_state == SDEV_DEL || + sdev->sdev_state == SDEV_CANCEL || + !get_device(&sdev->sdev_gendev)) continue; spin_unlock_irqrestore(shost->host_lock, flags); scsi_remove_device(sdev); -- 2.31.1

1 0