Skip to contentSkip to conversation

btrfs: compression: Adjust cb->compressed_folios allocation type

PATCH In review Kees Cook 4 participants 5 messages Apr 26, 2025 – Apr 30, 2025 Btrfs file system

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 btrfs: compression: Adjust cb->compressed_folios allocation type

In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct folio **" but the returned type will be "struct page **". These are the same allocation size (pointer size), but the types don't match. Adjust the allocation type to match the assignment.

---
Cc: Chris Mason <[email protected]>
Cc: Josef Bacik <[email protected]>
Cc: David Sterba <[email protected]>
Cc: <[email protected]>

---
 fs/btrfs/compression.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/compression.c +1 -1
index e7f8ee5d48a4..7f11ef559be6 100644
@@ -606,7 +606,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)
 	free_extent_map(em);
 
 	cb->nr_folios = DIV_ROUND_UP(compressed_len, PAGE_SIZE);
-	cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct page *), GFP_NOFS);
+	cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct folio *), GFP_NOFS);
 	if (!cb->compressed_folios) {
 		ret = BLK_STS_RESOURCE;
 		goto out_free_bio;
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Kees Cook

In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct folio **" but the returned type will be "struct page **". These are the same allocation size (pointer size), but the types don't match. Adjust the allocation type to match the assignment.

Thanks,
Qu

Quoted 22 lines

---
Cc: Chris Mason <[email protected]>
Cc: Josef Bacik <[email protected]>
Cc: David Sterba <[email protected]>
Cc: <[email protected]>

---
  fs/btrfs/compression.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/compression.c +1 -1
index e7f8ee5d48a4..7f11ef559be6 100644
@@ -606,7 +606,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)
  	free_extent_map(em);
 
  	cb->nr_folios = DIV_ROUND_UP(compressed_len, PAGE_SIZE);
-	cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct page *), GFP_NOFS);
+	cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct folio *), GFP_NOFS);
  	if (!cb->compressed_folios) {
  		ret = BLK_STS_RESOURCE;
  		goto out_free_bio;
#2 lore raw
In reply to Kees Cook
Quoted 24 lines · Kees Cook

In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct folio **" but the returned type will be "struct page **". These are the same allocation size (pointer size), but the types don't match. Adjust the allocation type to match the assignment.

---
Cc: Chris Mason <[email protected]>
Cc: Josef Bacik <[email protected]>
Cc: David Sterba <[email protected]>
Cc: <[email protected]>

---
  fs/btrfs/compression.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/compression.c +0 -0
index e7f8ee5d48a4..7f11ef559be6 100644

fs/btrfs/compression.c void btrfs_submit_compressed_read(struct btrfs_bio *bbio) · line 609

Quoted 5 lines
fs/btrfs/compression.c +1 -1
@@ -606,7 +606,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)
  	free_extent_map(em);
 
  	cb->nr_folios = DIV_ROUND_UP(compressed_len, PAGE_SIZE);
-	cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct page *), GFP_NOFS);
+	cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct folio *), GFP_NOFS);

Why not sizeof(*cb->compressed_folios) as in other patches? :)

-Gustavo

author
#3 lore raw
Quoted 22 lines · Gustavo A. R. Silva
Quoted 19 lines · Kees Cook

In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct folio **" but the returned type will be "struct page **". These are the same allocation size (pointer size), but the types don't match. Adjust the allocation type to match the assignment.

---
Cc: Chris Mason <[email protected]>
Cc: Josef Bacik <[email protected]>
Cc: David Sterba <[email protected]>
Cc: <[email protected]>

---
  fs/btrfs/compression.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 11 lines

fs/btrfs/compression.c void btrfs_submit_compressed_read(struct btrfs_bio *bbio) · line 608

Quoted 9 lines
fs/btrfs/compression.c +1 -1
index e7f8ee5d48a4..7f11ef559be6 100644
@@ -606,7 +606,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)
  	free_extent_map(em);
  	cb->nr_folios = DIV_ROUND_UP(compressed_len, PAGE_SIZE);
-	cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct page *), GFP_NOFS);
+	cb->compressed_folios = kcalloc(cb->nr_folios, sizeof(struct folio *), GFP_NOFS);

Why not sizeof(*cb->compressed_folios) as in other patches? :)

I generally trying to match the coding style of each instance, though sometimes it wasn't possible. Here, since a type is named for the sizeof(), I followed that style.

Signature · 1 line
Kees Cook
#4 lore raw
In reply to Kees Cook
Quoted 10 lines · Kees Cook

In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct folio **" but the returned type will be "struct page **". These are the same allocation size (pointer size), but the types don't match. Adjust the allocation type to match the assignment.

Added to for-next, thanks.