Skip to contentSkip to conversation

kernel-yocto: consolidated pull request

PATCH In review [email protected] 1 participant 7 messages May 19, 2022

lore
Share & tools
lore
#0 lore raw

cover kernel-yocto: consolidated pull request

From: Bruce Ashfield <[email protected]>

Richard,

Here's the next round of -stable updates, and a lttng-modules fix .. just because what fun would it be without some lttng issues :)

Local testing has passed, but we'll see if the AB manages to spot something that I could hit.

Bruce

The following changes since commit bd66a18eaa463c2eab291fea68039bf0d61c7b8b:

openssl: minor security upgrade 3.0.2 -> 3.0.3 (2022-05-15 08:57:16 +0100)

are available in the Git repository at:

git://git.yoctoproject.org/poky-contrib zedd/kernel
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (5):
linux-yocto/5.15: update to v5.15.37
linux-yocto/5.10: update to v5.10.113
linux-yocto/5.15: update to v5.15.38
linux-yocto/5.10: update to v5.10.114
lttng-modules: fix build against 5.18-rc7+

 .../linux/linux-yocto-rt_5.10.bb              |  6 +-
 .../linux/linux-yocto-rt_5.15.bb              |  6 +-
 .../linux/linux-yocto-tiny_5.10.bb            |  8 +-
 .../linux/linux-yocto-tiny_5.15.bb            |  6 +-
 meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 ++---
 meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++---
 ...x-__trace_sched_switch_state-5.18-rc.patch | 88 +++++++++++++++++++
 .../lttng/lttng-modules_2.13.3.bb             |  1 +
 8 files changed, 127 insertions(+), 38 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-sched-tracing-fix-__trace_sched_switch_state-5.18-rc.patch
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/5 linux-yocto/5.15: update to v5.15.37

From: Bruce Ashfield <[email protected]>

Updating to the latest korg -stable release that comprises the following commits:

4bf7f350c163 Linux 5.15.37
f59e6886cafb selftests/bpf: Add test for reg2btf_ids out of bounds access dcecd95a1357 mm: gup: make fault_in_safe_writeable() use fixup_user_fault() 4a0123bdb064 btrfs: fallback to blocking mode when doing async dio over multiple extents c81c4f566660 btrfs: fix deadlock due to page faults during direct IO reads and writes 640a6be8e861 gfs2: Fix mmap + page fault deadlocks for direct I/O f86f8d27840a iov_iter: Introduce nofault flag to disable page faults 6e213bc61446 gup: Introduce FOLL_NOFAULT flag to disable page faults d3b744791bf0 iomap: Add done_before argument to iomap_dio_rw
ea7a57858875 iomap: Support partial direct I/O on user copy failures a00cc46f97b9 iomap: Fix iomap_dio_rw return value for user copies 81a7fc397a62 gfs2: Fix mmap + page fault deadlocks for buffered I/O 38b58498819a gfs2: Eliminate ip->i_gh
8d363d817353 gfs2: Move the inode glock locking to gfs2_file_buffered_write 416a705304e5 gfs2: Introduce flag for glock holder auto-demotion
b25cfbc0e7de gfs2: Clean up function may_grant
b88b998579ee gfs2: Add wrapper for iomap_file_buffered_write
1d91c912e7d1 iov_iter: Introduce fault_in_iov_iter_writeable
30e66b1dfcbb iov_iter: Turn iov_iter_fault_in_readable into fault_in_iov_iter_readable 923f05a660e6 gup: Turn fault_in_pages_{readable,writeable} into fault_in_{readable,writeable} 19cbd78fb26a mm: kfence: fix objcgs vector allocation
10033fa72d41 ARM: dts: socfpga: change qspi to "intel,socfpga-qspi" e8749d608847 spi: cadence-quadspi: fix write completion support
8c39925e98d4 bpf: Fix crash due to out of bounds access into reg2btf_ids. 379382b347db bpf/selftests: Test PTR_TO_RDONLY_MEM
2a77c58726ab bpf: Add MEM_RDONLY for helper args that are pointers to rdonly mem. 15166bb3000f bpf: Make per_cpu_ptr return rdonly PTR_TO_MEM.
b710f73704d6 bpf: Convert PTR_TO_MEM_OR_NULL to composable types. b453361384c2 bpf: Introduce MEM_RDONLY flag
8d38cde47a7e bpf: Replace PTR_TO_XXX_OR_NULL with PTR_TO_XXX | PTR_MAYBE_NULL 3c141c82b958 bpf: Replace RET_XXX_OR_NULL with RET_XXX | PTR_MAYBE_NULL d58a396fa6c9 bpf: Replace ARG_XXX_OR_NULL with ARG_XXX | PTR_MAYBE_NULL a76020980b9f bpf: Introduce composable reg, ret and arg types.
e52da8e4632f floppy: disable FDRAWCMD by default

---
 .../linux/linux-yocto-rt_5.15.bb              |  6 ++---
 .../linux/linux-yocto-tiny_5.15.bb            |  6 ++---
 meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +3 -3
index afcc715918..5bc02623e9 100644
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "2b74bd6a3a2341f079f914171bc92eadc8a7deaa"
-SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c"
+SRCREV_machine ?= "0098c71753fab42ea29a58b8c39ae8852a0819b8"
+SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.15.36"
+LINUX_VERSION ?= "5.15.37"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +3 -3
index 9a708804c1..4d2e9facda 100644
@@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.15.36"
+LINUX_VERSION ?= "5.15.37"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "9107fb1e04c2da3d84e1967aeb7f5bc190423d5b"
-SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c"
+SRCREV_machine ?= "73e5fcde1e4d7b3ef0f122e309bf6feda2214133"
+SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.15.bb +13 -13
index 0aef531659..a0af1f93cf 100644
@@ -13,24 +13,24 @@ KBRANCH:qemux86  ?= "v5.15/standard/base"
 KBRANCH:qemux86-64 ?= "v5.15/standard/base"
 KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "b5b62e5ba72e2ed669bbb53dd5707e27d777257e"
-SRCREV_machine:qemuarm64 ?= "3f298fc00a40ed4f32805aba757c22c855f654b9"
-SRCREV_machine:qemumips ?= "6d50f4ff023b65e226fd2e65feaa583d8b177ae3"
-SRCREV_machine:qemuppc ?= "e51976427997a0b6f81e013ca6588e32c33cfeb0"
-SRCREV_machine:qemuriscv64 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e"
-SRCREV_machine:qemuriscv32 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e"
-SRCREV_machine:qemux86 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e"
-SRCREV_machine:qemux86-64 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e"
-SRCREV_machine:qemumips64 ?= "1822ceafc13337881a81edeb7093b0c095d9efca"
-SRCREV_machine ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e"
-SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c"
+SRCREV_machine:qemuarm ?= "487f0d10355bc4ea900c6cbfb6ba156541449263"
+SRCREV_machine:qemuarm64 ?= "623ef2010028407442669ed9d3a50a86ad4031aa"
+SRCREV_machine:qemumips ?= "d07fd1d207673b466616e5f806d97e2834ef35b2"
+SRCREV_machine:qemuppc ?= "cbe3228711c2f3df43ffb3d865ef09dd91fb7100"
+SRCREV_machine:qemuriscv64 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
+SRCREV_machine:qemuriscv32 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
+SRCREV_machine:qemux86 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
+SRCREV_machine:qemux86-64 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
+SRCREV_machine:qemumips64 ?= "08d20206727ae27296a3acf27a4fc6c9bdb874da"
+SRCREV_machine ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
+SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same
 # meta SRCREV as the linux-yocto-standard builds. Select your version using the
 # normal PREFERRED_VERSION settings.
 BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "45451e8015a91de5d1a512c3e3d7373bbcb58fb0"
