- Kernel - mailweb.openeuler.org

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

03 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-5.10 000/133] erofs: add ondemand mode support
by Baokun Li 03 Dec '24

03 Dec '24

Al Viro (1): erofs: fix handling kern_mount() failure Baokun Li (29): openeuler_defconfig: enable erofs ondemand for x86 and arm64 fscache: fix reference count leakage during abort init fscache: fix assertion failure in fscache_put_object() erofs: fix lockdep false positives on initializing erofs_pseudo_mnt erofs: remove erofs_fscache_netfs fscache: rename new_location to new_version cachefiles: use mainline xattr in ondemand mode cachefiles: remove err_put_fd tag in cachefiles_ondemand_daemon_read() cachefiles: fix slab-use-after-free in cachefiles_ondemand_get_fd() cachefiles: fix slab-use-after-free in cachefiles_ondemand_daemon_read() cachefiles: add output string to cachefiles_obj_[get|put]_ondemand_fd cachefiles: add consistency check for copen/cread cachefiles: stop sending new request when dropping object cachefiles: flush all requests for the object that is being dropped fscache: limit fscache_object_max_active to avoid blocking cachefiles: add spin_lock for cachefiles_ondemand_info cachefiles: never get a new anon fd if ondemand_id is valid cachefiles: make on-demand read killable fscache: set the default value of object_max_active to 256 cachefiles: flush all requests after setting CACHEFILES_DEAD cachefiles: call cachefiles_ondemand_init_object() out of dir inode lock cachefiles: defer exposing anon_fd until after copy_to_user() succeeds cachefiles: disallow to complete open requests with uninitialised ondemand_id cachefiles: clear FSCACHE_COOKIE_NO_DATA_YET for the new ondemand object erofs: correct the blknr/blkoff calculation in erofs_read_raw_page() fscache: fix op leak due to abort init after parent ready cachefiles: cyclic allocation of msg_id to avoid reuse fscache: fix assertion failure in cachefiles_put_object() cachefiles: prefault in user pages to aovid ABBA deadlock David Howells (1): cachefiles, erofs: Fix NULL deref in when cachefiles is not doing ondemand-mode Dawei Li (1): erofs: protect s_inodes with s_inode_list_lock for fscache Gao Xiang (26): erofs: clean up file headers & footers erofs: introduce chunk-based file on-disk format erofs: support reading chunk-based uncompressed files erofs: fix double free of 'copied' erofs: introduce erofs_sb_has_xxx() helpers erofs: decouple basic mount options from fs_context erofs: add multiple device support erofs: clean up erofs_map_blocks tracepoints erofs: introduce meta buffer operations erofs: use meta buffers for inode operations erofs: use meta buffers for super operations erofs: use meta buffers for xattr operations erofs: use meta buffers for zmap operations erofs: fix misbehavior of unsupported chunk format check erofs: add fscache mode check helper erofs: register fscache volume erofs: add fscache context helper functions erofs: add anonymous inode caching metadata for data blobs erofs: register fscache context for primary data blob erofs: register fscache context for extra data blobs erofs: implement fscache-based metadata read erofs: implement fscache-based data read for non-inline layout erofs: implement fscache-based data read for inline layout erofs: add 'fsid' mount option erofs: scan devices from device table erofs: fix order >= MAX_ORDER warning due to crafted negative i_size Hou Tao (2): erofs: check the uniqueness of fsid in shared domain in advance cachefiles: flush ondemand_object_worker during clean object Jeffle Xu (9): erofs: use meta buffers for erofs_read_superblock() cachefiles: notify the user daemon when looking up cookie cachefiles: unbind cachefiles gracefully in on-demand mode cachefiles: notify the user daemon when withdrawing cookie cachefiles: implement on-demand read cachefiles: enable on-demand read mode anolis: cachefiles: skip check for n_children in on-demand mode erofs: make erofs_map_blocks() generally available erofs: leave compressed inodes unsupported in fscache mode for now Jia Zhu (12): cachefiles: narrow the scope of flushed requests when releasing fd erofs: use kill_anon_super() to kill super in fscache mode erofs: code clean up for fscache erofs: introduce fscache-based domain erofs: introduce a pseudo mnt to manage shared cookies erofs: Support sharing cookies in the same domain erofs: introduce 'domain_id' mount option anolis: cachefiles: introduce object ondemand state anolis: cachefiles: extract ondemand info field from cachefiles_object anolis: cachefiles: resend an open request if the read request's object is closed anolis: cachefiles: narrow the scope of triggering EPOLLIN events in ondemand mode anolis: cachefiles: add restore command to recover inflight ondemand read requests Jingbo Xu (18): anolis: cachefiles: replace BUG_ON() with WARN_ON() anolis: cachefiles: fix volume key setup for cachefiles_open anolis: cachefiles: refactor cachefiles_ondemand_daemon_read() anolis: erofs: fix the name of erofs_fscache_super_index_def anolis: cachefiles: maintain a file descriptor to the backing file anolis: fscache,cachefiles: add fscache_prepare_read() helper anolis: erofs: implement fscache-based data readahead erofs: fix use-after-free of fsid and domain_id string erofs: remove unused EROFS_GET_BLOCKS_RAW flag anolis: cachefiles: optimize on-demand IO path with buffer IO anolis: fscache: export fscache_object_wq anolis: cachefiles: reset object->private to NULL when it's freed anolis: cachefiles: add missing lock protection when polling anolis: cachefiles: fix potential NULL in error path erofs: relinquish volume with mutex held erofs: maintain cookies of share domain in self-contained list erofs: remove unused device mapping in meta routine erofs: unify anonymous inodes for blob Mikulas Patocka (1): wait_on_bit: add an acquire memory barrier Sun Ke (1): cachefiles: fix error return code in cachefiles_ondemand_copen() Xin Yin (1): cachefiles: make on-demand request distribution fairer Yu Kuai (10): fscache: add new helper to determine cachefile location fscache: generate new key_hash for new location cachefiles: factor out helper to generate acc from cachefiles_cook_key() cachefiles: factor out helper to generate csum from cachefiles_cook_key() cachefiles: use volume key directly in cachefiles_cook_key() for new location cachefiles: skip acc in cachefiles_cook_key() for new location cachefiles: skip volum csum cachefiles_cook_key() for new location cachefiles: use key_hash as csum for new location cachefiles: handle the unprintable case for new location in cachefiles_cook_key() erofs: switch to use new location Yue Hu (1): erofs: don't use erofs_map_blocks() any more Zizhi Wo (20): erofs: fix page unlock advance during readahead erofs: add erofs switch to better control it erofs: add erofs_ondemand switch fscache: fix kernel BUG at __fscache_read_or_alloc_page fscache: add a waiting mechanism when duplicate cookies are detected fscache: Fix trace UAF in fscache_cookie_put() cachefiles: Fix NULL pointer dereference in object->file cachefiles: Restrict monitor calls to read_page cachefiles: Fix cookie reference count leakage error fscache: Add the unhash_cookie mechanism to fscache_drop_object() cachefiles: Add restrictions to cachefiles_daemon_cull() cachefiles: Change the mark inactive sequence in erofs ondemand mode cachefiles: Set object to close if ondemand_id < 0 in copen s390: provide arch_test_bit_acquire() for architecture s390 wait_on_bit: Add wait_on_bit_acquire() to provide memory barrier fscache: add a memory barrier for FSCACHE_COOKIE_LOOKING_UP fscache/cachefiles: add a memory barrier for waking and waiting fscache/cachefiles: add a memory barrier for page_write fscache: modify fscache_hash_cookie() to enhance security cachefiles: modify inappropriate error return value in cachefiles_daemon_secctx Documentation/atomic_bitops.txt | 10 +- Documentation/filesystems/erofs.rst | 28 +- arch/arm64/configs/openeuler_defconfig | 9 +- arch/s390/include/asm/bitops.h | 7 + arch/x86/configs/openeuler_defconfig | 9 +- arch/x86/include/asm/bitops.h | 21 + fs/Makefile | 2 + fs/cachefiles/Kconfig | 12 + fs/cachefiles/Makefile | 1 + fs/cachefiles/bind.c | 28 +- fs/cachefiles/daemon.c | 134 +++- fs/cachefiles/interface.c | 34 +- fs/cachefiles/internal.h | 132 ++- fs/cachefiles/key.c | 167 +++- fs/cachefiles/namei.c | 45 +- fs/cachefiles/ondemand.c | 752 ++++++++++++++++++ fs/cachefiles/rdwr.c | 201 ++++- fs/cachefiles/xattr.c | 179 ++++- fs/erofs/Kconfig | 35 +- fs/erofs/Makefile | 2 +- fs/erofs/compress.h | 2 - fs/erofs/data.c | 259 ++++-- fs/erofs/decompressor.c | 5 +- fs/erofs/dir.c | 2 - fs/erofs/erofs_fs.h | 68 +- fs/erofs/fscache.c | 568 +++++++++++++ fs/erofs/inode.c | 98 ++- fs/erofs/internal.h | 161 +++- fs/erofs/namei.c | 2 - fs/erofs/super.c | 353 ++++++-- fs/erofs/tagptr.h | 3 - fs/erofs/utils.c | 2 - fs/erofs/xattr.c | 141 +--- fs/erofs/xattr.h | 2 - fs/erofs/zdata.c | 35 +- fs/erofs/zdata.h | 1 - fs/erofs/zmap.c | 48 +- fs/erofs/zpvec.h | 2 - fs/fs_ctl.c | 43 + fs/fscache/cookie.c | 149 ++-- fs/fscache/internal.h | 1 + fs/fscache/main.c | 17 +- fs/fscache/object.c | 39 +- fs/fscache/page.c | 90 ++- .../bitops/instrumented-non-atomic.h | 12 + include/asm-generic/bitops/non-atomic.h | 14 + include/linux/fs.h | 17 + include/linux/fscache-cache.h | 8 + include/linux/fscache.h | 60 +- include/linux/wait_bit.h | 25 + include/trace/events/cachefiles.h | 10 +- include/trace/events/erofs.h | 7 +- include/uapi/linux/cachefiles.h | 69 ++ kernel/sched/wait_bit.c | 40 + lib/radix-tree.c | 1 + 55 files changed, 3614 insertions(+), 548 deletions(-) create mode 100644 fs/cachefiles/ondemand.c create mode 100644 fs/erofs/fscache.c create mode 100644 fs/fs_ctl.c create mode 100644 include/uapi/linux/cachefiles.h -- 2.46.1

