mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 01:04:41 +01:00
kmalloc_obj branch for v7.0-rc1
- Introduce kmalloc_obj*() family of type-based allocator APIs - checkpatch: Suggest kmalloc_obj family for sizeof allocations - coccinelle: Add kmalloc_objs conversion script -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRSPkdeREjth1dHnSE2KwveOeQkuwUCaYosbAAKCRA2KwveOeQk u+pzAPwK+re4aOGay+muhKaA5omh0wFz20a/BxjJVcDfp3qBcwEAhG7YGZ2cITH9 7dFgStecoHtvg8eObMq+W4XVwWdmeQQ= =52iK -----END PGP SIGNATURE----- Merge tag 'kmalloc_obj-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux Pull kmalloc_obj updates from Kees Cook: "Introduce the kmalloc_obj* family of APIs for switching to type-based kmalloc allocations, away from purely size-based allocations. Discussed on lkml, with you, and at Linux Plumbers. It's been in -next for the entire dev cycle. Before the merge window closes, I'd like to send the treewide change (generated from the Coccinelle script included here), which mechanically converts almost 20k callsites from kmalloc* to kmalloc_obj*: 8007 files changed, 19980 insertions(+), 20838 deletions(-) This change needed fixes for mismatched types (since now the return type from allocations is a pointer to the requested type, not "void *"), and I've been fixing these over the last 4 releases. These fixes have mostly been trivial mismatches with const qualifiers or accidentally identical sizes (e.g. same object size: "struct kvec" vs "struct iovec", or differing pointers to pointers), but I did catch one case of too-small allocation. Summary: - Introduce kmalloc_obj*() family of type-based allocator APIs - checkpatch: Suggest kmalloc_obj family for sizeof allocations - coccinelle: Add kmalloc_objs conversion script" * tag 'kmalloc_obj-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: coccinelle: Add kmalloc_objs conversion script slab: Introduce kmalloc_flex() and family compiler_types: Introduce __flex_counter() and family checkpatch: Suggest kmalloc_obj family for sizeof allocations slab: Introduce kmalloc_obj() and family
This commit is contained in:
Linus Torvalds
commit
958f7fb68c
6 changed files with 367 additions and 6 deletions
|
|
@ -7260,17 +7260,42 @@ sub process {
|
|||
"Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr);
|
||||
}
|
||||
|
||||
# check for (kv|k)[mz]alloc with multiplies that could be kmalloc_array/kvmalloc_array/kvcalloc/kcalloc
|
||||
# check for (kv|k)[mz]alloc that could be kmalloc_obj/kvmalloc_obj/kzalloc_obj/kvzalloc_obj
|
||||
if ($perl_version_ok &&
|
||||
defined $stat &&
|
||||
$stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*,/) {
|
||||
my $oldfunc = $3;
|
||||
my $a1 = $4;
|
||||
my $newfunc = "kmalloc_obj";
|
||||
$newfunc = "kvmalloc_obj" if ($oldfunc eq "kvmalloc");
|
||||
$newfunc = "kvzalloc_obj" if ($oldfunc eq "kvzalloc");
|
||||
$newfunc = "kzalloc_obj" if ($oldfunc eq "kzalloc");
|
||||
|
||||
if ($a1 =~ s/^sizeof\s*\S\(?([^\)]*)\)?$/$1/) {
|
||||
my $cnt = statement_rawlines($stat);
|
||||
my $herectx = get_stat_here($linenr, $cnt, $here);
|
||||
|
||||
if (WARN("ALLOC_WITH_SIZEOF",
|
||||
"Prefer $newfunc over $oldfunc with sizeof\n" . $herectx) &&
|
||||
$cnt == 1 &&
|
||||
$fix) {
|
||||
$fixed[$fixlinenr] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*,/$1 = $newfunc($a1,/;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# check for (kv|k)[mz]alloc with multiplies that could be kmalloc_objs/kvmalloc_objs/kzalloc_objs/kvzalloc_objs
|
||||
if ($perl_version_ok &&
|
||||
defined $stat &&
|
||||
$stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/) {
|
||||
my $oldfunc = $3;
|
||||
my $a1 = $4;
|
||||
my $a2 = $10;
|
||||
my $newfunc = "kmalloc_array";
|
||||
$newfunc = "kvmalloc_array" if ($oldfunc eq "kvmalloc");
|
||||
$newfunc = "kvcalloc" if ($oldfunc eq "kvzalloc");
|
||||
$newfunc = "kcalloc" if ($oldfunc eq "kzalloc");
|
||||
my $newfunc = "kmalloc_objs";
|
||||
$newfunc = "kvmalloc_objs" if ($oldfunc eq "kvmalloc");
|
||||
$newfunc = "kvzalloc_objs" if ($oldfunc eq "kvzalloc");
|
||||
$newfunc = "kzalloc_objs" if ($oldfunc eq "kzalloc");
|
||||
my $r1 = $a1;
|
||||
my $r2 = $a2;
|
||||
if ($a1 =~ /^sizeof\s*\S/) {
|
||||
|
|
@ -7286,7 +7311,9 @@ sub process {
|
|||
"Prefer $newfunc over $oldfunc with multiply\n" . $herectx) &&
|
||||
$cnt == 1 &&
|
||||
$fix) {
|
||||
$fixed[$fixlinenr] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1 . ' = ' . "$newfunc(" . trim($r1) . ', ' . trim($r2)/e;
|
||||
my $sized = trim($r2);
|
||||
$sized =~ s/^sizeof\s*\S\(?([^\)]*)\)?$/$1/;
|
||||
$fixed[$fixlinenr] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1 . ' = ' . "$newfunc(" . $sized . ', ' . trim($r1)/e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
124
scripts/coccinelle/api/kmalloc_objs.cocci
Normal file
124
scripts/coccinelle/api/kmalloc_objs.cocci
Normal file
|
|
@ -0,0 +1,124 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/// Use kmalloc_obj family of macros for allocations
|
||||
///
|
||||
// Confidence: High
|
||||
// Options: --include-headers-for-types --all-includes --include-headers --keep-comments
|
||||
|
||||
virtual patch
|
||||
|
||||
@initialize:python@
|
||||
@@
|
||||
import sys
|
||||
|
||||
def alloc_array(name):
|
||||
func = "FAILED_RENAME"
|
||||
if name == "kmalloc_array":
|
||||
func = "kmalloc_objs"
|
||||
elif name == "kvmalloc_array":
|
||||
func = "kvmalloc_objs"
|
||||
elif name == "kcalloc":
|
||||
func = "kzalloc_objs"
|
||||
elif name == "kvcalloc":
|
||||
func = "kvzalloc_objs"
|
||||
else:
|
||||
print(f"Unknown transform for {name}", file=sys.stderr)
|
||||
return func
|
||||
|
||||
// This excludes anything that is assigning to or from integral types or
|
||||
// string literals. Everything else gets the sizeof() extracted for the
|
||||
// kmalloc_obj() type/var argument. sizeof(void *) is also excluded because
|
||||
// it will need case-by-case double-checking to make sure the right type is
|
||||
// being assigned.
|
||||
@direct depends on patch && !(file in "tools") && !(file in "samples")@
|
||||
typedef u8, u16, u32, u64;
|
||||
typedef __u8, __u16, __u32, __u64;
|
||||
typedef uint8_t, uint16_t, uint32_t, uint64_t;
|
||||
typedef uchar, ushort, uint, ulong;
|
||||
typedef __le16, __le32, __le64;
|
||||
typedef __be16, __be32, __be64;
|
||||
typedef wchar_t;
|
||||
type INTEGRAL = {u8,__u8,uint8_t,char,unsigned char,uchar,wchar_t,
|
||||
u16,__u16,uint16_t,unsigned short,ushort,
|
||||
u32,__u32,uint32_t,unsigned int,uint,
|
||||
u64,__u64,uint64_t,unsigned long,ulong,
|
||||
__le16,__le32,__le64,__be16,__be32,__be64};
|
||||
char [] STRING;
|
||||
INTEGRAL *BYTES;
|
||||
INTEGRAL **BYTES_PTRS;
|
||||
type TYPE;
|
||||
expression VAR;
|
||||
expression GFP;
|
||||
expression COUNT;
|
||||
expression FLEX;
|
||||
expression E;
|
||||
identifier ALLOC =~ "^kv?[mz]alloc$";
|
||||
fresh identifier ALLOC_OBJ = ALLOC ## "_obj";
|
||||
fresh identifier ALLOC_FLEX = ALLOC ## "_flex";
|
||||
identifier ALLOC_ARRAY = {kmalloc_array,kvmalloc_array,kcalloc,kvcalloc};
|
||||
fresh identifier ALLOC_OBJS = script:python(ALLOC_ARRAY) { alloc_array(ALLOC_ARRAY) };
|
||||
@@
|
||||
|
||||
(
|
||||
- VAR = ALLOC((sizeof(*VAR)), GFP)
|
||||
+ VAR = ALLOC_OBJ(*VAR, GFP)
|
||||
|
|
||||
ALLOC((\(sizeof(STRING)\|sizeof(INTEGRAL)\|sizeof(INTEGRAL *)\)), GFP)
|
||||
|
|
||||
BYTES = ALLOC((sizeof(E)), GFP)
|
||||
|
|
||||
BYTES = ALLOC((sizeof(TYPE)), GFP)
|
||||
|
|
||||
BYTES_PTRS = ALLOC((sizeof(E)), GFP)
|
||||
|
|
||||
BYTES_PTRS = ALLOC((sizeof(TYPE)), GFP)
|
||||
|
|
||||
ALLOC((sizeof(void *)), GFP)
|
||||
|
|
||||
- ALLOC((sizeof(E)), GFP)
|
||||
+ ALLOC_OBJ(E, GFP)
|
||||
|
|
||||
- ALLOC((sizeof(TYPE)), GFP)
|
||||
+ ALLOC_OBJ(TYPE, GFP)
|
||||
|
|
||||
ALLOC_ARRAY(COUNT, (\(sizeof(STRING)\|sizeof(INTEGRAL)\|sizeof(INTEGRAL *)\)), GFP)
|
||||
|
|
||||
BYTES = ALLOC_ARRAY(COUNT, (sizeof(E)), GFP)
|
||||
|
|
||||
BYTES = ALLOC_ARRAY(COUNT, (sizeof(TYPE)), GFP)
|
||||
|
|
||||
BYTES_PTRS = ALLOC_ARRAY(COUNT, (sizeof(E)), GFP)
|
||||
|
|
||||
BYTES_PTRS = ALLOC_ARRAY(COUNT, (sizeof(TYPE)), GFP)
|
||||
|
|
||||
ALLOC_ARRAY((\(sizeof(STRING)\|sizeof(INTEGRAL)\|sizeof(INTEGRAL *)\)), COUNT, GFP)
|
||||
|
|
||||
BYTES = ALLOC_ARRAY((sizeof(E)), COUNT, GFP)
|
||||
|
|
||||
BYTES = ALLOC_ARRAY((sizeof(TYPE)), COUNT, GFP)
|
||||
|
|
||||
BYTES_PTRS = ALLOC_ARRAY((sizeof(E)), COUNT, GFP)
|
||||
|
|
||||
BYTES_PTRS = ALLOC_ARRAY((sizeof(TYPE)), COUNT, GFP)
|
||||
|
|
||||
ALLOC_ARRAY(COUNT, (sizeof(void *)), GFP)
|
||||
|
|
||||
ALLOC_ARRAY((sizeof(void *)), COUNT, GFP)
|
||||
|
|
||||
- ALLOC_ARRAY(COUNT, (sizeof(E)), GFP)
|
||||
+ ALLOC_OBJS(E, COUNT, GFP)
|
||||
|
|
||||
- ALLOC_ARRAY(COUNT, (sizeof(TYPE)), GFP)
|
||||
+ ALLOC_OBJS(TYPE, COUNT, GFP)
|
||||
|
|
||||
- ALLOC_ARRAY((sizeof(E)), COUNT, GFP)
|
||||
+ ALLOC_OBJS(E, COUNT, GFP)
|
||||
|
|
||||
- ALLOC_ARRAY((sizeof(TYPE)), COUNT, GFP)
|
||||
+ ALLOC_OBJS(TYPE, COUNT, GFP)
|
||||
|
|
||||
- ALLOC(struct_size(VAR, FLEX, COUNT), GFP)
|
||||
+ ALLOC_FLEX(*VAR, FLEX, COUNT, GFP)
|
||||
|
|
||||
- ALLOC(struct_size_t(TYPE, FLEX, COUNT), GFP)
|
||||
+ ALLOC_FLEX(TYPE, FLEX, COUNT, GFP)
|
||||
)
|
||||
Loading…
Add table
Add a link
Reference in a new issue