+SRCREV_machine:class-devupstream ?= "4bf7f350c1638def0caa1835ad92948c15853916"
 PN:class-devupstream = "linux-yocto-upstream"
 KBRANCH:class-devupstream = "v5.15/base"
 
@@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.15.36"
+LINUX_VERSION ?= "5.15.37"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.19.1
#2 lore raw

PATCH 2/5 linux-yocto/5.10: update to v5.10.113

In reply to [email protected]

From: Bruce Ashfield <[email protected]>

Updating to the latest korg -stable release that comprises the following commits:

54af9dd2b958 Linux 5.10.113
7992fdb045fb Revert "net: micrel: fix KS8851_MLL Kconfig"
8bedbc8f7f35 block/compat_ioctl: fix range check in BLKGETSIZE
fea24b07edfc staging: ion: Prevent incorrect reference counting behavour
dccee748af17 spi: atmel-quadspi: Fix the buswidth adjustment between spi-mem and controller 572761645b88 jbd2: fix a potential race while discarding reserved buffers after an abort 50aac4427360 can: isotp: stop timeout monitoring when no first frame was sent
e1e96e372721 ext4: force overhead calculation if the s_overhead_cluster makes no sense 4789149b9ea2 ext4: fix overhead calculation to account for the reserved gdt blocks 0c54b093766b ext4, doc: fix incorrect h_reserved size
22c450d39f89 ext4: limit length to bitmap_maxbytes - blocksize in punch_hole
75ac724684b7 ext4: fix use-after-free in ext4_search_dir
a46b3d849864 ext4: fix symlink file size not match to file content
f6038d43b25b ext4: fix fallocate to use file_modified to update permissions consistently 19590bbc691d perf report: Set PERF_SAMPLE_DATA_SRC bit for Arm SPE event
e012f9d1af54 powerpc/perf: Fix power9 event alternatives
0a2cef65b329 drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage f8f8b3124b89 KVM: PPC: Fix TCE handling for VFIO
405d98427416 drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare 231381f52116 drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised 51d9cbbb0f5a perf/core: Fix perf_mmap fail when CONFIG_PERF_USE_VMALLOC enabled 88fcfd6ee6c5 sched/pelt: Fix attach_entity_load_avg() corner case
c55327bc3712 arm_pmu: Validate single/group leader events
5580b974a84b ARC: entry: fix syscall_trace_exit argument
7082650eb826 e1000e: Fix possible overflow in LTR decoding
43a2a3734aa3 ASoC: soc-dapm: fix two incorrect uses of list iterator
54e6180c8c2d gpio: Request interrupts after IRQ is initialized
0837ff17d052 openvswitch: fix OOB access in reserve_sfa_size()
19f6dcb1f0f0 xtensa: fix a7 clobbering in coprocessor context load/store
f399ab11dd6c xtensa: patch_text: Fixup last cpu should be master
ba2716da2336 net: atlantic: invert deep par in pm functions, preventing null derefs 358a3846f6a9 dma: at_xdmac: fix a missing check on list iterator
cf23a960c5c6 ata: pata_marvell: Check the 'bmdma_addr' beforing reading
9ca66d791439 mm/mmu_notifier.c: fix race in mmu_interval_notifier_remove()
ed5d4efb4df1 oom_kill.c: futex: delay the OOM reaper to allow time for proper futex cleanup 6b932920b96f mm, hugetlb: allow for "high" userspace addresses
50cbc583fa83 EDAC/synopsys: Read the error count from the correct register
7ec6e06ee405 nvme-pci: disable namespace identifiers for Qemu controllers
316bd86c2261 nvme: add a quirk to disable namespace identifiers
76101c8e0c31 stat: fix inconsistency between struct stat and struct compat_stat bf28bba30410 scsi: qedi: Fix failed disconnect handling
a284cca3d81a net: macb: Restart tx only if queue pointer is lagging
9581e07b549b drm/msm/mdp5: check the return of kzalloc()
8d71edabb0ab dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info()
b3afe5a7fd75 brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant 202748f44148 mt76: Fix undefined behavior due to shift overflowing the constant 0de9c104d04a net: atlantic: Avoid out-of-bounds indexing
5bef9fc38ffa cifs: Check the IOCB_DIRECT flag, not O_DIRECT
e129c55153c8 vxlan: fix error return code in vxlan_fdb_append
8e7ea1136475 arm64: dts: imx: Fix imx8*-var-som touchscreen property sizes
cd227ac03f2a ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant 490815f0b50e platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative cb17b56a9b4d reset: tegra-bpmp: Restore Handle errors in BPMP response
d513ea9b7ef8 ARM: vexpress/spc: Avoid negative array index when !SMP
052e4a661f90 arm64: mm: fix p?d_leaf()
18ff7a2efa4e arm64/mm: Remove [PUD|PMD]_TABLE_BIT from [pud|pmd]_bad()
3bf8ca350170 selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets 520aab8b723c dmaengine: idxd: add RO check for wq max_transfer_size write
9a3c026dc3a5 dmaengine: idxd: add RO check for wq max_batch_size write
f593f49fcd17 net: stmmac: Use readl_poll_timeout_atomic() in atomic state
3d55b195747c netlink: reset network and mac headers in netlink_dump()
49516e6ed914 ipv6: make ip6_rt_gc_expire an atomic_t
078d839f11ac l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu 0ac8f83d8f64 net/sched: cls_u32: fix possible leak in u32_init_knode()
93366275be72 ip6_gre: Fix skb_under_panic in __gre6_xmit()
200f96ebb389 ip6_gre: Avoid updating tunnel->tun_hlen in __gre6_xmit()
8fb76adb89f0 net/packet: fix packet_sock xmit return value checking
a499cb5f3ef9 net/smc: Fix sock leak when release after smc_shutdown()
60592f16a456 rxrpc: Restore removed timer deletion
fc7116a79a86 igc: Fix BUG: scheduling while atomic
46b0e4f998ce igc: Fix infinite loop in release_swfw_sync
c075c3ea0317 esp: limit skb_page_frag_refill use to a single page
3f7914dbeacd spi: spi-mtk-nor: initialize spi controller after resume
f714abf28f81 dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources 9bc949a181ba dmaengine: imx-sdma: Fix error checking in sdma_event_remap
12aa8021c7a7 ASoC: codecs: wcd934x: do not switch off SIDO Buck when codec is in use b6f474cd3097 ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component 608fc58858bf ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek d29c78d3f9c5 dm: fix mempool NULL pointer race when completing IO
cf9b19546494 ALSA: hda/realtek: Add quirk for Clevo NP70PNP
8ce3820fc9d4 ALSA: usb-audio: Clear MIDI port active flag after draining
43ce33a68e2b net/sched: cls_u32: fix netns refcount changes in u32_change()
04dd45d9776e gfs2: assign rgrp glock before compute_bitstructs
378061c9b886 perf tools: Fix segfault accessing sample_id xyarray
5e8446e3820c tracing: Dump stacktrace trigger to the corresponding instance
69848f9488bc mm: page_alloc: fix building error on -Werror=array-compare
08ad7a770efa etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead

---
 .../linux/linux-yocto-rt_5.10.bb              |  6 ++---
 .../linux/linux-yocto-tiny_5.10.bb            |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +3 -3
