- Kernel - mailweb.openeuler.org

[PATCH OLK-5.10] drivers/perf: hisi: Add support for HiSilicon DDRC v3 PMU driver
by Junhao He 04 Dec '24

04 Dec '24

driver inclusion category: featrue bugzilla: https://gitee.com/openeuler/kernel/issues/IARCNN -------------------------------- On HiSilicon HIP10C platform, the DDRC PMU is a v3 PMU. And only the offset of it's interrupt registers offset quite a different tune DDRC v2 PMUs. The control registeres and events code are the same as v2 PMU. Their modification was unexpected, which caused the interrupt handler to not handle counter overflows correctly (HiSilicon Erratum 162400501). The before DDRC PMU driver will probe v3 as v2. Therefore DDRC v3 interrupt handler cannot work properly. We fixed that by adding new ID HISI0235 to correct the DDRC v3 PMU interrupt register offset (including mask/status/clear registers). Signed-off-by: Junhao He <hejunhao3(a)huawei.com> --- drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 150 ++++++++++-------- 1 file changed, 87 insertions(+), 63 deletions(-) diff --git a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c index b4d4660c7e6e..aaeb5fb4d86d 100644 --- a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c @@ -43,6 +43,11 @@ #define DDRC_V2_EVENT_TYPE 0xe74 #define DDRC_V2_PERF_CTRL 0xeA0 +/* DDRC interrupt registers definition in v3 */ +#define DDRC_V3_INT_MASK 0x534 +#define DDRC_V3_INT_STATUS 0x538 +#define DDRC_V3_INT_CLEAR 0x53C + /* DDRC has 8-counters */ #define DDRC_NR_COUNTERS 0x8 #define DDRC_V1_PERF_CTRL_EN 0x2 @@ -63,6 +68,12 @@ static const u32 ddrc_reg_off[] = { DDRC_PRE_CMD, DDRC_ACT_CMD, DDRC_RNK_CHG, DDRC_RW_CHG }; +struct hisi_ddrc_pmu_regs { + u32 int_mask; + u32 int_clear; + u32 int_status; +}; + /* * Select the counter register offset using the counter index. * In PMU v1, there are no programmable counter, the count @@ -223,77 +234,43 @@ static void hisi_ddrc_pmu_v2_disable_counter(struct hisi_pmu *ddrc_pmu, writel(val, ddrc_pmu->base + DDRC_V2_EVENT_CTRL); } -static void hisi_ddrc_pmu_v1_enable_counter_int(struct hisi_pmu *ddrc_pmu, - struct hw_perf_event *hwc) -{ - u32 val; - - /* Write 0 to enable interrupt */ - val = readl(ddrc_pmu->base + DDRC_INT_MASK); - val &= ~(1 << hwc->idx); - writel(val, ddrc_pmu->base + DDRC_INT_MASK); -} - -static void hisi_ddrc_pmu_v1_disable_counter_int(struct hisi_pmu *ddrc_pmu, - struct hw_perf_event *hwc) -{ - u32 val; - - /* Write 1 to mask interrupt */ - val = readl(ddrc_pmu->base + DDRC_INT_MASK); - val |= 1 << hwc->idx; - writel(val, ddrc_pmu->base + DDRC_INT_MASK); -} - -static void hisi_ddrc_pmu_v2_enable_counter_int(struct hisi_pmu *ddrc_pmu, - struct hw_perf_event *hwc) +static void hisi_ddrc_pmu_enable_counter_int(struct hisi_pmu *ddrc_pmu, + struct hw_perf_event *hwc) { + struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private; u32 val; - val = readl(ddrc_pmu->base + DDRC_V2_INT_MASK); - val &= ~(1 << hwc->idx); - writel(val, ddrc_pmu->base + DDRC_V2_INT_MASK); + val = readl(ddrc_pmu->base + regs->int_mask); + val &= ~BIT_ULL(hwc->idx); + writel(val, ddrc_pmu->base + regs->int_mask); } -static void hisi_ddrc_pmu_v2_disable_counter_int(struct hisi_pmu *ddrc_pmu, - struct hw_perf_event *hwc) +static void hisi_ddrc_pmu_disable_counter_int(struct hisi_pmu *ddrc_pmu, + struct hw_perf_event *hwc) { + struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private; u32 val; - val = readl(ddrc_pmu->base + DDRC_V2_INT_MASK); - val |= 1 << hwc->idx; - writel(val, ddrc_pmu->base + DDRC_V2_INT_MASK); + val = readl(ddrc_pmu->base + regs->int_mask); + val |= BIT_ULL(hwc->idx); + writel(val, ddrc_pmu->base + regs->int_mask); } -static u32 hisi_ddrc_pmu_v1_get_int_status(struct hisi_pmu *ddrc_pmu) +static u32 hisi_ddrc_pmu_get_int_status(struct hisi_pmu *ddrc_pmu) { - return readl(ddrc_pmu->base + DDRC_INT_STATUS); -} + struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private; -static void hisi_ddrc_pmu_v1_clear_int_status(struct hisi_pmu *ddrc_pmu, - int idx) -{ - writel(1 << idx, ddrc_pmu->base + DDRC_INT_CLEAR); + return readl(ddrc_pmu->base + regs->int_status); } -static u32 hisi_ddrc_pmu_v2_get_int_status(struct hisi_pmu *ddrc_pmu) +static void hisi_ddrc_pmu_clear_int_status(struct hisi_pmu *ddrc_pmu, + int idx) { - return readl(ddrc_pmu->base + DDRC_V2_INT_STATUS); -} + struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private; -static void hisi_ddrc_pmu_v2_clear_int_status(struct hisi_pmu *ddrc_pmu, - int idx) -{ - writel(1 << idx, ddrc_pmu->base + DDRC_V2_INT_CLEAR); + writel(1 << idx, ddrc_pmu->base + regs->int_clear); } -static const struct acpi_device_id hisi_ddrc_pmu_acpi_match[] = { - { "HISI0233", }, - { "HISI0234", }, - {} -}; -MODULE_DEVICE_TABLE(acpi, hisi_ddrc_pmu_acpi_match); - static int hisi_ddrc_pmu_init_data(struct platform_device *pdev, struct hisi_pmu *ddrc_pmu) { @@ -315,6 +292,10 @@ static int hisi_ddrc_pmu_init_data(struct platform_device *pdev, /* DDRC PMUs only share the same SCCL */ ddrc_pmu->ccl_id = -1; + ddrc_pmu->dev_info = device_get_match_data(&pdev->dev); + if (!ddrc_pmu->dev_info) + return -ENODEV; + ddrc_pmu->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(ddrc_pmu->base)) { dev_err(&pdev->dev, "ioremap failed for ddrc_pmu resource\n"); @@ -428,12 +409,12 @@ static const struct hisi_uncore_ops hisi_uncore_ddrc_v1_ops = { .stop_counters = hisi_ddrc_pmu_v1_stop_counters, .enable_counter = hisi_ddrc_pmu_v1_enable_counter, .disable_counter = hisi_ddrc_pmu_v1_disable_counter, - .enable_counter_int = hisi_ddrc_pmu_v1_enable_counter_int, - .disable_counter_int = hisi_ddrc_pmu_v1_disable_counter_int, + .enable_counter_int = hisi_ddrc_pmu_enable_counter_int, + .disable_counter_int = hisi_ddrc_pmu_disable_counter_int, .write_counter = hisi_ddrc_pmu_v1_write_counter, .read_counter = hisi_ddrc_pmu_v1_read_counter, - .get_int_status = hisi_ddrc_pmu_v1_get_int_status, - .clear_int_status = hisi_ddrc_pmu_v1_clear_int_status, + .get_int_status = hisi_ddrc_pmu_get_int_status, + .clear_int_status = hisi_ddrc_pmu_clear_int_status, }; static const struct hisi_uncore_ops hisi_uncore_ddrc_v2_ops = { @@ -443,12 +424,12 @@ static const struct hisi_uncore_ops hisi_uncore_ddrc_v2_ops = { .stop_counters = hisi_ddrc_pmu_v2_stop_counters, .enable_counter = hisi_ddrc_pmu_v2_enable_counter, .disable_counter = hisi_ddrc_pmu_v2_disable_counter, - .enable_counter_int = hisi_ddrc_pmu_v2_enable_counter_int, - .disable_counter_int = hisi_ddrc_pmu_v2_disable_counter_int, + .enable_counter_int = hisi_ddrc_pmu_enable_counter_int, + .disable_counter_int = hisi_ddrc_pmu_disable_counter_int, .write_counter = hisi_ddrc_pmu_v2_write_counter, .read_counter = hisi_ddrc_pmu_v2_read_counter, - .get_int_status = hisi_ddrc_pmu_v2_get_int_status, - .clear_int_status = hisi_ddrc_pmu_v2_clear_int_status, + .get_int_status = hisi_ddrc_pmu_get_int_status, + .clear_int_status = hisi_ddrc_pmu_clear_int_status, }; static int hisi_ddrc_pmu_dev_probe(struct platform_device *pdev, @@ -467,15 +448,14 @@ static int hisi_ddrc_pmu_dev_probe(struct platform_device *pdev, if (ddrc_pmu->identifier >= HISI_PMU_V2) { ddrc_pmu->counter_bits = 48; ddrc_pmu->check_event = DDRC_V2_NR_EVENTS; - ddrc_pmu->pmu_events.attr_groups = hisi_ddrc_pmu_v2_attr_groups; ddrc_pmu->ops = &hisi_uncore_ddrc_v2_ops; } else { ddrc_pmu->counter_bits = 32; ddrc_pmu->check_event = DDRC_V1_NR_EVENTS; - ddrc_pmu->pmu_events.attr_groups = hisi_ddrc_pmu_v1_attr_groups; ddrc_pmu->ops = &hisi_uncore_ddrc_v1_ops; } + ddrc_pmu->pmu_events.attr_groups = ddrc_pmu->dev_info->attr_groups; ddrc_pmu->num_counters = DDRC_NR_COUNTERS; ddrc_pmu->dev = &pdev->dev; ddrc_pmu->on_cpu = -1; @@ -541,6 +521,50 @@ static int hisi_ddrc_pmu_remove(struct platform_device *pdev) return 0; } +static struct hisi_ddrc_pmu_regs hisi_ddrc_v1_pmu_regs = { + .int_mask = DDRC_INT_MASK, + .int_clear = DDRC_INT_CLEAR, + .int_status = DDRC_INT_STATUS, +}; + +static const struct hisi_pmu_dev_info hisi_ddrc_v1 = { + .name = "ddrc", + .attr_groups = hisi_ddrc_pmu_v1_attr_groups, + .private = &hisi_ddrc_v1_pmu_regs, +}; + +static struct hisi_ddrc_pmu_regs hisi_ddrc_v2_pmu_regs = { + .int_mask = DDRC_V2_INT_MASK, + .int_clear = DDRC_V2_INT_CLEAR, + .int_status = DDRC_V2_INT_STATUS, +}; + +static const struct hisi_pmu_dev_info hisi_ddrc_v2 = { + .name = "ddrc", + .attr_groups = hisi_ddrc_pmu_v2_attr_groups, + .private = &hisi_ddrc_v2_pmu_regs, +}; + +static struct hisi_ddrc_pmu_regs hisi_ddrc_v3_pmu_regs = { + .int_mask = DDRC_V3_INT_MASK, + .int_clear = DDRC_V3_INT_CLEAR, + .int_status = DDRC_V3_INT_STATUS, +}; + +static const struct hisi_pmu_dev_info hisi_ddrc_v3 = { + .name = "ddrc", + .attr_groups = hisi_ddrc_pmu_v2_attr_groups, + .private = &hisi_ddrc_v3_pmu_regs, +}; + +static const struct acpi_device_id hisi_ddrc_pmu_acpi_match[] = { + { "HISI0233", (kernel_ulong_t)&hisi_ddrc_v1}, + { "HISI0234", (kernel_ulong_t)&hisi_ddrc_v2}, + { "HISI0235", (kernel_ulong_t)&hisi_ddrc_v3}, + {} +}; +MODULE_DEVICE_TABLE(acpi, hisi_ddrc_pmu_acpi_match); + static struct platform_driver hisi_ddrc_pmu_driver = { .driver = { .name = "hisi_ddrc_pmu", -- 2.33.0

