From patchwork Fri May 23 23:05:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 892140 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 D2F3121767D for ; Fri, 23 May 2025 23:05:32 +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=1748041534; cv=none; b=bpdMUUed8F6535QLh4wanxEvqFozhg6PGroeoDdGIZ3n9MnfK4lsrgxg/6vIEbFLQ2qiXiWnlxd/fry4aiqEqvsNXYF1uA9u8KcTtk1Gz1dWnlNnwm4+kEctpWP9YTUxyK8wjJSpvoomUk25yEf8iHKmxfnP7abhUv1nXeYT6lU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041534; c=relaxed/simple; bh=XtpGf08mk62B/n49TMdckE7eT2mByGhUn/6TICm/3tc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Oic9fwnMhDuOVPxQg4Q3GALyeuhccJbM4/6EMWu44G9XcE3t83pBUqfMfN3nd+lpL8qNVxYOqEDpaTrHk2SIhASwOmeOCfgAb+3v382GoqcKjjV1QFTuBo8TVMpjWdR0Ecxccm3ilq3fNTQ+9dKLoihzvy4v9QpNCp5Z7mufN0o= 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=S1237oP2; 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="S1237oP2" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-6c8f99fef10so334205a12.3 for ; Fri, 23 May 2025 16:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748041532; x=1748646332; 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=jo8oX10ObykGsTsR/s0quAt1NvrEp0Zt6nav8gqqDes=; b=S1237oP2fGB8BGwvycGvidqRwF7caLEZhno4g/sGIAzWEhERoOrwkywBkX/aVjo9go CR0aSPy8LbxaNs/AAVJkfVqTLLhl4LJHpAvo9lY13tXTjmVfSBpTSXflmka2EZvT3l0+ 8ylq4qoJyNMZq9K32QqwcVSukaewJuklLv1k8AAunfhZ+iJZlvk/CHRa3TgHf7yeme1j VZ3GMLqbjqSLmDtIobg2XjdQWVNuWNTuOp1UTCVaMemgOurEwwCsx0ORI4bd2APkZDCe +x5+IHhp/tgnmeQXCXhLp89mYcx2JKz86+baKlvK9fEUdWUFN475C9yBFF04zIL1RdIR ORzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748041532; x=1748646332; 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=jo8oX10ObykGsTsR/s0quAt1NvrEp0Zt6nav8gqqDes=; b=w5KK4HQcybasM8lLZNRk2pp/ZPUa6Hi/lr/PHPw3HEkKEkx6UeJvhjL5hV22f5/zrH xacdKArX/LAJgT30iqo86tJLSqMqoNEw5oDiOLG4szG/PfCmTSaw2xM5w3ELkrSC9voL +oE3emnXPSfsaV0RL3X2pYTSv7/4I+lEaLGlGjZizudxkvoEfAQ6TBqq1rUJJB2z1UOI 2FZ/yEE/P+LwES6TuQWYBfLNKqiaD02ztUuXTPzwb6Ok1u24H9QC6vxufiz3KQ53+P1J aBpkt5xsjTz7hqRiptrDCth2osJkyhHcRSXcJL5bATyOtxJVsGVO2BpcIFNEsZQWORXZ uL4Q== X-Forwarded-Encrypted: i=1; AJvYcCWyC9+cBtHSNmqcAlzBEncbgBg7mR+Qj7APDCcmyHTDf07qpg/SWFyzC2LrraICPQeixat7ySQdoxXXx4Dcqvs=@vger.kernel.org X-Gm-Message-State: AOJu0YyQ82XGzN6y0D2K1ebJIQ/5eRC7aVm//EQj0pA4O9qDCWvwGDXT W3afVzKjjqWZ3xtrkTSW7A3vSduPAauGWDskdKuk+4cLKmsb9wJIs5+G3v/mq5iIek+YoU1pDmR qQRH4eKAnzN9Ne0jNub42h5vt3g== X-Google-Smtp-Source: AGHT+IFoBkGFwgLLGT5f3w3RDig2i1nIBH1FsoeWWmCb4h+IXnB8/EK5ds7LLf2qaCyDmHPMD3Aak1+RlQqHMg3FlQ== X-Received: from pliy11.prod.google.com ([2002:a17:903:3d0b:b0:232:4eb:e2c6]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f609:b0:223:f408:c3e2 with SMTP id d9443c01a7336-23414f4b44fmr16343555ad.14.1748041532044; Fri, 23 May 2025 16:05:32 -0700 (PDT) Date: Fri, 23 May 2025 23:05:18 +0000 In-Reply-To: <20250523230524.1107879-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250523230524.1107879-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523230524.1107879-3-almasrymina@google.com> Subject: [PATCH net-next v2 2/8] page_pool: fix ugly page_pool formatting 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 Minor cleanup; this line is badly formatted. Signed-off-by: Mina Almasry --- net/core/page_pool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 974f3eef2efa..4011eb305cee 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -867,8 +867,8 @@ void page_pool_put_unrefed_netmem(struct page_pool *pool, netmem_ref netmem, if (!allow_direct) allow_direct = page_pool_napi_local(pool); - netmem = - __page_pool_put_page(pool, netmem, dma_sync_size, allow_direct); + netmem = __page_pool_put_page(pool, netmem, dma_sync_size, + allow_direct); if (netmem && !page_pool_recycle_in_ring(pool, netmem)) { /* Cache full, fallback to free pages */ recycle_stat_inc(pool, ring_full); From patchwork Fri May 23 23:05:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 892139 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 3A30821D3DB for ; Fri, 23 May 2025 23:05:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041537; cv=none; b=VATMwDMRqCzV/hZB3hDTO1CzRc3rGQUCmBqjeaC9AZUR4A4R3P7cG6SMPYXGYkpef7LIwlwsFgv0CLfSbfKMib870fJkhMURuZ8muI1d/hySaTkiwXy7NNPRgq33VL4FnMhg2vFh61gGV2YgoVV1kx8E3EsMgpWwgpgY0s7GNng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041537; c=relaxed/simple; bh=fIlnjHiVt66jMZHOXCtcWJq9iDhh9E2OfaIuTmFUKBo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=D8gshP5sauc2EUqMjvEjQvmgFU4IeVEMoOOT9dS+PRBuvJ8nS5QB5Fdi2POgUtzMjdmII2fhedrgYGFqQedVmGpKbI6g5AvZeJAf+W8AKwo9Ip7v/MuXefbbkeGb+os8CldFtBSr/5G4kYE638jk1sNLhz6jkGCPpdI+SpIg+f0= 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=vfgZa8iZ; arc=none smtp.client-ip=209.85.215.202 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="vfgZa8iZ" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b26f30486f0so359369a12.2 for ; Fri, 23 May 2025 16:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748041535; x=1748646335; 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=e8sdft2buoZW74We3vtEkvC8v0SQ5B0W9UWiowkjja8=; b=vfgZa8iZcpw1VyNThOV6kro0eOHzte7hM6MvCpV0y5ua3l7Oq0zeCnx8XW2eTlJyZW WcAqy0CuTKLE5ZK91l01NtRd3IO7CujKfR2Jx43XgCy7xYRxhQOuzzXL7dIGbnTLGAtN 7t8D3tHgcOI7g5ADAthwTqd91JY/B0QZNIVCHgrTPbBy6tNuavzeEiyyPD99ylulG7rU SqmdSEJ0nggzjLongXQ+3PdP6Y8a9kjd3EGphFFF8ZlbHULykEnfd/yegy38rmR82lcn j6rT1WF426ba5sIL/5XJ6RejziwlbnwgeCJ1VxDtlEooxPAu6E1v/v3l5TCUFZQ70pCk 9BBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748041535; x=1748646335; 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=e8sdft2buoZW74We3vtEkvC8v0SQ5B0W9UWiowkjja8=; b=W3e8aFkEjTUjf4pA5frocvzO6SwCqY+Ljfd6AJ0jUaxqcve4c3g6/FxYdaZtTyk/jw yvaHsiNJ13Ojv3Y86xsfVXUAgGvCJkR04dgcc9opgoa7/MhtNE383ILwD5joVYDNFzZ2 o7QKwP3knM0gY25ncO849r1M1LORcAlO8+JeZvmcezu6BfEhPUb4SeHNSuGZv+jOTQWL LSMhQIj+CSMTsZjVv2KO/XGshAO2MN6/VCi2kLDxdPJH9+VkEvA9zym9ExZu5gs1Z/Hf TkQDpNiPzIC5k/09Fx/cgBC6syo669w+IEhHZ7KOvpnTVSPrvfwD6IoLzHGnIm+F+tdy dWqA== X-Forwarded-Encrypted: i=1; AJvYcCVWtuxDVGOg4jhTfiFZGcM8VWVhoeEYvALrYnUWYOk6OuHmyylr4GCxzEmrcYwyUS+vMAl2r4DtPEsrXSvHKcU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5oeXALMXAuctlTUzTUCRx+muGK2vDxmcC0NegF6w2qhf7NIo8 MSrnkNgaI/VRVXPxmHzVTjdpRmhGv3YTIJGBlFha/pdVLk1zWUfVRo3MkYtKVjZZ//NPiSpQ/Pi lcIl7+tfzzUPBrBMphv2ETMAb/w== X-Google-Smtp-Source: AGHT+IFJs+ZhchzXRGJVcyEK6P/BPOUVSXu7jFxFlu1YtOZP4EdE+NQsj52iCebn4YmWRq4ge9eEJOy4WdeS3R2Oeg== X-Received: from pldt12.prod.google.com ([2002:a17:903:40cc:b0:220:d668:ff81]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:acf:b0:22f:9f6a:7cf with SMTP id d9443c01a7336-2341500d143mr15462135ad.52.1748041535501; Fri, 23 May 2025 16:05:35 -0700 (PDT) Date: Fri, 23 May 2025 23:05:20 +0000 In-Reply-To: <20250523230524.1107879-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250523230524.1107879-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523230524.1107879-5-almasrymina@google.com> Subject: [PATCH net-next v2 4/8] 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 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 --- v2: - Use cfg.addr and cfg.remote_addr instead of doing ipv4 and ipv6 special handling (Jakub) --- tools/testing/selftests/drivers/net/hw/devmem.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/devmem.py b/tools/testing/selftests/drivers/net/hw/devmem.py index 7fc686cf47a2..9b3e2c78f457 100755 --- a/tools/testing/selftests/drivers/net/hw/devmem.py +++ b/tools/testing/selftests/drivers/net/hw/devmem.py @@ -21,30 +21,28 @@ def require_devmem(cfg): @ksft_disruptive def check_rx(cfg) -> None: - cfg.require_ipver("6") require_devmem(cfg) port = rand_port() - listen_cmd = f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr_v['6']} -p {port}" + listen_cmd = f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -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 -u - TCP{cfg.addr_ipver}:{cfg.addr}:{port}", host=cfg.remote, shell=True) - ksft_eq(socat.stdout.strip(), "hello\nworld") + ksft_eq(ncdevmem.stdout.strip(), "hello\nworld") @ksft_disruptive def check_tx(cfg) -> None: - cfg.require_ipver("6") require_devmem(cfg) port = rand_port() - listen_cmd = f"socat -U - TCP6-LISTEN:{port}" + listen_cmd = f"socat -U - TCP{cfg.addr_ipver}-LISTEN:{port}" - with bkg(listen_cmd, exit_wait=True) as socat: + 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 {cfg.addr} -p {port}", host=cfg.remote, shell=True) ksft_eq(socat.stdout.strip(), "hello\nworld") From patchwork Fri May 23 23:05:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 892138 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 55195220F3F for ; Fri, 23 May 2025 23:05:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041540; cv=none; b=qsretpapGk1rrFhy7iAoQPJxbE81dbPhgiLk5vjyC0y23XTSd7hQANRj5A6N4pog/0GGgh1euulibzVBuhidme6K+HrOhcPoA2gw6y32cDKxm5+p2GCbGZ5Nk2gDHbo7xObUoKNsz4qcSTLVd3RfnObkL9tpmWIkJhMZdP35LHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041540; c=relaxed/simple; bh=PGtt9R/6JfJeszrvD0Vt1f7tbDi7oeGP/GPYQOO0a24=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=N+zYwaPmTesRNaZvDQF482bLaZBeI9OhvJNrSaveOcn0Bj46BG0cUp15eV6yLMS4dEzLzi20xmwDKcd4qO6Wtl5k5xnzoDTHgDzkiK17MxdSmerBvLC24pcpMou7XbpVmXFNMpCERmIFw1K4zHAsBry5QVJ4ujurTfJqp7bghG0= 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=kp46d2K5; arc=none smtp.client-ip=209.85.214.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="kp46d2K5" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-231d0c0fdedso2178465ad.1 for ; Fri, 23 May 2025 16:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748041539; x=1748646339; 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=d2RRh+/pmMlr+/9c1WquG879UR6TlmrH7OSbqN+4ntc=; b=kp46d2K5MO/6fpHTzUqPey1AgIt7Nlto1zldFf2T08vuHrjrNFWWNqFxqrrXqT9QG+ GBPcQARoJShygE0crgOUndm/vEyPMnGwe36bHgs/eqqzN2HvT4T5REmNUjxxu7cjjarv Lm4vwpKa/Rz68TZokH4aiglAHizxOnycL51jP26yXybr1YEh3PkU/JyNSCu2rInYzjIZ q2nfT4WXVFJZ8NUmt7E83Zy3KVHb6EcpHNZAe6OQpLcT05srzK1SlUqD8EI4JGMOAXj/ FBjy+0m85wX6KWKN8L4B9seIu6wJg417qtG6Nr/OKrnDCbGLhPjiaEC7B5AphVQ4oHTt ckkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748041539; x=1748646339; 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=d2RRh+/pmMlr+/9c1WquG879UR6TlmrH7OSbqN+4ntc=; b=FArPX0VAnwvOPtnADBLDKJ8ormMmBaqo+nLzMWazsM1I8IDSdf6N8abglrNJGa0LrQ p88Bjp2MVxqhcCqiQ3hDT2gTzHa4tfFa/FR9gBoxX/SdyNs0swci3P8nENaFRN1gdSGL 3vXld6WsNniZmsZOGL3TJi9+QkxLx4r25n2oeqIxRqkPQyEGv7dIlGn8ShyFzdUUWzB4 vQNRxzDTMnwohMpjIt3sn5HNBauHAgfaEckBno8i+poJS6Umlip+IJEy/7x6XbQ/DP03 tKT2hNwsfiasDgpZpeiYQmFfk5+aHD0a402XFN6C0e0/WtF0TeOCH9ebeDspLcx988dY XBFw== X-Forwarded-Encrypted: i=1; AJvYcCUeJkZViIO4SrDrIkjTO4ZfnGX2kGKKu/qNERqUnRCh1seIC4P44mfcBZglCwqTnae+T6swIeorOvDO/0GK27U=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2F27XSqCK2DK7tDMkfT3tXX+87+Gjoa9lO4o9XRT4zCAM9fm+ JLsvf2QWxJGX8Aqz4WOhom2PsnY84xVdUv6DXzbZH0Wtgd6aGwoLvVuxQnL0gbcD2Dpam2k1I7y R6H9iDREnpHfsdBOWDoW6m/Iprg== X-Google-Smtp-Source: AGHT+IHVsH+9q9leeBNnpPJqS1fD8D2RsLmkgZl1oWqFMbkXUFg3g4wWlhT0WJZW0fnCAI5MdSjgKwrRZzAv4AbXjA== X-Received: from plhk15.prod.google.com ([2002:a17:902:d58f:b0:22e:1633:9684]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:228d:b0:224:1157:6d26 with SMTP id d9443c01a7336-23414f3a8d9mr19684705ad.4.1748041538874; Fri, 23 May 2025 16:05:38 -0700 (PDT) Date: Fri, 23 May 2025 23:05:22 +0000 In-Reply-To: <20250523230524.1107879-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250523230524.1107879-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523230524.1107879-7-almasrymina@google.com> Subject: [PATCH net-next v2 6/8] net: devmem: ksft: add 5 tuple FS 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 ncdevmem supports drivers that are limited to either 3-tuple or 5-tuple FS support, but the ksft is currently 3-tuple only. Support drivers that have 5-tuple FS supported by adding a ksft arg. Signed-off-by: Mina Almasry fix 5-tuple fix 5-tuple --- tools/testing/selftests/drivers/net/hw/devmem.py | 4 ++-- tools/testing/selftests/drivers/net/hw/ncdevmem.c | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/devmem.py b/tools/testing/selftests/drivers/net/hw/devmem.py index 6effb9e33fd8..553ebf669a71 100755 --- a/tools/testing/selftests/drivers/net/hw/devmem.py +++ b/tools/testing/selftests/drivers/net/hw/devmem.py @@ -24,11 +24,11 @@ def check_rx(cfg) -> None: require_devmem(cfg) port = rand_port() - listen_cmd = f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -p {port}" + listen_cmd = f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -p {port} -c {cfg.remote_addr}" with bkg(listen_cmd, exit_wait=True) as ncdevmem: wait_port_listen(port) - cmd(f"echo -e \"hello\\nworld\"| socat -u - TCP{cfg.addr_ipver}:{cfg.addr}:{port}", host=cfg.remote, shell=True) + cmd(f"echo -e \"hello\\nworld\"| socat -u - TCP{cfg.addr_ipver}:{cfg.addr}:{port},bind={cfg.remote_addr}:{port}", host=cfg.remote, shell=True) ksft_eq(ncdevmem.stdout.strip(), "hello\nworld") diff --git a/tools/testing/selftests/drivers/net/hw/ncdevmem.c b/tools/testing/selftests/drivers/net/hw/ncdevmem.c index ca723722a810..3c7529de8d48 100644 --- a/tools/testing/selftests/drivers/net/hw/ncdevmem.c +++ b/tools/testing/selftests/drivers/net/hw/ncdevmem.c @@ -370,7 +370,8 @@ static int configure_flow_steering(struct sockaddr_in6 *server_sin) server_addr = strrchr(server_addr, ':') + 1; } - return run_command("sudo ethtool -N %s flow-type %s %s %s dst-ip %s %s %s dst-port %s queue %d >&2", + /* Try configure 5-tuple */ + if (run_command("sudo ethtool -N %s flow-type %s %s %s dst-ip %s %s %s dst-port %s queue %d >&2", ifname, type, client_ip ? "src-ip" : "", @@ -378,7 +379,17 @@ static int configure_flow_steering(struct sockaddr_in6 *server_sin) server_addr, client_ip ? "src-port" : "", client_ip ? port : "", - port, start_queue); + port, start_queue)) + /* If that fails, try configure 3-tuple */ + if (run_command("sudo ethtool -N %s flow-type %s dst-ip %s dst-port %s queue %d >&2", + ifname, + type, + server_addr, + port, start_queue)) + /* If that fails, return error */ + return -1; + + return 0; } static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd, From patchwork Fri May 23 23:05:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 892137 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 17D51215789 for ; Fri, 23 May 2025 23:05:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041545; cv=none; b=D3WcGC/bFUZpp/vjPtYLfO4yxrA9hEz/tG5ypMcybQDdq+vMQNl+czB4q3ADULgliD09qnhBpdBE1jdvrFrPvRQdOB8kIwY/CFzh7tIKmIVKYhdXh3BmFohZQMT/Rk15A+YnZdxiWO2CUhAem7mdgtfcR3LvnBI8o0XgXPhLgvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041545; c=relaxed/simple; bh=0JqtZHm1FjwTp/r9FfFXp2DhxiRW0Bdbv5viNa2gMfU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eeblFjHbUCy9Vvq3matxLPqBZ105Tm5TqnAP5U9io6FTlpH4la9jic4LRVo0wfSvpmNRY2gNE5jInGjRDhz0dMNh3wxS81+3eMfBsIy0eW/BespXao2vuAt7fDgJoHdj8cbGWU0pO/vJAWg+DS6mGKZVDLmzmXLnb1y1NOj+vrE= 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=R6iUBZ+9; arc=none smtp.client-ip=209.85.214.202 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="R6iUBZ+9" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-232054aa634so2861695ad.3 for ; Fri, 23 May 2025 16:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748041542; x=1748646342; 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=g9027k/STZBsLuLsL7i9IP6pBTVAG0SO2AdEyoxFagU=; b=R6iUBZ+9HVQ0voT5m+RPF6iohB8uARMGrHOt/QAtNhActs24wu0LUZpv9rmD9UQPKA 7yYVB/6ZynPCnYCMgYYLn7Xzb3f30iagRVmduoJ/cbrN1WfKN6CkmHINV1xcKHUGHUox HBVz2TmIHqHoxG+JSj+2OjffHWR/6+UjiYQBBuQ8wsQEXGPQ4tMjaGP3Gj87Fy0P+its okRYfbq0gQwBQGOd2rlYAORqCZ2N0mphubNEDbvd+q4ILWY2+28rW6kBOMMWlFAfo/vi B+rahlr0S9MvwlbDetoKWBFcCIX3X191jA+N7EFGLwDkhVO/pYUi6lRRcSH+MT65me9b BFHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748041542; x=1748646342; 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=g9027k/STZBsLuLsL7i9IP6pBTVAG0SO2AdEyoxFagU=; b=AMufIqYFdUc7z5Oih5G6nos9obCmO3g3VyK1vra1CL9212Hkq9NQ4kaebgLQDcc0cb k+/KL3eawlRUnwO+OHzlDYbChxc25VT3kJq084C8H6KymTPd2Q2+g/yV5nnVx1MB7JhH zbWOzOZEAj4jkqaYA9ZXKgmvJeadOLhy1301iUZd0JZ58eoMRqykQJGfp+yR/cfL+vz8 ZNYKJyfKtiGchlFlPm2RRmeFrMd8Mh1AmWZ9SGvbBHJpdmLZGfpXXB+d2uMydD7BUltd Ncxr3BM82F6NQwdcLLygOWeCq4uD9L/BwX0agmcqJ9nKZwgw5wy00AhEVG3a2geEh/+/ Olhw== X-Forwarded-Encrypted: i=1; AJvYcCUOv7iYen8EuOjxO/YqliogB2ZxNCHcrRcwsneag8Z0hB0iq+nqMzEuhv67qgGzC69h1U9P1r7Ti/wEcEZ4uo0=@vger.kernel.org X-Gm-Message-State: AOJu0YyRp3zXrz9GteuEYwLJ/rrZ6mEO7dTsHq4uqKVbqjwdxAILsIln p4eU2WDvKoShbA2z4shdxvcthVIfmWNABtdTvJWm4nMBo8d5N108uPobKO/d2+/08sczr3QgjfD 2mtF3Pv8RS38rGO8bLAa7csfluQ== X-Google-Smtp-Source: AGHT+IHn8TkCdj+ni+aC/DsrAqi9Ur2+n79I6LNfYvaRRRjb46r0pJxbHJPzmzbCwlmXoCzWPkQvZhUhuI8g+DiH4A== X-Received: from plbms3.prod.google.com ([2002:a17:903:ac3:b0:223:294f:455a]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ebc6:b0:224:2175:b0cd with SMTP id d9443c01a7336-23414f689ddmr16906845ad.26.1748041542350; Fri, 23 May 2025 16:05:42 -0700 (PDT) Date: Fri, 23 May 2025 23:05:24 +0000 In-Reply-To: <20250523230524.1107879-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250523230524.1107879-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523230524.1107879-9-almasrymina@google.com> Subject: [PATCH net-next v2 8/8] net: devmem: ncdevmem: remove unused variable 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 This variable is unused and can be removed. Signed-off-by: Mina Almasry Acked-by: Stanislav Fomichev --- tools/testing/selftests/drivers/net/hw/ncdevmem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/hw/ncdevmem.c b/tools/testing/selftests/drivers/net/hw/ncdevmem.c index 3c7529de8d48..03f0498cdffb 100644 --- a/tools/testing/selftests/drivers/net/hw/ncdevmem.c +++ b/tools/testing/selftests/drivers/net/hw/ncdevmem.c @@ -537,7 +537,6 @@ static struct netdev_queue_id *create_queues(void) static int do_server(struct memory_buffer *mem) { char ctrl_data[sizeof(int) * 20000]; - struct netdev_queue_id *queues; size_t non_page_aligned_frags = 0; struct sockaddr_in6 client_addr; struct sockaddr_in6 server_sin;