Re: please help backporting some patches to stable release 19.11.12 - part II

Re: please help backporting some patches to stable release 19.11.12 - part II

[Josh Soref]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

Christian Ehrhardt 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 19.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 19.11 branch, or
    - Indicate that the patch should not be backported


My spelling work can be safely skipped.

Please do either of the above by 03/11/22.
>

[-- Attachment #2: Type: text/html, Size: 975 bytes --]

Re: please help backporting some patches to stable release 19.11.12 - part II

[Kalesh Anakkur Purayil]

[-- Attachment #1.1: Type: text/plain, Size: 5629 bytes --]

Hi Christian,

Below is the status of bnxt PMD fixes:

8496483099  Ajit Khaparde    net/bnxt: fix VF resource allocation strategy
[Kalesh]: Above one is not needed in 19.11 and you can ignore this.

604a6be6b6  Kalesh AP        net/bnxt: cap maximum number of unicast MAC
addresses
6c63f3495e  Kalesh AP        net/bnxt: fix handling of VF configuration
change
5b8b248c96  Kalesh AP        net/bnxt: fix memzone allocation per VNIC
4dc9409e01  Kalesh AP        net/bnxt: fix multicast address set
3e6fae2b65  Kalesh AP        net/bnxt: fix queue stop operation
bc9b2c20d2  Kalesh AP        net/bnxt: get maximum supported multicast
filters count
9b4353bec3  Kalesh AP        net/bnxt: restore RSS configuration after
reset recovery
8dcee14fbf  Lance Richardson net/bnxt: fix xstats names query overrun
[Kalesh]: I just sent backported patches of above 8 fixes to the ML.

Regards,
Kalesh

On Fri, Feb 25, 2022 at 10:45 PM <christian.ehrhardt@canonical.com> 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 19.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 19.11 branch, or
>     - Indicate that the patch should not be backported
>
> Please do either of the above by 03/11/22.
>
> You can find the a temporary work-in-progress branch of the coming 19.11.12
> release at:
>     https://github.com/cpaelzer/dpdk-stable-queue
> 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 19.11] foo/bar: fix baz
>
> With git format-patch, this can be achieved by appending the parameter:
>     --subject-prefix='PATCH 19.11'
>
> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
>
> FYI, branch 19.11 is located at tree:
>    https://git.dpdk.org/dpdk-stable
>
> Thanks.
>
> Christian Ehrhardt <christian.ehrhardt@canonical.com>
>
> ---
> 8496483099  Ajit Khaparde    net/bnxt: fix VF resource allocation strategy
> eb11edd9db  Alexander Kozyrev net/mlx5: fix meter capabilities reporting
> 97ed4cb6fb  Andrzej Ostruszka ring: optimize corner case for
> enqueue/dequeue
> ecb904cc45  Bruce Richardson build: fix warnings when running external
> commands
> e16b972b1a  Bruce Richardson build: remove deprecated Meson functions
> fee17a1d29  Bruce Richardson doc: remove dependency on findutils on FreeBSD
> 59144f6edd  Bruce Richardson eal: fix C++ include
> 153e7d8813  Bruce Richardson eventdev: fix C++ include
> 57b156540f  Chengchang Tang  net/bonding: fix offloading configuration
> 285f63fc6b  Dapeng Yu        net/ice: track DCF state of PF
> 864678e420  Dariusz Sosnowski net/mlx5: fix inline length for
> multi-segment TSO
> 985b479267  Gregory Etelson  net/mlx5: fix GRE protocol type translation
> for Verbs
> edca47a1d9  Harold Huang     net/virtio-user: fix resource leak on probing
> failure
> 15174c40b7  Heinrich Kuhn    net/nfp: free HW ring memzone on queue release
> 99cc26f665  Hemant Agrawal   crypto/dpaax_sec: fix auth/cipher xform chain
> checks
> 6ee07e3cb5  Huisong Li       net/hns3: fix insecure way to query MAC
> statistics
> 5a2b22b40f  Huisong Li       net/hns3: fix mailbox wait time
> 7be78d0279  Josh Soref       fix spelling in comments and strings
> 604a6be6b6  Kalesh AP        net/bnxt: cap maximum number of unicast MAC
> addresses
> 6c63f3495e  Kalesh AP        net/bnxt: fix handling of VF configuration
> change
> 5b8b248c96  Kalesh AP        net/bnxt: fix memzone allocation per VNIC
> 4dc9409e01  Kalesh AP        net/bnxt: fix multicast address set
> 3e6fae2b65  Kalesh AP        net/bnxt: fix queue stop operation
> bc9b2c20d2  Kalesh AP        net/bnxt: get maximum supported multicast
> filters count
> 9b4353bec3  Kalesh AP        net/bnxt: restore RSS configuration after
> reset recovery
> 58d212e3bc  Kevin Liu        net/ice: fix Tx checksum offload
> 961fb4029b  Kumara Parameshwaran ethdev: add internal function to device
> struct from name
> c36ce7099c  Kumara Parameshwaran net/tap: fix to populate FDs in secondary
> process
> 8dcee14fbf  Lance Richardson net/bnxt: fix xstats names query overrun
> 9e2cf57e29  Maxime Gouin     net/nfp: remove duplicated check when setting
> MAC address
> 10599cf83e  Michael Baum     common/mlx5: add minimum WQE size for
> striding RQ
> 96c33cfb06  Min Hu (Connor)  net/hns3: fix Rx/Tx functions update
> affa9de474  Qi Zhang         doc: update matching versions in ice guide
> 9cc217a283  Ruifeng Wang     config: add arch define for Arm
> 2654ce5c56  Thomas Monjalon  doc: replace deprecated distutils version
> parsing
> 60e68d170b  Tianfei Zhang    raw/ifpga: fix thread closing
> 90762e5cb8  Vanshika Shukla  net/dpaa2: fix timestamping for IEEE1588
> d192fd321c  Vanshika Shukla  net/dpaa2: fix unregistering interrupt handler
> 5f69ebbd85  Yunjian Wang     mem: check allocation in dynamic hugepage init
> a62f095049  Yuying Zhang     net/ice/base: add profile validation on
> switch filter
>


-- 
Regards,
Kalesh A P

[-- Attachment #1.2: Type: text/html, Size: 7123 bytes --]

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4239 bytes --]

Re: please help backporting some patches to stable release 19.11.12 - part II

[Christian Ehrhardt]

On Fri, Feb 25, 2022 at 6:54 PM Josh Soref <jsoref@gmail.com> wrote:
>
> Christian Ehrhardt 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 19.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 19.11 branch, or
>     - Indicate that the patch should not be backported
>
>
> My spelling work can be safely skipped.

Thank you for the FYI

Maybe to everyone let me explain the reason why we even try :-)
In general those kinds of fixes are not "too important" but if they
can be applied it keeps the amount of extra churn lower later on.
Imagine you touch every string with a commit, afterwards nothing will
apply automatically anymore.
So sometimes backporting those changes even if they feel "not
important" can help.

