Merge 539fbb9123 ("Merge tag 'thermal-6.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline
Steps on the way to v6.11-rc1 Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I0573b4aaae096934178b9908a5e32a9b9583c16e
This commit is contained in:
Lee Jones
Treehugger Robot
+25
-1
@@ -28,6 +28,7 @@ my %verbose_messages = ();
|
||||
my %verbose_emitted = ();
|
||||
my $tree = 1;
|
||||
my $chk_signoff = 1;
|
||||
my $chk_fixes_tag = 1;
|
||||
my $chk_patch = 1;
|
||||
my $tst_only;
|
||||
my $emacs = 0;
|
||||
@@ -88,6 +89,7 @@ Options:
|
||||
-v, --verbose verbose mode
|
||||
--no-tree run without a kernel tree
|
||||
--no-signoff do not check for 'Signed-off-by' line
|
||||
--no-fixes-tag do not check for 'Fixes:' tag
|
||||
--patch treat FILE as patchfile (default)
|
||||
--emacs emacs compile window format
|
||||
--terse one line per report
|
||||
@@ -295,6 +297,7 @@ GetOptions(
|
||||
'v|verbose!' => \$verbose,
|
||||
'tree!' => \$tree,
|
||||
'signoff!' => \$chk_signoff,
|
||||
'fixes-tag!' => \$chk_fixes_tag,
|
||||
'patch!' => \$chk_patch,
|
||||
'emacs!' => \$emacs,
|
||||
'terse!' => \$terse,
|
||||
@@ -1257,6 +1260,7 @@ sub git_commit_info {
|
||||
}
|
||||
|
||||
$chk_signoff = 0 if ($file);
|
||||
$chk_fixes_tag = 0 if ($file);
|
||||
|
||||
my @rawlines = ();
|
||||
my @lines = ();
|
||||
@@ -2636,6 +2640,9 @@ sub process {
|
||||
|
||||
our $clean = 1;
|
||||
my $signoff = 0;
|
||||
my $fixes_tag = 0;
|
||||
my $is_revert = 0;
|
||||
my $needs_fixes_tag = "";
|
||||
my $author = '';
|
||||
my $authorsignoff = 0;
|
||||
my $author_sob = '';
|
||||
@@ -3189,6 +3196,16 @@ sub process {
|
||||
}
|
||||
}
|
||||
|
||||
# These indicate a bug fix
|
||||
if (!$in_header_lines && !$is_patch &&
|
||||
$line =~ /^This reverts commit/) {
|
||||
$is_revert = 1;
|
||||
}
|
||||
|
||||
if (!$in_header_lines && !$is_patch &&
|
||||
$line =~ /((?:(?:BUG: K.|UB)SAN: |Call Trace:|stable\@|syzkaller))/) {
|
||||
$needs_fixes_tag = $1;
|
||||
}
|
||||
|
||||
# Check Fixes: styles is correct
|
||||
if (!$in_header_lines &&
|
||||
@@ -3201,6 +3218,7 @@ sub process {
|
||||
my $id_length = 1;
|
||||
my $id_case = 1;
|
||||
my $title_has_quotes = 0;
|
||||
$fixes_tag = 1;
|
||||
|
||||
if ($line =~ /(\s*fixes:?)\s+([0-9a-f]{5,})\s+($balanced_parens)/i) {
|
||||
my $tag = $1;
|
||||
@@ -3858,7 +3876,7 @@ sub process {
|
||||
}
|
||||
|
||||
if ($msg_type ne "" &&
|
||||
(show_type("LONG_LINE") || show_type($msg_type))) {
|
||||
show_type("LONG_LINE") && show_type($msg_type)) {
|
||||
my $msg_level = \&WARN;
|
||||
$msg_level = \&CHK if ($file);
|
||||
&{$msg_level}($msg_type,
|
||||
@@ -7697,6 +7715,12 @@ sub process {
|
||||
ERROR("NOT_UNIFIED_DIFF",
|
||||
"Does not appear to be a unified-diff format patch\n");
|
||||
}
|
||||
if ($is_patch && $has_commit_log && $chk_fixes_tag) {
|
||||
if ($needs_fixes_tag ne "" && !$is_revert && !$fixes_tag) {
|
||||
WARN("MISSING_FIXES_TAG",
|
||||
"The commit message has '$needs_fixes_tag', perhaps it also needs a 'Fixes:' tag?\n");
|
||||
}
|
||||
}
|
||||
if ($is_patch && $has_commit_log && $chk_signoff) {
|
||||
if ($signoff == 0) {
|
||||
ERROR("MISSING_SIGN_OFF",
|
||||
|
||||
@@ -30,6 +30,7 @@ fi
|
||||
|
||||
READELF=${UTIL_PREFIX}readelf${UTIL_SUFFIX}
|
||||
ADDR2LINE=${UTIL_PREFIX}addr2line${UTIL_SUFFIX}
|
||||
NM=${UTIL_PREFIX}nm${UTIL_SUFFIX}
|
||||
|
||||
if [[ $1 == "-r" ]] ; then
|
||||
vmlinux=""
|
||||
@@ -158,7 +159,7 @@ parse_symbol() {
|
||||
if [[ $aarray_support == true && "${cache[$module,$name]+isset}" == "isset" ]]; then
|
||||
local base_addr=${cache[$module,$name]}
|
||||
else
|
||||
local base_addr=$(nm "$objfile" 2>/dev/null | awk '$3 == "'$name'" && ($2 == "t" || $2 == "T") {print $1; exit}')
|
||||
local base_addr=$(${NM} "$objfile" 2>/dev/null | awk '$3 == "'$name'" && ($2 == "t" || $2 == "T") {print $1; exit}')
|
||||
if [[ $base_addr == "" ]] ; then
|
||||
# address not found
|
||||
return
|
||||
@@ -282,6 +283,9 @@ handle_line() {
|
||||
|
||||
if [[ ${words[$last]} =~ \[([^]]+)\] ]]; then
|
||||
module=${words[$last]}
|
||||
# some traces format is "(%pS)", which like "(foo+0x0/0x1 [bar])"
|
||||
# so $module may like "[bar])". Strip the right parenthesis firstly
|
||||
module=${module%\)}
|
||||
module=${module#\[}
|
||||
module=${module%\]}
|
||||
modbuildid=${module#* }
|
||||
|
||||
+14
-9
@@ -33,7 +33,7 @@ class aarch64_page_ops():
|
||||
def __init__(self):
|
||||
self.SUBSECTION_SHIFT = 21
|
||||
self.SEBSECTION_SIZE = 1 << self.SUBSECTION_SHIFT
|
||||
self.MODULES_VSIZE = 128 * 1024 * 1024
|
||||
self.MODULES_VSIZE = 2 * 1024 * 1024 * 1024
|
||||
|
||||
if constants.LX_CONFIG_ARM64_64K_PAGES:
|
||||
self.SECTION_SIZE_BITS = 29
|
||||
@@ -47,8 +47,13 @@ class aarch64_page_ops():
|
||||
|
||||
self.VA_BITS = constants.LX_CONFIG_ARM64_VA_BITS
|
||||
if self.VA_BITS > 48:
|
||||
self.VA_BITS_MIN = 48
|
||||
self.vabits_actual = gdb.parse_and_eval('vabits_actual')
|
||||
if constants.LX_CONFIG_ARM64_16K_PAGES:
|
||||
self.VA_BITS_MIN = 47
|
||||
else:
|
||||
self.VA_BITS_MIN = 48
|
||||
tcr_el1 = gdb.execute("info registers $TCR_EL1", to_string=True)
|
||||
tcr_el1 = int(tcr_el1.split()[1], 16)
|
||||
self.vabits_actual = 64 - ((tcr_el1 >> 16) & 63)
|
||||
else:
|
||||
self.VA_BITS_MIN = self.VA_BITS
|
||||
self.vabits_actual = self.VA_BITS
|
||||
@@ -59,9 +64,9 @@ class aarch64_page_ops():
|
||||
if str(constants.LX_CONFIG_ARCH_FORCE_MAX_ORDER).isdigit():
|
||||
self.MAX_ORDER = constants.LX_CONFIG_ARCH_FORCE_MAX_ORDER
|
||||
else:
|
||||
self.MAX_ORDER = 11
|
||||
self.MAX_ORDER = 10
|
||||
|
||||
self.MAX_ORDER_NR_PAGES = 1 << (self.MAX_ORDER - 1)
|
||||
self.MAX_ORDER_NR_PAGES = 1 << (self.MAX_ORDER)
|
||||
self.PFN_SECTION_SHIFT = self.SECTION_SIZE_BITS - self.PAGE_SHIFT
|
||||
self.NR_MEM_SECTIONS = 1 << self.SECTIONS_SHIFT
|
||||
self.PAGES_PER_SECTION = 1 << self.PFN_SECTION_SHIFT
|
||||
@@ -89,10 +94,10 @@ class aarch64_page_ops():
|
||||
self.MODULES_VADDR = self._PAGE_END(self.VA_BITS_MIN)
|
||||
self.MODULES_END = self.MODULES_VADDR + self.MODULES_VSIZE
|
||||
|
||||
self.VMEMMAP_SHIFT = (self.PAGE_SHIFT - self.STRUCT_PAGE_MAX_SHIFT)
|
||||
self.VMEMMAP_SIZE = ((self._PAGE_END(self.VA_BITS_MIN) - self.PAGE_OFFSET) >> self.VMEMMAP_SHIFT)
|
||||
self.VMEMMAP_START = (-(1 << (self.VA_BITS - self.VMEMMAP_SHIFT))) & 0xffffffffffffffff
|
||||
self.VMEMMAP_END = self.VMEMMAP_START + self.VMEMMAP_SIZE
|
||||
self.VMEMMAP_RANGE = self._PAGE_END(self.VA_BITS_MIN) - self.PAGE_OFFSET
|
||||
self.VMEMMAP_SIZE = (self.VMEMMAP_RANGE >> self.PAGE_SHIFT) * self.struct_page_size
|
||||
self.VMEMMAP_END = (-(1 * 1024 * 1024 * 1024)) & 0xffffffffffffffff
|
||||
self.VMEMMAP_START = self.VMEMMAP_END - self.VMEMMAP_SIZE
|
||||
|
||||
self.VMALLOC_START = self.MODULES_END
|
||||
self.VMALLOC_END = self.VMEMMAP_START - 256 * 1024 * 1024
|
||||
|
||||
@@ -27,14 +27,18 @@ def stack_depot_fetch(handle):
|
||||
offset = parts['offset'] << DEPOT_STACK_ALIGN
|
||||
pools_num = gdb.parse_and_eval('pools_num')
|
||||
|
||||
if parts['pool_index'] > pools_num:
|
||||
if handle == 0:
|
||||
raise gdb.GdbError("handle is 0\n")
|
||||
|
||||
pool_index = parts['pool_index_plus_1'] - 1
|
||||
if pool_index >= pools_num:
|
||||
gdb.write("pool index %d out of bounds (%d) for stack id 0x%08x\n" % (parts['pool_index'], pools_num, handle))
|
||||
return gdb.Value(0), 0
|
||||
|
||||
stack_pools = gdb.parse_and_eval('stack_pools')
|
||||
|
||||
try:
|
||||
pool = stack_pools[parts['pool_index']]
|
||||
pool = stack_pools[pool_index]
|
||||
stack = (pool + gdb.Value(offset).cast(utils.get_size_t_type())).cast(stack_record_type.get_type().pointer())
|
||||
size = int(stack['size'].cast(utils.get_ulong_type()))
|
||||
return stack['entries'], size
|
||||
|
||||
+4
-15
@@ -778,17 +778,14 @@ static void check_section(const char *modname, struct elf_info *elf,
|
||||
|
||||
|
||||
#define ALL_INIT_DATA_SECTIONS \
|
||||
".init.setup", ".init.rodata", ".meminit.rodata", \
|
||||
".init.data", ".meminit.data"
|
||||
".init.setup", ".init.rodata", ".init.data"
|
||||
|
||||
#define ALL_PCI_INIT_SECTIONS \
|
||||
".pci_fixup_early", ".pci_fixup_header", ".pci_fixup_final", \
|
||||
".pci_fixup_enable", ".pci_fixup_resume", \
|
||||
".pci_fixup_resume_early", ".pci_fixup_suspend"
|
||||
|
||||
#define ALL_XXXINIT_SECTIONS ".meminit.*"
|
||||
|
||||
#define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS
|
||||
#define ALL_INIT_SECTIONS ".init.*"
|
||||
#define ALL_EXIT_SECTIONS ".exit.*"
|
||||
|
||||
#define DATA_SECTIONS ".data", ".data.rel"
|
||||
@@ -799,9 +796,7 @@ static void check_section(const char *modname, struct elf_info *elf,
|
||||
".fixup", ".entry.text", ".exception.text", \
|
||||
".coldtext", ".softirqentry.text"
|
||||
|
||||
#define INIT_SECTIONS ".init.*"
|
||||
|
||||
#define ALL_TEXT_SECTIONS ".init.text", ".meminit.text", ".exit.text", \
|
||||
#define ALL_TEXT_SECTIONS ".init.text", ".exit.text", \
|
||||
TEXT_SECTIONS, OTHER_TEXT_SECTIONS
|
||||
|
||||
enum mismatch {
|
||||
@@ -841,12 +836,6 @@ static const struct sectioncheck sectioncheck[] = {
|
||||
.bad_tosec = { ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL },
|
||||
.mismatch = TEXTDATA_TO_ANY_INIT_EXIT,
|
||||
},
|
||||
/* Do not reference init code/data from meminit code/data */
|
||||
{
|
||||
.fromsec = { ALL_XXXINIT_SECTIONS, NULL },
|
||||
.bad_tosec = { INIT_SECTIONS, NULL },
|
||||
.mismatch = XXXINIT_TO_SOME_INIT,
|
||||
},
|
||||
/* Do not use exit code/data from init code */
|
||||
{
|
||||
.fromsec = { ALL_INIT_SECTIONS, NULL },
|
||||
@@ -861,7 +850,7 @@ static const struct sectioncheck sectioncheck[] = {
|
||||
},
|
||||
{
|
||||
.fromsec = { ALL_PCI_INIT_SECTIONS, NULL },
|
||||
.bad_tosec = { INIT_SECTIONS, NULL },
|
||||
.bad_tosec = { ALL_INIT_SECTIONS, NULL },
|
||||
.mismatch = ANY_INIT_TO_ANY_EXIT,
|
||||
},
|
||||
{
|
||||
|
||||
@@ -176,8 +176,10 @@ assigment||assignment
|
||||
assigments||assignments
|
||||
assistent||assistant
|
||||
assocaited||associated
|
||||
assocated||associated
|
||||
assocating||associating
|
||||
assocation||association
|
||||
assocative||associative
|
||||
associcated||associated
|
||||
assotiated||associated
|
||||
asssert||assert
|
||||
@@ -543,6 +545,7 @@ direcly||directly
|
||||
direectly||directly
|
||||
diregard||disregard
|
||||
disassocation||disassociation
|
||||
disassocative||disassociative
|
||||
disapear||disappear
|
||||
disapeared||disappeared
|
||||
disappared||disappeared
|
||||
|
||||
Reference in New Issue
Block a user