Resolute patch Tested on local system, builds as expected
============================== root@ubuntu-resolute:~# sudo dkms build -m doca-ofed-3.4-dkms -v 3.4.0+0.8.5.0 -k 7.0.0-39-generic --force Sign command: /usr/bin/kmodsign Signing key: /var/lib/shim-signed/mok/MOK.priv Public certificate (MOK): /var/lib/shim-signed/mok/MOK.der Running the pre_build script...................... done. Building module(s)............................ done. Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/compat/mlx_compat.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/fwctl/mlx5/mlx5_fwctl.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/core/ib_core.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/core/ib_cm.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/core/iw_cm.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/core/ib_umad.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/core/ib_uverbs.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/core/rdma_cm.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/core/rdma_ucm.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/hw/mlx5/mlx5_ib.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/ulp/ipoib/ib_ipoib.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/net/ethernet/mellanox/mlxfw/mlxfw.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/infiniband/hw/irdma/irdma.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/vfio/pci/mlx5/mlx5-vfio-pci.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/vdpa/mlx5/mlx5_vdpa.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/drivers/net/ethernet/mellanox/mlx5/core/mlx5_dpll.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/net/mlxdevm/mlxdevm.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/iser/ib_iser.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/isert/ib_isert.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/kernel-mft/mst_backward_compatibility/mst_pci/mst_pci.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/kernel-mft/mst_backward_compatibility/mst_pciconf/mst_pciconf.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-nfsrdma/rpcrdma.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-nfsrdma/svcrdma.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-nfsrdma/xprtrdma.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/srp/ib_srp.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/srp/scsi/scsi_transport_srp.ko Signing module /var/lib/dkms/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/xpmem/kernel/xpmem.ko root@ubuntu-resolute:~# ========================================== ** Patch added: "resolute-doca-ofed-3.4.patch" https://bugs.launchpad.net/ubuntu/+source/doca-ofed-3.4-dkms/+bug/2169596/+attachment/6005967/+files/resolute-doca-ofed-3.4.patch ** Description changed: SRU Justification [ Impact ] After cherry picking upstream commit a6e4b9a6deb9362ef7a0706c70d674e92fe1411a ("xsk: honor XDP_TX_METADATA in zero-copy path") the file drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c in mlnx-ofed-kernel stopped compiling as now the called API needs 3 parameters instead of 2. [ Fix ] To fix, a check during the configure phase is needed, and at that point a discriminant to decide whether to use 2 or 3 parameters will generate the right call. [ Regression potential ] If not correctly used, the 3rd parameter might introduce a but, but this is considered almost as none, as desc.option exists in the pre-existing environment + [ Build artifacts ] + + Build artifacts can be found at + https://launchpad.net/~alessiofaina/+archive/ubuntu/doca- + ofed-3.4-resolute-ubuntu3-prerelease/+packages + [ Build failure detail ] drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c: In function ‘mlx5e_xsk_tx’: drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c:120:24: error: too few arguments to function ‘xsk_buff_get_metadata’; expected 3, have 2 - 120 | meta = xsk_buff_get_metadata(pool, desc.addr); - | ^~~~~~~~~~~~~~~~~~~~~ + 120 | meta = xsk_buff_get_metadata(pool, desc.addr); + | ^~~~~~~~~~~~~~~~~~~~~ In file included from /<<PKGBUILDDIR>>/staging_dir/linux-main-modules/fake_dkms_root_folder/doca-ofed-3.4-dkms/3.4.0+0.8.5.0/build/mlnx-ofed-kernel/include/net/xdp_sock_drv.h:7, - from drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c:10: + from drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c:10: /usr/src/linux-headers-7.0.0-39-generic/include/net/xdp_sock_drv.h:332:1: note: declared here - 332 | xsk_buff_get_metadata(struct xsk_buff_pool *pool, u64 addr, u32 options) - | ^~~~~~~~~~~~~~~~~~~~~ + 332 | xsk_buff_get_metadata(struct xsk_buff_pool *pool, u64 addr, u32 options) + | ^~~~~~~~~~~~~~~~~~~~~ make[7]: *** [/usr/src/linux-headers-7.0.0-39-generic/scripts/Makefile.build:289: drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.o] Error 1 make[7]: *** Waiting for unfinished jobs.... -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2169596 Title: doca-ofed-3.4 stops building after cherry pick of upstream commit a6e4b9a6deb9362ef7a0706c70d674e92fe1411a To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/doca-ofed-3.4-dkms/+bug/2169596/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