index 4c55a27abf..62d7494b88 100644
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "bd6e7290bc766ef13e42a1e37f75e6e708b4e317"
-SRCREV_meta ?= "19e7547dd6617760d6094b7a42da1a718b5a96ee"
+SRCREV_machine ?= "88b754b80392e1f1ac7df46595f9712edc8aec02"
+SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.10.112"
+LINUX_VERSION ?= "5.10.113"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +4 -4
index 42d5c105b7..e0c693fed2 100644
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.10.112"
+LINUX_VERSION ?= "5.10.113"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine:qemuarm ?= "ab911ca906ec6d1551ba12373d4133ccaf7f83cc"
-SRCREV_machine ?= "aadc46b05e5c77328bd3461578c770af3efa8944"
-SRCREV_meta ?= "19e7547dd6617760d6094b7a42da1a718b5a96ee"
+SRCREV_machine:qemuarm ?= "7dacc8332b0bc5600d97583f45b841c9724f2191"
+SRCREV_machine ?= "8dc46fa883d7b9a3412791f6731096e2e516d949"
+SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.10.bb +12 -12
index 3d3dad99b5..37f2db88a7 100644
@@ -13,23 +13,23 @@ KBRANCH:qemux86  ?= "v5.10/standard/base"
 KBRANCH:qemux86-64 ?= "v5.10/standard/base"
 KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "1c2e2b55a9d13e749131d812797fa0ddbb56fde2"
-SRCREV_machine:qemuarm64 ?= "9d22ba94a0b4466ead91f24b138fd8e5814dad21"
-SRCREV_machine:qemumips ?= "c8f392c534a331f6ee6d40c8b1ff428fc3599f7f"
-SRCREV_machine:qemuppc ?= "498fcdc5dc2f0b99001e50da239976430eacf676"
-SRCREV_machine:qemuriscv64 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15"
-SRCREV_machine:qemuriscv32 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15"
-SRCREV_machine:qemux86 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15"
-SRCREV_machine:qemux86-64 ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15"
-SRCREV_machine:qemumips64 ?= "a005c07acd278c86ddab4cd8bc7a1bfae4638414"
-SRCREV_machine ?= "6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15"
-SRCREV_meta ?= "19e7547dd6617760d6094b7a42da1a718b5a96ee"
+SRCREV_machine:qemuarm ?= "6092497574895b1179a3c7a9e07c7f40c2d4c136"
+SRCREV_machine:qemuarm64 ?= "97ad6c5f9ffdb6b108cbbf99d9061dd0fe03e4e8"
+SRCREV_machine:qemumips ?= "e53b2d1867f7bdc2c0cc904a15992178688c3ad4"
+SRCREV_machine:qemuppc ?= "b12ed76165bfc9fe2b99fcc224b5e0134b7b533f"
+SRCREV_machine:qemuriscv64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
+SRCREV_machine:qemuriscv32 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
+SRCREV_machine:qemux86 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
+SRCREV_machine:qemux86-64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
+SRCREV_machine:qemumips64 ?= "07580586b738406b4dec9bf91d4eecdb933f2a07"
+SRCREV_machine ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
+SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.112"
+LINUX_VERSION ?= "5.10.113"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.19.1
#3 lore raw

PATCH 3/5 linux-yocto/5.15: update to v5.15.38

In reply to [email protected]

From: Bruce Ashfield <[email protected]>

Updating to the latest korg -stable release that comprises the following commits:

