Commit 40c959cb authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

RPC: rename RPC crypto_bdev series 



RPC: rename RPC delete_crypto_bdev to bdev_crypto_delete
RPC: rename RPC construct_crypto_bdev to bdev_crypto_create

Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Ib93714504ee7a97cbbe36457f7826f0af69b1fe5
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465057


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 9a91a45c

doc/bdev.md

+3 −3
Original line number Diff line number Diff line
@@ -199,15 +199,15 @@ may cause problems in some use cases. 


Example command



`rpc.py construct_crypto_bdev NVMe1n1 CryNvmeA crypto_aesni_mb 0123456789123456`

`rpc.py bdev_crypto_create NVMe1n1 CryNvmeA crypto_aesni_mb 0123456789123456`



This command will create a crypto vbdev called 'CryNvmeA' on top of the NVMe bdev

'NVMe1n1' and will use the DPDK software driver 'crypto_aesni_mb' and the key

'0123456789123456'.



To remove the vbdev use the delete_crypto_bdev command.

To remove the vbdev use the bdev_crypto_delete command.



`rpc.py delete_crypto_bdev CryNvmeA`

`rpc.py bdev_crypto_delete CryNvmeA`



# Delay Bdev Module {#bdev_config_delay}

lib/bdev/crypto/vbdev_crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ vbdev_crypto_config_json(struct spdk_json_write_ctx *w) 


	TAILQ_FOREACH(crypto_bdev, &g_vbdev_crypto, link) {

		spdk_json_write_object_begin(w);

		spdk_json_write_named_string(w, "method", "construct_crypto_bdev");

		spdk_json_write_named_string(w, "method", "bdev_crypto_create");

		spdk_json_write_named_object_begin(w, "params");

		spdk_json_write_named_string(w, "base_bdev_name", spdk_bdev_get_name(crypto_bdev->base_bdev));

		spdk_json_write_named_string(w, "name", spdk_bdev_get_name(&crypto_bdev->crypto_bdev));

lib/bdev/crypto/vbdev_crypto_rpc.c

+9 −7
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static const struct spdk_json_object_decoder rpc_construct_crypto_decoders[] = { 
 * device. Error status returned in the failed cases.

 */

static void

spdk_rpc_construct_crypto_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_crypto_create(struct spdk_jsonrpc_request *request,

			    const struct spdk_json_val *params)

{

	struct rpc_construct_crypto req = {NULL};
@@ -95,7 +95,8 @@ spdk_rpc_construct_crypto_bdev(struct spdk_jsonrpc_request *request, 
cleanup:

	free_rpc_construct_crypto(&req);

}

SPDK_RPC_REGISTER("construct_crypto_bdev", spdk_rpc_construct_crypto_bdev, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_crypto_create", spdk_rpc_bdev_crypto_create, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_crypto_create, construct_crypto_bdev)



struct rpc_delete_crypto {

	char *name;
@@ -112,7 +113,7 @@ static const struct spdk_json_object_decoder rpc_delete_crypto_decoders[] = { 
};



static void

_spdk_rpc_delete_crypto_bdev_cb(void *cb_arg, int bdeverrno)

_spdk_rpc_bdev_crypto_delete_cb(void *cb_arg, int bdeverrno)

{

	struct spdk_jsonrpc_request *request = cb_arg;

	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
@@ -122,7 +123,7 @@ _spdk_rpc_delete_crypto_bdev_cb(void *cb_arg, int bdeverrno) 
}



static void

spdk_rpc_delete_crypto_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_crypto_delete(struct spdk_jsonrpc_request *request,

			    const struct spdk_json_val *params)

{

	struct rpc_delete_crypto req = {NULL};
@@ -142,7 +143,7 @@ spdk_rpc_delete_crypto_bdev(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	delete_crypto_disk(bdev, _spdk_rpc_delete_crypto_bdev_cb, request);

	delete_crypto_disk(bdev, _spdk_rpc_bdev_crypto_delete_cb, request);



	free_rpc_delete_crypto(&req);
@@ -151,4 +152,5 @@ spdk_rpc_delete_crypto_bdev(struct spdk_jsonrpc_request *request, 
cleanup:

	free_rpc_delete_crypto(&req);

}

SPDK_RPC_REGISTER("delete_crypto_bdev", spdk_rpc_delete_crypto_bdev, SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER("bdev_crypto_delete", spdk_rpc_bdev_crypto_delete, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_crypto_delete, delete_crypto_bdev)

scripts/rpc.py

+12 −12
Original line number Diff line number Diff line
@@ -161,27 +161,27 @@ if __name__ == "__main__": 
    p.add_argument('-p', '--pmd', type=int, help='0 = auto-select, 1= QAT only, 2 = ISAL only')

    p.set_defaults(func=set_compress_pmd)



    def construct_crypto_bdev(args):

        print_json(rpc.bdev.construct_crypto_bdev(args.client,

    def bdev_crypto_create(args):

        print_json(rpc.bdev.bdev_crypto_create(args.client,

                                               base_bdev_name=args.base_bdev_name,

                                               name=args.name,

                                               crypto_pmd=args.crypto_pmd,

                                               key=args.key))

    p = subparsers.add_parser('construct_crypto_bdev',

    p = subparsers.add_parser('bdev_crypto_create',

                              help='Add a crypto vbdev')

    p.add_argument('base_bdev_name', help="Name of the base bdev")

    p.add_argument('name', help="Name of the crypto vbdev")

    p.add_argument('crypto_pmd', help="Name of the crypto device driver")

    p.add_argument('key', help="Key")

    p.set_defaults(func=construct_crypto_bdev)

    p.set_defaults(func=bdev_crypto_create)



    def delete_crypto_bdev(args):

        rpc.bdev.delete_crypto_bdev(args.client,

    def bdev_crypto_delete(args):

        rpc.bdev.bdev_crypto_delete(args.client,

                                    name=args.name)



    p = subparsers.add_parser('delete_crypto_bdev', help='Delete a crypto disk')

    p = subparsers.add_parser('bdev_crypto_delete', help='Delete a crypto disk')

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

    p.set_defaults(func=delete_crypto_bdev)

    p.set_defaults(func=bdev_crypto_delete)



    def construct_ocf_bdev(args):

        print_json(rpc.bdev.construct_ocf_bdev(args.client,

scripts/rpc/bdev.py

+6 −4
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ def set_compress_pmd(client, pmd): 
    return client.call('set_compress_pmd', params)





def construct_crypto_bdev(client, base_bdev_name, name, crypto_pmd, key):

@deprecated_alias('construct_crypto_bdev')

def bdev_crypto_create(client, base_bdev_name, name, crypto_pmd, key):

    """Construct a crypto virtual block device.



    Args:
@@ -70,17 +71,18 @@ def construct_crypto_bdev(client, base_bdev_name, name, crypto_pmd, key): 
    """

    params = {'base_bdev_name': base_bdev_name, 'name': name, 'crypto_pmd': crypto_pmd, 'key': key}



    return client.call('construct_crypto_bdev', params)

    return client.call('bdev_crypto_create', params)





def delete_crypto_bdev(client, name):

@deprecated_alias('delete_crypto_bdev')

def bdev_crypto_delete(client, name):

    """Delete crypto virtual block device.



    Args:

        name: name of crypto vbdev to delete

    """

    params = {'name': name}

    return client.call('delete_crypto_bdev', params)

    return client.call('bdev_crypto_delete', params)





def construct_ocf_bdev(client, name, mode, cache_bdev_name, core_bdev_name):