- Kernel - mailweb.openeuler.org

[PATCH OLK-5.10] trace/fgraph: Fix error handling
by Tengda Wu 16 Sep '25

16 Sep '25

From: Guenter Roeck <linux(a)roeck-us.net> mainline inclusion from mainline-v6.17-rc4 commit ab1396af7595e7d49a3850481b24d7fe7cbdfd31 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICYBCS Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Commit edede7a6dcd7 ("trace/fgraph: Fix the warning caused by missing unregister notifier") added a call to unregister the PM notifier if register_ftrace_graph() failed. It does so unconditionally. However, the PM notifier is only registered with the first call to register_ftrace_graph(). If the first registration was successful and a subsequent registration failed, the notifier is now unregistered even if ftrace graphs are still registered. Fix the problem by only unregistering the PM notifier during error handling if there are no active fgraph registrations. Fixes: edede7a6dcd7 ("trace/fgraph: Fix the warning caused by missing unregister notifier") Closes: https://lore.kernel.org/all/63b0ba5a-a928-438e-84f9-93028dd72e54@roeck-us.n… Cc: Ye Weihua <yeweihua4(a)huawei.com> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Mark Rutland <mark.rutland(a)arm.com> Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Link: https://lore.kernel.org/20250906050618.2634078-1-linux@roeck-us.net Signed-off-by: Guenter Roeck <linux(a)roeck-us.net> Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> Conflicts: kernel/trace/fgraph.c [Context conflict, need to integrate the two err handling codes together] Signed-off-by: Tengda Wu <wutengda2(a)huawei.com> --- kernel/trace/fgraph.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index fd8f06c5dcc3..c920a7556764 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -609,11 +609,8 @@ int register_ftrace_graph(struct fgraph_ops *gops) ftrace_graph_active++; ret = start_graph_tracing(); - if (ret) { - ftrace_graph_active--; - unregister_pm_notifier(&ftrace_suspend_notifier); - goto out; - } + if (ret) + goto out_err; ftrace_graph_return = gops->retfunc; @@ -628,8 +625,12 @@ int register_ftrace_graph(struct fgraph_ops *gops) update_function_graph_func(); ret = ftrace_startup(&graph_ops, FTRACE_START_FUNC_RET); - if (ret) - unregister_pm_notifier(&ftrace_suspend_notifier); +out_err: + if (ret) { + ftrace_graph_active--; + if (!ftrace_graph_active) + unregister_pm_notifier(&ftrace_suspend_notifier); + } out: mutex_unlock(&ftrace_lock); return ret; -- 2.34.1

2 1

[PATCH OLK-6.6] trace/fgraph: Fix error handling
by Tengda Wu 16 Sep '25

16 Sep '25

From: Guenter Roeck <linux(a)roeck-us.net> mainline inclusion from mainline-v6.17-rc4 commit ab1396af7595e7d49a3850481b24d7fe7cbdfd31 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICYBCS Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Commit edede7a6dcd7 ("trace/fgraph: Fix the warning caused by missing unregister notifier") added a call to unregister the PM notifier if register_ftrace_graph() failed. It does so unconditionally. However, the PM notifier is only registered with the first call to register_ftrace_graph(). If the first registration was successful and a subsequent registration failed, the notifier is now unregistered even if ftrace graphs are still registered. Fix the problem by only unregistering the PM notifier during error handling if there are no active fgraph registrations. Fixes: edede7a6dcd7 ("trace/fgraph: Fix the warning caused by missing unregister notifier") Closes: https://lore.kernel.org/all/63b0ba5a-a928-438e-84f9-93028dd72e54@roeck-us.n… Cc: Ye Weihua <yeweihua4(a)huawei.com> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Mark Rutland <mark.rutland(a)arm.com> Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Link: https://lore.kernel.org/20250906050618.2634078-1-linux@roeck-us.net Signed-off-by: Guenter Roeck <linux(a)roeck-us.net> Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> Conflicts: kernel/trace/fgraph.c [Context conflict, need to integrate the two err handling codes together] Signed-off-by: Tengda Wu <wutengda2(a)huawei.com> --- kernel/trace/fgraph.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 7956a799b5e8..35d14657a28b 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -646,11 +646,8 @@ int register_ftrace_graph(struct fgraph_ops *gops) ftrace_graph_active++; ret = start_graph_tracing(); - if (ret) { - ftrace_graph_active--; - unregister_pm_notifier(&ftrace_suspend_notifier); - goto out; - } + if (ret) + goto out_err; ftrace_graph_return = gops->retfunc; @@ -665,8 +662,12 @@ int register_ftrace_graph(struct fgraph_ops *gops) update_function_graph_func(); ret = ftrace_startup(&graph_ops, FTRACE_START_FUNC_RET); - if (ret) - unregister_pm_notifier(&ftrace_suspend_notifier); +out_err: + if (ret) { + ftrace_graph_active--; + if (!ftrace_graph_active) + unregister_pm_notifier(&ftrace_suspend_notifier); + } out: mutex_unlock(&ftrace_lock); return ret; -- 2.34.1

2 1

[PATCH OLK-6.6 v2] arm64: Do not enable hardware xcall/xint in guest temporarily
by Jinjie Ruan 16 Sep '25

16 Sep '25

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/release-management/issues/IBV2E4 -------------------------------- In guest VM, ID register is needed to do VM migration, but currently 920G do not have an ID register to identify hardware xcall/xint feature, which will be supported by AIDR_EL1.xcall in the next generation, so check the bit for non-920G hardware and do not enable xcall/xint in guest for 920G to avoid the problem in guest. Fixes: 7f2e02718bba ("arm64: entry: Support hardware xcall and xint") Signed-off-by: Jinjie Ruan <ruanjinjie(a)huawei.com> --- arch/arm64/kernel/cpufeature.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 5c9d2f98e488..8d4c913d699c 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2443,15 +2443,35 @@ static void mpam_extra_caps(void) #include <asm/xcall.h> DEFINE_STATIC_KEY_FALSE(xcall_enable); +#define AIDR_ELx_XCALL_SHIFT 32 +#define AIDR_ELx_XCALL (UL(1) << AIDR_ELx_XCALL_SHIFT) + static bool is_arch_xcall_xint_support(void) { + u64 aidr_el1 = read_sysreg_s(SYS_AIDR_EL1); + u64 el = read_sysreg(CurrentEL); + /* List of CPUs that support Xcall/Xint */ - static const struct midr_range xcall_xint_cpus[] = { + static const struct midr_range kunpeng_920g_cpus[] = { MIDR_ALL_VERSIONS(MIDR_HISI_HIP12), { /* sentinel */ } }; - if (is_midr_in_range_list(read_cpuid_id(), xcall_xint_cpus)) + if (is_midr_in_range_list(read_cpuid_id(), kunpeng_920g_cpus)) { + if (el == CurrentEL_EL2) + return true; + else + return false; + } + + /* + * Before 1650v100, AIDR[33:32] is reserved zero, Xcall/Xint v1 + * is not supported. + * + * After 1650v100, if AIDR[33:32] = 0x01, Xcall/Xint v1 and v2 + * is supported, else if AIDR[33:32] = 0x0, none of them supported. + */ + if (aidr_el1 & AIDR_ELx_XCALL) return true; return false; -- 2.34.1

2 1

[openeuler:openEuler-1.0-LTS 1784/1784] drivers/usb/host/xhci.h:1877:9: warning: 'XHCI_ZHAOXIN_HOST' macro redefined
by kernel test robot 16 Sep '25