>> Please do either of the above by 03/11/22.



-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd

Re: please help backporting some patches to stable release 19.11.12 - part II

[Christian Ehrhardt]

On Mon, Mar 7, 2022 at 4:16 PM Kalesh Anakkur Purayil
<kalesh-anakkur.purayil@broadcom.com> wrote:
>
> Hi Christian,
>
> Below is the status of bnxt PMD fixes:
>
> 8496483099  Ajit Khaparde    net/bnxt: fix VF resource allocation strategy
> [Kalesh]: Above one is not needed in 19.11 and you can ignore this.

Thanks for the FYI above and even more thanks for the backports!

> 604a6be6b6  Kalesh AP        net/bnxt: cap maximum number of unicast MAC addresses
> 6c63f3495e  Kalesh AP        net/bnxt: fix handling of VF configuration change
> 5b8b248c96  Kalesh AP        net/bnxt: fix memzone allocation per VNIC
> 4dc9409e01  Kalesh AP        net/bnxt: fix multicast address set
> 3e6fae2b65  Kalesh AP        net/bnxt: fix queue stop operation
> bc9b2c20d2  Kalesh AP        net/bnxt: get maximum supported multicast filters count
> 9b4353bec3  Kalesh AP        net/bnxt: restore RSS configuration after reset recovery
> 8dcee14fbf  Lance Richardson net/bnxt: fix xstats names query overrun
> [Kalesh]: I just sent backported patches of above 8 fixes to the ML.
>
> Regards,
> Kalesh
>
> On Fri, Feb 25, 2022 at 10:45 PM <christian.ehrhardt@canonical.com> 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 19.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 19.11 branch, or
>>     - Indicate that the patch should not be backported
>>
>> Please do either of the above by 03/11/22.
>>
>> You can find the a temporary work-in-progress branch of the coming 19.11.12
>> release at:
>>     https://github.com/cpaelzer/dpdk-stable-queue
>> 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 19.11] foo/bar: fix baz
>>
>> With git format-patch, this can be achieved by appending the parameter:
>>     --subject-prefix='PATCH 19.11'
>>
>> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
>>
>> FYI, branch 19.11 is located at tree:
>>    https://git.dpdk.org/dpdk-stable
>>
>> Thanks.
>>
>> Christian Ehrhardt <christian.ehrhardt@canonical.com>
>>
>> ---
>> 8496483099  Ajit Khaparde    net/bnxt: fix VF resource allocation strategy
>> eb11edd9db  Alexander Kozyrev net/mlx5: fix meter capabilities reporting
>> 97ed4cb6fb  Andrzej Ostruszka ring: optimize corner case for enqueue/dequeue
>> ecb904cc45  Bruce Richardson build: fix warnings when running external commands
>> e16b972b1a  Bruce Richardson build: remove deprecated Meson functions
>> fee17a1d29  Bruce Richardson doc: remove dependency on findutils on FreeBSD
>> 59144f6edd  Bruce Richardson eal: fix C++ include
>> 153e7d8813  Bruce Richardson eventdev: fix C++ include
>> 57b156540f  Chengchang Tang  net/bonding: fix offloading configuration
>> 285f63fc6b  Dapeng Yu        net/ice: track DCF state of PF
>> 864678e420  Dariusz Sosnowski net/mlx5: fix inline length for multi-segment TSO
>> 985b479267  Gregory Etelson  net/mlx5: fix GRE protocol type translation for Verbs
>> edca47a1d9  Harold Huang     net/virtio-user: fix resource leak on probing failure
>> 15174c40b7  Heinrich Kuhn    net/nfp: free HW ring memzone on queue release
>> 99cc26f665  Hemant Agrawal   crypto/dpaax_sec: fix auth/cipher xform chain checks
>> 6ee07e3cb5  Huisong Li       net/hns3: fix insecure way to query MAC statistics
>> 5a2b22b40f  Huisong Li       net/hns3: fix mailbox wait time
>> 7be78d0279  Josh Soref       fix spelling in comments and strings
>> 604a6be6b6  Kalesh AP        net/bnxt: cap maximum number of unicast MAC addresses
>> 6c63f3495e  Kalesh AP        net/bnxt: fix handling of VF configuration change
>> 5b8b248c96  Kalesh AP        net/bnxt: fix memzone allocation per VNIC
>> 4dc9409e01  Kalesh AP        net/bnxt: fix multicast address set
>> 3e6fae2b65  Kalesh AP        net/bnxt: fix queue stop operation
>> bc9b2c20d2  Kalesh AP        net/bnxt: get maximum supported multicast filters count
>> 9b4353bec3  Kalesh AP        net/bnxt: restore RSS configuration after reset recovery
>> 58d212e3bc  Kevin Liu        net/ice: fix Tx checksum offload
>> 961fb4029b  Kumara Parameshwaran ethdev: add internal function to device struct from name
>> c36ce7099c  Kumara Parameshwaran net/tap: fix to populate FDs in secondary process
>> 8dcee14fbf  Lance Richardson net/bnxt: fix xstats names query overrun
>> 9e2cf57e29  Maxime Gouin     net/nfp: remove duplicated check when setting MAC address
>> 10599cf83e  Michael Baum     common/mlx5: add minimum WQE size for striding RQ
>> 96c33cfb06  Min Hu (Connor)  net/hns3: fix Rx/Tx functions update
>> affa9de474  Qi Zhang         doc: update matching versions in ice guide
>> 9cc217a283  Ruifeng Wang     config: add arch define for Arm
>> 2654ce5c56  Thomas Monjalon  doc: replace deprecated distutils version parsing
>> 60e68d170b  Tianfei Zhang    raw/ifpga: fix thread closing
>> 90762e5cb8  Vanshika Shukla  net/dpaa2: fix timestamping for IEEE1588
>> d192fd321c  Vanshika Shukla  net/dpaa2: fix unregistering interrupt handler
>> 5f69ebbd85  Yunjian Wang     mem: check allocation in dynamic hugepage init
>> a62f095049  Yuying Zhang     net/ice/base: add profile validation on switch filter
>
>
>
> --
> Regards,
> Kalesh A P