3fbf24b73f4a Linux 5.15.38
151322c24e87 powerpc/64: Add UADDR64 relocation support
ec1bb681eee2 objtool: Fix type of reloc::addend
19ffee7d6231 objtool: Fix code relocs vs weak symbols
80c71d76e88a eeprom: at25: Use DMA safe buffers
7d0010f62840 perf symbol: Remove arch__symbols__fixup_end()
ea47db3bac7a tty: n_gsm: fix software flow control handling
ab49c23668ea tty: n_gsm: fix incorrect UA handling
e0a84ae1c662 tty: n_gsm: fix reset fifo race condition
f92783b7568e tty: n_gsm: fix missing tty wakeup in convergence layer type 2
aeacc7e81c71 tty: n_gsm: fix wrong signal octets encoding in MSC
ef2f08ee00b0 tty: n_gsm: fix wrong command frame length field encoding
e51f35470383 tty: n_gsm: fix wrong command retry handling
73defa00a7bc tty: n_gsm: fix missing explicit ldisc flush
2484787cde3d tty: n_gsm: fix wrong DLCI release order
0a7fe1a47ca5 tty: n_gsm: fix insufficient txframe size
87e1b4f90703 netfilter: nft_socket: only do sk lookups when indev is available a93d2d3189e8 tty: n_gsm: fix malformed counter for out of frame data
0d6289c4a0e1 tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2 4e1beef38c35 tty: n_gsm: fix mux cleanup after unregister tty device
8b19dfb3e817 tty: n_gsm: fix decoupled mux resource
7f71387d9f3b tty: n_gsm: fix restart handling via CLD command
a87a36badd94 perf symbol: Update symbols__fixup_end()
cf7bf78f10bd perf symbol: Pass is_kallsyms to symbols__fixup_end()
f858bd6536e1 x86/cpu: Load microcode during restore_processor_state()
2333d2a72ba1 ARM: dts: imx8mm-venice-gw{71xx,72xx,73xx}: fix OTG controller OC mode 0dc5cad09e32 ARM: dts: at91: sama7g5ek: enable pull-up on flexcom3 console lines cf12ce1bd71d btrfs: fix leaked plug after failure syncing log on zoned filesystems 65b785cdb397 thermal: int340x: Fix attr.show callback prototype
f3106b0b0113 ACPI: processor: idle: Avoid falling back to C3 type C-states
d2bc6fc51e58 net: ethernet: stmmac: fix write to sgmii_adapter_base
4e308b21bc16 drm/i915: Fix SEL_FETCH_PLANE_*(PIPE_B+) register addresses
67434e132b8c drm/i915: Check EDID for HDR static metadata when choosing blc
891883c426b8 netfilter: Update ip6_route_me_harder to consider L3 domain
c63fbe063ffb mtd: rawnand: qcom: fix memory corruption that causes panic
30083f049204 kasan: prevent cpu_quarantine corruption when CPU offline and cache shrink occur at same time 051e78dc1f97 zonefs: Clear inode information flags on inode creation
534c3f29acdd zonefs: Fix management of open zones
746140625a0f Revert "ACPI: processor: idle: fix lockup regression on 32-bit ThinkPad T40" 2688d967ec65 selftest/vm: verify remap destination address in mremap_test
a17404fcbfd0 selftest/vm: verify mmap addr in mremap_test
c18b69393b4f powerpc/perf: Fix 32bit compile
9a90c13f72e7 drivers: net: hippi: Fix deadlock in rr_close()
3bb73c4cc265 cifs: destage any unwritten data to the server before calling copychunk_write 4640802e1cd4 x86: __memcpy_flushcache: fix wrong alignment if size > 2^32
5bf8eda3815a bonding: do not discard lowest hash bit for non layer3+4 hashing d276bcc5f72e ksmbd: set fixed sector size to FS_SECTOR_SIZE_INFORMATION
df30cbfd3d8a ksmbd: increment reference count of parent fp
50f79a2abb65 arch: xtensa: platforms: Fix deadlock in rs_close()
52c3a04f9ec2 ext4: fix bug_on in start_this_handle during umount filesystem
dd2f7fcb2a43 ASoC: wm8731: Disable the regulator when probing fails
2c5ca9bde710 ASoC: Intel: soc-acpi: correct device endpoints for max98373
27e724bf7c51 tcp: fix F-RTO may not work correctly when receiving DSACK
8de15dad3c77 Revert "ibmvnic: Add ethtool private flag for driver-defined queue limits" 881c48b61fbb ixgbe: ensure IPsec VF<->PF compatibility
3bc7a1f85d5b perf arm-spe: Fix addresses of synthesized SPE events
3591293c19df gfs2: No short reads or writes upon glock contention
b5afb477d2f8 gfs2: Make sure not to return short direct writes
fe24959a79c9 gfs2: Minor retry logic cleanup
e4ea3286b1aa gfs2: Prevent endless loops in gfs2_file_buffered_write
a83ee2d81b34 net: fec: add missing of_node_put() in fec_enet_init_stop_mode() 925ebcac26e4 bnx2x: fix napi API usage sequence
87fe5a392d27 tls: Skip tls_append_frag on zero copy size
815b847af99d drm/amd/display: Fix memory leak in dcn21_clock_source_create
ce9be3baec9b drm/amdkfd: Fix GWS queue count
54e0b949bf59 netfilter: conntrack: fix udp offload timeout sysctl
37811e46a232 io_uring: check reserved fields for recv/recvmsg
79c10cb18815 io_uring: check reserved fields for send/sendmsg
ee6d708520b7 net: dsa: lantiq_gswip: Don't set GSWIP_MII_CFG_RMII_CLK
8a991ba5ddde drm/sun4i: Remove obsolete references to PHYS_OFFSET
ede22fc0bf7e net: dsa: mv88e6xxx: Fix port_hidden_wait to account for port_base_addr 9b649f4c5672 net: phy: marvell10g: fix return value on error
21bf1dc99db4 net: bcmgenet: hide status block before TX timestamping
abff341ac2f9 cpufreq: qcom-cpufreq-hw: Clear dcvs interrupts
7356c1f0ae47 clk: sunxi: sun9i-mmc: check return value after calling platform_get_resource() 409789e2cec5 bus: sunxi-rsb: Fix the return value of sunxi_rsb_device_create() 45b7fca32bbc tcp: make sure treq->af_specific is initialized
6c4d4334e573 tcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT
6b59df7d4d0a ip_gre, ip6_gre: Fix race condition on o_seqno in collect_md mode e5e985dd99d8 ip6_gre: Make o_seqno start from 0 in native mode
2dec240fb161 ip_gre: Make o_seqno start from 0 in native mode
479dc5d15316 net/smc: sync err code when tcp connection was refused
8c59a61ffb11 net: hns3: add return value for mailbox handling in PF
fc480b465ab6 net: hns3: add validity check for message data length
cfedc70d3c63 net: hns3: modify the return code of hclge_get_ring_chain_from_mbx 88c39408187c net: hns3: clear inited state and stop client after failed to register netdev ac01adfa7d6d cpufreq: fix memory leak in sun50i_cpufreq_nvmem_probe
cdc350a76925 pinctrl: pistachio: fix use of irq_of_parse_and_map()
111827dfea31 arm64: dts: imx8mn-ddr4-evk: Describe the 32.768 kHz PMIC clock a621f6ce1fb3 ARM: dts: imx6ull-colibri: fix vqmmc regulator
5a4da2e23351 sctp: check asoc strreset_chunk in sctp_generate_reconf_event
37a04788c573 wireguard: device: check for metadata_dst with skb_valid_dst()
d632cba7dee7 tcp: ensure to use the most recently sent skb when filling the rate sample e9b1a51c3297 pinctrl: stm32: Keep pinctrl block clock enabled when LEVEL IRQ requested eb90a4269c20 tcp: md5: incorrect tcp_header_len for incoming connections
eea166561f7c pinctrl: rockchip: fix RK3308 pinmux bits
86d8076e5971 bpf, lwt: Fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook c2a69ac00b42 netfilter: nft_set_rbtree: overlap detection with element re-addition after deletion 9cc897ca03df net: dsa: Add missing of_node_put() in dsa_port_link_register_of 72e7940b00b5 memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode 2075f6f8e627 pinctrl: stm32: Do not call stm32_gpio_get() for edge triggered IRQs in EOI 291ee6787b35 mtd: fix 'part' field data corruption in mtd_info
6465a2120b23 mtd: rawnand: Fix return value check of wait_for_completion_timeout 102775603cd9 pinctrl: mediatek: moore: Fix build error
d3dfa4954e35 phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe()
b347b850a49f ipvs: correctly print the memory size of ip_vs_conn_tab
12d3fd4d8c49 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35
6b4928990b14 ARM: dts: am3517-evm: Fix misc pinmuxing
6476c49e8e31 ARM: dts: Fix mmc order for omap3-gta04
4e81598e2122 interconnect: qcom: sdx55: Drop IP0 interconnects
344558d201bb phy: ti: Add missing pm_runtime_disable() in serdes_am654_probe cf6f119f8244 phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe 49c7d87f19d4 ARM: dts: at91: fix pinctrl phandles
7ecb2639eb8a ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name
1e68040245ad ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek
555bcbb7d0ff phy: ti: omap-usb2: Fix error handling in omap_usb2_enable_clocks d60abf246aa5 ARM: dts: dra7: Fix suspend warning for vpe powerdomain
127295f86f70 bus: ti-sysc: Make omap3 gpt12 quirk handling SoC specific
033cac39d0b7 ARM: OMAP2+: Fix refcount leak in omap_gic_of_init
a933ee691dbd phy: samsung: exynos5250-sata: fix missing device put in probe error paths 3c8a02347f84 phy: samsung: Fix missing of_node_put() in exynos_sata_phy_probe bb0f3522cf42 arm64: dts: meson-sm1-bananapi-m5: fix wrong GPIO pin labeling for CON1 0f8e303faf88 arm64: dts: imx8mn: Fix SAI nodes
f1266c4eba8a ARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issue
7596c4576a0e USB: Fix xhci event ring dequeue pointer ERDP update issue
11baa5edf37d arm64: dts: imx8qm: Correct SCU clock controller's compatible property d84f8327af13 xsk: Fix l2fwd for copy mode + busy poll combo
3ec920d755ae mtd: rawnand: fix ecc parameters for mt7622
9e4dedb8ec72 iio:imu:bmi160: disable regulator in error path
d583cd6afc3b arm64: dts: meson: remove CPU opps below 1GHz for SM1 boards
9f878775fceb arm64: dts: meson: remove CPU opps below 1GHz for G12B boards
4df1584738f1 video: fbdev: udlfb: properly check endpoint type
1ad0832e8712 cpufreq: qcom-cpufreq-hw: Fix throttle frequency value on EPSS platforms 38ac9ca93252 cpufreq: qcom-hw: fix the race between LMH worker and cpuhp
08b036bac865 virtio_net: fix wrong buf address calculation when using xdp
10f24144ca48 iocost: don't reset the inuse weight of under-weighted debtors
559d4f45958b x86/pci/xen: Disable PCI/MSI[-X] masking for XEN_HVM guests
95ad6bef5bf1 riscv: patch_text: Fixup last cpu should be master
3437091fcc2f hex2bin: fix access beyond string end
4541645b5881 hex2bin: make the function hex_to_bin constant-time
41dee1832617 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config
8f2dac58b39e arm64: dts: imx8mm-venice: fix spi2 pin configuration
34b5d2aa355a bus: mhi: host: pci_generic: Flush recovery worker during freeze b3d21deabcbe bus: mhi: host: pci_generic: Add missing poweroff() PM callback 732f861dd480 ceph: fix possible NULL pointer dereference for req->r_session
2b008197a06b arch_topology: Do not set llc_sibling if llc_id is invalid
03cab849da1a serial: 8250: Correct the clock for EndRun PTP/1588 PCIe device 9445505273a5 serial: 8250: Also set sticky MCR bits in console restoration
ac55cac5dcd4 serial: amba-pl011: do not time out prematurely when draining tx fifo 858d93280e83 serial: imx: fix overrun interrupts in DMA mode
c0ea202fbc85 usb: phy: generic: Get the vbus supply
dd2af3ad968f usb: cdns3: Fix issue for clear halt endpoint
455285db8717 usb: dwc3: pci: add support for the Intel Meteor Lake-P
0d1c407b1a74 usb: dwc3: gadget: Return proper request status
7d14c96bff09 usb: dwc3: core: Only handle soft-reset in DCTL
5d8299ead7c5 usb: dwc3: core: Fix tx/rx threshold settings
b81be940eaca usb: dwc3: Try usb-role-switch first in dwc3_drd_init
9f051e510cd2 usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind() f9b2660d9c10 usb: gadget: uvc: Fix crash when encoding data for usb request
e5e7d6c4b305 usb: typec: ucsi: Fix role swapping
3e5dd4cf30fe usb: typec: ucsi: Fix reuse of completion structure
6bf55f6b0ebf usb: core: Don't hold the device lock while sleeping in do_proc_control() 949d422949ee usb: misc: fix improper handling of refcount in uss720_probe()
a590353a9506 iio: imu: inv_icm42600: Fix I2C init possible nack
7619f3c498a2 iio: magnetometer: ak8975: Fix the error handling in ak8975_power_on() 28e1f974e3e7 iio: dac: ad5446: Fix read_raw not returning set value
cd266c38aaa4 iio: dac: ad5592r: Fix the missing return value.
48bc03979f30 xhci: increase usb U3 -> U0 link resume timeout from 100ms to 500ms 9faa311f65b0 xhci: stop polling roothubs after shutdown
10e0d30f99f4 xhci: Enable runtime PM on second Alderlake controller
576b40690e91 usb: xhci: tegra:Fix PM usage reference leak of tegra_xusb_unpowergate_partitions 4ebf2982db15 USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions be94d697baab USB: serial: option: add support for Cinterion MV32-WA/MV32-WB
bb73ae98f086 USB: serial: cp210x: add PIDs for Kamstrup USB Meter Reader
f183708e8ecc USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS 7f8fc606893c USB: quirks: add STRING quirk for VCOM device
96a5999e1f62 USB: quirks: add a Realtek card reader
0da0ac894129 usb: mtu3: fix USB 3.0 dual-role-switch from device to host