2 1

[PATCH OLK-6.6] vp_vdpa: fix id_table array not null terminated error
by liukai 04 Dec '24

04 Dec '24

From: Xiaoguang Wang <lege.wang(a)jaguarmicro.com> stable inclusion from stable-v6.6.63 commit c4d64534d4b1c47d2f1ce427497f971ad4735aae category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB8IUJ CVE: CVE-2024-53110 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- commit 4e39ecadf1d2a08187139619f1f314b64ba7d947 upstream. Allocate one extra virtio_device_id as null terminator, otherwise vdpa_mgmtdev_get_classes() may iterate multiple times and visit undefined memory. Fixes: ffbda8e9df10 ("vdpa/vp_vdpa : add vdpa tool support in vp_vdpa") Cc: stable(a)vger.kernel.org Suggested-by: Parav Pandit <parav(a)nvidia.com> Signed-off-by: Angus Chen <angus.chen(a)jaguarmicro.com> Signed-off-by: Xiaoguang Wang <lege.wang(a)jaguarmicro.com> Message-Id: <20241105133518.1494-1-lege.wang(a)jaguarmicro.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Reviewed-by: Parav Pandit <parav(a)nvidia.com> Acked-by: Jason Wang <jasowang(a)redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Liu Kai <liukai284(a)huawei.com> --- drivers/vdpa/virtio_pci/vp_vdpa.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c index 0e16dd08968b..31b27e078b68 100644 --- a/drivers/vdpa/virtio_pci/vp_vdpa.c +++ b/drivers/vdpa/virtio_pci/vp_vdpa.c @@ -591,7 +591,11 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto mdev_err; } - mdev_id = kzalloc(sizeof(struct virtio_device_id), GFP_KERNEL); + /* + * id_table should be a null terminated array, so allocate one additional + * entry here, see vdpa_mgmtdev_get_classes(). + */ + mdev_id = kcalloc(2, sizeof(struct virtio_device_id), GFP_KERNEL); if (!mdev_id) { err = -ENOMEM; goto mdev_id_err; @@ -611,8 +615,8 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto probe_err; } - mdev_id->device = mdev->id.device; - mdev_id->vendor = mdev->id.vendor; + mdev_id[0].device = mdev->id.device; + mdev_id[0].vendor = mdev->id.vendor; mgtdev->id_table = mdev_id; mgtdev->max_supported_vqs = vp_modern_get_num_queues(mdev); mgtdev->supported_features = vp_modern_get_features(mdev); -- 2.34.1