-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd

Re: please help backporting some patches to stable release 19.11.12 - part II

[Josh Soref]

[-- Attachment #1: Type: text/plain, Size: 1857 bytes --]

On Wed, Mar 9, 2022, 2:49 AM Christian Ehrhardt <
christian.ehrhardt@canonical.com> wrote:

> On Fri, Feb 25, 2022 at 6:54 PM Josh Soref <jsoref@gmail.com> wrote:
> >
> > Christian Ehrhardt 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 19.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 19.11 branch, or
> >     - Indicate that the patch should not be backported
> >
> >
> > My spelling work can be safely skipped.
>
> Thank you for the FYI
>
> Maybe to everyone let me explain the reason why we even try :-)
> In general those kinds of fixes are not "too important" but if they
> can be applied it keeps the amount of extra churn lower later on.
> Imagine you touch every string with a commit, afterwards nothing will
> apply automatically anymore.
> So sometimes backporting those changes even if they feel "not
> important" can help.
>

Fair. Perhaps my message was a bit flippant. In general my changes are both
not important and also fairly easy to backport. If you need help, I could
probably allocate time to do it.

I've recently grown to love Visual Studio Code's conflict handling. If my
commits still have the original commit message (can't remember if they do
here, probably not, but I could start from the branch that did), while
rebasing I can select the word that the commit says was the replacement in
the `>>>>>> spelling: ...` line, and it'll highlight the matches within the
`<<<<<<` / `========` parts, and then I can visually identity which aren't
in the former and copy up the fixes from the lower part. And then I click
the accept link to keep the top part.

>

[-- Attachment #2: Type: text/html, Size: 2688 bytes --]