---
 .../linux/linux-yocto-rt_5.15.bb              |  6 ++---
 .../linux/linux-yocto-tiny_5.15.bb            |  6 ++---
 meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +3 -3
index 5bc02623e9..6bfb8deb1e 100644
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "0098c71753fab42ea29a58b8c39ae8852a0819b8"
-SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4"
+SRCREV_machine ?= "b028c4baada43d48014d4350dd66debe7e4cf362"
+SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.15.37"
+LINUX_VERSION ?= "5.15.38"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +3 -3
index 4d2e9facda..0cf2d68d56 100644
@@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.15.37"
+LINUX_VERSION ?= "5.15.38"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "73e5fcde1e4d7b3ef0f122e309bf6feda2214133"
-SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4"
+SRCREV_machine ?= "7b1fe61102fd6efc26373305417cd683687eb7a0"
+SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.15.bb +13 -13
index a0af1f93cf..206cc0692d 100644
@@ -13,24 +13,24 @@ KBRANCH:qemux86  ?= "v5.15/standard/base"
 KBRANCH:qemux86-64 ?= "v5.15/standard/base"
 KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "487f0d10355bc4ea900c6cbfb6ba156541449263"
-SRCREV_machine:qemuarm64 ?= "623ef2010028407442669ed9d3a50a86ad4031aa"
-SRCREV_machine:qemumips ?= "d07fd1d207673b466616e5f806d97e2834ef35b2"
-SRCREV_machine:qemuppc ?= "cbe3228711c2f3df43ffb3d865ef09dd91fb7100"
-SRCREV_machine:qemuriscv64 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
-SRCREV_machine:qemuriscv32 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
-SRCREV_machine:qemux86 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
-SRCREV_machine:qemux86-64 ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
-SRCREV_machine:qemumips64 ?= "08d20206727ae27296a3acf27a4fc6c9bdb874da"
-SRCREV_machine ?= "82ab1e179a347e02ef77ad7c5fa1493461e58520"
-SRCREV_meta ?= "b37a7198339ac27d27aec07ec5e952cc74c137f4"
+SRCREV_machine:qemuarm ?= "5a68f2d15d17f0f3c397e7f8c83f3f664f7037e5"
+SRCREV_machine:qemuarm64 ?= "00e666e6154fcdf52268f2a5a612b96afad073b0"
+SRCREV_machine:qemumips ?= "fb9e75076deade31754b7ad644952d63137e616b"
+SRCREV_machine:qemuppc ?= "49f6567f3b85a843e8b6042a79c58aab0bdbd0c9"
+SRCREV_machine:qemuriscv64 ?= "cc9695f5fd3b520464eb2ded66950734f308525c"
+SRCREV_machine:qemuriscv32 ?= "cc9695f5fd3b520464eb2ded66950734f308525c"
+SRCREV_machine:qemux86 ?= "cc9695f5fd3b520464eb2ded66950734f308525c"
+SRCREV_machine:qemux86-64 ?= "cc9695f5fd3b520464eb2ded66950734f308525c"
+SRCREV_machine:qemumips64 ?= "1ad01ab47ec056d4126798f6d57a33b65b2be49c"
+SRCREV_machine ?= "cc9695f5fd3b520464eb2ded66950734f308525c"
+SRCREV_meta ?= "37891dc371e83a3451781dd81a8a85cccd60084b"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same
 # meta SRCREV as the linux-yocto-standard builds. Select your version using the
 # normal PREFERRED_VERSION settings.
 BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "4bf7f350c1638def0caa1835ad92948c15853916"
+SRCREV_machine:class-devupstream ?= "3fbf24b73f4a5bc8fd39a6b7a29145451c1039ce"
 PN:class-devupstream = "linux-yocto-upstream"
 KBRANCH:class-devupstream = "v5.15/base"
 
@@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.15.37"
+LINUX_VERSION ?= "5.15.38"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.19.1
#4 lore raw

PATCH 4/5 linux-yocto/5.10: update to v5.10.114

In reply to [email protected]

From: Bruce Ashfield <[email protected]>

Updating to the latest korg -stable release that comprises the following commits:

