Skip to content

Commit cc9816c

Browse files
committed
Rebuild rocky9_5 with kernel-5.14.0-503.19.1.el9_5
Rebuild_History BUILDABLE Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50% Number of commits in upstream range v5.14~1..master: 244733 Number of commits in rpm: 42 Number of commits matched with upstream: 15 (35.71%) Number of commits in upstream but not in rpm: 244718 Number of commits NOT found in upstream: 27 (64.29%) Rebuilding Kernel on Branch rocky9_5_rebuild_kernel-5.14.0-503.19.1.el9_5 for kernel-5.14.0-503.19.1.el9_5 Clean Cherry Picks: 14 (93.33%) Empty Cherry Picks: 1 (6.67%) _______________________________ Full Details Located here: ciq/ciq_backports/kernel-5.14.0-503.19.1.el9_5/rebuild.details.txt Includes: * git commit header above * Empty Commits with upstream SHA * RPM ChangeLog Entries that could not be matched Individual Empty Commit failures contained in the same containing directory. The git message for empty commits will have the path for the failed commit. File names are the first 8 characters of the upstream SHA
1 parent e30bf12 commit cc9816c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+104413
-108011
lines changed
File renamed without changes.

Makefile.rhelver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RHEL_MINOR = 5
1212
#
1313
# Use this spot to avoid future merge conflicts.
1414
# Do not trim this comment.
15-
RHEL_RELEASE = 503.16.1
15+
RHEL_RELEASE = 503.19.1
1616

1717
#
1818
# ZSTREAM

arch/arm64/kernel/probes/decode-insn.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *api)
9999
aarch64_insn_is_blr(insn) ||
100100
aarch64_insn_is_ret(insn)) {
101101
api->handler = simulate_br_blr_ret;
102-
} else if (aarch64_insn_is_ldr_lit(insn)) {
103-
api->handler = simulate_ldr_literal;
104-
} else if (aarch64_insn_is_ldrsw_lit(insn)) {
105-
api->handler = simulate_ldrsw_literal;
106102
} else {
107103
/*
108104
* Instruction cannot be stepped out-of-line and we don't
@@ -140,6 +136,17 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
140136
probe_opcode_t insn = le32_to_cpu(*addr);
141137
probe_opcode_t *scan_end = NULL;
142138
unsigned long size = 0, offset = 0;
139+
struct arch_probe_insn *api = &asi->api;
140+
141+
if (aarch64_insn_is_ldr_lit(insn)) {
142+
api->handler = simulate_ldr_literal;
143+
decoded = INSN_GOOD_NO_SLOT;
144+
} else if (aarch64_insn_is_ldrsw_lit(insn)) {
145+
api->handler = simulate_ldrsw_literal;
146+
decoded = INSN_GOOD_NO_SLOT;
147+
} else {
148+
decoded = arm_probe_decode_insn(insn, &asi->api);
149+
}
143150

144151
/*
145152
* If there's a symbol defined in front of and near enough to
@@ -157,7 +164,6 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
157164
else
158165
scan_end = addr - MAX_ATOMIC_CONTEXT_SIZE;
159166
}
160-
decoded = arm_probe_decode_insn(insn, &asi->api);
161167

162168
if (decoded != INSN_REJECTED && scan_end)
163169
if (is_probed_address_atomic(addr - 1, scan_end))

arch/x86/kvm/svm/nested.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,12 @@ static u64 nested_svm_get_tdp_pdptr(struct kvm_vcpu *vcpu, int index)
6363
u64 pdpte;
6464
int ret;
6565

66+
/*
67+
* Note, nCR3 is "assumed" to be 32-byte aligned, i.e. the CPU ignores
68+
* nCR3[4:0] when loading PDPTEs from memory.
69+
*/
6670
ret = kvm_vcpu_read_guest_page(vcpu, gpa_to_gfn(cr3), &pdpte,
67-
offset_in_page(cr3) + index * 8, 8);
71+
(cr3 & GENMASK(11, 5)) + index * 8, 8);
6872
if (ret)
6973
return 0;
7074
return pdpte;
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Rebuild_History BUILDABLE
2+
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
3+
Number of commits in upstream range v5.14~1..master: 244733
4+
Number of commits in rpm: 42
5+
Number of commits matched with upstream: 15 (35.71%)
6+
Number of commits in upstream but not in rpm: 244718
7+
Number of commits NOT found in upstream: 27 (64.29%)
8+
9+
Rebuilding Kernel on Branch rocky9_5_rebuild_kernel-5.14.0-503.19.1.el9_5 for kernel-5.14.0-503.19.1.el9_5
10+
Clean Cherry Picks: 14 (93.33%)
11+
Empty Cherry Picks: 1 (6.67%)
12+
_______________________________
13+
14+
__EMPTY COMMITS__________________________
15+
bed2eb964c70b780fb55925892a74f26cb590b25 bpf: Fix a kernel verifier crash in stacksafe()
16+
17+
__CHANGES NOT IN UPSTREAM________________
18+
Porting to Rocky Linux 9, debranding and Rocky branding'
19+
Ensure aarch64 kernel is not compressed'
20+
xfrm: validate new SA's prefixlen using SA family when sel.family is unset
21+
xfrm: fix one more kernel-infoleak in algo dumping
22+
Revert "Merge: softlockup triggered by ethtool -d [rhel-9.5.z]"
23+
tracing/hwlat: Fix a race during cpuhp processing
24+
tracing/timerlat: Fix a race during cpuhp processing
25+
tracing/timerlat: Drop interface_lock in stop_kthread()
26+
tracing/timerlat: Fix duplicated kthread creation due to CPU online/offline
27+
ceph: remove the incorrect Fw reference check when dirtying pages
28+
bpf: Fix a sdiv overflow issue
29+
bpf: Fix out-of-bounds write in trie_get_next_key()
30+
bpf: Fix use-after-free in bpf_uprobe_multi_link_attach()
31+
KVM: nSVM: Ignore nCR3when loading PDPTEs from memory
32+
net: tighten bad gso csum offset check in virtio_net_hdr
33+
Bluetooth: hci: fix null-ptr-deref in hci_read_supported_codecs
34+
Bluetooth: ISO: Fix UAF on iso_sock_timeout
35+
Bluetooth: SCO: Fix UAF on sco_sock_timeout
36+
Bluetooth: bnep: fix wild-memory-access in proto_unregister
37+
arm64: probes: Remove broken LDR (literal) uprobe support
38+
qed: put cond_resched() in qed_dmae_operation_wait()
39+
qed: allow the callee of qed_mcp_nvm_read() to sleep
40+
qed: put cond_resched() in qed_grc_dump_ctx_data()
41+
qed: make 'ethtool -d' 10 times faster
42+
sched/numa: Fix the potential null pointer dereference in task_numa_work()
43+
irqchip/gic-v4: Correctly deal with set_affinity on lazily-mapped VPEs
44+
irqchip/gic-v4: Don't allow a VMOVP on a dying VPE

configs/cpupower.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# See 'cpupower help' and cpupower(1) for more info
2+
CPUPOWER_START_OPTS="frequency-set -g performance"
3+
CPUPOWER_STOP_OPTS="frequency-set -g ondemand"

0 commit comments

Comments
 (0)