* [dpdk-dev] [PATCH 0/3] Fix external mbuf free issue in GSO case
@ 2020-07-30 9:56 yang_y_yi
2020-07-30 9:56 ` [dpdk-dev] [PATCH 1/3] gso: fix refcnt update issue for external mbuf yang_y_yi
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: yang_y_yi @ 2020-07-30 9:56 UTC (permalink / raw)
To: dev; +Cc: jiayu.hu, thomas, yangyi01, yang_y_yi
From: Yi Yang <yangyi01@inspur.com>
It is impossible to fix external mbuf free issue in GSO case,
the issue is GSO case only can free buffer in external mbuf
but can't free this external mbuf because this is done by free_cb,
in order to fix it, free_cb interface has to been changed to
adapt to GSO case, this patch series are just to fix it
completely, OVS DPDK is typical consumer application.
Yi Yang (3):
gso: fix refcnt update issue for external mbuf
mbuf: change free_cb interface to adapt to GSO case
vhost: use new free_cb interface to fix mbuf free issue
app/test-compress-perf/comp_perf_test_common.c | 2 +-
app/test/test_compressdev.c | 2 +-
app/test/test_mbuf.c | 2 +-
drivers/net/mlx5/mlx5_rxtx.c | 2 +-
drivers/net/mlx5/mlx5_rxtx.h | 2 +-
drivers/net/netvsc/hn_rxtx.c | 3 ++-
lib/librte_gso/rte_gso.c | 5 ++++-
lib/librte_mbuf/rte_mbuf.c | 4 ++--
lib/librte_mbuf/rte_mbuf.h | 2 +-
lib/librte_mbuf/rte_mbuf_core.h | 2 +-
lib/librte_vhost/virtio_net.c | 22 +++++++++++++++++++---
11 files changed, 34 insertions(+), 14 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [dpdk-dev] [PATCH 1/3] gso: fix refcnt update issue for external mbuf 2020-07-30 9:56 [dpdk-dev] [PATCH 0/3] Fix external mbuf free issue in GSO case yang_y_yi @ 2020-07-30 9:56 ` yang_y_yi 2020-07-30 9:56 ` [dpdk-dev] [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case yang_y_yi 2020-07-30 9:56 ` [dpdk-dev] [PATCH 3/3] vhost: use new free_cb interface to fix mbuf free issue yang_y_yi 2 siblings, 0 replies; 8+ messages in thread From: yang_y_yi @ 2020-07-30 9:56 UTC (permalink / raw) To: dev; +Cc: jiayu.hu, thomas, yangyi01, yang_y_yi From: Yi Yang <yangyi01@inspur.com> rte_gso_segment will segment original mbuf to multiple small size mbufs, every mbuf of them has two segments, the second segment will attach to original mbuf, if original mbuf is external, rte_gso_segment should update refcnt of mbuf->shinfo but not refcnt of mbuf. Otherwise, original mbuf will be invalid on doing sanity check because refcnt of mbuf is 0. Fixes: 119583797b6a ("gso: support TCP/IPv4 GSO") Signed-off-by: Yi Yang <yangyi01@inspur.com> --- lib/librte_gso/rte_gso.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/librte_gso/rte_gso.c b/lib/librte_gso/rte_gso.c index 751b5b6..b5e8b2a 100644 --- a/lib/librte_gso/rte_gso.c +++ b/lib/librte_gso/rte_gso.c @@ -83,7 +83,10 @@ if (ret > 1) { pkt_seg = pkt; while (pkt_seg) { - rte_mbuf_refcnt_update(pkt_seg, -1); + if (RTE_MBUF_HAS_EXTBUF(pkt_seg)) + rte_mbuf_ext_refcnt_update(pkt_seg->shinfo, -1); + else + rte_mbuf_refcnt_update(pkt_seg, -1); pkt_seg = pkt_seg->next; } } else if (ret < 0) { -- 1.8.3.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [dpdk-dev] [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case 2020-07-30 9:56 [dpdk-dev] [PATCH 0/3] Fix external mbuf free issue in GSO case yang_y_yi 2020-07-30 9:56 ` [dpdk-dev] [PATCH 1/3] gso: fix refcnt update issue for external mbuf yang_y_yi @ 2020-07-30 9:56 ` yang_y_yi 2020-07-30 10:16 ` Thomas Monjalon 2020-07-30 9:56 ` [dpdk-dev] [PATCH 3/3] vhost: use new free_cb interface to fix mbuf free issue yang_y_yi 2 siblings, 1 reply; 8+ messages in thread From: yang_y_yi @ 2020-07-30 9:56 UTC (permalink / raw) To: dev; +Cc: jiayu.hu, thomas, yangyi01, yang_y_yi From: Yi Yang <yangyi01@inspur.com> In GSO case, segmented mbufs are attached to original mbuf which can't be freed when it is external. The issue is free_cb doesn't know original mbuf and doesn't free it when refcnt of shinfo is 0. Original mbuf can be freed by rte_pktmbuf_free segmented mbufs or by rte_pktmbuf_free original mbuf. Two kind of cases should have different behaviors. free_cb won't explicitly call rte_pktmbuf_free to free original mbuf if it is freed by rte_pktmbuf_free original mbuf, but it has to call rte_pktmbuf_free to free original mbuf if it is freed by rte_pktmbuf_free segmented mbufs. In order to fix this issue, free_cb interface has to been changed, __rte_pktmbuf_free_extbuf must deliver called mbuf pointer to free_cb, argument opaque can be defined as a custom struct by user, it can includes original mbuf pointer, user-defined free_cb can compare caller mbuf with mbuf in opaque struct, free_cb should free original mbuf if they are not same, this corresponds to rte_pktmbuf_free segmented mbufs case, otherwise, free_cb won't free original mbuf because the caller explicitly called rte_pktmbuf_free to free it. Here is pseduo code to show two kind of cases. case 1. rte_pktmbuf_free segmented mbufs nb_tx = rte_gso_segment(original_mbuf, /* original mbuf */ &gso_ctx, /* segmented mbuf */ (struct rte_mbuf **)&gso_mbufs, MAX_GSO_MBUFS); rte_eth_tx_burst(dev->port_id, qid, gso_mbufs, nb_tx); case 2. rte_pktmbuf_free original mbuf rte_eth_tx_burst(dev->port_id, qid, original_mbuf, 1); Here are user defined free_cb and opaque. struct shinfo_arg { void *buf; struct rte_mbuf *mbuf; }; custom_free_cb(struct rte_mbuf *caller_m, void *opaque) { struct shinfo_arg *arg = (struct shinfo_arg *)opaque; rte_free(arg->buf); if (caller_m != arg->mbuf) rte_pktmbuf_free(arg->mbuf); rte_free(arg); } struct shinfo_arg *arg = (struct shinfo_arg *) rte_malloc(NULL, sizeof(struct shinfo_arg), RTE_CACHE_LINE_SIZE); arg->buf = buf; arg->mbuf = pkt; shinfo->free_cb = custom_free_cb; shinfo->fcb_opaque = arg; Signed-off-by: Yi Yang <yangyi01@inspur.com> --- app/test-compress-perf/comp_perf_test_common.c | 2 +- app/test/test_compressdev.c | 2 +- app/test/test_mbuf.c | 2 +- drivers/net/mlx5/mlx5_rxtx.c | 2 +- drivers/net/mlx5/mlx5_rxtx.h | 2 +- drivers/net/netvsc/hn_rxtx.c | 3 ++- lib/librte_mbuf/rte_mbuf.c | 4 ++-- lib/librte_mbuf/rte_mbuf.h | 2 +- lib/librte_mbuf/rte_mbuf_core.h | 2 +- lib/librte_vhost/virtio_net.c | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/test-compress-perf/comp_perf_test_common.c b/app/test-compress-perf/comp_perf_test_common.c index b402a0d..b1eb733 100644 --- a/app/test-compress-perf/comp_perf_test_common.c +++ b/app/test-compress-perf/comp_perf_test_common.c @@ -115,7 +115,7 @@ struct cperf_buffer_info { } static void -comp_perf_extbuf_free_cb(void *addr __rte_unused, void *opaque __rte_unused) +comp_perf_extbuf_free_cb(struct rte_mbuf *m __rte_unused, void *opaque __rte_unused) { } diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c index 0571c17..a4a5d7c 100644 --- a/app/test/test_compressdev.c +++ b/app/test/test_compressdev.c @@ -778,7 +778,7 @@ struct test_private_arrays { } static void -extbuf_free_callback(void *addr __rte_unused, void *opaque __rte_unused) +extbuf_free_callback(struct rte_mbuf *m __rte_unused, void *opaque __rte_unused) { } diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 06e44f0..f9e5ca5 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -2300,7 +2300,7 @@ struct test_case { /* Define a free call back function to be used for external buffer */ static void -ext_buf_free_callback_fn(void *addr __rte_unused, void *opaque) +ext_buf_free_callback_fn(struct rte_mbuf *caller_m __rte_unused, void *opaque) { void *ext_buf_addr = opaque; diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 3eb0243..f084488 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -1622,7 +1622,7 @@ enum mlx5_txcmp_code { } void -mlx5_mprq_buf_free_cb(void *addr __rte_unused, void *opaque) +mlx5_mprq_buf_free_cb(struct rte_mbuf *caller_m __rte_unused, void *opaque) { struct mlx5_mprq_buf *buf = opaque; diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index c02a007..8c230c6 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -499,7 +499,7 @@ struct mlx5_txq_ctrl *mlx5_txq_hairpin_new uint16_t mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n); void mlx5_rxq_initialize(struct mlx5_rxq_data *rxq); __rte_noinline int mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec); -void mlx5_mprq_buf_free_cb(void *addr, void *opaque); +void mlx5_mprq_buf_free_cb(struct rte_mbuf *caller_m, void *opaque); void mlx5_mprq_buf_free(struct mlx5_mprq_buf *buf); uint16_t mlx5_rx_burst_mprq(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n); diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 86a4c0d..30af404 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -519,7 +519,8 @@ int hn_dev_tx_descriptor_status(void *arg, uint16_t offset) return 0; } -static void hn_rx_buf_free_cb(void *buf __rte_unused, void *opaque) +static void hn_rx_buf_free_cb(struct rte_mbuf *caller_m __rte_unused, + void *opaque) { struct hn_rx_bufinfo *rxb = opaque; struct hn_data *hv = rxb->hv; diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 8a456e5..52445b3 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -118,11 +118,11 @@ * buffer. */ static void -rte_pktmbuf_free_pinned_extmem(void *addr, void *opaque) +rte_pktmbuf_free_pinned_extmem(struct rte_mbuf *caller_m, void *opaque) { struct rte_mbuf *m = opaque; - RTE_SET_USED(addr); + RTE_SET_USED(caller_m); RTE_ASSERT(RTE_MBUF_HAS_EXTBUF(m)); RTE_ASSERT(RTE_MBUF_HAS_PINNED_EXTBUF(m)); RTE_ASSERT(m->shinfo->fcb_opaque == m); diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 7259575..5f8626f 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1193,7 +1193,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *m) RTE_ASSERT(m->shinfo != NULL); if (rte_mbuf_ext_refcnt_update(m->shinfo, -1) == 0) - m->shinfo->free_cb(m->buf_addr, m->shinfo->fcb_opaque); + m->shinfo->free_cb(m, m->shinfo->fcb_opaque); } /** diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h index 8cd7137..d194429 100644 --- a/lib/librte_mbuf/rte_mbuf_core.h +++ b/lib/librte_mbuf/rte_mbuf_core.h @@ -671,7 +671,7 @@ struct rte_mbuf { /** * Function typedef of callback to free externally attached buffer. */ -typedef void (*rte_mbuf_extbuf_free_callback_t)(void *addr, void *opaque); +typedef void (*rte_mbuf_extbuf_free_callback_t)(struct rte_mbuf *, void *); /** * Shared data at the end of an external buffer. diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index 95a0bc1..e663fd4 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -2137,7 +2137,7 @@ uint16_t rte_vhost_poll_enqueue_completed(int vid, uint16_t queue_id, } static void -virtio_dev_extbuf_free(void *addr __rte_unused, void *opaque) +virtio_dev_extbuf_free(struct rte_mbuf * caller_m __rte_unused, void *opaque) { rte_free(opaque); } -- 1.8.3.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [dpdk-dev] [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case 2020-07-30 9:56 ` [dpdk-dev] [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case yang_y_yi @ 2020-07-30 10:16 ` Thomas Monjalon [not found] ` <f16b530ed9234b988241d5c4b4329d1b@inspur.com> 0 siblings, 1 reply; 8+ messages in thread From: Thomas Monjalon @ 2020-07-30 10:16 UTC (permalink / raw) To: yang_y_yi; +Cc: dev, jiayu.hu, yangyi01, yang_y_yi, olivier.matz 30/07/2020 11:56, yang_y_yi@163.com: > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -1193,7 +1193,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *m) > RTE_ASSERT(m->shinfo != NULL); > > if (rte_mbuf_ext_refcnt_update(m->shinfo, -1) == 0) > - m->shinfo->free_cb(m->buf_addr, m->shinfo->fcb_opaque); > + m->shinfo->free_cb(m, m->shinfo->fcb_opaque); > } > > /** > diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h > index 8cd7137..d194429 100644 > --- a/lib/librte_mbuf/rte_mbuf_core.h > +++ b/lib/librte_mbuf/rte_mbuf_core.h > @@ -671,7 +671,7 @@ struct rte_mbuf { > /** > * Function typedef of callback to free externally attached buffer. > */ > -typedef void (*rte_mbuf_extbuf_free_callback_t)(void *addr, void *opaque); > +typedef void (*rte_mbuf_extbuf_free_callback_t)(struct rte_mbuf *, void *); I think a deprecation notice is required in 20.08 in order to apply such change in 20.11. Please use --cc-cmd devtools/get-maintainer.sh when sending a patch. ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <f16b530ed9234b988241d5c4b4329d1b@inspur.com>]
* Re: [dpdk-dev] 答复: [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case [not found] ` <f16b530ed9234b988241d5c4b4329d1b@inspur.com> @ 2020-07-30 10:42 ` Thomas Monjalon 2020-07-30 10:44 ` yang_y_yi 2020-07-30 12:18 ` yang_y_yi 0 siblings, 2 replies; 8+ messages in thread From: Thomas Monjalon @ 2020-07-30 10:42 UTC (permalink / raw) To: yang_y_yi, Yi Yang (杨燚)-云服务集团 Cc: dev, jiayu.hu, yang_y_yi, olivier.matz 30/07/2020 12:39, Yi Yang (杨燚)-云服务集团: > Thomas, do you mean I need to change the below files to add deprecation notice about free_cb? No it should be a separate patch for announing the deprecation in 20.08. Below patches cannot be applied in 20.08. > > doc/guides/rel_notes/deprecation.rst > doc/guides/rel_notes/release_20_08.rst > > I'll use --cc-cmd devtools/get-maintainer.sh to send a new version including deprecation notice you mentioned. > > -----邮件原件----- > 发件人: Thomas Monjalon [mailto:thomas@monjalon.net] > 发送时间: 2020年7月30日 18:17 > 收件人: yang_y_yi@163.com > 抄送: dev@dpdk.org; jiayu.hu@intel.com; Yi Yang (杨燚)-云服务集团 <yangyi01@inspur.com>; yang_y_yi@163.com; olivier.matz@6wind.com > 主题: Re: [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case > > 30/07/2020 11:56, yang_y_yi@163.com: > > --- a/lib/librte_mbuf/rte_mbuf.h > > +++ b/lib/librte_mbuf/rte_mbuf.h > > @@ -1193,7 +1193,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *m) > > RTE_ASSERT(m->shinfo != NULL); > > > > if (rte_mbuf_ext_refcnt_update(m->shinfo, -1) == 0) > > - m->shinfo->free_cb(m->buf_addr, m->shinfo->fcb_opaque); > > + m->shinfo->free_cb(m, m->shinfo->fcb_opaque); > > } > > > > /** > > diff --git a/lib/librte_mbuf/rte_mbuf_core.h > > b/lib/librte_mbuf/rte_mbuf_core.h index 8cd7137..d194429 100644 > > --- a/lib/librte_mbuf/rte_mbuf_core.h > > +++ b/lib/librte_mbuf/rte_mbuf_core.h > > @@ -671,7 +671,7 @@ struct rte_mbuf { > > /** > > * Function typedef of callback to free externally attached buffer. > > */ > > -typedef void (*rte_mbuf_extbuf_free_callback_t)(void *addr, void > > *opaque); > > +typedef void (*rte_mbuf_extbuf_free_callback_t)(struct rte_mbuf *, > > +void *); > > I think a deprecation notice is required in 20.08 in order to apply such change in 20.11. > > Please use --cc-cmd devtools/get-maintainer.sh when sending a patch. > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [dpdk-dev] 答复: [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case 2020-07-30 10:42 ` [dpdk-dev] 答复: " Thomas Monjalon @ 2020-07-30 10:44 ` yang_y_yi 2020-07-30 12:18 ` yang_y_yi 1 sibling, 0 replies; 8+ messages in thread From: yang_y_yi @ 2020-07-30 10:44 UTC (permalink / raw) To: Thomas Monjalon Cc: Yi Yang (杨燚)-云服务集团, dev, jiayu.hu, olivier.matz Got it. Thanks a lot. 在 2020-07-30 18:42:38，"Thomas Monjalon" <thomas@monjalon.net> 写道： >30/07/2020 12:39, Yi Yang (杨燚)-云服务集团: >> Thomas, do you mean I need to change the below files to add deprecation notice about free_cb? > >No it should be a separate patch for announing the deprecation in 20.08. > >Below patches cannot be applied in 20.08. > > >> >> doc/guides/rel_notes/deprecation.rst >> doc/guides/rel_notes/release_20_08.rst >> >> I'll use --cc-cmd devtools/get-maintainer.sh to send a new version including deprecation notice you mentioned. >> >> -----邮件原件----- >> 发件人: Thomas Monjalon [mailto:thomas@monjalon.net] >> 发送时间: 2020年7月30日 18:17 >> 收件人: yang_y_yi@163.com >> 抄送: dev@dpdk.org; jiayu.hu@intel.com; Yi Yang (杨燚)-云服务集团 <yangyi01@inspur.com>; yang_y_yi@163.com; olivier.matz@6wind.com >> 主题: Re: [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case >> >> 30/07/2020 11:56, yang_y_yi@163.com: >> > --- a/lib/librte_mbuf/rte_mbuf.h >> > +++ b/lib/librte_mbuf/rte_mbuf.h >> > @@ -1193,7 +1193,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *m) >> > RTE_ASSERT(m->shinfo != NULL); >> > >> > if (rte_mbuf_ext_refcnt_update(m->shinfo, -1) == 0) >> > - m->shinfo->free_cb(m->buf_addr, m->shinfo->fcb_opaque); >> > + m->shinfo->free_cb(m, m->shinfo->fcb_opaque); >> > } >> > >> > /** >> > diff --git a/lib/librte_mbuf/rte_mbuf_core.h >> > b/lib/librte_mbuf/rte_mbuf_core.h index 8cd7137..d194429 100644 >> > --- a/lib/librte_mbuf/rte_mbuf_core.h >> > +++ b/lib/librte_mbuf/rte_mbuf_core.h >> > @@ -671,7 +671,7 @@ struct rte_mbuf { >> > /** >> > * Function typedef of callback to free externally attached buffer. >> > */ >> > -typedef void (*rte_mbuf_extbuf_free_callback_t)(void *addr, void >> > *opaque); >> > +typedef void (*rte_mbuf_extbuf_free_callback_t)(struct rte_mbuf *, >> > +void *); >> >> I think a deprecation notice is required in 20.08 in order to apply such change in 20.11. >> >> Please use --cc-cmd devtools/get-maintainer.sh when sending a patch. >> >> >> > > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [dpdk-dev] 答复: [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case 2020-07-30 10:42 ` [dpdk-dev] 答复: " Thomas Monjalon 2020-07-30 10:44 ` yang_y_yi @ 2020-07-30 12:18 ` yang_y_yi 1 sibling, 0 replies; 8+ messages in thread From: yang_y_yi @ 2020-07-30 12:18 UTC (permalink / raw) To: Thomas Monjalon Cc: Yi Yang (杨燚)-云服务集团, dev, jiayu.hu, olivier.matz Unfortunately, git send-email in windows can't work with -cc-cmd, I just tried it but maintainers weren't added to cc list. Here is my get-maintainer.sh. Anybody knows why it can't work. $ ./get-maintainer.sh dpdk-patches/0000-cover-letter.patch yangyi01@yangyi0100 MINGW64 ~ $ ./get-maintainer.sh dpdk-patches/0001-gso-fix-refcnt-update-issue-for-external-mbuf.patch Jiayu Hu <jiayu.hu@intel.com> Mark Kavanagh <mark.b.kavanagh@intel.com> Konstantin Ananyev <konstantin.ananyev@intel.com> yangyi01@yangyi0100 MINGW64 ~ $ ./get-maintainer.sh dpdk-patches/0002-mbuf-change-free_cb-interface-to-adapt-to-GSO-case.patch Fiona Trahe <fiona.trahe@intel.com> Ashish Gupta <ashish.gupta@marvell.com> Olivier Matz <olivier.matz@6wind.com> Matan Azrad <matan@mellanox.com> Shahaf Shuler <shahafs@mellanox.com> Viacheslav Ovsiienko <viacheslavo@mellanox.com> Stephen Hemminger <sthemmin@microsoft.com> K. Y. Srinivasan <kys@microsoft.com> Haiyang Zhang <haiyangz@microsoft.com> Long Li <longli@microsoft.com> Maxime Coquelin <maxime.coquelin@redhat.com> Zhihong Wang <zhihong.wang@intel.com> yangyi01@yangyi0100 MINGW64 ~ $ ./get-maintainer.sh dpdk-patches/0003-vhost-use-new-free_cb-interface-to-fix-mbuf-free-iss.patch Maxime Coquelin <maxime.coquelin@redhat.com> Zhihong Wang <zhihong.wang@intel.com> yangyi01@yangyi0100 MINGW64 ~ 在 2020-07-30 18:42:38，"Thomas Monjalon" <thomas@monjalon.net> 写道： >30/07/2020 12:39, Yi Yang (杨燚)-云服务集团: >> Thomas, do you mean I need to change the below files to add deprecation notice about free_cb? > >No it should be a separate patch for announing the deprecation in 20.08. > >Below patches cannot be applied in 20.08. > > >> >> doc/guides/rel_notes/deprecation.rst >> doc/guides/rel_notes/release_20_08.rst >> >> I'll use --cc-cmd devtools/get-maintainer.sh to send a new version including deprecation notice you mentioned. >> >> -----邮件原件----- >> 发件人: Thomas Monjalon [mailto:thomas@monjalon.net] >> 发送时间: 2020年7月30日 18:17 >> 收件人: yang_y_yi@163.com >> 抄送: dev@dpdk.org; jiayu.hu@intel.com; Yi Yang (杨燚)-云服务集团 <yangyi01@inspur.com>; yang_y_yi@163.com; olivier.matz@6wind.com >> 主题: Re: [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case >> >> 30/07/2020 11:56, yang_y_yi@163.com: >> > --- a/lib/librte_mbuf/rte_mbuf.h >> > +++ b/lib/librte_mbuf/rte_mbuf.h >> > @@ -1193,7 +1193,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *m) >> > RTE_ASSERT(m->shinfo != NULL); >> > >> > if (rte_mbuf_ext_refcnt_update(m->shinfo, -1) == 0) >> > - m->shinfo->free_cb(m->buf_addr, m->shinfo->fcb_opaque); >> > + m->shinfo->free_cb(m, m->shinfo->fcb_opaque); >> > } >> > >> > /** >> > diff --git a/lib/librte_mbuf/rte_mbuf_core.h >> > b/lib/librte_mbuf/rte_mbuf_core.h index 8cd7137..d194429 100644 >> > --- a/lib/librte_mbuf/rte_mbuf_core.h >> > +++ b/lib/librte_mbuf/rte_mbuf_core.h >> > @@ -671,7 +671,7 @@ struct rte_mbuf { >> > /** >> > * Function typedef of callback to free externally attached buffer. >> > */ >> > -typedef void (*rte_mbuf_extbuf_free_callback_t)(void *addr, void >> > *opaque); >> > +typedef void (*rte_mbuf_extbuf_free_callback_t)(struct rte_mbuf *, >> > +void *); >> >> I think a deprecation notice is required in 20.08 in order to apply such change in 20.11. >> >> Please use --cc-cmd devtools/get-maintainer.sh when sending a patch. >> >> >> > > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [dpdk-dev] [PATCH 3/3] vhost: use new free_cb interface to fix mbuf free issue 2020-07-30 9:56 [dpdk-dev] [PATCH 0/3] Fix external mbuf free issue in GSO case yang_y_yi 2020-07-30 9:56 ` [dpdk-dev] [PATCH 1/3] gso: fix refcnt update issue for external mbuf yang_y_yi 2020-07-30 9:56 ` [dpdk-dev] [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case yang_y_yi @ 2020-07-30 9:56 ` yang_y_yi 2 siblings, 0 replies; 8+ messages in thread From: yang_y_yi @ 2020-07-30 9:56 UTC (permalink / raw) To: dev; +Cc: jiayu.hu, thomas, yangyi01, yang_y_yi From: Yi Yang <yangyi01@inspur.com> New free_cb interface can help fix original external mbuf free issue in GSO case, it still can be compatible with normal non-GSO case. dpdkvhostuser port can work both in GSO case and in non-GSO case by this fix. Signed-off-by: Yi Yang <yangyi01@inspur.com> --- lib/librte_vhost/virtio_net.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index e663fd4..3b69cbb 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -2136,10 +2136,20 @@ uint16_t rte_vhost_poll_enqueue_completed(int vid, uint16_t queue_id, return NULL; } +struct shinfo_arg { + void *buf; + struct rte_mbuf *mbuf; +}; + static void -virtio_dev_extbuf_free(struct rte_mbuf * caller_m __rte_unused, void *opaque) +virtio_dev_extbuf_free(struct rte_mbuf *caller_m, void *opaque) { - rte_free(opaque); + struct shinfo_arg *arg = (struct shinfo_arg *)opaque; + + rte_free(arg->buf); + if (caller_m != arg->mbuf) + rte_pktmbuf_free(arg->mbuf); + rte_free(arg); } static int @@ -2172,8 +2182,14 @@ uint16_t rte_vhost_poll_enqueue_completed(int vid, uint16_t queue_id, /* Initialize shinfo */ if (shinfo) { + struct shinfo_arg *arg = (struct shinfo_arg *) + rte_malloc(NULL, sizeof(struct shinfo_arg), + RTE_CACHE_LINE_SIZE); + + arg->buf = buf; + arg->mbuf = pkt; shinfo->free_cb = virtio_dev_extbuf_free; - shinfo->fcb_opaque = buf; + shinfo->fcb_opaque = arg; rte_mbuf_ext_refcnt_set(shinfo, 1); } else { shinfo = rte_pktmbuf_ext_shinfo_init_helper(buf, &buf_len, -- 1.8.3.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-07-30 12:18 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-30 9:56 [dpdk-dev] [PATCH 0/3] Fix external mbuf free issue in GSO case yang_y_yi
2020-07-30 9:56 ` [dpdk-dev] [PATCH 1/3] gso: fix refcnt update issue for external mbuf yang_y_yi
2020-07-30 9:56 ` [dpdk-dev] [PATCH 2/3] mbuf: change free_cb interface to adapt to GSO case yang_y_yi
2020-07-30 10:16 ` Thomas Monjalon
[not found] ` <f16b530ed9234b988241d5c4b4329d1b@inspur.com>
2020-07-30 10:42 ` [dpdk-dev] 答复: " Thomas Monjalon
2020-07-30 10:44 ` yang_y_yi
2020-07-30 12:18 ` yang_y_yi
2020-07-30 9:56 ` [dpdk-dev] [PATCH 3/3] vhost: use new free_cb interface to fix mbuf free issue yang_y_yi
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).