16 Sep '25

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: 1d593bdfdaff241dea4989a81386a6f45887adf2 commit: 8a64dc868d76ad19b65c65fd8168f46b4cb662cb [1784/1784] xhci: Show ZHAOXIN xHCI root hub speed correctly config: x86_64-buildonly-randconfig-002-20250916 (https://download.01.org/0day-ci/archive/20250916/202509162016.H2iGR5dg-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/20250916/202509162016.H2iGR5dg-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/202509162016.H2iGR5dg-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from drivers/usb/host/xhci-plat.c:22: >> drivers/usb/host/xhci.h:1877:9: warning: 'XHCI_ZHAOXIN_HOST' macro redefined [-Wmacro-redefined] 1877 | #define XHCI_ZHAOXIN_HOST BIT_ULL(46) | ^ drivers/usb/host/xhci.h:1875:9: note: previous definition is here 1875 | #define XHCI_ZHAOXIN_HOST BIT_ULL(36) | ^ 1 warning generated. -- In file included from drivers/usb/host/xhci-ext-caps.c:9: >> drivers/usb/host/xhci.h:1877:9: warning: 'XHCI_ZHAOXIN_HOST' macro redefined [-Wmacro-redefined] 1877 | #define XHCI_ZHAOXIN_HOST BIT_ULL(46) | ^ drivers/usb/host/xhci.h:1875:9: note: previous definition is here 1875 | #define XHCI_ZHAOXIN_HOST BIT_ULL(36) | ^ 1 warning generated. In file included from drivers/usb/host/xhci-ext-caps.c:9: >> drivers/usb/host/xhci.h:1877:9: warning: 'XHCI_ZHAOXIN_HOST' macro redefined [-Wmacro-redefined] 1877 | #define XHCI_ZHAOXIN_HOST BIT_ULL(46) | ^ drivers/usb/host/xhci.h:1875:9: note: previous definition is here 1875 | #define XHCI_ZHAOXIN_HOST BIT_ULL(36) | ^ 1 warning generated. -- In file included from drivers/usb/host/xhci-mem.c:17: >> drivers/usb/host/xhci.h:1877:9: warning: 'XHCI_ZHAOXIN_HOST' macro redefined [-Wmacro-redefined] 1877 | #define XHCI_ZHAOXIN_HOST BIT_ULL(46) | ^ drivers/usb/host/xhci.h:1875:9: note: previous definition is here 1875 | #define XHCI_ZHAOXIN_HOST BIT_ULL(36) | ^ drivers/usb/host/xhci-mem.c:936:6: warning: no previous prototype for function 'xhci_free_virt_devices_depth_first' [-Wmissing-prototypes] 936 | void xhci_free_virt_devices_depth_first(struct xhci_hcd *xhci, int slot_id) | ^ drivers/usb/host/xhci-mem.c:936:1: note: declare 'static' if the function is not intended to be used outside of this translation unit 936 | void xhci_free_virt_devices_depth_first(struct xhci_hcd *xhci, int slot_id) | ^ | static 2 warnings generated. drivers/usb/host/xhci-mem.c:365: warning: Function parameter or member 'xhci' not described in 'xhci_ring_alloc' drivers/usb/host/xhci-mem.c:365: warning: Function parameter or member 'num_segs' not described in 'xhci_ring_alloc' drivers/usb/host/xhci-mem.c:365: warning: Function parameter or member 'cycle_state' not described in 'xhci_ring_alloc' drivers/usb/host/xhci-mem.c:365: warning: Function parameter or member 'type' not described in 'xhci_ring_alloc' drivers/usb/host/xhci-mem.c:365: warning: Function parameter or member 'max_packet' not described in 'xhci_ring_alloc' drivers/usb/host/xhci-mem.c:365: warning: Function parameter or member 'flags' not described in 'xhci_ring_alloc' -- In file included from drivers/usb/host/xhci.c:21: >> drivers/usb/host/xhci.h:1877:9: warning: 'XHCI_ZHAOXIN_HOST' macro redefined [-Wmacro-redefined] 1877 | #define XHCI_ZHAOXIN_HOST BIT_ULL(46) | ^ drivers/usb/host/xhci.h:1875:9: note: previous definition is here 1875 | #define XHCI_ZHAOXIN_HOST BIT_ULL(36) | ^ 1 warning generated. drivers/usb/host/xhci.c:1258: warning: Function parameter or member 'desc' not described in 'xhci_get_endpoint_index' In file included from drivers/usb/host/xhci.c:21: >> drivers/usb/host/xhci.h:1877:9: warning: 'XHCI_ZHAOXIN_HOST' macro redefined [-Wmacro-redefined] 1877 | #define XHCI_ZHAOXIN_HOST BIT_ULL(46) | ^ drivers/usb/host/xhci.h:1875:9: note: previous definition is here 1875 | #define XHCI_ZHAOXIN_HOST BIT_ULL(36) | ^ 1 warning generated. vim +/XHCI_ZHAOXIN_HOST +1877 drivers/usb/host/xhci.h 1732 1733 /* There is one xhci_hcd structure per controller */ 1734 struct xhci_hcd { 1735 struct usb_hcd *main_hcd; 1736 struct usb_hcd *shared_hcd; 1737 /* glue to PCI and HCD framework */ 1738 struct xhci_cap_regs __iomem *cap_regs; 1739 struct xhci_op_regs __iomem *op_regs; 1740 struct xhci_run_regs __iomem *run_regs; 1741 struct xhci_doorbell_array __iomem *dba; 1742 /* Our HCD's current interrupter register set */ 1743 struct xhci_intr_reg __iomem *ir_set; 1744 1745 /* Cached register copies of read-only HC data */ 1746 __u32 hcs_params1; 1747 __u32 hcs_params2; 1748 __u32 hcs_params3; 1749 __u32 hcc_params; 1750 __u32 hcc_params2; 1751 1752 spinlock_t lock; 1753 1754 /* packed release number */ 1755 u8 sbrn; 1756 u16 hci_version; 1757 u8 max_slots; 1758 u8 max_interrupters; 1759 u8 max_ports; 1760 u8 isoc_threshold; 1761 /* imod_interval in ns (I * 250ns) */ 1762 u32 imod_interval; 1763 int event_ring_max; 1764 /* 4KB min, 128MB max */ 1765 int page_size; 1766 /* Valid values are 12 to 20, inclusive */ 1767 int page_shift; 1768 /* msi-x vectors */ 1769 int msix_count; 1770 /* optional clocks */ 1771 struct clk *clk; 1772 struct clk *reg_clk; 1773 /* data structures */ 1774 struct xhci_device_context_array *dcbaa; 1775 struct xhci_ring *cmd_ring; 1776 unsigned int cmd_ring_state; 1777 #define CMD_RING_STATE_RUNNING (1 << 0) 1778 #define CMD_RING_STATE_ABORTED (1 << 1) 1779 #define CMD_RING_STATE_STOPPED (1 << 2) 1780 struct list_head cmd_list; 1781 unsigned int cmd_ring_reserved_trbs; 1782 struct delayed_work cmd_timer; 1783 struct completion cmd_ring_stop_completion; 1784 struct xhci_command *current_cmd; 1785 struct xhci_ring *event_ring; 1786 struct xhci_erst erst; 1787 /* Scratchpad */ 1788 struct xhci_scratchpad *scratchpad; 1789 /* Store LPM test failed devices' information */ 1790 struct list_head lpm_failed_devs; 1791 1792 /* slot enabling and address device helpers */ 1793 /* these are not thread safe so use mutex */ 1794 struct mutex mutex; 1795 /* For USB 3.0 LPM enable/disable. */ 1796 struct xhci_command *lpm_command; 1797 /* Internal mirror of the HW's dcbaa */ 1798 struct xhci_virt_device *devs[MAX_HC_SLOTS]; 1799 /* For keeping track of bandwidth domains per roothub. */ 1800 struct xhci_root_port_bw_info *rh_bw; 1801 1802 /* DMA pools */ 1803 struct dma_pool *device_pool; 1804 struct dma_pool *segment_pool; 1805 struct dma_pool *small_streams_pool; 1806 struct dma_pool *medium_streams_pool; 1807 1808 /* Host controller watchdog timer structures */ 1809 unsigned int xhc_state; 1810 1811 u32 command; 1812 struct s3_save s3; 1813 /* Host controller is dying - not responding to commands. "I'm not dead yet!" 1814 * 1815 * xHC interrupts have been disabled and a watchdog timer will (or has already) 1816 * halt the xHCI host, and complete all URBs with an -ESHUTDOWN code. Any code 1817 * that sees this status (other than the timer that set it) should stop touching 1818 * hardware immediately. Interrupt handlers should return immediately when 1819 * they see this status (any time they drop and re-acquire xhci->lock). 1820 * xhci_urb_dequeue() should call usb_hcd_check_unlink_urb() and return without 1821 * putting the TD on the canceled list, etc. 1822 * 1823 * There are no reports of xHCI host controllers that display this issue. 1824 */ 1825 #define XHCI_STATE_DYING (1 << 0) 1826 #define XHCI_STATE_HALTED (1 << 1) 1827 #define XHCI_STATE_REMOVING (1 << 2) 1828 unsigned long long quirks; 1829 #define XHCI_LINK_TRB_QUIRK BIT_ULL(0) 1830 #define XHCI_RESET_EP_QUIRK BIT_ULL(1) 1831 #define XHCI_NEC_HOST BIT_ULL(2) 1832 #define XHCI_AMD_PLL_FIX BIT_ULL(3) 1833 #define XHCI_SPURIOUS_SUCCESS BIT_ULL(4) 1834 /* 1835 * Certain Intel host controllers have a limit to the number of endpoint 1836 * contexts they can handle. Ideally, they would signal that they can't handle 1837 * anymore endpoint contexts by returning a Resource Error for the Configure 1838 * Endpoint command, but they don't. Instead they expect software to keep track 1839 * of the number of active endpoints for them, across configure endpoint 1840 * commands, reset device commands, disable slot commands, and address device 1841 * commands. 1842 */ 1843 #define XHCI_EP_LIMIT_QUIRK BIT_ULL(5) 1844 #define XHCI_BROKEN_MSI BIT_ULL(6) 1845 #define XHCI_RESET_ON_RESUME BIT_ULL(7) 1846 #define XHCI_SW_BW_CHECKING BIT_ULL(8) 1847 #define XHCI_AMD_0x96_HOST BIT_ULL(9) 1848 #define XHCI_TRUST_TX_LENGTH BIT_ULL(10) 1849 #define XHCI_LPM_SUPPORT BIT_ULL(11) 1850 #define XHCI_INTEL_HOST BIT_ULL(12) 1851 #define XHCI_SPURIOUS_REBOOT BIT_ULL(13) 1852 #define XHCI_COMP_MODE_QUIRK BIT_ULL(14) 1853 #define XHCI_AVOID_BEI BIT_ULL(15) 1854 #define XHCI_PLAT BIT_ULL(16) 1855 #define XHCI_SLOW_SUSPEND BIT_ULL(17) 1856 #define XHCI_SPURIOUS_WAKEUP BIT_ULL(18) 1857 /* For controllers with a broken beyond repair streams implementation */ 1858 #define XHCI_BROKEN_STREAMS BIT_ULL(19) 1859 #define XHCI_PME_STUCK_QUIRK BIT_ULL(20) 1860 #define XHCI_MTK_HOST BIT_ULL(21) 1861 #define XHCI_SSIC_PORT_UNUSED BIT_ULL(22) 1862 #define XHCI_NO_64BIT_SUPPORT BIT_ULL(23) 1863 #define XHCI_MISSING_CAS BIT_ULL(24) 1864 /* For controller with a broken Port Disable implementation */ 1865 #define XHCI_BROKEN_PORT_PED BIT_ULL(25) 1866 #define XHCI_LIMIT_ENDPOINT_INTERVAL_7 BIT_ULL(26) 1867 #define XHCI_U2_DISABLE_WAKE BIT_ULL(27) 1868 #define XHCI_ASMEDIA_MODIFY_FLOWCONTROL BIT_ULL(28) 1869 #define XHCI_HW_LPM_DISABLE BIT_ULL(29) 1870 #define XHCI_SUSPEND_DELAY BIT_ULL(30) 1871 #define XHCI_INTEL_USB_ROLE_SW BIT_ULL(31) 1872 #define XHCI_ZERO_64B_REGS BIT_ULL(32) 1873 #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) 1874 #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) 1875 #define XHCI_ZHAOXIN_HOST BIT_ULL(36) 1876 #define XHCI_ZHAOXIN_TRB_FETCH BIT_ULL(45) > 1877 #define XHCI_ZHAOXIN_HOST BIT_ULL(46) 1878 1879 unsigned int num_active_eps; 1880 unsigned int limit_active_eps; 1881 /* There are two roothubs to keep track of bus suspend info for */ 1882 struct xhci_bus_state bus_state[2]; 1883 struct xhci_port *hw_ports; 1884 struct xhci_hub usb2_rhub; 1885 struct xhci_hub usb3_rhub; 1886 /* support xHCI 0.96 spec USB2 software LPM */ 1887 unsigned sw_lpm_support:1; 1888 /* support xHCI 1.0 spec USB2 hardware LPM */ 1889 unsigned hw_lpm_support:1; 1890 /* Broken Suspend flag for SNPS Suspend resume issue */ 1891 unsigned broken_suspend:1; 1892 /* cached usb2 extened protocol capabilites */ 1893 u32 *ext_caps; 1894 unsigned int num_ext_caps; 1895 /* cached extended protocol port capabilities */ 1896 struct xhci_port_cap *port_caps; 1897 unsigned int num_port_caps; 1898 /* Compliance Mode Recovery Data */ 1899 struct timer_list comp_mode_recovery_timer; 1900 u32 port_status_u0; 1901 u16 test_mode; 1902 /* Compliance Mode Timer Triggered every 2 seconds */ 1903 #define COMP_MODE_RCVRY_MSECS 2000 1904 1905 struct dentry *debugfs_root; 1906 struct dentry *debugfs_slots; 1907 struct list_head regset_list; 1908 1909 void *dbc; 1910 /* platform-specific data -- must come last */ 1911 unsigned long priv[0] __aligned(sizeof(s64)); 1912 }; 1913 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH openEuler-1.0-LTS] ALSA: usb-audio: Validate UAC3 power domain descriptors, too
by Liu Kai 16 Sep '25

16 Sep '25

From: Takashi Iwai <tiwai(a)suse.de> mainline inclusion from mainline-v6.17-rc2 commit d832ccbc301fbd9e5a1d691bdcf461cdb514595f category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICWGHZ CVE: CVE-2025-38729 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- UAC3 power domain descriptors need to be verified with its variable bLength for avoiding the unexpected OOB accesses by malicious firmware, too. Fixes: 9a2fe9b801f5 ("ALSA: usb: initial USB Audio Device Class 3.0 support") Reported-and-tested-by: Youngjun Lee <yjjuny.lee(a)samsung.com> Cc: <stable(a)vger.kernel.org> Link: https://patch.msgid.link/20250814081245.8902-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Liu Kai <liukai284(a)huawei.com> --- sound/usb/validate.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/usb/validate.c b/sound/usb/validate.c index 389e8657434ac..5aa20c41cc928 100644 --- a/sound/usb/validate.c +++ b/sound/usb/validate.c @@ -221,6 +221,17 @@ static bool validate_uac3_feature_unit(const void *p, return d->bLength >= sizeof(*d) + 4 + 2; } +static bool validate_uac3_power_domain_unit(const void *p, + const struct usb_desc_validator *v) +{ + const struct uac3_power_domain_descriptor *d = p; + + if (d->bLength < sizeof(*d)) + return false; + /* baEntities[] + wPDomainDescrStr */ + return d->bLength >= sizeof(*d) + d->bNrEntities + 2; +} + static bool validate_midi_out_jack(const void *p, const struct usb_desc_validator *v) { @@ -285,6 +296,7 @@ static struct usb_desc_validator audio_validators[] = { struct uac3_clock_multiplier_descriptor), /* UAC_VERSION_3, UAC3_SAMPLE_RATE_CONVERTER: not implemented yet */ /* UAC_VERSION_3, UAC3_CONNECTORS: not implemented yet */ + FUNC(UAC_VERSION_3, UAC3_POWER_DOMAIN, validate_uac3_power_domain_unit), { } /* terminator */ }; -- 2.34.1

2 1

[PATCH] hikptool: ras: do some cleanup and refactoring of rasdfx dump
by Junhao He 16 Sep '25

16 Sep '25

cleanup: 1) Add a macro to simplify obtaining the packet size 2) Remove redundant checks for cmd and size, as they are always true 3) Use memcpy instead of for loop statements 4) Remove the redundant initialization of ras_rsp_data to 0 5) Other minor cleanup refactor: During the dump file process, do not repeatedly open and close the file No need to subtract the packet header length, then simplify the code for obtaining the file buffer size. Add helper of ras_get_rasdfx_header Add a check to verify if cmd_ret->rsp_data_num is 0 Add a check to verify whether f_header.pkt_num exceeds the maximum value The header.pkt_length indicates the size in bytes, which needs to be converted to DWORD size, and then compared with DFX_REG_PACKET_HEAD_LEN to address potential division by zero issues. Refactoring of parseing payload. Signed-off-by: Junhao He <hejunhao3(a)h-partners.com> --- ras/ras_func/ras_common.h | 26 -- ras/ras_func/ras_dump_data.c | 541 +++++++++++++------------------ ras/ras_func/ras_dump_data.h | 101 +++--- ras/user_cmd/ras_cmd_dump.c | 37 +-- ras/user_cmd/ras_tools_include.h | 25 -- 5 files changed, 282 insertions(+), 448 deletions(-) delete mode 100644 ras/ras_func/ras_common.h delete mode 100644 ras/user_cmd/ras_tools_include.h diff --git a/ras/ras_func/ras_common.h b/ras/ras_func/ras_common.h deleted file mode 100644 index 9b9a486..0000000 --- a/ras/ras_func/ras_common.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2022 Hisilicon Technologies Co., Ltd. - * Hikptool is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * - * See the Mulan PSL v2 for more details. - */ - -#ifndef RAS_COMMON_H -#define RAS_COMMON_H - -enum { - RAS_DUMP, -}; - -enum ras_dump_cmd_type { - DUMP_DFX = 0, - DUMP_CLEAR, -}; - -#endif /* RAS_COMMON_H */ diff --git a/ras/ras_func/ras_dump_data.c b/ras/ras_func/ras_dump_data.c index f4238e3..5d0ec8e 100644 --- a/ras/ras_func/ras_dump_data.c +++ b/ras/ras_func/ras_dump_data.c @@ -13,384 +13,299 @@ #include <unistd.h> #include <stdint.h> #include <stdlib.h> +#include <stdarg.h> #include <string.h> #include <stdio.h> #include <errno.h> #include <time.h> #include "hikptdev_plug.h" #include "op_logs.h" -#include "ras_common.h" +#include "hikpt_rciep.h" +#include "tool_lib.h" #include "ras_dump_data.h" -static struct dfx_reg_dump_header header; +static void __attribute__((format(printf, 2, 3))) __THROWNL +rasdfx_wr2buf(struct file_seq *s, const char *fmt, ...); -static int ras_get_data(uint32_t ras_cmd_type, struct ras_dump_req_para *req_data, - struct ras_rsp *ras_rsp_data) +#define RAS_DUMP 0 + +#define RASDFX_FILE_HEADER_LEN 6 +#define MAX_DFX_PACKET_LEN 256 +#define DFX_REG_PACKET_HEAD_LEN 3U + +#define DFX_DATA_CLEARED_MAGIC 0 +#define DFX_DATA_DUMPED_MAGIC 0x5aa5a55a + +#define RASDFX_PACKET_HEAD_SIZE 256 +#define RASDFX_PACKET_SIZE(reg_num) (RASDFX_PACKET_HEAD_SIZE + (reg_num) * 10) +#define RASDFX_PACKET_NUM_MAX 1000000 + +static void __THROWNL rasdfx_wr2buf(struct file_seq *s, const char *fmt, ...) +{ + size_t size = s->buf_size - s->buf_offs; + va_list argp; + int len; + + va_start(argp, fmt); + len = vsnprintf(s->buf + s->buf_offs, size, fmt, argp); + va_end(argp); + + if (len < 0 || (size_t)len >= size) + HIKP_WARN_PRINT("rasdfx_wr2buf failed, the dfx data is incomplete\n"); + else + s->buf_offs += (size_t)len; +} + +static struct hikp_cmd_ret *ras_get_rsp_data(struct ras_dump_cmd *cmd) { - uint32_t i; - struct hikp_cmd_ret *cmd_ret; struct hikp_cmd_header req_header; + struct hikp_cmd_ret *cmd_ret; + + hikp_cmd_init(&req_header, RAS_MOD, RAS_DUMP, cmd->cmd_type); + cmd_ret = hikp_cmd_alloc(&req_header, &cmd->cmd_id, sizeof(cmd->cmd_id)); + if (!cmd_ret) { + HIKP_ERROR_PRINT("alloc cmd failed, cmd: %u\n", cmd->cmd_id); + return NULL; + } - hikp_cmd_init(&req_header, RAS_MOD, RAS_DUMP, ras_cmd_type); - cmd_ret = hikp_cmd_alloc(&req_header, req_data, RAS_REQ_DATA_LEN); - if (cmd_ret == NULL || cmd_ret->status != 0 || - cmd_ret->rsp_data_num > HIKP_RSP_ALL_DATA_MAX) { - printf("hikp_data_proc err\n"); + if (cmd_ret->status) { + HIKP_ERROR_PRINT("hikp_data_proc err, status: %u\n", cmd_ret->status); hikp_cmd_free(&cmd_ret); - return -1; + return NULL; } - ras_rsp_data->rsp_data_num = cmd_ret->rsp_data_num; - for (i = 0; i < ras_rsp_data->rsp_data_num; i++) { - ras_rsp_data->rsp_data[i] = cmd_ret->rsp_data[i]; - } + return cmd_ret; +} + +static int ras_get_rasdfx_header(struct ras_dump_cmd *cmd, struct rasdfx_file_header *f_header) +{ + struct hikp_cmd_ret *cmd_ret; + + cmd->cmd_id = 0; + cmd_ret = ras_get_rsp_data(cmd); + if (!cmd_ret) + return -ENOMEM; + if (cmd_ret->rsp_data_num != RASDFX_FILE_HEADER_LEN) { + HIKP_ERROR_PRINT("invalid number of response data: %u\n", cmd_ret->rsp_data_num); + hikp_cmd_free(&cmd_ret); + return -1; + } + + memcpy(f_header, cmd_ret->rsp_data, sizeof(struct rasdfx_file_header)); hikp_cmd_free(&cmd_ret); + return 0; } -static void ras_print_time(struct file_seq *s) +static bool ras_check_header(struct rasdfx_file_header *f_header) { + if (f_header->pkt_size_dwords % REP_DATA_BLK_SIZE) { + HIKP_ERROR_PRINT("packet size is not aligned: %u\n", f_header->pkt_size_dwords); + return false; + } + + /* Converted to DWORD units to simplify subsequent calculations */ + f_header->pkt_size_dwords = f_header->pkt_size_dwords / REP_DATA_BLK_SIZE; + if (f_header->pkt_size_dwords < DFX_REG_PACKET_HEAD_LEN || + f_header->pkt_size_dwords > MAX_DFX_PACKET_LEN) { + HIKP_ERROR_PRINT("packet size is out of bounds: %u\n", f_header->pkt_size_dwords); + return false; + } + + if (f_header->pkt_num == 0 || f_header->pkt_num > RASDFX_PACKET_NUM_MAX) { + HIKP_ERROR_PRINT("packet number is out of bounds: %u\n", f_header->pkt_num); + return false; + } + + return true; +} + +static int ras_open_rasdfx_file_seq(struct file_seq *s, struct rasdfx_file_header *f_header) +{ + char file_path[OP_LOG_FILE_PATH_MAXLEN]; time_t time_seconds = time(0); struct tm timeinfo; + s->buf_offs = 0; + s->buf_size = RASDFX_PACKET_SIZE(f_header->pkt_size_dwords); + s->buf = (char *)malloc(s->buf_size); + if (!s->buf) { + HIKP_ERROR_PRINT("malloc file_seq buffer is failed\n"); + return -ENOMEM; + } + (void)localtime_r(&time_seconds, &timeinfo); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "Time: %d-%d-%d %d:%d:%d\n", - timeinfo.tm_year + START_YEAR, timeinfo.tm_mon + 1, timeinfo.tm_mday, - timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec); + snprintf(file_path, sizeof(file_path), "%srasdfx_%04d_%02d_%02d_%02d_%02d_%02d.log", + HIKP_LOG_DIR_PATH, timeinfo.tm_year + START_YEAR, timeinfo.tm_mon + 1, + timeinfo.tm_mday, timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec); + + // creat and open file, set file permissiion 0440 + s->fd = open(file_path, O_WRONLY | O_CREAT, S_IRUSR | S_IRGRP); + if (s->fd < 0) { + HIKP_ERROR_PRINT("open %s failed: %s\n", file_path, strerror(errno)); + free(s->buf); + return -errno; + } + + printf("dump dfx log start, log file: %s\n", file_path); + return 0; } -static int ras_parse_data(uint32_t *reg_save, uint32_t reg_num, uint32_t reg_off, struct file_seq *s) +static void ras_close_rasdfx_file_seq(struct file_seq *s) { - uint32_t i, j; - uint32_t cycle; - uint32_t reg_count, pkt_reg_num; - uint32_t off = reg_off; - - pkt_reg_num = header.pkt_length / sizeof(uint32_t); - cycle = reg_num / pkt_reg_num; - if (!cycle) - return -1; - - for (i = 0; i < cycle; i++) { - if ((off + pkt_reg_num) > HIKP_RSP_ALL_DATA_MAX) { - HIKP_ERROR_PRINT("off is %u, pkt_reg_num is %u,\ - reg_save index will exceed max reg_save length\n", - off, pkt_reg_num); - return -1; - } - - ras_print_time(s); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "Socket: 0X%hhX", - (reg_save[off + DFX_HEAD_INFO_DW0] >> DFX_HEAD_SKT_ID_OFF) & 0xff); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "%4s", ""); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "DIE: 0X%hhX", - (reg_save[off + DFX_HEAD_INFO_DW0] >> DFX_HEAD_DIE_ID_OFF) & 0xff); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "%4s", ""); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "Module: 0X%hhX", - (reg_save[off + DFX_HEAD_INFO_DW1] >> DFX_HEAD_MODULE_ID_OFF) & 0xff); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "%4s", ""); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "Sub Module: 0X%hhX", - (reg_save[off + DFX_HEAD_INFO_DW1] >> DFX_HEAD_SUBMODULE_ID_OFF) & 0xff); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "%4s", ""); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "SequenceNum: 0X%hhX", - (reg_save[off + DFX_HEAD_INFO_DW1] >> DFX_HEAD_SEQUENCE_NUM_OFF) & 0xff); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "%4s", ""); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "Version: 0X%hhX\n", - (reg_save[off + DFX_HEAD_INFO_DW0] >> DFX_HEAD_VERSION_OFF) & 0xff); - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, - "----------------------- DFX REGISTER DUMP -----------------------\n"); - - reg_count = (reg_save[off + DFX_HEAD_INFO_DW1] >> DFX_HEAD_REG_COUNT_OFF) & 0xff; - if (!reg_count || reg_count > pkt_reg_num - DFX_REG_PACKET_HEAD_LEN) { - HIKP_ERROR_PRINT("reg_count is %u, value is not within the reasonable range(1-%u).\n", - reg_count, pkt_reg_num - DFX_REG_PACKET_HEAD_LEN); - return -1; - } - - for (j = 0; j < reg_count; j++) - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "0X%08X\n", - reg_save[off + DFX_COMMON_MAIN_TEXT_BEGIN + j]); - - s->len += snprintf(s->buffer + s->len, s->buffer_size - s->len, "\n"); - off += pkt_reg_num; - } - - return 0; + (void)close(s->fd); + free(s->buf); } -static int ras_generate_file_name(struct file_seq *s) +static void ras_parse_rasdfx_pkt_header(struct file_seq *s, struct rasdfx_pkt *pkt) { time_t time_seconds = time(0); struct tm timeinfo; - int ret; (void)localtime_r(&time_seconds, &timeinfo); - ret = snprintf(s->file_name, MAX_LOG_NAME_LEN, "rasdfx_%d_%d_%d_%d_%d_%d.log", - timeinfo.tm_year + START_YEAR, timeinfo.tm_mon + 1, timeinfo.tm_mday, - timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec); - if (ret < 0 || (uint32_t)ret >= MAX_LOG_NAME_LEN) { - HIKP_ERROR_PRINT("generate file name failed, errno is %d\n", errno); - return -errno; - } - - return 0; + rasdfx_wr2buf(s, "Time: %d-%d-%d %d:%d:%d\n", + timeinfo.tm_year + START_YEAR, timeinfo.tm_mon + 1, timeinfo.tm_mday, + timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec); + rasdfx_wr2buf(s, "Socket: 0X%hhX ", pkt->dw0.skt_id); + rasdfx_wr2buf(s, "DIE: 0X%hhX ", pkt->dw0.die_id); + rasdfx_wr2buf(s, "Module: 0X%hhX ", pkt->dw1.module_id); + rasdfx_wr2buf(s, "Sub Module: 0X%hhX ", pkt->dw1.submodule_id); + rasdfx_wr2buf(s, "SequenceNum: 0X%hhX ", pkt->dw1.sequence_num); + rasdfx_wr2buf(s, "Version: 0X%hhX\n", pkt->dw0.version); + rasdfx_wr2buf(s, "----------------------- DFX REGISTER DUMP -----------------------\n"); } -static int ras_store_data(struct file_seq *s) +static int ras_parse_rasdfx_payload(struct file_seq *s, uint32_t *buf, + struct rasdfx_file_header *f_header) { - char file_path[OP_LOG_FILE_PATH_MAXLEN]; - size_t write_cnt; - FILE *fp; - int rc; - - rc = snprintf(file_path, sizeof(file_path), HIKP_LOG_DIR_PATH"%s", s->file_name); - if (rc < 0) { - HIKP_ERROR_PRINT("creat log file path fail.\n"); - return -EIO; - } + struct rasdfx_pkt *pkt = (struct rasdfx_pkt *)buf; + uint32_t reg_offs, i; + ssize_t write_cnt; - fp = fopen(file_path, "a"); - if (fp == NULL) { - HIKP_ERROR_PRINT("open %s failed, errno is %d\n", file_path, errno); - return -errno; - } + rasdfx_wr2buf(s, "SocID: %u\n\n", pkt->dw0.soc_id); - write_cnt = fwrite(s->buffer, 1, s->len, fp); - if (write_cnt != (uint32_t)s->len) { - fclose(fp); - HIKP_ERROR_PRINT("write %s failed, write cnt %zu.\n", file_path, write_cnt); - return -EAGAIN; - } + for (i = 0; i < f_header->pkt_num; i++) { + ras_parse_rasdfx_pkt_header(s, pkt); + if (pkt->dw1.reg_count > f_header->pkt_size_dwords - DFX_REG_PACKET_HEAD_LEN) { + HIKP_ERROR_PRINT("ras dfx register number is incorrect\n"); + return -1; + } - printf("dump dfx log completed, log file: %s.\n", file_path); - /* Set the file permission to 0440 */ - if (chmod(file_path, 0440)) - HIKP_ERROR_PRINT("chmod %s failed, errno is %d\n", file_path, errno); + for (reg_offs = 0; reg_offs < pkt->dw1.reg_count; reg_offs++) + rasdfx_wr2buf(s, "0X%08X\n", pkt->reg_base[reg_offs]); + rasdfx_wr2buf(s, "\n"); - if (fclose(fp)) { - HIKP_ERROR_PRINT("close %s failed, errno is %d\n", file_path, errno); - return -errno; - } + write_cnt = write(s->fd, s->buf, s->buf_offs); + if (write_cnt != (ssize_t)s->buf_offs) { + HIKP_ERROR_PRINT("write rasdfx file failed: %s\n", strerror(errno)); + return -1; + } - s->len = 0; + s->buf_offs = 0; + pkt = (struct rasdfx_pkt *)((uint32_t *)pkt + f_header->pkt_size_dwords); + } return 0; } -static int file_seq_init(struct file_seq *s, uint32_t size) +static int ras_dump_data_into_buf(struct ras_dump_cmd *cmd, uint32_t *buf, uint32_t buf_max) { - if (!size) - return -1; + struct hikp_cmd_ret *cmd_ret; + uint32_t copy_len = 0; + uint32_t data_num; + + while (copy_len < buf_max) { + cmd->cmd_id++; + cmd_ret = ras_get_rsp_data(cmd); + if (!cmd_ret) + return -ENOMEM; + + data_num = cmd_ret->rsp_data_num; + if (data_num == 0 || data_num > HIKP_RSP_ALL_DATA_MAX) { + HIKP_ERROR_PRINT("invalid response data number: %u\n", data_num); + hikp_cmd_free(&cmd_ret); + return -1; + } - s->buffer_size = size; - s->len = 0; - s->buffer = (char*)malloc(s->buffer_size); - if (!s->buffer) - return -1; + if (copy_len + data_num > buf_max) { + HIKP_ERROR_PRINT("response data is more than expected\n"); + hikp_cmd_free(&cmd_ret); + return -1; + } - return 0; -} + memcpy(buf + copy_len, cmd_ret->rsp_data, data_num * REP_DATA_BLK_SIZE); + copy_len += data_num; + hikp_cmd_free(&cmd_ret); + } -static void file_seq_destroy(struct file_seq *s) -{ - free(s->buffer); - s->buffer = NULL; + return 0; } -static void ras_rsp_init(struct ras_rsp *ras_rsp_data) +static int ras_get_rasdfx_payload(struct ras_dump_cmd *cmd, struct rasdfx_file_header *f_header) { - ras_rsp_data->first_pkt_begin = 0; - ras_rsp_data->last_pkt_end = 0; - ras_rsp_data->rsp_data_num = 0; - ras_rsp_data->packet_buffer_len = 0; + uint32_t buf_max = f_header->pkt_size_dwords * f_header->pkt_num; + uint32_t *total_buf; + struct file_seq s; + int ret; - memset(ras_rsp_data->rsp_data, 0, sizeof(ras_rsp_data->rsp_data)); - memset(ras_rsp_data->packet_buffer, 0, sizeof(ras_rsp_data->packet_buffer)); -} + total_buf = (uint32_t *)malloc(buf_max * REP_DATA_BLK_SIZE); + if (!total_buf) { + HIKP_ERROR_PRINT("malloc total_buf failed\n"); + return -ENOMEM; + } -static int parse_packet_buffer_data(struct ras_rsp *ras_rsp_data, - uint32_t pkt_reg_num, struct file_seq *s) -{ - int ret; + ret = ras_dump_data_into_buf(cmd, total_buf, buf_max); + if (ret) + goto release_total_buf; - if (ras_rsp_data->packet_buffer_len) { - uint32_t rest_pkt_length; + ret = ras_open_rasdfx_file_seq(&s, f_header); + if (ret) + goto release_total_buf; - rest_pkt_length = pkt_reg_num - ras_rsp_data->packet_buffer_len; - if (rest_pkt_length > ras_rsp_data->rsp_data_num) { - HIKP_ERROR_PRINT("The rest of packet_buffer is %u and rsp_data_num is %u, \ - memcpy will out of bounds\n", - rest_pkt_length, ras_rsp_data->rsp_data_num); - return -1; - } - memcpy(ras_rsp_data->packet_buffer + ras_rsp_data->packet_buffer_len, - ras_rsp_data->rsp_data, rest_pkt_length); - - ras_rsp_data->first_pkt_begin = rest_pkt_length; - ret = ras_parse_data(ras_rsp_data->packet_buffer, pkt_reg_num, 0, s); - if (ret) { - HIKP_ERROR_PRINT("ras parse packet_buffer_data is failed\n"); - return ret; - } - } else { - ras_rsp_data->first_pkt_begin = 0; - } - - if (ras_rsp_data->first_pkt_begin == ras_rsp_data->rsp_data_num) - return 0; - - ras_rsp_data->packet_buffer_len = - (ras_rsp_data->rsp_data_num - ras_rsp_data->first_pkt_begin) % pkt_reg_num; - ras_rsp_data->last_pkt_end = ras_rsp_data->rsp_data_num - ras_rsp_data->packet_buffer_len - 1; - ras_rsp_data->rsp_data_num = ras_rsp_data->last_pkt_end - ras_rsp_data->first_pkt_begin + 1; - - memcpy(ras_rsp_data->packet_buffer, ras_rsp_data->rsp_data + ras_rsp_data->last_pkt_end + 1, - ras_rsp_data->packet_buffer_len); - - return 0; -} + ret = ras_parse_rasdfx_payload(&s, total_buf, f_header); -static int ras_dump_pkt_pre(struct ras_rsp *ras_rsp_data, struct file_seq *s) -{ - int ret; - uint32_t reg_num, max_pkt_num, s_buffer_size; - - max_pkt_num = (HIKP_RSP_DATA_SIZE_MAX / header.pkt_length) + 1; - reg_num = header.pkt_length / sizeof(uint32_t) - DFX_REG_PACKET_HEAD_LEN; - s_buffer_size = max_pkt_num * - (reg_num * DFX_FILE_SINGLE_REG_SIZE + DFX_FILE_SINGLE_PACKET_HEAD_SIZE); - ras_rsp_data->rsp_data_num = 0; - - ret = file_seq_init(s, s_buffer_size); - if (ret) { - HIKP_ERROR_PRINT("malloc file_seq buffer is failed\n"); - return ret; - } - - ret = ras_generate_file_name(s); - if (ret) { - HIKP_ERROR_PRINT("ras generate file name is failed\n"); - file_seq_destroy(s); - return ret; - } - - return ret; + ras_close_rasdfx_file_seq(&s); +release_total_buf: + free(total_buf); + return ret; } -static int ras_dump_packet(struct tool_ras_cmd *cmd, struct ras_rsp *ras_rsp_data, - struct ras_dump_req_para *req_data) +int ras_data_dump(void) { - int ret; - uint32_t i, cmd_num; - bool has_printed_socid = false; - struct file_seq s; - - ret = ras_dump_pkt_pre(ras_rsp_data, &s); - if (ret) - return ret; - - cmd_num = (header.pkt_num * header.pkt_length + - HIKP_RSP_DATA_SIZE_MAX - 1) / HIKP_RSP_DATA_SIZE_MAX; - /* 0: get header info; 1-n: get packet data */ - for (i = 0; i < cmd_num; i++) { - req_data->cmd_id = i + 1; - ret = ras_get_data(cmd->ras_cmd_type, req_data, ras_rsp_data); - if (ret) { - HIKP_ERROR_PRINT("ras dump cmd %u is failed\n", req_data->cmd_id); - goto err_out_free; - } - - if (!has_printed_socid) { - s.len += snprintf(s.buffer + s.len, s.buffer_size - s.len, "SocID: %u\n", - (ras_rsp_data->rsp_data[DFX_HEAD_INFO_DW0] >> DFX_HEAD_SOC_ID_OFF) & 0xff); - s.len += snprintf(s.buffer + s.len, s.buffer_size - s.len, "\n"); - - has_printed_socid = true; - } - - ret = parse_packet_buffer_data(ras_rsp_data, header.pkt_length / sizeof(uint32_t), &s); - if (ret) { - HIKP_ERROR_PRINT("ras parse packet buffer data is failed\n"); - goto err_out_free; - } - - if (ras_rsp_data->first_pkt_begin != ras_rsp_data->rsp_data_num) { - ret = ras_parse_data(ras_rsp_data->rsp_data, ras_rsp_data->rsp_data_num, - ras_rsp_data->first_pkt_begin, &s); - if (ret) { - HIKP_ERROR_PRINT("ras parse rsp_data is failed\n"); - goto err_out_free; - } - } - - ret = ras_store_data(&s); - if (ret) { - HIKP_ERROR_PRINT("ras store rsp_data is failed\n"); - goto err_out_free; - } - } - -err_out_free: - file_seq_destroy(&s); - return ret; + struct ras_dump_cmd cmd = { .cmd_type = DUMP_DFX }; + struct rasdfx_file_header f_header; + int ret; + + ret = ras_get_rasdfx_header(&cmd, &f_header); + if (ret) + return ret; + + if (f_header.head_magic != DFX_DATA_DUMPED_MAGIC) { + HIKP_ERROR_PRINT("data does not exist or has been cleared.\n"); + return -1; + } + + if (!ras_check_header(&f_header)) + return -1; + + return ras_get_rasdfx_payload(&cmd, &f_header); } -int ras_data_dump(struct tool_ras_cmd *cmd) +int ras_data_clear(void) { + struct ras_dump_cmd cmd = { .cmd_type = DUMP_CLEAR }; + struct rasdfx_file_header f_header; int ret; - struct ras_rsp ras_rsp_data; - struct ras_dump_req_para req_data = {0}; - - if (cmd == NULL) - return -ENOSPC; - - ras_rsp_init(&ras_rsp_data); - ret = ras_get_data(cmd->ras_cmd_type, &req_data, &ras_rsp_data); - if (ret || (ras_rsp_data.rsp_data_num != DFX_REG_DUMP_HEADER_LEN)) { - HIKP_ERROR_PRINT("ras dump header is failed, rsp_data_num is %u\n", - ras_rsp_data.rsp_data_num); - return -1; - } - - if (!ras_rsp_data.rsp_data[HEAD_MAGIC]) { - HIKP_ERROR_PRINT("ras dfx dump is failed, data does not exist or has been cleared.\n"); - return -1; - } - - header.pkt_num = ras_rsp_data.rsp_data[PKT_NUM]; - header.pkt_length = ras_rsp_data.rsp_data[PKT_LENGTH]; - if (header.pkt_num == 0 || header.pkt_length < DFX_REG_PACKET_HEAD_LEN || - header.pkt_length > MAX_DFX_PACKET_LEN * sizeof(uint32_t)) { - HIKP_ERROR_PRINT("ras dfx dump is failed, pkt_num is %u, pkt_length is %u\n", - header.pkt_num, header.pkt_length); - return -1; - } - - ret = ras_dump_packet(cmd, &ras_rsp_data, &req_data); - if (ret) - HIKP_ERROR_PRINT("ras dump packet is failed\n"); - - return ret; -} -int ras_data_clear(struct tool_ras_cmd *cmd) -{ - int ret; - struct ras_rsp ras_rsp_data; - struct ras_dump_req_para req_data = { 0 }; - - if (cmd == NULL) - return -ENOSPC; - - ras_rsp_init(&ras_rsp_data); - ret = ras_get_data(cmd->ras_cmd_type, &req_data, &ras_rsp_data); - if (ret || ras_rsp_data.rsp_data_num != DFX_REG_DUMP_HEADER_LEN || - ras_rsp_data.rsp_data[HEAD_MAGIC] != DFX_DATA_IS_CLEARED) { - HIKP_ERROR_PRINT("ras dfx data clear is failed\n"); - return -1; - } - - return 0; -} + ret = ras_get_rasdfx_header(&cmd, &f_header); + if (ret) + return ret; + if (f_header.head_magic != DFX_DATA_CLEARED_MAGIC) { + HIKP_ERROR_PRINT("ras dfx data clear is failed\n"); + return -1; + } + + return 0; +} diff --git a/ras/ras_func/ras_dump_data.h b/ras/ras_func/ras_dump_data.h index b54efce..a5e8749 100644 --- a/ras/ras_func/ras_dump_data.h +++ b/ras/ras_func/ras_dump_data.h @@ -11,78 +11,59 @@ * See the Mulan PSL v2 for more details. */ -#ifndef RAS_DUMP_REG_H -#define RAS_DUMP_REG_H +#ifndef RAS_DUMP_DATA_H +#define RAS_DUMP_DATA_H -#include "ras_tools_include.h" -#include "hikpt_rciep.h" -#include "tool_lib.h" +#include <stdint.h> -#define RAS_FILE_HEAD_BUF_LEN 256 -#define MAX_DFX_PACKET_LEN 256 -#define RAS_REQ_DATA_LEN 4 -#define DFX_REG_DUMP_HEADER_LEN 6 -#define DFX_REG_PACKET_HEAD_LEN 3 - -struct dfx_reg_dump_header { - uint32_t head_magic; // 文件头的magic数字，特定值表示有效记录。 - uint32_t version; // 存储格式版本 - uint32_t cap_bits; // bit0表示是否开启crc，其余bit保留。 - uint32_t pkt_num; // packet数量 - uint32_t pkt_length; // 单个packet占用内存空间，单位bytes - uint32_t reserved; -}; - -struct file_seq { - char *buffer; - uint32_t buffer_size; - int len; - char file_name[MAX_LOG_NAME_LEN]; +struct rasdfx_file_header { + uint32_t head_magic; // 文件头的magic数字，特定值表示有效记录。 + uint32_t version; // 存储格式版本 + uint32_t cap_bits; // bit0表示是否开启crc，其余bit保留。 + uint32_t pkt_num; // packet数量 + uint32_t pkt_size_dwords; // 单个packet内DWord个数，单位4bytes + uint32_t reserved; }; -struct ras_rsp { - uint32_t rsp_data[HIKP_RSP_ALL_DATA_MAX]; - uint32_t first_pkt_begin; - uint32_t last_pkt_end; - uint32_t rsp_data_num; - uint32_t packet_buffer[MAX_DFX_PACKET_LEN]; - uint32_t packet_buffer_len; +struct rasdfx_pkt_header_dw0 { + uint32_t version : 8; + uint32_t soc_id : 8; + uint32_t skt_id : 8; + uint32_t die_id : 8; }; -struct ras_dump_req_para { - uint32_t cmd_id; +struct rasdfx_pkt_header_dw1 { + uint32_t module_id : 8; + uint32_t submodule_id : 8; + uint32_t sequence_num : 8; + uint32_t reg_count : 8; }; -enum reg_dump_header_index { - HEAD_MAGIC, - VERSION, - CAP_BITS, - PKT_NUM, - PKT_LENGTH +struct rasdfx_pkt { + struct rasdfx_pkt_header_dw0 dw0; + struct rasdfx_pkt_header_dw1 dw1; + uint32_t reserved; + uint32_t reg_base[0]; }; -enum dfx_packet_index { - DFX_HEAD_INFO_DW0, - DFX_HEAD_INFO_DW1, - DFX_COMMON_MAIN_TEXT_BEGIN = 3 +struct file_seq { + int fd; + char *buf; + size_t buf_size; + size_t buf_offs; }; -#define DFX_HEAD_VERSION_OFF 0 -#define DFX_HEAD_SOC_ID_OFF 8 -#define DFX_HEAD_SKT_ID_OFF 16 -#define DFX_HEAD_DIE_ID_OFF 24 -#define DFX_HEAD_MODULE_ID_OFF 0 -#define DFX_HEAD_SUBMODULE_ID_OFF 8 -#define DFX_HEAD_SEQUENCE_NUM_OFF 16 -#define DFX_HEAD_REG_COUNT_OFF 24 - -#define DFX_DATA_IS_CLEARED 0 - -#define DFX_FILE_SINGLE_PACKET_HEAD_SIZE 256 -#define DFX_FILE_SINGLE_REG_SIZE 10 +enum ras_dump_cmd_type { + DUMP_DFX, + DUMP_CLEAR + }; +struct ras_dump_cmd { + enum ras_dump_cmd_type cmd_type; + uint32_t cmd_id; /* 0: get header info, 1-n: get packet data */ +}; -int ras_data_dump(struct tool_ras_cmd *cmd); -int ras_data_clear(struct tool_ras_cmd *cmd); +int ras_data_dump(void); +int ras_data_clear(void); -#endif /* RAS_DUMP_REG_H */ +#endif /* RAS_DUMP_DATA_H */ diff --git a/ras/user_cmd/ras_cmd_dump.c b/ras/user_cmd/ras_cmd_dump.c index f8ae828..e0df98f 100644 --- a/ras/user_cmd/ras_cmd_dump.c +++ b/ras/user_cmd/ras_cmd_dump.c @@ -13,11 +13,12 @@ #include <stdint.h> #include "tool_cmd.h" -#include "ras_tools_include.h" +#include "hikptdev_plug.h" +#include "tool_lib.h" #include "ras_dump_data.h" -struct tool_ras_cmd g_ras_dump_cmd = { - .ras_cmd_type = DUMP_DFX, +struct ras_dump_cmd g_cmd = { + .cmd_type = DUMP_DFX }; static int ras_dump_help(struct major_cmd_ctrl *self, const char *argv) @@ -34,33 +35,21 @@ static int ras_dump_help(struct major_cmd_ctrl *self, const char *argv) return 0; } -static enum ras_dump_cmd_type ras_get_cmd_type(void) -{ - return g_ras_dump_cmd.ras_cmd_type; -} - -static void ras_set_cmd_type(enum ras_dump_cmd_type type) -{ - g_ras_dump_cmd.ras_cmd_type = type; -} - static int ras_set_clear(struct major_cmd_ctrl *self, const char *argv) { HIKP_SET_USED(self); HIKP_SET_USED(argv); - ras_set_cmd_type(DUMP_CLEAR); + g_cmd.cmd_type = DUMP_CLEAR; return 0; } -static int ras_dump_execute_process(void) +static int ras_dump_execute_process(enum ras_dump_cmd_type cmd_type) { - if (ras_get_cmd_type() == DUMP_DFX) - return ras_data_dump(&g_ras_dump_cmd); - else if (ras_get_cmd_type() == DUMP_CLEAR) - return ras_data_clear(&g_ras_dump_cmd); - else - return -EINVAL; + if (cmd_type == DUMP_CLEAR) + return ras_data_clear(); + else + return ras_data_dump(); } static void ras_dump_execute(struct major_cmd_ctrl *self) @@ -75,12 +64,12 @@ static void ras_dump_execute(struct major_cmd_ctrl *self) "ras dfx data clear error." }; - ret = ras_dump_execute_process(); + ret = ras_dump_execute_process(g_cmd.cmd_type); if (ret == 0) { - printf("%s\n", suc_msg[ras_get_cmd_type()]); + printf("%s\n", suc_msg[g_cmd.cmd_type]); } else { snprintf(self->err_str, sizeof(self->err_str), "%s\n", - err_msg[ras_get_cmd_type()]); + err_msg[g_cmd.cmd_type]); self->err_no = ret; } } diff --git a/ras/user_cmd/ras_tools_include.h b/ras/user_cmd/ras_tools_include.h deleted file mode 100644 index a999b8a..0000000 --- a/ras/user_cmd/ras_tools_include.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2022 Hisilicon Technologies Co., Ltd. - * Hikptool is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * - * See the Mulan PSL v2 for more details. - */ - -#ifndef RAS_TOOLS_INCLUDE_H -#define RAS_TOOLS_INCLUDE_H - -#include "hikptdev_plug.h" -#include "tool_lib.h" -#include "ras_common.h" - -struct tool_ras_cmd { - enum ras_dump_cmd_type ras_cmd_type; -}; - -#endif /* RAS_TOOLS_INCLUDE_H */ -- 2.33.0