f40e35e79c11 Linux 5.10.114
2d74f61787e6 perf symbol: Remove arch__symbols__fixup_end()
bf98302e689d tty: n_gsm: fix software flow control handling
95b267271a7d tty: n_gsm: fix incorrect UA handling
70b045d9ae4f tty: n_gsm: fix reset fifo race condition
320a24c4ef44 tty: n_gsm: fix wrong command frame length field encoding
935f314b6fdb tty: n_gsm: fix wrong command retry handling
17b86db43c00 tty: n_gsm: fix missing explicit ldisc flush
a2baa907c281 tty: n_gsm: fix wrong DLCI release order
705925e69360 tty: n_gsm: fix insufficient txframe size
842a9bbbeff1 netfilter: nft_socket: only do sk lookups when indev is available 7346e54dbf5b tty: n_gsm: fix malformed counter for out of frame data
d19613895e15 tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2 26f127f6d938 tty: n_gsm: fix mux cleanup after unregister tty device
f26c271492b6 tty: n_gsm: fix decoupled mux resource
47132f9f7f76 tty: n_gsm: fix restart handling via CLD command
b3c88d46db76 perf symbol: Update symbols__fixup_end()
3d0a3168a364 perf symbol: Pass is_kallsyms to symbols__fixup_end()
2ab14625b879 x86/cpu: Load microcode during restore_processor_state()
795afbe8b40c thermal: int340x: Fix attr.show callback prototype
11d16498d737 net: ethernet: stmmac: fix write to sgmii_adapter_base
236dd6223051 drm/i915: Fix SEL_FETCH_PLANE_*(PIPE_B+) register addresses
78d4dccf1601 kasan: prevent cpu_quarantine corruption when CPU offline and cache shrink occur at same time 5fef6df2731f zonefs: Clear inode information flags on inode creation
92ed64a9205b zonefs: Fix management of open zones
42e8ec3b4be8 powerpc/perf: Fix 32bit compile
ac3d0770437e drivers: net: hippi: Fix deadlock in rr_close()
5399e7b80c37 cifs: destage any unwritten data to the server before calling copychunk_write 80fc45377f41 x86: __memcpy_flushcache: fix wrong alignment if size > 2^32
585ef03c9e79 ext4: fix bug_on in start_this_handle during umount filesystem
07da0be58853 ASoC: wm8731: Disable the regulator when probing fails
1b1747ad7e88 ASoC: Intel: soc-acpi: correct device endpoints for max98373
aa138efd2bbf tcp: fix F-RTO may not work correctly when receiving DSACK
9d56e369bd4f Revert "ibmvnic: Add ethtool private flag for driver-defined queue limits" 96904c828991 ibmvnic: fix miscellaneous checks
17f71272ef41 ixgbe: ensure IPsec VF<->PF compatibility
c33d717e064a net: fec: add missing of_node_put() in fec_enet_init_stop_mode() 9591967ac4d5 bnx2x: fix napi API usage sequence
1781beb87935 tls: Skip tls_append_frag on zero copy size
77b922683e9e drm/amd/display: Fix memory leak in dcn21_clock_source_create
18068e0527d4 drm/amdkfd: Fix GWS queue count
c0396f5e5bba net: dsa: lantiq_gswip: Don't set GSWIP_MII_CFG_RMII_CLK
1204386e2657 net: phy: marvell10g: fix return value on error
e974c730f0af net: bcmgenet: hide status block before TX timestamping
ee71b47da599 clk: sunxi: sun9i-mmc: check return value after calling platform_get_resource() 8dacbef4fe58 bus: sunxi-rsb: Fix the return value of sunxi_rsb_device_create() 9f29f6f8da9e tcp: make sure treq->af_specific is initialized
8a9d6ca3608f tcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT
720b6ced8549 ip_gre, ip6_gre: Fix race condition on o_seqno in collect_md mode 41661b4c1ab1 ip6_gre: Make o_seqno start from 0 in native mode
7b187fbd7e38 ip_gre: Make o_seqno start from 0 in native mode
83d128daff2e net/smc: sync err code when tcp connection was refused
9eb25e00f59b net: hns3: add return value for mailbox handling in PF
929c30c02de4 net: hns3: add validity check for message data length
e3ec78d82d48 net: hns3: modify the return code of hclge_get_ring_chain_from_mbx 06a40e71053a cpufreq: fix memory leak in sun50i_cpufreq_nvmem_probe
fb172e93f861 pinctrl: pistachio: fix use of irq_of_parse_and_map()
8f042884aff8 arm64: dts: imx8mn-ddr4-evk: Describe the 32.768 kHz PMIC clock 73c35379dbdf ARM: dts: imx6ull-colibri: fix vqmmc regulator
61a89d0a5bce sctp: check asoc strreset_chunk in sctp_generate_reconf_event
41d6ac687da8 wireguard: device: check for metadata_dst with skb_valid_dst()
3c464db03c12 tcp: ensure to use the most recently sent skb when filling the rate sample ce4c3f708787 pinctrl: stm32: Keep pinctrl block clock enabled when LEVEL IRQ requested 0c60271df026 tcp: md5: incorrect tcp_header_len for incoming connections
f4dad5a48db5 pinctrl: rockchip: fix RK3308 pinmux bits
9ef33d23f86f bpf, lwt: Fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook 6ac03e6ddde9 netfilter: nft_set_rbtree: overlap detection with element re-addition after deletion 72ae15d5ce5f net: dsa: Add missing of_node_put() in dsa_port_link_register_of 14cc2044c17e memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode 690c1bc4bfcf pinctrl: stm32: Do not call stm32_gpio_get() for edge triggered IRQs in EOI 6f2bf9c5ddfe mtd: fix 'part' field data corruption in mtd_info
4da421035baa mtd: rawnand: Fix return value check of wait_for_completion_timeout 94ca69b70225 pinctrl: mediatek: moore: Fix build error
123b7e0388e7 ipvs: correctly print the memory size of ip_vs_conn_tab
f4446f213623 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35
4a526cc29cba ARM: dts: am3517-evm: Fix misc pinmuxing
b622bca852f6 ARM: dts: Fix mmc order for omap3-gta04
9419d27fe142 phy: ti: Add missing pm_runtime_disable() in serdes_am654_probe 9e00a6e1fd71 phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe eb659608e61e ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name
bb524f5a95f2 ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek
4691ce8f28da phy: ti: omap-usb2: Fix error handling in omap_usb2_enable_clocks 76d1591a38c6 bus: ti-sysc: Make omap3 gpt12 quirk handling SoC specific
1b9855bf31e2 ARM: OMAP2+: Fix refcount leak in omap_gic_of_init
93cc8f184e3c phy: samsung: exynos5250-sata: fix missing device put in probe error paths 3ca74915702e phy: samsung: Fix missing of_node_put() in exynos_sata_phy_probe 8f7644ac24ba ARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issue
23b0711fcd3c USB: Fix xhci event ring dequeue pointer ERDP update issue
712302aed104 mtd: rawnand: fix ecc parameters for mt7622
207c7af3418f iio:imu:bmi160: disable regulator in error path
70d2df257eed arm64: dts: meson: remove CPU opps below 1GHz for SM1 boards
2d320609be49 arm64: dts: meson: remove CPU opps below 1GHz for G12B boards
c4fb41bdf4d6 video: fbdev: udlfb: properly check endpoint type
0967830e720d iocost: don't reset the inuse weight of under-weighted debtors
ad604cbd1d54 x86/pci/xen: Disable PCI/MSI[-X] masking for XEN_HVM guests
8fcce58c59dd riscv: patch_text: Fixup last cpu should be master
51477d3b387b hex2bin: fix access beyond string end
616d354fb9e8 hex2bin: make the function hex_to_bin constant-time
1633cb2d4a1d pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config
bdc3ad925131 arch_topology: Do not set llc_sibling if llc_id is invalid
aaee3f661799 serial: 8250: Correct the clock for EndRun PTP/1588 PCIe device 662f945a2091 serial: 8250: Also set sticky MCR bits in console restoration
8be962c89de6 serial: imx: fix overrun interrupts in DMA mode
d22d92230ffb usb: phy: generic: Get the vbus supply
b820764c6450 usb: cdns3: Fix issue for clear halt endpoint
bd7f84708ea0 usb: dwc3: gadget: Return proper request status
a633b8c34149 usb: dwc3: core: Only handle soft-reset in DCTL
5fa59bb867a0 usb: dwc3: core: Fix tx/rx threshold settings
140801d3fbd3 usb: dwc3: Try usb-role-switch first in dwc3_drd_init
4dd5feb27939 usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind() 6c3da0e19c98 usb: gadget: uvc: Fix crash when encoding data for usb request
fb1fe1a4557a usb: typec: ucsi: Fix role swapping
06826eb0631c usb: typec: ucsi: Fix reuse of completion structure
7b510d4bb468 usb: misc: fix improper handling of refcount in uss720_probe()
bb8ecca2ddf9 iio: imu: inv_icm42600: Fix I2C init possible nack
ca2b54b6ad69 iio: magnetometer: ak8975: Fix the error handling in ak8975_power_on() 1060604fc7f2 iio: dac: ad5446: Fix read_raw not returning set value
6ff33c01befb iio: dac: ad5592r: Fix the missing return value.
06ada9487f24 xhci: increase usb U3 -> U0 link resume timeout from 100ms to 500ms e1be0001664d xhci: stop polling roothubs after shutdown
2eb6c8689146 xhci: Enable runtime PM on second Alderlake controller
63eda431b2f7 USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions e9971dac69a3 USB: serial: option: add support for Cinterion MV32-WA/MV32-WB
34ff5455eed2 USB: serial: cp210x: add PIDs for Kamstrup USB Meter Reader
729a81ae101b USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS 008ba29f339d USB: quirks: add STRING quirk for VCOM device
ac6ad0ef83cf USB: quirks: add a Realtek card reader
8ba02cebb734 usb: mtu3: fix USB 3.0 dual-role-switch from device to host
549209caabc8 lightnvm: disable the subsystem
54c028cfc496 floppy: disable FDRAWCMD by default

