# git rev-parse -q --verify deefd5024f0772cf56052ace9a8c347dc70bcaf3^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify deefd5024f0772cf56052ace9a8c347dc70bcaf3^{commit} deefd5024f0772cf56052ace9a8c347dc70bcaf3 # git checkout -q -f -B kisskb deefd5024f0772cf56052ace9a8c347dc70bcaf3 # git clean -qxdf # < git log -1 # commit deefd5024f0772cf56052ace9a8c347dc70bcaf3 # Merge: 009fbfc97b63 2b88119e35b0 # Author: Linus Torvalds # Date: Wed Nov 1 13:55:40 2023 -1000 # # Merge tag 'vfio-v6.7-rc1' of https://github.com/awilliam/linux-vfio # # Pull VFIO updates from Alex Williamson: # # - Add support for "chunk mode" in the mlx5-vfio-pci variant driver, # which allows both larger device image sizes for migration, beyond the # previous 4GB limit, and also read-ahead support for improved # migration performance (Yishai Hadas) # # - A new bus master control interface for the CDX bus driver where there # is no in-band mechanism to toggle device DMA as there is through # config space on PCI devices (Nipun Gupta) # # - Add explicit alignment directives to vfio data structures to reduce # the chance of breaking 32-bit userspace. In most cases this is # transparent and the remaining cases where data structures are padded # work within the existing rules for extending data structures within # vfio (Stefan Hajnoczi) # # - Resolve a bug in the cdx bus driver noted when compiled with clang # where missing parenthesis result in the wrong operation (Nathan # Chancellor) # # - Resolve errors reported by smatch for a function when dealing with # invalid inputs (Alex Williamson) # # - Add migration support to the mtty vfio/mdev sample driver for testing # and integration purposes, allowing CI of migration without specific # hardware requirements. Also resolve many of the short- comings of # this driver relative to implementation of the vfio interrupt ioctl # along the way (Alex Williamson) # # * tag 'vfio-v6.7-rc1' of https://github.com/awilliam/linux-vfio: # vfio/mtty: Enable migration support # vfio/mtty: Overhaul mtty interrupt handling # vfio: Fix smatch errors in vfio_combine_iova_ranges() # vfio/cdx: Add parentheses between bitwise AND expression and logical NOT # vfio/mlx5: Activate the chunk mode functionality # vfio/mlx5: Add support for READING in chunk mode # vfio/mlx5: Add support for SAVING in chunk mode # vfio/mlx5: Pre-allocate chunks for the STOP_COPY phase # vfio/mlx5: Rename some stuff to match chunk mode # vfio/mlx5: Enable querying state size which is > 4GB # vfio/mlx5: Refactor the SAVE callback to activate a work only upon an error # vfio/mlx5: Wake up the reader post of disabling the SAVING migration file # vfio: use __aligned_u64 in struct vfio_device_ioeventfd # vfio: use __aligned_u64 in struct vfio_device_gfx_plane_info # vfio: trivially use __aligned_u64 for ioctl structs # vfio-cdx: add bus mastering device feature support # vfio: add bus master feature to device feature ioctl # cdx: add support for bus mastering # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 deefd5024f0772cf56052ace9a8c347dc70bcaf3 # make -s -j 40 ARCH=mips O=/kisskb/build/linus-rand_allmodconfig_mips-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 40 ARCH=mips O=/kisskb/build/linus-rand_allmodconfig_mips-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 40 ARCH=mips O=/kisskb/build/linus-rand_allmodconfig_mips-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:14768:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 40 ARCH=mips O=/kisskb/build/linus-rand_allmodconfig_mips-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/mips-linux/bin/mips-linux- Completed OK # rm -rf /kisskb/build/linus-rand_allmodconfig_mips-gcc12 # Build took: 0:14:19.836573