1 0

[PATCH OLK-6.6] add test support for container
by Qi Xi 16 Sep '25

16 Sep '25

--- tools/container/client_kill.sh | 8 ++++ tools/container/create.sh | 75 ++++++++++++++++++++++++++++++++ tools/container/edit_client.sh | 34 +++++++++++++++ tools/container/env.sh | 31 +++++++++++++ tools/container/get_specific.sh | 19 ++++++++ tools/container/run_all.sh | 13 ++++++ tools/container/run_bk.sh | 16 +++++++ tools/container/run_bk_117.sh | 7 +++ tools/container/runc_parallel.sh | 41 +++++++++++++++++ tools/container/usage.rst | 56 ++++++++++++++++++++++++ 10 files changed, 300 insertions(+) create mode 100644 tools/container/client_kill.sh create mode 100644 tools/container/create.sh create mode 100644 tools/container/edit_client.sh create mode 100644 tools/container/env.sh create mode 100644 tools/container/get_specific.sh create mode 100644 tools/container/run_all.sh create mode 100644 tools/container/run_bk.sh create mode 100644 tools/container/run_bk_117.sh create mode 100644 tools/container/runc_parallel.sh create mode 100644 tools/container/usage.rst diff --git a/tools/container/client_kill.sh b/tools/container/client_kill.sh new file mode 100644 index 000000000000..a12c5be1edef --- /dev/null +++ b/tools/container/client_kill.sh @@ -0,0 +1,8 @@ +source /home/name/common/env.sh + +for IP in "${CLIENT[@]}" +do + echo $IP + ssh root@$IP "pgrep -f redis-benchmark | xargs kill -9" +done +ssh root@$CLIENT_OBSERVE "pgrep -f redis-benchmark | xargs kill -9" diff --git a/tools/container/create.sh b/tools/container/create.sh new file mode 100644 index 000000000000..3f507bfc39cd --- /dev/null +++ b/tools/container/create.sh @@ -0,0 +1,75 @@ +#!/bin/bash +source /home/name/common/env.sh + +nr=$1 +mode=${2:-"sequential"} # 默认顺序模式，可选：sequential(顺序)或interleave(交错) +[[ -z $nr ]] && { echo "Usage: $0 <number> [sequential|interleave]"; exit 1; } + +docker stop $(docker ps -aq) 2>/dev/null +docker rm $(docker ps -aq) 2>/dev/null + +mkdir -p /var/run/netns +systemctl stop irqbalance + +if [[ $mode == "interleave" ]]; then + deployment_order=() + for i in $(seq 0 $((nr - 1))); do + for j in $(seq $numa_start $numa_end); do + deployment_order+=("$j $i") + done + done +else + deployment_order=() + for j in $(seq $numa_start $numa_end); do + for i in $(seq 0 $((nr - 1))); do + deployment_order+=("$j $i") + done + done +fi + +ip_count=0 +for deployment in "${deployment_order[@]}"; do + j=$(echo $deployment | awk '{print $1}') + i=$(echo $deployment | awk '{print $2}') + + docker run --cpus=2 --cpuset-cpus=${cpus_numa[$j]} --cpuset-mems=$j -m 8g \ + --cap-add CAP_SYS_ADMIN --privileged=true -itd \ + --name redis-docker-bridge-numa$j-$i \ + -v /home/name/redis_image:/home -v /usr:/usr -v /mnt:/mnt \ + -v /lib/modules:/lib/modules -v /data:/data -v /etc:/etc \ + openeuler-22.03-lts-sp4 /bin/bash + + pid=$(docker inspect -f '{{.State.Pid}}' redis-docker-bridge-numa$j-$i) + vf=$((j * nr + i)) + ip_count=$((ip_count + 1)) + IP=${UNREACHABLE_IPS[$((ip_count))]} + + echo "vf: ${vf} IP: ${IP}" + + ln -sf /proc/$pid/ns/net /var/run/netns/redis-docker-bridge-numa$j-$i + ip link set enp24s0f0v$vf netns redis-docker-bridge-numa$j-$i + docker exec redis-docker-bridge-numa$j-$i ifconfig enp24s0f0v$vf $IP/16 + + docker exec -d redis-docker-bridge-numa$j-$i \ + /home/c00838100/redis-origin/src/redis-server \ + /home/c00838100/redis.conf --bind 0.0.0.0 --port 6379 + + while ! docker exec redis-docker-bridge-numa$j-$i ps -ef | grep -q "[r]edis-server"; do + sleep 0.5 + done + + pid=$(docker exec redis-docker-bridge-numa$j-$i pgrep -f redis-server) + core_array=(${cpus[$j]}) + cpu_core=${core_array[$((i * CPU_DIST))]} + docker exec redis-docker-bridge-numa$j-$i taskset -pc $cpu_core $pid + + vf_num=$vf + vf_dev=$(ls -la /sys/class/net/enp24s0f0np0/device/virtfn${vf_num} | awk '{print $11}' | sed "s|../||g") + irq_core=$((cpu_core + 1)) + + for irq in `cat /proc/interrupts | grep $vf_dev | awk -F ':' '{print $1}'`; do + echo $irq_core > /proc/irq/$irq/smp_affinity_list + done +done + +echo "部署完成! 模式: $mode, 容器数量: $((nr * (numa_end - numa_start + 1)))" diff --git a/tools/container/edit_client.sh b/tools/container/edit_client.sh new file mode 100644 index 000000000000..7242d49de753 --- /dev/null +++ b/tools/container/edit_client.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +source /home/name/common/env.sh + +connection=40 +data_len=3 +thread=50 +data_num=2000000 +data_num_large=200000000 + +mod=0 +for IP in "${CLIENT[@]}" +do +echo $IP + cp run_bk.sh run.sh + echo $mod + sed -i "s|xx|$mod|g" run.sh + sed -i "s|aa|$connection|g" run.sh + sed -i "s|bb|$data_len|g" run.sh + sed -i "s|cc|$thread|g" run.sh + sed -i "s|dd|$data_num_large|g" run.sh + + ssh root@$IP mkdir -p /home/name/common + scp /home/name/common/env.sh root@$IP:/home/name/common + scp run.sh root@$IP:/home/name/redis/client/ + mod=$((mod + 1)) +done + +cp run_bk_117.sh run_117.sh +sed -i "s|aa|$connection|g" run_117.sh +sed -i "s|bb|$data_len|g" run_117.sh +sed -i "s|cc|$thread|g" run_117.sh +sed -i "s|dd|$data_num|g" run_117.sh +scp run_117.sh root@$CLIENT_OBSERVE:/home/name/redis/client/run.sh diff --git a/tools/container/env.sh b/tools/container/env.sh new file mode 100644 index 000000000000..8ec051d67708 --- /dev/null +++ b/tools/container/env.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +CPU_DIST=4 + +cpus_numa=( +"0-79" // todo +) + +vf_core=317 // todo +redis_core=316 + +numa_start=0 +numa_end=3 + +cpus=( +"0 1"// todo +"80 81" +) + +CLIENT=( +ip1 // todo +ip2 // todo +) + +count=80 +CLIENT_OBSERVE=ip3 // todo + +UNREACHABLE_IPS=( +ip1 // todo +ip2 // todo +) diff --git a/tools/container/get_specific.sh b/tools/container/get_specific.sh new file mode 100644 index 000000000000..4bbbdac6e0b2 --- /dev/null +++ b/tools/container/get_specific.sh @@ -0,0 +1,19 @@ +nr=$1 +DIST=4 + +dir=/home/name/redis_image/test_inbalance_new/result +echo "****************" +cat ${dir}/test_1/log_specific | grep throughput | awk '{print $3}' +for i in $(seq 1 $nr); do +cat ${dir}/test_$((i * DIST))/log_specific | grep throughput | awk '{print $3}' +done +echo "****************" +cat ${dir}/test_1/log_specific | grep -A 2 "latency summary" | tail -n 1 | awk '{print $1}' +for i in $(seq 1 $nr); do +cat ${dir}/test_$((i * DIST))/log_specific | grep -A 2 "latency summary" | tail -n 1 | awk '{print $1}' +done +echo "****************" +cat ${dir}/test_1/log_specific | grep -A 2 "latency summary" | tail -n 1 | awk '{print $5}' +for i in $(seq 1 $nr); do +cat ${dir}/test_$((i * DIST))/log_specific | grep -A 2 "latency summary" | tail -n 1 | awk '{print $5}' +done diff --git a/tools/container/run_all.sh b/tools/container/run_all.sh new file mode 100644 index 000000000000..33d40b7d397e --- /dev/null +++ b/tools/container/run_all.sh @@ -0,0 +1,13 @@ +source /home/name/common/env.sh + +rm -rf result/test* +ssh root@$CLIENT_OBSERVE rm -rf /home/name/redis/client/test* +nr=$1 + +sh runc_parallel.sh 1 +sleep 3 + +for i in $(seq 1 $nr); do +sh runc_parallel.sh $((i * 4)) +sleep 3 +done diff --git a/tools/container/run_bk.sh b/tools/container/run_bk.sh new file mode 100644 index 000000000000..794d390b536e --- /dev/null +++ b/tools/container/run_bk.sh @@ -0,0 +1,16 @@ +nr=$1 + +source /home/name/common/env.sh +dir=/home/name/redis/client/test_$((nr + 1)) + +rm -rf $dir +mkdir $dir + +for (( i=1; i<=$nr; i++ )) +do + if [ $((i % 4)) -eq xx ]; then + redis-benchmark -h ${UNREACHABLE_IPS[$i]} -p 6379 -c aa -d bb -n dd -r 10000000 -t get --threads cc > $dir/log_${i} & +# redis-benchmark -h ${UNREACHABLE_IPS[$((80-i))]} -p 6379 -c aa -d bb -n dd -r 10000000 -t get --threads cc > $dir/log_${i} & +fi +done +wait diff --git a/tools/container/run_bk_117.sh b/tools/container/run_bk_117.sh new file mode 100644 index 000000000000..16315a256632 --- /dev/null +++ b/tools/container/run_bk_117.sh @@ -0,0 +1,7 @@ +nr=$1 +IP=ip_observe // todo + +#sleep 8 +rm -rf /home/name/redis/client/test_$nr +mkdir /home/name/redis/client/test_$nr +redis-benchmark -h $IP -p 6379 -c aa -d bb -n dd -r 10000000 -t get --threads cc > /home/name/redis/client/test_$nr/log_specific diff --git a/tools/container/runc_parallel.sh b/tools/container/runc_parallel.sh new file mode 100644 index 000000000000..47b48e88e703 --- /dev/null +++ b/tools/container/runc_parallel.sh @@ -0,0 +1,41 @@ +nr=$1 + +source /home/name/common/env.sh +sh client_kill.sh +function cleanup() { +ssh root@$CLIENT_OBSERVE "rm -rf /home/name/redis/client/test_*" +for IP in "${CLIENT[@]}" +do + ssh root@$IP "rm -rf /home/name/redis/client/test_*" +done +} + +function copy() { +scp -r root@$CLIENT_OBSERVE:/home/name/redis/client/test_$((nr + 1)) result +for IP in "${CLIENT[@]}" +do + scp -r root@$IP:/home/name/redis/client/test_$((nr + 1)) result &> /dev/null +done +} + +function stress() { +nr=$1 +for IP in "${CLIENT[@]}" +do +echo -n $IP + ssh root@$IP "sh /home/name/redis/client/run.sh $nr" & +echo done +done +} + +nr=$((nr - 1)) + +cleanup +stress $nr +sleep 2 +ssh root@$CLIENT_OBSERVE "sh /home/name/redis/client/run.sh $((nr + 1))" + +sleep 15 +mkdir result +copy +cat result/test_$((nr + 1))/log_specific | grep -A 4 throughput diff --git a/tools/container/usage.rst b/tools/container/usage.rst new file mode 100644 index 000000000000..beb2593b8142 --- /dev/null +++ b/tools/container/usage.rst @@ -0,0 +1,56 @@ +镜像下载：wget https://dl-cdn.openeuler.openatom.cn/openEuler-22.03-LTS-SP4/docker_img/aar… +导入容器镜像：docker load < ./openEuler-docker.aarch64.tar.xz +redis下载：https://redis.io/downloads/ 版本6.2 +修改点： +protected-mode no +daemonize yes +cd redis-xx && make && make install + +# 1. runc +基线测试方法： 6.6.0-92.0.0.96.oe2403sp2.aarch64 +1. 硬件：服务器，CX5双网口网卡共160个vf +2. redis容器：每个2u8g容器1个核绑定redis实例，另1个核绑定VF中断；且两个核同属一个SMT +3. 部署方式：numa 3的最后一个cluster部署1个观察容器，其他背景容器按顺序部署在numa 0-3 +4. 客户端：一台客户端单独加压观察容器，保证客户端不是瓶颈；其他四台客户端加压背景容器 +5. 组网方式：每个容器一个VF + +echo 80 > /sys/class/net/enp24s0f0np0/device/sriov_numvfs +echo 80 > /sys/class/net/enp24s0f1np1/device/sriov_numvfs +cd /home/name/redis_image/test_inbalance_refactor +sh create_runc_passthrough.sh 20 + +# 同时跑4个redis +sh runc_parallel.sh 4 +# 同时跑80个redis +sh runc_parallel.sh 80 + +# 2. vm：6.6.0-95.0.0 +1. BIOS配置：开启SMMU、开启GiCv4.1 +2. 服务器内核配置：开启中断直通kvm-arm.vgic_v4_enable=1、1G大页：default_hugepagesz=1G hugepagesz=1G +3. 虚拟机规格：2台虚机，单虚机2个numa，160U，240G内存，40个VF直通网卡 +4. host和虚拟机内开启调度策略优化（echo IRQ_AVG > /sys/kernel/debug/sched/features） + + +smt开关：Advanced -> AMD CBS-> CPU Common Options -> performance -> SMU Common Options +IOMMU开关：Advanced -> AMD CBS-> NBIO Common Options -> IOMMU/security -> IOMMU + +分配大页： +echo 120 > /sys/devices/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages +echo 120 > /sys/devices/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages +echo 120 > /sys/devices/system/node/node2/hugepages/hugepages-1048576kB/nr_hugepages +echo 120 > /sys/devices/system/node/node3/hugepages/hugepages-1048576kB/nr_hugepages + +virsh create /home/name/vms/vm1/vm1.xml +virsh create /home/name/vms/vm2/vm2.xml + +ssh root@vm_ip1 +cd /home/name/redis_image/test_inbalance_refactor +sh create_runc_passthrough.sh 20 + +ssh root@vm_ip2 +cd /home/name/redis_image/test_inbalance_refactor +sh create_runc_passthrough.sh 20 + +# host上 +cd /home/name/redis_image/test_inbalance_refactor +sh runc_parallel.sh 80 -- 2.33.0

