Commit 2ce9836b authored by Maciej Szwed's avatar Maciej Szwed Committed by Jim Harris
Browse files

bdev: add delete_null_bdev call 



Since delete_bdev should be used only for debug purpose,
this patch adds delete call specific for null bdev.

Changes in spdkcli done accordingly.

Signed-off-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Change-Id: I576322257e5cf70ec03d6b20f8ba43bfce222907
Reviewed-on: https://review.gerrithub.io/416505


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 459af2f0

lib/bdev/null/bdev_null.c

+11 −0
Original line number Diff line number Diff line
@@ -214,6 +214,17 @@ create_null_bdev(const char *name, const struct spdk_uuid *uuid, 
	return &bdev->bdev;

}



void

delete_null_bdev(struct spdk_bdev *bdev, spdk_delete_null_complete cb_fn, void *cb_arg)

{

	if (!bdev || bdev->module != &null_if) {

		cb_fn(cb_arg, -ENODEV);

		return;

	}



	spdk_bdev_unregister(bdev, cb_fn, cb_arg);

}



static int

null_io_poll(void *arg)

{

lib/bdev/null/bdev_null.h

+12 −0
Original line number Diff line number Diff line
@@ -36,10 +36,22 @@ 


#include "spdk/stdinc.h"



typedef void (*spdk_delete_null_complete)(void *cb_arg, int bdeverrno);



struct spdk_bdev;

struct spdk_uuid;



struct spdk_bdev *create_null_bdev(const char *name, const struct spdk_uuid *uuid,

				   uint64_t num_blocks, uint32_t block_size);



/**

 * Delete null bdev.

 *

 * \param bdev Pointer to null bdev.

 * \param cb_fn Function to call after deletion.

 * \param cb_arg Argument to pass to cb_fn.

 */

void delete_null_bdev(struct spdk_bdev *bdev, spdk_delete_null_complete cb_fn,

		      void *cb_arg);



#endif /* SPDK_BDEV_NULL_H */

lib/bdev/null/bdev_null_rpc.c

+63 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


#include "spdk/rpc.h"

#include "spdk/util.h"



#include "spdk/string.h"

#include "spdk/bdev_module.h"

#include "spdk_internal/log.h"
@@ -105,3 +105,65 @@ invalid: 
	free_rpc_construct_null(&req);

}

SPDK_RPC_REGISTER("construct_null_bdev", spdk_rpc_construct_null_bdev, SPDK_RPC_RUNTIME)



struct rpc_delete_null {

	char *name;

};



static void

free_rpc_delete_null(struct rpc_delete_null *req)

{

	free(req->name);

}



static const struct spdk_json_object_decoder rpc_delete_null_decoders[] = {

	{"name", offsetof(struct rpc_delete_null, name), spdk_json_decode_string},

};



static void

_spdk_rpc_delete_null_bdev_cb(void *cb_arg, int bdeverrno)

{

	struct spdk_jsonrpc_request *request = cb_arg;

	struct spdk_json_write_ctx *w;



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, bdeverrno == 0);

	spdk_jsonrpc_end_result(request, w);

}



static void

spdk_rpc_delete_null_bdev(struct spdk_jsonrpc_request *request,

			  const struct spdk_json_val *params)

{

	struct rpc_delete_null req = {NULL};

	struct spdk_bdev *bdev;

	int rc;



	if (spdk_json_decode_object(params, rpc_delete_null_decoders,

				    SPDK_COUNTOF(rpc_delete_null_decoders),

				    &req)) {

		rc = -EINVAL;

		goto invalid;

	}



	bdev = spdk_bdev_get_by_name(req.name);

	if (bdev == NULL) {

		rc = -ENODEV;

		goto invalid;

	}



	delete_null_bdev(bdev, _spdk_rpc_delete_null_bdev_cb, request);



	free_rpc_delete_null(&req);



	return;



invalid:

	free_rpc_delete_null(&req);

	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));

}

SPDK_RPC_REGISTER("delete_null_bdev", spdk_rpc_delete_null_bdev, SPDK_RPC_RUNTIME)

scripts/rpc.py

+9 −0
Original line number Diff line number Diff line
@@ -178,6 +178,15 @@ if __name__ == "__main__": 
    p.add_argument('block_size', help='Block size for this bdev', type=int)

    p.set_defaults(func=construct_null_bdev)



    @call_cmd

    def delete_null_bdev(args):

        rpc.bdev.delete_null_bdev(args.client,

                                  name=args.name)



    p = subparsers.add_parser('delete_null_bdev', help='Delete a null bdev')

    p.add_argument('name', help='null bdev name')

    p.set_defaults(func=delete_null_bdev)



    @call_cmd

    def construct_aio_bdev(args):

        print(rpc.bdev.construct_aio_bdev(args.client,

scripts/rpc/bdev.py

+10 −0
Original line number Diff line number Diff line
@@ -64,6 +64,16 @@ def construct_null_bdev(client, num_blocks, block_size, name, uuid=None): 
    return client.call('construct_null_bdev', params)





def delete_null_bdev(client, name):

    """Remove null bdev from the system.



    Args:

        name: name of null bdev to delete

    """

    params = {'name': name}

    return client.call('delete_null_bdev', params)





def construct_aio_bdev(client, filename, name, block_size=None):

    """Construct a Linux AIO block device.