ACK: [SRU][J:linux-azure][PULL v2] Additional Mana Patch Requests for 5.15 Kernel
Massimiliano Pellizzer
massimiliano.pellizzer at canonical.com
Thu Mar 27 15:23:17 UTC 2025
On Thu, 27 Mar 2025 at 16:17, Philip Cox <philip.cox at canonical.com> wrote:
>
>
>
> On Tue, Mar 25, 2025 at 10:30 PM John Cabaj <john.cabaj at canonical.com> wrote:
>>
>> BugLink: https://bugs.launchpad.net/bugs/2103651
>>
>> SRU Justification
>>
>> [Impact]
>>
>> * Microsoft requested additional MANA patches for 5.15 to bring
>> important fixes from 6.8 and newer.
>> * Requires previous commit ("net: mana: Fix oversized sge0 for GSO
>> packets") to be reverted and re-applied on top, as the remainder of the
>> patchset would cause incorrect code addition during cherry-pick
>>
>> [Fix]
>>
>> * 11 clean cherry-picks from upstream
>>
>> 72fc81e5bbce: "scsi: storvsc: Set correct data length for sending SCSI
>> command without payload"
>> 368809a586bd: "net: mana: Add get_link and get_link_ksettings in ethtool"
>> 9480d2fac80b: "net: mana: Cleanup "mana" debugfs dir after cleanup of
>> all children"
>> 232ffe595480: "net: netvsc: Update default VMBus channels"
>> 51c617891b64: "net: mana: Fix the extra HZ in mana_hwc_send_request"
>> 77b356028961: "net: mana: Configure hwc timeout from hardware"
>> 77be12274124: "net: mana: Fix perf regression: remove rx_cqes, tx_cqes
>> counters"
>> 87b01cb815c7: "net: mana: Fix possible double free in error handling path"
>> 12d56dcd1fec: "net: mana: Increase the DEF_RX_BUFFERS_PER_QUEUE to 1024"
>> ac30ab1488f8: "RDMA/mana_ib: query device capabilities"
>> 2948a31f3f4f: "RDMA/mana_ib: register RDMA device with GDMA"
>>
>> * 5 backports from upstream
>> a43e8e9ffa0d: "net: mana: Fix oversized sge0 for GSO packets"
>> 8942bba12fbb: "net: mana: Enable debugfs files for MANA device"
>> 3d133ab4a367: "net: mana: Add gdma stats to ethtool output for mana"
>> 7f4df1601556: "net: mana: Add new MANA VF performance counters for
>> easier troubleshooting"
>> 6ce8eb462c1b: "net: mana: Implement get_ringparam/set_ringparam for mana"
>>
>> * 1 revert (from jammy:linux-azure)
>> ce02deecee38: Revert "net: mana: Fix oversized sge0 for GSO packets"
>>
>
> The following 3 patches have an extra newline in the signedoff chain:
>
> d68ff207c79c net: mana: Increase the DEF_RX_BUFFERS_PER_QUEUE to 1024
> bf5993a299c2 net: mana: Fix possible double free in error handling path
> ac3899c62296 net: mana: Add get_link and get_link_ksettings in ethtool
>
> Fix those before pushing, and this patchset is
>
> Acked-by: Philip Cox <philip.cox at canonical.com>
>
>
>>
>> [Test Plan]
>>
>> * Compile tested
>> * Boot tested on Standard_A2_v2 instance
>> * Microsoft tested successfully
>>
>> [Regression potential]
>>
>> * Several of the backports took a bit of effort. For example, 5.15
>> doesn't have 7462494408cd: "ethtool: extend ringparam setting/getting
>> API with rx_buf_len" so the mana_ethtool changes requires function
>> parameter modifications to match 5.15. Additional, 5.15 doesn't have
>> 504148fedb85: "net: add skb_[inner_]tcp_all_headers helpers", so
>> previous arithmetic had to be re-implemented. There were a couple of
>> other places where previous functions were maintained rather than
>> bringing in unknown context from the commit.
>> * Most changes were to MANA related source code, so leaning heavily on
>> Microsoft to test there, but it is localized. MANA changes could lead to
>> network instability.
>> * Other changes to scsi and hyperv were small and clean cherry-picks
>> from upstream, so expect little regression risk there.
>>
>> [Other info]
>>
>> * SF#00408239
>> * SF#00406456
>> * SF#00407579
>>
>> v2:
>>
>> * Revert "net: mana: Fix oversized sge0 for GSO packets" and re-apply on
>> top to fix incorrect code addition during cherry-pick
>>
>> ----------------------------------------------------------------
>>
>> The following changes since commit ffb57d7416f896158a5f990a5a10e275ee92145c:
>>
>> UBUNTU: Ubuntu-azure-5.15.0-1085.94 (2025-03-21 16:53:00 -0500)
>>
>> are available in the Git repository at:
>>
>>
>> https://git.launchpad.net/~john-cabaj/ubuntu/+source/linux-azure/+git/jammy
>> lp2103651
>>
>> for you to fetch changes up to e5962c26ab59852762d90e0f87ff099d747fd62f:
>>
>> net: mana: Fix oversized sge0 for GSO packets (2025-03-25 21:11:28 -0500)
>>
>> ----------------------------------------------------------------
>> Erni Sri Satya Vennela (2):
>> net: netvsc: Update default VMBus channels
>> net: mana: Add get_link and get_link_ksettings in ethtool
>>
>> Haiyang Zhang (2):
>> net: mana: Fix perf regression: remove rx_cqes, tx_cqes counters
>> net: mana: Fix oversized sge0 for GSO packets
>>
>> John Cabaj (1):
>> Revert "net: mana: Fix oversized sge0 for GSO packets"
>>
>> Long Li (3):
>> RDMA/mana_ib: register RDMA device with GDMA
>> RDMA/mana_ib: query device capabilities
>> scsi: storvsc: Set correct data length for sending SCSI command
>> without payload
>>
>> Ma Ke (1):
>> net: mana: Fix possible double free in error handling path
>>
>> Shradha Gupta (6):
>> net: mana: Implement get_ringparam/set_ringparam for mana
>> net: mana: Increase the DEF_RX_BUFFERS_PER_QUEUE to 1024
>> net: mana: Add new MANA VF performance counters for easier
>> troubleshooting
>> net: mana: Add gdma stats to ethtool output for mana
>> net: mana: Enable debugfs files for MANA device
>> net: mana: Cleanup "mana" debugfs dir after cleanup of all children
>>
>> Souradeep Chakrabarti (2):
>> net: mana: Configure hwc timeout from hardware
>> net: mana: Fix the extra HZ in mana_hwc_send_request
>>
>> drivers/infiniband/hw/mana/cq.c | 2 +-
>> drivers/infiniband/hw/mana/device.c | 31
>> +++++++++++++++----
>> drivers/infiniband/hw/mana/main.c | 69
>> ++++++++++++++++++++++++++++++++----------
>> drivers/infiniband/hw/mana/mana_ib.h | 50
>> +++++++++++++++++++++++++++++++
>> drivers/infiniband/hw/mana/qp.c | 19 ++++++------
>> drivers/net/ethernet/microsoft/mana/gdma_main.c | 78
>> ++++++++++++++++++++++++++++++++++++++++++++++--
>> drivers/net/ethernet/microsoft/mana/hw_channel.c | 24 ++++++++++++++-
>> drivers/net/ethernet/microsoft/mana/mana_en.c | 214
>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
>> drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 146
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
>> drivers/net/hyperv/hyperv_net.h | 2 +-
>> drivers/net/hyperv/netvsc_drv.c | 3 +-
>> drivers/scsi/storvsc_drv.c | 1 +
>> include/net/mana/gdma.h | 31
>> +++++++++++++++++--
>> include/net/mana/hw_channel.h | 5 ++++
>> include/net/mana/mana.h | 134
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
>> 15 files changed, 752 insertions(+), 57 deletions(-)
>>
>> --
>> kernel-team mailing list
>> kernel-team at lists.ubuntu.com
>> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Acked-by: Massimiliano Pellizzer <massimiliano.pellizzer at canonical.com>
--
Massimiliano Pellizzer
More information about the kernel-team
mailing list