[dpdk-stable] please help backporting some patches to LTS release 17.11.1

[dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Yuanhan Liu]

Hi commit authors (and maintainers),

I didn't manage to apply following commits from upstream to stable branch
17.11: conflict happens. I'm wondering can the authors check the following
list and backport those patches belong to you?

FYI, branch 17.11 is located at tree:
   git://dpdk.org/dpdk-stable

It'd be great if you could do that in one weeks. Also, please add a
heading line like below before the commit log body:
    [ backported from upstream commit xxx ]

Example: http://dpdk.org/browse/dpdk-stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e

Please let me know if you have any comments, say, need more time, or it's
worthless to packport it. And please send it to "stable@dpdk.org", but not
"dev@dpdk.org".

Also, please make an reply to me when you have done that, just in case I
may miss the backport email.

Thanks.

	-yliu

---
5c45e0f  Anatoly Burakov  test/memzone: handle previously allocated memzones
4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound requirement
dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue action
f07f9bc  Nélio Laranjeiro net/mlx5: fix port stop by verify flows are still present
51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
35906ac  Olivier Matz     net/bnxt: fix headroom initialization
70205b5  Ophir Munk       net/failsafe: fix default Tx offloads capabilities
452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue count
dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
da23f0a  Vipin Varghese   service: fix memory leak with new function
c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
0ff7683  Yong Wang        net/dpaa: fix potential memory leak

[dpdk-stable] 答复: please help backporting some patches to LTS release 17.11.1

[wang.yong19]

I can't get the code from git. The error occured is below. What should I do now?

[root@localhost 2017]# git clone git://dpdk.org/dpdk-stable
Cloning into 'dpdk-stable'...
fatal: unable to connect to dpdk.org:
dpdk.org[0: 92.243.14.124]: errno=Connection timed out

[root@localhost 2017]# git clone http://dpdk.org/dpdk-stable
Cloning into 'dpdk-stable'...
fatal: repository 'http://dpdk.org/dpdk-stable/' not found





------------------origin------------------
send：YuanhanLiu <yliu@fridaylinux.org>
to：dpdk stable <stable@dpdk.org>
cc：Anatoly Burakov <anatoly.burakov@intel.com>Beilei Xing <beilei.xing@intel.com>Bernard Iremonger <bernard.iremonger@intel.com>Harish Patil <harish.patil@cavium.com>Nelio Laranjeiro <nelio.laranjeiro@6wind.com>Olivier Matz <olivier.matz@6wind.com>Ophir Munk <ophirmu@mellanox.com>Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>Qi Zhang <qi.z.zhang@intel.com>Shahaf Shuler <shahafs@mellanox.com>Vipin Varghese <vipin.varghese@intel.com>Yongseok Koh <yskoh@mellanox.com>汪勇10032886;
date ：2018年02月07日 17:32
subject ：please help backporting some patches to LTS release 17.11.1
Hi commit authors (and maintainers),

I didn't manage to apply following commits from upstream to stable branch
17.11: conflict happens. I'm wondering can the authors check the following
list and backport those patches belong to you?

FYI, branch 17.11 is located at tree:
git://dpdk.org/dpdk-stable

It'd be great if you could do that in one weeks. Also, please add a
heading line like below before the commit log body:
[ backported from upstream commit xxx ]

Example: http://dpdk.org/browse/dpdk-stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e

Please let me know if you have any comments, say, need more time, or it's
worthless to packport it. And please send it to "stable@dpdk.org", but not
"dev@dpdk.org".

Also, please make an reply to me when you have done that, just in case I
may miss the backport email.

Thanks.

-yliu

---
5c45e0f  Anatoly Burakov  test/memzone: handle previously allocated memzones
4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound requirement
dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue action
f07f9bc  Nélio Laranjeiro net/mlx5: fix port stop by verify flows are still present
51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
35906ac  Olivier Matz     net/bnxt: fix headroom initialization
70205b5  Ophir Munk       net/failsafe: fix default Tx offloads capabilities
452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue count
dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
da23f0a  Vipin Varghese   service: fix memory leak with new function
c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Pavan Nikhilesh]

Hi Yuanhan,

The following patch isn't a candidate for stable.

452cd79 app/eventdev: fix event device queue count

Thanks,
Pavan.

On Wed, Feb 07, 2018 at 05:31:55PM +0800, Yuanhan Liu wrote:
> Hi commit authors (and maintainers),
>
> I didn't manage to apply following commits from upstream to stable branch
> 17.11: conflict happens. I'm wondering can the authors check the following
> list and backport those patches belong to you?
>
> FYI, branch 17.11 is located at tree:
>    git://dpdk.org/dpdk-stable
>
> It'd be great if you could do that in one weeks. Also, please add a
> heading line like below before the commit log body:
>     [ backported from upstream commit xxx ]
>
> Example: http://dpdk.org/browse/dpdk-stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
>
> Please let me know if you have any comments, say, need more time, or it's
> worthless to packport it. And please send it to "stable@dpdk.org", but not
> "dev@dpdk.org".
>
> Also, please make an reply to me when you have done that, just in case I
> may miss the backport email.
>
> Thanks.
>
> 	-yliu
>
> ---
> 5c45e0f  Anatoly Burakov  test/memzone: handle previously allocated memzones
> 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
> cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
> 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
> 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound requirement
> dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
> c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue action
> f07f9bc  Nélio Laranjeiro net/mlx5: fix port stop by verify flows are still present
> 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
> 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
> 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads capabilities
> 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue count
> dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
> 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
> cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
> e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
> da23f0a  Vipin Varghese   service: fix memory leak with new function
> c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
> 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Yuanhan Liu]

On Thu, Feb 08, 2018 at 02:16:37PM +0530, Pavan Nikhilesh wrote:
> Hi Yuanhan,
> 
> The following patch isn't a candidate for stable.
> 
> 452cd79 app/eventdev: fix event device queue count

Hi Pavan, thank you for letting me know. It's now dropped.

	--yliu
> 
> Thanks,
> Pavan.
> 
> On Wed, Feb 07, 2018 at 05:31:55PM +0800, Yuanhan Liu wrote:
> > Hi commit authors (and maintainers),
> >
> > I didn't manage to apply following commits from upstream to stable branch
> > 17.11: conflict happens. I'm wondering can the authors check the following
> > list and backport those patches belong to you?
> >
> > FYI, branch 17.11 is located at tree:
> >    git://dpdk.org/dpdk-stable
> >
> > It'd be great if you could do that in one weeks. Also, please add a
> > heading line like below before the commit log body:
> >     [ backported from upstream commit xxx ]
> >
> > Example: http://dpdk.org/browse/dpdk-stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
> >
> > Please let me know if you have any comments, say, need more time, or it's
> > worthless to packport it. And please send it to "stable@dpdk.org", but not
> > "dev@dpdk.org".
> >
> > Also, please make an reply to me when you have done that, just in case I
> > may miss the backport email.
> >
> > Thanks.
> >
> > 	-yliu
> >
> > ---
> > 5c45e0f  Anatoly Burakov  test/memzone: handle previously allocated memzones
> > 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
> > cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
> > 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
> > 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound requirement
> > dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
> > c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue action
> > f07f9bc  Nélio Laranjeiro net/mlx5: fix port stop by verify flows are still present
> > 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
> > 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
> > 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads capabilities
> > 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue count
> > dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
> > 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
> > cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
> > e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
> > da23f0a  Vipin Varghese   service: fix memory leak with new function
> > c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
> > 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Yuanhan Liu]

Hi Harish,

Here is one more for you:

7cf0f10  Harish Patil     net/qede: fix tunnel parameters init

Thanks.

	--yliu

On Wed, Feb 07, 2018 at 05:31:55PM +0800, Yuanhan Liu wrote:
> Hi commit authors (and maintainers),
> 
> I didn't manage to apply following commits from upstream to stable branch
> 17.11: conflict happens. I'm wondering can the authors check the following
> list and backport those patches belong to you?
> 
> FYI, branch 17.11 is located at tree:
>    git://dpdk.org/dpdk-stable
> 
> It'd be great if you could do that in one weeks. Also, please add a
> heading line like below before the commit log body:
>     [ backported from upstream commit xxx ]
> 
> Example: http://dpdk.org/browse/dpdk-stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
> 
> Please let me know if you have any comments, say, need more time, or it's
> worthless to packport it. And please send it to "stable@dpdk.org", but not
> "dev@dpdk.org".
> 
> Also, please make an reply to me when you have done that, just in case I
> may miss the backport email.
> 
> Thanks.
> 
> 	-yliu
> 
> ---
> 5c45e0f  Anatoly Burakov  test/memzone: handle previously allocated memzones
> 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
> cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
> 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
> 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound requirement
> dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
> c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue action
> f07f9bc  Nélio Laranjeiro net/mlx5: fix port stop by verify flows are still present
> 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
> 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
> 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads capabilities
> 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue count
> dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
> 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
> cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
> e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
> da23f0a  Vipin Varghese   service: fix memory leak with new function
> c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
> 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Burakov, Anatoly]

Hi,

I've looked at commit 5c45e0f. This patch cannot be backported before 71330483 [1] is applied, as it depends on changes made in that patch.

http://dpdk.org/dev/patchwork/patch/31276/

Logs show that it was CC'd to stable, but it looks like it wasn't integrated into stable.

Thanks,
Anatoly


> -----Original Message-----
> From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> Sent: Wednesday, February 7, 2018 9:32 AM
> To: dpdk stable <stable@dpdk.org>
> Cc: Burakov, Anatoly <anatoly.burakov@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>; Iremonger, Bernard
> <bernard.iremonger@intel.com>; Harish Patil <harish.patil@cavium.com>;
> Nelio Laranjeiro <nelio.laranjeiro@6wind.com>; Olivier Matz
> <olivier.matz@6wind.com>; Ophir Munk <ophirmu@mellanox.com>; Pavan
> Nikhilesh <pbhagavatula@caviumnetworks.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Shahaf Shuler <shahafs@mellanox.com>;
> Varghese, Vipin <vipin.varghese@intel.com>; Yongseok Koh
> <yskoh@mellanox.com>; Yong Wang <wang.yong19@zte.com.cn>
> Subject: please help backporting some patches to LTS release 17.11.1
> 
> Hi commit authors (and maintainers),
> 
> I didn't manage to apply following commits from upstream to stable branch
> 17.11: conflict happens. I'm wondering can the authors check the following
> list and backport those patches belong to you?
> 
> FYI, branch 17.11 is located at tree:
>    git://dpdk.org/dpdk-stable
> 
> It'd be great if you could do that in one weeks. Also, please add a heading
> line like below before the commit log body:
>     [ backported from upstream commit xxx ]
> 
> Example: http://dpdk.org/browse/dpdk-
> stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
> 
> Please let me know if you have any comments, say, need more time, or it's
> worthless to packport it. And please send it to "stable@dpdk.org", but not
> "dev@dpdk.org".
> 
> Also, please make an reply to me when you have done that, just in case I
> may miss the backport email.
> 
> Thanks.
> 
> 	-yliu
> 
> ---
> 5c45e0f  Anatoly Burakov  test/memzone: handle previously allocated
> memzones
> 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
> cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
> 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
> 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound
> requirement
> dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
> c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue action f07f9bc
> Nélio Laranjeiro net/mlx5: fix port stop by verify flows are still present
> 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
> 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
> 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads capabilities
> 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue count
> dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
> 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
> cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
> e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
> da23f0a  Vipin Varghese   service: fix memory leak with new function
> c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
> 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Yuanhan Liu]

On Mon, Feb 12, 2018 at 10:36:23AM +0000, Burakov, Anatoly wrote:
> Hi,
> 
> I've looked at commit 5c45e0f. This patch cannot be backported before 71330483 [1] is applied, as it depends on changes made in that patch.
> 
> http://dpdk.org/dev/patchwork/patch/31276/
> 
> Logs show that it was CC'd to stable, but it looks like it wasn't integrated into stable.

That patch is part of the v17.11 release (was merged after v17.11-rc3).
So it's also in the 17.11 stable branch.

	--yliu
> 
> 
> > -----Original Message-----
> > From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> > Sent: Wednesday, February 7, 2018 9:32 AM
> > To: dpdk stable <stable@dpdk.org>
> > Cc: Burakov, Anatoly <anatoly.burakov@intel.com>; Xing, Beilei
> > <beilei.xing@intel.com>; Iremonger, Bernard
> > <bernard.iremonger@intel.com>; Harish Patil <harish.patil@cavium.com>;
> > Nelio Laranjeiro <nelio.laranjeiro@6wind.com>; Olivier Matz
> > <olivier.matz@6wind.com>; Ophir Munk <ophirmu@mellanox.com>; Pavan
> > Nikhilesh <pbhagavatula@caviumnetworks.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>; Shahaf Shuler <shahafs@mellanox.com>;
> > Varghese, Vipin <vipin.varghese@intel.com>; Yongseok Koh
> > <yskoh@mellanox.com>; Yong Wang <wang.yong19@zte.com.cn>
> > Subject: please help backporting some patches to LTS release 17.11.1
> > 
> > Hi commit authors (and maintainers),
> > 
> > I didn't manage to apply following commits from upstream to stable branch
> > 17.11: conflict happens. I'm wondering can the authors check the following
> > list and backport those patches belong to you?
> > 
> > FYI, branch 17.11 is located at tree:
> >    git://dpdk.org/dpdk-stable
> > 
> > It'd be great if you could do that in one weeks. Also, please add a heading
> > line like below before the commit log body:
> >     [ backported from upstream commit xxx ]
> > 
> > Example: http://dpdk.org/browse/dpdk-
> > stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
> > 
> > Please let me know if you have any comments, say, need more time, or it's
> > worthless to packport it. And please send it to "stable@dpdk.org", but not
> > "dev@dpdk.org".
> > 
> > Also, please make an reply to me when you have done that, just in case I
> > may miss the backport email.
> > 
> > Thanks.
> > 
> > 	-yliu
> > 
> > ---
> > 5c45e0f  Anatoly Burakov  test/memzone: handle previously allocated
> > memzones
> > 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
> > cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
> > 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
> > 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound
> > requirement
> > dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
> > c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue action f07f9bc
> > Nélio Laranjeiro net/mlx5: fix port stop by verify flows are still present
> > 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
> > 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
> > 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads capabilities
> > 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue count
> > dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
> > 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
> > cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
> > e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
> > da23f0a  Vipin Varghese   service: fix memory leak with new function
> > c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
> > 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Burakov, Anatoly]

