Received-SPF: pass (google.com: domain of linux-kernel+bounces-143434-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <1bda40f4-3f42-4785-8663-d1f40a75d98a@intel.com>
Date: Fri, 12 Apr 2024 16:41:56 -0700
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH net-next v9 2/3] net: ethernet: ti: Add desc_infos member
 to struct k3_cppi_desc_pool
To: Julien Panis <jpanis@baylibre.com>, "David S. Miller"
	<davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski
	<kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Russell King
	<linux@armlinux.org.uk>, Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann
	<daniel@iogearbox.net>, Jesper Dangaard Brouer <hawk@kernel.org>, "John
 Fastabend" <john.fastabend@gmail.com>, Sumit Semwal
	<sumit.semwal@linaro.org>, =?UTF-8?Q?Christian_K=C3=B6nig?=
	<christian.koenig@amd.com>, Simon Horman <horms@kernel.org>, Andrew Lunn
	<andrew@lunn.ch>, Ratheesh Kannoth <rkannoth@marvell.com>, "Naveen
 Mamindlapalli" <naveenm@marvell.com>
CC: <danishanwar@ti.com>, <yuehaibing@huawei.com>, <rogerq@kernel.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<bpf@vger.kernel.org>, <linux-media@vger.kernel.org>,
	<dri-devel@lists.freedesktop.org>, <linaro-mm-sig@lists.linaro.org>
References: <20240223-am65-cpsw-xdp-basic-v9-0-2c194217e325@baylibre.com>
 <20240223-am65-cpsw-xdp-basic-v9-2-2c194217e325@baylibre.com>
