* [PATCH v1] net/af_xdp: make umem configure code more readable
@ 2022-02-09 12:43 Haiyue Wang
2022-02-10 8:53 ` Loftus, Ciara
0 siblings, 1 reply; 3+ messages in thread
From: Haiyue Wang @ 2022-02-09 12:43 UTC (permalink / raw)
To: dev; +Cc: Haiyue Wang, Ciara Loftus, Qi Zhang
The below compile time defined style make the code not so readable, the
first function end block is after "#endif" segment.
#if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
xdp_umem_configure()
{
#else
xdp_umem_configure()
{
#endif
'shared code block'
}
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 1b6192fa44..802f912cb7 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -1078,6 +1078,12 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
__atomic_store_n(&umem->refcnt, 1, __ATOMIC_RELEASE);
}
+ return umem;
+
+err:
+ xdp_umem_destroy(umem);
+ return NULL;
+}
#else
static struct
xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
@@ -1138,13 +1144,13 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
}
umem->mz = mz;
-#endif
return umem;
err:
xdp_umem_destroy(umem);
return NULL;
}
+#endif
static int
load_custom_xdp_prog(const char *prog_path, int if_index, struct bpf_map **map)
--
2.35.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH v1] net/af_xdp: make umem configure code more readable
2022-02-09 12:43 [PATCH v1] net/af_xdp: make umem configure code more readable Haiyue Wang
@ 2022-02-10 8:53 ` Loftus, Ciara
2022-02-10 10:31 ` Ferruh Yigit
0 siblings, 1 reply; 3+ messages in thread
From: Loftus, Ciara @ 2022-02-10 8:53 UTC (permalink / raw)
To: Wang, Haiyue, dev; +Cc: Zhang, Qi Z
> Subject: [PATCH v1] net/af_xdp: make umem configure code more readable
>
> The below compile time defined style make the code not so readable, the
> first function end block is after "#endif" segment.
>
> #if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
>
> xdp_umem_configure()
> {
>
> #else
> xdp_umem_configure()
> {
>
> #endif
> 'shared code block'
> }
>
> Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Thanks for the patch!
Acked-by: Ciara Loftus <ciara.loftus@intel.com>
> ---
> drivers/net/af_xdp/rte_eth_af_xdp.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
> b/drivers/net/af_xdp/rte_eth_af_xdp.c
> index 1b6192fa44..802f912cb7 100644
> --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
> +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
> @@ -1078,6 +1078,12 @@ xsk_umem_info *xdp_umem_configure(struct
> pmd_internals *internals,
> __atomic_store_n(&umem->refcnt, 1, __ATOMIC_RELEASE);
> }
>
> + return umem;
> +
> +err:
> + xdp_umem_destroy(umem);
> + return NULL;
> +}
> #else
> static struct
> xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
> @@ -1138,13 +1144,13 @@ xsk_umem_info *xdp_umem_configure(struct
> pmd_internals *internals,
> }
> umem->mz = mz;
>
> -#endif
> return umem;
>
> err:
> xdp_umem_destroy(umem);
> return NULL;
> }
> +#endif
>
> static int
> load_custom_xdp_prog(const char *prog_path, int if_index, struct bpf_map
> **map)
> --
> 2.35.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v1] net/af_xdp: make umem configure code more readable
2022-02-10 8:53 ` Loftus, Ciara
@ 2022-02-10 10:31 ` Ferruh Yigit
0 siblings, 0 replies; 3+ messages in thread
From: Ferruh Yigit @ 2022-02-10 10:31 UTC (permalink / raw)
To: Loftus, Ciara, Wang, Haiyue, dev; +Cc: Zhang, Qi Z
On 2/10/2022 8:53 AM, Loftus, Ciara wrote:
>> Subject: [PATCH v1] net/af_xdp: make umem configure code more readable
>>
>> The below compile time defined style make the code not so readable, the
>> first function end block is after "#endif" segment.
>>
>> #if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
>>
>> xdp_umem_configure()
>> {
>>
>> #else
>> xdp_umem_configure()
>> {
>>
>> #endif
>> 'shared code block'
>> }
>>
>> Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
>
> Thanks for the patch!
>
> Acked-by: Ciara Loftus <ciara.loftus@intel.com>
>
Applied to dpdk-next-net/main, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-10 10:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-09 12:43 [PATCH v1] net/af_xdp: make umem configure code more readable Haiyue Wang
2022-02-10 8:53 ` Loftus, Ciara
2022-02-10 10:31 ` Ferruh Yigit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).