- Kernel - mailweb.openeuler.org

[PATCH OLK-5.10] drm/amd/display: Exit idle optimizations before attempt to access PHY
by Dapeng Yu 12 Jan '24

12 Jan '24

From: Leo Chen <sancchen(a)amd.com> stable inclusion from stable-v5.10.205 commit 357badc01add6e98dd69c9831843da9cc3e905e9 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8AS5P CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=… ------------------------- [ Upstream commit de612738e9771bd66aeb20044486c457c512f684 ] [Why & How] DMUB may hang when powering down pixel clocks due to no dprefclk. It is fixed by exiting idle optimization before the attempt to access PHY. Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> Acked-by: Alex Hung <alex.hung(a)amd.com> Signed-off-by: Leo Chen <sancchen(a)amd.com> Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Baogen Shang <baogen.shang(a)windriver.com> --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index e33fe0207b9e..53e8defd3475 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -1682,10 +1682,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control(edp_link_with_sink, false); } /*resume from S3, no vbios posting, no need to power down again*/ + clk_mgr_exit_optimized_pwr_state(dc, dc->clk_mgr); + power_down_all_hw_blocks(dc); disable_vga_and_power_gate_all_controllers(dc); if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control(edp_link_with_sink, false); + clk_mgr_optimize_pwr_state(dc, dc->clk_mgr); } bios_set_scratch_acc_mode_change(dc->ctx->dc_bios); } -- 2.33.0

1 0

[PATCH OLK-6.6 00/26] Introduce dynamic pool feature
by Liu Shixin 12 Jan '24

12 Jan '24

Rename from dynamic hugetlb(OLK_5.10) to dynamic pool. A per-memcg pagepool. The task in the memcg will prefer to alloc pages from corresponding pool. Liu Shixin (26): mm/memcg: introduce mem_cgroup_scan_cgroups to scan all memcgs mm/memcg: introduce memcg_has_children to check memcg mm/dynamic_pool: introduce per-memcg memory pool mm/dynamic_pool: introduce PG_dpool to mark free pages in dpool mm/dynamic_pool: introduce PG_pool to mark pages allocated from dpool mm/dynamic_pool: create dpool by dhugetlb.nr_pages interface mm/dynamic_pool: fill dpool with HugeTLB 1G pages mm/dynamic_pool: add interface to configure the count of hugepages mm/dynamic_pool: add restore_pool ops to reclaim memory and restore hugepages mm/dynamic_pool: support to flow pages between 1G and 2M pages pool mm/dynamic_pool: support to flow pages between 2M and 4K pages pool mm/dynamic_pool: migrate used pages before promote to huge page mm/dynamic_pool: call mem_cgroup_force_empty before restore pool mm/dynamic_pool: prevent task attach to another dpool mm/dynamic_pool: support page allocation from dpool mm/dynamic_pool: speed up allocation by percpu pages pool mm/dynamic_pool: check resv for HugeTLB allocation from dpool mm/dynamic_pool: support HugeTLB page allocation from dpool mm/dynamic_pool: add tracepoints for dpool mm/dynamic_pool: fill dpool with pagelist mm/dynamic_pool: disable THP for task attached with dpool mm/dynamic_pool: compatible with HugeTLB dissolve mm/dynamic_pool: compatible with HugeTLB Vmemmap mm/dynamic_pool: compatible with memory hwpoison mm/dynamic_pool: add Document for dynamic hugetlb feature mm/dynamic_pool: enable CONFIG_DYNAMIC_POOL on x86_64 and arm64 by default Documentation/mm/dynamic_hugetlb.rst | 100 ++ arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/hugetlbfs/inode.c | 5 + fs/proc/meminfo.c | 3 + fs/proc/page.c | 3 + include/linux/dynamic_pool.h | 228 ++++ include/linux/hugetlb.h | 11 + include/linux/memcontrol.h | 21 + include/linux/memory_hotplug.h | 5 + include/linux/mm.h | 1 + include/linux/page-flags.h | 22 + include/ras/ras_event.h | 1 + include/trace/events/dynamic_pool.h | 174 +++ include/trace/events/mmflags.h | 7 + include/uapi/linux/kernel-page-flags.h | 1 + kernel/cgroup/cgroup.c | 12 + mm/Kconfig | 9 + mm/Makefile | 1 + mm/dynamic_pool.c | 1722 ++++++++++++++++++++++++ mm/hugetlb.c | 103 +- mm/hugetlb_vmemmap.c | 4 + mm/internal.h | 6 + mm/khugepaged.c | 18 + mm/memcontrol.c | 119 +- mm/memory-failure.c | 16 +- mm/memory.c | 7 +- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 28 +- mm/shmem.c | 3 + mm/show_mem.c | 2 + tools/mm/page-types.c | 1 + 32 files changed, 2598 insertions(+), 39 deletions(-) create mode 100644 Documentation/mm/dynamic_hugetlb.rst create mode 100644 include/linux/dynamic_pool.h create mode 100644 include/trace/events/dynamic_pool.h create mode 100644 mm/dynamic_pool.c -- 2.25.1

