- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6] software node: Correct a OOB check in software_node_get_reference_args()
by Zhang Yuwei 11 Nov '25

11 Nov '25

From: Zijun Hu <quic_zijuhu(a)quicinc.com> stable inclusion from stable-v6.6.95 commit f9397cf7bfb680799fb8c7f717c8f756384c3280 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICOE0M Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 31e4e12e0e9609850cefd4b2e1adf782f56337d6 ] software_node_get_reference_args() wants to get @index-th element, so the property value requires at least '(index + 1) * sizeof(*ref)' bytes but that can not be guaranteed by current OOB check, and may cause OOB for malformed property. Fix by using as OOB check '((index + 1) * sizeof(*ref) > prop->length)'. Reviewed-by: Sakari Ailus <sakari.ailus(a)linux.intel.com> Signed-off-by: Zijun Hu <quic_zijuhu(a)quicinc.com> Link: https://lore.kernel.org/r/20250414-fix_swnode-v2-1-9c9e6ae11eab@quicinc.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Wang Hai <wanghai38(a)huawei.com> --- drivers/base/swnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index 079bd14bdedc..a7a3e3b66bb5 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -518,7 +518,7 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, if (prop->is_inline) return -EINVAL; - if (index * sizeof(*ref) >= prop->length) + if ((index + 1) * sizeof(*ref) > prop->length) return -ENOENT; ref_array = prop->pointer; -- 2.22.0

2 1

[PATCH OLK-6.6 v2 00/14] Add MFS Support
by Huang Xiaojia 11 Nov '25

11 Nov '25

MFS is a stackable file system that utilizes a lower and a cache layer. It provides users with programmable caching capabilities. MFS only supports read-only operations for regular files, directories and symbolic links. When MFS is stacked on top of the lower and cache layers (which are themselves mounted on other file systems, such as ext4 or xfs), the underlying file systems must be also kept read-only to prevent the data inconsistency. MFS supports three running mode: none, local and remote. These modes are explained in running mode section. In short, MFS requires the `mtree` and `cachedir` mount options. The `mtree` option specifies the metadata source for MFS, while the `cachedir` option specifies the data source. In local or remote mode, `cachedir` points to a local cache (in memory or on disk) for backend file systems. v2: squash several patches together Hongbo Li (12): mfs: Initialize mfs module mfs: implement the mount procedure mfs: Add basic metadata operation for MFS mfs: Add basic data operation for MFS mfs: Add basic cache framework: check method and control structure mfs: Add basic events framework mfs: Add communication devie and event acquisition operations mfs: Add user command for handling events mfs: Add tracepoint for MFS mfs: Add MFS documentation MAINTAINERS: Add maintainer for mfs mfs: enable MFS Huang Xiaojia (2): mfs: Optimize mfs syncer process and metadata ops mfs: tool: Add mfs user space tool demo Documentation/filesystems/index.rst | 1 + Documentation/filesystems/mfs.rst | 223 +++++++++++ MAINTAINERS | 10 + arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/mfs/Kconfig | 12 + fs/mfs/Makefile | 4 + fs/mfs/cache.c | 507 ++++++++++++++++++++++++ fs/mfs/data.c | 523 +++++++++++++++++++++++++ fs/mfs/dev.c | 242 ++++++++++++ fs/mfs/inode.c | 303 ++++++++++++++ fs/mfs/internal.h | 232 +++++++++++ fs/mfs/super.c | 499 +++++++++++++++++++++++ include/trace/events/mfs.h | 105 +++++ include/uapi/linux/magic.h | 1 + include/uapi/linux/mfs.h | 62 +++ tools/mfs/.gitignore | 2 + tools/mfs/Makefile | 13 + tools/mfs/mfsd.c | 186 +++++++++ 21 files changed, 2929 insertions(+) create mode 100644 Documentation/filesystems/mfs.rst create mode 100644 fs/mfs/Kconfig create mode 100644 fs/mfs/Makefile create mode 100644 fs/mfs/cache.c create mode 100644 fs/mfs/data.c create mode 100644 fs/mfs/dev.c create mode 100644 fs/mfs/inode.c create mode 100644 fs/mfs/internal.h create mode 100644 fs/mfs/super.c create mode 100644 include/trace/events/mfs.h create mode 100644 include/uapi/linux/mfs.h create mode 100644 tools/mfs/.gitignore create mode 100644 tools/mfs/Makefile create mode 100644 tools/mfs/mfsd.c -- 2.25.1

2 15

[PATCH OLK-6.6] scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort()
by Zhang Yuwei 11 Nov '25

11 Nov '25

From: Chenyuan Yang <chenyuan0y(a)gmail.com> stable inclusion from stable-v6.6.89 commit d6979fabe812a168d5053e5a41d5a2e9b8afd7bf category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IC8J7I Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 4c324085062919d4e21c69e5e78456dcec0052fe ] A race can occur between the MCQ completion path and the abort handler: once a request completes, __blk_mq_free_request() sets rq->mq_hctx to NULL, meaning the subsequent ufshcd_mcq_req_to_hwq() call in ufshcd_mcq_abort() can return a NULL pointer. If this NULL pointer is dereferenced, the kernel will crash. Add a NULL check for the returned hwq pointer. If hwq is NULL, log an error and return FAILED, preventing a potential NULL-pointer dereference. As suggested by Bart, the ufshcd_cmd_inflight() check is removed. This is similar to the fix in commit 74736103fb41 ("scsi: ufs: core: Fix ufshcd_abort_one racing issue"). This is found by our static analysis tool KNighter. Signed-off-by: Chenyuan Yang <chenyuan0y(a)gmail.com> Link: https://lore.kernel.org/r/20250410001320.2219341-1-chenyuan0y@gmail.com Fixes: f1304d442077 ("scsi: ufs: mcq: Added ufshcd_mcq_abort()") Reviewed-by: Bart Van Assche <bvanassche(a)acm.org> Reviewed-by: Peter Wang <peter.wang(a)mediatek.com> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Wang Hai <wanghai38(a)huawei.com> --- drivers/ufs/core/ufs-mcq.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c index da8c1734d333..411109a5ebbf 100644 --- a/drivers/ufs/core/ufs-mcq.c +++ b/drivers/ufs/core/ufs-mcq.c @@ -632,13 +632,6 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd) unsigned long flags; int err; - if (!ufshcd_cmd_inflight(lrbp->cmd)) { - dev_err(hba->dev, - "%s: skip abort. cmd at tag %d already completed.\n", - __func__, tag); - return FAILED; - } - /* Skip task abort in case previous aborts failed and report failure */ if (lrbp->req_abort_skip) { dev_err(hba->dev, "%s: skip abort. tag %d failed earlier\n", @@ -647,6 +640,11 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd) } hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(cmd)); + if (!hwq) { + dev_err(hba->dev, "%s: skip abort. cmd at tag %d already completed.\n", + __func__, tag); + return FAILED; + } if (ufshcd_mcq_sqe_search(hba, hwq, tag)) { /* -- 2.22.0

2 1

[openeuler:OLK-6.6 3129/3129] drivers/ub/ubfi/irq.c:18:20: error: no member named 'domain' in 'struct dev_msi_info'
by kernel test robot 11 Nov '25