Content-Language: en-US
From: Jacob Keller <jacob.e.keller@intel.com>
In-Reply-To: <20240223-am65-cpsw-xdp-basic-v9-2-2c194217e325@baylibre.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R0tmYjJLbnFLRTJKTDZKOHBUWEc2ZHdEc1cyWGdCMmJwOXBuZWF4dWJJZVVa?=
 =?utf-8?B?cDU4VmEvMnJsb2RyTTgxaVNoc0p5Q0dNdU83VDIvNzJGVDc1TkJSUXMySVd0?=
 =?utf-8?B?djRwZTRsQ2hlYnNZQjVwTjRSNUhMNlorM3ZBNUUwT1ZYdU1Nc2Vkd0g4N281?=
 =?utf-8?B?TUhuSFExSGdDcGlaK0lreGVmN3ZudjB0QXVzSytkZHc4eVV4dmluTy9ySzR3?=
 =?utf-8?B?N0xMSGkrVmJ0ekhpTVVZa283VjYrQmt1UVhlZmFjSzZnd2JrYXgvMFJqWSt6?=
 =?utf-8?B?ZTlvV1o0WFZtVFlGUDRHNGpodUJRSUNjWkVsRkl0NUVoREp6MjV5eUdGajdy?=
 =?utf-8?B?QmNHYUFnWU9Pb2lwcTdaNGVpTzF6WFVpQ3F0bzhxazFEemFiRnFpUGZRZXNv?=
 =?utf-8?B?VkNEdTVEVnJDNlVmbEo0am9YaXZzS00rNXpNdk5SQlV3UkJqcnR4cHh0Yjd4?=
 =?utf-8?B?WVo1VmtsWEp1OEJvdHdIOTVQa1gzRXBCbkE3ZkRxWjV5dDIxMTZZa283bEZX?=
 =?utf-8?B?NDlzTzlqVW1zbGhyZm16U2tkRGl4VUpVWFBYcHQ5TDNKM2xKcGtYZjdheUNS?=
 =?utf-8?B?YkxWeGhVSER2dDlRNmtFWmNmQVhPbFpWbXpXVFlpM0Q5Kzkrb0NJc1dBWjJY?=
 =?utf-8?B?QkxXU3dqTDQvdHVEWnhPRDZGbzBkUFM1Sm8yNWNFaTJmTCt2ZVVWZXBtUXA4?=
 =?utf-8?B?TExFN0srbWU3UFZKNUZHZlhLOXNzSFVUVm1maHVHdlVvcVJtY3V2ai82UDdB?=
 =?utf-8?B?Wm9aZTBLd3U4dm5ocmlYNFZwVFp3UHRsRXBnUjQzbGN5dElBYkwvcWpZVW5Y?=
 =?utf-8?B?MmhRUzFtRGpmSm9oYUdWaU9HS1ZReE1rUWNGY2FpU2hZQlFZRmQ0Nkg4bjdI?=
 =?utf-8?B?M3pLaXFQbnZldDl1Si9kd1VHcHlpOGM1cC9EbE9VZFpGQit2QVJMRFRERE1h?=
 =?utf-8?B?YzVNa2gyRFh3NXUwL1o2Ris4QVhFY1dmdG00anp4MWRSWnlXTGxEOXhJMHZP?=
 =?utf-8?B?ZVV3aE1tb3RSYVA5SjVUc01CM1ROMHVUbXJMZzM5cGltVkRYT21IbjI3Q21R?=
 =?utf-8?B?dW82aGdaeVlpa1VncVlWZXM1ancrSjBmK0hoVDczZWRqc2hEN2NGdmpzbFJV?=
 =?utf-8?B?cExFeEd6c3pwZUZ5NmgzSVVGMWJEK2ZLU1NsckdrVzJVbW1kaE5pTmljVzFE?=
 =?utf-8?B?aGhEeVpHUEswTnFscjVPZ2hna0hxRkxaS1hDNDAvMERiSVl1OTgwdnM2b25H?=
 =?utf-8?B?UlUvMG5jdXUzZTJ6VzFnU3g1M3ZGY1QzaGZOZkU4S3Zmell3TkJ4WHllZklB?=
 =?utf-8?B?RFNRZHZvbkNSY0pLNkJvNzlVYXhCb01nRS9WSzZ6bEVZam1wTmFEc2FEM3lQ?=
 =?utf-8?B?UjFqQytNd0xUR0ErajIwZUZMS0tUeHBVT1E0VzA0L0dyb29mc1Z3SUxEZEwy?=
 =?utf-8?B?T21zOVZXSDN4MHBRS0lpNmVKSExQL2ZNdXBxRXhObGZxUnM5VGM2V3RqZ3NT?=
 =?utf-8?B?S1JXb1pVNEVsNkY1T2lxNnBsaGFLR2RUV00zWW9nS0ZjRm9yZ09YMXVZMzFP?=
 =?utf-8?B?WWFGdGYxY3gvTFc0T3hYaXU0RFQrejl2UkRMQ1FtRUhPempoMDByN1lHRGMy?=
 =?utf-8?B?TWFBU2lSbnovTUFJcnp0NVpGcGpwMW5zejFzZnZYS1BTVGk2dXJNcW1LSTho?=
 =?utf-8?B?bWlTd2FNVVErTGsybnE3bmFvOXhYdWVOZmR0TDU5T0orVTlydlFsWFFVcExL?=
 =?utf-8?B?SVQzNk51WGRCMFgyV21SK29OTGJwSUdGeWY4bGpMZHl3LzhSVSt5UVY0Z2gr?=
 =?utf-8?B?cURVNU9tZktDV2xETEM2YVB4Kzh5ZjhzNkUzb2JDclovSTZTQ0F2MVFBR2Qw?=
 =?utf-8?B?eTVvbnVsQWNnejZ3WnpLV2FyVjhPMTZidC8xbWRjUnJWckhKMklBSW1vTjhl?=
 =?utf-8?B?WkxQcG01aW8vT05LZ1dyUDI5Z2IyQ2lEY1Bnck1ETVFwRUVyS2xWYzUyK29z?=
 =?utf-8?B?RHlEM3o5b2lUZWxaMnorUllYN0JrQTZhL0hxUTQwWktJSlZDRS84NnowMkc1?=
 =?utf-8?B?UWZNeExHRjMxU1MyUnNmdU9vSVp1RkxkaHAwMVBzNE9NNWsyY25jaGhMRzdt?=
 =?utf-8?B?anNPeFRWWjRDY2hldC8xT0c5VkdwVFpoMnhMQjZhSWVyUk1US3ZXS2EyaG1V?=
 =?utf-8?B?a2c9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 550a3be4-9216-406d-f4cc-08dc5b4a2584
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5089.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 23:41:59.5948
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ZF//DBXqhD8sLqbM8knPKH8zvi1dAioNv8sUvMcNwsN99oDkorHLi3wl1hmmIx0ZifPP90+oCqkdYmyx4RNGo1TnV5vJOsHI7VkDWNpBV/k=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7580
X-OriginatorOrg: intel.com


