Re:

[Christian Ehrhardt <christian.ehrhardt@canonical.com>]

.
T

On Wed, Dec 1, 2021 at 2:59 AM Wang, Haiyue <haiyue.wang@intel.com> wrote:
>
> Hi Christian,
>
> Applying but breaking the build:
>         96b25c496a  Haiyue Wang      net/ice: fix memzone leak after device init failure
>
> The build error is caused by calling new function 'rte_eth_dma_zone_free' which is not
> defined in 19.11.
>
> But I think it may be fixed by
>         1. Keep the patch for file "drivers/net/ice/ice_ethdev.c"
>         2. Drop the patch for file "drivers/net/ice/ice_fdir_filter.c", then apply
>                  (which is not in stable queue):
>                 https://git.dpdk.org/dpdk/commit/?id=d3778bf39a1dd36181b11459ad3936501ca17f4d

I'm tried combining 96b25c496a with d3778bf39 as the latter removes
the reference to rte_eth_dma_zone_free
The result LGTM at first - builds works fine now with both applied.
It was filtered out by the tooling as it fixed an issue only present
in a later release.
Thanks for making me aware of it!

> What do you think ?
>
> BR,
> Haiyue
>
> > -----Original Message-----
> > From: christian.ehrhardt@canonical.com <christian.ehrhardt@canonical.com>
> > Sent: Wednesday, December 1, 2021 00:57
> > Cc: Aaron Conole <aconole@redhat.com>; Gujjar, Abhinandan S <abhinandan.gujjar@intel.com>; Ajit
> > Khaparde <ajit.khaparde@broadcom.com>; Akhil Goyal <gakhil@marvell.com>; Alexander Kozyrev
> > <akozyrev@nvidia.com>; Ali Alnubani <alialnu@nvidia.com>; Zhang, AlvinX <alvinx.zhang@intel.com>;
> > Singh, Aman Deep <aman.deep.singh@intel.com>; Burakov, Anatoly <anatoly.burakov@intel.com>; Andrew
> > Boyer <aboyer@pensando.io>; Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>; Andy Moreton
> > <amoreton@xilinx.com>; Anoob Joseph <anoobj@marvell.com>; Apeksha Gupta <apeksha.gupta@nxp.com>;
> > Kusztal, ArkadiuszX <arkadiuszx.kusztal@intel.com>; Ashish Gupta <ashish.gupta@marvell.com>; Baruch
> > Siach <baruch@tkos.co.il>; Xing, Beilei <beilei.xing@intel.com>; Iremonger, Bernard
> > <bernard.iremonger@intel.com>; Richardson, Bruce <bruce.richardson@intel.com>; Chandubabu Namburu
> > <chandu@amd.com>; Chas Williams <chas3@att.com>; Xia, Chenbo <chenbo.xia@intel.com>; Chengchang Tang
> > <tangchengchang@huawei.com>; Chengwen Feng <fengchengwen@huawei.com>; Loftus, Ciara
> > <ciara.loftus@intel.com>; Power, Ciara <ciara.power@intel.com>; Conor Fogarty
> > <conor.fogarty@intel.com>; Walsh, Conor <conor.walsh@intel.com>; Dumitrescu, Cristian
> > <cristian.dumitrescu@intel.com>; Nowlin, Dan <dan.nowlin@intel.com>; Yu, DapengX
> > <dapengx.yu@intel.com>; Dariusz Sosnowski <dsosnowski@nvidia.com>; David Christensen
> > <drc@linux.vnet.ibm.com>; Hunt, David <david.hunt@intel.com>; David Marchand
> > <david.marchand@redhat.com>; Doherty, Declan <declan.doherty@intel.com>; Jain, Deepak K
> > <deepak.k.jain@intel.com>; Devendra Singh Rawat <dsinghrawat@marvell.com>; Dmitry Kozlyuk
> > <dkozlyuk@nvidia.com>; Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>; Dmitry Malloy
> > <dmitrym@microsoft.com>; Eli Britstein <elibr@nvidia.com>; Evgeny Schemeilin <evgenys@amazon.com>;
> > Zhang, Roy Fan <roy.fan.zhang@intel.com>; Feifei Wang <feifei.wang2@arm.com>; Yigit, Ferruh
> > <ferruh.yigit@intel.com>; Trahe, Fiona <fiona.trahe@intel.com>; Gagandeep Singh <g.singh@nxp.com>;
> > Gaoxiang Liu <liugaoxiang@huawei.com>; Gregory Etelson <getelson@nvidia.com>; Guoyang Zhou
> > <zhouguoyang@huawei.com>; Wang, Haiyue <haiyue.wang@intel.com>; Harman Kalra <hkalra@marvell.com>; Van
> > Haaren, Harry <harry.van.haaren@intel.com>; Heinrich Kuhn <heinrich.kuhn@corigine.com>; Hemant Agrawal
> > <hemant.agrawal@nxp.com>; Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>; Huichao Cai
> > <chcchc88@163.com>; Huisong Li <lihuisong@huawei.com>; Hyong Youb Kim <hyonkim@cisco.com>; Idan
> > Hackmon <idanhac@nvidia.com>; Igor Chauskin <igorch@amazon.com>; Igor Romanov
> > <igor.romanov@oktetlabs.ru>; Igor Russkikh <irusskikh@marvell.com>; Igor Ryzhov <iryzhov@nfware.com>;
> > Ilyes Ben Hamouda <ilyes.ben_hamouda@6wind.com>; Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>; Ivan
> > Malov <ivan.malov@oktetlabs.ru>; Jakub Grajciar <jgrajcia@cisco.com>; Singh, Jasvinder
> > <jasvinder.singh@intel.com>; Jayatheerthan, Jay <jay.jayatheerthan@intel.com>; Jay Zhou
> > <jianjay.zhou@huawei.com>; Jerin Jacob <jerinj@marvell.com>; Jian Wang <jianwang@trustnetic.com>;
> > Jiawen Wu <jiawenwu@trustnetic.com>; Wang, Jie1X <jie1x.wang@intel.com>; Wu, Jingjing
> > <jingjing.wu@intel.com>; Daley, John <johndale@cisco.com>; Griffin, John <john.griffin@intel.com>;
> > Mcnamara, John <john.mcnamara@intel.com>; John W. Linville <linville@tuxdriver.com>; Joyce Kong
> > <joyce.kong@arm.com>
> > Subject:
> >
> > Subject: please help backporting some patches to stable release 19.11.11
> >
> > 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 December the 14th 2021 (More time than
> > usual as backports get harder).
> >
> > You can find the a temporary work-in-progress branch of the coming 19.11.11
> > 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>
> >
> > ---
> >
> > Applying but breaking the build:
> >
> > 858a152ab5  Junxiao Shi      net/memif: allow stopping and closing device
> > c4d3e8fbe4  Ruifeng Wang     net/i40e: fix risk in descriptor read in scalar Rx
> > 7dc627426e  Olivier Matz     test/mbuf: fix access to freed memory
> > 86e361cdeb  David Marchand   test/cmdline: fix memory leak
> > 04bcc80204  Xuan Ding        net/virtio: fix indirect descriptor reconnection
> > 9de76dfb92  Ivan Ilchenko    net/virtio: fix Tx completed mbuf leak on device stop
> > 5d903aee8a  Gaoxiang Liu     net/virtio: fix repeated freeing of virtqueue
> > 9c8c806487  Thomas Monjalon  test/crypto: fix minsize build
> > 96b25c496a  Haiyue Wang      net/ice: fix memzone leak after device init failure
> >
> > ---
> >
> > Not Applying
> >
> > ed0ae3502f  Ajit Khaparde    net/bnxt: update ring group after ring stop start
> > 94421842de  Alexander Kozyrev net/mlx5: fix GENEVE and VXLAN-GPE flow item matching
> > 9e61533df2  Alexander Kozyrev net/mlx5: fix GRE flow item matching
> > 02220e5305  Alvin Zhang      app/testpmd: fix txonly forwarding
> > a78040c990  Alvin Zhang      app/testpmd: update forward engine beginning
> > c1c99d3421  Alvin Zhang      net/ice: fix pointer of meta data
> > 4fd15c6af0  Anatoly Burakov  vfio: set errno on unsupported OS
> > febc855b35  Andrew Rybchenko ethdev: forbid closing started device
> > 0015b149bc  Anoob Joseph     test/crypto: fix missing return checks
> > 156eee2177  Arek Kusztal     common/qat: fix queue pair config overrun
> > 0f2ffb49ce  Baruch Siach     net/af_xdp: fix zero-copy Tx queue drain
> > 897e55c8d2  Bruce Richardson doc: fix Doxygen examples build on FreeBSD
> > 2fc3e696a7  Chengchang Tang  net/hns3: add runtime config for mailbox limit time
> > 3fb0df3138  Chengchang Tang  net/hns3: fix taskqueue pair reset command
> > 0b77e8f3d3  Chengwen Feng    net/hns3: optimize Tx performance
> > 3cc817c195  Chengwen Feng    net/hns3: optimize Tx performance by mbuf fast free
> > c0daf3bd4b  Ciara Power      test/crypto: remove unnecessary stats retrieval
> > 9465a5d5a0  Conor Walsh      net/nfp: remove unused message length
> > ccf0f002d2  Dapeng Yu        net/bonding: fix memory leak on closing device
> > 7775172c04  Dariusz Sosnowski net/mlx5: fix partial inline of fine grain packets
> > fe629897de  David Marchand   app/testpmd: remove double dependency on bitrate lib
> > b72099be7f  David Marchand   net/virtio-user: fix init when using existing tap
> > 4a985f4e84  David Marchand   test/service: fix race in attr check
> > 9790fc2149  Dmitry Kozlyuk   eal/freebsd: fix IOVA mode selection
> > bc5bee028e  Dmitry Kozlyuk   net/mlx5: create drop queue using DevX
> > c5042f93a4  Dmitry Kozlyuk   net/mlx5: discover max flow priority using DevX
> > 6a8b64fd5e  Eli Britstein    app/testpmd: fix packet burst spreading stats
> > 5139502783  Ferruh Yigit     ethdev: fix typos
> > a1b2558cdb  Ferruh Yigit     kni: restrict bifurcated device support
> > 451dc0fad8  Gaoxiang Liu     vhost: fix crash on port deletion
> > 9f151fd8df  Gregory Etelson  net/mlx5: add Ethernet header to GENEVE RSS expansion
> > 690391dd0e  Gregory Etelson  net/mlx5: fix GENEVE protocol type translation
> > be26e81bfc  Gregory Etelson  net/mlx5: fix GRE protocol type translation
> > 861fa3796f  Gregory Etelson  net/mlx5: fix VXLAN-GPE next protocol translation
> > 567473433b  Huichao Cai      ip_frag: fix fragmenting IPv4 fragment
> > 013bb504c8  Huichao Cai      ip_frag: revert fix fragmenting IPv4 fragment
> > 841f869353  Huisong Li       net/hns3: fix multi-process action register and unregister
> > 19e67d8ebc  Huisong Li       net/hns3: fix residual MAC after setting default MAC
> > 3232637177  Huisong Li       net/hns3: fix secondary process reference count
> > 443242212b  Huisong Li       net/hns3: unregister MP action on close for secondary
> > 770d41bf33  Ilyes Ben Hamouda malloc: fix allocation with unknown socket ID
> > 580f3af31c  Ivan Ilchenko    net/virtio: fix device configure without jumbo Rx offload
> > c97e73779c  Ivan Ilchenko    net/virtio: fix split queue vectorized Rx
> > e2ca43a35e  Ivan Ilchenko    net/virtio: fix Tx cleanup functions to have same signature
> > 6474b59448  Ivan Malov       net/virtio: fix Tx checksum for tunnel packets
> > cbe70fded8  Jie Wang         app/testpmd: fix DCB in VT configuration
> > 655eae01f9  Jie Wang         app/testpmd: fix RSS hash offload display
> > 8cc79a1636  Jie Wang         net/i40e: fix forward outer IPv6 VXLAN
> > d5559ac589  Joyce Kong       test/func_reentrancy: free memzones after test
> > baedf29794  Kalesh AP        net/bnxt: check FW capability for VLAN offloads
> > 620e0290d1  Kalesh AP        net/bnxt: fix VLAN indication in Rx mbuf
> > 6c16a05c8c  Kefu Chai        doc: fix a typo in EAL guide
> > 0c3fa68396  Lior Margalit    net/mlx5: fix RSS expansion for L2/L3 VXLAN
> > aa52e5f0f9  Lior Margalit    net/mlx5: fix RSS expansion traversal over next nodes
> > 76b5bdf828  Matan Azrad      common/mlx5: create wrapped MR
> > 8594e2a64f  Matan Azrad      common/mlx5: fix build for zero-length headroom array
> > b6e9c33c82  Michael Baum     net/mlx5: remove duplicated reference of Tx doorbell
> > 8451e165b8  Michael Baum     net/mlx5: workaround MR creation for flow counter
> > e2a6d08bef  Michal Krawczyk  net/ena: advertise scattered Rx capability
> > e8c838fde9  Michal Krawczyk  net/ena: fix offload capabilities verification
> > 3a822d79c5  Michal Krawczyk  net/ena: fix per-queue offload capabilities
> > 599ef84add  Min Hu (Connor)  net/hns3: fix mailbox communication with HW
> > 818ce1132a  Mohsin Kazmi     net: fix checksum offload for outer IPv4
> > efc6f9104c  Olivier Matz     mbuf: fix reset on mbuf free
> > de5bef335e  Qiming Chen      net/iavf: fix high CPU usage on frequent command
> > 3affa0ef2d  Qi Zhang         net/ice/base: calculate logical PF ID
> > 778602fe57  Ruifeng Wang     net/i40e: fix risk in descriptor read in NEON Rx
> > 35bd0a5c58  Sean Morrissey   doc: capitalise PMD
> > f8dbaebbf1  Sean Morrissey   fix PMD wording
> > a7e21843f0  Somnath Kotur    net/bnxt: fix Rx next consumer index in mbuf alloc fail
> > accf3cfce4  Tal Shnaiderman  net/mlx5: fix software parsing support query
> > c1a320bf89  Tal Shnaiderman  net/mlx5: fix tunneling support query
> > f86d553cc1  Tudor Cornea     net/af_packet: fix ignoring full ring on Tx
> > 2108930be1  Tudor Cornea     net/ixgbe: fix port initialization if MTU config fails
> > e30ef3a3a0  Vladimir Medvedkin test/hash: fix buffer overflow with jhash
> > ad6f01945a  Xuan Ding        net/virtio: fix avail descriptor ID
> > 68fa62924d  Xueming Li       net/mlx5: fix Altivec Rx
> > 84cc857b5d  Zhihong Peng     net/virtio: fix check scatter on all Rx queues



-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd