Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 08:42:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git

Browse Source
This commit is contained in:
Stephen Rothwell 2024-12-20 15:11:33 +11:00
commit 5e76f6a874
5 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/process/handling-regressions.rst
View File

@ -29,9 +29,9 @@ The important bits (aka "The TL;DR")
* For mailed reports, check if the reporter included a line like ``#regzbot
introduced: v5.13..v5.14-rc1``. If not, send a reply (with the regressions
list in CC) containing a paragraph like the following, which tells regzbot
when the issue started to happen::
when the issue started to happen, preferably with a full git SHA::
#regzbot ^introduced: 1f2e3d4c5b6a
#regzbot ^introduced: 1f2e3d4c5b6a1524e886b7f1b8a0c1fc7321cac2
* When forwarding reports from a bug tracker to the regressions list (see
above), include a paragraph like the following::

4
Documentation/process/maintainer-tip.rst
View File

@ -284,7 +284,7 @@ following tag ordering scheme:
Commit
abcdef012345678 ("x86/xxx: Replace foo with bar")
ab0123456789 ("x86/xxx: Replace foo with bar")
left an unused instance of variable foo around. Remove it.
@ -295,7 +295,7 @@ following tag ordering scheme:
The recent replacement of foo with bar left an unused instance of
variable foo around. Remove it.
Fixes: abcdef012345678 ("x86/xxx: Replace foo with bar")
Fixes: ab0123456789 ("x86/xxx: Replace foo with bar")
Signed-off-by: J.Dev <j.dev@mail>
The latter puts the information about the patch into the focus and

6
Documentation/process/submitting-patches.rst
View File

@ -163,6 +163,12 @@ An example call::
$ git log -1 --pretty=fixes 54a4f0239f2e
Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed")
Note that the "Fixes" tag, while it does get parsed by machines, is intended
for humans (hence the Subject portion). It is preferred that hashes remain at
12 characters even in the face of prefix collisions. When encountering hash
prefix collisions, tools (and humans) need to resolve such collisions using
the parenthetical patch Subject.
.. _split_changes:
Separate your changes

44
include/trace/events/task.h
View File

@ -38,22 +38,56 @@ TRACE_EVENT(task_rename,
TP_ARGS(task, comm),
TP_STRUCT__entry(
__field( pid_t, pid)
__array( char, oldcomm, TASK_COMM_LEN)
__array( char, newcomm, TASK_COMM_LEN)
__field( short, oom_score_adj)
),
TP_fast_assign(
__entry->pid = task->pid;
memcpy(entry->oldcomm, task->comm, TASK_COMM_LEN);
strscpy(entry->newcomm, comm, TASK_COMM_LEN);
__entry->oom_score_adj = task->signal->oom_score_adj;
),
TP_printk("pid=%d oldcomm=%s newcomm=%s oom_score_adj=%hd",
__entry->pid, __entry->oldcomm,
__entry->newcomm, __entry->oom_score_adj)
TP_printk("oldcomm=%s newcomm=%s oom_score_adj=%hd",
__entry->oldcomm, __entry->newcomm, __entry->oom_score_adj)
);
/**
* task_prctl_unknown - called on unknown prctl() option
* @option: option passed
* @arg2: arg2 passed
* @arg3: arg3 passed
* @arg4: arg4 passed
* @arg5: arg5 passed
*
* Called on an unknown prctl() option.
*/
TRACE_EVENT(task_prctl_unknown,
TP_PROTO(int option, unsigned long arg2, unsigned long arg3,
unsigned long arg4, unsigned long arg5),
TP_ARGS(option, arg2, arg3, arg4, arg5),
TP_STRUCT__entry(
__field( int, option)
__field( unsigned long, arg2)
__field( unsigned long, arg3)
__field( unsigned long, arg4)
__field( unsigned long, arg5)
),
TP_fast_assign(
__entry->option = option;
__entry->arg2 = arg2;
__entry->arg3 = arg3;
__entry->arg4 = arg4;
__entry->arg5 = arg5;
),
TP_printk("option=%d arg2=%ld arg3=%ld arg4=%ld arg5=%ld",
__entry->option, __entry->arg2, __entry->arg3, __entry->arg4, __entry->arg5)
);
#endif

3
kernel/sys.c
View File

@ -75,6 +75,8 @@
#include <asm/io.h>
#include <asm/unistd.h>
#include <trace/events/task.h>
#include "uid16.h"
#ifndef SET_UNALIGN_CTL
@ -2810,6 +2812,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
error = arch_lock_shadow_stack_status(me, arg2);
break;
default:
trace_task_prctl_unknown(option, arg2, arg3, arg4, arg5);
error = -EINVAL;
break;
}