2 134

[PATCH v2 OLK-5.10 0/8] CVE-2024-40927
by Yongqiang Liu 03 Dec '24

03 Dec '24

Hector Martin (1): xhci: Handle TD clearing for multiple streams case Mathias Nyman (6): xhci: use xhci_td_cleanup() helper when giving back cancelled URBs xhci: split handling halted endpoints into two steps xhci: fix giving back URB with incorrect status regression in 5.12 xhci: Fix 5.12 regression of missing xHC cache clearing command after a Stall xhci: introduce a new move_dequeue_past_td() function to replace old code. xhci: Fix failure to give back some cached cancelled URBs. Michal Pecio (1): usb: xhci: Fix TD invalidation under pending Set TR Dequeue drivers/usb/host/xhci-ring.c | 385 ++++++++++++++++++++++++++--------- drivers/usb/host/xhci.c | 94 +-------- drivers/usb/host/xhci.h | 9 + 3 files changed, 299 insertions(+), 189 deletions(-) -- 2.25.1

2 9

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

03 Dec '24

euleros inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAXJCE CVE: NA ---------------------------------------------------- In the etmem swap process, use get_page_from_vaddr to obtain the page and add the page reference counting. If a page does not meet the recycling criteria, release the reference counting of the page. In the add_page_for_swap process, if the input page is the middle page of a compound page, head and page cannot be used together. Instead, head must be used as the input parameter. Fixes: 715de52cae8d ("etmem : fix page_ref count leak and head missing useing problem") Signed-off-by: chenrenhui <chenrenhui1(a)huawei.com> --- fs/proc/etmem_swap.c | 2 ++ mm/vmscan.c | 17 ++++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/fs/proc/etmem_swap.c b/fs/proc/etmem_swap.c index 86f5cf8c90a1..becc7f7c2fa8 100644 --- a/fs/proc/etmem_swap.c +++ b/fs/proc/etmem_swap.c @@ -70,6 +70,8 @@ static ssize_t swap_pages_write(struct file *file, const char __user *buf, continue; add_page_for_swap(page, &pagelist); + /* release the ref count we get from the get_page_from_vaddr interface */ + put_page(page); } if (!list_empty(&pagelist)) diff --git a/mm/vmscan.c b/mm/vmscan.c index 7cb214d44417..08213f1c18ee 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4623,7 +4623,6 @@ EXPORT_SYMBOL_GPL(check_move_unevictable_pages); #ifdef CONFIG_ETMEM int add_page_for_swap(struct page *page, struct list_head *pagelist) { - int err = -EBUSY; struct page *head; /* If the page is mapped by more than one process, do not swap it */ @@ -4634,19 +4633,15 @@ int add_page_for_swap(struct page *page, struct list_head *pagelist) return -EACCES; head = compound_head(page); - err = isolate_lru_page(head); - if (err) { - put_page(page); - return err; - } - put_page(page); - if (PageUnevictable(page)) - putback_lru_page(page); + if (isolate_lru_page(head)) + return -EBUSY; + + if (PageUnevictable(head)) + putback_lru_page(head); else list_add_tail(&head->lru, pagelist); - err = 0; - return err; + return 0; } EXPORT_SYMBOL_GPL(add_page_for_swap); -- 2.33.0

