mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mina Almasry <almasrymina@google.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	 linux-kselftest@vger.kernel.org
Cc: Mina Almasry <almasrymina@google.com>,
	"David S. Miller" <davem@davemloft.net>,
	 Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	 Simon Horman <horms@kernel.org>,
	Jesper Dangaard Brouer <hawk@kernel.org>,
	 Ilias Apalodimas <ilias.apalodimas@linaro.org>,
	Neal Cardwell <ncardwell@google.com>,
	 Kuniyuki Iwashima <kuniyu@amazon.com>,
	David Ahern <dsahern@kernel.org>,
	 Andrew Lunn <andrew+netdev@lunn.ch>,
	Shuah Khan <shuah@kernel.org>,
	sdf@fomichev.me,  ap420073@gmail.com, praan@google.com,
	shivajikant@google.com
Subject: [PATCH net-next v1 5/9] net: devmem: ksft: add ipv4 support
Date: Mon, 19 May 2025 02:35:13 +0000	[thread overview]
Message-ID: <20250519023517.4062941-6-almasrymina@google.com> (raw)
In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com>

ncdevmem supports both ipv4 and ipv6, but the ksft is currently
ipv6-only. Propagate the ipv4 support to the ksft, so that folks that
are limited to these networks can also test.

Signed-off-by: Mina Almasry <almasrymina@google.com>

---
 .../selftests/drivers/net/hw/devmem.py        | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/drivers/net/hw/devmem.py b/tools/testing/selftests/drivers/net/hw/devmem.py
index f5d7809400ea..850381e14d9e 100755
--- a/tools/testing/selftests/drivers/net/hw/devmem.py
+++ b/tools/testing/selftests/drivers/net/hw/devmem.py
@@ -18,30 +18,36 @@ def require_devmem(cfg):
         raise KsftSkipEx("Test requires devmem support")
 
 
-def check_rx(cfg) -> None:
-    cfg.require_ipver("6")
+def check_rx(cfg, ipver) -> None:
     require_devmem(cfg)
 
+    addr = cfg.addr_v[ipver]
+    if ipver == "6":
+        addr = "[" + addr + "]"
+
+    socat = f"socat -u - TCP{ipver}:{addr}:{port}"
+
     port = rand_port()
     listen_cmd = f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr_v['6']} -p {port}"
 
-    with bkg(listen_cmd) as socat:
+    with bkg(listen_cmd) as ncdevmem:
         wait_port_listen(port)
-        cmd(f"echo -e \"hello\\nworld\"| socat -u - TCP6:[{cfg.addr_v['6']}]:{port}", host=cfg.remote, shell=True)
+        cmd(f"echo -e \"hello\\nworld\"| {socat}", host=cfg.remote, shell=True)
 
-    ksft_eq(socat.stdout.strip(), "hello\nworld")
+    ksft_eq(ncdevmem.stdout.strip(), "hello\nworld")
 
 
-def check_tx(cfg) -> None:
-    cfg.require_ipver("6")
+def check_tx(cfg, ipver) -> None:
     require_devmem(cfg)
 
     port = rand_port()
-    listen_cmd = f"socat -U - TCP6-LISTEN:{port}"
+    listen_cmd = f"socat -U - TCP{ipver}-LISTEN:{port}"
 
-    with bkg(listen_cmd, exit_wait=True) as socat:
+    addr = cfg.addr_v[ipver]
+
+    with bkg(listen_cmd) as socat:
         wait_port_listen(port)
-        cmd(f"echo -e \"hello\\nworld\"| {cfg.bin_remote} -f {cfg.ifname} -s {cfg.addr_v['6']} -p {port}", host=cfg.remote, shell=True)
+        cmd(f"echo -e \"hello\\nworld\"| {cfg.bin_remote} -f {cfg.ifname} -s {addr} -p {port}", host=cfg.remote, shell=True)
 
     ksft_eq(socat.stdout.strip(), "hello\nworld")
 
@@ -51,8 +57,13 @@ def main() -> None:
         cfg.bin_local = path.abspath(path.dirname(__file__) + "/ncdevmem")
         cfg.bin_remote = cfg.remote.deploy(cfg.bin_local)
 
+        if "4" in cfg.addr_v:
+            ipver = "4"
+        else:
+            ipver = "6"
+
         ksft_run([check_rx, check_tx],
-                 args=(cfg, ))
+                 args=(cfg, ipver))
     ksft_exit()
 
 
-- 
2.49.0.1101.gccaa498523-goog


  parent reply	other threads:[~2025-05-19  2:35 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-19  2:35 [PATCH net-next v1 0/9] Devmem TCP minor cleanups and ksft improvements Mina Almasry
2025-05-19  2:35 ` [PATCH net-next v1 1/9] net: devmem: move list_add to net_devmem_bind_dmabuf Mina Almasry
2025-05-19  6:45   ` Taehee Yoo
2025-05-19  2:35 ` [PATCH net-next v1 2/9] page_pool: fix ugly page_pool formatting Mina Almasry
2025-05-19  2:35 ` [PATCH net-next v1 3/9] net: devmem: preserve sockc_err Mina Almasry
2025-05-19 15:21   ` Stanislav Fomichev
2025-05-19  2:35 ` [PATCH net-next v1 4/9] net: devmem: ksft: remove ksft_disruptive Mina Almasry
2025-05-19 15:25   ` Stanislav Fomichev
2025-05-19 17:30     ` Mina Almasry
2025-05-19 20:18       ` Stanislav Fomichev
2025-05-19 23:41         ` Jakub Kicinski
2025-05-19  2:35 ` Mina Almasry [this message]
2025-05-19 15:32   ` [PATCH net-next v1 5/9] net: devmem: ksft: add ipv4 support Stanislav Fomichev
2025-05-19 17:31     ` Mina Almasry
2025-05-19 20:26       ` Stanislav Fomichev
2025-05-19 23:48   ` Jakub Kicinski
2025-05-19  2:35 ` [PATCH net-next v1 6/9] net: devmem: ksft: add exit_wait to make rx test pass Mina Almasry
2025-05-19 15:32   ` Stanislav Fomichev
2025-05-19  2:35 ` [PATCH net-next v1 7/9] net: devmem: ksft: add 5 tuple FS support Mina Almasry
2025-05-19 15:37   ` Stanislav Fomichev
2025-05-19 17:32     ` Mina Almasry
2025-05-19 20:26       ` Stanislav Fomichev
2025-05-19  2:35 ` [PATCH net-next v1 8/9] net: devmem: ksft: upgrade rx test to send 1K data Mina Almasry
2025-05-19 15:37   ` Stanislav Fomichev
2025-05-19  2:35 ` [PATCH net-next v1 9/9] net: devmem: ncdevmem: remove unused variable Mina Almasry
2025-05-19 15:37   ` Stanislav Fomichev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250519023517.4062941-6-almasrymina@google.com \
    --to=almasrymina@google.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=ap420073@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=edumazet@google.com \
    --cc=hawk@kernel.org \
    --cc=horms@kernel.org \
    --cc=ilias.apalodimas@linaro.org \
    --cc=kuba@kernel.org \
    --cc=kuniyu@amazon.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=ncardwell@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=praan@google.com \
    --cc=sdf@fomichev.me \
    --cc=shivajikant@google.com \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®