2 1

[PATCH OLK-5.10] vp_vdpa: fix id_table array not null terminated error
by liukai 04 Dec '24

04 Dec '24

From: Xiaoguang Wang <lege.wang(a)jaguarmicro.com> stable inclusion from stable-v6.1.119 commit 870d68fe17b5d9032049dcad98b5781a344a8657 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB8IUJ CVE: CVE-2024-53110 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- commit 4e39ecadf1d2a08187139619f1f314b64ba7d947 upstream. Allocate one extra virtio_device_id as null terminator, otherwise vdpa_mgmtdev_get_classes() may iterate multiple times and visit undefined memory. Fixes: ffbda8e9df10 ("vdpa/vp_vdpa : add vdpa tool support in vp_vdpa") Cc: stable(a)vger.kernel.org Suggested-by: Parav Pandit <parav(a)nvidia.com> Signed-off-by: Angus Chen <angus.chen(a)jaguarmicro.com> Signed-off-by: Xiaoguang Wang <lege.wang(a)jaguarmicro.com> Message-Id: <20241105133518.1494-1-lege.wang(a)jaguarmicro.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Reviewed-by: Parav Pandit <parav(a)nvidia.com> Acked-by: Jason Wang <jasowang(a)redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Liu Kai <liukai284(a)huawei.com> --- drivers/vdpa/virtio_pci/vp_vdpa.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c index bc0bdcc7bcea..4e513a38df60 100644 --- a/drivers/vdpa/virtio_pci/vp_vdpa.c +++ b/drivers/vdpa/virtio_pci/vp_vdpa.c @@ -574,7 +574,11 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto mdev_err; } - mdev_id = kzalloc(sizeof(struct virtio_device_id), GFP_KERNEL); + /* + * id_table should be a null terminated array, so allocate one additional + * entry here, see vdpa_mgmtdev_get_classes(). + */ + mdev_id = kcalloc(2, sizeof(struct virtio_device_id), GFP_KERNEL); if (!mdev_id) { err = -ENOMEM; goto mdev_id_err; @@ -594,8 +598,8 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto probe_err; } - mdev_id->device = mdev->id.device; - mdev_id->vendor = mdev->id.vendor; + mdev_id[0].device = mdev->id.device; + mdev_id[0].vendor = mdev->id.vendor; mgtdev->id_table = mdev_id; mgtdev->max_supported_vqs = vp_modern_get_num_queues(mdev); mgtdev->supported_features = vp_modern_get_features(mdev); -- 2.34.1