2 1

[openeuler:OLK-5.10 2516/2516] drivers/gpu/drm/ast/ast_mm.c:91:39: sparse: sparse: incorrect type in assignment (different address spaces)
by kernel test robot 03 Dec '24

03 Dec '24

tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: f030ffc8e0c6dac3503bebddbf49cc339003fcdb commit: 968ee436e4d0ce09994f74015dc163ef280ccc1e [2516/2516] drm/ast: Fixed display error for ps23xx when using ast bmc card config: x86_64-randconfig-121-20241203 (https://download.01.org/0day-ci/archive/20241203/202412032029.eVzOP3UR-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241203/202412032029.eVzOP3UR-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/202412032029.eVzOP3UR-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) >> drivers/gpu/drm/ast/ast_mm.c:91:39: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected void *addr @@ got void [noderef] __iomem * @@ drivers/gpu/drm/ast/ast_mm.c:91:39: sparse: expected void *addr drivers/gpu/drm/ast/ast_mm.c:91:39: sparse: got void [noderef] __iomem * vim +91 drivers/gpu/drm/ast/ast_mm.c 76 77 static int ast_driver_io_mem_reserve(struct ttm_bo_device *bdev, 78 struct ttm_resource *mem) 79 { 80 struct drm_vram_mm *vmm = drm_vram_mm_of_bdev(bdev); 81 size_t bus_size = (size_t)mem->num_pages << PAGE_SHIFT; 82 83 switch (mem->mem_type) { 84 case TTM_PL_SYSTEM: /* nothing to do */ 85 break; 86 case TTM_PL_VRAM: 87 mem->bus.offset = (mem->start << PAGE_SHIFT) + vmm->vram_base; 88 mem->bus.is_iomem = true; 89 90 mem->placement = TTM_PL_FLAG_UNCACHED; > 91 mem->bus.addr = ioremap(mem->bus.offset, bus_size); 92 93 if (!mem->bus.addr) 94 return -ENOMEM; 95 96 break; 97 default: 98 return -EINVAL; 99 } 100 101 return 0; 102 } 103 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-5.10] hwpoison, memory_hotplug: lock page before unmap for hwpoisoned page
by Wupeng Ma 03 Dec '24

03 Dec '24

From: Ma Wupeng <mawupeng1(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IB8TSF -------------------------------- Commit b15c87263a69 ("hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined) add page poison checks in do_migrate_range in order to make offline hwpoisoned page possible by introducing isolate_lru_page and try_to_unmap for hwpoisoned page. However page lock must be held before calling try_to_unmap. Add it to fix this problem. Without page lock, kernel will BUG_ON with the following log: ------------[ cut here ]------------ kernel BUG at include/linux/swapops.h:326! Internal error: Oops - BUG: 00000000f2000800 [#1] SMP CPU: 55 PID: 59981 Comm: sh Kdump: loaded Tainted: G W OE 5.10.0 #1 pstate: 60400009 (nZCv daif +PAN -UAO -TCO BTYPE=--) pc : try_to_unmap_one+0xdfc/0x1380 lr : try_to_unmap_one+0x4f4/0x1380 Call trace: try_to_unmap_one+0xdfc/0x1380 rmap_walk_anon+0x150/0x45c rmap_walk+0x50/0xfc try_to_unmap+0x108/0x1b0 do_migrate_range+0x3bc/0x6d0 offline_pages+0x450/0x5b0 memory_subsys_offline+0x4c/0x9c device_offline+0xfc/0x14c state_store+0x98/0x110 dev_attr_store+0x1c/0x40 sysfs_kf_write+0x48/0x70 kernfs_fop_write_iter+0x128/0x1d0 new_sync_write+0xec/0x1a0 vfs_write+0x208/0x2b0 ksys_write+0x70/0x110 __arm64_sys_write+0x20/0x40 invoke_syscall+0x4c/0x124 el0_svc_common.constprop.0+0x140/0x15c do_el0_svc+0x30/0xd0 el0_svc+0x1c/0x2c el0_sync_handler+0xb0/0xb4 el0_sync+0x168/0x180 Code: 17ffffde d1000400 f9400000 3707a240 (d4210000) SMP: stopping secondary CPUs Fixes: b15c87263a69 ("hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined") Signed-off-by: Ma Wupeng <mawupeng1(a)huawei.com> --- mm/memory_hotplug.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index e49bc4753eca..465100749d2d 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1160,8 +1160,11 @@ int do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) if (PageHWPoison(page)) { if (WARN_ON(PageLRU(page))) isolate_lru_page(page); - if (page_mapped(page)) + if (page_mapped(page)) { + lock_page(page); try_to_unmap(page, TTU_IGNORE_MLOCK); + unlock_page(page); + } continue; } -- 2.25.1

2 1

[openeuler:openEuler-1.0-LTS 1297/1297] kernel/locking/.tmp_percpu-rwsem.o: warning: objtool: missing symbol for section .text
by kernel test robot 03 Dec '24

03 Dec '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: 312efa97a54edf7e64f108312c4d8c6961a1abaf commit: 96d4baaa81cce700eb801a0a9bf28b7fbbba3162 [1297/1297] tasks, sched/core: With a grace period after finish_task_switch(), remove unnecessary code config: x86_64-buildonly-randconfig-002-20241117 (https://download.01.org/0day-ci/archive/20241203/202412032008.TV1mkLUs-lkp@…) compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241203/202412032008.TV1mkLUs-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/202412032008.TV1mkLUs-lkp@intel.com/ All warnings (new ones prefixed by >>): >> kernel/locking/.tmp_percpu-rwsem.o: warning: objtool: missing symbol for section .text -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-5.10] drivers/perf: hisi: Enable HiSilicon Erratum 162400501 quirk
by Yushan Wang 03 Dec '24

03 Dec '24

From: Junhao He <hejunhao3(a)huawei.com> driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IB7OM0 CVE: NA ---------------------------------------------------------------------- On HiSilicon HIP10C platform, the DDRC PMU interrupt registers offset is modified, causing the interrupt handler to fail to properly handle counter overflows. This patch tries to fix this by correcting the HIP10C platform DDRC PMU interrupt registers offset (including mask/status/clear registers). Signed-off-by: Junhao He <hejunhao3(a)huawei.com> Signed-off-by: Qizhi Zhang <zhangqizhi3(a)h-partners.com> Signed-off-by: Yushan Wang <wangyushan12(a)huawei.com> --- drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 70 +++++++++++++++++-- drivers/perf/hisilicon/hisi_uncore_pmu.h | 1 + 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c index ee020669d134..816770ace86f 100644 --- a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c @@ -43,6 +43,16 @@ #define DDRC_V2_EVENT_TYPE 0xe74 #define DDRC_V2_PERF_CTRL 0xeA0 +/* + * HIP10C platform v2 PMU DDRC interrupt registers definition + * On HIP10C platform, the DDRC PMU interrupt register offset is + * modified, causing the interrupt handler to fail to properly + * handle counter overflows. + */ +#define DDRC_V2_HIP10C_INT_MASK 0x534 +#define DDRC_V2_HIP10C_INT_STATUS 0x538 +#define DDRC_V2_HIP10C_INT_CLEAR 0x53C + /* DDRC has 8-counters */ #define DDRC_NR_COUNTERS 0x8 #define DDRC_V1_PERF_CTRL_EN 0x2 @@ -58,11 +68,39 @@ */ #define GET_DDRC_EVENTID(hwc) (hwc->config_base & 0x7) +#define HISI_DDRC_PMU_NORMAL_PMU 0x0 /* HiSilicon normal PMU */ +#define HISI_DDRC_PMU_INCORRECT_INT_REGS BIT(0) /* HiSilicon HIP10C PMU */ + static const u32 ddrc_reg_off[] = { DDRC_FLUX_WR, DDRC_FLUX_RD, DDRC_FLUX_WCMD, DDRC_FLUX_RCMD, DDRC_PRE_CMD, DDRC_ACT_CMD, DDRC_RNK_CHG, DDRC_RW_CHG }; +static struct acpi_platform_list hisi_uncore_plat_info[] = { + /* HiSilicon Hip10C Platform */ + {"HISI ", "HIP10C ", 0, ACPI_SIG_DSDT, greater_than_or_equal, + "Erratum #162400501", HISI_DDRC_PMU_INCORRECT_INT_REGS}, + { } +}; + +static void hisi_ddrc_pmu_check_errata(struct platform_device *pdev, struct hisi_pmu *ddrc_pmu) +{ + int idx; + + idx = acpi_match_platform_list(hisi_uncore_plat_info); + if (idx >= 0) + ddrc_pmu->errata = hisi_uncore_plat_info[idx].data; + else + ddrc_pmu->errata = HISI_DDRC_PMU_NORMAL_PMU; + + dev_dbg(ddrc_pmu->dev, "errata mask %#x\n", ddrc_pmu->errata); +} + +static bool hisi_ddrc_pmu_has_erratum(struct hisi_pmu *ddrc_pmu, u32 erratum) +{ + return !!(ddrc_pmu->errata & erratum); +} + /* * Select the counter register offset using the counter index. * In PMU v1, there are no programmable counter, the count @@ -248,21 +286,29 @@ static void hisi_ddrc_pmu_v1_disable_counter_int(struct hisi_pmu *ddrc_pmu, static void hisi_ddrc_pmu_v2_enable_counter_int(struct hisi_pmu *ddrc_pmu, struct hw_perf_event *hwc) { + u32 int_mask = DDRC_V2_INT_MASK; u32 val; - val = readl(ddrc_pmu->base + DDRC_V2_INT_MASK); + if (hisi_ddrc_pmu_has_erratum(ddrc_pmu, HISI_DDRC_PMU_INCORRECT_INT_REGS)) + int_mask = DDRC_V2_HIP10C_INT_MASK; + + val = readl(ddrc_pmu->base + int_mask); val &= ~(1 << hwc->idx); - writel(val, ddrc_pmu->base + DDRC_V2_INT_MASK); + writel(val, ddrc_pmu->base + int_mask); } static void hisi_ddrc_pmu_v2_disable_counter_int(struct hisi_pmu *ddrc_pmu, struct hw_perf_event *hwc) { + u32 int_mask = DDRC_V2_INT_MASK; u32 val; - val = readl(ddrc_pmu->base + DDRC_V2_INT_MASK); + if (hisi_ddrc_pmu_has_erratum(ddrc_pmu, HISI_DDRC_PMU_INCORRECT_INT_REGS)) + int_mask = DDRC_V2_HIP10C_INT_MASK; + + val = readl(ddrc_pmu->base + int_mask); val |= 1 << hwc->idx; - writel(val, ddrc_pmu->base + DDRC_V2_INT_MASK); + writel(val, ddrc_pmu->base + int_mask); } static u32 hisi_ddrc_pmu_v1_get_int_status(struct hisi_pmu *ddrc_pmu) @@ -278,13 +324,23 @@ static void hisi_ddrc_pmu_v1_clear_int_status(struct hisi_pmu *ddrc_pmu, static u32 hisi_ddrc_pmu_v2_get_int_status(struct hisi_pmu *ddrc_pmu) { - return readl(ddrc_pmu->base + DDRC_V2_INT_STATUS); + u32 int_status = DDRC_V2_INT_STATUS; + + if (hisi_ddrc_pmu_has_erratum(ddrc_pmu, HISI_DDRC_PMU_INCORRECT_INT_REGS)) + int_status = DDRC_V2_HIP10C_INT_STATUS; + + return readl(ddrc_pmu->base + int_status); } 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); + u32 int_clear = DDRC_V2_INT_CLEAR; + + if (hisi_ddrc_pmu_has_erratum(ddrc_pmu, HISI_DDRC_PMU_INCORRECT_INT_REGS)) + int_clear = DDRC_V2_HIP10C_INT_CLEAR; + + writel(1 << idx, ddrc_pmu->base + int_clear); } static const struct acpi_device_id hisi_ddrc_pmu_acpi_match[] = { @@ -464,6 +520,8 @@ static int hisi_ddrc_pmu_dev_probe(struct platform_device *pdev, if (ret) return ret; + hisi_ddrc_pmu_check_errata(pdev, ddrc_pmu); + if (ddrc_pmu->identifier >= HISI_PMU_V2) { ddrc_pmu->counter_bits = 48; ddrc_pmu->check_event = DDRC_V2_NR_EVENTS; diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.h b/drivers/perf/hisilicon/hisi_uncore_pmu.h index 9cf06c80acf4..eeacf2e89568 100644 --- a/drivers/perf/hisilicon/hisi_uncore_pmu.h +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.h @@ -107,6 +107,7 @@ struct hisi_pmu { /* check event code range */ int check_event; u32 identifier; + u32 errata; }; int hisi_uncore_pmu_get_event_idx(struct perf_event *event); -- 2.33.0

2 1

[PATCH OLK-6.6] drivers/perf: hisi: Enable HiSilicon Erratum 162400501 quirk
by Yushan Wang 03 Dec '24

03 Dec '24

From: Junhao He <hejunhao3(a)huawei.com> driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IB7ONX CVE: NA ---------------------------------------------------------------------- On HiSilicon HIP10C platform, the DDRC PMU interrupt registers offset is modified, causing the interrupt handler to fail to properly handle counter overflows. This patch tries to fix this by correcting the HIP10C platform DDRC PMU interrupt registers offset (including mask/status/clear registers). Signed-off-by: Junhao He <hejunhao3(a)huawei.com> Signed-off-by: Qizhi Zhang <zhangqizhi3(a)h-partners.com> Signed-off-by: Yushan Wang <wangyushan12(a)huawei.com> --- drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 70 +++++++++++++++++-- drivers/perf/hisilicon/hisi_uncore_pmu.h | 1 + 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c index ee020669d134..816770ace86f 100644 --- a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c @@ -43,6 +43,16 @@ #define DDRC_V2_EVENT_TYPE 0xe74 #define DDRC_V2_PERF_CTRL 0xeA0 +/* + * HIP10C platform v2 PMU DDRC interrupt registers definition + * On HIP10C platform, the DDRC PMU interrupt register offset is + * modified, causing the interrupt handler to fail to properly + * handle counter overflows. + */ +#define DDRC_V2_HIP10C_INT_MASK 0x534 +#define DDRC_V2_HIP10C_INT_STATUS 0x538 +#define DDRC_V2_HIP10C_INT_CLEAR 0x53C + /* DDRC has 8-counters */ #define DDRC_NR_COUNTERS 0x8 #define DDRC_V1_PERF_CTRL_EN 0x2 @@ -58,11 +68,39 @@ */ #define GET_DDRC_EVENTID(hwc) (hwc->config_base & 0x7) +#define HISI_DDRC_PMU_NORMAL_PMU 0x0 /* HiSilicon normal PMU */ +#define HISI_DDRC_PMU_INCORRECT_INT_REGS BIT(0) /* HiSilicon HIP10C PMU */ + static const u32 ddrc_reg_off[] = { DDRC_FLUX_WR, DDRC_FLUX_RD, DDRC_FLUX_WCMD, DDRC_FLUX_RCMD, DDRC_PRE_CMD, DDRC_ACT_CMD, DDRC_RNK_CHG, DDRC_RW_CHG }; +static struct acpi_platform_list hisi_uncore_plat_info[] = { + /* HiSilicon Hip10C Platform */ + {"HISI ", "HIP10C ", 0, ACPI_SIG_DSDT, greater_than_or_equal, + "Erratum #162400501", HISI_DDRC_PMU_INCORRECT_INT_REGS}, + { } +}; + +static void hisi_ddrc_pmu_check_errata(struct platform_device *pdev, struct hisi_pmu *ddrc_pmu) +{ + int idx; + + idx = acpi_match_platform_list(hisi_uncore_plat_info); + if (idx >= 0) + ddrc_pmu->errata = hisi_uncore_plat_info[idx].data; + else + ddrc_pmu->errata = HISI_DDRC_PMU_NORMAL_PMU; + + dev_dbg(ddrc_pmu->dev, "errata mask %#x\n", ddrc_pmu->errata); +} + +static bool hisi_ddrc_pmu_has_erratum(struct hisi_pmu *ddrc_pmu, u32 erratum) +{ + return !!(ddrc_pmu->errata & erratum); +} + /* * Select the counter register offset using the counter index. * In PMU v1, there are no programmable counter, the count @@ -248,21 +286,29 @@ static void hisi_ddrc_pmu_v1_disable_counter_int(struct hisi_pmu *ddrc_pmu, static void hisi_ddrc_pmu_v2_enable_counter_int(struct hisi_pmu *ddrc_pmu, struct hw_perf_event *hwc) { + u32 int_mask = DDRC_V2_INT_MASK; u32 val; - val = readl(ddrc_pmu->base + DDRC_V2_INT_MASK); + if (hisi_ddrc_pmu_has_erratum(ddrc_pmu, HISI_DDRC_PMU_INCORRECT_INT_REGS)) + int_mask = DDRC_V2_HIP10C_INT_MASK; + + val = readl(ddrc_pmu->base + int_mask); val &= ~(1 << hwc->idx); - writel(val, ddrc_pmu->base + DDRC_V2_INT_MASK); + writel(val, ddrc_pmu->base + int_mask); } static void hisi_ddrc_pmu_v2_disable_counter_int(struct hisi_pmu *ddrc_pmu, struct hw_perf_event *hwc) { + u32 int_mask = DDRC_V2_INT_MASK; u32 val; - val = readl(ddrc_pmu->base + DDRC_V2_INT_MASK); + if (hisi_ddrc_pmu_has_erratum(ddrc_pmu, HISI_DDRC_PMU_INCORRECT_INT_REGS)) + int_mask = DDRC_V2_HIP10C_INT_MASK; + + val = readl(ddrc_pmu->base + int_mask); val |= 1 << hwc->idx; - writel(val, ddrc_pmu->base + DDRC_V2_INT_MASK); + writel(val, ddrc_pmu->base + int_mask); } static u32 hisi_ddrc_pmu_v1_get_int_status(struct hisi_pmu *ddrc_pmu) @@ -278,13 +324,23 @@ static void hisi_ddrc_pmu_v1_clear_int_status(struct hisi_pmu *ddrc_pmu, static u32 hisi_ddrc_pmu_v2_get_int_status(struct hisi_pmu *ddrc_pmu) { - return readl(ddrc_pmu->base + DDRC_V2_INT_STATUS); + u32 int_status = DDRC_V2_INT_STATUS; + + if (hisi_ddrc_pmu_has_erratum(ddrc_pmu, HISI_DDRC_PMU_INCORRECT_INT_REGS)) + int_status = DDRC_V2_HIP10C_INT_STATUS; + + return readl(ddrc_pmu->base + int_status); } 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); + u32 int_clear = DDRC_V2_INT_CLEAR; + + if (hisi_ddrc_pmu_has_erratum(ddrc_pmu, HISI_DDRC_PMU_INCORRECT_INT_REGS)) + int_clear = DDRC_V2_HIP10C_INT_CLEAR; + + writel(1 << idx, ddrc_pmu->base + int_clear); } static const struct acpi_device_id hisi_ddrc_pmu_acpi_match[] = { @@ -464,6 +520,8 @@ static int hisi_ddrc_pmu_dev_probe(struct platform_device *pdev, if (ret) return ret; + hisi_ddrc_pmu_check_errata(pdev, ddrc_pmu); + if (ddrc_pmu->identifier >= HISI_PMU_V2) { ddrc_pmu->counter_bits = 48; ddrc_pmu->check_event = DDRC_V2_NR_EVENTS; diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.h b/drivers/perf/hisilicon/hisi_uncore_pmu.h index 9cf06c80acf4..eeacf2e89568 100644 --- a/drivers/perf/hisilicon/hisi_uncore_pmu.h +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.h @@ -107,6 +107,7 @@ struct hisi_pmu { /* check event code range */ int check_event; u32 identifier; + u32 errata; }; int hisi_uncore_pmu_get_event_idx(struct perf_event *event); -- 2.33.0

2 1

[openeuler:OLK-6.6 1577/1577] drivers/ata/libahci.c:210:5: warning: no previous prototype for function 'get_ahci_em_messages'
by kernel test robot 03 Dec '24

03 Dec '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: d72146e885adc1fe1f656075dccd9344d0024041 commit: fb43492008c11fe89e510dd63383a2d37ea3cf8e [1577/1577] ata: ahci: Add support for AHCI SGPIO Enclosure Management config: x86_64-buildonly-randconfig-001-20241203 (https://download.01.org/0day-ci/archive/20241203/202412031924.l8eOZ6vd-lkp@…) compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241203/202412031924.l8eOZ6vd-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/202412031924.l8eOZ6vd-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from drivers/ata/libahci.c:24: In file included from include/linux/blkdev.h:9: In file included from include/linux/blk_types.h:10: In file included from include/linux/bvec.h:10: In file included from include/linux/highmem.h:8: In file included from include/linux/cacheflush.h:5: In file included from arch/x86/include/asm/cacheflush.h:5: In file included from include/linux/mm.h:2235: include/linux/vmstat.h:508:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion] 508 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ ^ 509 | item]; | ~~~~ include/linux/vmstat.h:515:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion] 515 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ ^ 516 | NR_VM_NUMA_EVENT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~~ include/linux/vmstat.h:522:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion] 522 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_" | ~~~~~~~~~~~ ^ ~~~ include/linux/vmstat.h:527:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion] 527 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ ^ 528 | NR_VM_NUMA_EVENT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~~ include/linux/vmstat.h:536:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion] 536 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~ ^ 537 | NR_VM_NUMA_EVENT_ITEMS + | ~~~~~~~~~~~~~~~~~~~~~~ >> drivers/ata/libahci.c:210:5: warning: no previous prototype for function 'get_ahci_em_messages' [-Wmissing-prototypes] 210 | int get_ahci_em_messages(void) | ^ drivers/ata/libahci.c:210:1: note: declare 'static' if the function is not intended to be used outside of this translation unit 210 | int get_ahci_em_messages(void) | ^ | static 6 warnings generated. vim +/get_ahci_em_messages +210 drivers/ata/libahci.c 209 > 210 int get_ahci_em_messages(void) 211 { 212 return ahci_em_messages; 213 } 214 EXPORT_SYMBOL_GPL(get_ahci_em_messages); 215 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0