From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.161.42 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795010991; b=TW9jmU3xcl+0RncjRoYaCzXirl7K7ewH3Gd/9SKpyN6CIGtrb2E4zUJyrFAbZOPLsF5/ T7K+tK2/WYy5s0/qTfsMLPvkDX1oEUI13uR72qjfgBTLw+aUFIMdYvvMlTPb/9RB6jzJc Lj3ZQbrEDKjX7Ur6Uu0s3fjIDNq5K0pjClU15syk72f0xcW62QJhJ7OJshJLtLTqs2dbR j8C5K5e5YlIiScH39Uucw/SEpRvQrn1zbG+Rv4RqSlJwWnGOdYnAWJBzSt5ccuvRtRIlv lx5SeYjcPvh7E7AWxjxvwLZM8YQJVH0dzVz3pBGzwMuKY23gERL3RTx0eaB0T42Bz3Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795010991; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=XAheLrxIyzbdT9JPYIudMidPXsJvcTTt6MqGrybJiMo=; b=bN3h3AYByRsyU9ghD7MK6KtB8cW2kxZDEsGLl7YgsLcjl1t/nfP1drTH2sA6+ZymmfVF Ckd+BQGpo2C5q4JulammuIBEABt0PD/7R+VRV05mFhENYJmApJMYYtlXv5aidI4CqZ8vn NioFQYgpKxok2gj3/2NNFJffM9WWkvbfiwZfOUuHP+pyqeIoM+LoGA+MWf+kKucdqDq2g QuD/EfCx7pozImhnFRCE//+I5BkLnpLuU6tzp2+rG+/XhjWd2mN53ct3lhc4wBA65nZ2l 1GXosk/D1OPKcBRVxC/iPmuA4QQadRUi/kxyU4J4VUDqL3lBpqqH89+Ilu2RTVfazSg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=jT9z8ZUs; arc=none smtp.remote-ip=209.85.161.42 Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8CBA60A262C for ; Wed, 18 Nov 2026 14:09:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A8CBA60A262C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=jT9z8ZUs Received: by mail-oo1-f42.google.com with SMTP id 006d021491bc7-6de2f213b7aso461741eaf.0 for ; Wed, 18 Nov 2026 06:09:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1795010989; x=1795615789; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=XAheLrxIyzbdT9JPYIudMidPXsJvcTTt6MqGrybJiMo=; b=jT9z8ZUsVYiBGxipChoWzCY5tmzAdRWCz0HJ5IWSPRXPhff3OUE3AEatyqayMpOLJU RRiJkKJOdnxGRlt2G0k5oQTp71Amz2gjMnh4qxTstm/wN2zaUWOddOvNayM6Q+SNKJeE QrZvpM1lQcEICLhxAY3C70lWW3DrbLS7dlTRoVXop8L+2EG6M5rlvzqkxzTeDwa1BZNW FXIEkuIS8MiTISs0xlkpuM8zWg5Plh99tFe6dCX4Ie8fm0VKJuB5dg02y8xkNmUW4vC0 nXOHPRSdHB1o4tRteJBiv2MyOQhKVrQog/0Fn3aWEQZ4V3mGXrvUSZQ1dZKzjIp9X9zK p5UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795010989; x=1795615789; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=XAheLrxIyzbdT9JPYIudMidPXsJvcTTt6MqGrybJiMo=; b=TvD4z0YqN4er/6AI6z6/zMJnXWlpBhzZ3ewicU5nNFeCieYQJHCdB9S1maWPyzhhly /CW/Fg6xK/snoU8JB/g7TTYDkdOTY4Q60Nwnc74ErxcQXE+eQPJDnIzefSvwEnk09x3Q t3Cono7ul+YU52fVm2HkwzHCpBOzsEOTZWg+1v2e++pIF1QA8oaurpEnl90IvQTKkKdb YPK1O+beQKa3+SCPPRsPbIAF0fCPJ/3eP9yAm+QNyoGO2x0/XWO4v+lW1MqfI0QJrrFg EdVLPYd4Y9k1RLC3k7TIcNMAqDmkKLIu/GWZyYsKewnYwWjPgC+o1E6jRNwvhCju+Y87 UzDw== X-Forwarded-Encrypted: i=1; AL+hErFYOi4p1cdsxzsuDO+JjVDMRQNKK5gj1if9yrGg49dQdqao0SRUpj5YWBy2iLMPf6q42C8f+4w=@vger.kernel.org X-Gm-Message-State: APuU4Z8IJxjsihpnjMD/ShWsdivjWtch/LXNQXtANYa60HcPZnP3KFed tTvtLKLQkc8XCNyU96EGwlIUnZ4uMDd1uZ052OF1rAKf08BsXIH8a+bC X-Gm-Gg: AYBFou0W+wkqepDjgTVmHP2NgdK++7OMpKXhHt/TjY7dHM5WfCuRYDs6a1W5KVo0T01 B1d3MKtqiQwP+07FhtlNOGh+vcaTtquumvgaU1W3U0QsFsqcwPRufQAnoIwb/RUuahgcVJ20ozx rtgUhRV+54WNFcJy5T2bqoLfY4u6CTizlMccY2fC+bF0x7F9//dtgQJLZjocEVrz51KMrPMTYlk wZCZYT2naiJBc2Q57b3ZxdfUcW1iFgSMF08jQ08M7c+0HBaSkmiEDfurxScSM9sjJhIvKK48irh 5M85WklGt65nag8uWWUYtresPWIbcMNzH5Uk9hYxfzW/+MzCjUStrWjwmXbj5sa/B4skWqGxDOm 0fSEjCK/XTOyAYZzhyCAW2OOBQSeizZPchDsMerm4TcfPiFC+doSbc/rZAkNjC6mBFO9ZxjvQvX RkU7X/f7Cq4/yMnaE3E9S+jId82mGAKVImebwgbQB9jE29TH5ieoXFgYIzvMsSWL8k3j2vZfiT7 62nzfHDmaGQpKp0nE1MtDoKFaKCyPfIop9TJyodCG/3JO3R+jIW93h59qxf11KvdI2u/q+Ms3+m mLihXLzCS9/nygEl7l0VsWmPCQ== X-Received: by 2002:a05:6820:55d6:20b0:6cd:3ffc:64cd with SMTP id 006d021491bc7-71b18600d04mr1037879eaf.72.1795010989519; Wed, 18 Nov 2026 06:09:49 -0800 (PST) Received: from localhost ([2a03:2880:30ff:1::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4b744126dfdsm2294761fac.10.2026.11.18.06.09.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 06:09:49 -0800 (PST) From: Daniel Zahka Date: Wed, 18 Nov 2026 06:08:07 -0800 Subject: [PATCH net-next v5 5/6] selftests: drv-net: psp: factor out psp connection setup X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261118-psp-v5-5-b9ec840e0296@gmail.com> References: <20261118-psp-v5-0-b9ec840e0296@gmail.com> In-Reply-To: <20261118-psp-v5-0-b9ec840e0296@gmail.com> To: Jakub Kicinski , Willem de Bruijn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Shuah Khan , Randy Dunlap , Donald Hunter , Andrew Lunn , Shuah Khan Cc: Daniel Zahka , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, Willem de Bruijn X-Mailer: b4 0.13.0 Lift out connection setup and PSP assoc uapi code in psp.py and responder, so that the key exchange sequence can be used in other test cases that start with a key exchange, but might choose to perform additional tx/rx assoc calls afterwards. Reviewed-by: Willem de Bruijn Signed-off-by: Daniel Zahka --- v4: - drop closing the data socket on conn_setup_psp() failure; preexisting and not needed by the series v3: - take key lengths from the kernel's rx-assoc reply instead of a per-version table - close the data socket in psp_responder if conn_setup_psp() fails --- tools/testing/selftests/drivers/net/psp.py | 14 ++++- .../testing/selftests/drivers/net/psp_responder.c | 73 ++++++++++++++-------- 2 files changed, 59 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/drivers/net/psp.py b/tools/testing/selftests/drivers/net/psp.py index 7c8fb2200b39..a6b46acf6bf8 100755 --- a/tools/testing/selftests/drivers/net/psp.py +++ b/tools/testing/selftests/drivers/net/psp.py @@ -467,10 +467,11 @@ def assoc_twice(cfg): ksft_eq(len(tx), 0) -def _data_basic_send(cfg, version, ipver): - """ Test basic data send """ - _init_psp_dev(cfg) +def _establish_psp_conn(cfg, version, ipver=None): + """Establish a PSP connection and return after key exchange + Requires _init_psp_dev() to have been called first. + """ # Version 0 is required by spec, don't let it skip if version: name = cfg.pspnl.consts["version"].entries_by_val[version].name @@ -495,7 +496,14 @@ def _data_basic_send(cfg, version, ipver): "version": version, "tx-key": tx, "sock-fd": s.fileno()}) + return s + + +def _data_basic_send(cfg, version, ipver): + """ Test basic data send """ + _init_psp_dev(cfg) + s = _establish_psp_conn(cfg, version, ipver) data_len = _send_careful(cfg, s, 100) _check_data_rx(cfg, data_len) _req_echo(cfg, s) diff --git a/tools/testing/selftests/drivers/net/psp_responder.c b/tools/testing/selftests/drivers/net/psp_responder.c index a26e7628bbb1..411a23be78d5 100644 --- a/tools/testing/selftests/drivers/net/psp_responder.c +++ b/tools/testing/selftests/drivers/net/psp_responder.c @@ -37,20 +37,15 @@ static struct { unsigned char rx; } psp_vers; -static int conn_setup_psp(struct ynl_sock *ys, struct opts *opts, int data_sock) +#define PSP_MAX_KEY_LEN 32 + +static int +rx_assoc(struct ynl_sock *ys, __u32 *spi, char *key, unsigned int *key_len, + int data_sock) { struct psp_rx_assoc_rsp *rsp; struct psp_rx_assoc_req *req; - struct psp_tx_assoc_rsp *tsp; - struct psp_tx_assoc_req *teq; - char info[300]; - int key_len; - ssize_t sz; - __u32 spi; - dbg("create PSP connection\n"); - - // Rx assoc alloc req = psp_rx_assoc_req_alloc(); psp_rx_assoc_req_set_sock_fd(req, data_sock); @@ -64,29 +59,28 @@ static int conn_setup_psp(struct ynl_sock *ys, struct opts *opts, int data_sock) return -1; } - // SPI exchange - key_len = rsp->rx_key._len.key; - memcpy(info, &rsp->rx_key.spi, sizeof(spi)); - memcpy(&info[sizeof(spi)], rsp->rx_key.key, key_len); - sz = sizeof(spi) + key_len; + *key_len = rsp->rx_key._len.key; + memcpy(spi, &rsp->rx_key.spi, sizeof(*spi)); + memcpy(key, rsp->rx_key.key, *key_len); - send(data_sock, info, sz, MSG_WAITALL); psp_rx_assoc_rsp_free(rsp); - sz = recv(data_sock, info, sz, MSG_WAITALL); - if (sz < 0) { - perror("ERROR: failed to read PSP key from sock"); - return -1; - } - memcpy(&spi, info, sizeof(spi)); + return 0; +} + +static int +tx_assoc(struct ynl_sock *ys, __u8 version, __u32 spi, char *key, + unsigned int key_len, int data_sock) +{ + struct psp_tx_assoc_rsp *tsp; + struct psp_tx_assoc_req *teq; - // Setup Tx assoc teq = psp_tx_assoc_req_alloc(); psp_tx_assoc_req_set_sock_fd(teq, data_sock); - psp_tx_assoc_req_set_version(teq, psp_vers.tx); + psp_tx_assoc_req_set_version(teq, version); psp_tx_assoc_req_set_tx_key_spi(teq, spi); - psp_tx_assoc_req_set_tx_key_key(teq, &info[sizeof(spi)], key_len); + psp_tx_assoc_req_set_tx_key_key(teq, key, key_len); tsp = psp_tx_assoc(ys, teq); psp_tx_assoc_req_free(teq); @@ -99,6 +93,35 @@ static int conn_setup_psp(struct ynl_sock *ys, struct opts *opts, int data_sock) return 0; } +static int conn_setup_psp(struct ynl_sock *ys, struct opts *opts, int data_sock) +{ + char info[sizeof(__u32) + PSP_MAX_KEY_LEN]; + unsigned int key_len; + ssize_t sz; + __u32 spi; + + dbg("create PSP connection\n"); + + if (rx_assoc(ys, &spi, &info[sizeof(spi)], &key_len, data_sock)) + return -1; + + // SPI exchange + memcpy(info, &spi, sizeof(spi)); + sz = sizeof(spi) + key_len; + + send(data_sock, info, sz, MSG_WAITALL); + + sz = recv(data_sock, info, sz, MSG_WAITALL); + if (sz < 0) { + perror("ERROR: failed to read PSP key from sock"); + return -1; + } + memcpy(&spi, info, sizeof(spi)); + + return tx_assoc(ys, psp_vers.tx, spi, &info[sizeof(spi)], key_len, + data_sock); +} + static void send_ack(int sock) { send(sock, "ack", 4, MSG_WAITALL); -- 2.52.1