---
 .../linux/linux-yocto-rt_5.10.bb              |  6 ++---
 .../linux/linux-yocto-tiny_5.10.bb            |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +3 -3
index 62d7494b88..ad206e4235 100644
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "88b754b80392e1f1ac7df46595f9712edc8aec02"
-SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3"
+SRCREV_machine ?= "a8d19259c63cbf1254fe545d0a1aacf8f82547ac"
+SRCREV_meta ?= "b368b4c1c8ee0e0e7573caa7f1596c3385ad855f"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.10.113"
+LINUX_VERSION ?= "5.10.114"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +4 -4
index e0c693fed2..9a8e6ecffc 100644
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.10.113"
+LINUX_VERSION ?= "5.10.114"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine:qemuarm ?= "7dacc8332b0bc5600d97583f45b841c9724f2191"
-SRCREV_machine ?= "8dc46fa883d7b9a3412791f6731096e2e516d949"
-SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3"
+SRCREV_machine:qemuarm ?= "a0664baa09b1c6265bd404e4d3a7ceb14577dcb8"
+SRCREV_machine ?= "63b2e48029f00bfc90371adc378050181ba5d253"
+SRCREV_meta ?= "b368b4c1c8ee0e0e7573caa7f1596c3385ad855f"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.10.bb +12 -12
index 37f2db88a7..ffd9538633 100644
@@ -13,23 +13,23 @@ KBRANCH:qemux86  ?= "v5.10/standard/base"
 KBRANCH:qemux86-64 ?= "v5.10/standard/base"
 KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "6092497574895b1179a3c7a9e07c7f40c2d4c136"
-SRCREV_machine:qemuarm64 ?= "97ad6c5f9ffdb6b108cbbf99d9061dd0fe03e4e8"
-SRCREV_machine:qemumips ?= "e53b2d1867f7bdc2c0cc904a15992178688c3ad4"
-SRCREV_machine:qemuppc ?= "b12ed76165bfc9fe2b99fcc224b5e0134b7b533f"
-SRCREV_machine:qemuriscv64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
-SRCREV_machine:qemuriscv32 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
-SRCREV_machine:qemux86 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
-SRCREV_machine:qemux86-64 ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
-SRCREV_machine:qemumips64 ?= "07580586b738406b4dec9bf91d4eecdb933f2a07"
-SRCREV_machine ?= "a8b4c628f382412e5e7df5750f2be711df95fa06"
-SRCREV_meta ?= "7767ab05bd3e525a287a7f9bfd780005b5eb25a3"
+SRCREV_machine:qemuarm ?= "49e2af0d85dc824c7829427c18e06ad2b1abbb8d"
+SRCREV_machine:qemuarm64 ?= "2b403ec0a7f60be807890902dbd0d5467bdef545"
+SRCREV_machine:qemumips ?= "793de0c2e4a3aa0e2f3091af8ff06df35f156fb3"
+SRCREV_machine:qemuppc ?= "9875eb3923e3d20893774ee7304142e2ce5ab22b"
+SRCREV_machine:qemuriscv64 ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437"
+SRCREV_machine:qemuriscv32 ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437"
+SRCREV_machine:qemux86 ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437"
+SRCREV_machine:qemux86-64 ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437"
+SRCREV_machine:qemumips64 ?= "4c3d57cc8bec91ea6225a7c9f134fd97bc1e8e0d"
+SRCREV_machine ?= "8ce5741d3f6c0aa649aca5f89ee8d1022f530437"
+SRCREV_meta ?= "b368b4c1c8ee0e0e7573caa7f1596c3385ad855f"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.113"
+LINUX_VERSION ?= "5.10.114"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.19.1
#5 lore raw

PATCH 5/5 lttng-modules: fix build against 5.18-rc7+

In reply to [email protected]

From: Bruce Ashfield <[email protected]>

lttng-modules fails to build against 5.18-rc7, the details of the fix are as follows:

The commit [fix: sched/tracing: Don't re-read p->state when emitting sched_switch event (v5.18)] was correct, but the kernel changed their mind with the following commit:

commit 9c2136be0878c88c53dea26943ce40bb03ad8d8d
Author: Delyan Kratunov <[email protected]>
Date: Wed May 11 18:28:36 2022 +0000

sched/tracing: Append prev_state to tp args instead

Commit fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting sched_switch event, 2022-01-20) added a new prev_state argument to the sched_switch tracepoint, before the prev task_struct pointer.

This reordering of arguments broke BPF programs that use the raw tracepoint (e.g. tp_btf programs). The type of the second argument has changed and existing programs that assume a task_struct* argument (e.g. for bpf_task_storage access) will now fail to verify.

If we instead append the new argument to the end, all existing programs would continue to work and can conditionally extract the prev_state argument on supported kernel versions.

Fixes fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting sched_switch event, 2022-01-20)

By reordering the parameters (again) we can get back up and building.

Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2022-May/030185.html]

---
 ...x-__trace_sched_switch_state-5.18-rc.patch | 88 +++++++++++++++++++
 .../lttng/lttng-modules_2.13.3.bb             |  1 +
 2 files changed, 89 insertions(+)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-sched-tracing-fix-__trace_sched_switch_state-5.18-rc.patch
