Skip to content

Commit 58b7584

Browse files
committed
Rebuild rocky8_8 with kernel-4.18.0-477.27.1.el8_8
Rebuild_History BUILDABLERebuilding Kernel from rpm changelog with Fuzz Limit: 87.50% Number of commits in upstream range v4.18~1..master: 488125 Number of commits in rpm: 118 Number of commits matched with upstream: 106 (89.83%) Number of commits in upstream but not in rpm: 488019 Number of commits NOT found in upstream: 12 (10.17%) Rebuilding Kernel on Branch rocky8_8_rebuild_kernel-4.18.0-477.27.1.el8_8 for kernel-4.18.0-477.27.1.el8_8 Clean Cherry Picks: 63 (59.43%) Empty Cherry Picks: 41 (38.68%) _______________________________ Full Details Located here: ciq/ciq_backports/kernel-4.18.0-477.27.1.el8_8/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 ec96ec6 commit 58b7584

Some content is hidden

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

72 files changed

+1451
-323
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4480,6 +4480,13 @@
44804480
Run specified binary instead of /init from the ramdisk,
44814481
used for early userspace startup. See initrd.
44824482

4483+
rdrand= [X86]
4484+
force - Override the decision by the kernel to hide the
4485+
advertisement of RDRAND support (this affects
4486+
certain AMD processors because of buggy BIOS
4487+
support, specifically around the suspend/resume
4488+
path).
4489+
44834490
rdt= [HW,X86,RDT]
44844491
Turn on/off individual RDT features. List is:
44854492
cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,

MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7671,6 +7671,12 @@ M: David E. Box <[email protected]>
76717671
S: Supported
76727672
F: drivers/platform/x86/intel/vsec.*
76737673

7674+
INTEL UNCORE FREQUENCY CONTROL
7675+
M: Srinivas Pandruvada <[email protected]>
7676+
7677+
S: Maintained
7678+
F: drivers/platform/x86/intel/uncore-frequency/
7679+
76747680
INTEL VIRTUAL BUTTON DRIVER
76757681
M: AceLan Kao <[email protected]>
76767682

Makefile.rhelver

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

1717
#
1818
# ZSTREAM

arch/arm64/mm/fault.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,11 +553,13 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
553553
return 0;
554554
}
555555

556+
/* The fault is fully completed (including releasing mmap lock) */
557+
if (fault & VM_FAULT_COMPLETED)
558+
return 0;
559+
556560
if (fault & VM_FAULT_RETRY) {
557-
if (mm_flags & FAULT_FLAG_ALLOW_RETRY) {
558-
mm_flags |= FAULT_FLAG_TRIED;
559-
goto retry;
560-
}
561+
mm_flags |= FAULT_FLAG_TRIED;
562+
goto retry;
561563
}
562564
mmap_read_unlock(mm);
563565

