scsi: libcxgbi: use kvzalloc instead of opencoded kzalloc/vzalloc
PATCH 1/1 scsi: libcxgbi: use kvzalloc instead of opencoded kzalloc/vzalloc
Remove cxgbi_alloc_big_mem(), cxgbi_free_big_mem() functions and use kvzalloc/kvfree instead.
--- drivers/scsi/cxgbi/libcxgbi.c | 8 ++++---- drivers/scsi/cxgbi/libcxgbi.h | 16 ---------------- 2 files changed, 4 insertions(+), 20 deletions(-)
drivers/scsi/cxgbi/libcxgbi.c +4 -4
@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap; - pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL );if (!pmap->port_csk) {pr_warn ("cdev 0x%p, portmap OOM %u.\n" , cdev, max_conn);return -ENOMEM ;
@@ -124,7 +124,7 @@ static inline void cxgbi_device_destroy(struct cxgbi_device *cdev)if (cdev->cdev2ppm)cxgbi_ppm_release (cdev->cdev2ppm (cdev));if (cdev->pmap.max_connect) -cxgbi_free_big_mem (cdev->pmap.port_csk); +kvfree (cdev->pmap.port_csk);kfree (cdev); }
drivers/scsi/cxgbi/libcxgbi.h +0 -16
@@ -537,22 +537,6 @@ struct cxgbi_task_data {#define iscsi_task_cxgbi_data (task) \ ((task)->dd_data + sizeof(struct iscsi_tcp_task)) -static inline void *cxgbi_alloc_big_mem (unsigned int size, -gfp_t gfp) -{ -void *p =kzalloc (size, gfp | __GFP_NOWARN); - -if (!p) - p =vzalloc (size); - -return p; -} - -static inline void cxgbi_free_big_mem (void *addr) -{ -kvfree (addr); -} -static inline void cxgbi_set_iscsi_ipv4 (struct cxgbi_hba *chba,__be32 ipaddr) {if (chba->cdev->flags &CXGBI_FLAG_IPV4_SET )
Signature · 1 line
2.26.2
Quoted 2 lines · Denis Efremov
Remove
cxgbi_alloc_big_mem(),cxgbi_free_big_mem()functions and use kvzalloc/kvfree instead.
Sensible, thanks.
drivers/scsi/cxgbi/libcxgbi.c
Quoted 1 line
drivers/scsi/cxgbi/libcxgbi.c +0
-0
[]
drivers/scsi/cxgbi/libcxgbi.c int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, · line 82
Quoted 10 lines
drivers/scsi/cxgbi/libcxgbi.c +3
-3@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap; - pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL );
missing __GFP_NOWARN
drivers/scsi/cxgbi/libcxgbi.h
Quoted 1 line
drivers/scsi/cxgbi/libcxgbi.h +0
-0
[]
Quoted 8 lines
drivers/scsi/cxgbi/libcxgbi.h +0
-4@@ -537,22 +537,6 @@ struct cxgbi_task_data {#define iscsi_task_cxgbi_data (task) \ ((task)->dd_data + sizeof(struct iscsi_tcp_task)) -static inline void *cxgbi_alloc_big_mem (unsigned int size, -gfp_t gfp) -{ -void *p =kzalloc (size, gfp | __GFP_NOWARN);
Quoted 12 lines · Joe Perches
Quoted 2 lines · Denis Efremov
Remove
cxgbi_alloc_big_mem(),cxgbi_free_big_mem()functions and use kvzalloc/kvfree instead.Sensible, thanks.
drivers/scsi/cxgbi/libcxgbi.c
Quoted 1 line
drivers/scsi/cxgbi/libcxgbi.c +0
-0[]
Quoted 4 lines
drivers/scsi/cxgbi/libcxgbi.c +0
-0@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap;
Quoted 9 lines
drivers/scsi/cxgbi/libcxgbi.c int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, · line 82
Quoted 6 lines
drivers/scsi/cxgbi/libcxgbi.c +3
-3- pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL );missing
__GFP_NOWARN
kvmalloc_node adds __GFP_NOWARN internally to kmalloc call
https://elixir.bootlin.com/linux/v5.8-rc4/source/mm/util.c#L568
Thanks,
Denis
Quoted 24 lines · Denis Efremov
Quoted 12 lines · Joe Perches
Quoted 2 lines · Denis Efremov
Remove
cxgbi_alloc_big_mem(),cxgbi_free_big_mem()functions and use kvzalloc/kvfree instead.Sensible, thanks.
drivers/scsi/cxgbi/libcxgbi.c
Quoted 1 line
drivers/scsi/cxgbi/libcxgbi.c +0
-0[]
Quoted 4 lines
drivers/scsi/cxgbi/libcxgbi.c +0
-0@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap;Quoted 9 lines
drivers/scsi/cxgbi/libcxgbi.c int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, · line 82
Quoted 6 lines
drivers/scsi/cxgbi/libcxgbi.c +3
-3- pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL );missing
__GFP_NOWARN
Quoted 2 lines
kvmalloc_nodeadds__GFP_NOWARNinternally to kmalloc call
https://elixir.bootlin.com/linux/v5.8-rc4/source/mm/util.c#L568
Only when there's a fallback, and the fallback does not.
Quoted 25 lines · Joe Perches
Quoted 24 lines · Denis Efremov
Quoted 21 lines · Joe Perches
Quoted 2 lines · Denis Efremov
Remove
cxgbi_alloc_big_mem(),cxgbi_free_big_mem()functions and use kvzalloc/kvfree instead.Sensible, thanks.
drivers/scsi/cxgbi/libcxgbi.c
Quoted 1 line
drivers/scsi/cxgbi/libcxgbi.c +0
-0[]
drivers/scsi/cxgbi/libcxgbi.c int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, · line 82
Quoted 10 lines
drivers/scsi/cxgbi/libcxgbi.c +3
-3@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap; - pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL );missing
__GFP_NOWARN
Quoted 5 lines
Quoted 2 lines
kvmalloc_nodeadds__GFP_NOWARNinternally to kmalloc call
https://elixir.bootlin.com/linux/v5.8-rc4/source/mm/util.c#L568Only when there's a fallback, and the fallback does not.
Sorry, Joe, I don't understand why do we need to add __GFP_NOWARN here.
We use GFP_KERNEL for allocation. cxgbi_alloc_big_mem adds __GFP_NOWARN only to kzalloc(). kvzalloc is: kvmalloc(size, flags | __GFP_ZERO)
kvmalloc is: kvmalloc_node(size, flags, NUMA_NO_NODE)kvmalloc_node:
if ((flags & GFP_KERNEL) != GFP_KERNEL) // false, flags == GFP_KERNEL|__GFP_ZERO
return kmalloc_node(size, flags, node);
if (size > PAGE_SIZE) {
kmalloc_flags |= __GFP_NOWARN; // add __GFP_NOWARN for "big" allocations
if (!(kmalloc_flags & __GFP_RETRY_MAYFAIL))
kmalloc_flags |= __GFP_NORETRY;
}
// kmalloc_flags == GFP_KERNEL|__GFP_ZERO|__GFP_NOWARN if size > PAGE_SIZE
ret = kmalloc_node(size, kmalloc_flags, node);
if (ret || size <= PAGE_SIZE)
return ret;
// flags == GFP_KERNEL|__GFP_ZERO
return __vmalloc_node(size, 1, flags, node,
__builtin_return_address(0));So, to my understanding the difference is only that cxgbi_alloc_big_mem adds __GFP_NOWARN to kzalloc unconditionally, kvzalloc adds __GFP_NOWARN to kmalloc_node if size > PAGE_SIZE. We use: max_conn * sizeof(struct cxgbi_sock *) in allocation. max_conn can be either CXGBI_MAX_CONN or CXGB4I_MAX_CONN. CXGBI_MAX_CONN == 16384, CXGB4I_MAX_CONN == 16384. Thus the allocation is bigger than PAGE_SIZE and kvmalloc_node adds __GFP_NOWARN to the kmalloc_node call. Maybe I missed something?
Thanks,
Denis
Quoted 60 lines · Denis Efremov
Quoted 25 lines · Joe Perches
Quoted 24 lines · Denis Efremov
Quoted 21 lines · Joe Perches
Quoted 2 lines · Denis Efremov
Remove
cxgbi_alloc_big_mem(),cxgbi_free_big_mem()functions and use kvzalloc/kvfree instead.Sensible, thanks.
drivers/scsi/cxgbi/libcxgbi.c
Quoted 1 line
drivers/scsi/cxgbi/libcxgbi.c +0
-0[]
drivers/scsi/cxgbi/libcxgbi.c int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, · line 82
Quoted 10 lines
drivers/scsi/cxgbi/libcxgbi.c +3
-3@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap; - pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL );missing
__GFP_NOWARNQuoted 5 lines
Quoted 2 lines
kvmalloc_nodeadds__GFP_NOWARNinternally to kmalloc call
https://elixir.bootlin.com/linux/v5.8-rc4/source/mm/util.c#L568Only when there's a fallback, and the fallback does not.
Sorry, Joe, I don't understand why do we need to add
__GFP_NOWARNhere.We use
GFP_KERNELfor allocation.cxgbi_alloc_big_memadds__GFP_NOWARNonly tokzalloc(). kvzalloc is:kvmalloc(size, flags | __GFP_ZERO)
kvmalloc is:kvmalloc_node(size, flags, NUMA_NO_NODE)kvmalloc_node:if ((flags & GFP_KERNEL) != GFP_KERNEL) // false, flags == GFP_KERNEL|__GFP_ZERO return kmalloc_node(size, flags, node); if (size > PAGE_SIZE) { kmalloc_flags |= __GFP_NOWARN; // add __GFP_NOWARN for "big" allocations if (!(kmalloc_flags & __GFP_RETRY_MAYFAIL)) kmalloc_flags |= __GFP_NORETRY; } // kmalloc_flags == GFP_KERNEL|__GFP_ZERO|__GFP_NOWARN if size > PAGE_SIZE ret = kmalloc_node(size, kmalloc_flags, node); if (ret || size <= PAGE_SIZE) return ret; // flags == GFP_KERNEL|__GFP_ZERO return __vmalloc_node(size, 1, flags, node, __builtin_return_address(0));
Quoted 7 lines
So, to my understanding the difference is only that
cxgbi_alloc_big_memadds__GFP_NOWARNto kzalloc unconditionally, kvzalloc adds__GFP_NOWARNtokmalloc_nodeif size >PAGE_SIZE. We use:max_conn*sizeof(struct cxgbi_sock *)in allocation.max_conncan be eitherCXGBI_MAX_CONNorCXGB4I_MAX_CONN.CXGBI_MAX_CONN== 16384,CXGB4I_MAX_CONN== 16384. Thus the allocation is bigger thanPAGE_SIZEandkvmalloc_nodeadds__GFP_NOWARNto thekmalloc_nodecall. Maybe I missed something?
Of course max_conn can be smaller than CXGBI_MAX_CONN and CXGB4I_MAX_CONN and size < PAGE_SIZE. However, it's by design not to warn on "small" allocations in kvmalloc_node and it will not even try to call __vmalloc_node if "small" allocation will fail with kmalloc_node. I think that this behavior fits the cxgbi_device_portmap_create() context call.
Quoted 25 lines · Denis Efremov
Quoted 24 lines · Joe Perches
Quoted 23 lines · Denis Efremov
Quoted 21 lines · Joe Perches
Quoted 2 lines · Denis Efremov
Remove
cxgbi_alloc_big_mem(),cxgbi_free_big_mem()functions and use kvzalloc/kvfree instead.Sensible, thanks.
drivers/scsi/cxgbi/libcxgbi.c
Quoted 1 line
drivers/scsi/cxgbi/libcxgbi.c +0
-0[]
drivers/scsi/cxgbi/libcxgbi.c int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, · line 82
Quoted 10 lines
drivers/scsi/cxgbi/libcxgbi.c +3
-3@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap; - pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL );missing
__GFP_NOWARN
Quoted 5 lines
Quoted 4 lines
Quoted 2 lines
kvmalloc_nodeadds__GFP_NOWARNinternally to kmalloc call
https://elixir.bootlin.com/linux/v5.8-rc4/source/mm/util.c#L568Only when there's a fallback, and the fallback does not.
Sorry, Joe, I don't understand why do we need to add
__GFP_NOWARNhere.
Hi.
The reason to add __GFP_NOWARN is so you don't get a dump_stack() as there's an existing error message output below this when OOM.
You should either remove the error message as it just effectively duplicates the dump_stack or add __GFP_NOWARN.
Your choice.
cheers, Joe
Quoted 32 lines · Joe Perches
Quoted 25 lines · Denis Efremov
Quoted 24 lines · Joe Perches
Quoted 23 lines · Denis Efremov
Quoted 21 lines · Joe Perches
Quoted 2 lines · Denis Efremov
Remove
cxgbi_alloc_big_mem(),cxgbi_free_big_mem()functions and use kvzalloc/kvfree instead.Sensible, thanks.
drivers/scsi/cxgbi/libcxgbi.c
Quoted 1 line
drivers/scsi/cxgbi/libcxgbi.c +0
-0[]
drivers/scsi/cxgbi/libcxgbi.c int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, · line 82
Quoted 10 lines
drivers/scsi/cxgbi/libcxgbi.c +3
-3@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap; - pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL );missing
__GFP_NOWARNQuoted 5 lines
Quoted 4 lines
Quoted 2 lines
kvmalloc_nodeadds__GFP_NOWARNinternally to kmalloc call
https://elixir.bootlin.com/linux/v5.8-rc4/source/mm/util.c#L568Only when there's a fallback, and the fallback does not.
Sorry, Joe, I don't understand why do we need to add
__GFP_NOWARNhere.
Quoted 8 lines
Hi.
The reason to add
__GFP_NOWARNis so you don't get adump_stack()as there's an existing error message output below this when OOM.You should either remove the error message as it just effectively duplicates the
dump_stackor add__GFP_NOWARN.
Now I see, thanks! I will send v2.
Regards,
Denis
PATCH v2 1/1 scsi: libcxgbi: use kvzalloc instead of opencoded kzalloc/vzalloc
In reply to Denis EfremovRemove cxgbi_alloc_big_mem(), cxgbi_free_big_mem() functions and use kvzalloc/kvfree instead. __GFP_NOWARN added to kvzalloc() call because we already print a warning in case of allocation fail.
--- drivers/scsi/cxgbi/libcxgbi.c | 8 ++++---- drivers/scsi/cxgbi/libcxgbi.h | 16 ---------------- 2 files changed, 4 insertions(+), 20 deletions(-)
drivers/scsi/cxgbi/libcxgbi.c +4 -4
@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap; - pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL | __GFP_NOWARN);if (!pmap->port_csk) {pr_warn ("cdev 0x%p, portmap OOM %u.\n" , cdev, max_conn);return -ENOMEM ;
@@ -124,7 +124,7 @@ static inline void cxgbi_device_destroy(struct cxgbi_device *cdev)if (cdev->cdev2ppm)cxgbi_ppm_release (cdev->cdev2ppm (cdev));if (cdev->pmap.max_connect) -cxgbi_free_big_mem (cdev->pmap.port_csk); +kvfree (cdev->pmap.port_csk);kfree (cdev); }
drivers/scsi/cxgbi/libcxgbi.h +0 -16
@@ -537,22 +537,6 @@ struct cxgbi_task_data {#define iscsi_task_cxgbi_data (task) \ ((task)->dd_data + sizeof(struct iscsi_tcp_task)) -static inline void *cxgbi_alloc_big_mem (unsigned int size, -gfp_t gfp) -{ -void *p =kzalloc (size, gfp | __GFP_NOWARN); - -if (!p) - p =vzalloc (size); - -return p; -} - -static inline void cxgbi_free_big_mem (void *addr) -{ -kvfree (addr); -} -static inline void cxgbi_set_iscsi_ipv4 (struct cxgbi_hba *chba,__be32 ipaddr) {if (chba->cdev->flags &CXGBI_FLAG_IPV4_SET )
Signature · 1 line
2.26.2
Ping?
Quoted 64 lines · Denis Efremov
Remove
cxgbi_alloc_big_mem(),cxgbi_free_big_mem()functions and use kvzalloc/kvfree instead.__GFP_NOWARNadded tokvzalloc()call because we already print a warning in case of allocation fail.Signed-off-by Denis Efremov <[email protected]>--- drivers/scsi/cxgbi/libcxgbi.c | 8 ++++---- drivers/scsi/cxgbi/libcxgbi.h | 16 ---------------- 2 files changed, 4 insertions(+), 20 deletions(-)drivers/scsi/cxgbi/libcxgbi.c +4
-4@@ -77,9 +77,9 @@ int cxgbi_device_portmap_create(struct cxgbi_device *cdev, unsigned int base, {struct cxgbi_ports_map *pmap = &cdev->pmap; - pmap->port_csk =cxgbi_alloc_big_mem (max_conn * -sizeof (struct cxgbi_sock *), -GFP_KERNEL ); + pmap->port_csk =kvzalloc (array_size (max_conn, +sizeof (struct cxgbi_sock *)), +GFP_KERNEL | __GFP_NOWARN);if (!pmap->port_csk) {pr_warn ("cdev 0x%p, portmap OOM %u.\n" , cdev, max_conn);return -ENOMEM ;@@ -124,7 +124,7 @@ static inline void cxgbi_device_destroy(struct cxgbi_device *cdev)if (cdev->cdev2ppm)cxgbi_ppm_release (cdev->cdev2ppm (cdev));if (cdev->pmap.max_connect) -cxgbi_free_big_mem (cdev->pmap.port_csk); +kvfree (cdev->pmap.port_csk);kfree (cdev); }drivers/scsi/cxgbi/libcxgbi.h +0
-16@@ -537,22 +537,6 @@ struct cxgbi_task_data {#define iscsi_task_cxgbi_data (task) \ ((task)->dd_data + sizeof(struct iscsi_tcp_task)) -static inline void *cxgbi_alloc_big_mem (unsigned int size, -gfp_t gfp) -{ -void *p =kzalloc (size, gfp | __GFP_NOWARN); - -if (!p) - p =vzalloc (size); - -return p; -} - -static inline void cxgbi_free_big_mem (void *addr) -{ -kvfree (addr); -} -static inline void cxgbi_set_iscsi_ipv4 (struct cxgbi_hba *chba,__be32 ipaddr) {if (chba->cdev->flags &CXGBI_FLAG_IPV4_SET )
Denis,
Quoted 1 line
Ping?
It's in my staging branch.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 3 lines · Denis Efremov
Remove
cxgbi_alloc_big_mem(),cxgbi_free_big_mem()functions and use kvzalloc/kvfree instead.__GFP_NOWARNadded tokvzalloc()call because we already print a warning in case of allocation fail.
Applied to 5.10/scsi-queue, thanks!
[1/1] scsi: libcxgbi: Use kvzalloc instead of opencoded kzalloc/vzalloc
https://git.kernel.org/mkp/scsi/c/ee9108fedf63
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering