1. Patchew
  2. linux
  3. View series

[PATCH] rds:Simplify the allocation of slab caches

Hongfu Li posted 1 patch 1 year, 6 months ago 
net/rds/tcp.c      | 4 +---
net/rds/tcp_recv.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
[PATCH] rds:Simplify the allocation of slab caches
Posted by Hongfu Li 1 year, 6 months ago 
Use the new KMEM_CACHE() macro instead of direct kmem_cache_create
to simplify the creation of SLAB caches.

Signed-off-by: Hongfu Li <lihongfu@kylinos.cn>
---
 net/rds/tcp.c      | 4 +---
 net/rds/tcp_recv.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index d8111ac83bb6..3dc6956f66f8 100644
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -719,9 +719,7 @@ static int __init rds_tcp_init(void)
 {
 	int ret;
 
-	rds_tcp_conn_slab = kmem_cache_create("rds_tcp_connection",
-					      sizeof(struct rds_tcp_connection),
-					      0, 0, NULL);
+	rds_tcp_conn_slab = KMEM_CACHE(rds_tcp_connection, 0);
 	if (!rds_tcp_conn_slab) {
 		ret = -ENOMEM;
 		goto out;
diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c
index c00f04a1a534..7997a19d1da3 100644
--- a/net/rds/tcp_recv.c
+++ b/net/rds/tcp_recv.c
@@ -337,9 +337,7 @@ void rds_tcp_data_ready(struct sock *sk)
 
 int rds_tcp_recv_init(void)
 {
-	rds_tcp_incoming_slab = kmem_cache_create("rds_tcp_incoming",
-					sizeof(struct rds_tcp_incoming),
-					0, 0, NULL);
+	rds_tcp_incoming_slab = KMEM_CACHE(rds_tcp_incoming, 0);
 	if (!rds_tcp_incoming_slab)
 		return -ENOMEM;
 	return 0;
-- 
2.25.1
Re: [PATCH] rds:Simplify the allocation of slab caches
Posted by Allison Henderson 1 year, 6 months ago 
On Mon, 2024-06-17 at 15:54 +0800, Hongfu Li wrote:
> Use the new KMEM_CACHE() macro instead of direct kmem_cache_create
> to simplify the creation of SLAB caches.
> 
> Signed-off-by: Hongfu Li <lihongfu@kylinos.cn>

This change looks simple enough to me.  Thanks for the clean up.
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>

> ---
>  net/rds/tcp.c      | 4 +---
>  net/rds/tcp_recv.c | 4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/net/rds/tcp.c b/net/rds/tcp.c
> index d8111ac83bb6..3dc6956f66f8 100644
> --- a/net/rds/tcp.c
> +++ b/net/rds/tcp.c
> @@ -719,9 +719,7 @@ static int __init rds_tcp_init(void)
>  {
>         int ret;
>  
> -       rds_tcp_conn_slab = kmem_cache_create("rds_tcp_connection",
> -                                             sizeof(struct
> rds_tcp_connection),
> -                                             0, 0, NULL);
> +       rds_tcp_conn_slab = KMEM_CACHE(rds_tcp_connection, 0);
>         if (!rds_tcp_conn_slab) {
>                 ret = -ENOMEM;
>                 goto out;
> diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c
> index c00f04a1a534..7997a19d1da3 100644
> --- a/net/rds/tcp_recv.c
> +++ b/net/rds/tcp_recv.c
> @@ -337,9 +337,7 @@ void rds_tcp_data_ready(struct sock *sk)
>  
>  int rds_tcp_recv_init(void)
>  {
> -       rds_tcp_incoming_slab = kmem_cache_create("rds_tcp_incoming",
> -                                       sizeof(struct
> rds_tcp_incoming),
> -                                       0, 0, NULL);
> +       rds_tcp_incoming_slab = KMEM_CACHE(rds_tcp_incoming, 0);
>         if (!rds_tcp_incoming_slab)
>                 return -ENOMEM;
>         return 0;
Re: [PATCH] rds:Simplify the allocation of slab caches
Posted by Zhu Yanjun 1 year, 6 months ago 
在 2024/6/17 15:54, Hongfu Li 写道:
> Use the new KMEM_CACHE() macro instead of direct kmem_cache_create
> to simplify the creation of SLAB caches.
> 
> Signed-off-by: Hongfu Li <lihongfu@kylinos.cn>
> ---
>   net/rds/tcp.c      | 4 +---
>   net/rds/tcp_recv.c | 4 +---
>   2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/net/rds/tcp.c b/net/rds/tcp.c
> index d8111ac83bb6..3dc6956f66f8 100644
> --- a/net/rds/tcp.c
> +++ b/net/rds/tcp.c
> @@ -719,9 +719,7 @@ static int __init rds_tcp_init(void)
>   {
>   	int ret;
>   
> -	rds_tcp_conn_slab = kmem_cache_create("rds_tcp_connection",
> -					      sizeof(struct rds_tcp_connection),
> -					      0, 0, NULL);
> +	rds_tcp_conn_slab = KMEM_CACHE(rds_tcp_connection, 0);

KMEM_CACHE is declared as below:

/*
  * Please use this macro to create slab caches. Simply specify the
  * name of the structure and maybe some flags that are listed above.
  *
  * The alignment of the struct determines object alignment. If you
  * f.e. add ____cacheline_aligned_in_smp to the struct declaration
  * then the objects will be properly aligned in SMP configurations.
  */
#define KMEM_CACHE(__struct, __flags)                                   \
                 kmem_cache_create(#__struct, sizeof(struct __struct),   \
                         __alignof__(struct __struct), (__flags), NULL)

Reviewed-by: Zhu Yanjun <yanjun.zhu@linux.dev>
Thanks a lot.

Zhu Yanjun

>   	if (!rds_tcp_conn_slab) {
>   		ret = -ENOMEM;
>   		goto out;
> diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c
> index c00f04a1a534..7997a19d1da3 100644
> --- a/net/rds/tcp_recv.c
> +++ b/net/rds/tcp_recv.c
> @@ -337,9 +337,7 @@ void rds_tcp_data_ready(struct sock *sk)
>   
>   int rds_tcp_recv_init(void)
>   {
> -	rds_tcp_incoming_slab = kmem_cache_create("rds_tcp_incoming",
> -					sizeof(struct rds_tcp_incoming),
> -					0, 0, NULL);
> +	rds_tcp_incoming_slab = KMEM_CACHE(rds_tcp_incoming, 0);
>   	if (!rds_tcp_incoming_slab)
>   		return -ENOMEM;
>   	return 0;
[PATCH] rds:Simplify the allocation of slab caches
Posted by Hongfu Li 1 year, 6 months ago 
>> Use the new KMEM_CACHE() macro instead of direct kmem_cache_create
>> to simplify the creation of SLAB caches.
>> 
>> Signed-off-by: Hongfu Li <lihongfu@kylinos.cn>
>> ---
>>   net/rds/tcp.c      | 4 +---
>>   net/rds/tcp_recv.c | 4 +---
>>   2 files changed, 2 insertions(+), 6 deletions(-)
>> 
>> diff --git a/net/rds/tcp.c b/net/rds/tcp.c
>> index d8111ac83bb6..3dc6956f66f8 100644
>> --- a/net/rds/tcp.c
>> +++ b/net/rds/tcp.c
>> @@ -719,9 +719,7 @@ static int __init rds_tcp_init(void)
>>   {
>>   	int ret;
>>   
>> -	rds_tcp_conn_slab = kmem_cache_create("rds_tcp_connection",
>> -					      sizeof(struct rds_tcp_connection),
>> -					      0, 0, NULL);
>> +	rds_tcp_conn_slab = KMEM_CACHE(rds_tcp_connection, 0);

>KMEM_CACHE is declared as below:
>
>/*
>  * Please use this macro to create slab caches. Simply specify the
>  * name of the structure and maybe some flags that are listed above.
>  *
>  * The alignment of the struct determines object alignment. If you
>  * f.e. add ____cacheline_aligned_in_smp to the struct declaration
>  * then the objects will be properly aligned in SMP configurations.
>  */
>#define KMEM_CACHE(__struct, __flags)                                   \
>                 kmem_cache_create(#__struct, sizeof(struct __struct),   \
>                         __alignof__(struct __struct), (__flags), NULL)

Sorry, I'll check it carefully next time.

Thanks, 

Hongfu Li

>>   	if (!rds_tcp_conn_slab) {
>>   		ret = -ENOMEM;
>>   		goto out;
>> diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c
>> index c00f04a1a534..7997a19d1da3 100644
>> --- a/net/rds/tcp_recv.c
>> +++ b/net/rds/tcp_recv.c
>> @@ -337,9 +337,7 @@ void rds_tcp_data_ready(struct sock *sk)
>>   
>>   int rds_tcp_recv_init(void)
>>   {
>> -	rds_tcp_incoming_slab = kmem_cache_create("rds_tcp_incoming",
>> -					sizeof(struct rds_tcp_incoming),
>> -					0, 0, NULL);
>> +	rds_tcp_incoming_slab = KMEM_CACHE(rds_tcp_incoming, 0);
>>   	if (!rds_tcp_incoming_slab)
>>   		return -ENOMEM;
>>   	return 0;

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.