arch/powerpc/mm/copro_fault.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ int copro_handle_mm_fault(struct mm_struct *mm, unsigned long ea,
7878

7979
ret = 0;
8080
*flt = handle_mm_fault(vma, ea, is_write ? FAULT_FLAG_WRITE : 0, NULL);
81+
82+
/* The fault is fully completed (including releasing mmap lock) */
83+
if (*flt & VM_FAULT_COMPLETED)
84+
return 0;
85+
8186
if (unlikely(*flt & VM_FAULT_ERROR)) {
8287
if (*flt & VM_FAULT_OOM) {
8388
ret = -ENOMEM;

arch/powerpc/mm/fault.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -624,22 +624,25 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address,
624624
if (fault_signal_pending(fault, regs))
625625
return user_mode(regs) ? 0 : SIGBUS;
626626

627+
/* The fault is fully completed (including releasing mmap lock) */
628+
if (fault & VM_FAULT_COMPLETED)
629+
goto out;
630+
627631
/*
628632
* Handle the retry right now, the mmap_lock has been released in that
629633
* case.
630634
*/
631635
if (unlikely(fault & VM_FAULT_RETRY)) {
632-
if (flags & FAULT_FLAG_ALLOW_RETRY) {
633-
flags |= FAULT_FLAG_TRIED;
634-
goto retry;
635-
}
636+
flags |= FAULT_FLAG_TRIED;
637+
goto retry;
636638
}
637639

638640
mmap_read_unlock(current->mm);
639641

640642
if (unlikely(fault & VM_FAULT_ERROR))
641643
return mm_fault_error(regs, address, fault);
642644

645+
out:
643646
/*
644647
* Major/minor page fault accounting.
645648
*/

arch/powerpc/purgatory/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined
66
$(obj)/purgatory.ro: $(obj)/trampoline_$(BITS).o FORCE
77
$(call if_changed,ld)
88

9-
CMD_BIN2C = $(objtree)/scripts/basic/bin2c
109
quiet_cmd_bin2c = BIN2C $@
11-
cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@
10+
cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@
1211

1312
$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE
1413
$(call if_changed,bin2c)

arch/s390/kernel/syscalls/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \
2525
$(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
2626

2727
define filechk_syshdr
28-
$(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2"
28+
$(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2" < $<
2929
endef
3030

3131
define filechk_sysnr
32-
$(CONFIG_SHELL) '$(systbl)' -N -a $(sysnr_abi_$(basetarget))
32+
$(CONFIG_SHELL) '$(systbl)' -N -a $(sysnr_abi_$(basetarget)) < $<
3333
endef
3434

3535
define filechk_syscalls
36-
$(CONFIG_SHELL) '$(systbl)' -S
36+
$(CONFIG_SHELL) '$(systbl)' -S < $<
3737
endef
3838

3939
syshdr_abi_unistd_32 := common,32

arch/s390/mm/fault.c

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -522,25 +522,37 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access)
522522
goto out_up;
523523
goto out;
524524
}
525+
526+
/* The fault is fully completed (including releasing mmap lock) */
527+
if (fault & VM_FAULT_COMPLETED) {
528+
if (gmap) {
529+
mmap_read_lock(mm);
530+
goto out_gmap;
531+
}
532+
fault = 0;
533+
goto out;
534+
}
535+
525536
if (unlikely(fault & VM_FAULT_ERROR))
526537
goto out_up;
527538

528-
if (flags & FAULT_FLAG_ALLOW_RETRY) {
529-
if (fault & VM_FAULT_RETRY) {
530-
if (IS_ENABLED(CONFIG_PGSTE) && gmap &&
531-
(flags & FAULT_FLAG_RETRY_NOWAIT)) {
532-
/* FAULT_FLAG_RETRY_NOWAIT has been set,
533-
* mmap_lock has not been released */
534-
current->thread.gmap_pfault = 1;
535-
fault = VM_FAULT_PFAULT;
536-
goto out_up;
537-
}
538-
flags &= ~FAULT_FLAG_RETRY_NOWAIT;
539-
flags |= FAULT_FLAG_TRIED;
540-
mmap_read_lock(mm);
541-
goto retry;
539+
if (fault & VM_FAULT_RETRY) {
540+
if (IS_ENABLED(CONFIG_PGSTE) && gmap &&
541+
(flags & FAULT_FLAG_RETRY_NOWAIT)) {
542+
/*
543+
* FAULT_FLAG_RETRY_NOWAIT has been set, mmap_lock has
544+
* not been released
545+
*/
546+
current->thread.gmap_pfault = 1;
547+
fault = VM_FAULT_PFAULT;
548+
goto out_up;
542549
}
550+
flags &= ~FAULT_FLAG_RETRY_NOWAIT;
551+
flags |= FAULT_FLAG_TRIED;
552+
mmap_read_lock(mm);
553+
goto retry;
543554
}
555+
out_gmap:
544556
if (IS_ENABLED(CONFIG_PGSTE) && gmap) {
545557
address = __gmap_link(gmap, current->thread.gmap_addr,
546558
address);

arch/s390/purgatory/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ OBJCOPYFLAGS_purgatory.ro += --remove-section='.comment'
3737
OBJCOPYFLAGS_purgatory.ro += --remove-section='.note.*'
3838
$(obj)/purgatory.ro: $(obj)/purgatory FORCE
3939
$(call if_changed,objcopy)
40+
quiet_cmd_bin2c = BIN2C $@
41+
cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@
4042

4143
$(obj)/kexec-purgatory.o: $(obj)/kexec-purgatory.S $(obj)/purgatory.ro FORCE
4244
$(call if_changed_rule,as_o_S)

0 commit comments

Comments
 (0)