Commit 1df4f4bb authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Jim Harris
Browse files

sock: remove global PSK related code 



We will no longer support setting global PSK and PSK
identity via sock_impl_set_options RPC - PSK related
operations are now handled by TCP transport.

Change-Id: I41d28dafc25696f98fd68239675bb1ce85629045
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17603


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent aabfea70

doc/jsonrpc.md

+2 −8
Original line number Diff line number Diff line
@@ -11232,9 +11232,7 @@ Example response: 
    "enable_zerocopy_send_client": false,

    "zerocopy_threshold": 0,

    "tls_version": 13,

    "enable_ktls": false,

    "psk_key": "1234567890ABCDEF",

    "psk_identity": "psk.spdk.io"

    "enable_ktls": false

  }

}

~~~
@@ -11259,8 +11257,6 @@ zerocopy_threshold | Optional | number | Set zerocopy_threshold in 
--                          | --       | --          | that fall below this threshold may be sent without zerocopy flag set

tls_version                 | Optional | number      | TLS protocol version, e.g. 13 for v1.3 (only applies when impl_name == ssl)

enable_ktls                 | Optional | boolean     | Enable or disable Kernel TLS (only applies when impl_name == ssl)

psk_key                     | Optional | string      | Default PSK KEY in hexadecimal digits, e.g. 1234567890ABCDEF (only applies when impl_name == ssl)

psk_identity                | Optional | string      | Default PSK ID, e.g. psk.spdk.io (only applies when impl_name == ssl)



#### Response
@@ -11286,9 +11282,7 @@ Example request: 
    "enable_zerocopy_send_client": false,

    "zerocopy_threshold": 10240,

    "tls_version": 13,

    "enable_ktls": false,

    "psk_key": "1234567890ABCDEF",

    "psk_identity": "psk.spdk.io"

    "enable_ktls": false

  }

}

~~~

lib/sock/sock.c

+0 −6
Original line number Diff line number Diff line
@@ -910,12 +910,6 @@ spdk_sock_write_config_json(struct spdk_json_write_ctx *w) 
			spdk_json_write_named_uint32(w, "zerocopy_threshold", opts.zerocopy_threshold);

			spdk_json_write_named_uint32(w, "tls_version", opts.tls_version);

			spdk_json_write_named_bool(w, "enable_ktls", opts.enable_ktls);

			if (opts.psk_key) {

				spdk_json_write_named_string(w, "psk_key", opts.psk_key);

			}

			if (opts.psk_identity) {

				spdk_json_write_named_string(w, "psk_identity", opts.psk_identity);

			}

			spdk_json_write_object_end(w);

			spdk_json_write_object_end(w);

		} else {

lib/sock/sock_rpc.c

+0 −14
Original line number Diff line number Diff line
@@ -55,12 +55,6 @@ rpc_sock_impl_get_options(struct spdk_jsonrpc_request *request, 
	spdk_json_write_named_uint32(w, "zerocopy_threshold", sock_opts.zerocopy_threshold);

	spdk_json_write_named_uint32(w, "tls_version", sock_opts.tls_version);

	spdk_json_write_named_bool(w, "enable_ktls", sock_opts.enable_ktls);

	if (sock_opts.psk_key) {

		spdk_json_write_named_string(w, "psk_key", sock_opts.psk_key);

	}

	if (sock_opts.psk_identity) {

		spdk_json_write_named_string(w, "psk_identity", sock_opts.psk_identity);

	}

	spdk_json_write_object_end(w);

	spdk_jsonrpc_end_result(request, w);

	free(impl_name);
@@ -117,14 +111,6 @@ static const struct spdk_json_object_decoder rpc_sock_impl_set_opts_decoders[] = 
	{

		"enable_ktls", offsetof(struct spdk_rpc_sock_impl_set_opts, sock_opts.enable_ktls),

		spdk_json_decode_bool, true

	},

	{

		"psk_key", offsetof(struct spdk_rpc_sock_impl_set_opts, sock_opts.psk_key),

		spdk_json_decode_string, true

	},

	{

		"psk_identity", offsetof(struct spdk_rpc_sock_impl_set_opts, sock_opts.psk_identity),

		spdk_json_decode_string, true

	}

};

python/spdk/rpc/sock.py

+1 −9
Original line number Diff line number Diff line
@@ -27,9 +27,7 @@ def sock_impl_set_options(client, 
                          enable_zerocopy_send_client=None,

                          zerocopy_threshold=None,

                          tls_version=None,

                          enable_ktls=None,

                          psk_key=None,

                          psk_identity=None):

                          enable_ktls=None):

    """Set parameters for the socket layer implementation.



    Args:
@@ -44,8 +42,6 @@ def sock_impl_set_options(client, 
        zerocopy_threshold: set zerocopy_threshold in bytes(optional)

        tls_version: set TLS protocol version (optional)

        enable_ktls: enable or disable Kernel TLS (optional)

        psk_key: set psk_key (optional)

        psk_identity: set psk_identity (optional)

    """

    params = {}
@@ -70,10 +66,6 @@ def sock_impl_set_options(client, 
        params['tls_version'] = tls_version

    if enable_ktls is not None:

        params['enable_ktls'] = enable_ktls

    if psk_key is not None:

        params['psk_key'] = psk_key

    if psk_identity is not None:

        params['psk_identity'] = psk_identity



    return client.call('sock_impl_set_options', params)

scripts/rpc.py

+2 −6
Original line number Diff line number Diff line
@@ -3228,9 +3228,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                                       enable_zerocopy_send_client=args.enable_zerocopy_send_client,

                                       zerocopy_threshold=args.zerocopy_threshold,

                                       tls_version=args.tls_version,

                                       enable_ktls=args.enable_ktls,

                                       psk_key=args.psk_key,

                                       psk_identity=args.psk_identity)

                                       enable_ktls=args.enable_ktls)



    p = subparsers.add_parser('sock_impl_set_options', help="""Set options of socket layer implementation""")

    p.add_argument('-i', '--impl', help='Socket implementation name, e.g. posix', required=True)
@@ -3259,11 +3257,9 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                   action='store_true', dest='enable_ktls')

    p.add_argument('--disable-ktls', help='Disable Kernel TLS',

                   action='store_false', dest='enable_ktls')

    p.add_argument('--psk-key', help='Set default PSK KEY', dest='psk_key')

    p.add_argument('--psk-identity', help='Set default PSK ID', dest='psk_identity')

    p.set_defaults(func=sock_impl_set_options, enable_recv_pipe=None, enable_quickack=None,

                   enable_placement_id=None, enable_zerocopy_send_server=None, enable_zerocopy_send_client=None,

                   zerocopy_threshold=None, tls_version=None, enable_ktls=None, psk_key=None, psk_identity=None)

                   zerocopy_threshold=None, tls_version=None, enable_ktls=None)



    def sock_set_default_impl(args):

        print_json(rpc.sock.sock_set_default_impl(args.client,