* Re: please help backporting some patches to stable release 21.11.2
2022-06-24 16:31 please help backporting some patches to stable release 21.11.2 Kevin Traynor
@ 2022-06-27 9:15 ` Stanisław Kardach
2022-06-28 14:14 ` Kevin Traynor
2022-06-27 13:39 ` Rahul Lakkireddy
` (5 subsequent siblings)
6 siblings, 1 reply; 22+ messages in thread
From: Stanisław Kardach @ 2022-06-27 9:15 UTC (permalink / raw)
To: dpdk stable; +Cc: Kevin Traynor
On Fri, Jun 24, 2022 at 6:31 PM Kevin Traynor <ktraynor@redhat.com> wrote:
> <snip>
> c65e343c14 Stanislaw Kardach ci: enable C++ check for Arm and PPC
This commit is not necessary as C++ checks were added later by:
5e437164df buildtools/chkincs: test headers for C++ compatibility
--
Best Regards,
Stanisław Kardach
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: please help backporting some patches to stable release 21.11.2
2022-06-27 9:15 ` Stanisław Kardach
@ 2022-06-28 14:14 ` Kevin Traynor
0 siblings, 0 replies; 22+ messages in thread
From: Kevin Traynor @ 2022-06-28 14:14 UTC (permalink / raw)
To: Stanisław Kardach, dpdk stable
On 27/06/2022 10:15, Stanisław Kardach wrote:
> On Fri, Jun 24, 2022 at 6:31 PM Kevin Traynor <ktraynor@redhat.com> wrote:
>> <snip>
>> c65e343c14 Stanislaw Kardach ci: enable C++ check for Arm and PPC
> This commit is not necessary as C++ checks were added later by:
> 5e437164df buildtools/chkincs: test headers for C++ compatibility
>
Thanks for checking, will drop from list.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: please help backporting some patches to stable release 21.11.2
2022-06-24 16:31 please help backporting some patches to stable release 21.11.2 Kevin Traynor
2022-06-27 9:15 ` Stanisław Kardach
@ 2022-06-27 13:39 ` Rahul Lakkireddy
2022-06-28 14:18 ` Kevin Traynor
2022-06-27 21:15 ` McDaniel, Timothy
` (4 subsequent siblings)
6 siblings, 1 reply; 22+ messages in thread
From: Rahul Lakkireddy @ 2022-06-27 13:39 UTC (permalink / raw)
To: dpdk stable
Cc: Andrew Rybchenko, Anoob Joseph, Arek Kusztal, Bruce Richardson,
Chaoyong He, Chengwen Feng, Conor Walsh, Dariusz Sosnowski,
David Marchand, Daxue Gao, Fan Zhang, Harman Kalra,
Jasvinder Singh, Jerin Jacob, Li Zhang, Louis Peens, Matan Azrad,
Maxime Coquelin, Morten Brørup, Niklas Söderlund,
Nithin Dabilpuram, Pavan Nikhilesh, Peng Zhang,
Stanislaw Kardach, Stephen Hemminger, Sunil Kumar Kori,
Timothy McDaniel, Viacheslav Ovsiienko, Walter Heymans, Yajun Wu,
Luca Boccassi
On Friday, June 06/24/22, 2022 at 17:31:08 +0100, Kevin Traynor wrote:
> Hi commit authors (and maintainers),
>
> Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
> I didn't apply following commits from DPDK main to 21.11
> stable branch, as conflicts or build errors occur.
>
> Can authors check your patches in the following list and either:
> - Backport your patches to the 21.11 branch, or
> - Indicate that the patch should not be backported
>
> Please do either of the above by 07/01/22.
>
> You can find the a temporary work-in-progress branch of the coming 21.11.2
> release at:
> https://github.com/kevintraynor/dpdk-stable
> It is recommended to backport on top of that to minimize further conflicts or
> misunderstandings.
>
> Some notes on stable backports:
>
> A backport should contain a reference to the DPDK main branch commit
> in it's commit message in the following fashion:
> [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
>
> For example:
> https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
>
> When sending the backported patch, please indicate the target branch in the
> subject line, as we have multiple branches, for example:
> [PATCH 21.11] foo/bar: fix baz
>
> With git format-patch, this can be achieved by appending the parameter:
> --subject-prefix='PATCH 21.11'
>
> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
>
> FYI, branch 21.11 is located at tree:
> https://git.dpdk.org/dpdk-stable
>
> Thanks.
>
> Kevin
>
> ---
> These commits have non-trivial conflicts while applying to 21.11 branch:
> 4c1a91b21f Arek Kusztal crypto/qat: fix cleanup function default behaviour
> 5b4d317d83 Arek Kusztal crypto/qat: fix missing copy guards in asym mod
> d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment
> a31c9f970d David Marchand net/cnxk: fix crash in IPsec telemetry
> 6cef22dcfe Harman Kalra net/cnxk: fix PFC class disabling
> 6f065d1539 Li Zhang vdpa/mlx5: fix maximum number of virtqs
> b2c5ff1bd9 Nithin Dabilpuram common/cnxk: fix mbox structs to avoid unaligned access
> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
> e2819fea94 Nithin Dabilpuram net/cnxk: fix multi-segment extraction in vwqe path
> 2e668c547f Nithin Dabilpuram net/cnxk: fix roundup size with transport mode
> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size
> 694c75e8e3 Rahul Lakkireddy test/crypto: fix build with optimization=1
Please skip this commit. Looks like its dependent commit:
d02c6bfcb99a ("test/crypto: add ESN and antireplay cases")
is not available in DPDK v21.11. It seems to be available from DPDK
v22.03, instead.
> c65e343c14 Stanislaw Kardach ci: enable C++ check for Arm and PPC
> f75dd6d3b1 Stanislaw Kardach config: fix C++ cross compiler for Arm and PPC
> 174f2f3512 Sunil Kumar Kori common/cnxk: add PFC support for VF
> 95af59b7ad Yajun Wu vdpa/mlx5: workaround VAR offset within page
>
> These commits apply cleanly to 21.11 branch but cause build errors:
> aa802b1023 Bruce Richardson dma/idxd: fix AVX2 in non-datapath functions
> (^ commit causes build error on OBS CentOS7. No need to rework, can take
> when fix arives on DPDK main)
>
> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
> 485df8847a Chengwen Feng ethdev: clarify null location case in xstats get
> 45a192b2b4 Stephen Hemminger sched: fix floating point math
> 87ecdd9e7f Timothy McDaniel event/dlb2: improve enqueue efficiency
>
Thanks,
Rahul
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: please help backporting some patches to stable release 21.11.2
2022-06-27 13:39 ` Rahul Lakkireddy
@ 2022-06-28 14:18 ` Kevin Traynor
0 siblings, 0 replies; 22+ messages in thread
From: Kevin Traynor @ 2022-06-28 14:18 UTC (permalink / raw)
To: Rahul Lakkireddy, dpdk stable; +Cc: Luca Boccassi
On 27/06/2022 14:39, Rahul Lakkireddy wrote:
> On Friday, June 06/24/22, 2022 at 17:31:08 +0100, Kevin Traynor wrote:
>> Hi commit authors (and maintainers),
>>
>> Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
>> I didn't apply following commits from DPDK main to 21.11
>> stable branch, as conflicts or build errors occur.
>>
>> Can authors check your patches in the following list and either:
>> - Backport your patches to the 21.11 branch, or
>> - Indicate that the patch should not be backported
>>
>> Please do either of the above by 07/01/22.
>>
>> You can find the a temporary work-in-progress branch of the coming 21.11.2
>> release at:
>> https://github.com/kevintraynor/dpdk-stable
>> It is recommended to backport on top of that to minimize further conflicts or
>> misunderstandings.
>>
>> Some notes on stable backports:
>>
>> A backport should contain a reference to the DPDK main branch commit
>> in it's commit message in the following fashion:
>> [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
>>
>> For example:
>> https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
>>
>> When sending the backported patch, please indicate the target branch in the
>> subject line, as we have multiple branches, for example:
>> [PATCH 21.11] foo/bar: fix baz
>>
>> With git format-patch, this can be achieved by appending the parameter:
>> --subject-prefix='PATCH 21.11'
>>
>> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
>>
>> FYI, branch 21.11 is located at tree:
>> https://git.dpdk.org/dpdk-stable
>>
>> Thanks.
>>
>> Kevin
>>
>> ---
>> These commits have non-trivial conflicts while applying to 21.11 branch:
>> 4c1a91b21f Arek Kusztal crypto/qat: fix cleanup function default behaviour
>> 5b4d317d83 Arek Kusztal crypto/qat: fix missing copy guards in asym mod
>> d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment
>> a31c9f970d David Marchand net/cnxk: fix crash in IPsec telemetry
>> 6cef22dcfe Harman Kalra net/cnxk: fix PFC class disabling
>> 6f065d1539 Li Zhang vdpa/mlx5: fix maximum number of virtqs
>> b2c5ff1bd9 Nithin Dabilpuram common/cnxk: fix mbox structs to avoid unaligned access
>> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
>> e2819fea94 Nithin Dabilpuram net/cnxk: fix multi-segment extraction in vwqe path
>> 2e668c547f Nithin Dabilpuram net/cnxk: fix roundup size with transport mode
>> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size
>> 694c75e8e3 Rahul Lakkireddy test/crypto: fix build with optimization=1
>
> Please skip this commit. Looks like its dependent commit:
>
> d02c6bfcb99a ("test/crypto: add ESN and antireplay cases")
>
> is not available in DPDK v21.11. It seems to be available from DPDK
> v22.03, instead.
>
will do, thanks for checking.
>> c65e343c14 Stanislaw Kardach ci: enable C++ check for Arm and PPC
>> f75dd6d3b1 Stanislaw Kardach config: fix C++ cross compiler for Arm and PPC
>> 174f2f3512 Sunil Kumar Kori common/cnxk: add PFC support for VF
>> 95af59b7ad Yajun Wu vdpa/mlx5: workaround VAR offset within page
>>
>> These commits apply cleanly to 21.11 branch but cause build errors:
>> aa802b1023 Bruce Richardson dma/idxd: fix AVX2 in non-datapath functions
>> (^ commit causes build error on OBS CentOS7. No need to rework, can take
>> when fix arives on DPDK main)
>>
>> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
>> 485df8847a Chengwen Feng ethdev: clarify null location case in xstats get
>> 45a192b2b4 Stephen Hemminger sched: fix floating point math
>> 87ecdd9e7f Timothy McDaniel event/dlb2: improve enqueue efficiency
>>
>
> Thanks,
> Rahul
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* RE: please help backporting some patches to stable release 21.11.2
2022-06-24 16:31 please help backporting some patches to stable release 21.11.2 Kevin Traynor
2022-06-27 9:15 ` Stanisław Kardach
2022-06-27 13:39 ` Rahul Lakkireddy
@ 2022-06-27 21:15 ` McDaniel, Timothy
2022-06-28 14:13 ` Kevin Traynor
2022-06-28 14:20 ` Kevin Traynor
` (3 subsequent siblings)
6 siblings, 1 reply; 22+ messages in thread
From: McDaniel, Timothy @ 2022-06-27 21:15 UTC (permalink / raw)
To: dpdk stable
Cc: Andrew Rybchenko, Anoob Joseph, Kusztal, ArkadiuszX, Richardson,
Bruce, Chaoyong He, Chengwen Feng, Walsh, Conor,
Dariusz Sosnowski, David Marchand, Gao, DaxueX, Zhang, Roy Fan,
Harman Kalra, Singh, Jasvinder, Jerin Jacob, Li Zhang,
Louis Peens, Matan Azrad, Maxime Coquelin, Morten Brørup,
Niklas Söderlund, Nithin Dabilpuram, Pavan Nikhilesh,
Peng Zhang, Rahul Lakkireddy, Stanislaw Kardach,
Stephen Hemminger, Sunil Kumar Kori, Viacheslav Ovsiienko,
Walter Heymans, Yajun Wu, Luca Boccassi
Hi Kevin,
I'd be happy to help, but I'm not sure what the ask is here?
Do I port the patch back to 21.11.2 and send it to you directly, or does it go to patchwork?
Thanks
Tim
> -----Original Message-----
> From: Kevin Traynor <ktraynor@redhat.com>
> Sent: Friday, June 24, 2022 11:31 AM
> To: dpdk stable <stable@dpdk.org>
> Cc: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>; Anoob Joseph
> <anoobj@marvell.com>; Kusztal, ArkadiuszX <arkadiuszx.kusztal@intel.com>;
> Richardson, Bruce <bruce.richardson@intel.com>; Chaoyong He
> <chaoyong.he@corigine.com>; Chengwen Feng
> <fengchengwen@huawei.com>; Walsh, Conor <conor.walsh@intel.com>;
> Dariusz Sosnowski <dsosnowski@nvidia.com>; David Marchand
> <david.marchand@redhat.com>; Gao, DaxueX <daxuex.gao@intel.com>;
> Zhang, Roy Fan <roy.fan.zhang@intel.com>; Harman Kalra
> <hkalra@marvell.com>; Singh, Jasvinder <jasvinder.singh@intel.com>; Jerin
> Jacob <jerinj@marvell.com>; Li Zhang <lizh@nvidia.com>; Louis Peens
> <louis.peens@corigine.com>; Matan Azrad <matan@nvidia.com>; Maxime
> Coquelin <maxime.coquelin@redhat.com>; Morten Brørup
> <mb@smartsharesystems.com>; Niklas Söderlund
> <niklas.soderlund@corigine.com>; Nithin Dabilpuram
> <ndabilpuram@marvell.com>; Pavan Nikhilesh <pbhagavatula@marvell.com>;
> Peng Zhang <peng.zhang@corigine.com>; Rahul Lakkireddy
> <rahul.lakkireddy@chelsio.com>; Stanislaw Kardach <kda@semihalf.com>;
> Stephen Hemminger <stephen@networkplumber.org>; Sunil Kumar Kori
> <skori@marvell.com>; McDaniel, Timothy <timothy.mcdaniel@intel.com>;
> Viacheslav Ovsiienko <viacheslavo@nvidia.com>; Walter Heymans
> <walter.heymans@corigine.com>; Yajun Wu <yajunw@nvidia.com>; Luca
> Boccassi <bluca@debian.org>
> Subject: please help backporting some patches to stable release 21.11.2
>
> Hi commit authors (and maintainers),
>
> Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
> I didn't apply following commits from DPDK main to 21.11
> stable branch, as conflicts or build errors occur.
>
> Can authors check your patches in the following list and either:
> - Backport your patches to the 21.11 branch, or
> - Indicate that the patch should not be backported
>
> Please do either of the above by 07/01/22.
>
> You can find the a temporary work-in-progress branch of the coming 21.11.2
> release at:
> https://github.com/kevintraynor/dpdk-stable
> It is recommended to backport on top of that to minimize further conflicts or
> misunderstandings.
>
> Some notes on stable backports:
>
> A backport should contain a reference to the DPDK main branch commit
> in it's commit message in the following fashion:
> [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
>
> For example:
> https://git.dpdk.org/dpdk-
> stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
>
> When sending the backported patch, please indicate the target branch in the
> subject line, as we have multiple branches, for example:
> [PATCH 21.11] foo/bar: fix baz
>
> With git format-patch, this can be achieved by appending the parameter:
> --subject-prefix='PATCH 21.11'
>
> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
>
> FYI, branch 21.11 is located at tree:
> https://git.dpdk.org/dpdk-stable
>
> Thanks.
>
> Kevin
>
> ---
> These commits have non-trivial conflicts while applying to 21.11 branch:
> 4c1a91b21f Arek Kusztal crypto/qat: fix cleanup function default behaviour
> 5b4d317d83 Arek Kusztal crypto/qat: fix missing copy guards in asym mod
> d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment
> a31c9f970d David Marchand net/cnxk: fix crash in IPsec telemetry
> 6cef22dcfe Harman Kalra net/cnxk: fix PFC class disabling
> 6f065d1539 Li Zhang vdpa/mlx5: fix maximum number of virtqs
> b2c5ff1bd9 Nithin Dabilpuram common/cnxk: fix mbox structs to avoid
> unaligned access
> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
> e2819fea94 Nithin Dabilpuram net/cnxk: fix multi-segment extraction in vwqe
> path
> 2e668c547f Nithin Dabilpuram net/cnxk: fix roundup size with transport mode
> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf
> size
> 694c75e8e3 Rahul Lakkireddy test/crypto: fix build with optimization=1
> c65e343c14 Stanislaw Kardach ci: enable C++ check for Arm and PPC
> f75dd6d3b1 Stanislaw Kardach config: fix C++ cross compiler for Arm and PPC
> 174f2f3512 Sunil Kumar Kori common/cnxk: add PFC support for VF
> 95af59b7ad Yajun Wu vdpa/mlx5: workaround VAR offset within page
>
> These commits apply cleanly to 21.11 branch but cause build errors:
> aa802b1023 Bruce Richardson dma/idxd: fix AVX2 in non-datapath functions
> (^ commit causes build error on OBS CentOS7. No need to rework, can take
> when fix arives on DPDK main)
>
> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
> 485df8847a Chengwen Feng ethdev: clarify null location case in xstats get
> 45a192b2b4 Stephen Hemminger sched: fix floating point math
> 87ecdd9e7f Timothy McDaniel event/dlb2: improve enqueue efficiency
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: please help backporting some patches to stable release 21.11.2
2022-06-27 21:15 ` McDaniel, Timothy
@ 2022-06-28 14:13 ` Kevin Traynor
0 siblings, 0 replies; 22+ messages in thread
From: Kevin Traynor @ 2022-06-28 14:13 UTC (permalink / raw)
To: McDaniel, Timothy, dpdk stable; +Cc: Luca Boccassi
Hi Tim,
On 27/06/2022 22:15, McDaniel, Timothy wrote:
> Hi Kevin,
>
> I'd be happy to help, but I'm not sure what the ask is here?
>
First thing is to decide whether the fix is relevant to 21.11 branch. It
may have been that the wrong Fixes: tag was used, or part of the fix
relies on some code not in 21.11 that means it's not feasible to backport.
You can then rebase to 21.11 branch, and check the build. The 21.11 repo
is here https://git.dpdk.org/dpdk-stable/log/?h=21.11
However, it can be wiser to rebase to the staging post as there is often
additional commits there that are in the process of being pushed to
dpdk.org. https://github.com/kevintraynor/dpdk-stable.git
> Do I port the patch back to 21.11.2 and send it to you directly, or does it go to patchwork?
>
You can send to stable@dpdk.org with [PATCH 21.11] in the subject. See
below for details. No harm to Cc: me and bluca@debian.org , just to make
sure we catch it.
thanks,
Kevin.
> Thanks
> Tim
>
>> -----Original Message-----
>> From: Kevin Traynor <ktraynor@redhat.com>
>> Sent: Friday, June 24, 2022 11:31 AM
>> To: dpdk stable <stable@dpdk.org>
>> Cc: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>; Anoob Joseph
>> <anoobj@marvell.com>; Kusztal, ArkadiuszX <arkadiuszx.kusztal@intel.com>;
>> Richardson, Bruce <bruce.richardson@intel.com>; Chaoyong He
>> <chaoyong.he@corigine.com>; Chengwen Feng
>> <fengchengwen@huawei.com>; Walsh, Conor <conor.walsh@intel.com>;
>> Dariusz Sosnowski <dsosnowski@nvidia.com>; David Marchand
>> <david.marchand@redhat.com>; Gao, DaxueX <daxuex.gao@intel.com>;
>> Zhang, Roy Fan <roy.fan.zhang@intel.com>; Harman Kalra
>> <hkalra@marvell.com>; Singh, Jasvinder <jasvinder.singh@intel.com>; Jerin
>> Jacob <jerinj@marvell.com>; Li Zhang <lizh@nvidia.com>; Louis Peens
>> <louis.peens@corigine.com>; Matan Azrad <matan@nvidia.com>; Maxime
>> Coquelin <maxime.coquelin@redhat.com>; Morten Brørup
>> <mb@smartsharesystems.com>; Niklas Söderlund
>> <niklas.soderlund@corigine.com>; Nithin Dabilpuram
>> <ndabilpuram@marvell.com>; Pavan Nikhilesh <pbhagavatula@marvell.com>;
>> Peng Zhang <peng.zhang@corigine.com>; Rahul Lakkireddy
>> <rahul.lakkireddy@chelsio.com>; Stanislaw Kardach <kda@semihalf.com>;
>> Stephen Hemminger <stephen@networkplumber.org>; Sunil Kumar Kori
>> <skori@marvell.com>; McDaniel, Timothy <timothy.mcdaniel@intel.com>;
>> Viacheslav Ovsiienko <viacheslavo@nvidia.com>; Walter Heymans
>> <walter.heymans@corigine.com>; Yajun Wu <yajunw@nvidia.com>; Luca
>> Boccassi <bluca@debian.org>
>> Subject: please help backporting some patches to stable release 21.11.2
>>
>> Hi commit authors (and maintainers),
>>
>> Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
>> I didn't apply following commits from DPDK main to 21.11
>> stable branch, as conflicts or build errors occur.
>>
>> Can authors check your patches in the following list and either:
>> - Backport your patches to the 21.11 branch, or
>> - Indicate that the patch should not be backported
>>
>> Please do either of the above by 07/01/22.
>>
>> You can find the a temporary work-in-progress branch of the coming 21.11.2
>> release at:
>> https://github.com/kevintraynor/dpdk-stable
>> It is recommended to backport on top of that to minimize further conflicts or
>> misunderstandings.
>>
>> Some notes on stable backports:
>>
>> A backport should contain a reference to the DPDK main branch commit
>> in it's commit message in the following fashion:
>> [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
>>
>> For example:
>> https://git.dpdk.org/dpdk-
>> stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
>>
>> When sending the backported patch, please indicate the target branch in the
>> subject line, as we have multiple branches, for example:
>> [PATCH 21.11] foo/bar: fix baz
>>
>> With git format-patch, this can be achieved by appending the parameter:
>> --subject-prefix='PATCH 21.11'
>>
>> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
>>
>> FYI, branch 21.11 is located at tree:
>> https://git.dpdk.org/dpdk-stable
>>
>> Thanks.
>>
>> Kevin
>>
>> ---
>> These commits have non-trivial conflicts while applying to 21.11 branch:
>> 4c1a91b21f Arek Kusztal crypto/qat: fix cleanup function default behaviour
>> 5b4d317d83 Arek Kusztal crypto/qat: fix missing copy guards in asym mod
>> d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment
>> a31c9f970d David Marchand net/cnxk: fix crash in IPsec telemetry
>> 6cef22dcfe Harman Kalra net/cnxk: fix PFC class disabling
>> 6f065d1539 Li Zhang vdpa/mlx5: fix maximum number of virtqs
>> b2c5ff1bd9 Nithin Dabilpuram common/cnxk: fix mbox structs to avoid
>> unaligned access
>> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
>> e2819fea94 Nithin Dabilpuram net/cnxk: fix multi-segment extraction in vwqe
>> path
>> 2e668c547f Nithin Dabilpuram net/cnxk: fix roundup size with transport mode
>> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf
>> size
>> 694c75e8e3 Rahul Lakkireddy test/crypto: fix build with optimization=1
>> c65e343c14 Stanislaw Kardach ci: enable C++ check for Arm and PPC
>> f75dd6d3b1 Stanislaw Kardach config: fix C++ cross compiler for Arm and PPC
>> 174f2f3512 Sunil Kumar Kori common/cnxk: add PFC support for VF
>> 95af59b7ad Yajun Wu vdpa/mlx5: workaround VAR offset within page
>>
>> These commits apply cleanly to 21.11 branch but cause build errors:
>> aa802b1023 Bruce Richardson dma/idxd: fix AVX2 in non-datapath functions
>> (^ commit causes build error on OBS CentOS7. No need to rework, can take
>> when fix arives on DPDK main)
>>
>> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
>> 485df8847a Chengwen Feng ethdev: clarify null location case in xstats get
>> 45a192b2b4 Stephen Hemminger sched: fix floating point math
>> 87ecdd9e7f Timothy McDaniel event/dlb2: improve enqueue efficiency
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: please help backporting some patches to stable release 21.11.2
2022-06-24 16:31 please help backporting some patches to stable release 21.11.2 Kevin Traynor
` (2 preceding siblings ...)
2022-06-27 21:15 ` McDaniel, Timothy
@ 2022-06-28 14:20 ` Kevin Traynor
2022-06-29 10:24 ` Niklas Söderlund
` (2 subsequent siblings)
6 siblings, 0 replies; 22+ messages in thread
From: Kevin Traynor @ 2022-06-28 14:20 UTC (permalink / raw)
To: dpdk stable
Cc: Andrew Rybchenko, Dariusz Sosnowski, Viacheslav Ovsiienko, Luca Boccassi
On 24/06/2022 17:31, Kevin Traynor wrote:
> Hi commit authors (and maintainers),
>
> Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
> I didn't apply following commits from DPDK main to 21.11
> stable branch, as conflicts or build errors occur.
>
> Can authors check your patches in the following list and either:
> - Backport your patches to the 21.11 branch, or
> - Indicate that the patch should not be backported
>
> Please do either of the above by 07/01/22.
>
> You can find the a temporary work-in-progress branch of the coming 21.11.2
> release at:
> https://github.com/kevintraynor/dpdk-stable
> It is recommended to backport on top of that to minimize further conflicts or
> misunderstandings.
>
> Some notes on stable backports:
>
> A backport should contain a reference to the DPDK main branch commit
> in it's commit message in the following fashion:
> [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
>
> For example:
> https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
>
> When sending the backported patch, please indicate the target branch in the
> subject line, as we have multiple branches, for example:
> [PATCH 21.11] foo/bar: fix baz
>
> With git format-patch, this can be achieved by appending the parameter:
> --subject-prefix='PATCH 21.11'
>
> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
>
> FYI, branch 21.11 is located at tree:
> https://git.dpdk.org/dpdk-stable
>
> Thanks.
>
> Kevin
>
> ---
> These commits have non-trivial conflicts while applying to 21.11 branch:
> 4c1a91b21f Arek Kusztal crypto/qat: fix cleanup function default behaviour
> 5b4d317d83 Arek Kusztal crypto/qat: fix missing copy guards in asym mod
> d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment
Correction, I rebased this one ^. No action is needed, thanks.
> a31c9f970d David Marchand net/cnxk: fix crash in IPsec telemetry
> 6cef22dcfe Harman Kalra net/cnxk: fix PFC class disabling
> 6f065d1539 Li Zhang vdpa/mlx5: fix maximum number of virtqs
> b2c5ff1bd9 Nithin Dabilpuram common/cnxk: fix mbox structs to avoid unaligned access
> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
> e2819fea94 Nithin Dabilpuram net/cnxk: fix multi-segment extraction in vwqe path
> 2e668c547f Nithin Dabilpuram net/cnxk: fix roundup size with transport mode
> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size
> 694c75e8e3 Rahul Lakkireddy test/crypto: fix build with optimization=1
> c65e343c14 Stanislaw Kardach ci: enable C++ check for Arm and PPC
> f75dd6d3b1 Stanislaw Kardach config: fix C++ cross compiler for Arm and PPC
> 174f2f3512 Sunil Kumar Kori common/cnxk: add PFC support for VF
> 95af59b7ad Yajun Wu vdpa/mlx5: workaround VAR offset within page
>
> These commits apply cleanly to 21.11 branch but cause build errors:
> aa802b1023 Bruce Richardson dma/idxd: fix AVX2 in non-datapath functions
> (^ commit causes build error on OBS CentOS7. No need to rework, can take
> when fix arives on DPDK main)
>
> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
> 485df8847a Chengwen Feng ethdev: clarify null location case in xstats get
> 45a192b2b4 Stephen Hemminger sched: fix floating point math
> 87ecdd9e7f Timothy McDaniel event/dlb2: improve enqueue efficiency
>
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: please help backporting some patches to stable release 21.11.2
2022-06-24 16:31 please help backporting some patches to stable release 21.11.2 Kevin Traynor
` (3 preceding siblings ...)
2022-06-28 14:20 ` Kevin Traynor
@ 2022-06-29 10:24 ` Niklas Söderlund
2022-07-01 16:06 ` Kevin Traynor
2022-07-06 20:40 ` luca.boccassi
2022-08-01 13:31 ` McDaniel, Timothy
6 siblings, 1 reply; 22+ messages in thread
From: Niklas Söderlund @ 2022-06-29 10:24 UTC (permalink / raw)
To: Kevin Traynor, dpdk stable
Cc: Andrew Rybchenko, Anoob Joseph, Arek Kusztal, Bruce Richardson,
Chaoyong He, Chengwen Feng, Conor Walsh, Dariusz Sosnowski,
David Marchand, Daxue Gao, Fan Zhang, Harman Kalra,
Jasvinder Singh, Jerin Jacob, Li Zhang, Louis Peens, Matan Azrad,
Maxime Coquelin, Morten Brørup, Nithin Dabilpuram,
Pavan Nikhilesh, Peng Zhang, Rahul Lakkireddy, Stanislaw Kardach,
Stephen Hemminger, Sunil Kumar Kori, Timothy McDaniel,
Viacheslav Ovsiienko, Walter Heymans, Yajun Wu, Luca Boccassi
Hi Kevin,
Thanks for your work!
On 2022-06-24 17:31:08 +0100, Kevin Traynor wrote:
> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size
I see this patch already in the 21.11 branch as
commit 1c770fda6f6f3862 ("net/nfp: make sure MTU is never larger than mbuf size")
Is this patch picked up twice by the tooling since it had special care
in [1]? Or is it some action I need to take here that I'm missing?
1. http://mails.dpdk.org/archives/stable/2022-June/039130.html
--
Kind Regards,
Niklas Söderlund
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: please help backporting some patches to stable release 21.11.2
2022-06-29 10:24 ` Niklas Söderlund
@ 2022-07-01 16:06 ` Kevin Traynor
0 siblings, 0 replies; 22+ messages in thread
From: Kevin Traynor @ 2022-07-01 16:06 UTC (permalink / raw)
To: Niklas Söderlund; +Cc: dpdk stable, Luca Boccassi
On Wed, Jun 29, 2022 at 11:24 AM Niklas Söderlund
<niklas.soderlund@corigine.com> wrote:
>
> Hi Kevin,
>
> Thanks for your work!
>
> On 2022-06-24 17:31:08 +0100, Kevin Traynor wrote:
> > 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size
>
> I see this patch already in the 21.11 branch as
>
> commit 1c770fda6f6f3862 ("net/nfp: make sure MTU is never larger than mbuf size")
>
> Is this patch picked up twice by the tooling since it had special care
> in [1]? Or is it some action I need to take here that I'm missing?
>
Hi Niklas. No action needed, it was just my mistake to not remove this
from this failed-to-apply list when I backported the 3 nfp commits. As
you say, it is now pushed to the 21.11 branch as part of the nfp
trilogy :-)
thanks,
Kevin.
bf7aa26ddd net/nfp: fix initialization
1c770fda6f net/nfp: make sure MTU is never larger than mbuf size
fe2cddeb08 net/nfp: update how max MTU is read
>
> 1. http://mails.dpdk.org/archives/stable/2022-June/039130.html
>
> --
> Kind Regards,
> Niklas Söderlund
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* please help backporting some patches to stable release 21.11.2
2022-06-24 16:31 please help backporting some patches to stable release 21.11.2 Kevin Traynor
` (4 preceding siblings ...)
2022-06-29 10:24 ` Niklas Söderlund
@ 2022-07-06 20:40 ` luca.boccassi
2022-08-01 13:31 ` McDaniel, Timothy
6 siblings, 0 replies; 22+ messages in thread
From: luca.boccassi @ 2022-07-06 20:40 UTC (permalink / raw)
To: dpdk stable
Cc: Changchun Ouyang, Chenbo Xia, Huawei Xie, Maxime Coquelin,
Wei Ling, Yuan Wang
Hi commit authors (and maintainers),
Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
I didn't apply following commits from DPDK main to 21.11
stable branch, as conflicts or build errors occur.
Can authors check your patches in the following list and either:
- Backport your patches to the 21.11 branch, or
- Indicate that the patch should not be backported
Please do either of the above by July the 8th.
You can find the a temporary work-in-progress branch of the coming 21.11.2
release at:
https://github.com/kevintraynor/dpdk-stable
It is recommended to backport on top of that to minimize further conflicts or
misunderstandings.
Some notes on stable backports:
A backport should contain a reference to the DPDK main branch commit
in it's commit message in the following fashion:
[ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
For example:
https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
When sending the backported patch, please indicate the target branch in the
subject line, as we have multiple branches, for example:
[PATCH 21.11] foo/bar: fix baz
With git format-patch, this can be achieved by appending the parameter:
--subject-prefix='PATCH 21.11'
Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
FYI, branch 21.11 is located at tree:
https://git.dpdk.org/dpdk-stable
Thanks.
Luca Boccassi
---
1907ce4bae Yuan Wang examples/vhost: fix retry logic on Rx path
^ permalink raw reply [flat|nested] 22+ messages in thread* RE: please help backporting some patches to stable release 21.11.2
2022-06-24 16:31 please help backporting some patches to stable release 21.11.2 Kevin Traynor
` (5 preceding siblings ...)
2022-07-06 20:40 ` luca.boccassi
@ 2022-08-01 13:31 ` McDaniel, Timothy
6 siblings, 0 replies; 22+ messages in thread
From: McDaniel, Timothy @ 2022-08-01 13:31 UTC (permalink / raw)
To: dpdk stable
Cc: Andrew Rybchenko, Anoob Joseph, Kusztal, ArkadiuszX, Richardson,
Bruce, Chaoyong He, Chengwen Feng, Walsh, Conor,
Dariusz Sosnowski, David Marchand, Gao, DaxueX, Zhang, Roy Fan,
Harman Kalra, Singh, Jasvinder, Jerin Jacob, Li Zhang,
Louis Peens, Matan Azrad, Maxime Coquelin, Morten Brørup,
Niklas Söderlund, Nithin Dabilpuram, Pavan Nikhilesh,
Peng Zhang, Rahul Lakkireddy, Stanislaw Kardach,
Stephen Hemminger, Sunil Kumar Kori, Viacheslav Ovsiienko,
Walter Heymans, Yajun Wu, Luca Boccassi
The following commit does not need to be backported.
87ecdd9e7f Timothy McDaniel event/dlb2: improve enqueue efficiency
Thanks,
Tim
^ permalink raw reply [flat|nested] 22+ messages in thread
* RE: please help backporting some patches to stable release 21.11.2
2022-06-21 10:02 Kevin Traynor
@ 2022-06-22 2:57 ` Jiawen Wu
2022-06-22 4:26 ` Gagandeep Singh
` (3 subsequent siblings)
4 siblings, 0 replies; 22+ messages in thread
From: Jiawen Wu @ 2022-06-22 2:57 UTC (permalink / raw)
To: 'dpdk stable', 'Kevin Traynor'
On Tuesday, June 21, 2022 6:02 PM, Kevin Traynor wrote:
> Hi commit authors (and maintainers),
>
> Despite being selected by the DPDK maintenance
> tool ./devtools/git-log-fixes.sh I didn't apply following commits from
DPDK main
> to 21.11 stable branch, as conflicts or build errors occur.
>
> Can authors check your patches in the following list and either:
> - Backport your patches to the 21.11 branch, or
> - Indicate that the patch should not be backported
>
> Please do either of the above by 06/23/22.
>
> You can find the a temporary work-in-progress branch of the coming 21.11.2
> release at:
> https://github.com/kevintraynor/dpdk-stable
> It is recommended to backport on top of that to minimize further conflicts
or
> misunderstandings.
>
> Some notes on stable backports:
>
> A backport should contain a reference to the DPDK main branch commit in
it's
> commit message in the following fashion:
> [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
>
> For example:
>
> https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3
> 811ff9f26aec7f3c06eb
>
> When sending the backported patch, please indicate the target branch in
the
> subject line, as we have multiple branches, for example:
> [PATCH 21.11] foo/bar: fix baz
>
> With git format-patch, this can be achieved by appending the parameter:
> --subject-prefix='PATCH 21.11'
>
> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
>
> FYI, branch 21.11 is located at tree:
> https://git.dpdk.org/dpdk-stable
>
> Thanks.
>
> Kevin
>
> ---
> These commits have non-trivial conflicts while applying to 21.11 branch:
> 708ebe7d03 Jiawen Wu net/ngbe: fix external PHY power down
> 6dcfb19f60 Jiawen Wu net/ngbe: fix reading M88E1512 PHY mode
> 696a821178 Jiawen Wu net/ngbe: redesign internal PHY init flow
Hi Kevin,
There is no need to backport these to 21.11.2.
^ permalink raw reply [flat|nested] 22+ messages in thread* RE: please help backporting some patches to stable release 21.11.2
2022-06-21 10:02 Kevin Traynor
2022-06-22 2:57 ` Jiawen Wu
@ 2022-06-22 4:26 ` Gagandeep Singh
2022-06-23 14:08 ` Kevin Traynor
2022-06-22 4:47 ` Zhou, YidingX
` (2 subsequent siblings)
4 siblings, 1 reply; 22+ messages in thread
From: Gagandeep Singh @ 2022-06-22 4:26 UTC (permalink / raw)
To: dpdk stable
Cc: Ajit Khaparde, Andrew Rybchenko, Chaoyong He, Chengwen Feng,
Dariusz Sosnowski, Jerin Jacob, Jiawen Wu, Kalesh AP,
Louis Peens, Morten Brørup, Niklas Söderlund,
Nithin Dabilpuram, Pavan Nikhilesh, Peng Zhang, Qi Zhang,
Somnath Kotur, Viacheslav Ovsiienko, Walter Heymans, Yiding Zhou
Hi Kevin,
Please skip patch "13ce268103 Gagandeep Singh common/dpaax: remove dead code" from backporting.
Regards,
Gagan
> -----Original Message-----
> From: Kevin Traynor <ktraynor@redhat.com>
> Sent: Tuesday, June 21, 2022 3:32 PM
> To: dpdk stable <stable@dpdk.org>
> Cc: Ajit Khaparde <ajit.khaparde@broadcom.com>; Andrew Rybchenko
> <andrew.rybchenko@oktetlabs.ru>; Chaoyong He
> <chaoyong.he@corigine.com>; Chengwen Feng <fengchengwen@huawei.com>;
> Dariusz Sosnowski <dsosnowski@nvidia.com>; Gagandeep Singh
> <G.Singh@nxp.com>; Jerin Jacob <jerinj@marvell.com>; Jiawen Wu
> <jiawenwu@trustnetic.com>; Kalesh AP <kalesh-
> anakkur.purayil@broadcom.com>; Louis Peens <louis.peens@corigine.com>;
> Morten Brørup <mb@smartsharesystems.com>; Niklas Söderlund
> <niklas.soderlund@corigine.com>; Nithin Dabilpuram
> <ndabilpuram@marvell.com>; Pavan Nikhilesh <pbhagavatula@marvell.com>;
> Peng Zhang <peng.zhang@corigine.com>; Qi Zhang <qi.z.zhang@intel.com>;
> Somnath Kotur <somnath.kotur@broadcom.com>; Viacheslav Ovsiienko
> <viacheslavo@nvidia.com>; Walter Heymans <walter.heymans@corigine.com>;
> Yiding Zhou <yidingx.zhou@intel.com>
> Subject: please help backporting some patches to stable release 21.11.2
>
> Hi commit authors (and maintainers),
>
> Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
> I didn't apply following commits from DPDK main to 21.11 stable branch, as
> conflicts or build errors occur.
>
> Can authors check your patches in the following list and either:
> - Backport your patches to the 21.11 branch, or
> - Indicate that the patch should not be backported
>
> Please do either of the above by 06/23/22.
>
> You can find the a temporary work-in-progress branch of the coming 21.11.2
> release at:
>
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.co
> m%2Fkevintraynor%2Fdpdk-
> stable&data=05%7C01%7Cg.singh%40nxp.com%7Cdec326eb24504b126b1
> 108da536d2f23%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63791
> 4025688667641%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQ
> IjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sd
> ata=PVn61hm46cv7e0A3N2ZT1XnwnoYvAufCq0vqpwkBDMk%3D&reserved
> =0
> It is recommended to backport on top of that to minimize further conflicts or
> misunderstandings.
>
> Some notes on stable backports:
>
> A backport should contain a reference to the DPDK main branch commit in it's
> commit message in the following fashion:
> [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
>
> For example:
>
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.dpdk.
> org%2Fdpdk-
> stable%2Fcommit%2F%3Fh%3D18.11%26id%3Dd90e6ae6f936ecdc2fd3811ff9f2
> 6aec7f3c06eb&data=05%7C01%7Cg.singh%40nxp.com%7Cdec326eb24504
> b126b1108da536d2f23%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7
> C637914025688667641%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwM
> DAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C
> &sdata=v6naGPkpVuZCHIxHSPADMFWbY%2FCy9p7q08VkqbcaXTM%3D&a
> mp;reserved=0
>
> When sending the backported patch, please indicate the target branch in the
> subject line, as we have multiple branches, for example:
> [PATCH 21.11] foo/bar: fix baz
>
> With git format-patch, this can be achieved by appending the parameter:
> --subject-prefix='PATCH 21.11'
>
> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
>
> FYI, branch 21.11 is located at tree:
>
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.dpdk.
> org%2Fdpdk-
> stable&data=05%7C01%7Cg.singh%40nxp.com%7Cdec326eb24504b126b1
> 108da536d2f23%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63791
> 4025688667641%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQ
> IjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sd
> ata=SoqOVS3dIRZ9iePy5FRjr%2BDhCg3%2BfSjbekn81ADCLbI%3D&reserved
> =0
>
> Thanks.
>
> Kevin
>
> ---
> These commits have non-trivial conflicts while applying to 21.11 branch:
> d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment
> 13ce268103 Gagandeep Singh common/dpaax: remove dead code
> 708ebe7d03 Jiawen Wu net/ngbe: fix external PHY power down
> 6dcfb19f60 Jiawen Wu net/ngbe: fix reading M88E1512 PHY mode
> 696a821178 Jiawen Wu net/ngbe: redesign internal PHY init flow
> e2819fea94 Nithin Dabilpuram net/cnxk: fix multi-segment extraction in vwqe
> path 2e668c547f Nithin Dabilpuram net/cnxk: fix roundup size with transport
> mode
> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf
> size
>
> These commits apply cleanly to 21.11 branch but cause build errors:
> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
> c0278f6e52 Kalesh AP net/bnxt: fix tunnel stateless offloads
> 485df8847a Chengwen Feng ethdev: clarify null location case in xstats get
> 676d986b4b Yiding Zhou net/iavf: fix crash after VF reset failure
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: please help backporting some patches to stable release 21.11.2
2022-06-22 4:26 ` Gagandeep Singh
@ 2022-06-23 14:08 ` Kevin Traynor
0 siblings, 0 replies; 22+ messages in thread
From: Kevin Traynor @ 2022-06-23 14:08 UTC (permalink / raw)
To: Gagandeep Singh, dpdk stable
On 22/06/2022 05:26, Gagandeep Singh wrote:
> Hi Kevin,
>
> Please skip patch "13ce268103 Gagandeep Singh common/dpaax: remove dead code" from backporting.
>
> Regards,
> Gagan
Hi Gagan, sure thanks. I figured it wasn't important but just wanted to
give you the chance to reply. I will drop from list. Kevin.
^ permalink raw reply [flat|nested] 22+ messages in thread
* RE: please help backporting some patches to stable release 21.11.2
2022-06-21 10:02 Kevin Traynor
2022-06-22 2:57 ` Jiawen Wu
2022-06-22 4:26 ` Gagandeep Singh
@ 2022-06-22 4:47 ` Zhou, YidingX
2022-06-22 8:40 ` Kalesh Anakkur Purayil
2022-06-22 10:48 ` Niklas Söderlund
[not found] ` <62b2851c.1c69fb81.cf480.7398SMTPIN_ADDED_BROKEN@mx.google.com>
4 siblings, 1 reply; 22+ messages in thread
From: Zhou, YidingX @ 2022-06-22 4:47 UTC (permalink / raw)
To: dpdk stable
Cc: Ajit Khaparde, Andrew Rybchenko, Chaoyong He, Chengwen Feng,
Dariusz Sosnowski, Gagandeep Singh, Jerin Jacob, Jiawen Wu,
Kalesh AP, Louis Peens, Morten Brørup,
Niklas Söderlund, Nithin Dabilpuram, Pavan Nikhilesh,
Peng Zhang, Zhang, Qi Z, Somnath Kotur, Viacheslav Ovsiienko,
Walter Heymans
> -----Original Message-----
> 676d986b4b Yiding Zhou net/iavf: fix crash after VF reset failure
Hi, Kevin
I have backported this upstream commit and sent the patch to stable@dpdk.org.
/Yiding
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: please help backporting some patches to stable release 21.11.2
2022-06-22 4:47 ` Zhou, YidingX
@ 2022-06-22 8:40 ` Kalesh Anakkur Purayil
0 siblings, 0 replies; 22+ messages in thread
From: Kalesh Anakkur Purayil @ 2022-06-22 8:40 UTC (permalink / raw)
To: Zhou, YidingX
Cc: dpdk stable, Ajit Khaparde, Andrew Rybchenko, Chaoyong He,
Chengwen Feng, Dariusz Sosnowski, Gagandeep Singh, Jerin Jacob,
Jiawen Wu, Louis Peens, Morten Brørup,
Niklas Söderlund, Nithin Dabilpuram, Pavan Nikhilesh,
Peng Zhang, Zhang, Qi Z, Somnath Kotur, Viacheslav Ovsiienko,
Walter Heymans
[-- Attachment #1.1: Type: text/plain, Size: 537 bytes --]
Hi Kevin,
c0278f6e52 Kalesh AP net/bnxt: fix tunnel stateless offloads
I have backported the above upstream commit with the build failure fixed
and sent it to the ML. Please apply.
Regards,
Kalesh
On Wed, Jun 22, 2022 at 10:18 AM Zhou, YidingX <yidingx.zhou@intel.com>
wrote:
>
> > -----Original Message-----
> > 676d986b4b Yiding Zhou net/iavf: fix crash after VF reset failure
>
> Hi, Kevin
>
> I have backported this upstream commit and sent the patch to
> stable@dpdk.org.
>
> /Yiding
>
>
--
Regards,
Kalesh A P
[-- Attachment #1.2: Type: text/html, Size: 1113 bytes --]
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4239 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: please help backporting some patches to stable release 21.11.2
2022-06-21 10:02 Kevin Traynor
` (2 preceding siblings ...)
2022-06-22 4:47 ` Zhou, YidingX
@ 2022-06-22 10:48 ` Niklas Söderlund
2022-06-24 14:17 ` Kevin Traynor
[not found] ` <62b2851c.1c69fb81.cf480.7398SMTPIN_ADDED_BROKEN@mx.google.com>
4 siblings, 1 reply; 22+ messages in thread
From: Niklas Söderlund @ 2022-06-22 10:48 UTC (permalink / raw)
To: dpdk stable, Kevin Traynor
Cc: Ajit Khaparde, Andrew Rybchenko, Chaoyong He, Chengwen Feng,
Dariusz Sosnowski, Gagandeep Singh, Jerin Jacob, Jiawen Wu,
Kalesh AP, Louis Peens, Morten Brørup, Nithin Dabilpuram,
Pavan Nikhilesh, Peng Zhang, Qi Zhang, Somnath Kotur,
Viacheslav Ovsiienko, Walter Heymans, Yiding Zhou
Hi Kevin,
Thanks for your backporting efforts.
On 2022-06-21 11:02:23 +0100, Kevin Traynor wrote:
> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size
This patch was submitted [1] with a 'Depends-on' on tag, on patch [2]
that is now upstream as,
commit 733afb244d304839 ("net/nfp: update how max MTU is read")
We have verified that the commits cherry-picked in order to the backport
branch applies as-is. Unfortunately we have a fix in dpdk-next-net for
the fix (with a Fixes tag) that needs to be considered.
commit f1619c874873a21d ("net/nfp: fix configure by providing initial flbufsz")
In summary for this backport the following upstream commits needs to be
backported (all or none), in order:
commit 733afb244d304839 ("net/nfp: update how max MTU is read")
commit 417be15e5f1117c3 ("net/nfp: make sure MTU is never larger than mbuf size")
from dpdk-next-net:
commit f1619c874873a21d ("net/nfp: fix configure by providing initial flbufsz")
My question is how would you prefer I handle this? Shall I create a
backport patch with all of them squashed, create a backport series with
the patches and send it out, or would you prefer to cherry-pick the
commits yourself, or something else?
I'm sorry for this messy backport.
1. https://patchwork.dpdk.org/project/dpdk/patch/20220511011553.2905582-1-peng.zhang@corigine.com/
2. https://patchwork.dpdk.org/project/dpdk/patch/20220420134638.24010-1-walter.heymans@corigine.com/
--
Kind Regards,
Niklas Söderlund
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: please help backporting some patches to stable release 21.11.2
2022-06-22 10:48 ` Niklas Söderlund
@ 2022-06-24 14:17 ` Kevin Traynor
0 siblings, 0 replies; 22+ messages in thread
From: Kevin Traynor @ 2022-06-24 14:17 UTC (permalink / raw)
To: Niklas Söderlund; +Cc: dpdk stable, peng.zhang
Hi Niklas,
On 22/06/2022 11:48, Niklas Söderlund wrote:
> Hi Kevin,
>
> Thanks for your backporting efforts.
>
> On 2022-06-21 11:02:23 +0100, Kevin Traynor wrote:
>> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size
>
> This patch was submitted [1] with a 'Depends-on' on tag, on patch [2]
> that is now upstream as,
>
> commit 733afb244d304839 ("net/nfp: update how max MTU is read")
>
> We have verified that the commits cherry-picked in order to the backport
> branch applies as-is. Unfortunately we have a fix in dpdk-next-net for
> the fix (with a Fixes tag) that needs to be considered.
>
> commit f1619c874873a21d ("net/nfp: fix configure by providing initial flbufsz")
>
> In summary for this backport the following upstream commits needs to be
> backported (all or none), in order:
>
> commit 733afb244d304839 ("net/nfp: update how max MTU is read")
> commit 417be15e5f1117c3 ("net/nfp: make sure MTU is never larger than mbuf size")
> from dpdk-next-net:
Adding the updated commit details in case we are trying to remember what
we did in the future:
> commit f1619c874873a21d ("net/nfp: fix configure by providing initial flbufsz")
This commit ^ merged in dpdk main branch as:
commit 5c305e218f15552d828e10293d19d9a06c4747f4
Author: Peng Zhang <peng.zhang@corigine.com>
Date: Wed Jun 15 12:14:17 2022 +0200
net/nfp: fix initialization
>
> My question is how would you prefer I handle this? Shall I create a
> backport patch with all of them squashed, create a backport series with
> the patches and send it out, or would you prefer to cherry-pick the
> commits yourself, or something else?
>
> I'm sorry for this messy backport.
>
No problems, thanks for the detailed explanation. I've queued all three
patches in that order on my 21.11 branch [0]. I will push to the
dpdk.org 21.11 branch with the next batch of backports in the coming days.
thanks,
Kevin.
[0]
fe2cddeb08 net/nfp: update how max MTU is read
1c770fda6f net/nfp: make sure MTU is never larger than mbuf size
bf7aa26ddd net/nfp: fix initialization
> 1. https://patchwork.dpdk.org/project/dpdk/patch/20220511011553.2905582-1-peng.zhang@corigine.com/
> 2. https://patchwork.dpdk.org/project/dpdk/patch/20220420134638.24010-1-walter.heymans@corigine.com/
>
^ permalink raw reply [flat|nested] 22+ messages in thread
[parent not found: <62b2851c.1c69fb81.cf480.7398SMTPIN_ADDED_BROKEN@mx.google.com>]