2 27

[PATCH OLK-6.6 00/26] Introduce dynamic pool feature
by Liu Shixin 12 Jan '24

12 Jan '24

Rename from dynamic hugetlb(OLK_5.10) to dynamic pool. A per-memcg pagepool. The task in the memcg will prefer to alloc pages from corresponding pool. Liu Shixin (26): mm/memcg: introduce mem_cgroup_scan_cgroups to scan all memcgs mm/memcg: introduce memcg_has_children to check memcg mm/dynamic_pool: introduce per-memcg memory pool mm/dynamic_pool: introduce PG_dpool to mark free pages in dpool mm/dynamic_pool: introduce PG_pool to mark pages allocated from dpool mm/dynamic_pool: create dpool by dhugetlb.nr_pages interface mm/dynamic_pool: fill dpool with HugeTLB 1G pages mm/dynamic_pool: add interface to configure the count of hugepages mm/dynamic_pool: add restore_pool ops to reclaim memory and restore hugepages mm/dynamic_pool: support to flow pages between 1G and 2M pages pool mm/dynamic_pool: support to flow pages between 2M and 4K pages pool mm/dynamic_pool: migrate used pages before promote to huge page mm/dynamic_pool: call mem_cgroup_force_empty before restore pool mm/dynamic_pool: prevent task attach to another dpool mm/dynamic_pool: support page allocation from dpool mm/dynamic_pool: speed up allocation by percpu pages pool mm/dynamic_pool: check resv for HugeTLB allocation from dpool mm/dynamic_pool: support HugeTLB page allocation from dpool mm/dynamic_pool: add tracepoints for dpool mm/dynamic_pool: fill dpool with pagelist mm/dynamic_pool: disable THP for task attached with dpool mm/dynamic_pool: compatible with HugeTLB dissolve mm/dynamic_pool: compatible with HugeTLB Vmemmap mm/dynamic_pool: compatible with memory hwpoison mm/dynamic_hugetlb: add Document for dynamic hugetlb feature mm/dynamic_pool: enable CONFIG_DYNAMIC_POOL on x86_64 and arm64 by default Documentation/mm/dynamic_hugetlb.rst | 100 ++ arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/hugetlbfs/inode.c | 5 + fs/proc/meminfo.c | 3 + fs/proc/page.c | 3 + include/linux/dynamic_pool.h | 228 ++++ include/linux/hugetlb.h | 11 + include/linux/memcontrol.h | 21 + include/linux/memory_hotplug.h | 5 + include/linux/mm.h | 1 + include/linux/page-flags.h | 22 + include/ras/ras_event.h | 1 + include/trace/events/dynamic_pool.h | 174 +++ include/trace/events/mmflags.h | 7 + include/uapi/linux/kernel-page-flags.h | 1 + kernel/cgroup/cgroup.c | 12 + mm/Kconfig | 9 + mm/Makefile | 1 + mm/dynamic_pool.c | 1722 ++++++++++++++++++++++++ mm/hugetlb.c | 103 +- mm/hugetlb_vmemmap.c | 4 + mm/internal.h | 6 + mm/khugepaged.c | 18 + mm/memcontrol.c | 119 +- mm/memory-failure.c | 16 +- mm/memory.c | 7 +- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 28 +- mm/shmem.c | 3 + mm/show_mem.c | 2 + tools/mm/page-types.c | 1 + 32 files changed, 2598 insertions(+), 39 deletions(-) create mode 100644 Documentation/mm/dynamic_hugetlb.rst create mode 100644 include/linux/dynamic_pool.h create mode 100644 include/trace/events/dynamic_pool.h create mode 100644 mm/dynamic_pool.c -- 2.25.1

