From: "Yu, DapengX" <dapengx.yu@intel.com>
To: "Wang, Haiyue" <haiyue.wang@intel.com>,
"Yang, Qiming" <qiming.yang@intel.com>,
"Zhang, Qi Z" <qi.z.zhang@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>, "stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH] net/ice: fix representor port segmentation fault
Date: Fri, 3 Sep 2021 03:08:50 +0000 [thread overview]
Message-ID: <PH0PR11MB51250A37E8593DE92431A2328CCF9@PH0PR11MB5125.namprd11.prod.outlook.com> (raw)
In-Reply-To: <BN8PR11MB37955D672D3037E1DE4EA958F7CE9@BN8PR11MB3795.namprd11.prod.outlook.com>
> -----Original Message-----
> From: Wang, Haiyue <haiyue.wang@intel.com>
> Sent: Thursday, September 2, 2021 10:45 PM
> To: Yu, DapengX <dapengx.yu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: RE: [PATCH] net/ice: fix representor port segmentation fault
>
> > -----Original Message-----
> > From: Yu, DapengX <dapengx.yu@intel.com>
> > Sent: Thursday, September 2, 2021 17:44
> > To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>
> > Cc: dev@dpdk.org; Wang, Haiyue <haiyue.wang@intel.com>; Yu, DapengX
> > <dapengx.yu@intel.com>; stable@dpdk.org
> > Subject: [PATCH] net/ice: fix representor port segmentation fault
> >
> > From: Dapeng Yu <dapengx.yu@intel.com>
> >
> > If DCF representor port is closed after DCF port is closed, there will
> > be segmentation fault because representor accesses the released
> > resource of DCF port.
> >
> > This patch makes DCF representor port is always closed before DCF port
> > is closed.
> >
> > Fixes: 5674465a32c8 ("net/ice: add DCF VLAN handling")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
> > ---
> > drivers/net/ice/ice_dcf_ethdev.c | 1 +
> > drivers/net/ice/ice_dcf_ethdev.h | 1 +
> > drivers/net/ice/ice_dcf_vf_representor.c | 26
> > ++++++++++++++++++++----
> > 3 files changed, 24 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/net/ice/ice_dcf_ethdev.c
> > b/drivers/net/ice/ice_dcf_ethdev.c
> > index cab7c4da87..b837f69fd4 100644
> > --- a/drivers/net/ice/ice_dcf_ethdev.c
> > +++ b/drivers/net/ice/ice_dcf_ethdev.c
> > @@ -874,6 +874,7 @@ ice_dcf_dev_close(struct rte_eth_dev *dev)
> > if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> > return 0;
> >
> > + ice_dcf_vf_repr_close_all(adapter);
> > ice_dcf_free_repr_info(adapter);
> > ice_dcf_uninit_parent_adapter(dev);
> > ice_dcf_uninit_hw(dev, &adapter->real_hw); diff --git
> > a/drivers/net/ice/ice_dcf_ethdev.h b/drivers/net/ice/ice_dcf_ethdev.h
> > index 8510e37119..9e8d3ef0c5 100644
> > --- a/drivers/net/ice/ice_dcf_ethdev.h
> > +++ b/drivers/net/ice/ice_dcf_ethdev.h
> > @@ -64,5 +64,6 @@ int ice_dcf_vf_repr_init(struct rte_eth_dev
> > *vf_rep_eth_dev, void *init_param); int ice_dcf_vf_repr_uninit(struct
> > rte_eth_dev *vf_rep_eth_dev); int ice_dcf_vf_repr_init_vlan(struct
> > rte_eth_dev *vf_rep_eth_dev); void ice_dcf_vf_repr_stop_all(struct
> > ice_dcf_adapter *dcf_adapter);
> > +void ice_dcf_vf_repr_close_all(struct ice_dcf_adapter *dcf_adapter);
> >
> > #endif /* _ICE_DCF_ETHDEV_H_ */
> > diff --git a/drivers/net/ice/ice_dcf_vf_representor.c
> > b/drivers/net/ice/ice_dcf_vf_representor.c
> > index 970461f3e9..121dea7483 100644
> > --- a/drivers/net/ice/ice_dcf_vf_representor.c
> > +++ b/drivers/net/ice/ice_dcf_vf_representor.c
> > @@ -46,6 +46,7 @@ static int
> > ice_dcf_vf_repr_dev_stop(struct rte_eth_dev *dev) {
> > dev->data->dev_link.link_status = ETH_LINK_DOWN;
> > + dev->data->dev_started = 0;
> >
> > return 0;
> > }
> > @@ -53,6 +54,7 @@ ice_dcf_vf_repr_dev_stop(struct rte_eth_dev *dev)
> > static int ice_dcf_vf_repr_dev_close(struct rte_eth_dev *dev) {
> > + (void)ice_dcf_vf_repr_dev_stop(dev);
>
> Do we truly need the "(void)" ?
Here use (void) to make discarding of return value explicit.
There will be no compiler(clang, icc, and gcc) warning even if remove (void)
So it is fine without that.
>
> > return ice_dcf_vf_repr_uninit(dev);
> > }
> >
> > @@ -464,7 +466,6 @@ void
> > ice_dcf_vf_repr_stop_all(struct ice_dcf_adapter *dcf_adapter) {
> > uint16_t vf_id;
> > - int ret;
> >
> > if (!dcf_adapter->repr_infos)
> > return;
> > @@ -475,8 +476,25 @@ ice_dcf_vf_repr_stop_all(struct ice_dcf_adapter
> *dcf_adapter)
> > if (!vf_rep_eth_dev || vf_rep_eth_dev->data->dev_started
> == 0)
> > continue;
> >
> > - ret = ice_dcf_vf_repr_dev_stop(vf_rep_eth_dev);
> > - if (!ret)
> > - vf_rep_eth_dev->data->dev_started = 0;
> > + (void)ice_dcf_vf_repr_dev_stop(vf_rep_eth_dev);
> > + }
> > +}
> > +
> > +void
> > +ice_dcf_vf_repr_close_all(struct ice_dcf_adapter *dcf_adapter) {
> > + uint16_t vf_id;
> > +
> > + if (!dcf_adapter->repr_infos)
> > + return;
> > +
> > + for (vf_id = 0; vf_id < dcf_adapter->real_hw.num_vfs; vf_id++) {
> > + struct rte_eth_dev *vf_rep_eth_dev =
> > + dcf_adapter-
> >repr_infos[vf_id].vf_rep_eth_dev;
> > + if (!vf_rep_eth_dev)
> > + continue;
> > +
> > + (void)ice_dcf_vf_repr_dev_close(vf_rep_eth_dev);
> > + (void)rte_eth_dev_release_port(vf_rep_eth_dev);
> > }
> > }
> > --
> > 2.27.0
next prev parent reply other threads:[~2021-09-03 3:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-02 9:44 dapengx.yu
2021-09-02 14:45 ` Wang, Haiyue
2021-09-03 3:08 ` Yu, DapengX [this message]
2021-09-03 4:37 ` Wang, Haiyue
2021-09-03 5:41 ` [dpdk-dev] [PATCH v2] " dapengx.yu
2021-09-07 2:00 ` [dpdk-dev] [PATCH v3] " dapengx.yu
2021-09-13 5:46 ` Wang, Haiyue
2021-09-13 5:50 ` Zhang, Qi Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=PH0PR11MB51250A37E8593DE92431A2328CCF9@PH0PR11MB5125.namprd11.prod.outlook.com \
--to=dapengx.yu@intel.com \
--cc=dev@dpdk.org \
--cc=haiyue.wang@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=qiming.yang@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).