I must've checked out the wrong branch then. I'll double-check. My apologies!

Thanks,
Anatoly


> -----Original Message-----
> From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> Sent: Tuesday, February 13, 2018 11:47 AM
> To: Burakov, Anatoly <anatoly.burakov@intel.com>
> Cc: dpdk stable <stable@dpdk.org>
> Subject: Re: please help backporting some patches to LTS release 17.11.1
> 
> On Mon, Feb 12, 2018 at 10:36:23AM +0000, Burakov, Anatoly wrote:
> > Hi,
> >
> > I've looked at commit 5c45e0f. This patch cannot be backported before
> 71330483 [1] is applied, as it depends on changes made in that patch.
> >
> > http://dpdk.org/dev/patchwork/patch/31276/
> >
> > Logs show that it was CC'd to stable, but it looks like it wasn't integrated
> into stable.
> 
> That patch is part of the v17.11 release (was merged after v17.11-rc3).
> So it's also in the 17.11 stable branch.
> 
> 	--yliu
> >
> >
> > > -----Original Message-----
> > > From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> > > Sent: Wednesday, February 7, 2018 9:32 AM
> > > To: dpdk stable <stable@dpdk.org>
> > > Cc: Burakov, Anatoly <anatoly.burakov@intel.com>; Xing, Beilei
> > > <beilei.xing@intel.com>; Iremonger, Bernard
> > > <bernard.iremonger@intel.com>; Harish Patil
> > > <harish.patil@cavium.com>; Nelio Laranjeiro
> > > <nelio.laranjeiro@6wind.com>; Olivier Matz <olivier.matz@6wind.com>;
> > > Ophir Munk <ophirmu@mellanox.com>; Pavan Nikhilesh
> > > <pbhagavatula@caviumnetworks.com>; Zhang, Qi Z
> > > <qi.z.zhang@intel.com>; Shahaf Shuler <shahafs@mellanox.com>;
> > > Varghese, Vipin <vipin.varghese@intel.com>; Yongseok Koh
> > > <yskoh@mellanox.com>; Yong Wang <wang.yong19@zte.com.cn>
> > > Subject: please help backporting some patches to LTS release 17.11.1
> > >
> > > Hi commit authors (and maintainers),
> > >
> > > I didn't manage to apply following commits from upstream to stable
> > > branch
> > > 17.11: conflict happens. I'm wondering can the authors check the
> > > following list and backport those patches belong to you?
> > >
> > > FYI, branch 17.11 is located at tree:
> > >    git://dpdk.org/dpdk-stable
> > >
> > > It'd be great if you could do that in one weeks. Also, please add a
> > > heading line like below before the commit log body:
> > >     [ backported from upstream commit xxx ]
> > >
> > > Example: http://dpdk.org/browse/dpdk-
> > >
> stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
> > >
> > > Please let me know if you have any comments, say, need more time, or
> > > it's worthless to packport it. And please send it to
> > > "stable@dpdk.org", but not "dev@dpdk.org".
> > >
> > > Also, please make an reply to me when you have done that, just in
> > > case I may miss the backport email.
> > >
> > > Thanks.
> > >
> > > 	-yliu
> > >
> > > ---
> > > 5c45e0f  Anatoly Burakov  test/memzone: handle previously allocated
> > > memzones
> > > 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
> > > cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
> > > 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
> > > 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound
> > > requirement
> > > dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
> > > c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue
> > > action f07f9bc Nélio Laranjeiro net/mlx5: fix port stop by verify
> > > flows are still present
> > > 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
> > > 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
> > > 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads capabilities
> > > 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue count
> > > dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
> > > 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
> > > cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
> > > e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
> > > da23f0a  Vipin Varghese   service: fix memory leak with new function
> > > c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
> > > 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Burakov, Anatoly]

Hi,

The commit in question will apply, if previous changes are applied, specifically, patch fixing a typo [1]. After these patches are applied (specifically, the first one), the patch in question [2] should apply as well.

[1] http://dpdk.org/dev/patchwork/patch/32587/
[2] http://dpdk.org/dev/patchwork/patch/34813/

Thanks,
Anatoly

> -----Original Message-----
> From: Burakov, Anatoly
> Sent: Tuesday, February 13, 2018 11:49 AM
> To: Yuanhan Liu <yliu@fridaylinux.org>
> Cc: dpdk stable <stable@dpdk.org>
> Subject: RE: please help backporting some patches to LTS release 17.11.1
> 
> I must've checked out the wrong branch then. I'll double-check. My
> apologies!
> 
> Thanks,
> Anatoly
> 
> 
> > -----Original Message-----
> > From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> > Sent: Tuesday, February 13, 2018 11:47 AM
> > To: Burakov, Anatoly <anatoly.burakov@intel.com>
> > Cc: dpdk stable <stable@dpdk.org>
> > Subject: Re: please help backporting some patches to LTS release
> > 17.11.1
> >
> > On Mon, Feb 12, 2018 at 10:36:23AM +0000, Burakov, Anatoly wrote:
> > > Hi,
> > >
> > > I've looked at commit 5c45e0f. This patch cannot be backported
> > > before
> > 71330483 [1] is applied, as it depends on changes made in that patch.
> > >
> > > http://dpdk.org/dev/patchwork/patch/31276/
> > >
> > > Logs show that it was CC'd to stable, but it looks like it wasn't
> > > integrated
> > into stable.
> >
> > That patch is part of the v17.11 release (was merged after v17.11-rc3).
> > So it's also in the 17.11 stable branch.
> >
> > 	--yliu
> > >
> > >
> > > > -----Original Message-----
> > > > From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> > > > Sent: Wednesday, February 7, 2018 9:32 AM
> > > > To: dpdk stable <stable@dpdk.org>
> > > > Cc: Burakov, Anatoly <anatoly.burakov@intel.com>; Xing, Beilei
> > > > <beilei.xing@intel.com>; Iremonger, Bernard
> > > > <bernard.iremonger@intel.com>; Harish Patil
> > > > <harish.patil@cavium.com>; Nelio Laranjeiro
> > > > <nelio.laranjeiro@6wind.com>; Olivier Matz
> > > > <olivier.matz@6wind.com>; Ophir Munk <ophirmu@mellanox.com>;
> Pavan
> > > > Nikhilesh <pbhagavatula@caviumnetworks.com>; Zhang, Qi Z
> > > > <qi.z.zhang@intel.com>; Shahaf Shuler <shahafs@mellanox.com>;
> > > > Varghese, Vipin <vipin.varghese@intel.com>; Yongseok Koh
> > > > <yskoh@mellanox.com>; Yong Wang <wang.yong19@zte.com.cn>
> > > > Subject: please help backporting some patches to LTS release
> > > > 17.11.1
> > > >
> > > > Hi commit authors (and maintainers),
> > > >
> > > > I didn't manage to apply following commits from upstream to stable
> > > > branch
> > > > 17.11: conflict happens. I'm wondering can the authors check the
> > > > following list and backport those patches belong to you?
> > > >
> > > > FYI, branch 17.11 is located at tree:
> > > >    git://dpdk.org/dpdk-stable
> > > >
> > > > It'd be great if you could do that in one weeks. Also, please add
> > > > a heading line like below before the commit log body:
> > > >     [ backported from upstream commit xxx ]
> > > >
> > > > Example: http://dpdk.org/browse/dpdk-
> > > >
> > stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
> > > >
> > > > Please let me know if you have any comments, say, need more time,
> > > > or it's worthless to packport it. And please send it to
> > > > "stable@dpdk.org", but not "dev@dpdk.org".
> > > >
> > > > Also, please make an reply to me when you have done that, just in
> > > > case I may miss the backport email.
> > > >
> > > > Thanks.
> > > >
> > > > 	-yliu
> > > >
> > > > ---
> > > > 5c45e0f  Anatoly Burakov  test/memzone: handle previously
> > > > allocated memzones
> > > > 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
> > > > cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
> > > > 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
> > > > 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound
> > > > requirement
> > > > dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
> > > > c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue
> > > > action f07f9bc Nélio Laranjeiro net/mlx5: fix port stop by verify
> > > > flows are still present
> > > > 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
> > > > 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
> > > > 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads capabilities
> > > > 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue count
> > > > dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
> > > > 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
> > > > cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
> > > > e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
> > > > da23f0a  Vipin Varghese   service: fix memory leak with new function
> > > > c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
> > > > 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Burakov, Anatoly]

Hi all,

It seems that this patch has never made it into 17.11 stable. Is there anything that I can do to make it happen?

Thanks,
Anatoly

> -----Original Message-----
> From: Burakov, Anatoly
> Sent: Tuesday, February 20, 2018 11:03 AM
> To: 'Yuanhan Liu' <yliu@fridaylinux.org>
> Cc: 'dpdk stable' <stable@dpdk.org>
> Subject: RE: please help backporting some patches to LTS release 17.11.1
> 
> Hi,
> 
> The commit in question will apply, if previous changes are applied,
> specifically, patch fixing a typo [1]. After these patches are applied
> (specifically, the first one), the patch in question [2] should apply as well.
> 
> [1] http://dpdk.org/dev/patchwork/patch/32587/
> [2] http://dpdk.org/dev/patchwork/patch/34813/
> 
> Thanks,
> Anatoly
> 
> > -----Original Message-----
> > From: Burakov, Anatoly
> > Sent: Tuesday, February 13, 2018 11:49 AM
> > To: Yuanhan Liu <yliu@fridaylinux.org>
> > Cc: dpdk stable <stable@dpdk.org>
> > Subject: RE: please help backporting some patches to LTS release
> > 17.11.1
> >
> > I must've checked out the wrong branch then. I'll double-check. My
> > apologies!
> >
> > Thanks,
> > Anatoly
> >
> >
> > > -----Original Message-----
> > > From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> > > Sent: Tuesday, February 13, 2018 11:47 AM
> > > To: Burakov, Anatoly <anatoly.burakov@intel.com>
> > > Cc: dpdk stable <stable@dpdk.org>
> > > Subject: Re: please help backporting some patches to LTS release
> > > 17.11.1
> > >
> > > On Mon, Feb 12, 2018 at 10:36:23AM +0000, Burakov, Anatoly wrote:
> > > > Hi,
> > > >
> > > > I've looked at commit 5c45e0f. This patch cannot be backported
> > > > before
> > > 71330483 [1] is applied, as it depends on changes made in that patch.
> > > >
> > > > http://dpdk.org/dev/patchwork/patch/31276/
> > > >
> > > > Logs show that it was CC'd to stable, but it looks like it wasn't
> > > > integrated
> > > into stable.
> > >
> > > That patch is part of the v17.11 release (was merged after v17.11-rc3).
> > > So it's also in the 17.11 stable branch.
> > >
> > > 	--yliu
> > > >
> > > >
> > > > > -----Original Message-----
> > > > > From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> > > > > Sent: Wednesday, February 7, 2018 9:32 AM
> > > > > To: dpdk stable <stable@dpdk.org>
> > > > > Cc: Burakov, Anatoly <anatoly.burakov@intel.com>; Xing, Beilei
> > > > > <beilei.xing@intel.com>; Iremonger, Bernard
> > > > > <bernard.iremonger@intel.com>; Harish Patil
> > > > > <harish.patil@cavium.com>; Nelio Laranjeiro
> > > > > <nelio.laranjeiro@6wind.com>; Olivier Matz
> > > > > <olivier.matz@6wind.com>; Ophir Munk <ophirmu@mellanox.com>;
> > Pavan
> > > > > Nikhilesh <pbhagavatula@caviumnetworks.com>; Zhang, Qi Z
> > > > > <qi.z.zhang@intel.com>; Shahaf Shuler <shahafs@mellanox.com>;
> > > > > Varghese, Vipin <vipin.varghese@intel.com>; Yongseok Koh
> > > > > <yskoh@mellanox.com>; Yong Wang <wang.yong19@zte.com.cn>
> > > > > Subject: please help backporting some patches to LTS release
> > > > > 17.11.1
> > > > >
> > > > > Hi commit authors (and maintainers),
> > > > >
> > > > > I didn't manage to apply following commits from upstream to
> > > > > stable branch
> > > > > 17.11: conflict happens. I'm wondering can the authors check the
> > > > > following list and backport those patches belong to you?
> > > > >
> > > > > FYI, branch 17.11 is located at tree:
> > > > >    git://dpdk.org/dpdk-stable
> > > > >
> > > > > It'd be great if you could do that in one weeks. Also, please
> > > > > add a heading line like below before the commit log body:
> > > > >     [ backported from upstream commit xxx ]
> > > > >
> > > > > Example: http://dpdk.org/browse/dpdk-
> > > > >
> > >
> stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
> > > > >
> > > > > Please let me know if you have any comments, say, need more
> > > > > time, or it's worthless to packport it. And please send it to
> > > > > "stable@dpdk.org", but not "dev@dpdk.org".
> > > > >
> > > > > Also, please make an reply to me when you have done that, just
> > > > > in case I may miss the backport email.
> > > > >
> > > > > Thanks.
> > > > >
> > > > > 	-yliu
> > > > >
> > > > > ---
> > > > > 5c45e0f  Anatoly Burakov  test/memzone: handle previously
> > > > > allocated memzones
> > > > > 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
> > > > > cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
> > > > > 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
> > > > > 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound
> > > > > requirement
> > > > > dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
> > > > > c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue
> > > > > action f07f9bc Nélio Laranjeiro net/mlx5: fix port stop by
> > > > > verify flows are still present
> > > > > 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
> > > > > 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
> > > > > 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads
> capabilities
> > > > > 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue
> count
> > > > > dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
> > > > > 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
> > > > > cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
> > > > > e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
> > > > > da23f0a  Vipin Varghese   service: fix memory leak with new function
> > > > > c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
> > > > > 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Yongseok Koh]