2 27

[PATCH OLK-5.10] drm/amd/display: Exit idle optimizations before attempt to access PHY
by Baogen Shang 12 Jan '24

12 Jan '24

From: Leo Chen <sancchen(a)amd.com> stable inclusion from stable-v5.10.205 commit 357badc01add6e98dd69c9831843da9cc3e905e9 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8AS5P CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=… ------------------------- [ Upstream commit de612738e9771bd66aeb20044486c457c512f684 ] [Why & How] DMUB may hang when powering down pixel clocks due to no dprefclk. It is fixed by exiting idle optimization before the attempt to access PHY. Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> Acked-by: Alex Hung <alex.hung(a)amd.com> Signed-off-by: Leo Chen <sancchen(a)amd.com> Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Baogen Shang <baogen.shang(a)windriver.com> --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index e33fe0207b9e..53e8defd3475 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -1682,10 +1682,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control(edp_link_with_sink, false); } /*resume from S3, no vbios posting, no need to power down again*/ + clk_mgr_exit_optimized_pwr_state(dc, dc->clk_mgr); + power_down_all_hw_blocks(dc); disable_vga_and_power_gate_all_controllers(dc); if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control(edp_link_with_sink, false); + clk_mgr_optimize_pwr_state(dc, dc->clk_mgr); } bios_set_scratch_acc_mode_change(dc->ctx->dc_bios); } -- 2.33.0

1 0

[PATCH OLK-6.6] kabi: mm: add kabi reserve for mm structure
by Kefeng Wang 12 Jan '24