2 1

[PATCH openEuler-22.03-LTS-SP1 0/2] CVE-2024-53054
by Chen Ridong 04 Dec '24

04 Dec '24

CVE-2024-53054 Chen Ridong (2): Revert "cgroup: Fix AA deadlock caused by cgroup_bpf_release" cgroup/bpf: use a dedicated workqueue for cgroup bpf destruction kernel/bpf/cgroup.c | 19 ++++++++++++++++++- kernel/cgroup/cgroup-internal.h | 1 - kernel/cgroup/cgroup.c | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) -- 2.34.1

2 3

[openeuler:openEuler-1.0-LTS 1320/1320] drivers/tty/serial/sc16is7xx.c:1501:1: warning: label 'err_i2c' defined but not used
by kernel test robot 04 Dec '24

04 Dec '24

Hi Mao, FYI, the error/warning still remains. tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: 98beb6bc5000f977169e4f633e450f4e3e9d84d1 commit: 1c30433d9fa5c5b48039990ba214c0e8e199a22d [1320/1320] sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init() config: arm64-randconfig-003 (https://download.01.org/0day-ci/archive/20241204/202412041458.vwP2M34t-lkp@…) compiler: aarch64-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241204/202412041458.vwP2M34t-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202412041458.vwP2M34t-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/tty/serial/sc16is7xx.c: In function 'sc16is7xx_init': >> drivers/tty/serial/sc16is7xx.c:1501:1: warning: label 'err_i2c' defined but not used [-Wunused-label] 1501 | err_i2c: | ^~~~~~~ In file included from drivers/tty/serial/sc16is7xx.c:17: drivers/tty/serial/sc16is7xx.c: At top level: include/linux/module.h:140:14: warning: 'cleanup_module' specifies less restrictive attribute than its target 'sc16is7xx_exit': 'cold' [-Wmissing-attributes] 140 | void cleanup_module(void) __attribute__((alias(#exitfn))); | ^~~~~~~~~~~~~~ drivers/tty/serial/sc16is7xx.c:1518:1: note: in expansion of macro 'module_exit' 1518 | module_exit(sc16is7xx_exit); | ^~~~~~~~~~~ drivers/tty/serial/sc16is7xx.c:1507:20: note: 'cleanup_module' target declared here 1507 | static void __exit sc16is7xx_exit(void) | ^~~~~~~~~~~~~~ include/linux/module.h:134:13: warning: 'init_module' specifies less restrictive attribute than its target 'sc16is7xx_init': 'cold' [-Wmissing-attributes] 134 | int init_module(void) __attribute__((alias(#initfn))); | ^~~~~~~~~~~ drivers/tty/serial/sc16is7xx.c:1505:1: note: in expansion of macro 'module_init' 1505 | module_init(sc16is7xx_init); | ^~~~~~~~~~~ drivers/tty/serial/sc16is7xx.c:1470:19: note: 'init_module' target declared here 1470 | static int __init sc16is7xx_init(void) | ^~~~~~~~~~~~~~ drivers/tty/serial/sc16is7xx.c: In function 'sc16is7xx_remove.isra': drivers/tty/serial/sc16is7xx.c:1309:17: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 1309 | uart_remove_one_port(&sc16is7xx_uart, &s->p[i].port); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ drivers/tty/serial/sc16is7xx.c:1310:31: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 1310 | clear_bit(s->p[i].port.line, &sc16is7xx_lines); | ~~~~^~~ drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ drivers/tty/serial/sc16is7xx.c:1309:60: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 1309 | uart_remove_one_port(&sc16is7xx_uart, &s->p[i].port); | ~~~~^~~ drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ In function 'sc16is7xx_port_irq', inlined from 'sc16is7xx_ist' at drivers/tty/serial/sc16is7xx.c:704:20: drivers/tty/serial/sc16is7xx.c:662:34: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 662 | struct uart_port *port = &s->p[portno].port; | ^~~~~~~~~~~~~~~~~~ drivers/tty/serial/sc16is7xx.c: In function 'sc16is7xx_ist': drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ In function 'sc16is7xx_port_irq', inlined from 'sc16is7xx_ist' at drivers/tty/serial/sc16is7xx.c:704:20: drivers/tty/serial/sc16is7xx.c:662:39: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 662 | struct uart_port *port = &s->p[portno].port; | ~~~~^~~~~~~~ drivers/tty/serial/sc16is7xx.c: In function 'sc16is7xx_ist': drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ In function 'sc16is7xx_port_irq', inlined from 'sc16is7xx_ist' at drivers/tty/serial/sc16is7xx.c:704:20: drivers/tty/serial/sc16is7xx.c:662:39: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 662 | struct uart_port *port = &s->p[portno].port; | ~~~~^~~~~~~~ drivers/tty/serial/sc16is7xx.c: In function 'sc16is7xx_ist': drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ In function 'sc16is7xx_port_irq', inlined from 'sc16is7xx_ist' at drivers/tty/serial/sc16is7xx.c:704:20: drivers/tty/serial/sc16is7xx.c:662:39: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 662 | struct uart_port *port = &s->p[portno].port; | ~~~~^~~~~~~~ drivers/tty/serial/sc16is7xx.c: In function 'sc16is7xx_ist': drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ In function 'sc16is7xx_port_irq', inlined from 'sc16is7xx_ist' at drivers/tty/serial/sc16is7xx.c:704:20: drivers/tty/serial/sc16is7xx.c:662:39: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 662 | struct uart_port *port = &s->p[portno].port; | ~~~~^~~~~~~~ drivers/tty/serial/sc16is7xx.c: In function 'sc16is7xx_ist': drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ drivers/tty/serial/sc16is7xx.c: In function 'sc16is7xx_probe': drivers/tty/serial/sc16is7xx.c:1223:21: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 1223 | s->p[i].line = i; | ~~~~^~~ drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ drivers/tty/serial/sc16is7xx.c:1225:21: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] 1225 | s->p[i].port.dev = dev; | ~~~~^~~ drivers/tty/serial/sc16is7xx.c:331:41: note: while referencing 'p' 331 | struct sc16is7xx_one p[0]; | ^ drivers/tty/serial/sc16is7xx.c:1226:21: warning: array subscript i is outside array bounds of 'struct sc16is7xx_one[0]' [-Warray-bounds=] vim +/err_i2c +1501 drivers/tty/serial/sc16is7xx.c 1487 1488 #ifdef CONFIG_SERIAL_SC16IS7XX_SPI 1489 ret = spi_register_driver(&sc16is7xx_spi_uart_driver); 1490 if (ret < 0) { 1491 pr_err("failed to init sc16is7xx spi --> %d\n", ret); 1492 goto err_spi; 1493 } 1494 #endif 1495 return ret; 1496 1497 err_spi: 1498 #ifdef CONFIG_SERIAL_SC16IS7XX_I2C 1499 i2c_del_driver(&sc16is7xx_i2c_uart_driver); 1500 #endif > 1501 err_i2c: 1502 uart_unregister_driver(&sc16is7xx_uart); 1503 return ret; 1504 } 1505 module_init(sc16is7xx_init); 1506 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-5.10 0/2] CVE-2024-53054
by Chen Ridong 04 Dec '24

04 Dec '24

CVE-2024-53054 Chen Ridong (2): [Huawei] Revert "cgroup: Fix AA deadlock caused by cgroup_bpf_release" cgroup/bpf: use a dedicated workqueue for cgroup bpf destruction kernel/bpf/cgroup.c | 19 ++++++++++++++++++- kernel/cgroup/cgroup-internal.h | 1 - kernel/cgroup/cgroup.c | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) -- 2.34.1