Hi, Anatoly

Please give the list of missing patches of the master branch
so that I can cherry-pick it for v17.11.6.

If you don't think those are not cleanly applicable to stable/17.11,
you could send back-ports to stable@dpdk.org along with the prefix,
	git send-email --subject-prefix='PATCH 17.11' ...


Thanks,
Yongseok

> On Mar 6, 2019, at 2:56 AM, Burakov, Anatoly <anatoly.burakov@intel.com> wrote:
> 
> Hi all,
> 
> It seems that this patch has never made it into 17.11 stable. Is there anything that I can do to make it happen?
> 
> Thanks,
> Anatoly
> 
>> -----Original Message-----
>> From: Burakov, Anatoly
>> Sent: Tuesday, February 20, 2018 11:03 AM
>> To: 'Yuanhan Liu' <yliu@fridaylinux.org>
>> Cc: 'dpdk stable' <stable@dpdk.org>
>> Subject: RE: please help backporting some patches to LTS release 17.11.1
>> 
>> Hi,
>> 
>> The commit in question will apply, if previous changes are applied,
>> specifically, patch fixing a typo [1]. After these patches are applied
>> (specifically, the first one), the patch in question [2] should apply as well.
>> 
>> [1] https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpdk.org%2Fdev%2Fpatchwork%2Fpatch%2F32587%2F&amp;data=02%7C01%7Cyskoh%40mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=sX%2FdJSY2U7pIbtCbKkd5hS%2Fb4XoTrup%2BmIa37qL77wA%3D&amp;reserved=0
>> [2] https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpdk.org%2Fdev%2Fpatchwork%2Fpatch%2F34813%2F&amp;data=02%7C01%7Cyskoh%40mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=TzsDQFGYywsQDbEkErfoIz82NksLJbbvc9XLN5e44F4%3D&amp;reserved=0
>> 
>> Thanks,
>> Anatoly
>> 
>>> -----Original Message-----
>>> From: Burakov, Anatoly
>>> Sent: Tuesday, February 13, 2018 11:49 AM
>>> To: Yuanhan Liu <yliu@fridaylinux.org>
>>> Cc: dpdk stable <stable@dpdk.org>
>>> Subject: RE: please help backporting some patches to LTS release
>>> 17.11.1
>>> 
>>> I must've checked out the wrong branch then. I'll double-check. My
>>> apologies!
>>> 
>>> Thanks,
>>> Anatoly
>>> 
>>> 
>>>> -----Original Message-----
>>>> From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
>>>> Sent: Tuesday, February 13, 2018 11:47 AM
>>>> To: Burakov, Anatoly <anatoly.burakov@intel.com>
>>>> Cc: dpdk stable <stable@dpdk.org>
>>>> Subject: Re: please help backporting some patches to LTS release
>>>> 17.11.1
>>>> 
>>>> On Mon, Feb 12, 2018 at 10:36:23AM +0000, Burakov, Anatoly wrote:
>>>>> Hi,
>>>>> 
>>>>> I've looked at commit 5c45e0f. This patch cannot be backported
>>>>> before
>>>> 71330483 [1] is applied, as it depends on changes made in that patch.
>>>>> 
>>>>> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpdk.org%2Fdev%2Fpatchwork%2Fpatch%2F31276%2F&amp;data=02%7C01%7Cyskoh%40mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=H7%2BxeaclAJNz3XI4g69JfE9f2R19t844aaohtfW3gpk%3D&amp;reserved=0
>>>>> 
>>>>> Logs show that it was CC'd to stable, but it looks like it wasn't
>>>>> integrated
>>>> into stable.
>>>> 
>>>> That patch is part of the v17.11 release (was merged after v17.11-rc3).
>>>> So it's also in the 17.11 stable branch.
>>>> 
>>>> 	--yliu
>>>>> 
>>>>> 
>>>>>> -----Original Message-----
>>>>>> From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
>>>>>> Sent: Wednesday, February 7, 2018 9:32 AM
>>>>>> To: dpdk stable <stable@dpdk.org>
>>>>>> Cc: Burakov, Anatoly <anatoly.burakov@intel.com>; Xing, Beilei
>>>>>> <beilei.xing@intel.com>; Iremonger, Bernard
>>>>>> <bernard.iremonger@intel.com>; Harish Patil
>>>>>> <harish.patil@cavium.com>; Nelio Laranjeiro
>>>>>> <nelio.laranjeiro@6wind.com>; Olivier Matz
>>>>>> <olivier.matz@6wind.com>; Ophir Munk <ophirmu@mellanox.com>;
>>> Pavan
>>>>>> Nikhilesh <pbhagavatula@caviumnetworks.com>; Zhang, Qi Z
>>>>>> <qi.z.zhang@intel.com>; Shahaf Shuler <shahafs@mellanox.com>;
>>>>>> Varghese, Vipin <vipin.varghese@intel.com>; Yongseok Koh
>>>>>> <yskoh@mellanox.com>; Yong Wang <wang.yong19@zte.com.cn>
>>>>>> Subject: please help backporting some patches to LTS release
>>>>>> 17.11.1
>>>>>> 
>>>>>> Hi commit authors (and maintainers),
>>>>>> 
>>>>>> I didn't manage to apply following commits from upstream to
>>>>>> stable branch
>>>>>> 17.11: conflict happens. I'm wondering can the authors check the
>>>>>> following list and backport those patches belong to you?
>>>>>> 
>>>>>> FYI, branch 17.11 is located at tree:
>>>>>>   git://dpdk.org/dpdk-stable
>>>>>> 
>>>>>> It'd be great if you could do that in one weeks. Also, please
>>>>>> add a heading line like below before the commit log body:
>>>>>>    [ backported from upstream commit xxx ]
>>>>>> 
>>>>>> Example: https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpdk.org%2Fbrowse%2Fdpdk-&amp;data=02%7C01%7Cyskoh%40mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=Q7o6uCxSpimpYYujg7%2BLKJf40dIz3Io3Ib%2F%2FRZJvbeI%3D&amp;reserved=0
>>>>>> 
>>>> 
>> stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
>>>>>> 
>>>>>> Please let me know if you have any comments, say, need more
>>>>>> time, or it's worthless to packport it. And please send it to
>>>>>> "stable@dpdk.org", but not "dev@dpdk.org".
>>>>>> 
>>>>>> Also, please make an reply to me when you have done that, just
>>>>>> in case I may miss the backport email.
>>>>>> 
>>>>>> Thanks.
>>>>>> 
>>>>>> 	-yliu
>>>>>> 
>>>>>> ---
>>>>>> 5c45e0f  Anatoly Burakov  test/memzone: handle previously
>>>>>> allocated memzones
>>>>>> 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-driver
>>>>>> cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
>>>>>> 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
>>>>>> 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound
>>>>>> requirement
>>>>>> dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
>>>>>> c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue
>>>>>> action f07f9bc Nélio Laranjeiro net/mlx5: fix port stop by
>>>>>> verify flows are still present
>>>>>> 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
>>>>>> 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
>>>>>> 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads
>> capabilities
>>>>>> 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue
>> count
>>>>>> dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
>>>>>> 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
>>>>>> cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
>>>>>> e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
>>>>>> da23f0a  Vipin Varghese   service: fix memory leak with new function
>>>>>> c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
>>>>>> 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Burakov, Anatoly]

Hi Yongseok,

The patch that's missing is this one:

5c45e0fdeddfc773fab63e12d086c4f2052cda40
[http://patches.dpdk.org/patch/34813/]

However, the patch in question depends on another commit, so that one should be pulled in too:

8ceee8e7dea1fb07f9ccf6a037d0571fea328afc
[http://patches.dpdk.org/patch/32587/]

Thanks,
Anatoly


> -----Original Message-----
> From: Yongseok Koh [mailto:yskoh@mellanox.com]
> Sent: Wednesday, March 6, 2019 7:03 PM
> To: Burakov, Anatoly <anatoly.burakov@intel.com>
> Cc: Yuanhan Liu <yliu@fridaylinux.org>; dpdk stable <stable@dpdk.org>
> Subject: Re: [dpdk-stable] please help backporting some patches to LTS
> release 17.11.1
> 
> Hi, Anatoly
> 
> Please give the list of missing patches of the master branch so that I can
> cherry-pick it for v17.11.6.
> 
> If you don't think those are not cleanly applicable to stable/17.11, you could
> send back-ports to stable@dpdk.org along with the prefix,
> 	git send-email --subject-prefix='PATCH 17.11' ...
> 
> 
> Thanks,
> Yongseok
> 
> > On Mar 6, 2019, at 2:56 AM, Burakov, Anatoly
> <anatoly.burakov@intel.com> wrote:
> >
> > Hi all,
> >
> > It seems that this patch has never made it into 17.11 stable. Is there
> anything that I can do to make it happen?
> >
> > Thanks,
> > Anatoly
> >
> >> -----Original Message-----
> >> From: Burakov, Anatoly
> >> Sent: Tuesday, February 20, 2018 11:03 AM
> >> To: 'Yuanhan Liu' <yliu@fridaylinux.org>
> >> Cc: 'dpdk stable' <stable@dpdk.org>
> >> Subject: RE: please help backporting some patches to LTS release
> >> 17.11.1
> >>
> >> Hi,
> >>
> >> The commit in question will apply, if previous changes are applied,
> >> specifically, patch fixing a typo [1]. After these patches are
> >> applied (specifically, the first one), the patch in question [2] should apply
> as well.
> >>
> >> [1]
> >>
> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpd
> >>
> k.org%2Fdev%2Fpatchwork%2Fpatch%2F32587%2F&amp;data=02%7C01%7C
> yskoh%4
> >>
> 0mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d
> 9ba6
> >>
> a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=sX%2FdJSY
> 2U7pIb
> >> tCbKkd5hS%2Fb4XoTrup%2BmIa37qL77wA%3D&amp;reserved=0
> >> [2]
> >>
> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpd
> >>
> k.org%2Fdev%2Fpatchwork%2Fpatch%2F34813%2F&amp;data=02%7C01%7C
> yskoh%4
> >>
> 0mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d
> 9ba6
> >>
> a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=TzsDQFGYy
> wsQDbE
> >> kErfoIz82NksLJbbvc9XLN5e44F4%3D&amp;reserved=0
> >>
> >> Thanks,
> >> Anatoly
> >>
> >>> -----Original Message-----
> >>> From: Burakov, Anatoly
> >>> Sent: Tuesday, February 13, 2018 11:49 AM
> >>> To: Yuanhan Liu <yliu@fridaylinux.org>
> >>> Cc: dpdk stable <stable@dpdk.org>
> >>> Subject: RE: please help backporting some patches to LTS release
> >>> 17.11.1
> >>>
> >>> I must've checked out the wrong branch then. I'll double-check. My
> >>> apologies!
> >>>
> >>> Thanks,
> >>> Anatoly
> >>>
> >>>
> >>>> -----Original Message-----
> >>>> From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> >>>> Sent: Tuesday, February 13, 2018 11:47 AM
> >>>> To: Burakov, Anatoly <anatoly.burakov@intel.com>
> >>>> Cc: dpdk stable <stable@dpdk.org>
> >>>> Subject: Re: please help backporting some patches to LTS release
> >>>> 17.11.1
> >>>>
> >>>> On Mon, Feb 12, 2018 at 10:36:23AM +0000, Burakov, Anatoly wrote:
> >>>>> Hi,
> >>>>>
> >>>>> I've looked at commit 5c45e0f. This patch cannot be backported
> >>>>> before
> >>>> 71330483 [1] is applied, as it depends on changes made in that patch.
> >>>>>
> >>>>>
> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2F
> >>>>>
> dpdk.org%2Fdev%2Fpatchwork%2Fpatch%2F31276%2F&amp;data=02%7C01
> %7Cy
> >>>>>
> skoh%40mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c
> 7
> >>>>>
> d2e4d9ba6a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=
> H7%
> >>>>> 2BxeaclAJNz3XI4g69JfE9f2R19t844aaohtfW3gpk%3D&amp;reserved=0
> >>>>>
> >>>>> Logs show that it was CC'd to stable, but it looks like it wasn't
> >>>>> integrated
> >>>> into stable.
> >>>>
> >>>> That patch is part of the v17.11 release (was merged after v17.11-rc3).
> >>>> So it's also in the 17.11 stable branch.
> >>>>
> >>>> 	--yliu
> >>>>>
> >>>>>
> >>>>>> -----Original Message-----
> >>>>>> From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
> >>>>>> Sent: Wednesday, February 7, 2018 9:32 AM
> >>>>>> To: dpdk stable <stable@dpdk.org>
> >>>>>> Cc: Burakov, Anatoly <anatoly.burakov@intel.com>; Xing, Beilei
> >>>>>> <beilei.xing@intel.com>; Iremonger, Bernard
> >>>>>> <bernard.iremonger@intel.com>; Harish Patil
> >>>>>> <harish.patil@cavium.com>; Nelio Laranjeiro
> >>>>>> <nelio.laranjeiro@6wind.com>; Olivier Matz
> >>>>>> <olivier.matz@6wind.com>; Ophir Munk
> <ophirmu@mellanox.com>;
> >>> Pavan
> >>>>>> Nikhilesh <pbhagavatula@caviumnetworks.com>; Zhang, Qi Z
> >>>>>> <qi.z.zhang@intel.com>; Shahaf Shuler <shahafs@mellanox.com>;
> >>>>>> Varghese, Vipin <vipin.varghese@intel.com>; Yongseok Koh
> >>>>>> <yskoh@mellanox.com>; Yong Wang <wang.yong19@zte.com.cn>
> >>>>>> Subject: please help backporting some patches to LTS release
> >>>>>> 17.11.1
> >>>>>>
> >>>>>> Hi commit authors (and maintainers),
> >>>>>>
> >>>>>> I didn't manage to apply following commits from upstream to
> >>>>>> stable branch
> >>>>>> 17.11: conflict happens. I'm wondering can the authors check the
> >>>>>> following list and backport those patches belong to you?
> >>>>>>
> >>>>>> FYI, branch 17.11 is located at tree:
> >>>>>>   git://dpdk.org/dpdk-stable
> >>>>>>
> >>>>>> It'd be great if you could do that in one weeks. Also, please add
> >>>>>> a heading line like below before the commit log body:
> >>>>>>    [ backported from upstream commit xxx ]
> >>>>>>
> >>>>>> Example:
> >>>>>>
> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2
> >>>>>> Fdpdk.org%2Fbrowse%2Fdpdk-
> &amp;data=02%7C01%7Cyskoh%40mellanox.co
> >>>>>>
> m%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d9ba6a4d1492
> 5
> >>>>>>
> 6f461b%7C0%7C0%7C636874666108260958&amp;sdata=Q7o6uCxSpimpYYujg
> 7%
> >>>>>> 2BLKJf40dIz3Io3Ib%2F%2FRZJvbeI%3D&amp;reserved=0
> >>>>>>
> >>>>
> >>
> stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
> >>>>>>
> >>>>>> Please let me know if you have any comments, say, need more time,
> >>>>>> or it's worthless to packport it. And please send it to
> >>>>>> "stable@dpdk.org", but not "dev@dpdk.org".
> >>>>>>
> >>>>>> Also, please make an reply to me when you have done that, just in
> >>>>>> case I may miss the backport email.
> >>>>>>
> >>>>>> Thanks.
> >>>>>>
> >>>>>> 	-yliu
> >>>>>>
> >>>>>> ---
> >>>>>> 5c45e0f  Anatoly Burakov  test/memzone: handle previously
> >>>>>> allocated memzones
> >>>>>> 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-
> driver
> >>>>>> cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
> >>>>>> 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
> >>>>>> 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound
> >>>>>> requirement
> >>>>>> dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
> >>>>>> c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue
> >>>>>> action f07f9bc Nélio Laranjeiro net/mlx5: fix port stop by verify
> >>>>>> flows are still present
> >>>>>> 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
> >>>>>> 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
> >>>>>> 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads
> >> capabilities
> >>>>>> 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue
> >> count
> >>>>>> dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
> >>>>>> 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
> >>>>>> cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
> >>>>>> e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
> >>>>>> da23f0a  Vipin Varghese   service: fix memory leak with new function
> >>>>>> c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
> >>>>>> 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

Re: [dpdk-stable] please help backporting some patches to LTS release 17.11.1

[Yongseok Koh]

Applied the two patches to stable/17.11

Thanks,
Yongseok

> On Mar 7, 2019, at 4:04 AM, Burakov, Anatoly <anatoly.burakov@intel.com> wrote:
> 
> Hi Yongseok,
> 
> The patch that's missing is this one:
> 
> 5c45e0fdeddfc773fab63e12d086c4f2052cda40
> [https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatches.dpdk.org%2Fpatch%2F34813%2F&amp;data=02%7C01%7Cyskoh%40mellanox.com%7Cc3cf58367614433e450b08d6a2f51fb3%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7C636875571017224025&amp;sdata=%2BJY2R0WpMMSPi7V37ew8rTrOPhOzyXE3gxhnO1ioZYU%3D&amp;reserved=0]
> 
> However, the patch in question depends on another commit, so that one should be pulled in too:
> 
> 8ceee8e7dea1fb07f9ccf6a037d0571fea328afc
> [https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatches.dpdk.org%2Fpatch%2F32587%2F&amp;data=02%7C01%7Cyskoh%40mellanox.com%7Cc3cf58367614433e450b08d6a2f51fb3%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7C636875571017224025&amp;sdata=Mxf%2BUWl3bfeI5UBGzBP7Iljnu3%2F1FcwjM9%2FZfb%2FJm%2Bs%3D&amp;reserved=0]
> 
> Thanks,
> Anatoly
> 
> 
>> -----Original Message-----
>> From: Yongseok Koh [mailto:yskoh@mellanox.com]
>> Sent: Wednesday, March 6, 2019 7:03 PM
>> To: Burakov, Anatoly <anatoly.burakov@intel.com>
>> Cc: Yuanhan Liu <yliu@fridaylinux.org>; dpdk stable <stable@dpdk.org>
>> Subject: Re: [dpdk-stable] please help backporting some patches to LTS
>> release 17.11.1
>> 
>> Hi, Anatoly
>> 
>> Please give the list of missing patches of the master branch so that I can
>> cherry-pick it for v17.11.6.
>> 
>> If you don't think those are not cleanly applicable to stable/17.11, you could
>> send back-ports to stable@dpdk.org along with the prefix,
>> 	git send-email --subject-prefix='PATCH 17.11' ...
>> 
>> 
>> Thanks,
>> Yongseok
>> 
>>> On Mar 6, 2019, at 2:56 AM, Burakov, Anatoly
>> <anatoly.burakov@intel.com> wrote:
>>> 
>>> Hi all,
>>> 
>>> It seems that this patch has never made it into 17.11 stable. Is there
>> anything that I can do to make it happen?
>>> 
>>> Thanks,
>>> Anatoly
>>> 
>>>> -----Original Message-----
>>>> From: Burakov, Anatoly
>>>> Sent: Tuesday, February 20, 2018 11:03 AM
>>>> To: 'Yuanhan Liu' <yliu@fridaylinux.org>
>>>> Cc: 'dpdk stable' <stable@dpdk.org>
>>>> Subject: RE: please help backporting some patches to LTS release
>>>> 17.11.1
>>>> 
>>>> Hi,
>>>> 
>>>> The commit in question will apply, if previous changes are applied,
>>>> specifically, patch fixing a typo [1]. After these patches are
>>>> applied (specifically, the first one), the patch in question [2] should apply
>> as well.
>>>> 
>>>> [1]
>>>> 
>> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpd
>>>> 
>> k.org%2Fdev%2Fpatchwork%2Fpatch%2F32587%2F&amp;data=02%7C01%7C
>> yskoh%4
>>>> 
>> 0mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d
>> 9ba6
>>>> 
>> a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=sX%2FdJSY
>> 2U7pIb
>>>> tCbKkd5hS%2Fb4XoTrup%2BmIa37qL77wA%3D&amp;reserved=0
>>>> [2]
>>>> 
>> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpd
>>>> 
>> k.org%2Fdev%2Fpatchwork%2Fpatch%2F34813%2F&amp;data=02%7C01%7C
>> yskoh%4
>>>> 
>> 0mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d
>> 9ba6
>>>> 
>> a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=TzsDQFGYy
>> wsQDbE
>>>> kErfoIz82NksLJbbvc9XLN5e44F4%3D&amp;reserved=0
>>>> 
>>>> Thanks,
>>>> Anatoly
>>>> 
>>>>> -----Original Message-----
>>>>> From: Burakov, Anatoly
>>>>> Sent: Tuesday, February 13, 2018 11:49 AM
>>>>> To: Yuanhan Liu <yliu@fridaylinux.org>
>>>>> Cc: dpdk stable <stable@dpdk.org>
>>>>> Subject: RE: please help backporting some patches to LTS release
>>>>> 17.11.1
>>>>> 
>>>>> I must've checked out the wrong branch then. I'll double-check. My
>>>>> apologies!
>>>>> 
>>>>> Thanks,
>>>>> Anatoly
>>>>> 
>>>>> 
>>>>>> -----Original Message-----
>>>>>> From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
>>>>>> Sent: Tuesday, February 13, 2018 11:47 AM
>>>>>> To: Burakov, Anatoly <anatoly.burakov@intel.com>
>>>>>> Cc: dpdk stable <stable@dpdk.org>
>>>>>> Subject: Re: please help backporting some patches to LTS release
>>>>>> 17.11.1
>>>>>> 
>>>>>> On Mon, Feb 12, 2018 at 10:36:23AM +0000, Burakov, Anatoly wrote:
>>>>>>> Hi,
>>>>>>> 
>>>>>>> I've looked at commit 5c45e0f. This patch cannot be backported
>>>>>>> before
>>>>>> 71330483 [1] is applied, as it depends on changes made in that patch.
>>>>>>> 
>>>>>>> 
>> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2F
>>>>>>> 
>> dpdk.org%2Fdev%2Fpatchwork%2Fpatch%2F31276%2F&amp;data=02%7C01
>> %7Cy
>>>>>>> 
>> skoh%40mellanox.com%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c
>> 7
>>>>>>> 
>> d2e4d9ba6a4d149256f461b%7C0%7C0%7C636874666108260958&amp;sdata=
>> H7%
>>>>>>> 2BxeaclAJNz3XI4g69JfE9f2R19t844aaohtfW3gpk%3D&amp;reserved=0
>>>>>>> 
>>>>>>> Logs show that it was CC'd to stable, but it looks like it wasn't
>>>>>>> integrated
>>>>>> into stable.
>>>>>> 
>>>>>> That patch is part of the v17.11 release (was merged after v17.11-rc3).
>>>>>> So it's also in the 17.11 stable branch.
>>>>>> 
>>>>>> 	--yliu
>>>>>>> 
>>>>>>> 
>>>>>>>> -----Original Message-----
>>>>>>>> From: Yuanhan Liu [mailto:yliu@fridaylinux.org]
>>>>>>>> Sent: Wednesday, February 7, 2018 9:32 AM
>>>>>>>> To: dpdk stable <stable@dpdk.org>
>>>>>>>> Cc: Burakov, Anatoly <anatoly.burakov@intel.com>; Xing, Beilei
>>>>>>>> <beilei.xing@intel.com>; Iremonger, Bernard
>>>>>>>> <bernard.iremonger@intel.com>; Harish Patil
>>>>>>>> <harish.patil@cavium.com>; Nelio Laranjeiro
>>>>>>>> <nelio.laranjeiro@6wind.com>; Olivier Matz
>>>>>>>> <olivier.matz@6wind.com>; Ophir Munk
>> <ophirmu@mellanox.com>;
>>>>> Pavan
>>>>>>>> Nikhilesh <pbhagavatula@caviumnetworks.com>; Zhang, Qi Z
>>>>>>>> <qi.z.zhang@intel.com>; Shahaf Shuler <shahafs@mellanox.com>;
>>>>>>>> Varghese, Vipin <vipin.varghese@intel.com>; Yongseok Koh
>>>>>>>> <yskoh@mellanox.com>; Yong Wang <wang.yong19@zte.com.cn>
>>>>>>>> Subject: please help backporting some patches to LTS release
>>>>>>>> 17.11.1
>>>>>>>> 
>>>>>>>> Hi commit authors (and maintainers),
>>>>>>>> 
>>>>>>>> I didn't manage to apply following commits from upstream to
>>>>>>>> stable branch
>>>>>>>> 17.11: conflict happens. I'm wondering can the authors check the
>>>>>>>> following list and backport those patches belong to you?
>>>>>>>> 
>>>>>>>> FYI, branch 17.11 is located at tree:
>>>>>>>>  git://dpdk.org/dpdk-stable
>>>>>>>> 
>>>>>>>> It'd be great if you could do that in one weeks. Also, please add
>>>>>>>> a heading line like below before the commit log body:
>>>>>>>>   [ backported from upstream commit xxx ]
>>>>>>>> 
>>>>>>>> Example:
>>>>>>>> 
>> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2
>>>>>>>> Fdpdk.org%2Fbrowse%2Fdpdk-
>> &amp;data=02%7C01%7Cyskoh%40mellanox.co
>>>>>>>> 
>> m%7Ce5ca9a99dae0486a15f608d6a2226f12%7Ca652971c7d2e4d9ba6a4d1492
>> 5
>>>>>>>> 
>> 6f461b%7C0%7C0%7C636874666108260958&amp;sdata=Q7o6uCxSpimpYYujg
>> 7%
>>>>>>>> 2BLKJf40dIz3Io3Ib%2F%2FRZJvbeI%3D&amp;reserved=0
>>>>>>>> 
>>>>>> 
>>>> 
>> stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
>>>>>>>> 
>>>>>>>> Please let me know if you have any comments, say, need more time,
>>>>>>>> or it's worthless to packport it. And please send it to
>>>>>>>> "stable@dpdk.org", but not "dev@dpdk.org".
>>>>>>>> 
>>>>>>>> Also, please make an reply to me when you have done that, just in
>>>>>>>> case I may miss the backport email.
>>>>>>>> 
>>>>>>>> Thanks.
>>>>>>>> 
>>>>>>>> 	-yliu
>>>>>>>> 
>>>>>>>> ---
>>>>>>>> 5c45e0f  Anatoly Burakov  test/memzone: handle previously
>>>>>>>> allocated memzones
>>>>>>>> 4ab8314  Beilei Xing      net/i40e: fix interrupt conflict with multi-
>> driver
>>>>>>>> cfdfca4  Beilei Xing      net/i40e: fix multiple driver support
>>>>>>>> 378cc7f  Beilei Xing      net/i40e: fix Rx interrupt
>>>>>>>> 5cbf8b4  Bernard Iremonger test/flow_classify: remove port bound
>>>>>>>> requirement
>>>>>>>> dd28bc8  Harish Patil     net/qede: fix VF port creation sequence
>>>>>>>> c3299d7  Nélio Laranjeiro net/mlx5: fix flow priority on queue
>>>>>>>> action f07f9bc Nélio Laranjeiro net/mlx5: fix port stop by verify
>>>>>>>> flows are still present
>>>>>>>> 51e7fa8  Nélio Laranjeiro net/mlx5: fix secondary process verification
>>>>>>>> 35906ac  Olivier Matz     net/bnxt: fix headroom initialization
>>>>>>>> 70205b5  Ophir Munk       net/failsafe: fix default Tx offloads
>>>> capabilities
>>>>>>>> 452cd79  Pavan Nikhilesh  app/eventdev: fix event device queue
>>>> count
>>>>>>>> dd18b06  Qi Zhang         net/e1000: fix mailbox interrupt handler
>>>>>>>> 6810c63  Qi Zhang         net/ixgbe: fix mailbox interrupt handler
>>>>>>>> cd230a3  Shahaf Shuler    net/mlx5: fix CRC strip capability query
>>>>>>>> e313ef4  Shahaf Shuler    net/mlx5: fix link state on device start
>>>>>>>> da23f0a  Vipin Varghese   service: fix memory leak with new function
>>>>>>>> c7bf622  Yongseok Koh     net/mlx5: fix handling link status event
>>>>>>>> 0ff7683  Yong Wang        net/dpaa: fix potential memory leak

[dpdk-stable] [PATCH 1/3] net/mlx5: fix secondary process verification

[Nelio Laranjeiro]

From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>

[ backported from upstream commit 51e7fa8d20876cb221b11013cd23b1881cc9b75c ]

Since the secondary process has its own devops, function which cannot be
called by the secondary don't need anymore to verify which process is
calling it.

Fixes: 87ec44ce1651 ("net/mlx5: add operations for secondary process")
Cc: stable@dpdk.org

Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5.c         |  4 +---
 drivers/net/mlx5/mlx5_ethdev.c  | 25 -------------------------
 drivers/net/mlx5/mlx5_mac.c     |  6 ------
 drivers/net/mlx5/mlx5_rss.c     |  1 -
 drivers/net/mlx5/mlx5_rxmode.c  |  8 --------
 drivers/net/mlx5/mlx5_rxq.c     |  6 ------
 drivers/net/mlx5/mlx5_trigger.c |  6 ------
 drivers/net/mlx5/mlx5_txq.c     |  6 ------
 8 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 47ac8af48..45e0e8dba 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -158,7 +158,6 @@ mlx5_alloc_verbs_buf(size_t size, void *data)
 	size_t alignment = sysconf(_SC_PAGESIZE);
 
 	assert(data != NULL);
-	assert(!mlx5_is_secondary());
 	ret = rte_malloc_socket(__func__, size, alignment,
 				priv->dev->device->numa_node);
 	DEBUG("Extern alloc size: %lu, align: %lu: %p", size, alignment, ret);
@@ -177,7 +176,6 @@ static void
 mlx5_free_verbs_buf(void *ptr, void *data __rte_unused)
 {
 	assert(data != NULL);
-	assert(!mlx5_is_secondary());
 	DEBUG("Extern free request: %p", ptr);
 	rte_free(ptr);
 }
@@ -692,7 +690,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 
 		mlx5_dev[idx].ports |= test;
 
-		if (mlx5_is_secondary()) {
+		if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
 			eth_dev = rte_eth_dev_attach_secondary(name);
 			if (eth_dev == NULL) {
 				ERROR("can not attach rte ethdev");
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index fc0860fbc..ffe1cdd64 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -134,18 +134,6 @@ mlx5_get_priv(struct rte_eth_dev *dev)
 }
 
 /**
- * Check if running as a secondary process.
- *
- * @return
- *   Nonzero if running as a secondary process.
- */
-inline int
-mlx5_is_secondary(void)
-{
-	return rte_eal_process_type() == RTE_PROC_SECONDARY;
-}
-
-/**
  * Get interface name from private structure.
  *
  * @param[in] priv
@@ -649,9 +637,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
 	struct priv *priv = dev->data->dev_private;
 	int ret;
 
-	if (mlx5_is_secondary())
-		return -E_RTE_SECONDARY;
-
 	priv_lock(priv);
 	ret = dev_configure(dev);
 	assert(ret >= 0);
@@ -1059,9 +1044,6 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
 	uint16_t kern_mtu;
 	int ret = 0;
 
-	if (mlx5_is_secondary())
-		return -E_RTE_SECONDARY;
-
 	priv_lock(priv);
 	ret = priv_get_mtu(priv, &kern_mtu);
 	if (ret)
@@ -1109,9 +1091,6 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 	};
 	int ret;
 
-	if (mlx5_is_secondary())
-		return -E_RTE_SECONDARY;
-
 	ifr.ifr_data = (void *)&ethpause;
 	priv_lock(priv);
 	if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) {
@@ -1160,9 +1139,6 @@ mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 	};
 	int ret;
 
-	if (mlx5_is_secondary())
-		return -E_RTE_SECONDARY;
-
 	ifr.ifr_data = (void *)&ethpause;
 	ethpause.autoneg = fc_conf->autoneg;
 	if (((fc_conf->mode & RTE_FC_FULL) == RTE_FC_FULL) ||
@@ -1429,7 +1405,6 @@ priv_dev_interrupt_handler_install(struct priv *priv, struct rte_eth_dev *dev)
 {
 	int rc, flags;
 
-	assert(!mlx5_is_secondary());
 	assert(priv->ctx->async_fd > 0);
 	flags = fcntl(priv->ctx->async_fd, F_GETFL);
 	rc = fcntl(priv->ctx->async_fd, F_SETFL, flags | O_NONBLOCK);
diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index d17b991e4..9fb5ba5e7 100644
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -93,8 +93,6 @@ priv_get_mac(struct priv *priv, uint8_t (*mac)[ETHER_ADDR_LEN])
 void
 mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
 {
-	if (mlx5_is_secondary())
-		return;
 	assert(index < MLX5_MAX_MAC_ADDRESSES);
 	memset(&dev->data->mac_addrs[index], 0, sizeof(struct ether_addr));
 	if (!dev->data->promiscuous && !dev->data->all_multicast)
@@ -124,8 +122,6 @@ mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
 	int ret = 0;
 
 	(void)vmdq;
-	if (mlx5_is_secondary())
-		return 0;
 	assert(index < MLX5_MAX_MAC_ADDRESSES);
 	/* First, make sure this address isn't already configured. */
 	for (i = 0; (i != MLX5_MAX_MAC_ADDRESSES); ++i) {
@@ -154,8 +150,6 @@ mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
 void
 mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
 {
-	if (mlx5_is_secondary())
-		return;
 	DEBUG("%p: setting primary MAC address", (void *)dev);
 	mlx5_mac_addr_add(dev, mac_addr, 0, 0);
 }
diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c
index 7c0cf4de8..f47bda667 100644
--- a/drivers/net/mlx5/mlx5_rss.c
+++ b/drivers/net/mlx5/mlx5_rss.c
@@ -279,7 +279,6 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev,
 	int ret;
 	struct priv *priv = dev->data->dev_private;
 
-	assert(!mlx5_is_secondary());
 	priv_lock(priv);
 	ret = priv_dev_rss_reta_update(priv, reta_conf, reta_size);
 	priv_unlock(priv);
diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c
index 0ef2cdf09..6fb245ba1 100644
--- a/drivers/net/mlx5/mlx5_rxmode.c
+++ b/drivers/net/mlx5/mlx5_rxmode.c
@@ -60,8 +60,6 @@
 void
 mlx5_promiscuous_enable(struct rte_eth_dev *dev)
 {
-	if (mlx5_is_secondary())
-		return;
 	dev->data->promiscuous = 1;
 	mlx5_traffic_restart(dev);
 }
@@ -75,8 +73,6 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev)
 void
 mlx5_promiscuous_disable(struct rte_eth_dev *dev)
 {
-	if (mlx5_is_secondary())
-		return;
 	dev->data->promiscuous = 0;
 	mlx5_traffic_restart(dev);
 }
@@ -90,8 +86,6 @@ mlx5_promiscuous_disable(struct rte_eth_dev *dev)
 void
 mlx5_allmulticast_enable(struct rte_eth_dev *dev)
 {
-	if (mlx5_is_secondary())
-		return;
 	dev->data->all_multicast = 1;
 	mlx5_traffic_restart(dev);
 }
@@ -105,8 +99,6 @@ mlx5_allmulticast_enable(struct rte_eth_dev *dev)
 void
 mlx5_allmulticast_disable(struct rte_eth_dev *dev)
 {
-	if (mlx5_is_secondary())
-		return;
 	dev->data->all_multicast = 0;
 	mlx5_traffic_restart(dev);
 }
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 85399eff5..20f3ec6c9 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -242,8 +242,6 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
 	int ret = 0;
 
 	(void)conf;
-	if (mlx5_is_secondary())
-		return -E_RTE_SECONDARY;
 	priv_lock(priv);
 	if (!rte_is_power_of_2(desc)) {
 		desc = 1 << log2above(desc);
@@ -294,9 +292,6 @@ mlx5_rx_queue_release(void *dpdk_rxq)
 	struct mlx5_rxq_ctrl *rxq_ctrl;
 	struct priv *priv;
 
-	if (mlx5_is_secondary())
-		return;
-
 	if (rxq == NULL)
 		return;
 	rxq_ctrl = container_of(rxq, struct mlx5_rxq_ctrl, rxq);
@@ -327,7 +322,6 @@ priv_rx_intr_vec_enable(struct priv *priv)
 	unsigned int count = 0;
 	struct rte_intr_handle *intr_handle = priv->dev->intr_handle;
 
-	assert(!mlx5_is_secondary());
 	if (!priv->dev->data->dev_conf.intr_conf.rxq)
 		return 0;
 	priv_rx_intr_vec_disable(priv);
diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index bbb7b531b..d682ea2c9 100644
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -135,9 +135,6 @@ mlx5_dev_start(struct rte_eth_dev *dev)
 	struct mlx5_mr *mr = NULL;
 	int err;
 
-	if (mlx5_is_secondary())
-		return -E_RTE_SECONDARY;
-
 	dev->data->dev_started = 1;
 	priv_lock(priv);
 	err = priv_flow_create_drop_queue(priv);
@@ -207,9 +204,6 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
 	struct priv *priv = dev->data->dev_private;
 	struct mlx5_mr *mr;
 
-	if (mlx5_is_secondary())
-		return;
-
 	priv_lock(priv);
 	dev->data->dev_started = 0;
 	/* Prevent crashes when queues are still in use. */
diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 31110a732..7ca99f5aa 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -142,9 +142,6 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
 		container_of(txq, struct mlx5_txq_ctrl, txq);
 	int ret = 0;
 
-	if (mlx5_is_secondary())
-		return -E_RTE_SECONDARY;
-
 	priv_lock(priv);
 	if (desc <= MLX5_TX_COMP_THRESH) {
 		WARN("%p: number of descriptors requested for TX queue %u"
@@ -203,9 +200,6 @@ mlx5_tx_queue_release(void *dpdk_txq)
 	struct priv *priv;
 	unsigned int i;
 
-	if (mlx5_is_secondary())
-		return;
-
 	if (txq == NULL)
 		return;
 	txq_ctrl = container_of(txq, struct mlx5_txq_ctrl, txq);
-- 
2.11.0

Re: [dpdk-stable] [PATCH 1/3] net/mlx5: fix secondary process verification

[Yuanhan Liu]

On Wed, Feb 14, 2018 at 09:58:29AM +0100, Nelio Laranjeiro wrote:
> From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>
> 
> [ backported from upstream commit 51e7fa8d20876cb221b11013cd23b1881cc9b75c ]

All 3 patches are applied to dpdk-stable/17.11.

Thanks!

	--yliu
> 
> Since the secondary process has its own devops, function which cannot be
> called by the secondary don't need anymore to verify which process is
> calling it.
> 
> Fixes: 87ec44ce1651 ("net/mlx5: add operations for secondary process")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
> Acked-by: Yongseok Koh <yskoh@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5.c         |  4 +---
>  drivers/net/mlx5/mlx5_ethdev.c  | 25 -------------------------
>  drivers/net/mlx5/mlx5_mac.c     |  6 ------
>  drivers/net/mlx5/mlx5_rss.c     |  1 -
>  drivers/net/mlx5/mlx5_rxmode.c  |  8 --------
>  drivers/net/mlx5/mlx5_rxq.c     |  6 ------
>  drivers/net/mlx5/mlx5_trigger.c |  6 ------
>  drivers/net/mlx5/mlx5_txq.c     |  6 ------
>  8 files changed, 1 insertion(+), 61 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> index 47ac8af48..45e0e8dba 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -158,7 +158,6 @@ mlx5_alloc_verbs_buf(size_t size, void *data)
>  	size_t alignment = sysconf(_SC_PAGESIZE);
>  
>  	assert(data != NULL);
> -	assert(!mlx5_is_secondary());
>  	ret = rte_malloc_socket(__func__, size, alignment,
>  				priv->dev->device->numa_node);
>  	DEBUG("Extern alloc size: %lu, align: %lu: %p", size, alignment, ret);
> @@ -177,7 +176,6 @@ static void
>  mlx5_free_verbs_buf(void *ptr, void *data __rte_unused)
>  {
>  	assert(data != NULL);
> -	assert(!mlx5_is_secondary());
>  	DEBUG("Extern free request: %p", ptr);
>  	rte_free(ptr);
>  }
> @@ -692,7 +690,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
>  
>  		mlx5_dev[idx].ports |= test;
>  
> -		if (mlx5_is_secondary()) {
> +		if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
>  			eth_dev = rte_eth_dev_attach_secondary(name);
>  			if (eth_dev == NULL) {
>  				ERROR("can not attach rte ethdev");
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
> index fc0860fbc..ffe1cdd64 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -134,18 +134,6 @@ mlx5_get_priv(struct rte_eth_dev *dev)
>  }
>  
>  /**
> - * Check if running as a secondary process.
> - *
> - * @return
> - *   Nonzero if running as a secondary process.
> - */
> -inline int
> -mlx5_is_secondary(void)
> -{
> -	return rte_eal_process_type() == RTE_PROC_SECONDARY;
> -}
> -
> -/**
>   * Get interface name from private structure.
>   *
>   * @param[in] priv
> @@ -649,9 +637,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
>  	struct priv *priv = dev->data->dev_private;
>  	int ret;
>  
> -	if (mlx5_is_secondary())
> -		return -E_RTE_SECONDARY;
> -
>  	priv_lock(priv);
>  	ret = dev_configure(dev);
>  	assert(ret >= 0);
> @@ -1059,9 +1044,6 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
>  	uint16_t kern_mtu;
>  	int ret = 0;
>  
> -	if (mlx5_is_secondary())
> -		return -E_RTE_SECONDARY;
> -
>  	priv_lock(priv);
>  	ret = priv_get_mtu(priv, &kern_mtu);
>  	if (ret)
> @@ -1109,9 +1091,6 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
>  	};
>  	int ret;
>  
> -	if (mlx5_is_secondary())
> -		return -E_RTE_SECONDARY;
> -
>  	ifr.ifr_data = (void *)&ethpause;
>  	priv_lock(priv);
>  	if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) {
> @@ -1160,9 +1139,6 @@ mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
>  	};
>  	int ret;
>  
> -	if (mlx5_is_secondary())
> -		return -E_RTE_SECONDARY;
> -
>  	ifr.ifr_data = (void *)&ethpause;
>  	ethpause.autoneg = fc_conf->autoneg;
>  	if (((fc_conf->mode & RTE_FC_FULL) == RTE_FC_FULL) ||
> @@ -1429,7 +1405,6 @@ priv_dev_interrupt_handler_install(struct priv *priv, struct rte_eth_dev *dev)
>  {
>  	int rc, flags;
>  
> -	assert(!mlx5_is_secondary());
>  	assert(priv->ctx->async_fd > 0);
>  	flags = fcntl(priv->ctx->async_fd, F_GETFL);
>  	rc = fcntl(priv->ctx->async_fd, F_SETFL, flags | O_NONBLOCK);
> diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
> index d17b991e4..9fb5ba5e7 100644
> --- a/drivers/net/mlx5/mlx5_mac.c
> +++ b/drivers/net/mlx5/mlx5_mac.c
> @@ -93,8 +93,6 @@ priv_get_mac(struct priv *priv, uint8_t (*mac)[ETHER_ADDR_LEN])
>  void
>  mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
>  {
> -	if (mlx5_is_secondary())
> -		return;
>  	assert(index < MLX5_MAX_MAC_ADDRESSES);
>  	memset(&dev->data->mac_addrs[index], 0, sizeof(struct ether_addr));
>  	if (!dev->data->promiscuous && !dev->data->all_multicast)
> @@ -124,8 +122,6 @@ mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
>  	int ret = 0;
>  
>  	(void)vmdq;
> -	if (mlx5_is_secondary())
> -		return 0;
>  	assert(index < MLX5_MAX_MAC_ADDRESSES);
>  	/* First, make sure this address isn't already configured. */
>  	for (i = 0; (i != MLX5_MAX_MAC_ADDRESSES); ++i) {
> @@ -154,8 +150,6 @@ mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
>  void
>  mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
>  {
> -	if (mlx5_is_secondary())
> -		return;
>  	DEBUG("%p: setting primary MAC address", (void *)dev);
>  	mlx5_mac_addr_add(dev, mac_addr, 0, 0);
>  }
> diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c
> index 7c0cf4de8..f47bda667 100644
> --- a/drivers/net/mlx5/mlx5_rss.c
> +++ b/drivers/net/mlx5/mlx5_rss.c
> @@ -279,7 +279,6 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev,
>  	int ret;
>  	struct priv *priv = dev->data->dev_private;
>  
> -	assert(!mlx5_is_secondary());
>  	priv_lock(priv);
>  	ret = priv_dev_rss_reta_update(priv, reta_conf, reta_size);
>  	priv_unlock(priv);
> diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c
> index 0ef2cdf09..6fb245ba1 100644
> --- a/drivers/net/mlx5/mlx5_rxmode.c
> +++ b/drivers/net/mlx5/mlx5_rxmode.c
> @@ -60,8 +60,6 @@
>  void
>  mlx5_promiscuous_enable(struct rte_eth_dev *dev)
>  {
> -	if (mlx5_is_secondary())
> -		return;
>  	dev->data->promiscuous = 1;
>  	mlx5_traffic_restart(dev);
>  }
> @@ -75,8 +73,6 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev)
>  void
>  mlx5_promiscuous_disable(struct rte_eth_dev *dev)
>  {
> -	if (mlx5_is_secondary())
> -		return;
>  	dev->data->promiscuous = 0;
>  	mlx5_traffic_restart(dev);
>  }
> @@ -90,8 +86,6 @@ mlx5_promiscuous_disable(struct rte_eth_dev *dev)
>  void
>  mlx5_allmulticast_enable(struct rte_eth_dev *dev)
>  {
> -	if (mlx5_is_secondary())
> -		return;
>  	dev->data->all_multicast = 1;
>  	mlx5_traffic_restart(dev);
>  }
> @@ -105,8 +99,6 @@ mlx5_allmulticast_enable(struct rte_eth_dev *dev)
>  void
>  mlx5_allmulticast_disable(struct rte_eth_dev *dev)
>  {
> -	if (mlx5_is_secondary())
> -		return;
>  	dev->data->all_multicast = 0;
>  	mlx5_traffic_restart(dev);
>  }
> diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
> index 85399eff5..20f3ec6c9 100644
> --- a/drivers/net/mlx5/mlx5_rxq.c
> +++ b/drivers/net/mlx5/mlx5_rxq.c
> @@ -242,8 +242,6 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
>  	int ret = 0;
>  
>  	(void)conf;
> -	if (mlx5_is_secondary())
> -		return -E_RTE_SECONDARY;
>  	priv_lock(priv);
>  	if (!rte_is_power_of_2(desc)) {
>  		desc = 1 << log2above(desc);
> @@ -294,9 +292,6 @@ mlx5_rx_queue_release(void *dpdk_rxq)
>  	struct mlx5_rxq_ctrl *rxq_ctrl;
>  	struct priv *priv;
>  
> -	if (mlx5_is_secondary())
> -		return;
> -
>  	if (rxq == NULL)
>  		return;
>  	rxq_ctrl = container_of(rxq, struct mlx5_rxq_ctrl, rxq);
> @@ -327,7 +322,6 @@ priv_rx_intr_vec_enable(struct priv *priv)
>  	unsigned int count = 0;
>  	struct rte_intr_handle *intr_handle = priv->dev->intr_handle;
>  
> -	assert(!mlx5_is_secondary());
>  	if (!priv->dev->data->dev_conf.intr_conf.rxq)
>  		return 0;
>  	priv_rx_intr_vec_disable(priv);
> diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
> index bbb7b531b..d682ea2c9 100644
> --- a/drivers/net/mlx5/mlx5_trigger.c
> +++ b/drivers/net/mlx5/mlx5_trigger.c
> @@ -135,9 +135,6 @@ mlx5_dev_start(struct rte_eth_dev *dev)
>  	struct mlx5_mr *mr = NULL;
>  	int err;
>  
> -	if (mlx5_is_secondary())
> -		return -E_RTE_SECONDARY;
> -
>  	dev->data->dev_started = 1;
>  	priv_lock(priv);
>  	err = priv_flow_create_drop_queue(priv);
> @@ -207,9 +204,6 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
>  	struct priv *priv = dev->data->dev_private;
>  	struct mlx5_mr *mr;
>  
> -	if (mlx5_is_secondary())
> -		return;
> -
>  	priv_lock(priv);
>  	dev->data->dev_started = 0;
>  	/* Prevent crashes when queues are still in use. */
> diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
> index 31110a732..7ca99f5aa 100644
> --- a/drivers/net/mlx5/mlx5_txq.c
> +++ b/drivers/net/mlx5/mlx5_txq.c
> @@ -142,9 +142,6 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
>  		container_of(txq, struct mlx5_txq_ctrl, txq);
>  	int ret = 0;
>  
> -	if (mlx5_is_secondary())
> -		return -E_RTE_SECONDARY;
> -
>  	priv_lock(priv);
>  	if (desc <= MLX5_TX_COMP_THRESH) {
>  		WARN("%p: number of descriptors requested for TX queue %u"
> @@ -203,9 +200,6 @@ mlx5_tx_queue_release(void *dpdk_txq)
>  	struct priv *priv;
>  	unsigned int i;
>  
> -	if (mlx5_is_secondary())
> -		return;
> -
>  	if (txq == NULL)
>  		return;
>  	txq_ctrl = container_of(txq, struct mlx5_txq_ctrl, txq);
> -- 
> 2.11.0

[dpdk-stable] [PATCH 2/3] net/mlx5: fix port stop by verify flows are still present

[Nelio Laranjeiro]

From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>

[ backported from upstream commit f07f9bcdb4d6aaaef7469ac4b03d8dd8d43a41db ]

priv_flow_stop() may be called several times, in such situation flows are
already removed from the NIC and thus all associated objects are no present
in the flow object (ibv_flow, indirection tables, ....).

Fixes: 8086cf08b2f0 ("net/mlx5: handle RSS hash configuration in RSS flow")
Cc: stable@dpdk.org

Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---
 drivers/net/mlx5/mlx5_flow.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 68c28edee..c18c77d48 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2240,23 +2240,33 @@ priv_flow_stop(struct priv *priv, struct mlx5_flows *list)
 
 	TAILQ_FOREACH_REVERSE(flow, list, mlx5_flows, next) {
 		unsigned int i;
+		struct mlx5_ind_table_ibv *ind_tbl = NULL;
 
 		if (flow->drop) {
 			if (!flow->drxq.ibv_flow)
 				continue;
 			claim_zero(ibv_destroy_flow(flow->drxq.ibv_flow));
 			flow->drxq.ibv_flow = NULL;
+			DEBUG("Flow %p removed", (void *)flow);
 			/* Next flow. */
 			continue;
 		}
+		/* Verify the flow has not already been cleaned. */
+		for (i = 0; i != hash_rxq_init_n; ++i) {
+			if (!flow->frxq[i].ibv_flow)
+				continue;
+			/*
+			 * Indirection table may be necessary to remove the
+			 * flags in the Rx queues.
+			 * This helps to speed-up the process by avoiding
+			 * another loop.
+			 */
+			ind_tbl = flow->frxq[i].hrxq->ind_table;
+			break;
+		}
+		if (i == hash_rxq_init_n)
+			return;
 		if (flow->mark) {
-			struct mlx5_ind_table_ibv *ind_tbl = NULL;
-
-			for (i = 0; i != hash_rxq_init_n; ++i) {
-				if (!flow->frxq[i].hrxq)
-					continue;
-				ind_tbl = flow->frxq[i].hrxq->ind_table;
-			}
 			assert(ind_tbl);
 			for (i = 0; i != ind_tbl->queues_n; ++i)
 				(*priv->rxqs)[ind_tbl->queues[i]]->mark = 0;
-- 
2.11.0

[dpdk-stable] [PATCH 3/3] net/mlx5: fix flow priority on queue action

[Nelio Laranjeiro]

From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>

[ backported from upstream commit c3299d76867f23e595d8e1b3e6b9ad4d6aa87155 ]

A single queue should have the same verbs priority as an RSS one.

Fixes: 8086cf08b2f0 ("net/mlx5: handle RSS hash configuration in RSS flow")
Cc: stable@dpdk.org

Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index c18c77d48..82efddc5a 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -882,8 +882,6 @@ priv_flow_convert_items_validate(struct priv *priv,
 		}
 		if (parser->drop) {
 			parser->drop_q.offset += cur_item->dst_sz;
-		} else if (parser->queues_n == 1) {
-			parser->queue[HASH_RXQ_ETH].offset += cur_item->dst_sz;
 		} else {
 			for (n = 0; n != hash_rxq_init_n; ++n)
 				parser->queue[n].offset += cur_item->dst_sz;
@@ -1126,19 +1124,6 @@ priv_flow_convert(struct priv *priv,
 		if (!parser->drop_q.ibv_attr)
 			return ENOMEM;
 		parser->drop_q.offset = sizeof(struct ibv_flow_attr);
-	} else if (parser->queues_n == 1) {
-		unsigned int priority =
-			attr->priority +
-			hash_rxq_init[HASH_RXQ_ETH].flow_priority;
-		unsigned int offset = parser->queue[HASH_RXQ_ETH].offset;
-
-		parser->queue[HASH_RXQ_ETH].ibv_attr =
-			priv_flow_convert_allocate(priv, priority,
-						   offset, error);
-		if (!parser->queue[HASH_RXQ_ETH].ibv_attr)
-			return ENOMEM;
-		parser->queue[HASH_RXQ_ETH].offset =
-			sizeof(struct ibv_flow_attr);
 	} else {
 		for (i = 0; i != hash_rxq_init_n; ++i) {
 			unsigned int priority =
@@ -1188,22 +1173,9 @@ priv_flow_convert(struct priv *priv,
 	 * Last step. Complete missing specification to reach the RSS
 	 * configuration.
 	 */
-	if (parser->drop) {
-		/*
-		 * Drop queue priority needs to be adjusted to
-		 * their most specific layer priority.
-		 */
-		parser->drop_q.ibv_attr->priority =
-			attr->priority +
-			hash_rxq_init[parser->layer].flow_priority;
-	} else if (parser->queues_n > 1) {
+	if (!parser->drop) {
 		priv_flow_convert_finalise(priv, parser);
 	} else {
-		/*
-		 * Action queue have their priority overridden with
-		 * Ethernet priority, this priority needs to be adjusted to
-		 * their most specific layer priority.
-		 */
 		parser->queue[HASH_RXQ_ETH].ibv_attr->priority =
 			attr->priority +
 			hash_rxq_init[parser->layer].flow_priority;
-- 
2.11.0

[dpdk-stable] [PATCH 1/3] Revert "net/mlx5: fix flow priority on queue action"

[Nelio Laranjeiro]

This patch depends on another one not backported.  For now it should be
reverted to backport first the one missing and then re-apply this one.

This reverts commit 0ec3529b056a826cee94104e20dfd3d58d64ab67.
---
 drivers/net/mlx5/mlx5_flow.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 82efddc5a..c18c77d48 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -882,6 +882,8 @@ priv_flow_convert_items_validate(struct priv *priv,
 		}
 		if (parser->drop) {
 			parser->drop_q.offset += cur_item->dst_sz;
+		} else if (parser->queues_n == 1) {
+			parser->queue[HASH_RXQ_ETH].offset += cur_item->dst_sz;
 		} else {
 			for (n = 0; n != hash_rxq_init_n; ++n)
 				parser->queue[n].offset += cur_item->dst_sz;
@@ -1124,6 +1126,19 @@ priv_flow_convert(struct priv *priv,
 		if (!parser->drop_q.ibv_attr)
 			return ENOMEM;
 		parser->drop_q.offset = sizeof(struct ibv_flow_attr);
+	} else if (parser->queues_n == 1) {
+		unsigned int priority =
+			attr->priority +
+			hash_rxq_init[HASH_RXQ_ETH].flow_priority;
+		unsigned int offset = parser->queue[HASH_RXQ_ETH].offset;
+
+		parser->queue[HASH_RXQ_ETH].ibv_attr =
+			priv_flow_convert_allocate(priv, priority,
+						   offset, error);
+		if (!parser->queue[HASH_RXQ_ETH].ibv_attr)
+			return ENOMEM;
+		parser->queue[HASH_RXQ_ETH].offset =
+			sizeof(struct ibv_flow_attr);
 	} else {
 		for (i = 0; i != hash_rxq_init_n; ++i) {
 			unsigned int priority =
@@ -1173,9 +1188,22 @@ priv_flow_convert(struct priv *priv,
 	 * Last step. Complete missing specification to reach the RSS
 	 * configuration.
 	 */
-	if (!parser->drop) {
+	if (parser->drop) {
+		/*
+		 * Drop queue priority needs to be adjusted to
+		 * their most specific layer priority.
+		 */
+		parser->drop_q.ibv_attr->priority =
+			attr->priority +
+			hash_rxq_init[parser->layer].flow_priority;
+	} else if (parser->queues_n > 1) {
 		priv_flow_convert_finalise(priv, parser);
 	} else {
+		/*
+		 * Action queue have their priority overridden with
+		 * Ethernet priority, this priority needs to be adjusted to
+		 * their most specific layer priority.
+		 */
 		parser->queue[HASH_RXQ_ETH].ibv_attr->priority =
 			attr->priority +
 			hash_rxq_init[parser->layer].flow_priority;
-- 
2.11.0

Re: [dpdk-stable] [PATCH 1/3] Revert "net/mlx5: fix flow priority on queue action"

[Yuanhan Liu]

On Tue, Feb 27, 2018 at 10:36:43AM +0100, Nelio Laranjeiro wrote:
> This patch depends on another one not backported.  For now it should be
> reverted to backport first the one missing and then re-apply this one.
> 
> This reverts commit 0ec3529b056a826cee94104e20dfd3d58d64ab67.

Series Applied to dpdk-stable/17.11.

Thanks for the backporting!

	--yliu

> ---
>  drivers/net/mlx5/mlx5_flow.c | 30 +++++++++++++++++++++++++++++-
>  1 file changed, 29 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> index 82efddc5a..c18c77d48 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -882,6 +882,8 @@ priv_flow_convert_items_validate(struct priv *priv,
>  		}
>  		if (parser->drop) {
>  			parser->drop_q.offset += cur_item->dst_sz;
> +		} else if (parser->queues_n == 1) {
> +			parser->queue[HASH_RXQ_ETH].offset += cur_item->dst_sz;
>  		} else {
>  			for (n = 0; n != hash_rxq_init_n; ++n)
>  				parser->queue[n].offset += cur_item->dst_sz;
> @@ -1124,6 +1126,19 @@ priv_flow_convert(struct priv *priv,
>  		if (!parser->drop_q.ibv_attr)
>  			return ENOMEM;
>  		parser->drop_q.offset = sizeof(struct ibv_flow_attr);
> +	} else if (parser->queues_n == 1) {
> +		unsigned int priority =
> +			attr->priority +
> +			hash_rxq_init[HASH_RXQ_ETH].flow_priority;
> +		unsigned int offset = parser->queue[HASH_RXQ_ETH].offset;
> +
> +		parser->queue[HASH_RXQ_ETH].ibv_attr =
> +			priv_flow_convert_allocate(priv, priority,
> +						   offset, error);
> +		if (!parser->queue[HASH_RXQ_ETH].ibv_attr)
> +			return ENOMEM;
> +		parser->queue[HASH_RXQ_ETH].offset =
> +			sizeof(struct ibv_flow_attr);
>  	} else {
>  		for (i = 0; i != hash_rxq_init_n; ++i) {
>  			unsigned int priority =
> @@ -1173,9 +1188,22 @@ priv_flow_convert(struct priv *priv,
>  	 * Last step. Complete missing specification to reach the RSS
>  	 * configuration.
>  	 */
> -	if (!parser->drop) {
> +	if (parser->drop) {
> +		/*
> +		 * Drop queue priority needs to be adjusted to
> +		 * their most specific layer priority.
> +		 */
> +		parser->drop_q.ibv_attr->priority =
> +			attr->priority +
> +			hash_rxq_init[parser->layer].flow_priority;
> +	} else if (parser->queues_n > 1) {
>  		priv_flow_convert_finalise(priv, parser);
>  	} else {
> +		/*
> +		 * Action queue have their priority overridden with
> +		 * Ethernet priority, this priority needs to be adjusted to
> +		 * their most specific layer priority.
> +		 */
>  		parser->queue[HASH_RXQ_ETH].ibv_attr->priority =
>  			attr->priority +
>  			hash_rxq_init[parser->layer].flow_priority;
> -- 
> 2.11.0

[dpdk-stable] [PATCH 2/3] net/mlx5: remove parser/flow drop queue

[Nelio Laranjeiro]

From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>

[ backported from upstream commit 992300f402b60717ffc5d6cf3a8e71c4e485d14c ]

This drop queue can be handled efficiently by using the drop flag in the
context.

Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 178 ++++++++++++++-----------------------------
 1 file changed, 56 insertions(+), 122 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index c18c77d48..bc2bba21b 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -251,11 +251,8 @@ struct rte_flow {
 	uint8_t rss_key[40]; /**< copy of the RSS key. */
 	struct ibv_counter_set *cs; /**< Holds the counters for the rule. */
 	struct mlx5_flow_counter_stats counter_stats;/**<The counter stats. */
-	union {
-		struct mlx5_flow frxq[RTE_DIM(hash_rxq_init)];
-		/**< Flow with Rx queue. */
-		struct mlx5_flow_drop drxq; /**< Flow with drop Rx queue. */
-	};
+	struct mlx5_flow frxq[RTE_DIM(hash_rxq_init)];
+	/**< Flow with Rx queue. */
 };
 
 /** Static initializer for items. */
@@ -445,20 +442,12 @@ struct mlx5_flow_parse {
 	uint8_t rss_key[40]; /**< copy of the RSS key. */
 	enum hash_rxq_type layer; /**< Last pattern layer detected. */
 	struct ibv_counter_set *cs; /**< Holds the counter set for the rule */
-	union {
-		struct {
-			struct ibv_flow_attr *ibv_attr;
-			/**< Pointer to Verbs attributes. */
-			unsigned int offset;
-			/**< Current position or total size of the attribute. */
-		} queue[RTE_DIM(hash_rxq_init)];
-		struct {
-			struct ibv_flow_attr *ibv_attr;
-			/**< Pointer to Verbs attributes. */
-			unsigned int offset;
-			/**< Current position or total size of the attribute. */
-		} drop_q;
-	};
+	struct {
+		struct ibv_flow_attr *ibv_attr;
+		/**< Pointer to Verbs attributes. */
+		unsigned int offset;
+		/**< Current position or total size of the attribute. */
+	} queue[RTE_DIM(hash_rxq_init)];
 };
 
 static const struct rte_flow_ops mlx5_flow_ops = {
@@ -839,12 +828,8 @@ priv_flow_convert_items_validate(struct priv *priv,
 
 	(void)priv;
 	/* Initialise the offsets to start after verbs attribute. */
-	if (parser->drop) {
-		parser->drop_q.offset = sizeof(struct ibv_flow_attr);
-	} else {
-		for (i = 0; i != hash_rxq_init_n; ++i)
-			parser->queue[i].offset = sizeof(struct ibv_flow_attr);
-	}
+	for (i = 0; i != hash_rxq_init_n; ++i)
+		parser->queue[i].offset = sizeof(struct ibv_flow_attr);
 	for (; items->type != RTE_FLOW_ITEM_TYPE_END; ++items) {
 		const struct mlx5_flow_items *token = NULL;
 		unsigned int n;
@@ -880,9 +865,7 @@ priv_flow_convert_items_validate(struct priv *priv,
 			}
 			parser->inner = IBV_FLOW_SPEC_INNER;
 		}
-		if (parser->drop) {
-			parser->drop_q.offset += cur_item->dst_sz;
-		} else if (parser->queues_n == 1) {
+		if (parser->drop || parser->queues_n == 1) {
 			parser->queue[HASH_RXQ_ETH].offset += cur_item->dst_sz;
 		} else {
 			for (n = 0; n != hash_rxq_init_n; ++n)
@@ -901,12 +884,8 @@ priv_flow_convert_items_validate(struct priv *priv,
 	if (parser->count) {
 		unsigned int size = sizeof(struct ibv_flow_spec_counter_action);
 
-		if (parser->drop) {
-			parser->drop_q.offset += size;
-		} else {
-			for (i = 0; i != hash_rxq_init_n; ++i)
-				parser->queue[i].offset += size;
-		}
+		for (i = 0; i != hash_rxq_init_n; ++i)
+			parser->queue[i].offset += size;
 	}
 	return 0;
 exit_item_not_supported:
@@ -1118,15 +1097,7 @@ priv_flow_convert(struct priv *priv,
 	 * Second step.
 	 * Allocate the memory space to store verbs specifications.
 	 */
-	if (parser->drop) {
-		parser->drop_q.ibv_attr =
-			priv_flow_convert_allocate(priv, attr->priority,
-						   parser->drop_q.offset,
-						   error);
-		if (!parser->drop_q.ibv_attr)
-			return ENOMEM;
-		parser->drop_q.offset = sizeof(struct ibv_flow_attr);
-	} else if (parser->queues_n == 1) {
+	if (parser->drop || parser->queues_n == 1) {
 		unsigned int priority =
 			attr->priority +
 			hash_rxq_init[HASH_RXQ_ETH].flow_priority;
@@ -1188,15 +1159,7 @@ priv_flow_convert(struct priv *priv,
 	 * Last step. Complete missing specification to reach the RSS
 	 * configuration.
 	 */
-	if (parser->drop) {
-		/*
-		 * Drop queue priority needs to be adjusted to
-		 * their most specific layer priority.
-		 */
-		parser->drop_q.ibv_attr->priority =
-			attr->priority +
-			hash_rxq_init[parser->layer].flow_priority;
-	} else if (parser->queues_n > 1) {
+	if (parser->queues_n > 1) {
 		priv_flow_convert_finalise(priv, parser);
 	} else {
 		/*
@@ -1211,10 +1174,6 @@ priv_flow_convert(struct priv *priv,
 exit_free:
 	/* Only verification is expected, all resources should be released. */
 	if (!parser->create) {
-		if (parser->drop) {
-			rte_free(parser->drop_q.ibv_attr);
-			parser->drop_q.ibv_attr = NULL;
-		}
 		for (i = 0; i != hash_rxq_init_n; ++i) {
 			if (parser->queue[i].ibv_attr) {
 				rte_free(parser->queue[i].ibv_attr);
@@ -1256,14 +1215,6 @@ mlx5_flow_create_copy(struct mlx5_flow_parse *parser, void *src,
 	unsigned int i;
 	void *dst;
 
-	if (parser->drop) {
-		dst = (void *)((uintptr_t)parser->drop_q.ibv_attr +
-				parser->drop_q.offset);
-		memcpy(dst, src, size);
-		++parser->drop_q.ibv_attr->num_of_specs;
-		parser->drop_q.offset += size;
-		return;
-	}
 	for (i = 0; i != hash_rxq_init_n; ++i) {
 		if (!parser->queue[i].ibv_attr)
 			continue;
@@ -1356,14 +1307,6 @@ mlx5_flow_create_vlan(const struct rte_flow_item *item,
 		if (!mask)
 			mask = default_mask;
 
-		if (parser->drop) {
-			eth = (void *)((uintptr_t)parser->drop_q.ibv_attr +
-				       parser->drop_q.offset - eth_size);
-			eth->val.vlan_tag = spec->tci;
-			eth->mask.vlan_tag = mask->tci;
-			eth->val.vlan_tag &= eth->mask.vlan_tag;
-			return 0;
-		}
 		for (i = 0; i != hash_rxq_init_n; ++i) {
 			if (!parser->queue[i].ibv_attr)
 				continue;
@@ -1717,23 +1660,25 @@ priv_flow_create_action_queue_drop(struct priv *priv,
 	assert(priv->pd);
 	assert(priv->ctx);
 	flow->drop = 1;
-	drop = (void *)((uintptr_t)parser->drop_q.ibv_attr +
-			parser->drop_q.offset);
+	drop = (void *)((uintptr_t)parser->queue[HASH_RXQ_ETH].ibv_attr +
+			parser->queue[HASH_RXQ_ETH].offset);
 	*drop = (struct ibv_flow_spec_action_drop){
 			.type = IBV_FLOW_SPEC_ACTION_DROP,
 			.size = size,
 	};
-	++parser->drop_q.ibv_attr->num_of_specs;
-	parser->drop_q.offset += size;
-	flow->drxq.ibv_attr = parser->drop_q.ibv_attr;
+	++parser->queue[HASH_RXQ_ETH].ibv_attr->num_of_specs;
+	parser->queue[HASH_RXQ_ETH].offset += size;
+	flow->frxq[HASH_RXQ_ETH].ibv_attr =
+		parser->queue[HASH_RXQ_ETH].ibv_attr;
 	if (parser->count)
 		flow->cs = parser->cs;
 	if (!priv->dev->data->dev_started)
 		return 0;
-	parser->drop_q.ibv_attr = NULL;
-	flow->drxq.ibv_flow = ibv_create_flow(priv->flow_drop_queue->qp,
-					      flow->drxq.ibv_attr);
-	if (!flow->drxq.ibv_flow) {
+	parser->queue[HASH_RXQ_ETH].ibv_attr = NULL;
+	flow->frxq[HASH_RXQ_ETH].ibv_flow =
+		ibv_create_flow(priv->flow_drop_queue->qp,
+				flow->frxq[HASH_RXQ_ETH].ibv_attr);
+	if (!flow->frxq[HASH_RXQ_ETH].ibv_flow) {
 		rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE,
 				   NULL, "flow rule creation failure");
 		err = ENOMEM;
@@ -1742,13 +1687,13 @@ priv_flow_create_action_queue_drop(struct priv *priv,
 	return 0;
 error:
 	assert(flow);
-	if (flow->drxq.ibv_flow) {
-		claim_zero(ibv_destroy_flow(flow->drxq.ibv_flow));
-		flow->drxq.ibv_flow = NULL;
+	if (flow->frxq[HASH_RXQ_ETH].ibv_flow) {
+		claim_zero(ibv_destroy_flow(flow->frxq[HASH_RXQ_ETH].ibv_flow));
+		flow->frxq[HASH_RXQ_ETH].ibv_flow = NULL;
 	}
-	if (flow->drxq.ibv_attr) {
-		rte_free(flow->drxq.ibv_attr);
-		flow->drxq.ibv_attr = NULL;
+	if (flow->frxq[HASH_RXQ_ETH].ibv_attr) {
+		rte_free(flow->frxq[HASH_RXQ_ETH].ibv_attr);
+		flow->frxq[HASH_RXQ_ETH].ibv_attr = NULL;
 	}
 	if (flow->cs) {
 		claim_zero(ibv_destroy_counter_set(flow->cs));
@@ -1963,13 +1908,9 @@ priv_flow_create(struct priv *priv,
 	DEBUG("Flow created %p", (void *)flow);
 	return flow;
 exit:
-	if (parser.drop) {
-		rte_free(parser.drop_q.ibv_attr);
-	} else {
-		for (i = 0; i != hash_rxq_init_n; ++i) {
-			if (parser.queue[i].ibv_attr)
-				rte_free(parser.queue[i].ibv_attr);
-		}
+	for (i = 0; i != hash_rxq_init_n; ++i) {
+		if (parser.queue[i].ibv_attr)
+			rte_free(parser.queue[i].ibv_attr);
 	}
 	rte_free(flow);
 	return NULL;
@@ -2071,9 +2012,10 @@ priv_flow_destroy(struct priv *priv,
 	}
 free:
 	if (flow->drop) {
-		if (flow->drxq.ibv_flow)
-			claim_zero(ibv_destroy_flow(flow->drxq.ibv_flow));
-		rte_free(flow->drxq.ibv_attr);
+		if (flow->frxq[HASH_RXQ_ETH].ibv_flow)
+			claim_zero(ibv_destroy_flow
+				   (flow->frxq[HASH_RXQ_ETH].ibv_flow));
+		rte_free(flow->frxq[HASH_RXQ_ETH].ibv_attr);
 	} else {
 		for (i = 0; i != hash_rxq_init_n; ++i) {
 			struct mlx5_flow *frxq = &flow->frxq[i];
@@ -2243,10 +2185,11 @@ priv_flow_stop(struct priv *priv, struct mlx5_flows *list)
 		struct mlx5_ind_table_ibv *ind_tbl = NULL;
 
 		if (flow->drop) {
-			if (!flow->drxq.ibv_flow)
+			if (!flow->frxq[HASH_RXQ_ETH].ibv_flow)
 				continue;
-			claim_zero(ibv_destroy_flow(flow->drxq.ibv_flow));
-			flow->drxq.ibv_flow = NULL;
+			claim_zero(ibv_destroy_flow
+				   (flow->frxq[HASH_RXQ_ETH].ibv_flow));
+			flow->frxq[HASH_RXQ_ETH].ibv_flow = NULL;
 			DEBUG("Flow %p removed", (void *)flow);
 			/* Next flow. */
 			continue;
@@ -2303,10 +2246,11 @@ priv_flow_start(struct priv *priv, struct mlx5_flows *list)
 		unsigned int i;
 
 		if (flow->drop) {
-			flow->drxq.ibv_flow =
-				ibv_create_flow(priv->flow_drop_queue->qp,
-						flow->drxq.ibv_attr);
-			if (!flow->drxq.ibv_flow) {
+			flow->frxq[HASH_RXQ_ETH].ibv_flow =
+				ibv_create_flow
+				(priv->flow_drop_queue->qp,
+				 flow->frxq[HASH_RXQ_ETH].ibv_attr);
+			if (!flow->frxq[HASH_RXQ_ETH].ibv_flow) {
 				DEBUG("Flow %p cannot be applied",
 				      (void *)flow);
 				rte_errno = EINVAL;
@@ -2901,13 +2845,13 @@ priv_fdir_filter_delete(struct priv *priv,
 	if (parser.drop) {
 		struct ibv_flow_spec_action_drop *drop;
 
-		drop = (void *)((uintptr_t)parser.drop_q.ibv_attr +
-				parser.drop_q.offset);
+		drop = (void *)((uintptr_t)parser.queue[HASH_RXQ_ETH].ibv_attr +
+				parser.queue[HASH_RXQ_ETH].offset);
 		*drop = (struct ibv_flow_spec_action_drop){
 			.type = IBV_FLOW_SPEC_ACTION_DROP,
 			.size = sizeof(struct ibv_flow_spec_action_drop),
 		};
-		parser.drop_q.ibv_attr->num_of_specs++;
+		parser.queue[HASH_RXQ_ETH].ibv_attr->num_of_specs++;
 	}
 	TAILQ_FOREACH(flow, &priv->flows, next) {
 		struct ibv_flow_attr *attr;
@@ -2918,14 +2862,8 @@ priv_fdir_filter_delete(struct priv *priv,
 		void *flow_spec;
 		unsigned int specs_n;
 
-		if (parser.drop)
-			attr = parser.drop_q.ibv_attr;
-		else
-			attr = parser.queue[HASH_RXQ_ETH].ibv_attr;
-		if (flow->drop)
-			flow_attr = flow->drxq.ibv_attr;
-		else
-			flow_attr = flow->frxq[HASH_RXQ_ETH].ibv_attr;
+		attr = parser.queue[HASH_RXQ_ETH].ibv_attr;
+		flow_attr = flow->frxq[HASH_RXQ_ETH].ibv_attr;
 		/* Compare first the attributes. */
 		if (memcmp(attr, flow_attr, sizeof(struct ibv_flow_attr)))
 			continue;
@@ -2955,13 +2893,9 @@ priv_fdir_filter_delete(struct priv *priv,
 	if (flow)
 		priv_flow_destroy(priv, &priv->flows, flow);
 exit:
-	if (parser.drop) {
-		rte_free(parser.drop_q.ibv_attr);
-	} else {
-		for (i = 0; i != hash_rxq_init_n; ++i) {
-			if (parser.queue[i].ibv_attr)
-				rte_free(parser.queue[i].ibv_attr);
-		}
+	for (i = 0; i != hash_rxq_init_n; ++i) {
+		if (parser.queue[i].ibv_attr)
+			rte_free(parser.queue[i].ibv_attr);
 	}
 	return -ret;
 }
-- 
2.11.0

[dpdk-stable] [PATCH 3/3] net/mlx5: fix flow priority on queue action

[Nelio Laranjeiro]

From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>

[ backported from upstream commit c3299d76867f23e595d8e1b3e6b9ad4d6aa87155 ]

A single queue should have the same verbs priority as an RSS one.

Fixes: 8086cf08b2f0 ("net/mlx5: handle RSS hash configuration in RSS flow")
Cc: stable@dpdk.org

Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index bc2bba21b..092644ff1 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -865,7 +865,7 @@ priv_flow_convert_items_validate(struct priv *priv,
 			}
 			parser->inner = IBV_FLOW_SPEC_INNER;
 		}
-		if (parser->drop || parser->queues_n == 1) {
+		if (parser->drop) {
 			parser->queue[HASH_RXQ_ETH].offset += cur_item->dst_sz;
 		} else {
 			for (n = 0; n != hash_rxq_init_n; ++n)
@@ -1097,15 +1097,12 @@ priv_flow_convert(struct priv *priv,
 	 * Second step.
 	 * Allocate the memory space to store verbs specifications.
 	 */
-	if (parser->drop || parser->queues_n == 1) {
-		unsigned int priority =
-			attr->priority +
-			hash_rxq_init[HASH_RXQ_ETH].flow_priority;
-		unsigned int offset = parser->queue[HASH_RXQ_ETH].offset;
-
+	if (parser->drop) {
 		parser->queue[HASH_RXQ_ETH].ibv_attr =
-			priv_flow_convert_allocate(priv, priority,
-						   offset, error);
+			priv_flow_convert_allocate
+			(priv, attr->priority,
+			 parser->queue[HASH_RXQ_ETH].offset,
+			 error);
 		if (!parser->queue[HASH_RXQ_ETH].ibv_attr)
 			return ENOMEM;
 		parser->queue[HASH_RXQ_ETH].offset =
@@ -1159,14 +1156,9 @@ priv_flow_convert(struct priv *priv,
 	 * Last step. Complete missing specification to reach the RSS
 	 * configuration.
 	 */
-	if (parser->queues_n > 1) {
+	if (!parser->drop) {
 		priv_flow_convert_finalise(priv, parser);
 	} else {
-		/*
-		 * Action queue have their priority overridden with
-		 * Ethernet priority, this priority needs to be adjusted to
-		 * their most specific layer priority.
-		 */
 		parser->queue[HASH_RXQ_ETH].ibv_attr->priority =
 			attr->priority +
 			hash_rxq_init[parser->layer].flow_priority;
-- 
2.11.0