12 Jan '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8UU53 --------------------------- Reserve space for the structure in mm subsystem. Signed-off-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> --- include/linux/mempolicy.h | 3 +++ include/linux/mempool.h | 4 ++++ include/linux/memremap.h | 9 +++++++++ include/linux/mm.h | 8 ++++++++ include/linux/mm_types.h | 11 +++++++++++ include/linux/mmzone.h | 14 ++++++++++++++ include/linux/pagemap.h | 4 ++++ include/linux/shrinker.h | 7 +++++++ include/linux/swap.h | 3 +++ 9 files changed, 63 insertions(+) diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index ca62e945e4f7..2e81ac87e6f6 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h @@ -52,6 +52,9 @@ struct mempolicy { nodemask_t cpuset_mems_allowed; /* relative to these nodes */ nodemask_t user_nodemask; /* nodemask passed by user */ } w; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; /* diff --git a/include/linux/mempool.h b/include/linux/mempool.h index 4aae6c06c5f2..178959b2ee5c 100644 --- a/include/linux/mempool.h +++ b/include/linux/mempool.h @@ -7,6 +7,7 @@ #include <linux/wait.h> #include <linux/compiler.h> +#include <linux/kabi.h> struct kmem_cache; @@ -23,6 +24,9 @@ typedef struct mempool_s { mempool_alloc_t *alloc; mempool_free_t *free; wait_queue_head_t wait; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) } mempool_t; static inline bool mempool_initialized(mempool_t *pool) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 1314d9c5f05b..816532f7ae92 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -25,6 +25,8 @@ struct vmem_altmap { unsigned long free; unsigned long align; unsigned long alloc; + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* @@ -99,6 +101,8 @@ struct dev_pagemap_ops { */ int (*memory_failure)(struct dev_pagemap *pgmap, unsigned long pfn, unsigned long nr_pages, int mf_flags); + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define PGMAP_ALTMAP_VALID (1 << 0) @@ -133,6 +137,11 @@ struct dev_pagemap { const struct dev_pagemap_ops *ops; void *owner; int nr_range; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) union { struct range range; DECLARE_FLEX_ARRAY(struct range, ranges); diff --git a/include/linux/mm.h b/include/linux/mm.h index f078aa6b493c..ffd323dda7cf 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -30,6 +30,7 @@ #include <linux/kasan.h> #include <linux/memremap.h> #include <linux/slab.h> +#include <linux/kabi.h> struct mempolicy; struct anon_vma; @@ -562,6 +563,9 @@ struct vm_fault { * page table to avoid allocation from * atomic context. */ + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; /* @@ -641,6 +645,10 @@ struct vm_operations_struct { */ struct page *(*find_special_page)(struct vm_area_struct *vma, unsigned long addr); + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; #ifdef CONFIG_NUMA_BALANCING diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 0bc3c7c191a5..03a0a3e53986 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -22,6 +22,8 @@ #include <asm/mmu.h> +#include <linux/kabi.h> + #ifndef AT_VECTOR_SIZE_ARCH #define AT_VECTOR_SIZE_ARCH 0 #endif @@ -677,6 +679,10 @@ struct vm_area_struct { #ifdef CONFIG_SHARE_POOL struct sp_area *spa; #endif + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) } __randomize_layout; #ifdef CONFIG_SCHED_MM_CID @@ -939,6 +945,11 @@ struct mm_struct { #endif } __randomize_layout; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) /* * The mm_cpumask needs to be at the end of mm_struct, because it * is dynamically sized based on nr_cpu_ids. diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 57086c57b8e4..0821282fccd3 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -637,6 +637,10 @@ struct lruvec { #ifdef CONFIG_MEMCG struct pglist_data *pgdat; #endif + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /* Isolate unmapped pages */ @@ -997,6 +1001,12 @@ struct zone { bool contiguous; CACHELINE_PADDING(_pad3_); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + /* Zone statistics */ atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS]; atomic_long_t vm_numa_event[NR_VM_NUMA_EVENT_ITEMS]; @@ -1410,6 +1420,10 @@ typedef struct pglist_data { CACHELINE_PADDING(_pad2_); + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + /* Per-node vmstats */ struct per_cpu_nodestat __percpu *per_cpu_nodestats; atomic_long_t vm_stat[NR_VM_NODE_STAT_ITEMS]; diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 8c9608b217b0..d418f1c563ee 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -15,6 +15,7 @@ #include <linux/bitops.h> #include <linux/hardirq.h> /* for in_interrupt() */ #include <linux/hugetlb_inline.h> +#include <linux/kabi.h> struct folio_batch; @@ -1262,6 +1263,9 @@ struct readahead_control { struct file *file; struct address_space *mapping; struct file_ra_state *ra; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) /* private: use the readahead_* accessors instead */ pgoff_t _index; unsigned int _nr_pages; diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h index 224293b2dd06..335e7aa12fa5 100644 --- a/include/linux/shrinker.h +++ b/include/linux/shrinker.h @@ -4,6 +4,7 @@ #include <linux/atomic.h> #include <linux/types.h> +#include <linux/kabi.h> /* * This struct is used to pass information from page reclaim to the shrinkers. @@ -34,6 +35,9 @@ struct shrink_control { /* current memcg being shrunk (for memcg aware shrinkers) */ struct mem_cgroup *memcg; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define SHRINK_STOP (~0UL) @@ -83,6 +87,9 @@ struct shrinker { #endif /* objs pending delete, per node */ atomic_long_t *nr_deferred; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define DEFAULT_SEEKS 2 /* A good number if you don't know better. */ diff --git a/include/linux/swap.h b/include/linux/swap.h index 9dc160d6fd43..a0286656c231 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -334,6 +334,9 @@ struct swap_info_struct { */ struct work_struct discard_work; /* discard worker */ struct swap_cluster_list discard_clusters; /* discard clusters list */ + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) struct plist_node avail_lists[]; /* * entries in swap_avail_heads, one * entry per node. -- 2.27.0

2 1

[PATCH OLK-6.6 0/3] kabi reserve for gmem
by Wupeng Ma 12 Jan '24

12 Jan '24

From: Ma Wupeng <mawupeng1(a)huawei.com> Reserve kabi in preparation for gmem. Ma Wupeng (3): mm: gmem: kabi reserve for gmem mm: gmem: Introduce new node state N_HETEROGENEOUS openeuler_defconfig: enable CONFIG_GMEM by default arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + drivers/base/node.c | 6 ++++++ include/linux/device.h | 4 ++++ include/linux/mm.h | 8 ++++++++ include/linux/mm_types.h | 5 +++++ include/linux/nodemask.h | 3 +++ mm/Kconfig | 14 ++++++++++++++ mm/page_alloc.c | 3 +++ 9 files changed, 45 insertions(+) -- 2.25.1

4 6

[PATCH OLK-6.6] Revert "drm/prime: Unexport helpers for fd/handle conversion"
by Chen Haixiang 12 Jan '24

12 Jan '24

From: Felix Kuehling <Felix.Kuehling(a)amd.com> mainline inclusion from mainline-v6.7-rc4 commit 0514f63cfff38a0dcb7ba9c5f245827edc0c5107 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8VGWZ Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Revert "drm/prime: Unexport helpers for fd/handle conversion" This reverts commit 71a7974ac7019afeec105a54447ae1dc7216cbb3. These helper functions are needed for KFD to export and import DMABufs the right way without duplicating the tracking of DMABufs associated with GEM objects while ensuring that move notifier callbacks are working as intended. CC: Christian König <christian.koenig(a)amd.com> CC: Thomas Zimmermann <tzimmermann(a)suse.de> Acked-by: Thomas Zimmermann <tzimmermann(a)suse.de> Acked-by: Daniel Vetter <daniel(a)ffwll.ch> Signed-off-by: Felix Kuehling <Felix.Kuehling(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- drivers/gpu/drm/drm_prime.c | 33 ++++++++++++++++++--------------- include/drm/drm_prime.h | 7 +++++++ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 63b709a67471..834a5e28abbe 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -278,7 +278,7 @@ void drm_gem_dmabuf_release(struct dma_buf *dma_buf) } EXPORT_SYMBOL(drm_gem_dmabuf_release); -/* +/** * drm_gem_prime_fd_to_handle - PRIME import function for GEM drivers * @dev: drm_device to import into * @file_priv: drm file-private structure @@ -292,9 +292,9 @@ EXPORT_SYMBOL(drm_gem_dmabuf_release); * * Returns 0 on success or a negative error code on failure. */ -static int drm_gem_prime_fd_to_handle(struct drm_device *dev, - struct drm_file *file_priv, int prime_fd, - uint32_t *handle) +int drm_gem_prime_fd_to_handle(struct drm_device *dev, + struct drm_file *file_priv, int prime_fd, + uint32_t *handle) { struct dma_buf *dma_buf; struct drm_gem_object *obj; @@ -360,6 +360,7 @@ static int drm_gem_prime_fd_to_handle(struct drm_device *dev, dma_buf_put(dma_buf); return ret; } +EXPORT_SYMBOL(drm_gem_prime_fd_to_handle); int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) @@ -408,7 +409,7 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, return dmabuf; } -/* +/** * drm_gem_prime_handle_to_fd - PRIME export function for GEM drivers * @dev: dev to export the buffer from * @file_priv: drm file-private structure @@ -421,10 +422,10 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, * The actual exporting from GEM object to a dma-buf is done through the * &drm_gem_object_funcs.export callback. */ -static int drm_gem_prime_handle_to_fd(struct drm_device *dev, - struct drm_file *file_priv, uint32_t handle, - uint32_t flags, - int *prime_fd) +int drm_gem_prime_handle_to_fd(struct drm_device *dev, + struct drm_file *file_priv, uint32_t handle, + uint32_t flags, + int *prime_fd) { struct drm_gem_object *obj; int ret = 0; @@ -506,6 +507,7 @@ static int drm_gem_prime_handle_to_fd(struct drm_device *dev, return ret; } +EXPORT_SYMBOL(drm_gem_prime_handle_to_fd); int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) @@ -864,9 +866,9 @@ EXPORT_SYMBOL(drm_prime_get_contiguous_size); * @obj: GEM object to export * @flags: flags like DRM_CLOEXEC and DRM_RDWR * - * This is the implementation of the &drm_gem_object_funcs.export functions - * for GEM drivers using the PRIME helpers. It is used as the default for - * drivers that do not set their own. + * This is the implementation of the &drm_gem_object_funcs.export functions for GEM drivers + * using the PRIME helpers. It is used as the default in + * drm_gem_prime_handle_to_fd(). */ struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj, int flags) @@ -962,9 +964,10 @@ EXPORT_SYMBOL(drm_gem_prime_import_dev); * @dev: drm_device to import into * @dma_buf: dma-buf object to import * - * This is the implementation of the gem_prime_import functions for GEM - * drivers using the PRIME helpers. It is the default for drivers that do - * not set their own &drm_driver.gem_prime_import. + * This is the implementation of the gem_prime_import functions for GEM drivers + * using the PRIME helpers. Drivers can use this as their + * &drm_driver.gem_prime_import implementation. It is used as the default + * implementation in drm_gem_prime_fd_to_handle(). * * Drivers must arrange to call drm_prime_gem_destroy() from their * &drm_gem_object_funcs.free hook when using this function. diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h index a7abf9f3e697..2a1d01e5b56b 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -60,12 +60,19 @@ enum dma_data_direction; struct drm_device; struct drm_gem_object; +struct drm_file; /* core prime functions */ struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev, struct dma_buf_export_info *exp_info); void drm_gem_dmabuf_release(struct dma_buf *dma_buf); +int drm_gem_prime_fd_to_handle(struct drm_device *dev, + struct drm_file *file_priv, int prime_fd, uint32_t *handle); +int drm_gem_prime_handle_to_fd(struct drm_device *dev, + struct drm_file *file_priv, uint32_t handle, uint32_t flags, + int *prime_fd); + /* helper functions for exporting */ int drm_gem_map_attach(struct dma_buf *dma_buf, struct dma_buf_attachment *attach); -- 2.33.0

