From 047c067c05ff22df06c053990998184b8a940514 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 31 Jan 2022 10:55:58 +0100 Subject: [PATCH] so_ver: increase all major versions To allow SO_MINOR updates on LTS for the whole year it is supported, the major version for all components needs to be increased. This is to prevent scenario where two versions exists with matching versions, but conflicting ABI. Ex. Next SPDK release adds an API call increasing the minor version, then LTS needs just a subset of those additions. Increasing major so version after LTS, allows the future releases to update versions as needed. Yet allowing LTS to increase minor version separately. Disabled test for increasing SO version without ABI change, as that is goal of this patch. This check shall be removed with SPDK 22.05 release. This patch: - increases SO_VER by 1 for all components - resets SO_MINOR to 0 for all components - removes suppressions for ABI tests Signed-off-by: Tomasz Zawadzki Change-Id: Id1a5358882dc496faa5b0b5c9a63b326c378c551 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11361 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- lib/accel/Makefile | 2 +- lib/bdev/Makefile | 4 ++-- lib/blob/Makefile | 2 +- lib/blobfs/Makefile | 2 +- lib/conf/Makefile | 2 +- lib/dma/Makefile | 2 +- lib/env_dpdk/Makefile | 2 +- lib/event/Makefile | 2 +- lib/ftl/Makefile | 2 +- lib/idxd/Makefile | 2 +- lib/init/Makefile | 2 +- lib/ioat/Makefile | 2 +- lib/iscsi/Makefile | 2 +- lib/json/Makefile | 4 ++-- lib/jsonrpc/Makefile | 2 +- lib/log/Makefile | 4 ++-- lib/lvol/Makefile | 2 +- lib/nbd/Makefile | 2 +- lib/notify/Makefile | 2 +- lib/nvme/Makefile | 4 ++-- lib/nvmf/Makefile | 2 +- lib/rdma/Makefile | 2 +- lib/reduce/Makefile | 2 +- lib/rpc/Makefile | 2 +- lib/scsi/Makefile | 4 ++-- lib/sock/Makefile | 2 +- lib/thread/Makefile | 4 ++-- lib/trace/Makefile | 4 ++-- lib/trace_parser/Makefile | 2 +- lib/ut_mock/Makefile | 2 +- lib/util/Makefile | 4 ++-- lib/vfio_user/Makefile | 2 +- lib/vhost/Makefile | 2 +- lib/virtio/Makefile | 2 +- lib/vmd/Makefile | 2 +- module/accel/idxd/Makefile | 2 +- module/accel/ioat/Makefile | 2 +- module/bdev/aio/Makefile | 2 +- module/bdev/compress/Makefile | 2 +- module/bdev/crypto/Makefile | 2 +- module/bdev/delay/Makefile | 2 +- module/bdev/error/Makefile | 2 +- module/bdev/ftl/Makefile | 2 +- module/bdev/gpt/Makefile | 2 +- module/bdev/iscsi/Makefile | 2 +- module/bdev/lvol/Makefile | 2 +- module/bdev/malloc/Makefile | 2 +- module/bdev/null/Makefile | 2 +- module/bdev/nvme/Makefile | 2 +- module/bdev/ocf/Makefile | 2 +- module/bdev/passthru/Makefile | 2 +- module/bdev/pmem/Makefile | 2 +- module/bdev/raid/Makefile | 2 +- module/bdev/rbd/Makefile | 2 +- module/bdev/split/Makefile | 2 +- module/bdev/uring/Makefile | 2 +- module/bdev/virtio/Makefile | 2 +- module/bdev/zone_block/Makefile | 2 +- module/blob/bdev/Makefile | 2 +- module/blobfs/bdev/Makefile | 2 +- module/env_dpdk/Makefile | 2 +- module/event/subsystems/accel/Makefile | 2 +- module/event/subsystems/bdev/Makefile | 2 +- module/event/subsystems/iscsi/Makefile | 2 +- module/event/subsystems/nbd/Makefile | 2 +- module/event/subsystems/nvmf/Makefile | 2 +- module/event/subsystems/scheduler/Makefile | 2 +- module/event/subsystems/scsi/Makefile | 2 +- module/event/subsystems/sock/Makefile | 2 +- module/event/subsystems/vhost/Makefile | 2 +- module/event/subsystems/vmd/Makefile | 2 +- module/scheduler/dpdk_governor/Makefile | 2 +- module/scheduler/dynamic/Makefile | 2 +- module/scheduler/gscheduler/Makefile | 2 +- module/sock/posix/Makefile | 2 +- module/sock/uring/Makefile | 2 +- shared_lib/Makefile | 2 +- test/make/check_so_deps.sh | 2 ++ 78 files changed, 87 insertions(+), 85 deletions(-) diff --git a/lib/accel/Makefile b/lib/accel/Makefile index 7e76b3079..86d750a4e 100644 --- a/lib/accel/Makefile +++ b/lib/accel/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 8 +SO_VER := 9 SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile index c4f6a315b..86cb719bd 100644 --- a/lib/bdev/Makefile +++ b/lib/bdev/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 8 -SO_MINOR := 1 +SO_VER := 9 +SO_MINOR := 0 ifeq ($(CONFIG_VTUNE),y) CFLAGS += -I$(CONFIG_VTUNE_DIR)/include -I$(CONFIG_VTUNE_DIR)/sdk/src/ittnotify diff --git a/lib/blob/Makefile b/lib/blob/Makefile index d206ca3e5..32036ed62 100644 --- a/lib/blob/Makefile +++ b/lib/blob/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 6 +SO_VER := 7 SO_MINOR := 0 C_SRCS = blobstore.c request.c zeroes.c blob_bs_dev.c diff --git a/lib/blobfs/Makefile b/lib/blobfs/Makefile index 5ee3d020e..48ffeba12 100644 --- a/lib/blobfs/Makefile +++ b/lib/blobfs/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 C_SRCS = blobfs.c tree.c diff --git a/lib/conf/Makefile b/lib/conf/Makefile index 1f822355d..f70d5201c 100644 --- a/lib/conf/Makefile +++ b/lib/conf/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = conf.c diff --git a/lib/dma/Makefile b/lib/dma/Makefile index 24e5710d6..33760fc40 100644 --- a/lib/dma/Makefile +++ b/lib/dma/Makefile @@ -33,7 +33,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) diff --git a/lib/env_dpdk/Makefile b/lib/env_dpdk/Makefile index 795fc4f7a..12392cba6 100644 --- a/lib/env_dpdk/Makefile +++ b/lib/env_dpdk/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 8 +SO_VER := 9 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/lib/event/Makefile b/lib/event/Makefile index 6cbdab07b..3f2f37d3a 100644 --- a/lib/event/Makefile +++ b/lib/event/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 10 +SO_VER := 11 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/lib/ftl/Makefile b/lib/ftl/Makefile index 81330da87..5b5993221 100644 --- a/lib/ftl/Makefile +++ b/lib/ftl/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = ftl_band.c ftl_core.c ftl_debug.c ftl_io.c ftl_reloc.c \ diff --git a/lib/idxd/Makefile b/lib/idxd/Makefile index 38a872f9f..c41317cae 100644 --- a/lib/idxd/Makefile +++ b/lib/idxd/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 7 +SO_VER := 8 SO_MINOR := 0 C_SRCS = idxd.c idxd_user.c diff --git a/lib/init/Makefile b/lib/init/Makefile index 0e852bd67..be763e17e 100644 --- a/lib/init/Makefile +++ b/lib/init/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = json_config.c subsystem.c subsystem_rpc.c rpc.c diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile index 045c9f4d2..579d4482d 100644 --- a/lib/ioat/Makefile +++ b/lib/ioat/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = ioat.c diff --git a/lib/iscsi/Makefile b/lib/iscsi/Makefile index 668c2ab3d..b51f36262 100644 --- a/lib/iscsi/Makefile +++ b/lib/iscsi/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib diff --git a/lib/json/Makefile b/lib/json/Makefile index 086fe9874..2cb30d3c8 100644 --- a/lib/json/Makefile +++ b/lib/json/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 -SO_MINOR := 3 +SO_VER := 4 +SO_MINOR := 0 C_SRCS = json_parse.c json_util.c json_write.c LIBNAME = json diff --git a/lib/jsonrpc/Makefile b/lib/jsonrpc/Makefile index 7553cee29..a3fc57c09 100644 --- a/lib/jsonrpc/Makefile +++ b/lib/jsonrpc/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 LIBNAME = jsonrpc diff --git a/lib/log/Makefile b/lib/log/Makefile index 56f3aba16..c49772acf 100644 --- a/lib/log/Makefile +++ b/lib/log/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 -SO_MINOR := 1 +SO_VER := 5 +SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = log.c log_flags.c diff --git a/lib/lvol/Makefile b/lib/lvol/Makefile index 037268f69..d31388496 100644 --- a/lib/lvol/Makefile +++ b/lib/lvol/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 C_SRCS = lvol.c diff --git a/lib/nbd/Makefile b/lib/nbd/Makefile index 702f34850..9f48f4a67 100644 --- a/lib/nbd/Makefile +++ b/lib/nbd/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 LIBNAME = nbd diff --git a/lib/notify/Makefile b/lib/notify/Makefile index 7069b6382..64272746d 100644 --- a/lib/notify/Makefile +++ b/lib/notify/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = notify.c notify_rpc.c diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile index 06180417f..e7d6ef8a2 100644 --- a/lib/nvme/Makefile +++ b/lib/nvme/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 7 -SO_MINOR := 1 +SO_VER := 8 +SO_MINOR := 0 C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_fabric.c nvme_ns_cmd.c \ nvme_ns.c nvme_pcie_common.c nvme_pcie.c nvme_qpair.c nvme.c \ diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile index fdf512f69..fef09713b 100644 --- a/lib/nvmf/Makefile +++ b/lib/nvmf/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 11 +SO_VER := 12 SO_MINOR := 0 C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \ diff --git a/lib/rdma/Makefile b/lib/rdma/Makefile index 4d5c5e252..01006aa41 100644 --- a/lib/rdma/Makefile +++ b/lib/rdma/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_rdma.map) diff --git a/lib/reduce/Makefile b/lib/reduce/Makefile index 73958b16e..88324387c 100644 --- a/lib/reduce/Makefile +++ b/lib/reduce/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = reduce.c diff --git a/lib/rpc/Makefile b/lib/rpc/Makefile index 36911c934..6ea994861 100644 --- a/lib/rpc/Makefile +++ b/lib/rpc/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = rpc.c diff --git a/lib/scsi/Makefile b/lib/scsi/Makefile index 6c4a4aec6..4dc8c824f 100644 --- a/lib/scsi/Makefile +++ b/lib/scsi/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 -SO_MINOR := 1 +SO_VER := 5 +SO_MINOR := 0 C_SRCS = dev.c lun.c port.c scsi.c scsi_bdev.c scsi_pr.c scsi_rpc.c task.c LIBNAME = scsi diff --git a/lib/sock/Makefile b/lib/sock/Makefile index d80b24ab2..e6b8b804c 100644 --- a/lib/sock/Makefile +++ b/lib/sock/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 C_SRCS = sock.c sock_rpc.c diff --git a/lib/thread/Makefile b/lib/thread/Makefile index 484833409..53b8cd83d 100644 --- a/lib/thread/Makefile +++ b/lib/thread/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 6 -SO_MINOR := 1 +SO_VER := 7 +SO_MINOR := 0 C_SRCS = thread.c LIBNAME = thread diff --git a/lib/trace/Makefile b/lib/trace/Makefile index 135e94a41..9814a9a21 100644 --- a/lib/trace/Makefile +++ b/lib/trace/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 -SO_MINOR := 1 +SO_VER := 6 +SO_MINOR := 0 C_SRCS = trace.c trace_flags.c trace_rpc.c LIBNAME = trace diff --git a/lib/trace_parser/Makefile b/lib/trace_parser/Makefile index 67690cc70..6b538078f 100644 --- a/lib/trace_parser/Makefile +++ b/lib/trace_parser/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 CXX_SRCS = trace.cpp diff --git a/lib/ut_mock/Makefile b/lib/ut_mock/Makefile index f5ebd48c6..18fb20986 100644 --- a/lib/ut_mock/Makefile +++ b/lib/ut_mock/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = mock.c diff --git a/lib/util/Makefile b/lib/util/Makefile index b282ed562..04b3b037c 100644 --- a/lib/util/Makefile +++ b/lib/util/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 -SO_MINOR := 1 +SO_VER := 5 +SO_MINOR := 0 C_SRCS = base64.c bit_array.c cpuset.c crc16.c crc32.c crc32c.c crc32_ieee.c \ dif.c fd.c file.c iov.c math.c pipe.c strerror_tls.c string.c uuid.c \ diff --git a/lib/vfio_user/Makefile b/lib/vfio_user/Makefile index bf958bf64..4e92fd75c 100644 --- a/lib/vfio_user/Makefile +++ b/lib/vfio_user/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = vfio_user_pci.c vfio_user.c diff --git a/lib/vhost/Makefile b/lib/vhost/Makefile index 635249086..764796635 100644 --- a/lib/vhost/Makefile +++ b/lib/vhost/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 5 +SO_VER := 6 SO_MINOR := 0 CFLAGS += -I. diff --git a/lib/virtio/Makefile b/lib/virtio/Makefile index 4172ccedd..45ce778c6 100644 --- a/lib/virtio/Makefile +++ b/lib/virtio/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/lib/vmd/Makefile b/lib/vmd/Makefile index 692910166..a2decf823 100644 --- a/lib/vmd/Makefile +++ b/lib/vmd/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = vmd.c led.c diff --git a/module/accel/idxd/Makefile b/module/accel/idxd/Makefile index 372885534..9c0c846da 100644 --- a/module/accel/idxd/Makefile +++ b/module/accel/idxd/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 LIBNAME = accel_idxd diff --git a/module/accel/ioat/Makefile b/module/accel/ioat/Makefile index 3f3d735e3..7f0600667 100644 --- a/module/accel/ioat/Makefile +++ b/module/accel/ioat/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 LIBNAME = accel_ioat diff --git a/module/bdev/aio/Makefile b/module/bdev/aio/Makefile index 644e31d83..8c38d64af 100644 --- a/module/bdev/aio/Makefile +++ b/module/bdev/aio/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = bdev_aio.c bdev_aio_rpc.c diff --git a/module/bdev/compress/Makefile b/module/bdev/compress/Makefile index a95ef72e9..7c1973412 100644 --- a/module/bdev/compress/Makefile +++ b/module/bdev/compress/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/crypto/Makefile b/module/bdev/crypto/Makefile index 9562ddcc4..d5081b6a9 100644 --- a/module/bdev/crypto/Makefile +++ b/module/bdev/crypto/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/module/bdev/delay/Makefile b/module/bdev/delay/Makefile index 925fda92d..529642e6c 100644 --- a/module/bdev/delay/Makefile +++ b/module/bdev/delay/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/error/Makefile b/module/bdev/error/Makefile index fdd4b44a3..0a6fdd41a 100644 --- a/module/bdev/error/Makefile +++ b/module/bdev/error/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = vbdev_error.c vbdev_error_rpc.c diff --git a/module/bdev/ftl/Makefile b/module/bdev/ftl/Makefile index c81269418..a8573ba86 100644 --- a/module/bdev/ftl/Makefile +++ b/module/bdev/ftl/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS += bdev_ftl.c bdev_ftl_rpc.c diff --git a/module/bdev/gpt/Makefile b/module/bdev/gpt/Makefile index 14969417c..02ac6e800 100644 --- a/module/bdev/gpt/Makefile +++ b/module/bdev/gpt/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = gpt.c vbdev_gpt.c diff --git a/module/bdev/iscsi/Makefile b/module/bdev/iscsi/Makefile index 6141a5ed9..41ec221ed 100644 --- a/module/bdev/iscsi/Makefile +++ b/module/bdev/iscsi/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/lvol/Makefile b/module/bdev/lvol/Makefile index 8417e8e94..9cc75e070 100644 --- a/module/bdev/lvol/Makefile +++ b/module/bdev/lvol/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = vbdev_lvol.c vbdev_lvol_rpc.c diff --git a/module/bdev/malloc/Makefile b/module/bdev/malloc/Makefile index 4db73241a..9f3f0e656 100644 --- a/module/bdev/malloc/Makefile +++ b/module/bdev/malloc/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = bdev_malloc.c bdev_malloc_rpc.c diff --git a/module/bdev/null/Makefile b/module/bdev/null/Makefile index 48ea20f25..641af4d93 100644 --- a/module/bdev/null/Makefile +++ b/module/bdev/null/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = bdev_null.c bdev_null_rpc.c diff --git a/module/bdev/nvme/Makefile b/module/bdev/nvme/Makefile index ba8359170..9f88187ae 100644 --- a/module/bdev/nvme/Makefile +++ b/module/bdev/nvme/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = bdev_nvme.c bdev_nvme_rpc.c nvme_rpc.c diff --git a/module/bdev/ocf/Makefile b/module/bdev/ocf/Makefile index 16d3db581..8ebaa49da 100644 --- a/module/bdev/ocf/Makefile +++ b/module/bdev/ocf/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/env_ocf -I$(SPDK_ROOT_DIR)/lib/env_ocf/include diff --git a/module/bdev/passthru/Makefile b/module/bdev/passthru/Makefile index 0e706c2e0..d5f69d4fb 100644 --- a/module/bdev/passthru/Makefile +++ b/module/bdev/passthru/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/pmem/Makefile b/module/bdev/pmem/Makefile index 2780272a4..c008d4beb 100644 --- a/module/bdev/pmem/Makefile +++ b/module/bdev/pmem/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = bdev_pmem.c bdev_pmem_rpc.c diff --git a/module/bdev/raid/Makefile b/module/bdev/raid/Makefile index d5f928af2..b550e88e8 100644 --- a/module/bdev/raid/Makefile +++ b/module/bdev/raid/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/rbd/Makefile b/module/bdev/rbd/Makefile index 66b6d815b..b764880fd 100644 --- a/module/bdev/rbd/Makefile +++ b/module/bdev/rbd/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = bdev_rbd.c bdev_rbd_rpc.c diff --git a/module/bdev/split/Makefile b/module/bdev/split/Makefile index 952c6bd6f..28de94ca3 100644 --- a/module/bdev/split/Makefile +++ b/module/bdev/split/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = vbdev_split.c vbdev_split_rpc.c diff --git a/module/bdev/uring/Makefile b/module/bdev/uring/Makefile index f2ddd371a..89311a0e3 100644 --- a/module/bdev/uring/Makefile +++ b/module/bdev/uring/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = bdev_uring.c bdev_uring_rpc.c diff --git a/module/bdev/virtio/Makefile b/module/bdev/virtio/Makefile index 002edfad6..05a5aa356 100644 --- a/module/bdev/virtio/Makefile +++ b/module/bdev/virtio/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = bdev_virtio_scsi.c bdev_virtio_blk.c bdev_virtio_rpc.c diff --git a/module/bdev/zone_block/Makefile b/module/bdev/zone_block/Makefile index 26001d184..7f0ee7be3 100644 --- a/module/bdev/zone_block/Makefile +++ b/module/bdev/zone_block/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = vbdev_zone_block.c vbdev_zone_block_rpc.c diff --git a/module/blob/bdev/Makefile b/module/blob/bdev/Makefile index 53a0b0248..6878b0838 100644 --- a/module/blob/bdev/Makefile +++ b/module/blob/bdev/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 6 +SO_VER := 7 SO_MINOR := 0 C_SRCS = blob_bdev.c diff --git a/module/blobfs/bdev/Makefile b/module/blobfs/bdev/Makefile index 8b1e84084..0b07b223b 100644 --- a/module/blobfs/bdev/Makefile +++ b/module/blobfs/bdev/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = blobfs_bdev.c blobfs_bdev_rpc.c diff --git a/module/env_dpdk/Makefile b/module/env_dpdk/Makefile index 2c60470ae..939dcf382 100644 --- a/module/env_dpdk/Makefile +++ b/module/env_dpdk/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = env_dpdk_rpc.c diff --git a/module/event/subsystems/accel/Makefile b/module/event/subsystems/accel/Makefile index d5553981a..0dbb77cab 100644 --- a/module/event/subsystems/accel/Makefile +++ b/module/event/subsystems/accel/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = accel.c diff --git a/module/event/subsystems/bdev/Makefile b/module/event/subsystems/bdev/Makefile index cbd004826..1a4bc662f 100644 --- a/module/event/subsystems/bdev/Makefile +++ b/module/event/subsystems/bdev/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = bdev.c diff --git a/module/event/subsystems/iscsi/Makefile b/module/event/subsystems/iscsi/Makefile index 0350ad6fd..a71766f41 100644 --- a/module/event/subsystems/iscsi/Makefile +++ b/module/event/subsystems/iscsi/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib diff --git a/module/event/subsystems/nbd/Makefile b/module/event/subsystems/nbd/Makefile index a301520c2..e4311a45a 100644 --- a/module/event/subsystems/nbd/Makefile +++ b/module/event/subsystems/nbd/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = nbd.c diff --git a/module/event/subsystems/nvmf/Makefile b/module/event/subsystems/nvmf/Makefile index 6a2fd79bb..4f53c7eeb 100644 --- a/module/event/subsystems/nvmf/Makefile +++ b/module/event/subsystems/nvmf/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = nvmf_rpc.c nvmf_tgt.c diff --git a/module/event/subsystems/scheduler/Makefile b/module/event/subsystems/scheduler/Makefile index 0dc3443b7..79c646cc9 100644 --- a/module/event/subsystems/scheduler/Makefile +++ b/module/event/subsystems/scheduler/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = scheduler.c diff --git a/module/event/subsystems/scsi/Makefile b/module/event/subsystems/scsi/Makefile index 9393b262a..50d3d39be 100644 --- a/module/event/subsystems/scsi/Makefile +++ b/module/event/subsystems/scsi/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = scsi.c diff --git a/module/event/subsystems/sock/Makefile b/module/event/subsystems/sock/Makefile index e901c9937..4850c876f 100644 --- a/module/event/subsystems/sock/Makefile +++ b/module/event/subsystems/sock/Makefile @@ -33,7 +33,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = sock.c diff --git a/module/event/subsystems/vhost/Makefile b/module/event/subsystems/vhost/Makefile index 3bee09bd4..3f24fa716 100644 --- a/module/event/subsystems/vhost/Makefile +++ b/module/event/subsystems/vhost/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = vhost.c diff --git a/module/event/subsystems/vmd/Makefile b/module/event/subsystems/vmd/Makefile index ccc470c5a..882bf0899 100644 --- a/module/event/subsystems/vmd/Makefile +++ b/module/event/subsystems/vmd/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = vmd.c vmd_rpc.c diff --git a/module/scheduler/dpdk_governor/Makefile b/module/scheduler/dpdk_governor/Makefile index 5acf4ab3f..bc25ab8ac 100644 --- a/module/scheduler/dpdk_governor/Makefile +++ b/module/scheduler/dpdk_governor/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/module/scheduler/dynamic/Makefile b/module/scheduler/dynamic/Makefile index 7bb47657e..ea43157aa 100644 --- a/module/scheduler/dynamic/Makefile +++ b/module/scheduler/dynamic/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 LIBNAME = scheduler_dynamic diff --git a/module/scheduler/gscheduler/Makefile b/module/scheduler/gscheduler/Makefile index 8dc119c61..b703998c7 100644 --- a/module/scheduler/gscheduler/Makefile +++ b/module/scheduler/gscheduler/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 +SO_VER := 2 SO_MINOR := 0 LIBNAME = scheduler_gscheduler diff --git a/module/sock/posix/Makefile b/module/sock/posix/Makefile index 186f60d43..6db0f4692 100644 --- a/module/sock/posix/Makefile +++ b/module/sock/posix/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 LIBNAME = sock_posix diff --git a/module/sock/uring/Makefile b/module/sock/uring/Makefile index faa3d97c8..dc714260a 100644 --- a/module/sock/uring/Makefile +++ b/module/sock/uring/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 LIBNAME = sock_uring diff --git a/shared_lib/Makefile b/shared_lib/Makefile index 9fd29eeb2..fd9a91e00 100644 --- a/shared_lib/Makefile +++ b/shared_lib/Makefile @@ -36,7 +36,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk -SO_VER := 3 +SO_VER := 4 SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index 30f5a0edc..a03292455 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -132,6 +132,8 @@ EOF fi if [[ $so_name_changed == yes ]]; then + # After 22.01 LTS all SO major versions were intentionally increased. Disable this check until SPDK 22.05 release. + found_abi_change=true if ! $found_abi_change; then echo "SO name for $so_file changed without a change to abi. please revert that change." touch $fail_file