meta/recipes-kernel/lttng/lttng-modules/0001-sched-tracing-fix-__trace_sched_switch_state-5.18-rc.patch new file +88 -0
new file mode 100644
index 0000000000..1f6e8a3c34
@@ -0,0 +1,88 @@
+From fbcc510cab67b918a6103c3b1903b1b69f28d399 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Thu, 19 May 2022 10:46:19 -0400
+Subject: [PATCH] sched/tracing: fix __trace_sched_switch_state (5.18-rc7+)
+
+The commit [fix: sched/tracing: Don't re-read p->state when emitting
+sched_switch event (v5.18)] was correct, but the kernel changed their
+mind with the following commit:
+
+   commit 9c2136be0878c88c53dea26943ce40bb03ad8d8d
+   Author: Delyan Kratunov <[email protected]>
+   Date:   Wed May 11 18:28:36 2022 +0000
+
+       sched/tracing: Append prev_state to tp args instead
+
+       Commit fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting
+       sched_switch event, 2022-01-20) added a new prev_state argument to the
+       sched_switch tracepoint, before the prev task_struct pointer.
+
+       This reordering of arguments broke BPF programs that use the raw
+       tracepoint (e.g. tp_btf programs). The type of the second argument has
+       changed and existing programs that assume a task_struct* argument
+       (e.g. for bpf_task_storage access) will now fail to verify.
+
+       If we instead append the new argument to the end, all existing programs
+       would continue to work and can conditionally extract the prev_state
+       argument on supported kernel versions.
+
+       Fixes: fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting sched_switch event, 2022-01-20)
+       Signed-off-by: Delyan Kratunov <[email protected]>
+       Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
+       Acked-by: Steven Rostedt (Google) <[email protected]>
+       Link: https://lkml.kernel.org/r/[email protected]
+
+By reordering the parameters (again) we can get back up and building.
+
+Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2022-May/030185.html]
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ include/instrumentation/events/sched.h | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h
+index 339bec9..f9e9c38 100644
+--- a/include/instrumentation/events/sched.h
++++ b/include/instrumentation/events/sched.h
+@@ -23,8 +23,9 @@
+ #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
+ 
+ static inline long __trace_sched_switch_state(bool preempt,
+-		unsigned int prev_state,
+-		struct task_struct *p)
++		struct task_struct *p,
++		struct task_struct *n,
++		unsigned int prev_state )
+ {
+         unsigned int state;
+ 
+@@ -356,20 +357,20 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
+ LTTNG_TRACEPOINT_EVENT(sched_switch,
+ 
+ 	TP_PROTO(bool preempt,
+-		unsigned int prev_state,
+ 		struct task_struct *prev,
+-		struct task_struct *next),
++		struct task_struct *next,
++		unsigned int prev_state),
+ 
+-	TP_ARGS(preempt, prev_state, prev, next),
++	TP_ARGS(preempt, prev, next, prev_state),
+ 
+ 	TP_FIELDS(
+ 		ctf_array_text(char, prev_comm,	prev->comm, TASK_COMM_LEN)
+ 		ctf_integer(pid_t, prev_tid, prev->pid)
+ 		ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)
+ #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+-		ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev))
++		ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev, next, prev_state))
+ #else
+-		ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev))
++		ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev, next, prev_state))
+ #endif
+ 		ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)
+ 		ctf_integer(pid_t, next_tid, next->pid)
+-- 
+2.19.1
+
meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb +1 -0
index 2b00534e53..96b6491a4b 100644
@@ -20,6 +20,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch \
            file://0009-Rename-genhd-wrapper-to-blkdev.patch \
            file://0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch \
+           file://0001-sched-tracing-fix-__trace_sched_switch_state-5.18-rc.patch \
           "
 
 # Use :append here so that the patch is applied also when using devupstream
Signature · 1 line
2.19.1
#6 lore raw

Re: [PATCH 5/5] lttng-modules: fix build against 5.18-rc7+

Quoted 35 lines · On Thu, May 19, 2022 at 11:15 AM <[email protected]> wrote:

From: Bruce Ashfield <[email protected]>

lttng-modules fails to build against 5.18-rc7, the details of the fix are as follows:

The commit [fix: sched/tracing: Don't re-read p->state when emitting sched_switch event (v5.18)] was correct, but the kernel changed their mind with the following commit:

commit 9c2136be0878c88c53dea26943ce40bb03ad8d8d
Author: Delyan Kratunov <[email protected]>
Date: Wed May 11 18:28:36 2022 +0000

sched/tracing: Append prev_state to tp args instead

Commit fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting sched_switch event, 2022-01-20) added a new prev_state argument to the sched_switch tracepoint, before the prev task_struct pointer.

This reordering of arguments broke BPF programs that use the raw tracepoint (e.g. tp_btf programs). The type of the second argument has changed and existing programs that assume a task_struct* argument (e.g. for bpf_task_storage access) will now fail to verify.

If we instead append the new argument to the end, all existing programs would continue to work and can conditionally extract the prev_state argument on supported kernel versions.

Fixes fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting sched_switch event, 2022-01-20)
Quoted 3 lines

By reordering the parameters (again) we can get back up and building.

Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2022-May/030185.html]

Upstream has a fix in flight as well, that should merge today.

We can hold on this patch, and I'll update it tomorrow (or as soon as) the patch lands in lttng-modules.

Bruce

Quoted 116 lines
---
 ...x-__trace_sched_switch_state-5.18-rc.patch | 88 +++++++++++++++++++
 .../lttng/lttng-modules_2.13.3.bb             |  1 +
 2 files changed, 89 insertions(+)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-sched-tracing-fix-__trace_sched_switch_state-5.18-rc.patch
meta/recipes-kernel/lttng/lttng-modules/0001-sched-tracing-fix-__trace_sched_switch_state-5.18-rc.patch new file +88 -0
new file mode 100644
index 0000000000..1f6e8a3c34
@@ -0,0 +1,88 @@
+From fbcc510cab67b918a6103c3b1903b1b69f28d399 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Thu, 19 May 2022 10:46:19 -0400
+Subject: [PATCH] sched/tracing: fix __trace_sched_switch_state (5.18-rc7+)
+
+The commit [fix: sched/tracing: Don't re-read p->state when emitting
+sched_switch event (v5.18)] was correct, but the kernel changed their
+mind with the following commit:
+
+   commit 9c2136be0878c88c53dea26943ce40bb03ad8d8d
+   Author: Delyan Kratunov <[email protected]>
+   Date:   Wed May 11 18:28:36 2022 +0000
+
+       sched/tracing: Append prev_state to tp args instead
+
+       Commit fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting
+       sched_switch event, 2022-01-20) added a new prev_state argument to the
+       sched_switch tracepoint, before the prev task_struct pointer.
+
+       This reordering of arguments broke BPF programs that use the raw
+       tracepoint (e.g. tp_btf programs). The type of the second argument has
+       changed and existing programs that assume a task_struct* argument
+       (e.g. for bpf_task_storage access) will now fail to verify.
+
+       If we instead append the new argument to the end, all existing programs
+       would continue to work and can conditionally extract the prev_state
+       argument on supported kernel versions.
+
+       Fixes: fa2c3254d7cf (sched/tracing: Don't re-read p->state when emitting sched_switch event, 2022-01-20)
+       Signed-off-by: Delyan Kratunov <[email protected]>
+       Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
+       Acked-by: Steven Rostedt (Google) <[email protected]>
+       Link: https://lkml.kernel.org/r/[email protected]
+
+By reordering the parameters (again) we can get back up and building.
+
+Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2022-May/030185.html]
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ include/instrumentation/events/sched.h | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h
+index 339bec9..f9e9c38 100644
+--- a/include/instrumentation/events/sched.h
++++ b/include/instrumentation/events/sched.h
+@@ -23,8 +23,9 @@
+ #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
+
+ static inline long __trace_sched_switch_state(bool preempt,
+-              unsigned int prev_state,
+-              struct task_struct *p)
++              struct task_struct *p,
++              struct task_struct *n,
++              unsigned int prev_state )
+ {
+         unsigned int state;
+
+@@ -356,20 +357,20 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
+ LTTNG_TRACEPOINT_EVENT(sched_switch,
+
+       TP_PROTO(bool preempt,
+-              unsigned int prev_state,
+               struct task_struct *prev,
+-              struct task_struct *next),
++              struct task_struct *next,
++              unsigned int prev_state),
+
+-      TP_ARGS(preempt, prev_state, prev, next),
++      TP_ARGS(preempt, prev, next, prev_state),
+
+       TP_FIELDS(
+               ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, prev_tid, prev->pid)
+               ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)
+ #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+-              ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev))
++              ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev, next, prev_state))
+ #else
+-              ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev))
++              ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev, next, prev_state))
+ #endif
+               ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, next_tid, next->pid)
+--
+2.19.1
+
meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb +1 -1
index 2b00534e53..96b6491a4b 100644
@@ -20,6 +20,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch \
            file://0009-Rename-genhd-wrapper-to-blkdev.patch \
            file://0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch \
+           file://0001-sched-tracing-fix-__trace_sched_switch_state-5.18-rc.patch \
           "
 
 # Use :append here so that the patch is applied also when using devupstream
--

2.19.1

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II