2 1

[PATCH OLK-6.6 1/1] Revert "drm/prime: Unexport helpers for fd/handle conversion"
by Chen Haixiang 12 Jan '24

12 Jan '24

From: Felix Kuehling <Felix.Kuehling(a)amd.com> mainline inclusion from mainline-v6.7-rc4 commit 0514f63cfff38a0dcb7ba9c5f245827edc0c5107 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8VGWZ Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Revert "drm/prime: Unexport helpers for fd/handle conversion" This reverts commit 71a7974ac7019afeec105a54447ae1dc7216cbb3. These helper functions are needed for KFD to export and import DMABufs the right way without duplicating the tracking of DMABufs associated with GEM objects while ensuring that move notifier callbacks are working as intended. CC: Christian König <christian.koenig(a)amd.com> CC: Thomas Zimmermann <tzimmermann(a)suse.de> Acked-by: Thomas Zimmermann <tzimmermann(a)suse.de> Acked-by: Daniel Vetter <daniel(a)ffwll.ch> Signed-off-by: Felix Kuehling <Felix.Kuehling(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- drivers/gpu/drm/drm_prime.c | 33 ++++++++++++++++++--------------- include/drm/drm_prime.h | 7 +++++++ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 63b709a67471..834a5e28abbe 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -278,7 +278,7 @@ void drm_gem_dmabuf_release(struct dma_buf *dma_buf) } EXPORT_SYMBOL(drm_gem_dmabuf_release); -/* +/** * drm_gem_prime_fd_to_handle - PRIME import function for GEM drivers * @dev: drm_device to import into * @file_priv: drm file-private structure @@ -292,9 +292,9 @@ EXPORT_SYMBOL(drm_gem_dmabuf_release); * * Returns 0 on success or a negative error code on failure. */ -static int drm_gem_prime_fd_to_handle(struct drm_device *dev, - struct drm_file *file_priv, int prime_fd, - uint32_t *handle) +int drm_gem_prime_fd_to_handle(struct drm_device *dev, + struct drm_file *file_priv, int prime_fd, + uint32_t *handle) { struct dma_buf *dma_buf; struct drm_gem_object *obj; @@ -360,6 +360,7 @@ static int drm_gem_prime_fd_to_handle(struct drm_device *dev, dma_buf_put(dma_buf); return ret; } +EXPORT_SYMBOL(drm_gem_prime_fd_to_handle); int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) @@ -408,7 +409,7 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, return dmabuf; } -/* +/** * drm_gem_prime_handle_to_fd - PRIME export function for GEM drivers * @dev: dev to export the buffer from * @file_priv: drm file-private structure @@ -421,10 +422,10 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, * The actual exporting from GEM object to a dma-buf is done through the * &drm_gem_object_funcs.export callback. */ -static int drm_gem_prime_handle_to_fd(struct drm_device *dev, - struct drm_file *file_priv, uint32_t handle, - uint32_t flags, - int *prime_fd) +int drm_gem_prime_handle_to_fd(struct drm_device *dev, + struct drm_file *file_priv, uint32_t handle, + uint32_t flags, + int *prime_fd) { struct drm_gem_object *obj; int ret = 0; @@ -506,6 +507,7 @@ static int drm_gem_prime_handle_to_fd(struct drm_device *dev, return ret; } +EXPORT_SYMBOL(drm_gem_prime_handle_to_fd); int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) @@ -864,9 +866,9 @@ EXPORT_SYMBOL(drm_prime_get_contiguous_size); * @obj: GEM object to export * @flags: flags like DRM_CLOEXEC and DRM_RDWR * - * This is the implementation of the &drm_gem_object_funcs.export functions - * for GEM drivers using the PRIME helpers. It is used as the default for - * drivers that do not set their own. + * This is the implementation of the &drm_gem_object_funcs.export functions for GEM drivers + * using the PRIME helpers. It is used as the default in + * drm_gem_prime_handle_to_fd(). */ struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj, int flags) @@ -962,9 +964,10 @@ EXPORT_SYMBOL(drm_gem_prime_import_dev); * @dev: drm_device to import into * @dma_buf: dma-buf object to import * - * This is the implementation of the gem_prime_import functions for GEM - * drivers using the PRIME helpers. It is the default for drivers that do - * not set their own &drm_driver.gem_prime_import. + * This is the implementation of the gem_prime_import functions for GEM drivers + * using the PRIME helpers. Drivers can use this as their + * &drm_driver.gem_prime_import implementation. It is used as the default + * implementation in drm_gem_prime_fd_to_handle(). * * Drivers must arrange to call drm_prime_gem_destroy() from their * &drm_gem_object_funcs.free hook when using this function. diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h index a7abf9f3e697..2a1d01e5b56b 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -60,12 +60,19 @@ enum dma_data_direction; struct drm_device; struct drm_gem_object; +struct drm_file; /* core prime functions */ struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev, struct dma_buf_export_info *exp_info); void drm_gem_dmabuf_release(struct dma_buf *dma_buf); +int drm_gem_prime_fd_to_handle(struct drm_device *dev, + struct drm_file *file_priv, int prime_fd, uint32_t *handle); +int drm_gem_prime_handle_to_fd(struct drm_device *dev, + struct drm_file *file_priv, uint32_t handle, uint32_t flags, + int *prime_fd); + /* helper functions for exporting */ int drm_gem_map_attach(struct dma_buf *dma_buf, struct dma_buf_attachment *attach); -- 2.33.0