2 3

[openEuler-22.03-LTS-SP1] vp_vdpa: fix id_table array not null terminated error
by liukai 04 Dec '24

04 Dec '24

From: Xiaoguang Wang <lege.wang(a)jaguarmicro.com> stable inclusion from stable-v6.1.119 commit 870d68fe17b5d9032049dcad98b5781a344a8657 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB8IUJ CVE: CVE-2024-53110 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- commit 4e39ecadf1d2a08187139619f1f314b64ba7d947 upstream. Allocate one extra virtio_device_id as null terminator, otherwise vdpa_mgmtdev_get_classes() may iterate multiple times and visit undefined memory. Fixes: ffbda8e9df10 ("vdpa/vp_vdpa : add vdpa tool support in vp_vdpa") Cc: stable(a)vger.kernel.org Suggested-by: Parav Pandit <parav(a)nvidia.com> Signed-off-by: Angus Chen <angus.chen(a)jaguarmicro.com> Signed-off-by: Xiaoguang Wang <lege.wang(a)jaguarmicro.com> Message-Id: <20241105133518.1494-1-lege.wang(a)jaguarmicro.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Reviewed-by: Parav Pandit <parav(a)nvidia.com> Acked-by: Jason Wang <jasowang(a)redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Liu Kai <liukai284(a)huawei.com> --- drivers/vdpa/virtio_pci/vp_vdpa.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c index bc0bdcc7bcea..4e513a38df60 100644 --- a/drivers/vdpa/virtio_pci/vp_vdpa.c +++ b/drivers/vdpa/virtio_pci/vp_vdpa.c @@ -574,7 +574,11 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto mdev_err; } - mdev_id = kzalloc(sizeof(struct virtio_device_id), GFP_KERNEL); + /* + * id_table should be a null terminated array, so allocate one additional + * entry here, see vdpa_mgmtdev_get_classes(). + */ + mdev_id = kcalloc(2, sizeof(struct virtio_device_id), GFP_KERNEL); if (!mdev_id) { err = -ENOMEM; goto mdev_id_err; @@ -594,8 +598,8 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto probe_err; } - mdev_id->device = mdev->id.device; - mdev_id->vendor = mdev->id.vendor; + mdev_id[0].device = mdev->id.device; + mdev_id[0].vendor = mdev->id.vendor; mgtdev->id_table = mdev_id; mgtdev->max_supported_vqs = vp_modern_get_num_queues(mdev); mgtdev->supported_features = vp_modern_get_features(mdev); -- 2.34.1

