From c5224a96ae5d68954845a11b812b3d020b4e8015 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 7 Mar 2023 20:45:01 +0000 Subject: [PATCH] ocf: clarify deprecation notice Huawei is working on picking up support for OCF and the associated SPDK bdev module, after Intel discontinued support. So clarify various docs and strings to reflect this for now. If everything goes according to plan, deprecation notice will get removed before 23.05 release. If not, SPDK will just keep the deprecation notice for 23.05, keep the code in-tree, and give another release cycle to get things worked out. Signed-off-by: Jim Harris Change-Id: I9ac6bf2f509005956440b41516ca00b0c1997361 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17085 Community-CI: Mellanox Build Bot Reviewed-by: Amir Haroush Reviewed-by: Aleksey Marchuk Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker --- configure | 1 - deprecation.md | 7 +++++-- module/bdev/ocf/vbdev_ocf.c | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure b/configure index f5557ce2c..9c60289ed 100755 --- a/configure +++ b/configure @@ -1115,7 +1115,6 @@ if echo -e '#include \nint main(void) { uuid_generate_sha1(NULL, NU fi if [[ "${CONFIG[OCF]}" = "y" ]]; then - echo "WARNING: OCF - bdev_ocf is deprecated." # If OCF_PATH is a file, assume it is a library and use it to compile with if [ -f ${CONFIG[OCF_PATH]} ]; then CONFIG[CUSTOMOCF]=y diff --git a/deprecation.md b/deprecation.md index 54fcf0e8d..efeaca5d6 100644 --- a/deprecation.md +++ b/deprecation.md @@ -44,8 +44,11 @@ VTune integration is in now deprecated and will be removed in SPDK 23.05. #### `bdev_ocf` -The Open CAS Framework (OCF) integration via bdev module and env_ocf is now deprecated -and will be removed in SPDK 23.05. +The Open CAS Framework (OCF) integration via bdev module and env_ocf is currently marked +deprecated due to discontinued support from Intel. However, Huawei is working to pick up +support for these components, and the OCF project in general. This code will definitely +remain in SPDK 23.05 release, in fact it is likely deprecation notice will be removed by +then. ### nvme diff --git a/module/bdev/ocf/vbdev_ocf.c b/module/bdev/ocf/vbdev_ocf.c index 0c12856f0..003e36860 100644 --- a/module/bdev/ocf/vbdev_ocf.c +++ b/module/bdev/ocf/vbdev_ocf.c @@ -1256,7 +1256,10 @@ error_free: return rc; } -SPDK_LOG_DEPRECATION_REGISTER(bdev_ocf, "bdev_ocf support", "SPDK 23.05", 0); +/* This deprecation is likely to be removed, and the ocf support will remain + * in SPDK. See deprecation.md for more details. + */ +SPDK_LOG_DEPRECATION_REGISTER(bdev_ocf, "bdev_ocf support", "SPDK 23.09", 0); /* Read configuration file at the start of SPDK application * This adds vbdevs to global list if some mentioned in config */ @@ -1265,8 +1268,6 @@ vbdev_ocf_init(void) { int status; - SPDK_LOG_DEPRECATED(bdev_ocf); - status = vbdev_ocf_ctx_init(); if (status) { SPDK_ERRLOG("OCF ctx initialization failed with=%d\n", status);