2 1

[PATCH OLK-5.10] drm/amd/display: Exit idle optimizations before attempt to access PHY
by Baogen Shang 12 Jan '24

12 Jan '24

From: Leo Chen <sancchen(a)amd.com> stable inclusion from stable-v5.10.205 commit 357badc01add6e98dd69c9831843da9cc3e905e9 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8AS5P CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=… ------------------------- [ Upstream commit de612738e9771bd66aeb20044486c457c512f684 ] [Why & How] DMUB may hang when powering down pixel clocks due to no dprefclk. It is fixed by exiting idle optimization before the attempt to access PHY. Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> Acked-by: Alex Hung <alex.hung(a)amd.com> Signed-off-by: Leo Chen <sancchen(a)amd.com> Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Baogen Shang <baogen.shang(a)windriver.com> --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index e33fe0207b9e..53e8defd3475 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -1682,10 +1682,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control(edp_link_with_sink, false); } /*resume from S3, no vbios posting, no need to power down again*/ + clk_mgr_exit_optimized_pwr_state(dc, dc->clk_mgr); + power_down_all_hw_blocks(dc); disable_vga_and_power_gate_all_controllers(dc); if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control(edp_link_with_sink, false); + clk_mgr_optimize_pwr_state(dc, dc->clk_mgr); } bios_set_scratch_acc_mode_change(dc->ctx->dc_bios); } -- 2.33.0

1 0

[PATCH OLK-6.6 0/2] Export remaining aarch64 kvm exit reasons
by lishusen 12 Jan '24

12 Jan '24

Export remaining aarch64 kvm exit reasons to debugfs Zenghui Yu (1): KVM: arm64: Fix {fp_asimd,sve}_exit_stat manipulation chenjiajun (1): kvm: debugfs: export remaining aarch64 kvm exit reasons to debugfs C | 0 arch/arm64/include/asm/kvm_host.h | 15 +++++++++++++++ arch/arm64/kvm/handle_exit.c | 9 +++++++++ arch/arm64/kvm/hyp/include/hyp/switch.h | 2 ++ arch/arm64/kvm/mmu.c | 1 + arch/arm64/kvm/sys_regs.c | 11 +++++++++++ 6 files changed, 38 insertions(+) create mode 100644 C -- 2.33.0

2 3

2024

2023

2022

2021

2020

2019

Kernel