1 0

[PATCH OLK-5.10 0/1] etmem : fix page_ref count leak and head missing useing problem
by chenrenhui 04 Dec '24

04 Dec '24

etmem : fix page_ref count leak and head missing useing problem chenrenhui (1): etmem : fix page_ref count leak and head missing useing problem fs/proc/etmem_swap.c | 2 ++ mm/vmscan.c | 17 ++++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) -- 2.33.0

2 2

[PATCH OLK-6.6 0/2] cgroup/bpf: use a dedicated workqueue for cgroup bpf destruction
by Chen Ridong 04 Dec '24

04 Dec '24

cgroup/bpf: use a dedicated workqueue for cgroup bpf destruction Chen Ridong (2): Revert "cgroup: Fix AA deadlock caused by cgroup_bpf_release" cgroup/bpf: use a dedicated workqueue for cgroup bpf destruction kernel/bpf/cgroup.c | 19 ++++++++++++++++++- kernel/cgroup/cgroup-internal.h | 1 - kernel/cgroup/cgroup.c | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) -- 2.34.1

2 3

[openeuler:OLK-5.10 2516/2516] drivers/ub/urma/ubcore/ubcore_netdev.c:49:5: warning: no previous prototype for 'ubcore_check_port_state'
by kernel test robot 04 Dec '24

04 Dec '24

