From e4070ee0e012c345f4c059f125f4f9ce3be66690 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Fri, 29 Jan 2021 05:11:25 -0500 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 quarterly 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 21.04 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: I44d01154430a074103bd21c7084f44932e81fe72 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6167 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/accel/Makefile | 2 +- lib/bdev/Makefile | 2 +- lib/blob/Makefile | 2 +- lib/blobfs/Makefile | 2 +- lib/conf/Makefile | 4 ++-- lib/env_dpdk/Makefile | 4 ++-- lib/event/Makefile | 2 +- lib/ftl/Makefile | 2 +- lib/ioat/Makefile | 2 +- lib/iscsi/Makefile | 2 +- lib/json/Makefile | 4 ++-- lib/jsonrpc/Makefile | 4 ++-- lib/log/Makefile | 4 ++-- lib/lvol/Makefile | 2 +- lib/nbd/Makefile | 2 +- lib/net/Makefile | 2 +- lib/notify/Makefile | 2 +- lib/nvmf/Makefile | 2 +- lib/rdma/Makefile | 4 ++-- lib/reduce/Makefile | 2 +- lib/rpc/Makefile | 2 +- lib/scsi/Makefile | 4 ++-- lib/sock/Makefile | 2 +- lib/thread/Makefile | 2 +- lib/trace/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/net/Makefile | 2 +- module/event/subsystems/nvmf/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/sock/posix/Makefile | 2 +- module/sock/uring/Makefile | 2 +- shared_lib/Makefile | 2 +- test/make/check_so_deps.sh | 13 ++----------- 71 files changed, 80 insertions(+), 89 deletions(-) diff --git a/lib/accel/Makefile b/lib/accel/Makefile index b196ed3cc..7b11d8c3b 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 := 4 +SO_VER := 5 SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile index 795fa6e1a..4b9f3f098 100644 --- a/lib/bdev/Makefile +++ b/lib/bdev/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 ifeq ($(CONFIG_VTUNE),y) diff --git a/lib/blob/Makefile b/lib/blob/Makefile index b02fad5cf..19263199e 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 := 4 +SO_VER := 5 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 d0c46de02..04219fc46 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 := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = blobfs.c tree.c diff --git a/lib/conf/Makefile b/lib/conf/Makefile index 09966ea12..1f822355d 100644 --- a/lib/conf/Makefile +++ b/lib/conf/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 -SO_MINOR := 1 +SO_VER := 3 +SO_MINOR := 0 C_SRCS = conf.c LIBNAME = conf diff --git a/lib/env_dpdk/Makefile b/lib/env_dpdk/Makefile index f29182a5a..9c0175911 100644 --- a/lib/env_dpdk/Makefile +++ b/lib/env_dpdk/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 CFLAGS += $(ENV_CFLAGS) C_SRCS = env.c memory.c pci.c init.c threads.c diff --git a/lib/event/Makefile b/lib/event/Makefile index 8da1c67a4..359bfe81f 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 := 7 +SO_VER := 8 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/lib/ftl/Makefile b/lib/ftl/Makefile index c24274622..81330da87 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = ftl_band.c ftl_core.c ftl_debug.c ftl_io.c ftl_reloc.c \ diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile index 4cada5685..045c9f4d2 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 := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = ioat.c diff --git a/lib/iscsi/Makefile b/lib/iscsi/Makefile index a3556f2cd..668c2ab3d 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 := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib diff --git a/lib/json/Makefile b/lib/json/Makefile index f22cd07b4..80b31981c 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 := 2 -SO_MINOR := 1 +SO_VER := 3 +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 7afd832ff..7553cee29 100644 --- a/lib/jsonrpc/Makefile +++ b/lib/jsonrpc/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 -SO_MINOR := 1 +SO_VER := 3 +SO_MINOR := 0 LIBNAME = jsonrpc C_SRCS = jsonrpc_server.c jsonrpc_server_tcp.c diff --git a/lib/log/Makefile b/lib/log/Makefile index 291156350..7f25786cb 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 := 3 -SO_MINOR := 1 +SO_VER := 4 +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 6e9aaf4d7..f67628f55 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 := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = lvol.c diff --git a/lib/nbd/Makefile b/lib/nbd/Makefile index 3e9f0384a..702f34850 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 := 3 +SO_VER := 4 SO_MINOR := 0 LIBNAME = nbd diff --git a/lib/net/Makefile b/lib/net/Makefile index 918df6cfb..d86534722 100644 --- a/lib/net/Makefile +++ b/lib/net/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 = interface.c net_rpc.c diff --git a/lib/notify/Makefile b/lib/notify/Makefile index 82249a5b2..7069b6382 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = notify.c notify_rpc.c diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile index d1d35d0b0..e7eab45b9 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 := 7 +SO_VER := 8 SO_MINOR := 0 C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \ diff --git a/lib/rdma/Makefile b/lib/rdma/Makefile index 1403aff7b..122e92b61 100644 --- a/lib/rdma/Makefile +++ b/lib/rdma/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 1 -SO_MINOR := 1 +SO_VER := 2 +SO_MINOR := 0 SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_rdma.map) diff --git a/lib/reduce/Makefile b/lib/reduce/Makefile index fb417cd57..73958b16e 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = reduce.c diff --git a/lib/rpc/Makefile b/lib/rpc/Makefile index ead36f6ba..36911c934 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = rpc.c diff --git a/lib/scsi/Makefile b/lib/scsi/Makefile index b7d38e249..eac71c0ec 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 := 3 -SO_MINOR := 1 +SO_VER := 4 +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 27d1633be..d80b24ab2 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 := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = sock.c sock_rpc.c diff --git a/lib/thread/Makefile b/lib/thread/Makefile index 26d0d950f..de4a09d85 100644 --- a/lib/thread/Makefile +++ b/lib/thread/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 = thread.c diff --git a/lib/trace/Makefile b/lib/trace/Makefile index f9a3efb05..43e221f39 100644 --- a/lib/trace/Makefile +++ b/lib/trace/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 = trace.c trace_flags.c trace_rpc.c diff --git a/lib/ut_mock/Makefile b/lib/ut_mock/Makefile index f4087807f..f5ebd48c6 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = mock.c diff --git a/lib/util/Makefile b/lib/util/Makefile index b8a0cb525..f4eb147c2 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 := 2 -SO_MINOR := 1 +SO_VER := 3 +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 60009c434..bf958bf64 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 := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = vfio_user_pci.c vfio_user.c diff --git a/lib/vhost/Makefile b/lib/vhost/Makefile index ca77041b9..add7acd84 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 := 4 +SO_VER := 5 SO_MINOR := 0 CFLAGS += -I. diff --git a/lib/virtio/Makefile b/lib/virtio/Makefile index 8ea173c3b..4172ccedd 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 := 2 +SO_VER := 3 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/lib/vmd/Makefile b/lib/vmd/Makefile index 13813c559..692910166 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = vmd.c led.c diff --git a/module/accel/idxd/Makefile b/module/accel/idxd/Makefile index f2540f900..372885534 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 := 1 +SO_VER := 2 SO_MINOR := 0 LIBNAME = accel_idxd diff --git a/module/accel/ioat/Makefile b/module/accel/ioat/Makefile index 0e43adbb1..3f3d735e3 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 := 2 +SO_VER := 3 SO_MINOR := 0 LIBNAME = accel_ioat diff --git a/module/bdev/aio/Makefile b/module/bdev/aio/Makefile index 9f0e3a582..644e31d83 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 := 2 +SO_VER := 3 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 e3d889e67..a95ef72e9 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 := 2 +SO_VER := 3 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/crypto/Makefile b/module/bdev/crypto/Makefile index dbf96952d..9562ddcc4 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 := 2 +SO_VER := 3 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/module/bdev/delay/Makefile b/module/bdev/delay/Makefile index f043ca5a8..925fda92d 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 := 2 +SO_VER := 3 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/error/Makefile b/module/bdev/error/Makefile index e67a18530..fdd4b44a3 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 := 2 +SO_VER := 3 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 d0bfe1078..c81269418 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 := 2 +SO_VER := 3 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 db27dbc38..14969417c 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = gpt.c vbdev_gpt.c diff --git a/module/bdev/iscsi/Makefile b/module/bdev/iscsi/Makefile index 38ba8b709..6141a5ed9 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 := 2 +SO_VER := 3 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/lvol/Makefile b/module/bdev/lvol/Makefile index 2bd34f64e..8417e8e94 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 := 2 +SO_VER := 3 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 312ed0024..4db73241a 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 := 2 +SO_VER := 3 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 e179b01ed..48ea20f25 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 := 2 +SO_VER := 3 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 f9ddb2389..85145d9f1 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 := 3 +SO_VER := 4 SO_MINOR := 0 C_SRCS = bdev_nvme.c bdev_nvme_rpc.c nvme_rpc.c common.c bdev_ocssd.c bdev_ocssd_rpc.c diff --git a/module/bdev/ocf/Makefile b/module/bdev/ocf/Makefile index b931de106..16d3db581 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 := 2 +SO_VER := 3 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 c12b97691..0e706c2e0 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 := 2 +SO_VER := 3 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/pmem/Makefile b/module/bdev/pmem/Makefile index 3a918be78..2780272a4 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 := 2 +SO_VER := 3 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 452d32e79..d5f928af2 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 := 2 +SO_VER := 3 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ diff --git a/module/bdev/rbd/Makefile b/module/bdev/rbd/Makefile index 055e14dac..66b6d815b 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 := 3 +SO_VER := 4 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 830224c62..952c6bd6f 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 := 2 +SO_VER := 3 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 2a97f1564..f2ddd371a 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 := 2 +SO_VER := 3 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 602927afe..002edfad6 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 := 2 +SO_VER := 3 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 3dec8a37d..26001d184 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 := 2 +SO_VER := 3 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 9daf4551b..842060219 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 := 4 +SO_VER := 5 SO_MINOR := 0 C_SRCS = blob_bdev.c diff --git a/module/blobfs/bdev/Makefile b/module/blobfs/bdev/Makefile index 97d350d30..8b1e84084 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 := 2 +SO_VER := 3 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 6585c676a..2c60470ae 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = env_dpdk_rpc.c diff --git a/module/event/subsystems/accel/Makefile b/module/event/subsystems/accel/Makefile index 6c8045984..d5553981a 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = accel.c diff --git a/module/event/subsystems/bdev/Makefile b/module/event/subsystems/bdev/Makefile index 4503e327a..cbd004826 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = bdev.c diff --git a/module/event/subsystems/iscsi/Makefile b/module/event/subsystems/iscsi/Makefile index f418f8bd9..0350ad6fd 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 := 2 +SO_VER := 3 SO_MINOR := 0 CFLAGS += -I$(SPDK_ROOT_DIR)/lib diff --git a/module/event/subsystems/nbd/Makefile b/module/event/subsystems/nbd/Makefile index 6991ce76d..a301520c2 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = nbd.c diff --git a/module/event/subsystems/net/Makefile b/module/event/subsystems/net/Makefile index b90cffae4..9149c7b28 100644 --- a/module/event/subsystems/net/Makefile +++ b/module/event/subsystems/net/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 = net.c diff --git a/module/event/subsystems/nvmf/Makefile b/module/event/subsystems/nvmf/Makefile index b09396d0e..6a2fd79bb 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = nvmf_rpc.c nvmf_tgt.c diff --git a/module/event/subsystems/scsi/Makefile b/module/event/subsystems/scsi/Makefile index 5d7fc3038..9393b262a 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = scsi.c diff --git a/module/event/subsystems/sock/Makefile b/module/event/subsystems/sock/Makefile index 5a137d88d..e901c9937 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 := 1 +SO_VER := 2 SO_MINOR := 0 C_SRCS = sock.c diff --git a/module/event/subsystems/vhost/Makefile b/module/event/subsystems/vhost/Makefile index a31bba91f..3bee09bd4 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = vhost.c diff --git a/module/event/subsystems/vmd/Makefile b/module/event/subsystems/vmd/Makefile index 2089a2b9d..ccc470c5a 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 := 2 +SO_VER := 3 SO_MINOR := 0 C_SRCS = vmd.c vmd_rpc.c diff --git a/module/sock/posix/Makefile b/module/sock/posix/Makefile index 9783e024d..186f60d43 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 := 2 +SO_VER := 3 SO_MINOR := 0 LIBNAME = sock_posix diff --git a/module/sock/uring/Makefile b/module/sock/uring/Makefile index 2d0e7c4e2..faa3d97c8 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 := 1 +SO_VER := 2 SO_MINOR := 0 LIBNAME = sock_uring diff --git a/shared_lib/Makefile b/shared_lib/Makefile index fe34c8659..9fd29eeb2 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 := 2 +SO_VER := 3 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 fd58e87d0..444f9d4dd 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -49,17 +49,6 @@ function confirm_abi_deps() { fi cat << EOF > ${suppression_file} -[suppress_type] - name = spdk_nvme_ctrlr_data -[suppress_type] - type_kind = enum - changed_enumerators = SPDK_BDEV_NUM_IO_TYPES -[suppress_type] - name = spdk_env_opts -[suppress_type] - name = spdk_app_opts -[suppress_type] - name = spdk_thread EOF for object in "$libdir"/libspdk_*.so; do @@ -143,6 +132,8 @@ EOF fi if [[ $so_name_changed == yes ]]; then + # After 21.01 LTS all SO major versions were intentionally increased. Disable this check until SPDK 21.04 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