<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=gb2312"> </head> <body> <div> <div> <div dir="ltr" style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);"> Got it.</div> </div> <div id="ms-outlook-mobile-signature"> <div> </div> 获取 <a href="https://aka.ms/o0ukef">Outlook for iOS</a></div> </div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">发件人: Slava Ovsiienko <viacheslavo@nvidia.com> 发送时间: Friday, November 12, 2021 12:47:04 AM 收件人: YE Chengfeng <cyeaa@connect.ust.hk>; Ferruh Yigit <ferruh.yigit@intel.com>; dev@dpdk.org <dev@dpdk.org> 抄送: Raslan Darawsheh <rasland@nvidia.com>; Matan Azrad <matan@nvidia.com>; stable@dpdk.org <stable@dpdk.org> 主题: RE: [PATCH] net/mlx5: remove redundant "set used" <div> </div> </div> <style>  </style> <div lang="EN-US" link="blue" vlink="purple" style="word-wrap:break-word"> <div class="x_WordSection1"> <div style="border:none; border-left:solid blue 1.5pt; padding:0in 0in 0in 4.0pt"> <div> <div style="border:none; border-top:solid #E1E1E1 1.0pt; padding:3.0pt 0in 0in 0in"> From: YE Chengfeng <cyeaa@connect.ust.hk> Sent: Thursday, November 11, 2021 18:08 To: Slava Ovsiienko <viacheslavo@nvidia.com>; Ferruh Yigit <ferruh.yigit@intel.com>; dev@dpdk.org Cc: Raslan Darawsheh <rasland@nvidia.com>; Matan Azrad <matan@nvidia.com>; stable@dpdk.org Subject: Re: [PATCH] net/mlx5: remove redundant "set used" </div> </div> <div> No problem, I will send the new patch. </div> [SO] Thank you. But what about the commit message and title, should I use the previous one? <pre style="margin-bottom:7.5pt; background:white; word-break:break-all; box-sizing:border-box; border-top-left-radius:0px; border-top-right-radius:0px; border-bottom-right-radius:0px; border-bottom-left-radius:0px; overflow:auto">net/mlx5: fix mutex unlock in txpp cleanup</pre> <pre>[SO] Please, send as the next version (v6?) of your patch. Just squash my proposals and keep your title (“net/mlx5: fix mutex unlock in txpp cleanup”) and commit message.</pre> <pre> </pre> <pre>With best regards, Slava</pre> <pre> </pre> <div> <div> <div> <pre style="line-height:10.75pt; background:white; word-break:break-all"> </pre> </div> </div> </div> <div id="x_ms-outlook-mobile-signature"> <div> </div> 获取 <a href="https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Faka.ms%2Fo0ukef&data=04%7C01%7Ccyeaa%40connect.ust.hk%7Cb054bd8f8f3c42e1f0bb08d9a532e5d5%7C6c1d415239d044ca88d9b8d6ddca0708%7C1%7C0%7C637722460307163598%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3v%2BIAEdHSfsB%2BEoAmKldFqybeHCC3ihLZ6HSnWzkTD0%3D&reserved=0" originalsrc="https://aka.ms/o0ukef" shash="cIW6ps8jdMTzcz2ajD20Ap5X8xtQD3Gy82qnOkhF3SPtX9yrkVtjkPjrub32bKEOLMAKxlvkyRQYTrNHtc6jQgb5O4hdF749H+DjZ+53Y9/lirK5R87B1Y9pNDr4WOuWp2N2k8O2Ki+GF/sBJtldLAg7C9M5ilR59jKDkvo30jo=">Outlook for iOS</a> </div> </div> <div class="x_MsoNormal" align="center" style="text-align:center"> <hr size="2" width="98%" align="center"> </div> <div id="x_divRplyFwdMsg"> 发件人: Slava Ovsiienko <<a href="mailto:viacheslavo@nvidia.com">viacheslavo@nvidia.com</a>> 发送时间: Thursday, November 11, 2021 8:27:30 PM 收件人: Ferruh Yigit <<a href="mailto:ferruh.yigit@intel.com">ferruh.yigit@intel.com</a>>; <a href="mailto:dev@dpdk.org"> dev@dpdk.org</a> <<a href="mailto:dev@dpdk.org">dev@dpdk.org</a>> 抄送: Raslan Darawsheh <<a href="mailto:rasland@nvidia.com">rasland@nvidia.com</a>>; Matan Azrad <<a href="mailto:matan@nvidia.com">matan@nvidia.com</a>>; <a href="mailto:stable@dpdk.org">stable@dpdk.org</a> <<a href="mailto:stable@dpdk.org">stable@dpdk.org</a>>; YE Chengfeng <<a href="mailto:cyeaa@connect.ust.hk">cyeaa@connect.ust.hk</a>> 主题: RE: [PATCH] net/mlx5: remove redundant "set used" <div> </div> </div> <div> <div> Hi, Ferruh > -----Original Message----- > From: Ferruh Yigit <<a href="mailto:ferruh.yigit@intel.com">ferruh.yigit@intel.com</a>> > Sent: Thursday, November 11, 2021 14:08 > To: Slava Ovsiienko <<a href="mailto:viacheslavo@nvidia.com">viacheslavo@nvidia.com</a>>; <a href="mailto:dev@dpdk.org">dev@dpdk.org</a> > Cc: Raslan Darawsheh <<a href="mailto:rasland@nvidia.com">rasland@nvidia.com</a>>; Matan Azrad > <<a href="mailto:matan@nvidia.com">matan@nvidia.com</a>>; <a href="mailto:stable@dpdk.org"> stable@dpdk.org</a>; Chengfeng Ye > <<a href="mailto:cyeaa@connect.ust.hk">cyeaa@connect.ust.hk</a>> > Subject: Re: [PATCH] net/mlx5: remove redundant "set used" > > On 11/11/2021 8:59 AM, Slava Ovsiienko wrote: > > Hi, Ferruh > > > > I've also inspected the mlx5 PMD code for RTE_SET_USED() for the > > similar issues related to the MLX5_ASSERT(). > > > > The patch > > <a href="https://apc01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatches.dpdk.org%2Fproject%2Fdpdk%2Fpatch%2F20211111084751.26721-1-&data=04%7C01%7Ccyeaa%40connect.ust.hk%7Cb054bd8f8f3c42e1f0bb08d9a532e5d5%7C6c1d415239d044ca88d9b8d6ddca0708%7C1%7C0%7C637722460307173555%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=FH1BEOdaDn4vgLHJ%2BjV8DrH9kZIVCVpoVUEnPB2GHWw%3D&reserved=0" originalsrc="http://patches.dpdk.org/project/dpdk/patch/20211111084751.26721-1-" shash="c+SO4L//Wpwld5Ripp9U+OxvjzIycUQUdbjWbHAWQ9P0mqwHmQWUkQGePdb44/3UwhprrWiPTxNhw+W5jV42J2kZGe3gbSlWi9KGQbQMwDtXgcP0FUw7pyuOu3Ev9ca/4YUGelUWk65C1v5N184JqHCLdfi5VjmVuORNRrauczs="> https://apc01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatches.dpdk.org%2Fproject%2Fdpdk%2Fpatch%2F20211111084751.26721-1-&data=04%7C01%7Ccyeaa%40connect.ust.hk%7C87553a5cd43647db708008d9a50ea321%7C6c1d415239d044ca88d9b8d6ddca0708%7C1%7C0%7C637722304566828185%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=woTMghsE0S7ckoo0AI01YbdWrJeLtbMCu4GeE8JDiUc%3D&reserved=0</a> > viac > > <a href="mailto:heslavo@nvidia.com/">heslavo@nvidia.com/</a> > > should refine the few found ones. > > > > I do not mind about squashing with "net/mlx5: fix mutex unlock in txpp > cleanup" > > After getting this code in Upstream will care about the version for LTS. > > > > It will cause additional complexity for the LTS, since a small part of the below > fix will be originated from Chengfeng's change. To help LTS, what do you think > - First get your fix on top of current task > - Have a new version from Chengfeng on top of latest head, with 'claim_zero' > usage? Would be nice, I have no any objections. Chengfeng, could you please, squash (or write by yourself) my proposed updates and send the next version of your patch with "claim_zero()"? > So only your update need to be merged to LTS releases. Yes, agree, it is even better than my proposal. With best regards, Slava > > > >> -----Original Message----- > >> From: Viacheslav Ovsiienko <<a href="mailto:viacheslavo@nvidia.com">viacheslavo@nvidia.com</a>> > >> Sent: Thursday, November 11, 2021 10:48 > >> To: <a href="mailto:dev@dpdk.org">dev@dpdk.org</a> > >> Cc: <a href="mailto:ferruh.yigit@intel.com">ferruh.yigit@intel.com</a>; Raslan Darawsheh <<a href="mailto:rasland@nvidia.com">rasland@nvidia.com</a>>; > >> Matan Azrad <<a href="mailto:matan@nvidia.com">matan@nvidia.com</a>>; <a href="mailto:stable@dpdk.org"> stable@dpdk.org</a> > >> Subject: [PATCH] net/mlx5: remove redundant "set used" > >> > >> The patch just refines the code and replaces the pairs of > >> MLX5_ASSERT() and > >> RTE_SET_USED() with equivalent claim_zero(). > >> > >> Cc: <a href="mailto:stable@dpdk.org">stable@dpdk.org</a> > >> > >> Signed-off-by: Viacheslav Ovsiienko <<a href="mailto:viacheslavo@nvidia.com">viacheslavo@nvidia.com</a>> > >> --- > >> drivers/net/mlx5/mlx5_txpp.c | 30 ++++++++++-------------------- > >> 1 file changed, 10 insertions(+), 20 deletions(-) > >> > >> diff --git a/drivers/net/mlx5/mlx5_txpp.c > >> b/drivers/net/mlx5/mlx5_txpp.c index 73626f0e8f..af77e91e4c 100644 > >> --- a/drivers/net/mlx5/mlx5_txpp.c > >> +++ b/drivers/net/mlx5/mlx5_txpp.c > >> @@ -890,7 +890,6 @@ mlx5_txpp_start(struct rte_eth_dev *dev) > >> struct mlx5_priv *priv = dev->data->dev_private; > >> struct mlx5_dev_ctx_shared *sh = priv->sh; > >> int err = 0; > >> - int ret; > >> > >> if (!priv->config.tx_pp) { > >> /* Packet pacing is not requested for the device. */ @@ - > >> 903,14 +902,14 @@ mlx5_txpp_start(struct rte_eth_dev *dev) > >> return 0; > >> } > >> if (priv->config.tx_pp > 0) { > >> - ret = rte_mbuf_dynflag_lookup > >> - > >> (RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME, NULL); > >> - if (ret < 0) > >> + err = rte_mbuf_dynflag_lookup > >> + (RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME, > >> NULL); > >> + /* No flag registered means no service needed. */ > >> + if (err < 0) > >> return 0; > >> + err = 0; > >> } > >> - ret = pthread_mutex_lock(&sh->txpp.mutex); > >> - MLX5_ASSERT(!ret); > >> - RTE_SET_USED(ret); > >> + claim_zero(pthread_mutex_lock(&sh->txpp.mutex)); > >> if (sh->txpp.refcnt) { > >> priv->txpp_en = 1; > >> ++sh->txpp.refcnt; > >> @@ -924,9 +923,7 @@ mlx5_txpp_start(struct rte_eth_dev *dev) > >> rte_errno = -err; > >> } > >> } > >> - ret = pthread_mutex_unlock(&sh->txpp.mutex); > >> - MLX5_ASSERT(!ret); > >> - RTE_SET_USED(ret); > >> + claim_zero(pthread_mutex_unlock(&sh->txpp.mutex)); > >> return err; > >> } > >> > >> @@ -944,28 +941,21 @@ mlx5_txpp_stop(struct rte_eth_dev *dev) { > >> struct mlx5_priv *priv = dev->data->dev_private; > >> struct mlx5_dev_ctx_shared *sh = priv->sh; > >> - int ret; > >> > >> if (!priv->txpp_en) { > >> /* Packet pacing is already disabled for the device. */ > >> return; > >> } > >> priv->txpp_en = 0; > >> - ret = pthread_mutex_lock(&sh->txpp.mutex); > >> - MLX5_ASSERT(!ret); > >> - RTE_SET_USED(ret); > >> + claim_zero(pthread_mutex_lock(&sh->txpp.mutex)); > >> MLX5_ASSERT(sh->txpp.refcnt); > >> if (!sh->txpp.refcnt || --sh->txpp.refcnt) { > >> - ret = pthread_mutex_unlock(&sh->txpp.mutex); > >> - MLX5_ASSERT(!ret); > >> - RTE_SET_USED(ret); > >> + claim_zero(pthread_mutex_unlock(&sh->txpp.mutex)); > >> return; > >> } > >> /* No references any more, do actual destroy. */ > >> mlx5_txpp_destroy(sh); > >> - ret = pthread_mutex_unlock(&sh->txpp.mutex); > >> - MLX5_ASSERT(!ret); > >> - RTE_SET_USED(ret); > >> + claim_zero(pthread_mutex_unlock(&sh->txpp.mutex)); > >> } > >> > >> /* > >> -- > >> 2.18.1 > > </div> </div> </div> </div> </body> </html>