Hi Yizhen, FYI, the error/warning still remains. tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: 50144653bfd09743bb9ce60543744e9e8cbb6489 commit: 84e122368ec3a37e074c9657bc09422b62f6ccd0 [2516/2516] ub: add new feature for urma config: arm64-randconfig-003-20241203 (https://download.01.org/0day-ci/archive/20241204/202412041258.OQhOgdm4-lkp@…) compiler: aarch64-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241204/202412041258.OQhOgdm4-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202412041258.OQhOgdm4-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/ub/urma/ubcore/ubcore_uvs_cmd.c: In function 'ubcore_uvs_cmd_channel_init': >> drivers/ub/urma/ubcore/ubcore_uvs_cmd.c:47:15: warning: 'strncpy' output truncated before terminating nul copying 10 bytes from a string of the same length [-Wstringop-truncation] 47 | (void)strncpy(arg.out.kernel_out, "Hello uvs!", strlen("Hello uvs!")); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- >> drivers/ub/urma/ubcore/ubcore_netdev.c:49:5: warning: no previous prototype for 'ubcore_check_port_state' [-Wmissing-prototypes] 49 | int ubcore_check_port_state(struct ubcore_device *dev, uint8_t port_idx) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/ub/urma/ubcore/ubcore_netdev.c:73:5: warning: no previous prototype for 'ubcore_find_port_netdev' [-Wmissing-prototypes] 73 | int ubcore_find_port_netdev(struct ubcore_device *dev, struct net_device *ndev) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/ub/urma/ubcore/ubcore_netdev.c:90:5: warning: no previous prototype for 'ubcore_find_port_with_dev_name' [-Wmissing-prototypes] 90 | int ubcore_find_port_with_dev_name(struct ubcore_device *dev, char *dev_name) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:113:5: warning: no previous prototype for 'ubcore_set_port_netdev' [-Wmissing-prototypes] 113 | int ubcore_set_port_netdev(struct ubcore_device *dev, struct net_device *ndev, | ^~~~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:149:6: warning: no previous prototype for 'ubcore_put_port_netdev' [-Wmissing-prototypes] 149 | void ubcore_put_port_netdev(struct ubcore_device *dev) | ^~~~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:169:10: warning: no previous prototype for 'ubcore_sip_idx_alloc' [-Wmissing-prototypes] 169 | uint32_t ubcore_sip_idx_alloc(uint32_t idx) | ^~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:197:5: warning: no previous prototype for 'ubcore_sip_idx_free' [-Wmissing-prototypes] 197 | int ubcore_sip_idx_free(uint32_t idx) | ^~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:210:6: warning: no previous prototype for 'ubcore_sip_table_init' [-Wmissing-prototypes] 210 | void ubcore_sip_table_init(void) | ^~~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:216:6: warning: no previous prototype for 'ubcore_sip_table_uninit' [-Wmissing-prototypes] 216 | void ubcore_sip_table_uninit(void) | ^~~~~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:230:5: warning: no previous prototype for 'ubcore_add_sip_entry' [-Wmissing-prototypes] 230 | int ubcore_add_sip_entry(const struct ubcore_sip_info *sip, uint32_t idx) | ^~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:250:5: warning: no previous prototype for 'ubcore_del_sip_entry' [-Wmissing-prototypes] 250 | int ubcore_del_sip_entry(uint32_t idx) | ^~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:264:5: warning: no previous prototype for 'ubcore_lookup_sip_idx' [-Wmissing-prototypes] 264 | int ubcore_lookup_sip_idx(struct ubcore_sip_info *sip, uint32_t *idx) | ^~~~~~~~~~~~~~~~~~~~~ drivers/ub/urma/ubcore/ubcore_netdev.c:285:10: warning: no previous prototype for 'ubcore_get_sip_max_cnt' [-Wmissing-prototypes] 285 | uint32_t ubcore_get_sip_max_cnt(void) | ^~~~~~~~~~~~~~~~~~~~~~ drivers/ub/urma/ubcore/ubcore_netdev.c:290:25: warning: no previous prototype for 'ubcore_lookup_sip_info' [-Wmissing-prototypes] 290 | struct ubcore_sip_info *ubcore_lookup_sip_info(uint32_t idx) | ^~~~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:301:5: warning: no previous prototype for 'ubcore_notify_uvs_del_sip' [-Wmissing-prototypes] 301 | int ubcore_notify_uvs_del_sip(struct ubcore_device *dev, | ^~~~~~~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/ubcore/ubcore_netdev.c:343:5: warning: no previous prototype for 'ubcore_notify_uvs_add_sip' [-Wmissing-prototypes] 343 | int ubcore_notify_uvs_add_sip(struct ubcore_device *dev, | ^~~~~~~~~~~~~~~~~~~~~~~~~ -- >> drivers/ub/urma/ubcore/ubcore_device.c:344:6: warning: no previous prototype for 'ubcore_destroy_upi_list' [-Wmissing-prototypes] 344 | void ubcore_destroy_upi_list(void) | ^~~~~~~~~~~~~~~~~~~~~~~ -- drivers/ub/urma/uburma/uburma_cmd.c:315:6: warning: no previous prototype for 'uburma_jfc_event_cb' [-Wmissing-prototypes] 315 | void uburma_jfc_event_cb(struct ubcore_event *event, struct ubcore_ucontext *ctx) | ^~~~~~~~~~~~~~~~~~~ drivers/ub/urma/uburma/uburma_cmd.c:327:6: warning: no previous prototype for 'uburma_jfs_event_cb' [-Wmissing-prototypes] 327 | void uburma_jfs_event_cb(struct ubcore_event *event, struct ubcore_ucontext *ctx) | ^~~~~~~~~~~~~~~~~~~ drivers/ub/urma/uburma/uburma_cmd.c:339:6: warning: no previous prototype for 'uburma_jfr_event_cb' [-Wmissing-prototypes] 339 | void uburma_jfr_event_cb(struct ubcore_event *event, struct ubcore_ucontext *ctx) | ^~~~~~~~~~~~~~~~~~~ drivers/ub/urma/uburma/uburma_cmd.c:351:6: warning: no previous prototype for 'uburma_jetty_event_cb' [-Wmissing-prototypes] 351 | void uburma_jetty_event_cb(struct ubcore_event *event, struct ubcore_ucontext *ctx) | ^~~~~~~~~~~~~~~~~~~~~ >> drivers/ub/urma/uburma/uburma_cmd.c:363:6: warning: no previous prototype for 'uburma_jetty_grp_event_cb' [-Wmissing-prototypes] 363 | void uburma_jetty_grp_event_cb(struct ubcore_event *event, struct ubcore_ucontext *ctx) | ^~~~~~~~~~~~~~~~~~~~~~~~~ vim +/ubcore_check_port_state +49 drivers/ub/urma/ubcore/ubcore_netdev.c 48 > 49 int ubcore_check_port_state(struct ubcore_device *dev, uint8_t port_idx) 50 { 51 struct ubcore_device_status status; 52 53 if (dev == NULL || port_idx >= UBCORE_MAX_PORT_CNT) { 54 ubcore_log_err("Invalid parameter.\n"); 55 return -EINVAL; 56 } 57 58 if (ubcore_query_device_status(dev, &status) != 0) { 59 ubcore_log_err("query device status for state failed with dev name %s\n", 60 dev->dev_name); 61 return -EPERM; 62 } 63 64 if (status.port_status[port_idx].state != UBCORE_PORT_ACTIVE) { 65 ubcore_log_err("port state is not active with dev name: %s and port_idx: %hhu\n", 66 dev->dev_name, port_idx); 67 return -EPERM; 68 } 69 ubcore_log_info("Success to query dev %s port state and it's active.\n", dev->dev_name); 70 return 0; 71 } 72 > 73 int ubcore_find_port_netdev(struct ubcore_device *dev, struct net_device *ndev) 74 { 75 struct ubcore_ndev_port *port_info; 76 77 down_write(&g_port_list_lock); 78 list_for_each_entry(port_info, &dev->port_list, node) { 79 if (port_info->ndev == ndev) { 80 up_write(&g_port_list_lock); 81 return (int)port_info->port_id; 82 } 83 } 84 up_write(&g_port_list_lock); 85 ubcore_log_warn("ndev:%s no available port found.\n", netdev_name(ndev)); 86 /* Currently assigned port0 by default */ 87 return 0; 88 } 89 > 90 int ubcore_find_port_with_dev_name(struct ubcore_device *dev, char *dev_name) 91 { 92 struct ubcore_ndev_port *port_info; 93 94 if (dev == NULL || dev_name == NULL) { 95 ubcore_log_err("Invalid input parameter\n"); 96 return 0; 97 } 98 99 down_write(&g_port_list_lock); 100 list_for_each_entry(port_info, &dev->port_list, node) { 101 if (strcmp(port_info->dev_name, dev_name) == 0) { 102 up_write(&g_port_list_lock); 103 ubcore_log_info("ndev:%s dev name:%s with port id %u found.\n", 104 netdev_name(port_info->ndev), dev_name, port_info->port_id); 105 return (int)port_info->port_id; 106 } 107 } 108 up_write(&g_port_list_lock); 109 ubcore_log_warn("dev name:%s no available port found.\n", dev_name); 110 return 0; 111 } 112 > 113 int ubcore_set_port_netdev(struct ubcore_device *dev, struct net_device *ndev, 114 unsigned int port_id) 115 { 116 struct ubcore_ndev_port *port_info, *new_node; 117 118 if (dev == NULL || ndev == NULL) { 119 ubcore_log_err("invalid input parameter.\n"); 120 return -1; 121 } 122 down_write(&g_port_list_lock); 123 list_for_each_entry(port_info, &dev->port_list, node) { 124 if (port_info->ndev == ndev) { 125 up_write(&g_port_list_lock); 126 ubcore_log_warn("ndev:%s is already bound port: %d\n", 127 netdev_name(ndev), port_info->port_id); 128 return 0; 129 } 130 } 131 up_write(&g_port_list_lock); 132 133 new_node = kzalloc(sizeof(struct ubcore_ndev_port), GFP_ATOMIC); 134 if (new_node == NULL) 135 return -ENOMEM; 136 137 new_node->ndev = ndev; 138 new_node->port_id = port_id; 139 (void)strcpy(new_node->dev_name, dev->dev_name); 140 down_write(&g_port_list_lock); 141 list_add_tail(&new_node->node, &dev->port_list); 142 up_write(&g_port_list_lock); 143 ubcore_log_info("ndev:%s dev_name: %s bound port: %d\n", netdev_name(ndev), 144 dev->dev_name, new_node->port_id); 145 return 0; 146 } 147 EXPORT_SYMBOL(ubcore_set_port_netdev); 148 > 149 void ubcore_put_port_netdev(struct ubcore_device *dev) 150 { 151 struct ubcore_ndev_port *port_info, *next; 152 153 down_write(&g_port_list_lock); 154 list_for_each_entry_safe(port_info, next, &dev->port_list, node) { 155 if (port_info != NULL) { 156 list_del(&port_info->node); 157 kfree(port_info); 158 } 159 } 160 up_write(&g_port_list_lock); 161 } 162 EXPORT_SYMBOL(ubcore_put_port_netdev); 163 164 static void ubcore_sip_bitmap_init(void) 165 { 166 bitmap_zero(g_sip_bitmap, UBCORE_MAX_SIP); 167 } 168 > 169 uint32_t ubcore_sip_idx_alloc(uint32_t idx) 170 { 171 uint32_t ret_idx = idx; 172 int ret; 173 174 spin_lock(&g_sip_spinlock); 175 if (ret_idx > 0) { 176 ret = test_bit(ret_idx, g_sip_bitmap); 177 if (ret == 0) { 178 set_bit(ret_idx, g_sip_bitmap); 179 spin_unlock(&g_sip_spinlock); 180 return ret_idx; 181 } 182 spin_unlock(&g_sip_spinlock); 183 ubcore_log_err("ret_idx allocation failed.\n"); 184 return 0; 185 } 186 ret_idx = (uint32_t)find_first_zero_bit(g_sip_bitmap, UBCORE_MAX_SIP); 187 if (ret_idx >= UBCORE_MAX_SIP) { 188 ubcore_log_err("ret_idx allocation failed.\n"); 189 spin_unlock(&g_sip_spinlock); 190 return 0; 191 } 192 set_bit(ret_idx, g_sip_bitmap); 193 spin_unlock(&g_sip_spinlock); 194 return ret_idx; 195 } 196 > 197 int ubcore_sip_idx_free(uint32_t idx) 198 { 199 spin_lock(&g_sip_spinlock); 200 if (test_bit(idx, g_sip_bitmap) == false) { 201 spin_unlock(&g_sip_spinlock); 202 ubcore_log_err("idx is used.\n"); 203 return -EINVAL; 204 } 205 clear_bit(idx, g_sip_bitmap); 206 spin_unlock(&g_sip_spinlock); 207 return 0; 208 } 209 > 210 void ubcore_sip_table_init(void) 211 { 212 ubcore_sip_bitmap_init(); 213 mutex_init(&g_sip_table.lock); 214 } 215 > 216 void ubcore_sip_table_uninit(void) 217 { 218 uint32_t i; 219 220 mutex_lock(&g_sip_table.lock); 221 for (i = 0; i < UBCORE_SIP_TABLE_SIZE; i++) { 222 if (g_sip_table.entry[i] != NULL) { 223 kfree(g_sip_table.entry[i]); 224 g_sip_table.entry[i] = NULL; 225 } 226 } 227 mutex_unlock(&g_sip_table.lock); 228 } 229 > 230 int ubcore_add_sip_entry(const struct ubcore_sip_info *sip, uint32_t idx) 231 { 232 struct ubcore_sip_info *new_sip; 233 234 if (idx >= UBCORE_SIP_TABLE_SIZE || g_sip_table.entry[idx] != NULL) { 235 ubcore_log_err("add sip failed.\n"); 236 return -1; 237 } 238 new_sip = kzalloc(sizeof(struct ubcore_sip_info), GFP_ATOMIC); 239 if (new_sip == NULL) 240 return -ENOMEM; 241 242 (void)memcpy(new_sip, sip, sizeof(struct ubcore_sip_info)); 243 mutex_lock(&g_sip_table.lock); 244 g_sip_table.entry[idx] = new_sip; 245 mutex_unlock(&g_sip_table.lock); 246 ubcore_log_info("sip table add netdev: %s, entry idx: %d.\n", new_sip->dev_name, idx); 247 return 0; 248 } 249 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0