11 Nov '25

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: be4908c3dd5d15795275b738fbadd71ff8f0fbaa commit: 028a4161a77d2e15d331a13599a6f06cdd7490b6 [3129/3129] ub:ubfi: register ubc usi domain config: x86_64-allnoconfig (https://download.01.org/0day-ci/archive/20251111/202511111409.5wQwlEc6-lkp@…) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251111/202511111409.5wQwlEc6-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/202511111409.5wQwlEc6-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/ub/ubfi/irq.c:18:20: error: no member named 'domain' in 'struct dev_msi_info' 18 | domain = dev->msi.domain; | ~~~~~~~~ ^ 1 error generated. vim +18 drivers/ub/ubfi/irq.c 11 12 int ub_update_msi_domain(struct device *dev, 13 enum irq_domain_bus_token bus_token) 14 { 15 struct fwnode_handle *fwnode; 16 struct irq_domain *domain; 17 > 18 domain = dev->msi.domain; 19 if (!domain) { 20 dev_err(dev, "find base irq domain failed!\n"); 21 return -ENODEV; 22 } 23 24 fwnode = domain->fwnode; 25 if (!fwnode) { 26 dev_err(dev, "find fwnode failed!\n"); 27 return -ENODEV; 28 } 29 30 domain = irq_find_matching_fwnode(fwnode, bus_token); 31 if (!domain) { 32 dev_err(dev, "find irq domain failed!\n"); 33 return -ENODEV; 34 } 35 36 /* Update msi domain with new bus_token */ 37 dev_set_msi_domain(dev, domain); 38 39 return 0; 40 } 41 EXPORT_SYMBOL_GPL(ub_update_msi_domain); 42 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6] misc: pci_endpoint_test: Avoid issue of interrupts remaining after request_irq error
by Zhang Yuwei 11 Nov '25

11 Nov '25

From: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> stable inclusion from stable-v6.6.88 commit 5a4b7181213268c9b07bef8800905528435db44a category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IC8J7I Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit f6cb7828c8e17520d4f5afb416515d3fae1af9a9 upstream. After devm_request_irq() fails with error in pci_endpoint_test_request_irq(), the pci_endpoint_test_free_irq_vectors() is called assuming that all IRQs have been released. However, some requested IRQs remain unreleased, so there are still /proc/irq/* entries remaining, and this results in WARN() with the following message: remove_proc_entry: removing non-empty directory 'irq/30', leaking at least 'pci-endpoint-test.0' WARNING: CPU: 0 PID: 202 at fs/proc/generic.c:719 remove_proc_entry +0x190/0x19c To solve this issue, set the number of remaining IRQs to test->num_irqs, and release IRQs in advance by calling pci_endpoint_test_release_irq(). Cc: stable(a)vger.kernel.org Fixes: e03327122e2c ("pci_endpoint_test: Add 2 ioctl commands") Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> Link: https://lore.kernel.org/r/20250225110252.28866-3-hayashi.kunihiko@socionext… [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński <kwilczynski(a)kernel.org> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Wang Hai <wanghai38(a)huawei.com> --- drivers/misc/pci_endpoint_test.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c index af519088732d..cd5af3e55f28 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -260,6 +260,9 @@ static bool pci_endpoint_test_request_irq(struct pci_endpoint_test *test) break; } + test->num_irqs = i; + pci_endpoint_test_release_irq(test); + return false; } -- 2.22.0

2 1

[PATCH OLK-6.6 00/14] mm: add huge pfnmap support for remap_pfn_range()
by Yin Tirui 11 Nov '25

11 Nov '25

mm: add huge pfnmap support for remap_pfn_range() Overview ======== This patch series adds huge page support for remap_pfn_range(), automatically creating huge mappings when prerequisites are satisfied (size, alignment, architecture support, etc.) and falling back to normal page mappings otherwise. This work builds on Peter Xu's previous efforts on huge pfnmap support [0]. TODO ==== - Add PUD-level huge page support. Currently, only PMD-level huge pages are supported. - Consider the logic related to vmap_page_range and extract reusable common code. Tests Done ========== - Cross-build tests. - Performance tests with custom device driver implementing mmap() with remap_pfn_range(): - lat_mem_rd benchmark modified to use mmap(device_fd) instead of malloc() shows around 40% improvement in memory access latency with huge page support compared to normal page mappings. numactl -C 0 lat_mem_rd -t 4096M (stride=64) Memory Size (MB) Without Huge Mapping With Huge Mapping Improvement ---------------- ----------------- -------------- ----------- 64.00 148.858 ns 100.780 ns 32.3% 128.00 164.745 ns 103.537 ns 37.2% 256.00 169.907 ns 103.179 ns 39.3% 512.00 171.285 ns 103.072 ns 39.8% 1024.00 173.054 ns 103.055 ns 40.4% 2048.00 172.820 ns 103.091 ns 40.3% 4096.00 172.877 ns 103.115 ns 40.4% - Custom memory copy operations on mmap(device_fd) show around 18% performance improvement with huge page support compared to normal page mappings. numactl -C 0 memcpy_test (memory copy performance test) Memory Size (MB) Without Huge Mapping With Huge Mapping Improvement ---------------- ----------------- -------------- ----------- 1024.00 95.76 ms 77.91 ms 18.6% 2048.00 190.87 ms 155.64 ms 18.5% 4096.00 380.84 ms 311.45 ms 18.2% [0] https://lore.kernel.org/all/20240826204353.2228736-2-peterx@redhat.com/T/#u David Hildenbrand (1): mm/huge_memory: check pmd_special() only after pmd_present() Peter Xu (11): mm: introduce ARCH_SUPPORTS_HUGE_PFNMAP and special bits to pmd/pud mm: drop is_huge_zero_pud() mm: mark special bits for huge pfn mappings when inject mm: allow THP orders for PFNMAPs mm/gup: detect huge pfnmap entries in gup-fast mm/pagewalk: check pfnmap for folio_walk_start() mm/fork: accept huge pfnmap entries mm: always define pxx_pgprot() mm/x86: support large pfn mappings mm/arm64: support large pfn mappings arm64: mm: Drop dead code for pud special bit handling Yin Tirui (2): pgtable: add pte_clrhuge() implementation mm: introduce remap_pfn_range_try_pmd() for PMD-level hugepage mapping arch/arm/include/asm/pgtable-3level.h | 1 + arch/arm64/Kconfig | 1 + arch/arm64/include/asm/pgtable.h | 38 ++++++ arch/loongarch/include/asm/pgtable.h | 6 + arch/mips/include/asm/pgtable.h | 6 + arch/powerpc/include/asm/book3s/32/pgtable.h | 5 + arch/powerpc/include/asm/book3s/64/pgtable.h | 7 +- arch/powerpc/include/asm/nohash/32/pte-8xx.h | 7 ++ arch/powerpc/include/asm/nohash/pgtable.h | 7 ++ arch/powerpc/include/asm/pgtable.h | 1 + arch/riscv/include/asm/pgtable.h | 5 + arch/s390/include/asm/pgtable.h | 6 + arch/sparc/include/asm/pgtable_64.h | 6 + arch/sw_64/include/asm/pgtable.h | 6 + arch/x86/Kconfig | 1 + arch/x86/include/asm/pgtable.h | 80 +++++++----- fs/dax.c | 2 +- include/linux/huge_mm.h | 16 +-- include/linux/mm.h | 26 ++++ include/linux/pgtable.h | 14 ++- mm/Kconfig | 13 ++ mm/gup.c | 6 + mm/huge_memory.c | 93 ++++++++++---- mm/memory.c | 126 +++++++++++++++---- 24 files changed, 383 insertions(+), 96 deletions(-) -- 2.43.0

2 15

[PATCH OLK-6.6] i2c: cros-ec-tunnel: defer probe if parent EC is not present
by Zhang Yuwei 11 Nov '25

11 Nov '25

mainline inclusion from mainline-v6.15-rc3 commit 424eafe65647a8d6c690284536e711977153195a category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IC5BNL CVE: CVE-2025-37781 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- When i2c-cros-ec-tunnel and the EC driver are built-in, the EC parent device will not be found, leading to NULL pointer dereference. That can also be reproduced by unbinding the controller driver and then loading i2c-cros-ec-tunnel module (or binding the device). Returning -EPROBE_DEFER will allow the device to be bound once the controller is bound, in the case of built-in drivers. Fixes: 9d230c9e4f4e ("i2c: ChromeOS EC tunnel driver") Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo(a)igalia.com> Cc: <stable(a)vger.kernel.org> # v3.16+ Signed-off-by: Andi Shyti <andi.shyti(a)kernel.org> Signed-off-by: Zhang Yuwei <zhangyuwei20(a)huawei.com> --- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c index 2737fd8abd32..0cad18ae959e 100644 --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c @@ -247,6 +247,9 @@ static int ec_i2c_probe(struct platform_device *pdev) u32 remote_bus; int err; + if (!ec) + return dev_err_probe(dev, -EPROBE_DEFER, "couldn't find parent EC device\n"); + if (!ec->cmd_xfer) { dev_err(dev, "Missing sendrecv\n"); return -EINVAL; -- 2.22.0

2 1

[PATCH OLK-6.6 00/22] Add MFS Support
by Huang Xiaojia 11 Nov '25

11 Nov '25

MFS is a stackable file system that utilizes a lower and a cache layer. It provides users with programmable caching capabilities. MFS only supports read-only operations for regular files, directories and symbolic links. When MFS is stacked on top of the lower and cache layers (which are themselves mounted on other file systems, such as ext4 or xfs), the underlying file systems must be also kept read-only to prevent the data inconsistency. MFS supports three running mode: none, local and remote. These modes are explained in running mode section. In short, MFS requires the `mtree` and `cachedir` mount options. The `mtree` option specifies the metadata source for MFS, while the `cachedir` option specifies the data source. In local or remote mode, `cachedir` points to a local cache (in memory or on disk) for backend file systems. Hongbo Li (19): mfs: Initialize mfs module mfs: implement the mount procedure mfs: Add basic metadata operation for MFS mfs: Add basic data operation for MFS mfs: Add basic cache framework: check method and control structure mfs: Add basic events framework mfs: Add communication devie and event acquisition operations mfs: Add user command for handling events mfs: Add tracepoint for MFS mfs: Add MFS documentation MAINTAINERS: Add maintainer for mfs mfs: enable MFS mfs: Fix the UAF problems on syncer object mfs: Make mfs_filemap_map_pages static mfs: Make mfs_dops, mfs_sops and _acquire_set_path static mfs: Make mfs_lookup, mfs_dir_iops, mfs_symlink_iops and mfs_symlink_iops static mfs: Make sure all delayed rcu inodes are safe to be destroyed mfs: Pending when umount with the device opening mfs: allow resched when too many events need to be destroyed Huang Xiaojia (2): mfs: tool: Add mfs user space tool demo mfs: Use min_t in mfs_read_iter, mfs_filemap_fault and mfs_filemap_map_pages HuangXiaojia (1): mfs: Fix null pointer access in mfs_open or mfs_lookup Documentation/filesystems/index.rst | 1 + Documentation/filesystems/mfs.rst | 223 +++++++++++ MAINTAINERS | 10 + arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/mfs/Kconfig | 12 + fs/mfs/Makefile | 4 + fs/mfs/cache.c | 507 ++++++++++++++++++++++++ fs/mfs/data.c | 523 +++++++++++++++++++++++++ fs/mfs/dev.c | 242 ++++++++++++ fs/mfs/inode.c | 303 ++++++++++++++ fs/mfs/internal.h | 232 +++++++++++ fs/mfs/super.c | 499 +++++++++++++++++++++++ include/trace/events/mfs.h | 105 +++++ include/uapi/linux/magic.h | 1 + include/uapi/linux/mfs.h | 62 +++ tools/mfs/.gitignore | 2 + tools/mfs/Makefile | 13 + tools/mfs/mfsd.c | 186 +++++++++ 21 files changed, 2929 insertions(+) create mode 100644 Documentation/filesystems/mfs.rst create mode 100644 fs/mfs/Kconfig create mode 100644 fs/mfs/Makefile create mode 100644 fs/mfs/cache.c create mode 100644 fs/mfs/data.c create mode 100644 fs/mfs/dev.c create mode 100644 fs/mfs/inode.c create mode 100644 fs/mfs/internal.h create mode 100644 fs/mfs/super.c create mode 100644 include/trace/events/mfs.h create mode 100644 include/uapi/linux/mfs.h create mode 100644 tools/mfs/.gitignore create mode 100644 tools/mfs/Makefile create mode 100644 tools/mfs/mfsd.c -- 2.25.1

2 23

[PATCH OLK-6.6 0/7] blk-ioinf: introduce inflight-based IO QoS controller
by Baokun Li 11 Nov '25

11 Nov '25

Baokun Li (7): blk-ioinf: introduce inflight-based IO QoS controller blk-ioinf: add rqos/inflight/stat debufs interface blk-ioinf: dynamically adjust inflight limit to balance workloads blk-ioinf: support percentile latency QoS for oneline workloads blk-io-hierarchy: support new bio based stage ioinf openeuler_defconfig: Enable CONFIG_BLK_CGROUP_IOINFLIGHT blk-mq: fix kabi broken in struct request arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + block/Kconfig | 10 + block/Makefile | 1 + block/blk-io-hierarchy/Kconfig | 11 + block/blk-io-hierarchy/debugfs.c | 3 + block/blk-ioinf.c | 1342 ++++++++++++++++++++++++ block/blk-mq-debugfs.c | 2 + block/blk-rq-qos.h | 1 + include/linux/blk-mq.h | 4 + include/linux/blk_types.h | 3 + 11 files changed, 1379 insertions(+) create mode 100644 block/blk-ioinf.c -- 2.46.1

2 8

[openeuler:OLK-5.10 3278/3278] arch/x86/events/intel/core.c:6765:7: warning: variable 'name' is used uninitialized whenever switch case is taken
by kernel test robot 10 Nov '25

10 Nov '25

tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: f7d17f5d9c13869cef204e25f552fbac501824dc commit: 6f5c7e20d8ef1bffa7b1ed906689e5a2e52e7dd2 [3278/3278] perf/x86/intel: Add common intel_pmu_init_hybrid() config: x86_64-allnoconfig (https://download.01.org/0day-ci/archive/20251110/202511102332.qUTQH99w-lkp@…) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251110/202511102332.qUTQH99w-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/202511102332.qUTQH99w-lkp@intel.com/ All warnings (new ones prefixed by >>): >> arch/x86/events/intel/core.c:6765:7: warning: variable 'name' is used uninitialized whenever switch case is taken [-Wsometimes-uninitialized] 6765 | case INTEL_FAM6_METEORLAKE: | ^~~~~~~~~~~~~~~~~~~~~ arch/x86/include/asm/intel-family.h:120:32: note: expanded from macro 'INTEL_FAM6_METEORLAKE' 120 | #define INTEL_FAM6_METEORLAKE 0xAC | ^~~~ arch/x86/events/intel/core.c:6819:53: note: uninitialized use occurs here 6819 | snprintf(pmu_name_str, sizeof(pmu_name_str), "%s", name); | ^~~~ arch/x86/events/intel/core.c:6766:7: warning: variable 'name' is used uninitialized whenever switch case is taken [-Wsometimes-uninitialized] 6766 | case INTEL_FAM6_METEORLAKE_L: | ^~~~~~~~~~~~~~~~~~~~~~~ arch/x86/include/asm/intel-family.h:121:34: note: expanded from macro 'INTEL_FAM6_METEORLAKE_L' 121 | #define INTEL_FAM6_METEORLAKE_L 0xAA | ^~~~ arch/x86/events/intel/core.c:6819:53: note: uninitialized use occurs here 6819 | snprintf(pmu_name_str, sizeof(pmu_name_str), "%s", name); | ^~~~ arch/x86/events/intel/core.c:6083:12: note: initialize the variable 'name' to silence this warning 6083 | char *name; | ^ | = NULL 2 warnings generated. vim +/name +6765 arch/x86/events/intel/core.c 6069 6070 __init int intel_pmu_init(void) 6071 { 6072 struct attribute **extra_skl_attr = &empty_attrs; 6073 struct attribute **extra_attr = &empty_attrs; 6074 struct attribute **td_attr = &empty_attrs; 6075 struct attribute **mem_attr = &empty_attrs; 6076 struct attribute **tsx_attr = &empty_attrs; 6077 union cpuid10_edx edx; 6078 union cpuid10_eax eax; 6079 union cpuid10_ebx ebx; 6080 unsigned int fixed_mask; 6081 bool pmem = false; 6082 int version, i; 6083 char *name; 6084 struct x86_hybrid_pmu *pmu; 6085 6086 if (!cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) { 6087 switch (boot_cpu_data.x86) { 6088 case 0x6: 6089 return p6_pmu_init(); 6090 case 0xb: 6091 return knc_pmu_init(); 6092 case 0xf: 6093 return p4_pmu_init(); 6094 } 6095 return -ENODEV; 6096 } 6097 6098 /* 6099 * Check whether the Architectural PerfMon supports 6100 * Branch Misses Retired hw_event or not. 6101 */ 6102 cpuid(10, &eax.full, &ebx.full, &fixed_mask, &edx.full); 6103 if (eax.split.mask_length < ARCH_PERFMON_EVENTS_COUNT) 6104 return -ENODEV; 6105 6106 version = eax.split.version_id; 6107 if (version < 2) 6108 x86_pmu = core_pmu; 6109 else 6110 x86_pmu = intel_pmu; 6111 6112 x86_pmu.version = version; 6113 x86_pmu.num_counters = eax.split.num_counters; 6114 x86_pmu.cntval_bits = eax.split.bit_width; 6115 x86_pmu.cntval_mask = (1ULL << eax.split.bit_width) - 1; 6116 6117 x86_pmu.events_maskl = ebx.full; 6118 x86_pmu.events_mask_len = eax.split.mask_length; 6119 6120 x86_pmu.max_pebs_events = min_t(unsigned, MAX_PEBS_EVENTS, x86_pmu.num_counters); 6121 6122 /* 6123 * Quirk: v2 perfmon does not report fixed-purpose events, so 6124 * assume at least 3 events, when not running in a hypervisor: 6125 */ 6126 if (version > 1 && version < 5) { 6127 int assume = 3 * !boot_cpu_has(X86_FEATURE_HYPERVISOR); 6128 6129 x86_pmu.num_counters_fixed = 6130 max((int)edx.split.num_counters_fixed, assume); 6131 6132 fixed_mask = (1L << x86_pmu.num_counters_fixed) - 1; 6133 } else if (version >= 5) 6134 x86_pmu.num_counters_fixed = fls(fixed_mask); 6135 6136 if (version >= 4) 6137 x86_pmu.counter_freezing = !disable_counter_freezing; 6138 6139 if (boot_cpu_has(X86_FEATURE_PDCM)) { 6140 u64 capabilities; 6141 6142 rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities); 6143 x86_pmu.intel_cap.capabilities = capabilities; 6144 } 6145 6146 if (x86_pmu.intel_cap.lbr_format == LBR_FORMAT_32) { 6147 x86_pmu.lbr_reset = intel_pmu_lbr_reset_32; 6148 x86_pmu.lbr_read = intel_pmu_lbr_read_32; 6149 } 6150 6151 if (boot_cpu_has(X86_FEATURE_ARCH_LBR)) 6152 intel_pmu_arch_lbr_init(); 6153 6154 intel_ds_init(); 6155 6156 x86_add_quirk(intel_arch_events_quirk); /* Install first, so it runs last */ 6157 6158 if (version >= 5) { 6159 x86_pmu.intel_cap.anythread_deprecated = edx.split.anythread_deprecated; 6160 if (x86_pmu.intel_cap.anythread_deprecated) 6161 pr_cont(" AnyThread deprecated, "); 6162 } 6163 6164 /* 6165 * Install the hw-cache-events table: 6166 */ 6167 switch (boot_cpu_data.x86_model) { 6168 case INTEL_FAM6_CORE_YONAH: 6169 pr_cont("Core events, "); 6170 name = "core"; 6171 break; 6172 6173 case INTEL_FAM6_CORE2_MEROM: 6174 x86_add_quirk(intel_clovertown_quirk); 6175 fallthrough; 6176 6177 case INTEL_FAM6_CORE2_MEROM_L: 6178 case INTEL_FAM6_CORE2_PENRYN: 6179 case INTEL_FAM6_CORE2_DUNNINGTON: 6180 memcpy(hw_cache_event_ids, core2_hw_cache_event_ids, 6181 sizeof(hw_cache_event_ids)); 6182 6183 intel_pmu_lbr_init_core(); 6184 6185 x86_pmu.event_constraints = intel_core2_event_constraints; 6186 x86_pmu.pebs_constraints = intel_core2_pebs_event_constraints; 6187 pr_cont("Core2 events, "); 6188 name = "core2"; 6189 break; 6190 6191 case INTEL_FAM6_NEHALEM: 6192 case INTEL_FAM6_NEHALEM_EP: 6193 case INTEL_FAM6_NEHALEM_EX: 6194 memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids, 6195 sizeof(hw_cache_event_ids)); 6196 memcpy(hw_cache_extra_regs, nehalem_hw_cache_extra_regs, 6197 sizeof(hw_cache_extra_regs)); 6198 6199 intel_pmu_lbr_init_nhm(); 6200 6201 x86_pmu.event_constraints = intel_nehalem_event_constraints; 6202 x86_pmu.pebs_constraints = intel_nehalem_pebs_event_constraints; 6203 x86_pmu.enable_all = intel_pmu_nhm_enable_all; 6204 x86_pmu.extra_regs = intel_nehalem_extra_regs; 6205 x86_pmu.limit_period = nhm_limit_period; 6206 6207 mem_attr = nhm_mem_events_attrs; 6208 6209 /* UOPS_ISSUED.STALLED_CYCLES */ 6210 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 6211 X86_CONFIG(.event=0x0e, .umask=0x01, .inv=1, .cmask=1); 6212 /* UOPS_EXECUTED.CORE_ACTIVE_CYCLES,c=1,i=1 */ 6213 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 6214 X86_CONFIG(.event=0xb1, .umask=0x3f, .inv=1, .cmask=1); 6215 6216 intel_pmu_pebs_data_source_nhm(); 6217 x86_add_quirk(intel_nehalem_quirk); 6218 x86_pmu.pebs_no_tlb = 1; 6219 extra_attr = nhm_format_attr; 6220 6221 pr_cont("Nehalem events, "); 6222 name = "nehalem"; 6223 break; 6224 6225 case INTEL_FAM6_ATOM_BONNELL: 6226 case INTEL_FAM6_ATOM_BONNELL_MID: 6227 case INTEL_FAM6_ATOM_SALTWELL: 6228 case INTEL_FAM6_ATOM_SALTWELL_MID: 6229 case INTEL_FAM6_ATOM_SALTWELL_TABLET: 6230 memcpy(hw_cache_event_ids, atom_hw_cache_event_ids, 6231 sizeof(hw_cache_event_ids)); 6232 6233 intel_pmu_lbr_init_atom(); 6234 6235 x86_pmu.event_constraints = intel_gen_event_constraints; 6236 x86_pmu.pebs_constraints = intel_atom_pebs_event_constraints; 6237 x86_pmu.pebs_aliases = intel_pebs_aliases_core2; 6238 pr_cont("Atom events, "); 6239 name = "bonnell"; 6240 break; 6241 6242 case INTEL_FAM6_ATOM_SILVERMONT: 6243 case INTEL_FAM6_ATOM_SILVERMONT_D: 6244 case INTEL_FAM6_ATOM_SILVERMONT_MID: 6245 case INTEL_FAM6_ATOM_AIRMONT: 6246 case INTEL_FAM6_ATOM_AIRMONT_MID: 6247 memcpy(hw_cache_event_ids, slm_hw_cache_event_ids, 6248 sizeof(hw_cache_event_ids)); 6249 memcpy(hw_cache_extra_regs, slm_hw_cache_extra_regs, 6250 sizeof(hw_cache_extra_regs)); 6251 6252 intel_pmu_lbr_init_slm(); 6253 6254 x86_pmu.event_constraints = intel_slm_event_constraints; 6255 x86_pmu.pebs_constraints = intel_slm_pebs_event_constraints; 6256 x86_pmu.extra_regs = intel_slm_extra_regs; 6257 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6258 td_attr = slm_events_attrs; 6259 extra_attr = slm_format_attr; 6260 pr_cont("Silvermont events, "); 6261 name = "silvermont"; 6262 break; 6263 6264 case INTEL_FAM6_ATOM_GOLDMONT: 6265 case INTEL_FAM6_ATOM_GOLDMONT_D: 6266 x86_add_quirk(intel_counter_freezing_quirk); 6267 memcpy(hw_cache_event_ids, glm_hw_cache_event_ids, 6268 sizeof(hw_cache_event_ids)); 6269 memcpy(hw_cache_extra_regs, glm_hw_cache_extra_regs, 6270 sizeof(hw_cache_extra_regs)); 6271 6272 intel_pmu_lbr_init_skl(); 6273 6274 x86_pmu.event_constraints = intel_slm_event_constraints; 6275 x86_pmu.pebs_constraints = intel_glm_pebs_event_constraints; 6276 x86_pmu.extra_regs = intel_glm_extra_regs; 6277 /* 6278 * It's recommended to use CPU_CLK_UNHALTED.CORE_P + NPEBS 6279 * for precise cycles. 6280 * :pp is identical to :ppp 6281 */ 6282 x86_pmu.pebs_aliases = NULL; 6283 x86_pmu.pebs_prec_dist = true; 6284 x86_pmu.lbr_pt_coexist = true; 6285 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6286 td_attr = glm_events_attrs; 6287 extra_attr = slm_format_attr; 6288 pr_cont("Goldmont events, "); 6289 name = "goldmont"; 6290 break; 6291 6292 case INTEL_FAM6_ATOM_GOLDMONT_PLUS: 6293 x86_add_quirk(intel_counter_freezing_quirk); 6294 memcpy(hw_cache_event_ids, glp_hw_cache_event_ids, 6295 sizeof(hw_cache_event_ids)); 6296 memcpy(hw_cache_extra_regs, glp_hw_cache_extra_regs, 6297 sizeof(hw_cache_extra_regs)); 6298 6299 intel_pmu_lbr_init_skl(); 6300 6301 x86_pmu.event_constraints = intel_slm_event_constraints; 6302 x86_pmu.extra_regs = intel_glm_extra_regs; 6303 /* 6304 * It's recommended to use CPU_CLK_UNHALTED.CORE_P + NPEBS 6305 * for precise cycles. 6306 */ 6307 x86_pmu.pebs_aliases = NULL; 6308 x86_pmu.pebs_prec_dist = true; 6309 x86_pmu.lbr_pt_coexist = true; 6310 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6311 x86_pmu.flags |= PMU_FL_PEBS_ALL; 6312 x86_pmu.get_event_constraints = glp_get_event_constraints; 6313 td_attr = glm_events_attrs; 6314 /* Goldmont Plus has 4-wide pipeline */ 6315 event_attr_td_total_slots_scale_glm.event_str = "4"; 6316 extra_attr = slm_format_attr; 6317 pr_cont("Goldmont plus events, "); 6318 name = "goldmont_plus"; 6319 break; 6320 6321 case INTEL_FAM6_ATOM_TREMONT_D: 6322 case INTEL_FAM6_ATOM_TREMONT: 6323 case INTEL_FAM6_ATOM_TREMONT_L: 6324 x86_pmu.late_ack = true; 6325 memcpy(hw_cache_event_ids, glp_hw_cache_event_ids, 6326 sizeof(hw_cache_event_ids)); 6327 memcpy(hw_cache_extra_regs, tnt_hw_cache_extra_regs, 6328 sizeof(hw_cache_extra_regs)); 6329 hw_cache_event_ids[C(ITLB)][C(OP_READ)][C(RESULT_ACCESS)] = -1; 6330 6331 intel_pmu_lbr_init_skl(); 6332 6333 x86_pmu.event_constraints = intel_slm_event_constraints; 6334 x86_pmu.extra_regs = intel_tnt_extra_regs; 6335 /* 6336 * It's recommended to use CPU_CLK_UNHALTED.CORE_P + NPEBS 6337 * for precise cycles. 6338 */ 6339 x86_pmu.pebs_aliases = NULL; 6340 x86_pmu.pebs_prec_dist = true; 6341 x86_pmu.lbr_pt_coexist = true; 6342 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6343 x86_pmu.get_event_constraints = tnt_get_event_constraints; 6344 td_attr = tnt_events_attrs; 6345 extra_attr = slm_format_attr; 6346 pr_cont("Tremont events, "); 6347 name = "Tremont"; 6348 break; 6349 6350 case INTEL_FAM6_ATOM_GRACEMONT: 6351 intel_pmu_init_grt(NULL); 6352 intel_pmu_pebs_data_source_grt(); 6353 x86_pmu.pebs_latency_data = adl_latency_data_small; 6354 x86_pmu.get_event_constraints = tnt_get_event_constraints; 6355 td_attr = tnt_events_attrs; 6356 mem_attr = grt_mem_attrs; 6357 extra_attr = nhm_format_attr; 6358 pr_cont("Gracemont events, "); 6359 name = "gracemont"; 6360 break; 6361 6362 case INTEL_FAM6_ATOM_CRESTMONT: 6363 case INTEL_FAM6_ATOM_CRESTMONT_X: 6364 intel_pmu_init_grt(NULL); 6365 x86_pmu.extra_regs = intel_cmt_extra_regs; 6366 intel_pmu_pebs_data_source_cmt(); 6367 x86_pmu.pebs_latency_data = mtl_latency_data_small; 6368 x86_pmu.get_event_constraints = cmt_get_event_constraints; 6369 td_attr = cmt_events_attrs; 6370 mem_attr = grt_mem_attrs; 6371 extra_attr = cmt_format_attr; 6372 pr_cont("Crestmont events, "); 6373 name = "crestmont"; 6374 break; 6375 6376 case INTEL_FAM6_WESTMERE: 6377 case INTEL_FAM6_WESTMERE_EP: 6378 case INTEL_FAM6_WESTMERE_EX: 6379 memcpy(hw_cache_event_ids, westmere_hw_cache_event_ids, 6380 sizeof(hw_cache_event_ids)); 6381 memcpy(hw_cache_extra_regs, nehalem_hw_cache_extra_regs, 6382 sizeof(hw_cache_extra_regs)); 6383 6384 intel_pmu_lbr_init_nhm(); 6385 6386 x86_pmu.event_constraints = intel_westmere_event_constraints; 6387 x86_pmu.enable_all = intel_pmu_nhm_enable_all; 6388 x86_pmu.pebs_constraints = intel_westmere_pebs_event_constraints; 6389 x86_pmu.extra_regs = intel_westmere_extra_regs; 6390 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6391 6392 mem_attr = nhm_mem_events_attrs; 6393 6394 /* UOPS_ISSUED.STALLED_CYCLES */ 6395 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 6396 X86_CONFIG(.event=0x0e, .umask=0x01, .inv=1, .cmask=1); 6397 /* UOPS_EXECUTED.CORE_ACTIVE_CYCLES,c=1,i=1 */ 6398 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 6399 X86_CONFIG(.event=0xb1, .umask=0x3f, .inv=1, .cmask=1); 6400 6401 intel_pmu_pebs_data_source_nhm(); 6402 extra_attr = nhm_format_attr; 6403 pr_cont("Westmere events, "); 6404 name = "westmere"; 6405 break; 6406 6407 case INTEL_FAM6_SANDYBRIDGE: 6408 case INTEL_FAM6_SANDYBRIDGE_X: 6409 x86_add_quirk(intel_sandybridge_quirk); 6410 x86_add_quirk(intel_ht_bug); 6411 memcpy(hw_cache_event_ids, snb_hw_cache_event_ids, 6412 sizeof(hw_cache_event_ids)); 6413 memcpy(hw_cache_extra_regs, snb_hw_cache_extra_regs, 6414 sizeof(hw_cache_extra_regs)); 6415 6416 intel_pmu_lbr_init_snb(); 6417 6418 x86_pmu.event_constraints = intel_snb_event_constraints; 6419 x86_pmu.pebs_constraints = intel_snb_pebs_event_constraints; 6420 x86_pmu.pebs_aliases = intel_pebs_aliases_snb; 6421 if (boot_cpu_data.x86_model == INTEL_FAM6_SANDYBRIDGE_X) 6422 x86_pmu.extra_regs = intel_snbep_extra_regs; 6423 else 6424 x86_pmu.extra_regs = intel_snb_extra_regs; 6425 6426 6427 /* all extra regs are per-cpu when HT is on */ 6428 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6429 x86_pmu.flags |= PMU_FL_NO_HT_SHARING; 6430 6431 td_attr = snb_events_attrs; 6432 mem_attr = snb_mem_events_attrs; 6433 6434 /* UOPS_ISSUED.ANY,c=1,i=1 to count stall cycles */ 6435 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 6436 X86_CONFIG(.event=0x0e, .umask=0x01, .inv=1, .cmask=1); 6437 /* UOPS_DISPATCHED.THREAD,c=1,i=1 to count stall cycles*/ 6438 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 6439 X86_CONFIG(.event=0xb1, .umask=0x01, .inv=1, .cmask=1); 6440 6441 extra_attr = nhm_format_attr; 6442 6443 pr_cont("SandyBridge events, "); 6444 name = "sandybridge"; 6445 break; 6446 6447 case INTEL_FAM6_IVYBRIDGE: 6448 case INTEL_FAM6_IVYBRIDGE_X: 6449 x86_add_quirk(intel_ht_bug); 6450 memcpy(hw_cache_event_ids, snb_hw_cache_event_ids, 6451 sizeof(hw_cache_event_ids)); 6452 /* dTLB-load-misses on IVB is different than SNB */ 6453 hw_cache_event_ids[C(DTLB)][C(OP_READ)][C(RESULT_MISS)] = 0x8108; /* DTLB_LOAD_MISSES.DEMAND_LD_MISS_CAUSES_A_WALK */ 6454 6455 memcpy(hw_cache_extra_regs, snb_hw_cache_extra_regs, 6456 sizeof(hw_cache_extra_regs)); 6457 6458 intel_pmu_lbr_init_snb(); 6459 6460 x86_pmu.event_constraints = intel_ivb_event_constraints; 6461 x86_pmu.pebs_constraints = intel_ivb_pebs_event_constraints; 6462 x86_pmu.pebs_aliases = intel_pebs_aliases_ivb; 6463 x86_pmu.pebs_prec_dist = true; 6464 if (boot_cpu_data.x86_model == INTEL_FAM6_IVYBRIDGE_X) 6465 x86_pmu.extra_regs = intel_snbep_extra_regs; 6466 else 6467 x86_pmu.extra_regs = intel_snb_extra_regs; 6468 /* all extra regs are per-cpu when HT is on */ 6469 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6470 x86_pmu.flags |= PMU_FL_NO_HT_SHARING; 6471 6472 td_attr = snb_events_attrs; 6473 mem_attr = snb_mem_events_attrs; 6474 6475 /* UOPS_ISSUED.ANY,c=1,i=1 to count stall cycles */ 6476 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 6477 X86_CONFIG(.event=0x0e, .umask=0x01, .inv=1, .cmask=1); 6478 6479 extra_attr = nhm_format_attr; 6480 6481 pr_cont("IvyBridge events, "); 6482 name = "ivybridge"; 6483 break; 6484 6485 6486 case INTEL_FAM6_HASWELL: 6487 case INTEL_FAM6_HASWELL_X: 6488 case INTEL_FAM6_HASWELL_L: 6489 case INTEL_FAM6_HASWELL_G: 6490 x86_add_quirk(intel_ht_bug); 6491 x86_add_quirk(intel_pebs_isolation_quirk); 6492 x86_pmu.late_ack = true; 6493 memcpy(hw_cache_event_ids, hsw_hw_cache_event_ids, sizeof(hw_cache_event_ids)); 6494 memcpy(hw_cache_extra_regs, hsw_hw_cache_extra_regs, sizeof(hw_cache_extra_regs)); 6495 6496 intel_pmu_lbr_init_hsw(); 6497 6498 x86_pmu.event_constraints = intel_hsw_event_constraints; 6499 x86_pmu.pebs_constraints = intel_hsw_pebs_event_constraints; 6500 x86_pmu.extra_regs = intel_snbep_extra_regs; 6501 x86_pmu.pebs_aliases = intel_pebs_aliases_ivb; 6502 x86_pmu.pebs_prec_dist = true; 6503 /* all extra regs are per-cpu when HT is on */ 6504 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6505 x86_pmu.flags |= PMU_FL_NO_HT_SHARING; 6506 6507 x86_pmu.hw_config = hsw_hw_config; 6508 x86_pmu.get_event_constraints = hsw_get_event_constraints; 6509 x86_pmu.limit_period = hsw_limit_period; 6510 x86_pmu.lbr_double_abort = true; 6511 extra_attr = boot_cpu_has(X86_FEATURE_RTM) ? 6512 hsw_format_attr : nhm_format_attr; 6513 td_attr = hsw_events_attrs; 6514 mem_attr = hsw_mem_events_attrs; 6515 tsx_attr = hsw_tsx_events_attrs; 6516 pr_cont("Haswell events, "); 6517 name = "haswell"; 6518 break; 6519 6520 case INTEL_FAM6_BROADWELL: 6521 case INTEL_FAM6_BROADWELL_D: 6522 case INTEL_FAM6_BROADWELL_G: 6523 case INTEL_FAM6_BROADWELL_X: 6524 x86_add_quirk(intel_pebs_isolation_quirk); 6525 x86_pmu.late_ack = true; 6526 memcpy(hw_cache_event_ids, hsw_hw_cache_event_ids, sizeof(hw_cache_event_ids)); 6527 memcpy(hw_cache_extra_regs, hsw_hw_cache_extra_regs, sizeof(hw_cache_extra_regs)); 6528 6529 /* L3_MISS_LOCAL_DRAM is BIT(26) in Broadwell */ 6530 hw_cache_extra_regs[C(LL)][C(OP_READ)][C(RESULT_MISS)] = HSW_DEMAND_READ | 6531 BDW_L3_MISS|HSW_SNOOP_DRAM; 6532 hw_cache_extra_regs[C(LL)][C(OP_WRITE)][C(RESULT_MISS)] = HSW_DEMAND_WRITE|BDW_L3_MISS| 6533 HSW_SNOOP_DRAM; 6534 hw_cache_extra_regs[C(NODE)][C(OP_READ)][C(RESULT_ACCESS)] = HSW_DEMAND_READ| 6535 BDW_L3_MISS_LOCAL|HSW_SNOOP_DRAM; 6536 hw_cache_extra_regs[C(NODE)][C(OP_WRITE)][C(RESULT_ACCESS)] = HSW_DEMAND_WRITE| 6537 BDW_L3_MISS_LOCAL|HSW_SNOOP_DRAM; 6538 6539 intel_pmu_lbr_init_hsw(); 6540 6541 x86_pmu.event_constraints = intel_bdw_event_constraints; 6542 x86_pmu.pebs_constraints = intel_bdw_pebs_event_constraints; 6543 x86_pmu.extra_regs = intel_snbep_extra_regs; 6544 x86_pmu.pebs_aliases = intel_pebs_aliases_ivb; 6545 x86_pmu.pebs_prec_dist = true; 6546 /* all extra regs are per-cpu when HT is on */ 6547 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6548 x86_pmu.flags |= PMU_FL_NO_HT_SHARING; 6549 6550 x86_pmu.hw_config = hsw_hw_config; 6551 x86_pmu.get_event_constraints = hsw_get_event_constraints; 6552 x86_pmu.limit_period = bdw_limit_period; 6553 extra_attr = boot_cpu_has(X86_FEATURE_RTM) ? 6554 hsw_format_attr : nhm_format_attr; 6555 td_attr = hsw_events_attrs; 6556 mem_attr = hsw_mem_events_attrs; 6557 tsx_attr = hsw_tsx_events_attrs; 6558 pr_cont("Broadwell events, "); 6559 name = "broadwell"; 6560 break; 6561 6562 case INTEL_FAM6_XEON_PHI_KNL: 6563 case INTEL_FAM6_XEON_PHI_KNM: 6564 memcpy(hw_cache_event_ids, 6565 slm_hw_cache_event_ids, sizeof(hw_cache_event_ids)); 6566 memcpy(hw_cache_extra_regs, 6567 knl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs)); 6568 intel_pmu_lbr_init_knl(); 6569 6570 x86_pmu.event_constraints = intel_slm_event_constraints; 6571 x86_pmu.pebs_constraints = intel_slm_pebs_event_constraints; 6572 x86_pmu.extra_regs = intel_knl_extra_regs; 6573 6574 /* all extra regs are per-cpu when HT is on */ 6575 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6576 x86_pmu.flags |= PMU_FL_NO_HT_SHARING; 6577 extra_attr = slm_format_attr; 6578 pr_cont("Knights Landing/Mill events, "); 6579 name = "knights-landing"; 6580 break; 6581 6582 case INTEL_FAM6_SKYLAKE_X: 6583 pmem = true; 6584 fallthrough; 6585 case INTEL_FAM6_SKYLAKE_L: 6586 case INTEL_FAM6_SKYLAKE: 6587 case INTEL_FAM6_KABYLAKE_L: 6588 case INTEL_FAM6_KABYLAKE: 6589 case INTEL_FAM6_COMETLAKE_L: 6590 case INTEL_FAM6_COMETLAKE: 6591 x86_add_quirk(intel_pebs_isolation_quirk); 6592 x86_pmu.late_ack = true; 6593 memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids)); 6594 memcpy(hw_cache_extra_regs, skl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs)); 6595 intel_pmu_lbr_init_skl(); 6596 6597 /* INT_MISC.RECOVERY_CYCLES has umask 1 in Skylake */ 6598 event_attr_td_recovery_bubbles.event_str_noht = 6599 "event=0xd,umask=0x1,cmask=1"; 6600 event_attr_td_recovery_bubbles.event_str_ht = 6601 "event=0xd,umask=0x1,cmask=1,any=1"; 6602 6603 x86_pmu.event_constraints = intel_skl_event_constraints; 6604 x86_pmu.pebs_constraints = intel_skl_pebs_event_constraints; 6605 x86_pmu.extra_regs = intel_skl_extra_regs; 6606 x86_pmu.pebs_aliases = intel_pebs_aliases_skl; 6607 x86_pmu.pebs_prec_dist = true; 6608 /* all extra regs are per-cpu when HT is on */ 6609 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6610 x86_pmu.flags |= PMU_FL_NO_HT_SHARING; 6611 6612 x86_pmu.hw_config = hsw_hw_config; 6613 x86_pmu.get_event_constraints = hsw_get_event_constraints; 6614 extra_attr = boot_cpu_has(X86_FEATURE_RTM) ? 6615 hsw_format_attr : nhm_format_attr; 6616 extra_skl_attr = skl_format_attr; 6617 td_attr = hsw_events_attrs; 6618 mem_attr = hsw_mem_events_attrs; 6619 tsx_attr = hsw_tsx_events_attrs; 6620 intel_pmu_pebs_data_source_skl(pmem); 6621 6622 if (boot_cpu_has(X86_FEATURE_TSX_FORCE_ABORT)) { 6623 x86_pmu.flags |= PMU_FL_TFA; 6624 x86_pmu.get_event_constraints = tfa_get_event_constraints; 6625 x86_pmu.enable_all = intel_tfa_pmu_enable_all; 6626 x86_pmu.commit_scheduling = intel_tfa_commit_scheduling; 6627 } 6628 6629 pr_cont("Skylake events, "); 6630 name = "skylake"; 6631 break; 6632 6633 case INTEL_FAM6_ICELAKE_X: 6634 case INTEL_FAM6_ICELAKE_D: 6635 pmem = true; 6636 fallthrough; 6637 case INTEL_FAM6_ICELAKE_L: 6638 case INTEL_FAM6_ICELAKE: 6639 case INTEL_FAM6_TIGERLAKE_L: 6640 case INTEL_FAM6_TIGERLAKE: 6641 x86_pmu.late_ack = true; 6642 memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids)); 6643 memcpy(hw_cache_extra_regs, skl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs)); 6644 hw_cache_event_ids[C(ITLB)][C(OP_READ)][C(RESULT_ACCESS)] = -1; 6645 intel_pmu_lbr_init_skl(); 6646 6647 x86_pmu.event_constraints = intel_icl_event_constraints; 6648 x86_pmu.pebs_constraints = intel_icl_pebs_event_constraints; 6649 x86_pmu.extra_regs = intel_icl_extra_regs; 6650 x86_pmu.pebs_aliases = NULL; 6651 x86_pmu.pebs_prec_dist = true; 6652 x86_pmu.flags |= PMU_FL_HAS_RSP_1; 6653 x86_pmu.flags |= PMU_FL_NO_HT_SHARING; 6654 6655 x86_pmu.hw_config = hsw_hw_config; 6656 x86_pmu.get_event_constraints = icl_get_event_constraints; 6657 extra_attr = boot_cpu_has(X86_FEATURE_RTM) ? 6658 hsw_format_attr : nhm_format_attr; 6659 extra_skl_attr = skl_format_attr; 6660 mem_attr = icl_events_attrs; 6661 td_attr = icl_td_events_attrs; 6662 tsx_attr = icl_tsx_events_attrs; 6663 x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xc9, .umask=0x04); 6664 x86_pmu.lbr_pt_coexist = true; 6665 intel_pmu_pebs_data_source_skl(pmem); 6666 x86_pmu.num_topdown_events = 4; 6667 x86_pmu.update_topdown_event = icl_update_topdown_event; 6668 x86_pmu.set_topdown_event_period = icl_set_topdown_event_period; 6669 pr_cont("Icelake events, "); 6670 name = "icelake"; 6671 break; 6672 6673 case INTEL_FAM6_SAPPHIRERAPIDS_X: 6674 case INTEL_FAM6_EMERALDRAPIDS_X: 6675 x86_pmu.flags |= PMU_FL_MEM_LOADS_AUX; 6676 x86_pmu.extra_regs = intel_glc_extra_regs; 6677 pr_cont("Sapphire Rapids events, "); 6678 name = "sapphire_rapids"; 6679 goto glc_common; 6680 6681 case INTEL_FAM6_GRANITERAPIDS_X: 6682 case INTEL_FAM6_GRANITERAPIDS_D: 6683 if (!x86_pmu.extra_regs) 6684 x86_pmu.extra_regs = intel_rwc_extra_regs; 6685 pr_cont("Granite Rapids events, "); 6686 name = "granite_rapids"; 6687 6688 glc_common: 6689 intel_pmu_init_glc(NULL); 6690 6691 x86_pmu.hw_config = hsw_hw_config; 6692 x86_pmu.get_event_constraints = glc_get_event_constraints; 6693 extra_attr = boot_cpu_has(X86_FEATURE_RTM) ? 6694 hsw_format_attr : nhm_format_attr; 6695 extra_skl_attr = skl_format_attr; 6696 mem_attr = glc_events_attrs; 6697 td_attr = glc_td_events_attrs; 6698 tsx_attr = glc_tsx_events_attrs; 6699 intel_pmu_pebs_data_source_skl(true); 6700 break; 6701 6702 case INTEL_FAM6_ALDERLAKE: 6703 case INTEL_FAM6_ALDERLAKE_L: 6704 case INTEL_FAM6_RAPTORLAKE: 6705 case INTEL_FAM6_RAPTORLAKE_P: 6706 /* 6707 * Alder Lake has 2 types of CPU, core and atom. 6708 * 6709 * Initialize the common PerfMon capabilities here. 6710 */ 6711 intel_pmu_init_hybrid(hybrid_big_small); 6712 6713 x86_pmu.pebs_latency_data = adl_latency_data_small; 6714 6715 x86_pmu.get_event_constraints = adl_get_event_constraints; 6716 x86_pmu.hw_config = adl_hw_config; 6717 x86_pmu.get_hybrid_cpu_type = adl_get_hybrid_cpu_type; 6718 6719 td_attr = adl_hybrid_events_attrs; 6720 mem_attr = adl_hybrid_mem_attrs; 6721 tsx_attr = adl_hybrid_tsx_attrs; 6722 extra_attr = boot_cpu_has(X86_FEATURE_RTM) ? 6723 adl_hybrid_extra_attr_rtm : adl_hybrid_extra_attr; 6724 6725 /* Initialize big core specific PerfMon capabilities.*/ 6726 pmu = &x86_pmu.hybrid_pmu[X86_HYBRID_PMU_CORE_IDX]; 6727 intel_pmu_init_glc(&pmu->pmu); 6728 if (cpu_feature_enabled(X86_FEATURE_HYBRID_CPU)) { 6729 pmu->num_counters = x86_pmu.num_counters + 2; 6730 pmu->num_counters_fixed = x86_pmu.num_counters_fixed + 1; 6731 } else { 6732 pmu->num_counters = x86_pmu.num_counters; 6733 pmu->num_counters_fixed = x86_pmu.num_counters_fixed; 6734 } 6735 6736 /* 6737 * Quirk: For some Alder Lake machine, when all E-cores are disabled in 6738 * a BIOS, the leaf 0xA will enumerate all counters of P-cores. However, 6739 * the X86_FEATURE_HYBRID_CPU is still set. The above codes will 6740 * mistakenly add extra counters for P-cores. Correct the number of 6741 * counters here. 6742 */ 6743 if ((pmu->num_counters > 8) || (pmu->num_counters_fixed > 4)) { 6744 pmu->num_counters = x86_pmu.num_counters; 6745 pmu->num_counters_fixed = x86_pmu.num_counters_fixed; 6746 } 6747 6748 pmu->max_pebs_events = min_t(unsigned, MAX_PEBS_EVENTS, pmu->num_counters); 6749 pmu->unconstrained = (struct event_constraint) 6750 __EVENT_CONSTRAINT(0, (1ULL << pmu->num_counters) - 1, 6751 0, pmu->num_counters, 0, 0); 6752 6753 pmu->extra_regs = intel_glc_extra_regs; 6754 6755 /* Initialize Atom core specific PerfMon capabilities.*/ 6756 pmu = &x86_pmu.hybrid_pmu[X86_HYBRID_PMU_ATOM_IDX]; 6757 intel_pmu_init_grt(&pmu->pmu); 6758 6759 x86_pmu.flags |= PMU_FL_MEM_LOADS_AUX; 6760 intel_pmu_pebs_data_source_adl(); 6761 pr_cont("Alderlake Hybrid events, "); 6762 name = "alderlake_hybrid"; 6763 break; 6764 > 6765 case INTEL_FAM6_METEORLAKE: 6766 case INTEL_FAM6_METEORLAKE_L: 6767 intel_pmu_init_hybrid(hybrid_big_small); 6768 6769 x86_pmu.pebs_latency_data = mtl_latency_data_small; 6770 x86_pmu.get_event_constraints = mtl_get_event_constraints; 6771 x86_pmu.hw_config = adl_hw_config; 6772 6773 td_attr = adl_hybrid_events_attrs; 6774 mem_attr = mtl_hybrid_mem_attrs; 6775 tsx_attr = adl_hybrid_tsx_attrs; 6776 extra_attr = boot_cpu_has(X86_FEATURE_RTM) ? 6777 mtl_hybrid_extra_attr_rtm : mtl_hybrid_extra_attr; 6778 6779 /* Initialize big core specific PerfMon capabilities.*/ 6780 pmu = &x86_pmu.hybrid_pmu[X86_HYBRID_PMU_CORE_IDX]; 6781 intel_pmu_init_glc(&pmu->pmu); 6782 break; 6783 6784 default: 6785 switch (x86_pmu.version) { 6786 case 1: 6787 x86_pmu.event_constraints = intel_v1_event_constraints; 6788 pr_cont("generic architected perfmon v1, "); 6789 name = "generic_arch_v1"; 6790 break; 6791 case 2: 6792 case 3: 6793 case 4: 6794 /* 6795 * default constraints for v2 and up 6796 */ 6797 x86_pmu.event_constraints = intel_gen_event_constraints; 6798 pr_cont("generic architected perfmon, "); 6799 name = "generic_arch_v2+"; 6800 break; 6801 default: 6802 /* 6803 * The default constraints for v5 and up can support up to 6804 * 16 fixed counters. For the fixed counters 4 and later, 6805 * the pseudo-encoding is applied. 6806 * The constraints may be cut according to the CPUID enumeration 6807 * by inserting the EVENT_CONSTRAINT_END. 6808 */ 6809 if (x86_pmu.num_counters_fixed > INTEL_PMC_MAX_FIXED) 6810 x86_pmu.num_counters_fixed = INTEL_PMC_MAX_FIXED; 6811 intel_v5_gen_event_constraints[x86_pmu.num_counters_fixed].weight = -1; 6812 x86_pmu.event_constraints = intel_v5_gen_event_constraints; 6813 pr_cont("generic architected perfmon, "); 6814 name = "generic_arch_v5+"; 6815 break; 6816 } 6817 } 6818 6819 snprintf(pmu_name_str, sizeof(pmu_name_str), "%s", name); 6820 6821 if (!is_hybrid()) { 6822 group_events_td.attrs = td_attr; 6823 group_events_mem.attrs = mem_attr; 6824 group_events_tsx.attrs = tsx_attr; 6825 group_format_extra.attrs = extra_attr; 6826 group_format_extra_skl.attrs = extra_skl_attr; 6827 6828 x86_pmu.attr_update = attr_update; 6829 } else { 6830 hybrid_group_events_td.attrs = td_attr; 6831 hybrid_group_events_mem.attrs = mem_attr; 6832 hybrid_group_events_tsx.attrs = tsx_attr; 6833 hybrid_group_format_extra.attrs = extra_attr; 6834 6835 x86_pmu.attr_update = hybrid_attr_update; 6836 } 6837 6838 intel_pmu_check_num_counters(&x86_pmu.num_counters, 6839 &x86_pmu.num_counters_fixed, 6840 &x86_pmu.intel_ctrl, 6841 (u64)fixed_mask); 6842 6843 /* AnyThread may be deprecated on arch perfmon v5 or later */ 6844 if (x86_pmu.intel_cap.anythread_deprecated) 6845 x86_pmu.format_attrs = intel_arch_formats_attr; 6846 6847 intel_pmu_check_event_constraints(x86_pmu.event_constraints, 6848 x86_pmu.num_counters, 6849 x86_pmu.num_counters_fixed, 6850 x86_pmu.intel_ctrl); 6851 /* 6852 * Access LBR MSR may cause #GP under certain circumstances. 6853 * E.g. KVM doesn't support LBR MSR 6854 * Check all LBT MSR here. 6855 * Disable LBR access if any LBR MSRs can not be accessed. 6856 */ 6857 if (x86_pmu.lbr_tos && !check_msr(x86_pmu.lbr_tos, 0x3UL)) 6858 x86_pmu.lbr_nr = 0; 6859 for (i = 0; i < x86_pmu.lbr_nr; i++) { 6860 if (!(check_msr(x86_pmu.lbr_from + i, 0xffffUL) && 6861 check_msr(x86_pmu.lbr_to + i, 0xffffUL))) 6862 x86_pmu.lbr_nr = 0; 6863 } 6864 6865 if (x86_pmu.lbr_nr) 6866 pr_cont("%d-deep LBR, ", x86_pmu.lbr_nr); 6867 6868 intel_pmu_check_extra_regs(x86_pmu.extra_regs); 6869 6870 /* Support full width counters using alternative MSR range */ 6871 if (x86_pmu.intel_cap.full_width_write) { 6872 x86_pmu.max_period = x86_pmu.cntval_mask >> 1; 6873 x86_pmu.perfctr = MSR_IA32_PMC0; 6874 pr_cont("full-width counters, "); 6875 } 6876 6877 /* 6878 * For arch perfmon 4 use counter freezing to avoid 6879 * several MSR accesses in the PMI. 6880 */ 6881 if (x86_pmu.counter_freezing) 6882 x86_pmu.handle_irq = intel_pmu_handle_irq_v4; 6883 6884 if (!is_hybrid() && x86_pmu.intel_cap.perf_metrics) 6885 x86_pmu.intel_ctrl |= 1ULL << GLOBAL_CTRL_EN_PERF_METRICS; 6886 6887 if (is_hybrid() && !boot_cpu_has(X86_FEATURE_ARCH_PERFMON_EXT)) 6888 intel_pmu_check_hybrid_pmus((u64)fixed_mask); 6889 6890 if (x86_pmu.intel_cap.pebs_timing_info) 6891 x86_pmu.flags |= PMU_FL_RETIRE_LATENCY; 6892 6893 return 0; 6894 } 6895 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0