From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2EA78322A16 for ; Thu, 25 Sep 2025 21:16:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758835019; cv=none; b=rvPHPJ89ZFDTwXO2iDVGJPTNIhuZm/xW06bY0jb2Ckjpou4tmIVRFCVH6BkfFoG3WKmT0miZf9H4lCUvwMs3On4vuw9Oh7S/ZnKHUGlD6jKI8g+a0WXU8dzR+4C2JUoaI7iZO/kyEFIwdJb83iiQu4TOfvQ8CQpMkVtJKsTGV44= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758835019; c=relaxed/simple; bh=UR2g2L/dn248+KAjuC7/6A+sOSuT+cFn2zsAUhnx6Go=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kfg+pDnsaq7ii46267JPL/pTe6H3hp4Zb0D3Ihe+WETFul8mmZ650KHx8ZSqGw9/l+qmL0aElWMiwof4qDwHr5Fn/XnTG+W6D9fQdh8DJ7gfO2hMGdzMY+abq0jPDIxhB+De4x7s29JwITU8LtMOh6zv46gbcE6z1ChYYW7/eIM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BEgcTdVV; arc=none smtp.client-ip=209.85.128.170 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.b="BEgcTdVV" Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-71d71bcac45so14137217b3.0 for ; Thu, 25 Sep 2025 14:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758835017; x=1759439817; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7O4aK1TwScVZuzbSfRb2GDWE+wxfFzGH5C/YNiWtLSA=; b=BEgcTdVVhQCPDp2Mzv7TtwiSKzP82kNFzR4Hi/lFSA4fqZ/AbecHl7mEptU+HCLfAb vACi81Z8r54GblIezTVSl8a9sCnxs7BLga8/XB5Vsn/FFpZmI6yguWKmagmqjN2AN5gV c9f/QhpKXhjREZOJZ8l2PguvNSO/z6TNkgF5p9dLZ5Y8I/87Tydc0r9nh7uqL1JfPGIv gXQpT8DRA6fzscdzZUM+QTL0qN4bLLs3Fx/accJk0GIug7eigojCvHSaMpPKr25ow+XK dWjVe0Du6G/FLR3MgSAT++W9tCrIsA8xbJg4Ijn/rEDk2zMio8fJ6h+HxzNLhsf5+ltz sOFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758835017; x=1759439817; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7O4aK1TwScVZuzbSfRb2GDWE+wxfFzGH5C/YNiWtLSA=; b=XFqck5tjkL2KKUHN0kCHdv7vqGvzKE/J3xB2SBn1oqY7WPzx4Mr1JDHpy6QIVWe4cl bVGyOr3AJGs353kgVuJTwOKQwUydfczgs11P/1yr8EsZMJ85o6+4OPciAConzKccBWd6 kw54oXm3rqG1BR2Nvs9Xt98hQ72zM7COd8aWpwlpuj4ghI8TRQ1w7AE7EtIgmLxwByyq 5OF1NCuywYjuddfrcNYgr8eNv0dIwnh/LUb9Q48iom6jKQADkhNH8SSoBiMQ/srXEkyW B6zAFyba9DqnlQxlHzHHKds8KfPHvDOuhleB8ZkraYXH8jvE3jjvKi2F6wSiOLBODBMj hJdQ== X-Forwarded-Encrypted: i=1; AJvYcCUppCd53ODe37OniDl0rzV8TQO5f5DQxbBw3kSxIGYK/UUCxAATODWsdH2zHz++Gi3eaKHI9CdNC2/iCTWaB4c=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3f3/S7X9fa8Oie6MFu8m15HYMwJnw6XDwIhz/wNuj2Yf0wfNG AeVsEui6j+zXIJujsIYZF2fWqeOR+j3CVxF4xGmfHhczfUUA+fjwuaMa X-Gm-Gg: ASbGncumuGtJLgIVJ+TpDwxLcG2zhM6RMZDLItfJZH61rYi8sjlSH3nvLFV94rYoP4G oNdmIww5hoCzP2x/vdxFJGK+RcttNrwtKzUSNrWPjwImTeOCvRSUhbjuJroE60fV+rw91XB76Cl 3Nb/iGnOzprdQAPzh3QJqzmrW0HK90gUKsRdmEzU3EDiL092mUbmxj+hBdolCewhWpDLLlPOtby /7rqjlvYi8aPT9oyjphXT1xp7xQKVrUmUFtYRINRwrxOe5nWN6+bhM4DRzEBn7y3Sn1B2cf8NFY lKlr/sXIzDxseg3SE1e90yeE40e/dJEy7zfy/6P2RnmGndqMLtUuGYZ/4hlNOvLOJrVHPkjBeAJ cR7QEUAe7J0oIw3R//IrZ X-Google-Smtp-Source: AGHT+IGRzlyt8EOriw2alMhz6U5/DUT7KIrK/VXzyG7iQlFSifXMuchqhD1KYBpzmW3hoJqtKulNtw== X-Received: by 2002:a05:690c:930c:20b0:729:a1ee:9bd8 with SMTP id 00721157ae682-76403422deamr47063577b3.36.1758835016863; Thu, 25 Sep 2025 14:16:56 -0700 (PDT) Received: from localhost ([2a03:2880:25ff:13::]) by smtp.gmail.com with ESMTPSA id 00721157ae682-765c91e01fesm7273867b3.70.2025.09.25.14.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 14:16:56 -0700 (PDT) From: Daniel Zahka To: Jakub Kicinski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Shuah Khan Cc: Willem de Bruijn , Breno Leitao , Petr Machata , Yuyang Huang , Xiao Liang , Carolina Jubran , Donald Hunter , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH net-next v2 6/8] selftests: drv-net: psp: add connection breaking tests Date: Thu, 25 Sep 2025 14:16:42 -0700 Message-ID: <20250925211647.3450332-7-daniel.zahka@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250925211647.3450332-1-daniel.zahka@gmail.com> References: <20250925211647.3450332-1-daniel.zahka@gmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jakub Kicinski Add test checking conditions which lead to connections breaking. Using bad key or connection gets stuck if device key is rotated twice. Signed-off-by: Jakub Kicinski Signed-off-by: Daniel Zahka --- tools/testing/selftests/drivers/net/psp.py | 90 +++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/psp.py b/tools/testing/selftests/drivers/net/psp.py index b4d97a9a5fbc..f9647371b791 100755 --- a/tools/testing/selftests/drivers/net/psp.py +++ b/tools/testing/selftests/drivers/net/psp.py @@ -15,6 +15,10 @@ from lib.py import NetDrvEpEnv, PSPFamily, NlError from lib.py import bkg, rand_port, wait_port_listen +class PSPExceptShortIO(Exception): + pass + + def _get_outq(s): one = b'\0' * 4 outq = fcntl.ioctl(s.fileno(), termios.TIOCOUTQ, one) @@ -99,6 +103,16 @@ def _check_data_rx(cfg, exp_len): time.sleep(0.01) ksft_eq(read_len, exp_len) + +def _check_data_outq(s, exp_len, force_wait=False): + outq = 0 + for _ in range(10): + outq = _get_outq(s) + if not force_wait and outq == exp_len: + break + time.sleep(0.01) + ksft_eq(outq, exp_len) + # # Test cases # @@ -324,6 +338,80 @@ def _data_basic_send(cfg, version, ipver): _close_psp_conn(cfg, s) +def __bad_xfer_do(cfg, s, tx, version='hdr0-aes-gcm-128'): + # Make sure we accept the ACK for the SPI before we seal with the bad assoc + _check_data_outq(s, 0) + + cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id, + "version": version, + "tx-key": tx, + "sock-fd": s.fileno()}) + + data_len = _send_careful(cfg, s, 20) + _check_data_outq(s, data_len, force_wait=True) + _check_data_rx(cfg, 0) + _close_psp_conn(cfg, s) + + +def data_send_bad_key(cfg): + """ Test send data with bad key """ + s = _make_psp_conn(cfg) + + rx_assoc = cfg.pspnl.rx_assoc({"version": 0, + "dev-id": cfg.psp_dev_id, + "sock-fd": s.fileno()}) + rx = rx_assoc['rx-key'] + tx = _spi_xchg(s, rx) + tx['key'] = (tx['key'][0] ^ 0xff).to_bytes(1, 'little') + tx['key'][1:] + __bad_xfer_do(cfg, s, tx) + + +def data_send_disconnect(cfg): + """ Test socket close after sending data """ + with _make_psp_conn(cfg) as s: + assoc = cfg.pspnl.rx_assoc({"version": 0, + "sock-fd": s.fileno()}) + tx = _spi_xchg(s, assoc['rx-key']) + cfg.pspnl.tx_assoc({"version": 0, + "tx-key": tx, + "sock-fd": s.fileno()}) + + data_len = _send_careful(cfg, s, 100) + _check_data_rx(cfg, data_len) + + s.shutdown(socket.SHUT_RDWR) + s.close() + + +def data_stale_key(cfg): + """ Test send on a double-rotated key """ + + s = _make_psp_conn(cfg) + try: + rx_assoc = cfg.pspnl.rx_assoc({"version": 0, + "dev-id": cfg.psp_dev_id, + "sock-fd": s.fileno()}) + rx = rx_assoc['rx-key'] + tx = _spi_xchg(s, rx) + + cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id, + "version": 0, + "tx-key": tx, + "sock-fd": s.fileno()}) + + data_len = _send_careful(cfg, s, 100) + _check_data_rx(cfg, data_len) + _check_data_outq(s, 0) + + cfg.pspnl.key_rotate({"id": cfg.psp_dev_id}) + cfg.pspnl.key_rotate({"id": cfg.psp_dev_id}) + + s.send(b'0123456789' * 200) + _check_data_outq(s, 2000, force_wait=True) + finally: + _close_psp_conn(cfg, s) + + def psp_ip_ver_test_builder(name, test_func, psp_ver, ipver): """Build test cases for each combo of PSP version and IP version""" def test_case(cfg): @@ -374,7 +462,7 @@ def main() -> None: if cfg.psp_dev_id is not None: ksft_run(cases=cases, globs=globals(), - case_pfx={"dev_", "assoc_"}, + case_pfx={"dev_", "data_", "assoc_"}, args=(cfg, )) else: ksft_pr("No PSP device found, skipping all tests") -- 2.47.3