Projects
home:xmzzz:branches:openEuler:24.03
kernel
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 78
View file
_service:tar_scm:kernel-rt.spec
Changed
@@ -40,10 +40,10 @@ %global upstream_version 6.6 %global upstream_sublevel 0 -%global devel_release 27 +%global devel_release 38 %global maintenance_release .0.0 -%global pkg_release .4 -%global rt_release .rt30 +%global pkg_release .5 +%global rt_release .rt35 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -1057,6 +1057,9 @@ %endif %changelog +* Thu Aug 22 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0-38.0.0.5 +- update kernel-rt version to 6.6.0-38.0.0.5 + * Tue May 21 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0-27.0.0.4 - update kernel-rt version to 6.6.0-27.0.0.3
View file
_service:tar_scm:kernel.spec
Changed
@@ -6,6 +6,7 @@ %if %{with toolchain_clang} %global toolchain clang +%define with_kabichk 0 %endif %bcond_with clang_lto @@ -42,7 +43,7 @@ %global upstream_sublevel 0 %global devel_release 41 %global maintenance_release .0.0 -%global pkg_release .49 +%global pkg_release .53 %global openeuler_lts 1 %global openeuler_major 2403 @@ -445,7 +446,7 @@ %{openEuler_check_EBS_perm} if $openEuler_has_sign_perm -eq 1 ; then cp %{SOURCE15} ./certs/openeuler-cert.pem - # close kernel native signature + # close kernel native signature sed -i 's/CONFIG_MODULE_SIG_KEY=.*$/CONFIG_MODULE_SIG_KEY=""/g' .config sed -i 's/CONFIG_SYSTEM_TRUSTED_KEYS=.*$/CONFIG_SYSTEM_TRUSTED_KEYS="certs\/openeuler-cert.pem"/g' .config sed -i 's/CONFIG_MODULE_SIG_ALL=y$/CONFIG_MODULE_SIG_ALL=n/g' .config @@ -1089,11 +1090,14 @@ %endif %changelog -* Fri Sep 13 2024 Mingzheng Xing <xingmingzheng@iscas.ac.cn> - 6.6.0-41.0.0.49 +* Fri Sep 13 2024 Mingzheng Xing <xingmingzheng@iscas.ac.cn> - 6.6.0-41.0.0.51 - riscv kernel upgrade to 6.6.0-41.0.0 - Enable device mapper related configs to fix ISO image booting issue for RISC-V -* Fri Sep 06 2024 ZhangPeng <zhangpeng362@huawei.com> - 6.6.0-41.0.0.48 +* Fri Sep 13 2024 Taoxy2004 <221870066@smail.nju.edu.cn> - 6.6.0-41.0.0.50 +- tools: Add dynamic process-level cgroup memory monitoring tool + +* Fri Sep 06 2024 ZhangPeng <zhangpeng362@huawei.com> - 6.6.0-41.0.0.49 - !11443 v2 drm/amd/display: Fix null pointer deref in dcn20_resource.c - drm/amd/display: Fix null pointer deref in dcn20_resource.c - !11433 ext4: Track data blocks freeing operation in journal @@ -1231,6 +1235,9 @@ - mm: make HPAGE_PXD_* macros even if !THP - mm/Kconfig: CONFIG_PGTABLE_HAS_HUGE_LEAVES +* Wed Aug 28 2024 Luo Feng <luofeng13@huawei.com> - 6.6.0-39.0.0.48 +- When compiling with clang, skip the kabi check. + * Tue Aug 27 2024 ZhangPeng <zhangpeng362@huawei.com> - 6.6.0-39.0.0.47 - !11156 v3 Fix CVE-2024-43869 - perf: Fix kabi broken of struct perf_event
View file
_service:tar_scm:raspberrypi-kernel-rt.spec
Changed
@@ -2,13 +2,13 @@ %global KernelVer %{version}-%{release}.raspi.%{_target_cpu} -%global hulkrelease 26.0.0 +%global hulkrelease 38.0.0 %global debug_package %{nil} Name: raspberrypi-kernel-rt Version: 6.6.0 -Release: %{hulkrelease}.rt.1 +Release: %{hulkrelease}.rt.3 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -265,6 +265,10 @@ %changelog +* Thu Aug 22 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0.38.0.3 +- - update Rpi:preempt-RT to openEuler 6.6.0.38.0.0 + + * Wed May 15 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0.25.0.0 - - update Rpi:preempt-RT to openEuler 6.6.0.25.0.0 @@ -2889,4 +2893,4 @@ - package init based on openEuler 5.10.0-5.3.0 * Mon Aug 9 2021 Yafen Fang<yafen@iscas.ac.cn> - 5.10.0-5.1.0.1 -- package init based on openEuler 5.10.0-5.1.0 \ No newline at end of file +- package init based on openEuler 5.10.0-5.1.0
View file
_service:tar_scm:raspberrypi-kernel.spec
Changed
@@ -2,13 +2,13 @@ %global KernelVer %{version}-%{release}.raspi.%{_target_cpu} -%global hulkrelease 28.0.0 +%global hulkrelease 39.0.0 %global debug_package %{nil} Name: raspberrypi-kernel Version: 6.6.0 -Release: %{hulkrelease}.5 +Release: %{hulkrelease}.7 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -260,6 +260,12 @@ /usr/src/kernels/%{KernelVer} %changelog +* Fri Aug 30 2024 Yafen Fang <yafen@iscas.ac.cn> - 6.6.0-39.0.0.7 +- update kernel version to openEuler 6.6.0-39.0.0 + +* Sat Aug 17 2024 Yafen Fang <yafen@iscas.ac.cn> - 6.6.0-38.0.0.6 +- update kernel version to openEuler 6.6.0-38.0.0 + * Wed May 29 2024 Yafen Fang <yafen@iscas.ac.cn> - 6.6.0-28.0.0.5 - update kernel version to openEuler 6.6.0-28.0.0
View file
_service:tar_scm:0000-raspberrypi-kernel.patch
Changed
@@ -1,7 +1,7 @@ -From 42a6a0e9bca5d03c3bbc4104eb93025153d4cfee Mon Sep 17 00:00:00 2001 +From c1e3be3d366faf8c19e493071f7c7a2297558c82 Mon Sep 17 00:00:00 2001 From: Yafen <yafen@iscas.ac.cn> -Date: Wed, 15 May 2024 06:23:21 +0800 -Subject: PATCH apply RPi patch of 6.6.30 (openEuler 6.6.0-26.0.0) +Date: Sat, 17 Aug 2024 20:06:31 +0800 +Subject: PATCH apply RPi patch of 6.6.30 (openEuler 6.6.0-39.0.0) --- .../admin-guide/media/bcm2835-isp.rst | 127 + @@ -47,7 +47,7 @@ .../devicetree/bindings/vendor-prefixes.txt | 463 ++ .../devicetree/bindings/vendor-prefixes.yaml | 6 + .../devicetree/configfs-overlays.txt | 31 + - Documentation/driver-api/pwm.rst | 17 +- + Documentation/driver-api/pwm.rst | 9 + .../userspace-api/media/drivers/index.rst | 1 + .../userspace-api/media/v4l/meta-formats.rst | 2 + .../v4l/pixfmt-meta-bcm2835-isp-stats.rst | 41 + @@ -540,7 +540,7 @@ drivers/dma/Makefile | 1 + drivers/dma/bcm2708-dmaengine.c | 281 + drivers/dma/bcm2835-dma.c | 735 +- - .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 137 +- + .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 135 +- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + drivers/firmware/psci/psci.c | 9 +- drivers/firmware/raspberrypi.c | 149 +- @@ -565,13 +565,12 @@ drivers/gpu/drm/drm_fb_helper.c | 11 +- drivers/gpu/drm/drm_modes.c | 5 +- drivers/gpu/drm/drm_probe_helper.c | 5 +- - .../gpu/drm/i915/display/intel_backlight.c | 6 +- drivers/gpu/drm/i915/display/intel_display.c | 13 + drivers/gpu/drm/msm/msm_atomic.c | 2 + drivers/gpu/drm/panel/Kconfig | 32 + drivers/gpu/drm/panel/Makefile | 3 + drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 484 ++ - drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 955 ++- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 949 ++- .../gpu/drm/panel/panel-jdi-lt070me05000.c | 19 +- .../drm/panel/panel-raspberrypi-touchscreen.c | 44 +- drivers/gpu/drm/panel/panel-simple.c | 238 +- @@ -599,7 +598,6 @@ drivers/gpu/drm/rp1/rp1-vec/rp1_vec_cfg.c | 508 ++ drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c | 568 ++ drivers/gpu/drm/rp1/rp1-vec/vec_regs.h | 1420 ++++ - drivers/gpu/drm/solomon/ssd130x.c | 2 +- drivers/gpu/drm/tiny/ili9486.c | 1 - drivers/gpu/drm/v3d/v3d_bo.c | 12 +- drivers/gpu/drm/v3d/v3d_debugfs.c | 258 +- @@ -625,7 +623,7 @@ drivers/gpu/drm/vc4/vc4_dsi.c | 98 +- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 2077 +++++ drivers/gpu/drm/vc4/vc4_gem.c | 24 +- - drivers/gpu/drm/vc4/vc4_hdmi.c | 216 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 217 +- drivers/gpu/drm/vc4/vc4_hdmi.h | 31 + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 640 ++ drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 222 +- @@ -650,7 +648,7 @@ drivers/hwmon/aht10.c | 7 + drivers/hwmon/ds1621.c | 10 + drivers/hwmon/emc2305.c | 95 +- - drivers/hwmon/pwm-fan.c | 67 +- + drivers/hwmon/pwm-fan.c | 59 +- drivers/hwmon/rp1-adc.c | 307 + drivers/hwmon/sht3x.c | 12 +- drivers/i2c/busses/Kconfig | 19 + @@ -668,10 +666,6 @@ drivers/input/joystick/Kconfig | 8 + drivers/input/joystick/Makefile | 1 + drivers/input/joystick/rpisense-js.c | 153 + - drivers/input/misc/da7280.c | 4 +- - drivers/input/misc/pwm-beeper.c | 4 +- - drivers/input/misc/pwm-vibra.c | 8 +- - drivers/input/touchscreen/ads7846.c | 11 + drivers/input/touchscreen/edt-ft5x06.c | 124 +- drivers/input/touchscreen/goodix.c | 75 +- drivers/input/touchscreen/goodix.h | 5 + @@ -688,8 +682,6 @@ drivers/irqchip/irq-bcm2836.c | 28 +- drivers/irqchip/irq-brcmstb-l2.c | 17 + drivers/leds/leds-gpio.c | 17 +- - drivers/leds/leds-pwm.c | 2 +- - drivers/leds/rgb/leds-pwm-multicolor.c | 4 +- drivers/leds/trigger/Kconfig | 18 + drivers/leds/trigger/Makefile | 2 + drivers/leds/trigger/ledtrig-actpwr.c | 190 + @@ -750,7 +742,7 @@ .../platform/raspberrypi/rp1_cfe/pisp_types.h | 144 + drivers/media/platform/video-mux.c | 73 +- drivers/media/rc/Kconfig | 1 + - drivers/media/rc/pwm-ir-tx.c | 87 +- + drivers/media/rc/pwm-ir-tx.c | 83 +- drivers/media/spi/Kconfig | 1 + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1 + @@ -787,7 +779,7 @@ drivers/mmc/host/sdhci-pltfm.h | 3 + drivers/mmc/host/sdhci.c | 36 +- drivers/mmc/host/sdhci.h | 9 + - .../net/ethernet/broadcom/genet/bcmgenet.c | 45 +- + .../net/ethernet/broadcom/genet/bcmgenet.c | 29 +- .../net/ethernet/broadcom/genet/bcmgenet.h | 2 +- drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +- drivers/net/ethernet/cadence/macb.h | 25 + @@ -800,7 +792,7 @@ drivers/net/phy/broadcom.c | 48 +- drivers/net/phy/microchip.c | 27 + drivers/net/usb/lan78xx.c | 64 +- - drivers/net/usb/smsc95xx.c | 51 +- + drivers/net/usb/smsc95xx.c | 45 +- .../broadcom/brcm80211/brcmfmac/bus.h | 2 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 364 +- .../broadcom/brcm80211/brcmfmac/cfg80211.h | 18 + @@ -841,7 +833,6 @@ drivers/pinctrl/bcm/pinctrl-bcm2712.c | 1247 +++ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 44 +- drivers/pinctrl/pinctrl-rp1.c | 1605 ++++ - drivers/platform/x86/lenovo-yogabook.c | 2 +- drivers/pmdomain/bcm/bcm2835-power.c | 29 +- drivers/power/reset/gpio-poweroff.c | 21 +- drivers/power/supply/Kconfig | 7 + @@ -851,17 +842,13 @@ drivers/pps/pps.c | 6 +- drivers/pwm/Kconfig | 9 + drivers/pwm/Makefile | 1 + - drivers/pwm/core.c | 74 +- + drivers/pwm/core.c | 62 +- drivers/pwm/pwm-bcm2835.c | 59 +- drivers/pwm/pwm-raspberrypi-poe.c | 81 +- drivers/pwm/pwm-renesas-tpu.c | 1 - drivers/pwm/pwm-rp1.c | 203 + - drivers/pwm/pwm-twl-led.c | 2 +- - drivers/pwm/pwm-vt8500.c | 2 +- - drivers/pwm/sysfs.c | 10 +- drivers/regulator/Kconfig | 10 + drivers/regulator/Makefile | 1 + - drivers/regulator/pwm-regulator.c | 4 +- .../regulator/rpi-panel-attiny-regulator.c | 27 +- drivers/regulator/rpi-panel-v2-regulator.c | 189 + drivers/reset/Kconfig | 2 +- @@ -952,7 +939,6 @@ drivers/usb/dwc3/core.h | 17 +- drivers/usb/dwc3/host.c | 9 +- drivers/usb/gadget/file_storage.c | 3676 +++++++++ - drivers/usb/gadget/function/uvc_configfs.c | 4 +- drivers/usb/host/Kconfig | 10 + drivers/usb/host/Makefile | 1 + drivers/usb/host/dwc_common_port/Makefile | 58 + @@ -1023,9 +1009,6 @@ drivers/usb/phy/phy-generic.c | 7 - drivers/video/backlight/Kconfig | 7 + drivers/video/backlight/Makefile | 1 + - drivers/video/backlight/lm3630a_bl.c | 2 +- - drivers/video/backlight/lp855x_bl.c | 2 +- - drivers/video/backlight/pwm_bl.c | 12 +- drivers/video/backlight/rpi_backlight.c | 119 + drivers/video/fbdev/Kconfig | 28 + drivers/video/fbdev/Makefile | 2 + @@ -1034,7 +1017,6 @@ drivers/video/fbdev/core/fb_defio.c | 3 +- drivers/video/fbdev/core/fbmem.c | 19 +- drivers/video/fbdev/rpisense-fb.c | 297 + - drivers/video/fbdev/ssd1307fb.c | 2 +- drivers/video/logo/logo_linux_clut224.ppm | 2483 ++---- drivers/w1/masters/w1-gpio.c | 15 +- drivers/w1/w1.c | 2 + @@ -1062,7 +1044,7 @@ include/linux/mmc/sd.h | 12 + include/linux/module.h | 2 +- include/linux/platform_data/dma-bcm2708.h | 143 + - include/linux/pwm.h | 57 +- + include/linux/pwm.h | 29 +- include/linux/rp1_platform.h | 20 + include/linux/usb.h | 2 + include/linux/usb/hcd.h | 7 + @@ -1139,7 +1121,7 @@ sound/soc/soc-core.c | 14 +- sound/usb/card.c | 8 +- sound/usb/quirks.c | 2 + - 1135 files changed, 230272 insertions(+), 4326 deletions(-) + 1117 files changed, 230176 insertions(+), 4250 deletions(-) create mode 100644 Documentation/admin-guide/media/bcm2835-isp.rst create mode 100644 Documentation/devicetree/bindings/display/panel/panel-dsi.yaml create mode 100644 Documentation/devicetree/bindings/hwmon/microchip,emc2305.yaml @@ -4475,16 +4457,10 @@ +intended to be used by hardware managers in the kernel, while the copy interface +make sense for developers (since it avoids problems with namespaces). diff --git a/Documentation/driver-api/pwm.rst b/Documentation/driver-api/pwm.rst -index 3fdc95f7a1d1..c68ed828fba9 100644 +index ed5ec9816538..c68ed828fba9 100644 --- a/Documentation/driver-api/pwm.rst +++ b/Documentation/driver-api/pwm.rst -@@ -41,11 +41,20 @@ the getter, devm_pwm_get() and devm_fwnode_pwm_get(), also exist. - - After being requested, a PWM has to be configured using:: -
View file
_service:tar_scm:0001-raspberrypi-kernel-RT.patch
Changed
@@ -1,7 +1,7 @@ -From a8b87098c93aa630d286de4af9637a247d55a370 Mon Sep 17 00:00:00 2001 +From b000137e06f399ac756aa2374e77e724d245f19c Mon Sep 17 00:00:00 2001 From: zhangyu <zhangyu4@kylinos.cn> -Date: Fri, 17 May 2024 15:06:01 +0800 -Subject: PATCH rpi-rt +Date: Thu, 22 Aug 2024 09:32:29 +0800 +Subject: PATCH rt-patrch --- arch/arm/Kconfig | 6 +- @@ -32,7 +32,7 @@ drivers/gpu/drm/i915/Kconfig | 1 - drivers/gpu/drm/i915/display/intel_crtc.c | 15 +- drivers/gpu/drm/i915/display/intel_vblank.c | 6 +- - drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 5 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 7 +- .../drm/i915/gt/intel_execlists_submission.c | 17 +- drivers/gpu/drm/i915/gt/intel_reset.c | 12 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +- @@ -155,10 +155,10 @@ kernel/sched/core.c | 127 +- kernel/sched/debug.c | 19 + kernel/sched/fair.c | 49 +- - kernel/sched/features.h | 2 +- + kernel/sched/features.h | 2 + kernel/sched/idle.c | 3 +- kernel/sched/rt.c | 5 +- - kernel/sched/sched.h | 1 + + kernel/sched/sched.h | 3 +- kernel/signal.c | 30 +- kernel/softirq.c | 95 +- kernel/time/hrtimer.c | 4 +- @@ -168,11 +168,11 @@ kernel/trace/trace_output.c | 16 +- net/core/dev.c | 39 +- net/core/skbuff.c | 7 +- - 164 files changed, 5041 insertions(+), 1542 deletions(-) + 164 files changed, 5047 insertions(+), 1540 deletions(-) create mode 100644 kernel/printk/nbcon.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 2483ce304..52707a682 100644 +index 749935e2e..46910150c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -34,6 +34,7 @@ config ARM @@ -234,7 +234,7 @@ return 0; } diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c -index a1ff693e4..adcc34042 100644 +index 7e8773a2d..9fde36fcb 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -55,6 +55,34 @@ extern unsigned int VFP_arch_feroceon __alias(VFP_arch); @@ -272,7 +272,7 @@ /* * Is 'thread's most up to date state stored in this CPUs hardware? * Must be called from non-preemptible context. -@@ -243,7 +271,7 @@ static void vfp_panic(char *reason, u32 inst) +@@ -240,7 +268,7 @@ static void vfp_panic(char *reason, u32 inst) /* * Process bitmask of exception conditions. */ @@ -281,7 +281,7 @@ { int si_code = 0; -@@ -251,8 +279,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ +@@ -248,8 +276,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ if (exceptions == VFP_EXCEPTION_ERROR) { vfp_panic("unhandled bounce", inst); @@ -291,7 +291,7 @@ } /* -@@ -280,8 +307,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ +@@ -277,8 +304,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ RAISE(FPSCR_OFC, FPSCR_OFE, FPE_FLTOVF); RAISE(FPSCR_IOC, FPSCR_IOE, FPE_FLTINV); @@ -301,7 +301,7 @@ } /* -@@ -327,6 +353,8 @@ static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs) +@@ -324,6 +350,8 @@ static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs) static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) { u32 fpscr, orig_fpscr, fpsid, exceptions; @@ -310,7 +310,7 @@ pr_debug("VFP: bounce: trigger %08x fpexc %08x\n", trigger, fpexc); -@@ -372,8 +400,8 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) +@@ -369,8 +397,8 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) * unallocated VFP instruction but with FPSCR.IXE set and not * on VFP subarch 1. */ @@ -321,7 +321,7 @@ } /* -@@ -397,14 +425,14 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) +@@ -394,14 +422,14 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) */ exceptions = vfp_emulate_instruction(trigger, fpscr, regs); if (exceptions) @@ -338,7 +338,7 @@ /* * The barrier() here prevents fpinst2 being read -@@ -416,7 +444,13 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) +@@ -413,7 +441,13 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) emulate: exceptions = vfp_emulate_instruction(trigger, orig_fpscr, regs); if (exceptions) @@ -353,7 +353,7 @@ } static void vfp_enable(void *unused) -@@ -518,11 +552,9 @@ static inline void vfp_pm_init(void) { } +@@ -512,11 +546,9 @@ static inline void vfp_pm_init(void) { } */ void vfp_sync_hwstate(struct thread_info *thread) { @@ -367,7 +367,7 @@ u32 fpexc = fmrx(FPEXC); /* -@@ -534,8 +566,7 @@ void vfp_sync_hwstate(struct thread_info *thread) +@@ -527,8 +559,7 @@ void vfp_sync_hwstate(struct thread_info *thread) fmxr(FPEXC, fpexc); } @@ -377,7 +377,7 @@ } /* Ensure that the thread reloads the hardware VFP state on the next use. */ -@@ -695,7 +726,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) +@@ -683,7 +714,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) if (!user_mode(regs)) return vfp_kmode_exception(regs, trigger); @@ -386,7 +386,7 @@ fpexc = fmrx(FPEXC); /* -@@ -760,6 +791,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) +@@ -748,6 +779,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) * replay the instruction that trapped. */ fmxr(FPEXC, fpexc); @@ -394,7 +394,7 @@ } else { /* Check for synchronous or asynchronous exceptions */ if (!(fpexc & (FPEXC_EX | FPEXC_DEX))) { -@@ -774,17 +806,17 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) +@@ -762,17 +794,17 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) if (!(fpscr & FPSCR_IXE)) { if (!(fpscr & FPSCR_LENGTH_MASK)) { pr_debug("not VFP\n"); @@ -414,7 +414,7 @@ return 0; } -@@ -831,7 +863,7 @@ void kernel_neon_begin(void) +@@ -819,7 +851,7 @@ void kernel_neon_begin(void) unsigned int cpu; u32 fpexc; @@ -423,7 +423,7 @@ /* * Kernel mode NEON is only allowed outside of hardirq context with -@@ -863,7 +895,7 @@ void kernel_neon_end(void) +@@ -850,7 +882,7 @@ void kernel_neon_end(void) { /* Disable the NEON/VFP unit. */ fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN); @@ -433,10 +433,10 @@ EXPORT_SYMBOL(kernel_neon_end); diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index bb49f48de..699c3f58a 100644 +index 501ec560a..eb0d9a8e0 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -98,6 +98,7 @@ config ARM64 +@@ -99,6 +99,7 @@ config ARM64 select ARCH_SUPPORTS_NUMA_BALANCING select ARCH_SUPPORTS_PAGE_TABLE_CHECK select ARCH_SUPPORTS_PER_VMA_LOCK @@ -531,7 +531,7 @@ select MPIC select OF_DYNAMIC diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c -index e8c412969..c61e29dea 100644
View file
_service:tar_scm:0001-riscv-kernel.patch
Changed
@@ -1,6 +1,6 @@ -From 4034fd3eaf28fe7589f7bd378750724c373112f3 Mon Sep 17 00:00:00 2001 +From aaddd46d5808e8a1c6c9c84b7478e3bf263e0c65 Mon Sep 17 00:00:00 2001 From: Mingzheng Xing <xingmingzheng@iscas.ac.cn> -Date: Fri, 13 Sep 2024 13:55:24 +0800 +Date: Wed, 18 Sep 2024 20:55:22 +0800 Subject: PATCH riscv kernel Signed-off-by: Mingzheng Xing <xingmingzheng@iscas.ac.cn> @@ -60,9 +60,10 @@ .../boot/dts/thead/th1520-lichee-pi-4a.dts | 840 ++ arch/riscv/boot/dts/thead/th1520.dtsi | 1226 ++- arch/riscv/configs/defconfig | 22 +- - arch/riscv/configs/openeuler_defconfig | 1779 +++- + arch/riscv/configs/openeuler_defconfig | 975 +- arch/riscv/configs/sg2042_defconfig | 9 + - arch/riscv/configs/th1520_defconfig | 398 + + arch/riscv/configs/th1520_defconfig | 399 + + arch/riscv/configs/th1520_oe_defconfig | 174 + arch/riscv/include/asm/barrier.h | 22 + arch/riscv/include/asm/errata_list.h | 32 +- arch/riscv/include/asm/io.h | 4 + @@ -896,7 +897,7 @@ .../riscv/thead/c900-legacy/firmware.json | 68 + .../riscv/thead/c900-legacy/instruction.json | 72 + .../riscv/thead/c900-legacy/microarch.json | 80 + - 891 files changed, 356155 insertions(+), 549 deletions(-) + 892 files changed, 355633 insertions(+), 442 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/thead,th1520-adc.yaml create mode 100644 Documentation/devicetree/bindings/iio/adc/xuantie,th1520-adc.yaml create mode 100644 Documentation/devicetree/bindings/mailbox/xuantie-th1520-mailbox.txt @@ -937,6 +938,7 @@ create mode 100644 arch/riscv/boot/dts/sophgo/mango.dtsi create mode 100644 arch/riscv/configs/sg2042_defconfig create mode 100644 arch/riscv/configs/th1520_defconfig + create mode 100644 arch/riscv/configs/th1520_oe_defconfig create mode 100644 arch/riscv/include/asm/membarrier.h create mode 100644 arch/riscv/include/asm/sync_core.h create mode 100644 drivers/clk/sophgo/Makefile @@ -12488,7 +12490,7 @@ +# TH1520 PMIC_WDT +CONFIG_TH1520_PMIC_WATCHDOG=y diff --git a/arch/riscv/configs/openeuler_defconfig b/arch/riscv/configs/openeuler_defconfig -index 026582613f2c..ba82a5f68da0 100644 +index 026582613f2c..4a08a469d50b 100644 --- a/arch/riscv/configs/openeuler_defconfig +++ b/arch/riscv/configs/openeuler_defconfig @@ -2,6 +2,7 @@ @@ -12499,36 +12501,7 @@ CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y -@@ -90,11 +91,12 @@ CONFIG_BPF_JIT_DEFAULT_ON=y - # CONFIG_BPF_SCHED is not set - # end of BPF subsystem - --CONFIG_PREEMPT_VOLUNTARY_BUILD=y -+CONFIG_PREEMPT_BUILD=y - # CONFIG_PREEMPT_NONE is not set --CONFIG_PREEMPT_VOLUNTARY=y --# CONFIG_PREEMPT is not set -+# CONFIG_PREEMPT_VOLUNTARY is not set -+CONFIG_PREEMPT=y - CONFIG_PREEMPT_COUNT=y -+CONFIG_PREEMPTION=y - # CONFIG_PREEMPT_DYNAMIC is not set - - # -@@ -123,10 +125,11 @@ CONFIG_CPU_ISOLATION=y - # RCU Subsystem - # - CONFIG_TREE_RCU=y -+CONFIG_PREEMPT_RCU=y - # CONFIG_RCU_EXPERT is not set - CONFIG_TREE_SRCU=y - CONFIG_TASKS_RCU_GENERIC=y --CONFIG_TASKS_RUDE_RCU=y -+CONFIG_TASKS_RCU=y - CONFIG_TASKS_TRACE_RCU=y - CONFIG_RCU_STALL_COMMON=y - CONFIG_RCU_NEED_SEGCBLIST=y -@@ -148,7 +151,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y +@@ -148,7 +149,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" @@ -12537,16 +12510,7 @@ CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y -@@ -226,7 +229,7 @@ CONFIG_SYSFS_SYSCALL=y - CONFIG_FHANDLE=y - CONFIG_POSIX_TIMERS=y - CONFIG_PRINTK=y --CONFIG_BUG=y -+# CONFIG_BUG is not set - CONFIG_ELF_CORE=y - CONFIG_BASE_FULL=y - CONFIG_FUTEX=y -@@ -244,6 +247,8 @@ CONFIG_KALLSYMS=y +@@ -244,6 +245,8 @@ CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y @@ -12555,48 +12519,28 @@ CONFIG_KCMP=y CONFIG_RSEQ=y CONFIG_CACHESTAT_SYSCALL=y -@@ -288,12 +293,11 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17 +@@ -288,6 +291,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17 CONFIG_RISCV_SBI=y CONFIG_MMU=y CONFIG_PAGE_OFFSET=0xff60000000000000 -+CONFIG_ARCH_FORCE_MAX_ORDER=15 ++CONFIG_ARCH_FORCE_MAX_ORDER=10 CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SUPPORTS_UPROBES=y - CONFIG_STACKTRACE_SUPPORT=y --CONFIG_GENERIC_BUG=y --CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y - CONFIG_GENERIC_CALIBRATE_DELAY=y - CONFIG_GENERIC_CSUM=y - CONFIG_GENERIC_HWEIGHT=y -@@ -306,13 +310,15 @@ CONFIG_RISCV_DMA_NONCOHERENT=y - # SoC selection - # - # CONFIG_SOC_MICROCHIP_POLARFIRE is not set --# CONFIG_ARCH_RENESAS is not set -+CONFIG_ARCH_RENESAS=y +@@ -309,10 +313,12 @@ CONFIG_RISCV_DMA_NONCOHERENT=y + # CONFIG_ARCH_RENESAS is not set CONFIG_ARCH_SIFIVE=y CONFIG_SOC_SIFIVE=y +CONFIG_ARCH_SOPHGO=y CONFIG_ARCH_STARFIVE=y CONFIG_SOC_STARFIVE=y --# CONFIG_ARCH_SUNXI is not set -+CONFIG_ARCH_SUNXI=y + # CONFIG_ARCH_SUNXI is not set CONFIG_ARCH_THEAD=y +CONFIG_ARCH_XUANTIE=y CONFIG_ARCH_VIRT=y CONFIG_SOC_VIRT=y # end of SoC selection -@@ -339,7 +345,7 @@ CONFIG_ARCH_RV64I=y - CONFIG_CMODEL_MEDANY=y - CONFIG_MODULE_SECTIONS=y - CONFIG_SMP=y --# CONFIG_SCHED_MC is not set -+CONFIG_SCHED_MC=y - CONFIG_NR_CPUS=512 - CONFIG_HOTPLUG_CPU=y - CONFIG_TUNE_GENERIC=y -@@ -351,9 +357,8 @@ CONFIG_RISCV_ISA_C=y +@@ -351,9 +357,10 @@ CONFIG_RISCV_ISA_C=y CONFIG_RISCV_ISA_SVNAPOT=y CONFIG_RISCV_ISA_SVPBMT=y CONFIG_TOOLCHAIN_HAS_V=y @@ -12604,41 +12548,13 @@ -CONFIG_RISCV_ISA_V_DEFAULT_ENABLE=y -CONFIG_RISCV_ISA_ZICBOM=y +# CONFIG_RISCV_ISA_V is not set ++CONFIG_TOOLCHAIN_HAS_ZBB=y ++CONFIG_RISCV_ISA_ZBB=y +# CONFIG_RISCV_ISA_ZICBOM is not set CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI=y -@@ -400,27 +405,17 @@ CONFIG_PORTABLE=y - # - # Power management options - # --CONFIG_SUSPEND=y --CONFIG_SUSPEND_FREEZER=y --# CONFIG_SUSPEND_SKIP_SYNC is not set --CONFIG_PM_SLEEP=y --CONFIG_PM_SLEEP_SMP=y --# CONFIG_PM_AUTOSLEEP is not set --# CONFIG_PM_USERSPACE_AUTOSLEEP is not set --# CONFIG_PM_WAKELOCKS is not set -+# CONFIG_SUSPEND is not set - CONFIG_PM=y - CONFIG_PM_DEBUG=y - # CONFIG_PM_ADVANCED_DEBUG is not set --# CONFIG_PM_TEST_SUSPEND is not set --CONFIG_PM_SLEEP_DEBUG=y - # CONFIG_DPM_WATCHDOG is not set - CONFIG_PM_CLK=y - CONFIG_PM_GENERIC_DOMAINS=y - # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set --CONFIG_PM_GENERIC_DOMAINS_SLEEP=y - CONFIG_PM_GENERIC_DOMAINS_OF=y - CONFIG_CPU_PM=y --# CONFIG_ENERGY_MODEL is not set -+CONFIG_ENERGY_MODEL=y - CONFIG_ARCH_SUSPEND_POSSIBLE=y - # end of Power management options - -@@ -471,6 +466,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
View file
_service:tar_scm:0001-tools-Add-dynamic-process-level-cgroup-memory-monito.patch
Added
@@ -0,0 +1,1780 @@ +From 7ebd40e68808f9a159d91c3de996e91cffcf3e20 Mon Sep 17 00:00:00 2001 +From: Taoxy2004 <221870066@smail.nju.edu.cn> +Date: Fri, 6 Sep 2024 10:37:55 +0800 +Subject: PATCH OLK-6.6 tools: Add dynamic process-level cgroup memory + monitoring tool + +community inclusion +category: feature +bugzilla: https://gitee.com/openeuler/open-source-summer/issues/I9JQ4D + +---------------------------------------------------------------------- + +This patch introduces a new tool called "probeCgroup" that enables dynamic +monitoring of memory usage at the process level within cgroups. By using +kprobes at relevant cgroup functions, this tool can track memory allocations +and deallocations for individual processes within a cgroup, providing detailed +statistics on memory usage. + +The key features of the tool include: +1. Dynamic insertion of kprobes at critical points in the cgroup subsystem. +2. Tracking memory allocation and deallocation events for each process by recording page addresses in a hash table. +3. Providing real-time statistics on memory usage at the process level. +4. Providing statistics on memory usage for processes that are OOM. + +Signed-off-by: Taoxy2004 <221870066@smail.nju.edu.cn> +--- + tools/probeCgroup/Makefile | 7 + + tools/probeCgroup/README.md | 29 + + tools/probeCgroup/probeCgroup.c | 612 ++++++++++++++++++ + tools/probeCgroup/probeCgroup.h | 415 ++++++++++++ + tools/probeCgroup/run.sh | 8 + + tools/probeCgroup/scripts/script1.sh | 10 + + tools/probeCgroup/scripts/script2.sh | 14 + + tools/probeCgroup/scripts/script3.sh | 11 + + .../testcases/1_load_unload_test.py | 24 + + .../testcases/2_multiple_process_test.py | 48 ++ + .../testcases/3_multiple_cgroup_test.py | 55 ++ + tools/probeCgroup/testcases/4_oom_test.py | 52 ++ + .../testcases/5_multiple_threads_test.py | 45 ++ + tools/probeCgroup/testcases/cgroup_utils.py | 114 ++++ + tools/probeCgroup/testcases/mem-allocate.c | 35 + + .../testcases/multiple-thread-mem-allocate.c | 60 ++ + tools/probeCgroup/testcases/run.py | 32 + + .../testcases/simple-mem-allocate.c | 27 + + 18 files changed, 1598 insertions(+) + create mode 100644 tools/probeCgroup/Makefile + create mode 100644 tools/probeCgroup/README.md + create mode 100644 tools/probeCgroup/probeCgroup.c + create mode 100644 tools/probeCgroup/probeCgroup.h + create mode 100755 tools/probeCgroup/run.sh + create mode 100755 tools/probeCgroup/scripts/script1.sh + create mode 100755 tools/probeCgroup/scripts/script2.sh + create mode 100755 tools/probeCgroup/scripts/script3.sh + create mode 100755 tools/probeCgroup/testcases/1_load_unload_test.py + create mode 100755 tools/probeCgroup/testcases/2_multiple_process_test.py + create mode 100755 tools/probeCgroup/testcases/3_multiple_cgroup_test.py + create mode 100755 tools/probeCgroup/testcases/4_oom_test.py + create mode 100755 tools/probeCgroup/testcases/5_multiple_threads_test.py + create mode 100644 tools/probeCgroup/testcases/cgroup_utils.py + create mode 100644 tools/probeCgroup/testcases/mem-allocate.c + create mode 100644 tools/probeCgroup/testcases/multiple-thread-mem-allocate.c + create mode 100755 tools/probeCgroup/testcases/run.py + create mode 100644 tools/probeCgroup/testcases/simple-mem-allocate.c + +diff --git a/tools/probeCgroup/Makefile b/tools/probeCgroup/Makefile +new file mode 100644 +index 000000000000..606c951e5487 +--- /dev/null ++++ b/tools/probeCgroup/Makefile +@@ -0,0 +1,7 @@ ++obj-m := probeCgroup.o ++CROSS_COMPILE = '' ++KDIR := /lib/modules/$(shell uname -r)/build ++all: ++ make -C $(KDIR) M=$(PWD) modules ++clean: ++ rm -f *.ko *.o *.mod *.mod.o *.mod.c .*.cmd *.symvers module* +diff --git a/tools/probeCgroup/README.md b/tools/probeCgroup/README.md +new file mode 100644 +index 000000000000..ff0b6fc21228 +--- /dev/null ++++ b/tools/probeCgroup/README.md +@@ -0,0 +1,29 @@ ++# probeCgroup ++ ++#### Description ++probeCgroup is a process-level cgroup memory monitoring tool based on dynamic tracing (kprobe/kretprobe) technology. By inserting kprobes and kretprobes at the entry and exit points of relevant cgroup functions, this tool can track the memory usage of individual processes within each cgroup in real time. ++ ++#### Software Architecture ++1. Dynamic Tracing : Insert kprobes and kretprobes at critical points in cgroup functions to capture memory allocation and release events. ++2. Hash Table Recording : Record the addresses of pages currently used by each process in a hash table, so that when a page is released, the process it belongs to can be identified. ++3. Real-Time Statistics : Provide real-time statistics showing the memory usage of individual processes within each cgroup. ++ ++#### Instruction ++1. Compile and Load the Module ++ a. In the 'probeCgroup' directory, run the 'make' command to compile the module. ++ b. Load the module: 'insmod probeCgroup.ko'. ++ c. View memory statistics: 'cat /proc/cgroup_memory_usage_per_process'. ++ If an OOM (Out of Memory) event occurs in a cgroup, you can see "oom:" followed by the process that experienced the OOM and its memory usage at the time. ++ ++2. Automate OOM Scenario ++ In the 'probeCgroup' directory, run './run.sh'. This script will automatically set up an OOM scenario and output the content of '/proc/cgroup_memory_usage_per_process' after execution. ++ ++3. Perform More Tests ++ a. After compiling the module, in the 'testcases' directory, run './run.py'. ++ b. This script will perform various tests, including: ++ - Loading and unloading the module ++ - Each cgroup containing multiple processes ++ - Creating multiple cgroups ++ - OOM scenarios ++ - Multithreading ++ c. The tests will take approximately one minute to complete. +diff --git a/tools/probeCgroup/probeCgroup.c b/tools/probeCgroup/probeCgroup.c +new file mode 100644 +index 000000000000..9883cb1e082d +--- /dev/null ++++ b/tools/probeCgroup/probeCgroup.c +@@ -0,0 +1,612 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * probeCgroup.c - A tool used to get memory usage for each process in a cgroup ++ * ++ * Copyright (C) Taoxy2004 <221870066@smail.nju.edu.cn> ++ */ ++ ++#include "probeCgroup.h" ++ ++// kretprobe at mem_cgroup_charge ++struct charge_data { ++ struct cgroup *cgrp; ++ struct mem_cgroup *memcg; ++ struct task_struct *task; ++ unsigned long addr; ++}; ++ ++static int mem_cgroup_charge_entry_handler(struct kretprobe_instance *ri, ++ struct pt_regs *regs) ++{ ++ struct charge_data *data; ++ struct folio *page; ++ struct mm_struct *mm; ++ struct mem_cgroup *memcg; ++ struct cgroup_subsys_state css; ++ struct cgroup *cgrp; ++ ++ if (!current->mm) ++ return 1; ++ page = (struct folio *)regs->di; ++ mm = (struct mm_struct *)regs->si; ++ if (mm == NULL || page == NULL) ++ return -1; ++ memcg = get_mem_cgroup_from_mm(mm); ++ if (memcg != NULL) { ++ css = memcg->css; ++ cgrp = css.cgroup; ++ ++ data = (struct charge_data *)ri->data; ++ data->memcg = memcg; ++ data->addr = (unsigned long)page; ++ data->task = current; ++ data->cgrp = cgrp; ++ } ++ return 0; ++} ++ ++NOKPROBE_SYMBOL(mem_cgroup_charge_entry_handler); ++ ++static int mem_cgroup_charge_ret_handler(struct kretprobe_instance *ri, ++ struct pt_regs *regs) ++{ ++ unsigned long retval = regs_return_value(regs); ++ struct charge_data *data = (struct charge_data *)ri->data; ++ int id; ++ struct cgroup_info *cgrp_info; ++ struct task_info *tsk_info; ++ ++ if (data->memcg != NULL && retval == 0) { ++ id = ((data->memcg)->css).id; ++ ++ spin_lock(&lock); ++ cgrp_info = find_cgroup_info(id); ++ if (cgrp_info == NULL) { ++ cgrp_info = create_cgroup_info(data->cgrp, data->memcg); ++ if (cgrp_info == NULL) { ++ spin_unlock(&lock); ++ return -1; ++ } ++ add_cgroup_info(cgrp_info); ++ } ++ spin_unlock(&lock); ++ ++ read_lock(&cgrp_info->cgrp_lock); ++ tsk_info = find_task_info(cgrp_info, data->task->tgid); ++ read_unlock(&cgrp_info->cgrp_lock); ++ ++ // for some cases, task->comm changes over time ++ if (tsk_info != NULL ++ && strcmp(data->task->comm, tsk_info->comm) != 0) { ++ strscpy(tsk_info->comm, data->task->comm,
View file
_service:tar_scm:patch-6.6.0-6.0.0-rt20.patch
Changed
@@ -1,7 +1,7 @@ -From a8b87098c93aa630d286de4af9637a247d55a370 Mon Sep 17 00:00:00 2001 +From b000137e06f399ac756aa2374e77e724d245f19c Mon Sep 17 00:00:00 2001 From: zhangyu <zhangyu4@kylinos.cn> -Date: Fri, 17 May 2024 15:06:01 +0800 -Subject: PATCH rpi-rt +Date: Thu, 22 Aug 2024 09:32:29 +0800 +Subject: PATCH rt-patrch --- arch/arm/Kconfig | 6 +- @@ -32,7 +32,7 @@ drivers/gpu/drm/i915/Kconfig | 1 - drivers/gpu/drm/i915/display/intel_crtc.c | 15 +- drivers/gpu/drm/i915/display/intel_vblank.c | 6 +- - drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 5 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 7 +- .../drm/i915/gt/intel_execlists_submission.c | 17 +- drivers/gpu/drm/i915/gt/intel_reset.c | 12 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +- @@ -155,10 +155,10 @@ kernel/sched/core.c | 127 +- kernel/sched/debug.c | 19 + kernel/sched/fair.c | 49 +- - kernel/sched/features.h | 2 +- + kernel/sched/features.h | 2 + kernel/sched/idle.c | 3 +- kernel/sched/rt.c | 5 +- - kernel/sched/sched.h | 1 + + kernel/sched/sched.h | 3 +- kernel/signal.c | 30 +- kernel/softirq.c | 95 +- kernel/time/hrtimer.c | 4 +- @@ -168,11 +168,11 @@ kernel/trace/trace_output.c | 16 +- net/core/dev.c | 39 +- net/core/skbuff.c | 7 +- - 164 files changed, 5041 insertions(+), 1542 deletions(-) + 164 files changed, 5047 insertions(+), 1540 deletions(-) create mode 100644 kernel/printk/nbcon.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 2483ce304..52707a682 100644 +index 749935e2e..46910150c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -34,6 +34,7 @@ config ARM @@ -234,7 +234,7 @@ return 0; } diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c -index a1ff693e4..adcc34042 100644 +index 7e8773a2d..9fde36fcb 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -55,6 +55,34 @@ extern unsigned int VFP_arch_feroceon __alias(VFP_arch); @@ -272,7 +272,7 @@ /* * Is 'thread's most up to date state stored in this CPUs hardware? * Must be called from non-preemptible context. -@@ -243,7 +271,7 @@ static void vfp_panic(char *reason, u32 inst) +@@ -240,7 +268,7 @@ static void vfp_panic(char *reason, u32 inst) /* * Process bitmask of exception conditions. */ @@ -281,7 +281,7 @@ { int si_code = 0; -@@ -251,8 +279,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ +@@ -248,8 +276,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ if (exceptions == VFP_EXCEPTION_ERROR) { vfp_panic("unhandled bounce", inst); @@ -291,7 +291,7 @@ } /* -@@ -280,8 +307,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ +@@ -277,8 +304,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ RAISE(FPSCR_OFC, FPSCR_OFE, FPE_FLTOVF); RAISE(FPSCR_IOC, FPSCR_IOE, FPE_FLTINV); @@ -301,7 +301,7 @@ } /* -@@ -327,6 +353,8 @@ static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs) +@@ -324,6 +350,8 @@ static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs) static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) { u32 fpscr, orig_fpscr, fpsid, exceptions; @@ -310,7 +310,7 @@ pr_debug("VFP: bounce: trigger %08x fpexc %08x\n", trigger, fpexc); -@@ -372,8 +400,8 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) +@@ -369,8 +397,8 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) * unallocated VFP instruction but with FPSCR.IXE set and not * on VFP subarch 1. */ @@ -321,7 +321,7 @@ } /* -@@ -397,14 +425,14 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) +@@ -394,14 +422,14 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) */ exceptions = vfp_emulate_instruction(trigger, fpscr, regs); if (exceptions) @@ -338,7 +338,7 @@ /* * The barrier() here prevents fpinst2 being read -@@ -416,7 +444,13 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) +@@ -413,7 +441,13 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) emulate: exceptions = vfp_emulate_instruction(trigger, orig_fpscr, regs); if (exceptions) @@ -353,7 +353,7 @@ } static void vfp_enable(void *unused) -@@ -518,11 +552,9 @@ static inline void vfp_pm_init(void) { } +@@ -512,11 +546,9 @@ static inline void vfp_pm_init(void) { } */ void vfp_sync_hwstate(struct thread_info *thread) { @@ -367,7 +367,7 @@ u32 fpexc = fmrx(FPEXC); /* -@@ -534,8 +566,7 @@ void vfp_sync_hwstate(struct thread_info *thread) +@@ -527,8 +559,7 @@ void vfp_sync_hwstate(struct thread_info *thread) fmxr(FPEXC, fpexc); } @@ -377,7 +377,7 @@ } /* Ensure that the thread reloads the hardware VFP state on the next use. */ -@@ -695,7 +726,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) +@@ -683,7 +714,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) if (!user_mode(regs)) return vfp_kmode_exception(regs, trigger); @@ -386,7 +386,7 @@ fpexc = fmrx(FPEXC); /* -@@ -760,6 +791,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) +@@ -748,6 +779,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) * replay the instruction that trapped. */ fmxr(FPEXC, fpexc); @@ -394,7 +394,7 @@ } else { /* Check for synchronous or asynchronous exceptions */ if (!(fpexc & (FPEXC_EX | FPEXC_DEX))) { -@@ -774,17 +806,17 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) +@@ -762,17 +794,17 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) if (!(fpscr & FPSCR_IXE)) { if (!(fpscr & FPSCR_LENGTH_MASK)) { pr_debug("not VFP\n"); @@ -414,7 +414,7 @@ return 0; } -@@ -831,7 +863,7 @@ void kernel_neon_begin(void) +@@ -819,7 +851,7 @@ void kernel_neon_begin(void) unsigned int cpu; u32 fpexc; @@ -423,7 +423,7 @@ /* * Kernel mode NEON is only allowed outside of hardirq context with -@@ -863,7 +895,7 @@ void kernel_neon_end(void) +@@ -850,7 +882,7 @@ void kernel_neon_end(void) { /* Disable the NEON/VFP unit. */ fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN); @@ -433,10 +433,10 @@ EXPORT_SYMBOL(kernel_neon_end); diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index bb49f48de..699c3f58a 100644 +index 501ec560a..eb0d9a8e0 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -98,6 +98,7 @@ config ARM64 +@@ -99,6 +99,7 @@ config ARM64 select ARCH_SUPPORTS_NUMA_BALANCING select ARCH_SUPPORTS_PAGE_TABLE_CHECK select ARCH_SUPPORTS_PER_VMA_LOCK @@ -531,7 +531,7 @@ select MPIC select OF_DYNAMIC diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c -index e8c412969..c61e29dea 100644
View file
_service:tar_scm:patch-6.6.0-6.0.0-rt20.patch-openeuler_defconfig.patch
Changed
@@ -1,7 +1,7 @@ -From cb6750f16a7d1d5074b0f7c46270014dd348a958 Mon Sep 17 00:00:00 2001 +From 9b1136bad28f0deb735f7cd220fb740eae876832 Mon Sep 17 00:00:00 2001 From: zhangyu <zhangyu4@kylinos.cn> -Date: Tue, 21 May 2024 14:50:20 +0800 -Subject: PATCH rt2 +Date: Thu, 22 Aug 2024 10:06:55 +0800 +Subject: PATCH rt111 --- arch/arm64/configs/openeuler_defconfig | 4 ++-- @@ -9,7 +9,7 @@ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig -index 3b8d78f94..6c7e6f2f9 100644 +index 650fe88cb..576b8f12d 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -97,7 +97,7 @@ CONFIG_PREEMPT_NONE=y @@ -21,17 +21,17 @@ # # CPU/Task time and stats accounting # -@@ -755,7 +755,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y +@@ -757,7 +757,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y CONFIG_KVM_HISI_VIRT=y -CONFIG_VIRTUALIZATION=y +#CONFIG_VIRTUALIZATION is not set CONFIG_KVM=y - CONFIG_CVM_HOST=y + CONFIG_HISI_VIRTCCA_HOST=y # CONFIG_NVHE_EL2_DEBUG is not set diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig -index 9b5df8585..ece62e3df 100644 +index b3403ba04..047d2c71d 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -112,11 +112,11 @@ CONFIG_BPF_SCHED=y @@ -57,7 +57,7 @@ CONFIG_UID16=y CONFIG_MULTIUSER=y CONFIG_SGETMASK_SYSCALL=y -@@ -744,7 +744,7 @@ CONFIG_HAVE_KVM_NO_POLL=y +@@ -746,7 +746,7 @@ CONFIG_HAVE_KVM_NO_POLL=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_HAVE_KVM_PM_NOTIFIER=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
View file
_service
Changed
@@ -2,7 +2,7 @@ <service name="tar_scm"> <param name="scm">git</param> <param name="url">git@gitee.com:xingmz/src-kernel.git</param> - <param name="revision">24.03-rebase-41</param> + <param name="revision">24.09-rebase-41-v4</param> <param name="submodules">disable</param> <param name="history-depth">1</param> <param name="exclude">*</param>
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2