From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 C44001EE033 for ; Mon, 19 May 2025 02:35:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622131; cv=none; b=MfHKeeKTHlNCG1P6Fq737CFw9funqoRpsUfEZHaGJRJvQCCe3OOmkDLVjIuyCjcYJnAUw0hJQD3wA+yTZfUOL1TpTNf+2bpNUIawl3COGUCp7+fKYt5vSaCg0JMt8QRhHjRzqIO9XgbhYVbK2dpqAy23d7jrTroy/ytiB3ZLJZI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622131; c=relaxed/simple; bh=6BzkwJjhMHJehkP1jcxnKavLT353dEzPvceqQkvdIdI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=g9lgCwFVCIoKW8Pc1EA12sDGNOSd/MraOjW414eXIRyvXA1q8lf7HLIfZZ2glHsPh5qwmoVMNxNDjadyf1ewc0bMt7BYSSUUSfF1KfK926VBqxKDqmlcQlG3J+8OTtHhR05x0hv9M5K+BG4uZsNZmxNZD89tLKinH5/nnguE9Gs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=QDGl+NRr; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QDGl+NRr" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b26e73d375aso3863018a12.2 for ; Sun, 18 May 2025 19:35:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747622129; x=1748226929; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=C/XD8ih8Lun8Jh7EfzFjhzSFOYTw1eL+7WAd/almRX4=; b=QDGl+NRrbuUSq0Ra6x1FhkqyPgu/s6MHlJDmXEkfk/MazRLHnjk8axxB9ye9uoO3hE 7k7sAFdgzWU28F6WJlj+oEzN2o6pXpDc52DtkxpiJld3ZRpt0ip4dsRRnOshnZCxwdeV YUpK/taED9GwtwTtHlz4slqTbSYxMOgXMZhaOiBxwruqYLvG7WHmTpdPIsmOLwfAMZ3d GBQ2qz3fUNwPrBexYBRJn8joaHgnj8ikqjqBaJNx2DvFsH6qKipjNH9v6UsRQaka5ce5 E2XayMsmHRwYg/gf1gOeFH2epo0VGzxMTFrRi2mupXYWc9U8oFSvYzZih0tlG45vTKXQ Qg9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747622129; x=1748226929; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=C/XD8ih8Lun8Jh7EfzFjhzSFOYTw1eL+7WAd/almRX4=; b=iewFztrrzSGzzF/ldLIS2+1bxyaC6FHXIb4au5EiSyeAwF9FATL9Qwp5NcReg968FR cTSR7tJpfT5VWnChZDQ/o5Vw8J4eio5HTu0OroySvlaVEKMqDn7vBjBmjLLDBTy8LeXo F0LFQWSsY2fF+tIuYbCT1kn5DNeG76+gdksIctg4BqD1KnO7pQME0ePG6eBoBN+oA1vJ vU1HtmNAFZDPPOubxiGLcg2aEjO1Q6qsQZix3om+2SmaKTFblUJUcWoBru/Ry3KvNOBH uMOfUjb+C0beZwmvOW0YMqUk7llHg7lJK2LPfB545gU7QgTsNGL3mUAq1QuMQcczZc5J husw== X-Gm-Message-State: AOJu0Yz2mmOGryIKL5VDj6u3VkJWg+0kW0a/cA1kgxOA+1FrRMpAAoc8 9uDqChqXIhaFY/6Ar5VtuTag5i9lndA8SSpafRozuH5KvfLq+/rgojri7Plu7CIX11zGys8FfNf wsBAVEUCmKHaDOLLLNyrGai8dBHNvqjR42HM24v2QABy1BaW969Jgvky445xKt4weLT02ltVmhg QbNBn9jp4B/w89Ux5+tWRyTf8CYw9aZqpAETuLzTf2qSnGpCf/m/9DEgUa/neE1Jw= X-Google-Smtp-Source: AGHT+IFayzQr6wJvEJqbgF2FAgyUkn6R53b1/7hz6ZHfYbnuHXWd9Bie02qYj6Dj1rPQWiCAL28/w/PqK+HGxqMS7g== X-Received: from pfbiv22.prod.google.com ([2002:a05:6a00:66d6:b0:740:b061:1007]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3d1f:b0:215:dfee:bb6a with SMTP id adf61e73a8af0-2170cde517bmr13396545637.28.1747622128931; Sun, 18 May 2025 19:35:28 -0700 (PDT) Date: Mon, 19 May 2025 02:35:13 +0000 In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250519023517.4062941-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1101.gccaa498523-goog Message-ID: <20250519023517.4062941-6-almasrymina@google.com> Subject: [PATCH net-next v1 5/9] net: devmem: ksft: add ipv4 support From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Mina Almasry , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jesper Dangaard Brouer , Ilias Apalodimas , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Andrew Lunn , Shuah Khan , sdf@fomichev.me, ap420073@gmail.com, praan@google.com, shivajikant@google.com Content-Type: text/plain; charset="UTF-8" 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 --- .../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