On 4/12/2024 8:38 AM, Julien Panis wrote:
> This patch introduces a member and the related accessors which can be
> used to store descriptor specific additional information. This member
> can store, for instance, an ID to differentiate a skb TX buffer type
> from a xdpf TX buffer type.
> 
> Signed-off-by: Julien Panis <jpanis@baylibre.com>
> ---
>  drivers/net/ethernet/ti/k3-cppi-desc-pool.c | 34 ++++++++++++++++++++++++-----
>  drivers/net/ethernet/ti/k3-cppi-desc-pool.h |  4 ++++
>  2 files changed, 33 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/ti/k3-cppi-desc-pool.c b/drivers/net/ethernet/ti/k3-cppi-desc-pool.c
> index 414bcac9dcc6..739bae8e11ee 100644
> --- a/drivers/net/ethernet/ti/k3-cppi-desc-pool.c
> +++ b/drivers/net/ethernet/ti/k3-cppi-desc-pool.c
> @@ -22,6 +22,7 @@ struct k3_cppi_desc_pool {
>  	size_t			mem_size;
>  	size_t			num_desc;
>  	struct gen_pool		*gen_pool;
> +	void			**desc_infos;
>  };
>  
>  void k3_cppi_desc_pool_destroy(struct k3_cppi_desc_pool *pool)
> @@ -37,7 +38,11 @@ void k3_cppi_desc_pool_destroy(struct k3_cppi_desc_pool *pool)
>  		dma_free_coherent(pool->dev, pool->mem_size, pool->cpumem,
>  				  pool->dma_addr);
>  
> +	kfree(pool->desc_infos);
> +
>  	gen_pool_destroy(pool->gen_pool);	/* frees pool->name */
> +
> +	kfree(pool);
>  }
>  EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_destroy);
>  
> @@ -50,7 +55,7 @@ k3_cppi_desc_pool_create_name(struct device *dev, size_t size,
>  	const char *pool_name = NULL;
>  	int ret = -ENOMEM;
>  
> -	pool = devm_kzalloc(dev, sizeof(*pool), GFP_KERNEL);
> +	pool = kzalloc(sizeof(*pool), GFP_KERNEL);

You could refactor pool to use the new __free cleanup annotations along
with return_no_free() to automatically handle cleanup of the pool when
the function exits on an error state. It's pretty recent, and i don't
think its strictly necessary to do here just thought I'd point it out.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>

>  	if (!pool)
>  		return ERR_PTR(ret);
>  
> @@ -62,18 +67,21 @@ k3_cppi_desc_pool_create_name(struct device *dev, size_t size,
>  	pool_name = kstrdup_const(name ? name : dev_name(pool->dev),
>  				  GFP_KERNEL);
>  	if (!pool_name)
> -		return ERR_PTR(-ENOMEM);
> +		goto gen_pool_create_fail;
>  
>  	pool->gen_pool = gen_pool_create(ilog2(pool->desc_size), -1);
>  	if (!pool->gen_pool) {
> -		ret = -ENOMEM;
> -		dev_err(pool->dev, "pool create failed %d\n", ret);
>  		kfree_const(pool_name);
>  		goto gen_pool_create_fail;
>  	}
>  
>  	pool->gen_pool->name = pool_name;
>  
> +	pool->desc_infos = kcalloc(pool->num_desc,
> +				   sizeof(*pool->desc_infos), GFP_KERNEL);
> +	if (!pool->desc_infos)
> +		goto gen_pool_desc_infos_alloc_fail;
> +
>  	pool->cpumem = dma_alloc_coherent(pool->dev, pool->mem_size,
>  					  &pool->dma_addr, GFP_KERNEL);
>  
> @@ -94,9 +102,11 @@ k3_cppi_desc_pool_create_name(struct device *dev, size_t size,
>  	dma_free_coherent(pool->dev, pool->mem_size, pool->cpumem,
>  			  pool->dma_addr);
>  dma_alloc_fail:
> +	kfree(pool->desc_infos);
> +gen_pool_desc_infos_alloc_fail:
>  	gen_pool_destroy(pool->gen_pool);	/* frees pool->name */
>  gen_pool_create_fail:
> -	devm_kfree(pool->dev, pool);
> +	kfree(pool);
>  	return ERR_PTR(ret);
>  }
>  EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_create_name);
> @@ -144,5 +154,19 @@ void *k3_cppi_desc_pool_cpuaddr(const struct k3_cppi_desc_pool *pool)
>  }
>  EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_cpuaddr);
>  
> +void k3_cppi_desc_pool_desc_info_set(struct k3_cppi_desc_pool *pool,
> +				     int desc_idx, void *info)
> +{
> +	pool->desc_infos[desc_idx] = info;
> +}
> +EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_desc_info_set);
> +
> +void *k3_cppi_desc_pool_desc_info(const struct k3_cppi_desc_pool *pool,
> +				  int desc_idx)
> +{
> +	return pool->desc_infos[desc_idx];
> +}
> +EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_desc_info);
> +
>  MODULE_LICENSE("GPL");
>  MODULE_DESCRIPTION("TI K3 CPPI5 descriptors pool API");
> diff --git a/drivers/net/ethernet/ti/k3-cppi-desc-pool.h b/drivers/net/ethernet/ti/k3-cppi-desc-pool.h
> index 3c6aed0bed71..851d352b338b 100644
> --- a/drivers/net/ethernet/ti/k3-cppi-desc-pool.h
> +++ b/drivers/net/ethernet/ti/k3-cppi-desc-pool.h
> @@ -28,5 +28,9 @@ void k3_cppi_desc_pool_free(struct k3_cppi_desc_pool *pool, void *addr);
>  size_t k3_cppi_desc_pool_avail(struct k3_cppi_desc_pool *pool);
>  size_t k3_cppi_desc_pool_desc_size(const struct k3_cppi_desc_pool *pool);
>  void *k3_cppi_desc_pool_cpuaddr(const struct k3_cppi_desc_pool *pool);
> +void k3_cppi_desc_pool_desc_info_set(struct k3_cppi_desc_pool *pool,
> +				     int desc_idx, void *info);
> +void *k3_cppi_desc_pool_desc_info(const struct k3_cppi_desc_pool *pool,
> +				  int desc_idx);
>  
>  #endif /* K3_CPPI_DESC_POOL_H_ */
>