2 1

[PATCH OLK-6.6] vsock/virtio: Validate length in packet header before skb_put()
by Ziming Du 16 Sep '25

16 Sep '25

From: Will Deacon <will(a)kernel.org> mainline inclusion from mainline-v6.17-rc1 commit 0dab92484474587b82e8e0455839eaf5ac7bf894 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICWO1M CVE: CVE-2025-39718 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- When receiving a vsock packet in the guest, only the virtqueue buffer size is validated prior to virtio_vsock_skb_rx_put(). Unfortunately, virtio_vsock_skb_rx_put() uses the length from the packet header as the length argument to skb_put(), potentially resulting in SKB overflow if the host has gone wonky. Validate the length as advertised by the packet header before calling virtio_vsock_skb_rx_put(). Cc: <stable(a)vger.kernel.org> Fixes: 71dc9ec9ac7d ("virtio/vsock: replace virtio_vsock_pkt with sk_buff") Signed-off-by: Will Deacon <will(a)kernel.org> Message-Id: <20250717090116.11987-3-will(a)kernel.org> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Reviewed-by: Stefano Garzarella <sgarzare(a)redhat.com> Signed-off-by: Ziming Du <duziming2(a)huawei.com> --- net/vmw_vsock/virtio_transport.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index 2925f5d27ad3f..c4877cb7a5737 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -497,8 +497,9 @@ static void virtio_transport_rx_work(struct work_struct *work) do { virtqueue_disable_cb(vq); for (;;) { + unsigned int len, payload_len; + struct virtio_vsock_hdr *hdr; struct sk_buff *skb; - unsigned int len; if (!virtio_transport_more_replies(vsock)) { /* Stop rx until the device processes already @@ -515,12 +516,19 @@ static void virtio_transport_rx_work(struct work_struct *work) vsock->rx_buf_nr--; /* Drop short/long packets */ - if (unlikely(len < sizeof(struct virtio_vsock_hdr) || + if (unlikely(len < sizeof(*hdr) || len > virtio_vsock_skb_len(skb))) { kfree_skb(skb); continue; } + hdr = virtio_vsock_hdr(skb); + payload_len = le32_to_cpu(hdr->len); + if (unlikely(payload_len > len - sizeof(*hdr))) { + kfree_skb(skb); + continue; + } + virtio_vsock_skb_rx_put(skb); virtio_transport_deliver_tap_pkt(skb); virtio_transport_recv_pkt(&virtio_transport, skb); -- 2.43.0

2 1

[PATCH OLK-6.6] pNFS: Fix uninited ptr deref in block/scsi layout
by Chen Jinghuang 16 Sep '25

16 Sep '25

From: Sergey Bashirov <sergeybashirov(a)gmail.com> stable inclusion from stable-v6.6.103 commit 24334f3cf8a294f253071b5bf22d754dbb6d0f2d category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICWGG2 CVE: CVE-2025-38691 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 9768797c219326699778fba9cd3b607b2f1e7950 ] The error occurs on the third attempt to encode extents. When function ext_tree_prepare_commit() reallocates a larger buffer to retry encoding extents, the "layoutupdate_pages" page array is initialized only after the retry loop. But ext_tree_free_commitdata() is called on every iteration and tries to put pages in the array, thus dereferencing uninitialized pointers. An additional problem is that there is no limit on the maximum possible buffer_size. When there are too many extents, the client may create a layoutcommit that is larger than the maximum possible RPC size accepted by the server. During testing, we observed two typical scenarios. First, one memory page for extents is enough when we work with small files, append data to the end of the file, or preallocate extents before writing. But when we fill a new large file without preallocating, the number of extents can be huge, and counting the number of written extents in ext_tree_encode_commit() does not help much. Since this number increases even more between unlocking and locking of ext_tree, the reallocated buffer may not be large enough again and again. Co-developed-by: Konstantin Evtushenko <koevtushenko(a)yandex.com> Signed-off-by: Konstantin Evtushenko <koevtushenko(a)yandex.com> Signed-off-by: Sergey Bashirov <sergeybashirov(a)gmail.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Link: https://lore.kernel.org/r/20250630183537.196479-2-sergeybashirov@gmail.com Signed-off-by: Trond Myklebust <trond.myklebust(a)hammerspace.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Chen Jinghuang <Chenjinghuang2(a)huawei.com> --- fs/nfs/blocklayout/extent_tree.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/fs/nfs/blocklayout/extent_tree.c b/fs/nfs/blocklayout/extent_tree.c index 8f7cff7a4293..0add0f329816 100644 --- a/fs/nfs/blocklayout/extent_tree.c +++ b/fs/nfs/blocklayout/extent_tree.c @@ -552,6 +552,15 @@ static int ext_tree_encode_commit(struct pnfs_block_layout *bl, __be32 *p, return ret; } +/** + * ext_tree_prepare_commit - encode extents that need to be committed + * @arg: layout commit data + * + * Return values: + * %0: Success, all required extents are encoded + * %-ENOSPC: Some extents are encoded, but not all, due to RPC size limit + * %-ENOMEM: Out of memory, extents not encoded + */ int ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg) { @@ -568,12 +577,12 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg) start_p = page_address(arg->layoutupdate_page); arg->layoutupdate_pages = &arg->layoutupdate_page; -retry: - ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, &count, &arg->lastbytewritten); + ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, + &count, &arg->lastbytewritten); if (unlikely(ret)) { ext_tree_free_commitdata(arg, buffer_size); - buffer_size = ext_tree_layoutupdate_size(bl, count); + buffer_size = NFS_SERVER(arg->inode)->wsize; count = 0; arg->layoutupdate_pages = @@ -588,7 +597,8 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg) return -ENOMEM; } - goto retry; + ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, + &count, &arg->lastbytewritten); } *start_p = cpu_to_be32(count); @@ -608,7 +618,7 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg) } dprintk("%s found %zu ranges\n", __func__, count); - return 0; + return ret; } void -- 2.34.1

2 1

[PATCH OLK-6.6] media: uvcvideo: Fix 1-byte out-of-bounds read in uvc_parse_format()
by Huang Xiaojia 16 Sep '25

16 Sep '25

From: Youngjun Lee <yjjuny.lee(a)samsung.com> stable inclusion from stable-v6.6.103 commit a97e062e4ff3dab84a2f1eb811e9eddc6699e2a9 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICWGIM CVE: CVE-2025-38680 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 782b6a718651eda3478b1824b37a8b3185d2740c upstream. The buffer length check before calling uvc_parse_format() only ensured that the buffer has at least 3 bytes (buflen > 2), buf the function accesses buffer[3], requiring at least 4 bytes. This can lead to an out-of-bounds read if the buffer has exactly 3 bytes. Fix it by checking that the buffer has at least 4 bytes in uvc_parse_format(). Signed-off-by: Youngjun Lee <yjjuny.lee(a)samsung.com> Reviewed-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Fixes: c0efd232929c ("V4L/DVB (8145a): USB Video Class driver") Cc: stable(a)vger.kernel.org Reviewed-by: Ricardo Ribalda <ribalda(a)chromium.org> Link: https://lore.kernel.org/r/20250610124107.37360-1-yjjuny.lee@samsung.com Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil(a)xs4all.nl> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Huang Xiaojia <huangxiaojia2(a)huawei.com> --- drivers/media/usb/uvc/uvc_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index ae2e8bd2b3f7..1a6a3c1cb4ae 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -235,6 +235,9 @@ static int uvc_parse_format(struct uvc_device *dev, unsigned int i, n; u8 ftype; + if (buflen < 4) + return -EINVAL; + format->type = buffer[2]; format->index = buffer[3]; format->frames = frames; -- 2.34.1

2 1