From nobody Fri Dec 19 15:52:07 2025 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 1C8F738B for ; Mon, 19 May 2025 02:35:21 +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=1747622123; cv=none; b=kq/YU+HV211xzkdxempqMe1eFmxe74C+FrZrKYmNZ1u33yABqtuPg4osiKjftKoEXEwTZG+j531mkdjg9o3EH5+3NJsREHbqWdw2GUECID+duM1plWpikx5nTYBc+NXP93JRUjKdWi+zsqWbvarVsQFBZZauQKQZMEoGkPha/cA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622123; c=relaxed/simple; bh=ZS34Cvz02/vnDD36atJAHqch4t580yf9dD/ZkBaC9P4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XDXp/v8kOqFWEJucGBtCG74JTG/hgs6G5YnaCdidUh9wcEq1JN/eDxrM5tVYBz8LM8lUUJXPdk0qeZfzhxCUuJp6Tf1wxycfJH1LARu+cCvSLIqF/S5yIRMjzGXaufsNNmiP6Jiy9XdSRBkoasj5rpa9Rv8RKFNG+MzRBrh329E= 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=U2wlKOWZ; 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="U2wlKOWZ" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-22c31b55ac6so66825805ad.0 for ; Sun, 18 May 2025 19:35:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747622121; x=1748226921; 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=NWTJVNW3YHtUCUhr40523AtMDA0/wA+qLJ0JBpFh9lY=; b=U2wlKOWZWp1gVugQIvwe7At+5u3H/XJOdV7SLf629E/tDUcWfYh/9lx6NKClh0vMZh EmE3kAa6qylvCaq8PJgtOQHlHSp09qD+u/5EUOEq31tgut4/Hus2d4WrEH5DE8ELZ5IJ Bhjm+gHly8m4AsbLOsqukvW2G84s12N3iW8ilgWaSnufhA/2rAhb7XPaXuiNQUycUraC ufRw5VJoOulh//9+/gVcP3VS97byi8xN7cRGz496YcBtShN1fHBX9AoQa8SjnjWDtqZM +WxEcEXykn9Bb44/gPh2t2SI39xAtWfn2CNMB2h/Z5ockE362QFJMPrO+kDix5V2h1fW H1KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747622121; x=1748226921; 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=NWTJVNW3YHtUCUhr40523AtMDA0/wA+qLJ0JBpFh9lY=; b=WTgBuLLR0vROxuq/Nvghpsi3Rgt3QF9IDUpis6jmqMT8iw1kUMeyr1NLxb6dnGyZnI CT9R4xP/24mIXcoRjMYY4CFzgcJCc9qlNP2WlF6f5jrx5/ynQ3U7cy7e/LQZVKtF4Umq PrOQtn2UYpwK8weqjz9+b2WISvvHaN9O9Y443rnYTIev95HsczsIo0wxyxRd/fSMKLF5 mDBqnfnoS59syQpLtwxfJvosZsWnf18UwnyL8hUMEo9hn5j88bCkPxLL3W4SHBajnwEU MEB5irIudeQSZK5L+tBA2ejHCsthmIyDxvXsmPO0lMl59ckcUn2M+QCGU1u28j4MGMvM BsnA== X-Forwarded-Encrypted: i=1; AJvYcCXFD6/eHTiwgmeFznIco+x1GADDM73J1uvJkwKTRVc2ewVt32sN5IvTivPWB8eWv8/FqbeBSF2vE5AK3pw=@vger.kernel.org X-Gm-Message-State: AOJu0YyWK8x+QdCfL8JNL9Wh5E064TkXSoWVEtlbaJbH12PufnjUB7zK uOFgF5ke4/9TPsXptpClG7yQL2qacfM39S6jqYnSQaIpOB0kBa/sovR/zzCrUJl40rrqwjf5iJX ys5ctM5XeMIS+PgephF5IbOm6Xw== X-Google-Smtp-Source: AGHT+IHHnpya9LgxFUJ+pdYLo7X5YnZkXRpI9Yli/3/2VBAPkdccDSoRBmBGpbwXjjZ03aoSSFbYgVF9lwKokTnJ0Q== X-Received: from plbmu14.prod.google.com ([2002:a17:903:b4e:b0:231:e2ee:34c9]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e78c:b0:231:d156:b26b with SMTP id d9443c01a7336-231d4598d28mr176848355ad.38.1747622121254; Sun, 18 May 2025 19:35:21 -0700 (PDT) Date: Mon, 19 May 2025 02:35:09 +0000 In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@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-2-almasrymina@google.com> Subject: [PATCH net-next v1 1/9] net: devmem: move list_add to net_devmem_bind_dmabuf. 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It's annoying for the list_add to be outside net_devmem_bind_dmabuf, but the list_del is in net_devmem_unbind_dmabuf. Make it consistent by having both the list_add/del be inside the net_devmem_[un]bind_dmabuf. Cc: ap420073@gmail.com Signed-off-by: Mina Almasry Tested-by: Taehee Yoo --- net/core/devmem.c | 5 ++++- net/core/devmem.h | 5 ++++- net/core/netdev-genl.c | 8 ++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/net/core/devmem.c b/net/core/devmem.c index 0dba26baae18..b3a62ca0df65 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -178,7 +178,8 @@ int net_devmem_bind_dmabuf_to_queue(struct net_device *= dev, u32 rxq_idx, struct net_devmem_dmabuf_binding * net_devmem_bind_dmabuf(struct net_device *dev, enum dma_data_direction direction, - unsigned int dmabuf_fd, struct netlink_ext_ack *extack) + unsigned int dmabuf_fd, struct netdev_nl_sock *priv, + struct netlink_ext_ack *extack) { struct net_devmem_dmabuf_binding *binding; static u32 id_alloc_next; @@ -299,6 +300,8 @@ net_devmem_bind_dmabuf(struct net_device *dev, if (err < 0) goto err_free_chunks; =20 + list_add(&binding->list, &priv->bindings); + return binding; =20 err_free_chunks: diff --git a/net/core/devmem.h b/net/core/devmem.h index 58d8d3c1b945..e7ba77050b8f 100644 --- a/net/core/devmem.h +++ b/net/core/devmem.h @@ -11,6 +11,7 @@ #define _NET_DEVMEM_H =20 #include +#include =20 struct netlink_ext_ack; =20 @@ -82,7 +83,8 @@ void __net_devmem_dmabuf_binding_free(struct work_struct = *wq); struct net_devmem_dmabuf_binding * net_devmem_bind_dmabuf(struct net_device *dev, enum dma_data_direction direction, - unsigned int dmabuf_fd, struct netlink_ext_ack *extack); + unsigned int dmabuf_fd, struct netdev_nl_sock *priv, + struct netlink_ext_ack *extack); struct net_devmem_dmabuf_binding *net_devmem_lookup_dmabuf(u32 id); void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding); int net_devmem_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx, @@ -170,6 +172,7 @@ static inline void __net_devmem_dmabuf_binding_free(str= uct work_struct *wq) static inline struct net_devmem_dmabuf_binding * net_devmem_bind_dmabuf(struct net_device *dev, unsigned int dmabuf_fd, enum dma_data_direction direction, + struct netdev_nl_sock *priv, struct netlink_ext_ack *extack) { return ERR_PTR(-EOPNOTSUPP); diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c index 762570dcda61..2afa7b2141aa 100644 --- a/net/core/netdev-genl.c +++ b/net/core/netdev-genl.c @@ -908,7 +908,7 @@ int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct = genl_info *info) } =20 binding =3D net_devmem_bind_dmabuf(netdev, DMA_FROM_DEVICE, dmabuf_fd, - info->extack); + priv, info->extack); if (IS_ERR(binding)) { err =3D PTR_ERR(binding); goto err_unlock; @@ -943,8 +943,6 @@ int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct = genl_info *info) goto err_unbind; } =20 - list_add(&binding->list, &priv->bindings); - nla_put_u32(rsp, NETDEV_A_DMABUF_ID, binding->id); genlmsg_end(rsp, hdr); =20 @@ -1020,15 +1018,13 @@ int netdev_nl_bind_tx_doit(struct sk_buff *skb, str= uct genl_info *info) goto err_unlock_netdev; } =20 - binding =3D net_devmem_bind_dmabuf(netdev, DMA_TO_DEVICE, dmabuf_fd, + binding =3D net_devmem_bind_dmabuf(netdev, DMA_TO_DEVICE, dmabuf_fd, priv, info->extack); if (IS_ERR(binding)) { err =3D PTR_ERR(binding); goto err_unlock_netdev; } =20 - list_add(&binding->list, &priv->bindings); - nla_put_u32(rsp, NETDEV_A_DMABUF_ID, binding->id); genlmsg_end(rsp, hdr); =20 --=20 2.49.0.1101.gccaa498523-goog From nobody Fri Dec 19 15:52:07 2025 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 A60FF1DE8BE for ; Mon, 19 May 2025 02:35:23 +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=1747622126; cv=none; b=em92W1NWMupn3uz4lFEQEV5dT4YA0LruBQ6w9O4ezysTlzK8fZRWNIL+x1cSh3j++W90C0bWZ18TI/q1Tdj6w2Kp2cHgsVvJQhn6IV7qBM+LAXr9Z9VF1wxiOHQohT4bd8M9PZSMsepYC/dAlVAHG9+bxf+iTDBnJAdDGuLy65E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622126; c=relaxed/simple; bh=fjMbYp1OUTPpUA+isQhdpqYICCd17AJcekK61Bn+4TY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=amWt/TAHcCL8YKvbjJLB2IUS9fZ9LaHRLRTQ0+tDKRXIhnLVTWZNMr44pvIlVGA3CVz7KRM5gDOch8R4wZTm1so6MQg/1p7jVNXqeXaKFKgxRXQrxnDhI/BNqMGyvY58YPM7yjmWCQfu0aByW9UioD1ACke31VmjuMUaEWfB634= 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=hsuqJtWr; 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="hsuqJtWr" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b2371b50cabso4313714a12.0 for ; Sun, 18 May 2025 19:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747622123; x=1748226923; 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=SiIOWkaYu6Q5NvtHbuVewPLdOWvzkt5VSs00BXd1iZA=; b=hsuqJtWrT+r7rFyfp6q4p2B076jErBiTumcXh3MiCUuWfOuYO8x5iTG87RScJ8I69t wfqPlxOB2cDPd6Bkd1qmlXaC2VPzbw40DTGdVId9SUGGbiSkdyaG9XE7MdMUzfZB9hRY CCQyORXj1nX57kyW7dto4nEjLu8Tu3vUyixU+CH28gbqM/RPwk8MrdZKvDrrjUkwgVnG rO44nAzRTLK3zVohbdArjYyTJ7NNxL0zP+EX/BlgcF/CskcEXaFVXO0iy0dcCNjmdGdi yjIz3DGjHZXN8owG+n4y7Z+wFs35znaUnnNIV9v4UPnHsiaWd7I1jX+OiVMkYTsrs42c aGkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747622123; x=1748226923; 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=SiIOWkaYu6Q5NvtHbuVewPLdOWvzkt5VSs00BXd1iZA=; b=RsItKyi3CCPEgNHONzZwNukoUxaIxIqWHXjcW5SbB+U5W/fI1uqT/L3BLDZpyXqj97 0CxEtzrJnr+WtBvziYYXWpW+LFRo9AynMkPeporxTQGQ3kJNRRkQddghdFz8uxX3VJNe 6urQPtevmqWxnKicClMc5uYPyux6H+yyrs2ikcMLclpEhxuv4uTeLyRE0WOFyQjivX7F IkYLVa4/rW2lUNGu3IcwJUaJinwlDBDdDuVs32v3EGUWZ1UtE+UFX/4jsvtYQAmle15q KQJSNob/EJAaiSMIu+uTn1efmdt9XmuM1irVhTl+mKEN8OyndTIbEkecRaFKrSXZtyiE i22g== X-Forwarded-Encrypted: i=1; AJvYcCV9+Oh8JKWg/Zid7Mm0JO9mybRyFACfjwlrPIEEETOXIdZ/n4D82jPhaNBBmkqwL3YFuh7o/A39Yi1UYnk=@vger.kernel.org X-Gm-Message-State: AOJu0YyEcv0mLB/0PP53aDPDZgv7OReAY6jFvmV8pDo3AsCCR3hwgr/X 2nQ/DNYqpVfeulaZ57Z7UM1JnkOyRgkHCrfhKYR44CL8bNA8VnEwXL1UPUL5WQD3ItyODHT2rl2 IzF3IdOEqwuPDfDV49ucJ2jaPlg== X-Google-Smtp-Source: AGHT+IHBrwI4b9TNUkLaMgynwA2HQL/MTtdwhOuI/X1LYMxFchY6tJBRsHHTzW22QGPcgrBPKF64HUiyRaUkCYyEgQ== X-Received: from pgmp18.prod.google.com ([2002:a63:1e52:0:b0:b0b:301e:8e96]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:3385:b0:1fa:9819:b064 with SMTP id adf61e73a8af0-2170cb407f7mr14894249637.18.1747622122885; Sun, 18 May 2025 19:35:22 -0700 (PDT) Date: Mon, 19 May 2025 02:35:10 +0000 In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@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-3-almasrymina@google.com> Subject: [PATCH net-next v1 2/9] 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 *poo= l, netmem_ref netmem, if (!allow_direct) allow_direct =3D page_pool_napi_local(pool); =20 - netmem =3D - __page_pool_put_page(pool, netmem, dma_sync_size, allow_direct); + netmem =3D __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); --=20 2.49.0.1101.gccaa498523-goog From nobody Fri Dec 19 15:52:07 2025 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 917A91E3DDB for ; Mon, 19 May 2025 02:35:25 +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=1747622127; cv=none; b=rBMlID6jG0NS19z9dEK3cuTB/fh6KbYrtI4iyE5ho8cjqUwYcp9en1jrO5gi+1mpNnR6+L3+6wgqtWKJTV0q+uQa+BjtC1fme4aQQCBaR18smnxFiEFnJiBQsfUc/ih+hMPKNW4JERVFwBvje7n2Z6Phy/P+PwKHmRthjf4SnaU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622127; c=relaxed/simple; bh=5DzXyFZppL/cq5j1HzYPMxrLP1enrQNOXaKnx3QGtjg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Gnyo4t0KgB9zChyalnUimwkH78Nj+1TGcKbLZTDIyHq4z6FK9E/Ltb7MNE0Ct+0N50vwCAjBtlH1bkGCVvknNsf22KS8Cg+kKHPiZ6Y3Hl9aA6+EVwcMQHZ0LU8/U6bUmWZVXGlRhXw4BRjYyJsE7veVKDfJLMsj9NCoxGxuBBQ= 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=P6nJKqVn; 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="P6nJKqVn" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b115fb801bcso4148165a12.3 for ; Sun, 18 May 2025 19:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747622125; x=1748226925; 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=Gusqn2FGILPnBfmIj4t7zENeze5uiCs9j+T8Q4RUJFI=; b=P6nJKqVnGS+nusg1unC3VlZC4wEsndhTSqpAXtAHzKE8n+a2tZndNuEi8apDdnG95Q cWN36sLDp8i62cm3axEGYcj2jlPX7hzuJSvo4puOpptoZifCnHMSEXBGCgW+HlqNpNUF 1yt5aW922Se5i7v74/y1e6wYEZNihfclmO9t6vyMTI1Od03ftfX0e4LbMWitFW5FddpP jO23brPhxB+OPEh2q+lex41t/VbOsLUb5oga3OqwBxJObBdsZkiAXUo0GxNQNvkemv5V tpJrJyGwjXlSlHRgevD8/XoC0Bk5P7UziM5Tyxov3iGp6dgw+XsvWOf+Mg3ODCHdaWVo 2stw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747622125; x=1748226925; 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=Gusqn2FGILPnBfmIj4t7zENeze5uiCs9j+T8Q4RUJFI=; b=kdwt1HTu47c6fqsH2GzrUM4h5o2kZus2xvRECunyJEJOAUeUwkuqeW7tLGO7wTRZ82 T6PqAbxdqD/OqOeCl99LGfX7pfcmM9kHU8/xLEaH6yzzt5gZaY0ZZ3ZMvKF4w28dBBun WMKOKNDInVdICFb4/AvH6BcIynmF4TxsATyKdtXzbiDa17SHIG82B+gX/JMFQh4wfS+4 Y7Ew5p9RqrPGCMr9buocthY12YfcMM60JAJ02aGKBpnmKfzhO8FvUibRNSOPdyiuLBw2 g6WIEAIlfytS1fHkR56eMHMXm+1A+RqYV+2CL/F6STPK+VrdVF3lsNSuyFpgEjLc+6RJ vBQQ== X-Forwarded-Encrypted: i=1; AJvYcCWMqi1lnkIbYJUpg/BgASRKezjn/JSXCqCc2NKb3gsV1Rn1ALeMOakwhYbHkbQ14u4RhvyB+/rfzcRpYTI=@vger.kernel.org X-Gm-Message-State: AOJu0YyiWgtZP6mZxQSHAzeLocp07ybp8L/t6Z6lAtcJhnEpUYBE9I6+ 4SAraDv3rS4LFboSAHWjSQTmlLb/9s689UTMnCB69J2bvU4O5hzLxBqJZYVZ7wbg0zwT+mqMI8m bkHG4cQI1uPOgq9PBjI/Ei7rsIw== X-Google-Smtp-Source: AGHT+IHDDNZkjAjUjolYoSTD0tv7TPNYWLq6jXy11ozQMRE7VpKYIgEpNaXnIZTOp/O8RRLb92Sj8gyGBrpw3U9Zqg== X-Received: from plblk7.prod.google.com ([2002:a17:903:8c7:b0:231:78bc:586d]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2990:b0:22e:5df9:8f67 with SMTP id d9443c01a7336-231d4596da5mr182730955ad.34.1747622124969; Sun, 18 May 2025 19:35:24 -0700 (PDT) Date: Mon, 19 May 2025 02:35:11 +0000 In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@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-4-almasrymina@google.com> Subject: [PATCH net-next v1 3/9] net: devmem: preserve sockc_err 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Preserve the error code returned by sock_cmsg_send and return that on err. Signed-off-by: Mina Almasry --- net/ipv4/tcp.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b7b6ab41b496..45abe5772157 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1067,7 +1067,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) int flags, err, copied =3D 0; int mss_now =3D 0, size_goal, copied_syn =3D 0; int process_backlog =3D 0; - bool sockc_valid =3D true; + int sockc_err =3D 0; int zc =3D 0; long timeo; =20 @@ -1075,13 +1075,10 @@ int tcp_sendmsg_locked(struct sock *sk, struct msgh= dr *msg, size_t size) =20 sockc =3D (struct sockcm_cookie){ .tsflags =3D READ_ONCE(sk->sk_tsflags) = }; if (msg->msg_controllen) { - err =3D sock_cmsg_send(sk, msg, &sockc); - if (unlikely(err)) - /* Don't return error until MSG_FASTOPEN has been - * processed; that may succeed even if the cmsg is - * invalid. - */ - sockc_valid =3D false; + sockc_err =3D sock_cmsg_send(sk, msg, &sockc); + /* Don't return error until MSG_FASTOPEN has been processed; + * that may succeed even if the cmsg is invalid. + */ } =20 if ((flags & MSG_ZEROCOPY) && size) { @@ -1092,7 +1089,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) } else if (sock_flag(sk, SOCK_ZEROCOPY)) { skb =3D tcp_write_queue_tail(sk); uarg =3D msg_zerocopy_realloc(sk, size, skb_zcopy(skb), - sockc_valid && !!sockc.dmabuf_id); + !sockc_err && !!sockc.dmabuf_id); if (!uarg) { err =3D -ENOBUFS; goto out_err; @@ -1102,7 +1099,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) else uarg_to_msgzc(uarg)->zerocopy =3D 0; =20 - if (sockc_valid && sockc.dmabuf_id) { + if (!sockc_err && sockc.dmabuf_id) { binding =3D net_devmem_get_binding(sk, sockc.dmabuf_id); if (IS_ERR(binding)) { err =3D PTR_ERR(binding); @@ -1116,7 +1113,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) zc =3D MSG_SPLICE_PAGES; } =20 - if (sockc_valid && sockc.dmabuf_id && + if (!sockc_err && sockc.dmabuf_id && (!(flags & MSG_ZEROCOPY) || !sock_flag(sk, SOCK_ZEROCOPY))) { err =3D -EINVAL; goto out_err; @@ -1160,9 +1157,8 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) /* 'common' sending to sendq */ } =20 - if (!sockc_valid) { - if (!err) - err =3D -EINVAL; + if (!!sockc_err) { + err =3D sockc_err; goto out_err; } =20 --=20 2.49.0.1101.gccaa498523-goog From nobody Fri Dec 19 15:52:07 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 DE0501E9B08 for ; Mon, 19 May 2025 02:35:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622129; cv=none; b=DnSAjOkzPyItZIDWoRPpo5L8EDh3WV5CYj1mz2+79bZSWSC3jzqZKZ0bjqwA8SzuJzsZS1fxoFaxstrIR2Pvlj7wMDq7Wal/IklRKxsLMrq0ZU4S3g6glxt6Ru9ez4SlOd5uA59eKvYZRHkP8E09WzSO2gxScOYrMSCl/1CCyfQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622129; c=relaxed/simple; bh=mv1hnc/JYcrsYiWob27N35tjryacdBHMn0uTMgSU2F0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=a0ie6U+wLUm+KTIXKiebZAcKV3jGIesXHOL7yyANsarnh/hts+EUc3bpl6VXcmAj/tbBJgvxGYeIdXhqgey/5QP7hUElvE3FpzUAwqCEi3vz2QPI0ZZ0Sy1SK2SvSSYQYIViLZZL15pFp9BlP5UQSnsRF1du5iJ96OJQD6MCKF0= 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=01LmC/qz; arc=none smtp.client-ip=209.85.210.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="01LmC/qz" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-73e0094706bso5299227b3a.3 for ; Sun, 18 May 2025 19:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747622127; x=1748226927; 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=dgbVYH77FpbHQz0jo3ZInucxDqpVyDPyOGojAswcD18=; b=01LmC/qzQmgA0OPRbG75nu8kKZGDpPtmUhKpXWEFmgwKD3fXToyX2vAor/wc4pHEdz ux/u6NPwi4sXacRQL1a4Fc8Qxi9xMu4S1gcTBXvV60h4mo5BVpg1jchWNaByWaRo37OV 6rdWwPKPdDp13xgYq7dOQrsc5sDizzNG1Uo7rEmVQwIIZQtufHwKaHFW8Gbs5KcYBSB1 5695azyZoOfPl+qaensLQMqjm/gprTWik7XwQn89A6MSrQvUtgIDVAN25urC9qZ+h5z9 jeNqCOxv6TgkGytsJi5SFuPSEQq4jKckAJA7IWDie8tH17EuCluG7Tk48Xfqk+m0ikGG //dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747622127; x=1748226927; 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=dgbVYH77FpbHQz0jo3ZInucxDqpVyDPyOGojAswcD18=; b=wNdfJgHz6EX0Is90QVeWj/0ebDwMFvBYAL4aM21U2BDXup/1KbHRNY8hJY36FMq5JS d9j3/gEcVsrTyyUSgPlucua0sJeoKYIRzmxENGfE2GCBIeEZQHY4Y67Dh8W4Brg6MFJg WtIZeSQrqJymxHmQ1LZcNlOz+dghTxLGo//HatioZA4bn3bzKHK0JZlrCKVaBjDpGHZt ooDGxX9W/3emZG7UZ6tj4sudkE3BNl/cH8odgyxUSstLllg8wxAuSpLxOWBc2D90TxVO /sY8FcjFWt/WuGNRZdpAwhMStoQ7R/K2rZ3+9scE4I3+NLFT0glSbz2gzzF00Cab9+kv DHZQ== X-Forwarded-Encrypted: i=1; AJvYcCX8qg1q6l4gfROHHI+YDtyEMGmOo3G9ppD+QmqrEw9aZVvFIgWhHUhPMAdQqM6L6D2UqmhxyhDjKEFuRC4=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq3jcoS/n/RfLRdpAjJEIPWhH1UCdWge7clFl2KXj9Ek6TWYm+ U7ME++8xUtIxfwmExxTzJc8H9kUAbEqrDEodReZSUWs852ojfqA8VKx0IroND/9i8gPZzbvvz1Z JSiaydktZ4X7yR4KiaZVrSeU66g== X-Google-Smtp-Source: AGHT+IGYP7gHTQY4VrMBV4Jvp7SIjOwTc4ULH4X27OGkctqn0OJKaDn02AnHC71nkqQCZpE94dyzsqSq6kKMXBhrJg== X-Received: from pfes20.prod.google.com ([2002:aa7:8d54:0:b0:742:a60b:3336]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:aa7:9ddd:0:b0:742:b3a6:db16 with SMTP id d2e1a72fcca58-742b3a6dbc0mr10282223b3a.20.1747622127291; Sun, 18 May 2025 19:35:27 -0700 (PDT) Date: Mon, 19 May 2025 02:35:12 +0000 In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@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-5-almasrymina@google.com> Subject: [PATCH net-next v1 4/9] net: devmem: ksft: remove ksft_disruptive 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As far as I can tell the ksft_disruptive here is unnecessary. These tests are largerly independent, and when one test fails, it's nice to know the results from all the other test cases. Signed-off-by: Mina Almasry --- tools/testing/selftests/drivers/net/hw/devmem.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/devmem.py b/tools/testi= ng/selftests/drivers/net/hw/devmem.py index 7fc686cf47a2..f5d7809400ea 100755 --- a/tools/testing/selftests/drivers/net/hw/devmem.py +++ b/tools/testing/selftests/drivers/net/hw/devmem.py @@ -6,7 +6,6 @@ from lib.py import ksft_run, ksft_exit from lib.py import ksft_eq, KsftSkipEx from lib.py import NetDrvEpEnv from lib.py import bkg, cmd, rand_port, wait_port_listen -from lib.py import ksft_disruptive =20 =20 def require_devmem(cfg): @@ -19,7 +18,6 @@ def require_devmem(cfg): raise KsftSkipEx("Test requires devmem support") =20 =20 -@ksft_disruptive def check_rx(cfg) -> None: cfg.require_ipver("6") require_devmem(cfg) @@ -34,7 +32,6 @@ def check_rx(cfg) -> None: ksft_eq(socat.stdout.strip(), "hello\nworld") =20 =20 -@ksft_disruptive def check_tx(cfg) -> None: cfg.require_ipver("6") require_devmem(cfg) --=20 2.49.0.1101.gccaa498523-goog From nobody Fri Dec 19 15:52:07 2025 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 8D2AC1DE8BE for ; Mon, 19 May 2025 02:35:29 +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=1747622131; cv=none; b=APvAn1pDEChZIeA5LLA67iyIYWyzPklWIbUdVaoq6dLdbYKHCSfU9Iw+NgRotZmcRzBSVIVZeHJ9Ts3/eJB1WGHpGr4aO4U8euGN2hha3GGR6kkCuvOVWJum9kyAOqSYGq8Pczp4pVFJzMDVS0s6QhVFquBhLdxjtMqfpVKd4yI= 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.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="QDGl+NRr" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b26e73d375aso3863013a12.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=d3Ye17Du80GXTcqVwJ1WJWm4aq0W0kSlJkFiqu0KSqnMsyHOHB2hIeNI0yBLn+vxxc V8hXQdiyPDJRtnGnog439gGgAGtTrkyoGrpPitQioyo3X0fLcJRMijpL8WDupOXglrVO HM0ZhrSubIdSydt0eqd6HHeyTDQKoqC5w7KwS0yVMdBLScgAwYhzMF75Jfu5MTIeeXsb GLA3vCFwAfSGwFSI1BjIbsdn2wUWKcsjPPU+/24PyXm/Ex+0EyMPvSpnwKjSsjF4uEpp YOWBz9VxpTIAavuGOFqqZI4qYBsW9qfYiTJEVKCIae0huUT2xkJ4k6q/OpsJSEuMjnHH 2Rcg== X-Forwarded-Encrypted: i=1; AJvYcCXe9AZtyDKcoh8yZslfCOehwOthIr49U+eriuZlv/Obc0NFDdyTjwQBabpyyB0GTzjRRlNONZL8vwGJKr0=@vger.kernel.org X-Gm-Message-State: AOJu0Yzf3T0i+tXK0f/iXTT/5gyA9/i/zgvtyZUu0kMgWDzPMml00IIG Q6vFF1zYldQG4+r5v9WsD0E+cB7eYo9qBHdJSKVgyfNE6+EJqreUp1ZnD4UObtLs1I2ghl6Hh3h eXooN3mwLomvEF01xkQ8AeUF09w== 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: linux-kernel@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-Transfer-Encoding: quoted-printable 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/testi= ng/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") =20 =20 -def check_rx(cfg) -> None: - cfg.require_ipver("6") +def check_rx(cfg, ipver) -> None: require_devmem(cfg) =20 + addr =3D cfg.addr_v[ipver] + if ipver =3D=3D "6": + addr =3D "[" + addr + "]" + + socat =3D f"socat -u - TCP{ipver}:{addr}:{port}" + port =3D rand_port() listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr_v['6'= ]} -p {port}" =20 - 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=3Dcfg.remote, shell=3DTrue) + cmd(f"echo -e \"hello\\nworld\"| {socat}", host=3Dcfg.remote, shel= l=3DTrue) =20 - ksft_eq(socat.stdout.strip(), "hello\nworld") + ksft_eq(ncdevmem.stdout.strip(), "hello\nworld") =20 =20 -def check_tx(cfg) -> None: - cfg.require_ipver("6") +def check_tx(cfg, ipver) -> None: require_devmem(cfg) =20 port =3D rand_port() - listen_cmd =3D f"socat -U - TCP6-LISTEN:{port}" + listen_cmd =3D f"socat -U - TCP{ipver}-LISTEN:{port}" =20 - with bkg(listen_cmd, exit_wait=3DTrue) as socat: + addr =3D 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=3Dcfg.remote, shell=3DTrue) + cmd(f"echo -e \"hello\\nworld\"| {cfg.bin_remote} -f {cfg.ifname} = -s {addr} -p {port}", host=3Dcfg.remote, shell=3DTrue) =20 ksft_eq(socat.stdout.strip(), "hello\nworld") =20 @@ -51,8 +57,13 @@ def main() -> None: cfg.bin_local =3D path.abspath(path.dirname(__file__) + "/ncdevmem= ") cfg.bin_remote =3D cfg.remote.deploy(cfg.bin_local) =20 + if "4" in cfg.addr_v: + ipver =3D "4" + else: + ipver =3D "6" + ksft_run([check_rx, check_tx], - args=3D(cfg, )) + args=3D(cfg, ipver)) ksft_exit() =20 =20 --=20 2.49.0.1101.gccaa498523-goog From nobody Fri Dec 19 15:52:07 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 4E0481F09A7 for ; Mon, 19 May 2025 02:35:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622132; cv=none; b=JWyds+zMTD2ijoBAGVtdBDBo3dP1P2j/WXVLI33Iw2on12mxBqbPIOOALLIdPFqp7BOWxBJDUXcPvkB3dXrXUOEjOSAhYrhmQJS1P6CyP9aPsoZEzj0ulI+b1aePwNNI8CNMqfRjSdABhv990oqCXa/tEs7K2Iof4CDglznd1+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622132; c=relaxed/simple; bh=+fLzCD1RoUrUeV193X0CN0MPAFz9uajW9owZKfgSTYA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=X4JLSeLKcdVYZHHAV38I6SYJTnZCpmeY+bB8bZlYxTw74/9htYrlg5tW/1dvK0qMkS20qOF5lFINK8zmeTC36LSXWqzz+A6WQ4AAVo47yy6YA8Zjyc8aGpKwTiQzBquRTvEmCBxFe2fm0nxFyeWWtayBExM4hs66zIb2bImQuxA= 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=c0YgX5rK; arc=none smtp.client-ip=209.85.210.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="c0YgX5rK" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-742a091d290so2427556b3a.3 for ; Sun, 18 May 2025 19:35:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747622130; x=1748226930; 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=Dsib5kCQHhRTpjaf9L/1KcIsuAgRVw/2/Ukd6+B+UoU=; b=c0YgX5rKmwq33rnuPYK6ZxMBYswLZHFh4/l3+XZMwZNAkr7n9MrnTFjr19kx2kaW7Z Ji+ka646sC8VLF6Nzic96WWm1BeIQzTIu2dy0CPOcP++sG5LnUaqsYrMqltkBC8m/8Ex u/cu3uUcgZ9B6ADwUMUOF7ksGmgGFir7bhQynTCJ+yLZ4b5a+p7lbQcR+3Ra0WT3mqB8 h4IcH8a8rI4aIOhcxs8Sc92je8MFgbuhCFFB33Xl7OqCGTxuvwwYoygWXWIvklJJ1ADY rY/BNdjCmCmvLVo4AKAXyOqoVYhmbwTYHDE6/2L+AlmmXzGhlsoMDhvaOwC1lzjYxFaH I19g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747622130; x=1748226930; 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=Dsib5kCQHhRTpjaf9L/1KcIsuAgRVw/2/Ukd6+B+UoU=; b=RAxR7J8kBguMiFR3xHTotByqmtAS8BLHZ6ukLpPZ7171QJOAIZi3XjWNwQRpTQJsJG 9opS2g80fwfnoTS0udcOvY0I1n1YRHTKjuc0cYnp8DqdMX/9Q3ksipJofXf8xLb3WZVi bqZUvN9+n0TFlOt7gkOEPlaKjBU2rgzHOOyJi9twiZloNP5bNCwSgr9WgbB2Zz3OdFCj 2y1PsRPzbayDs1ufDFopNysDEvvS+5KxagWvFCzKCJnUeOclXuCalirp7YVYnTIyMvv9 vbyLYolZq9kqjNFrP0E/0Cygz9BD+AAdoY2+eoiv+aJf6S0Lxi79jV7F/Glycl3rGd4u Cp7g== X-Forwarded-Encrypted: i=1; AJvYcCULDtt85BstAj/YY4FBVCEHhzhCZ9JWDMQxcWP8c0Zr+yAzhgsmUU65ee3qHSY8dMo3lE32YI+uzGp5ZJU=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8cZr277kw7PwuCLJ0WTdzcBJPi55YX4E/p+nEjY8T6U9bVwSV M9ANHYLXt+lCe9HKgMMlKDxk7KTrC6sxdltHpiyTHrzmpfdH836OEv1/R0Xpawm+DznVEZfqYzF xL06UyC2A7Y8sgNvecupQD+AGSg== X-Google-Smtp-Source: AGHT+IHYtSlpqkjG9aEm65HFlOMqCYP8ZVIHIn0ysadn3DoH/Dao7wFtqE4cnWV8BuGlnEjplUE25OvnhoAFtu3l/Q== X-Received: from pfbei22.prod.google.com ([2002:a05:6a00:80d6:b0:736:415f:3d45]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:91e0:b0:740:b394:3ebd with SMTP id d2e1a72fcca58-742a97ad507mr16514775b3a.7.1747622130537; Sun, 18 May 2025 19:35:30 -0700 (PDT) Date: Mon, 19 May 2025 02:35:14 +0000 In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@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-7-almasrymina@google.com> Subject: [PATCH net-next v1 6/9] net: devmem: ksft: add exit_wait to make rx test pass 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This exit_wait seems necessary to make the rx side test pass for me. I think this is just missed from the original test add patch. Add it now. Signed-off-by: Mina Almasry Acked-by: Stanislav Fomichev --- tools/testing/selftests/drivers/net/hw/devmem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/hw/devmem.py b/tools/testi= ng/selftests/drivers/net/hw/devmem.py index 850381e14d9e..39b5241463aa 100755 --- a/tools/testing/selftests/drivers/net/hw/devmem.py +++ b/tools/testing/selftests/drivers/net/hw/devmem.py @@ -30,7 +30,7 @@ def check_rx(cfg, ipver) -> None: port =3D rand_port() listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr_v['6'= ]} -p {port}" =20 - with bkg(listen_cmd) as ncdevmem: + with bkg(listen_cmd, exit_wait=3DTrue) as ncdevmem: wait_port_listen(port) cmd(f"echo -e \"hello\\nworld\"| {socat}", host=3Dcfg.remote, shel= l=3DTrue) =20 --=20 2.49.0.1101.gccaa498523-goog From nobody Fri Dec 19 15:52:07 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 CFB7F1F4CAF for ; Mon, 19 May 2025 02:35:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622134; cv=none; b=igKK8+2QArvnquyKG4NZ9Hmj4soiPf/6m7qtekdrpP+cwCr7UADzIKBmuAy79+YwTmbgJ2mF5Q86XrjLLwW0SaCgEzL+Z2fWoIa17VKGsNmkh09gaN6C/+pmb3850vk9QBPgMnS7avE7DZ8VDJFWQyjAbhR8+GE5BBDB5WE6O2U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622134; c=relaxed/simple; bh=lXhPuDqZ8lFiqJJEDrc+fi8w2H175fq+dRDihzDr1bM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dxlDz5++Hnh26JQs9+sQqrP9rQhOTCcdYaqVKFW0ajRF4cc74VcLn6b1MkMx2yZkwCbdgRT6+MdriO9Gjf4AhCQR+cTj9gmMJtKAs/c5mF0CjexY5i+sQBA3X/o4P+H9WiaPy6QF+vVdQJ1ZTpjljMhDc9tGsDrzDqVE1Uo2Mr8= 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=YQUVFN4K; arc=none smtp.client-ip=209.85.210.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="YQUVFN4K" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7394792f83cso2856152b3a.3 for ; Sun, 18 May 2025 19:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747622132; x=1748226932; 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=c6AvReAJLKB2KWx4p7QNdhXPE+oF5Pp4I3dIzKrTOjY=; b=YQUVFN4K9FtwrdqaVkZcfeEOuiXBuM8F3imqbqDtx6xkpeHDfDr3CbRkD+m9Lu/y3Z yyXJZYGfrgroFEyHREsXvcOfkuFkHRlSUHCLnzAUVBmX8L+BMBrCiEK5YC3Uv3BthgUu zx2HMwhnKdkWWJsJ/XQ07ZnwOkGLZ8XzmZCnZ6zRZgIJGllxedrmRxB9XSvuGp/R1nBn FREGOqoLlKGDBDwjVIjXuGqcxvpGrmEkMr7uLKAze0ImSRmh2E2BHjUJjp4lp3NqQMcC emaL7hdJ/qGQVzsTBO/8rhaW1PdSE7ybKgaogD3We8LgRSPWzSY61Q4b65p55CuDZDp7 uNxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747622132; x=1748226932; 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=c6AvReAJLKB2KWx4p7QNdhXPE+oF5Pp4I3dIzKrTOjY=; b=NWbk2yEty/UBpWohSnLmj4uxivPi0Uj+oyI+iR4WFh3a4Syosm/+cIcW9V9R+cmL92 0wnhNIDfeOFKFrdXI5VdjppSkDdVoPYeFJJE2eSh04XCqsbDXU/L71vQDPnZeILkieZP nry/WqQUvXfsjmzxurK0ikEnGINZnVkNNvl1bdSHp2syu4Ws4/83MSvG5pgn9VKlVS2v 5fa3f3uEDkmuIjaGwZt7J87DFh6pu5cXWnzhaTSQ46RuS5Chlm88k6uabafEmMSCXSPE aczWslI2fO4YI2/a9zWDpSomtbu/hrVXE47ikwFxShIwjuqJV+XwQfmsndcRpgYGiBNr YFSg== X-Forwarded-Encrypted: i=1; AJvYcCUDPFB5KXk1QhMwBT0VEfagFjXUjteC4oS+VVtKPIR+76CrvSTB17057B3VYVdhCQxhwuY7ASe04zxjan0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3UL2ER9WNbMndrDfd927cmE2Qsft3L2QaBGmkylUV5Urz3RC5 w0laZPtd6qk6EFUad+lNwrVISbwNqbPfFiq9IoK++PsjdIDrWc7KqB64iy6AdI7viUdX3k+1qqc HHss0Wucl0kP4s+PmdlKeS7HTiA== X-Google-Smtp-Source: AGHT+IHeYzRMmOkX7+lsgG9BfNqeH5NnQHkDsXjIYRGrh345Z62LvP2j6VviMlp6xHOXPHOb4h2WAzbno9NKL1vt+Q== X-Received: from pfblw5.prod.google.com ([2002:a05:6a00:7505:b0:732:2279:bc82]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:9186:b0:742:4770:bfbb with SMTP id d2e1a72fcca58-742a98a3213mr15212907b3a.18.1747622132372; Sun, 18 May 2025 19:35:32 -0700 (PDT) Date: Mon, 19 May 2025 02:35:15 +0000 In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@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-8-almasrymina@google.com> Subject: [PATCH net-next v1 7/9] 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- .../testing/selftests/drivers/net/hw/devmem.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/devmem.py b/tools/testi= ng/selftests/drivers/net/hw/devmem.py index 39b5241463aa..40fe5b525d51 100755 --- a/tools/testing/selftests/drivers/net/hw/devmem.py +++ b/tools/testing/selftests/drivers/net/hw/devmem.py @@ -21,14 +21,27 @@ def require_devmem(cfg): def check_rx(cfg, ipver) -> None: require_devmem(cfg) =20 + fs_5_tuple =3D False + if "FLOW_STEERING_5_TUPLE" in cfg.env: + fs_5_tuple =3D cfg.env["FLOW_STEERING_5_TUPLE"] + addr =3D cfg.addr_v[ipver] + remote_addr =3D cfg.remote_addr_v[ipver] + port =3D rand_port() + if ipver =3D=3D "6": addr =3D "[" + addr + "]" + remote_addr =3D "[" + remote_addr + "]" =20 socat =3D f"socat -u - TCP{ipver}:{addr}:{port}" =20 - port =3D rand_port() - listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr_v['6'= ]} -p {port}" + if fs_5_tuple: + socat +=3D f",bind=3D{remote_addr}:{port}" + + listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {addr} -p {port= }" + + if fs_5_tuple: + listen_cmd +=3D f" -c {remote_addr}" =20 with bkg(listen_cmd, exit_wait=3DTrue) as ncdevmem: wait_port_listen(port) --=20 2.49.0.1101.gccaa498523-goog From nobody Fri Dec 19 15:52:07 2025 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 8ECD72066F7 for ; Mon, 19 May 2025 02:35:34 +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=1747622135; cv=none; b=JkKrNB867Z1aSkViRuASDpR6Q/M5oeqw9QD2qe8bkSQUeYn8igdLLodwHV2sTMSMWYMoGgWgtUcgY6HsdPMSvVSa+wGATtXky4VptBq8lefuVgbfA/b5BDRRZCDQ+vvHMsH1YjfqfjDGV3MgnIgPVRJ+SIjNNUTah/HUoi1hurs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622135; c=relaxed/simple; bh=DyWWH7L0CCILd4odcqjjQy5VKvNZph+DcgjHacONU08=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GuLw27afcp0NehEy+sgR0D5WLgX4QFJFF/4CPz1zsxMVxQAlzqKXUWGKQg0mfmMCWYBT+ToZPp8SAmvxIdos8rkiCZ0+NBzj4tX42loW6fpQIp8KWR6Abr4PqKDNEv84MFZm71iKSfwcQadK8IRfQgBMwt0pnVx+Cn6gbVteSPw= 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=w1tnfZ6W; 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="w1tnfZ6W" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b26e278dd1aso2146776a12.1 for ; Sun, 18 May 2025 19:35:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747622134; x=1748226934; 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=GOoqGQ98UOim4ci2kcnS9BvhTjdsuvqj0JQE1ld7C3U=; b=w1tnfZ6WgTx53clXqSvj7QMR0DLvEhPE2G7VuwAtpgmFjbGkLDugrlqKsjUAILCZAl 8i41tZZ6HvgB0+mrmae0F4wrwhtlCVhHtkrARP8fh9BWELm+vzeul+7mGrW5qbLEIAoN FR6tTTCPoPbMwERimgwEIDj8Rs9Fe1BVSANb15fk3MzNsMjZNQwnkcBesxuKKjB2AFF2 XS+TUb5oMGZyfBCo0XPUrdzZI+GNI4SJEnArVv3coI5MR658VGmPM1BE26R2ELSbd8sg lcnhTU9rav0yW7ShVNIieQ2f3l4Ssz2qHdTkTGGm3caK5bVR/3Du+FUmS/7JTBW/audF wgIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747622134; x=1748226934; 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=GOoqGQ98UOim4ci2kcnS9BvhTjdsuvqj0JQE1ld7C3U=; b=k0Xidika/GDnjhvTJ1/gFZ5LUcKSzxsKVyVbdUb9e2vwx/5TSavGeWzNdsQsw8Mdjz Pj5AHTSWZZ1ytikqzSyu8PO7nSFz9gRze0DwP7LLMdUQosCxRCFDnVXjgdrOm4ay19J8 SVyCMMe/otp/EJaaMFK1Lh16q4T7ELGuCJv7CbblnxoD0U3V76f7pdtAD42eVVfALdYg 5iFmU/frM6FxxG8TrrbnIewHE7v7BMqy+WePomUXXuDQwIFF/MApwI6is7dKjEaO9nny LE0wFodTm792NpxWcQPsU8UkFT2Iv8YjkiTavyND/a9dPM6zWVEzzw9TUHun3MxUS2Fp DX9w== X-Forwarded-Encrypted: i=1; AJvYcCUa32uYqP+QJj6OsjYw6l6H3voqdcTnVVh8f83NG/cPIuA6Pem7mN52fyQvzFlLmxl/ReiGyXSymyZdUKA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9rC/XEWb5xwknTNw5r1+s+qBFMA1GRi7mNL3Ql7ZgUqNDipl/ zckNVatojwX6oxzDia3cKBBFuwsHLMC4z/1jrAYlVhY6r1JIJjjy4dFgr6RM3wg6tx3Ahqsfguj tvi6gcdzrsJtecZIIztZtGuIHuQ== X-Google-Smtp-Source: AGHT+IE6aX84b0eaIo0V77IgI3eQ+VzhrvTcrSqQdZ5DqYv5fJgf6icKRjS5aZdtIH3xwKERF3FKSLCy29p3I18ZnA== X-Received: from pga23.prod.google.com ([2002:a05:6a02:4f97:b0:af2:4edb:7793]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:439e:b0:1fd:ecfa:b6d7 with SMTP id adf61e73a8af0-216219b13c4mr18758690637.28.1747622134057; Sun, 18 May 2025 19:35:34 -0700 (PDT) Date: Mon, 19 May 2025 02:35:16 +0000 In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@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-9-almasrymina@google.com> Subject: [PATCH net-next v1 8/9] net: devmem: ksft: upgrade rx test to send 1K data 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The current test just sends "hello\nworld" and verifies that is the string received on the RX side. That is fine, but improve the test a bit by sending 1K data. The test should be improved further to send more data, but for now this should be a welcome improvement. The test will send a repeating pattern of 0x01, 0x02, ... 0x06. The ncdevmem `-v 7` flag will verify this pattern. ncdevmem will provide useful debugging info when the test fails, such as the frags received and verified fine, and which frag exactly failed, what was the expected byte pattern, and what is the actual byte pattern received. All this debug information will be useful when the test fails. Signed-off-by: Mina Almasry Acked-by: Stanislav Fomichev --- tools/testing/selftests/drivers/net/hw/devmem.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/devmem.py b/tools/testi= ng/selftests/drivers/net/hw/devmem.py index 40fe5b525d51..10ffd8a8f72b 100755 --- a/tools/testing/selftests/drivers/net/hw/devmem.py +++ b/tools/testing/selftests/drivers/net/hw/devmem.py @@ -38,16 +38,17 @@ def check_rx(cfg, ipver) -> None: if fs_5_tuple: socat +=3D f",bind=3D{remote_addr}:{port}" =20 - listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {addr} -p {port= }" + listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {addr} -p {port= } -v 7" =20 if fs_5_tuple: listen_cmd +=3D f" -c {remote_addr}" =20 with bkg(listen_cmd, exit_wait=3DTrue) as ncdevmem: wait_port_listen(port) - cmd(f"echo -e \"hello\\nworld\"| {socat}", host=3Dcfg.remote, shel= l=3DTrue) + cmd(f"yes $(echo -e \x01\x02\x03\x04\x05\x06) | \ + head -c 1K | {socat}", host=3Dcfg.remote, shell=3DTrue) =20 - ksft_eq(ncdevmem.stdout.strip(), "hello\nworld") + ksft_eq(ncdevmem.ret, 0) =20 =20 def check_tx(cfg, ipver) -> None: --=20 2.49.0.1101.gccaa498523-goog From nobody Fri Dec 19 15:52:07 2025 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 5E14820E021 for ; Mon, 19 May 2025 02:35:36 +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=1747622137; cv=none; b=C+I77xc4BnxvepDvwXNasfo7r4qIcAASxyJERWXtbRU0FfjVPyBNGkOyTHyrodsIHqGBFo+oZk/aWIeST07XQytT25usbXPJsZmUm7KJnUU2xEW9TYCJrXP+rRieUQ7CaNrehtqKgTzYdHUmuFlmdvZS2QXQhYzlPaB13DeqQn8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622137; c=relaxed/simple; bh=RrPVhAa66e66GaEwz0wQ3D7hCOWXRdfrdXeUxMO+Rog=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aZ77LL+KA9jk7rBWpEv1GYi6rL9SV1N2QmJaemG+JsxE+PJTGkLxg0esDJ3j93u4CVdnUr59T/rbuOKmBo+IQ2IQb/YQMuEfGeVGIv2lIwcA0el5/VDVzUONA/myCLRPqGRnot0jw5xnOyiNKDZdy9G5inncd+7Pw5TUIcSD4HQ= 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=jOtww293; 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="jOtww293" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b26e38174e5so3695042a12.1 for ; Sun, 18 May 2025 19:35:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747622136; x=1748226936; 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=0Glndt75G+OVXAAyKARdAz9i34uW2k/8nkArkfG9jRQ=; b=jOtww293+X4rPff3K+J+q384ObwJNJgnL/qR4Q9WceIWatjjwLzQgQ7OoYsVp0WuCE lAl015nCIDBlurAnfmQUXgPHJZWdKiOnvNJDLsKP3sN8Cm1czlNv84q6DI2Sij/TJM0b Wbu7lagmNycOly8IjaaortIcrBS9ksZaMvBqqpdCdxwzphzqmyouBO6IqsmIAYQPQXH1 7kNo81BSkkeV0+2cuV0iTqIc4L5YZ7Tg2jxmKHoZTA56H0L1ALGk4Qxfqi4eoyIm61tS KvvcwsBrDFUNNyAukG98iUmOn5sMThLRbDx5FvZx5Ny/88oy9bbrh0YY2JfKrOXY3IAN lRhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747622136; x=1748226936; 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=0Glndt75G+OVXAAyKARdAz9i34uW2k/8nkArkfG9jRQ=; b=h0oFV1YABX+suxNA6lfuiBcvK22vDFA/JCWKkJOgna8Bn71Fu0HYI/EeILjO6kc90E uHs9vd6uIKAG4ev5lRzqD3yYliwPa4OtPvo2dU+M2Gz3NVRv9JEPTfilIMjuwo1KlH6V 0U1ZOGPMETgbZN7R21nXaBeRZrlMfBuRgjQYINbwV0jbxzC2NQ9Yhr2nqAP/j2HUOp7V kW7CqSz6E9WhW7Z+jwtMdJrj2EwJ58dLHXVctT1Ej5X4qnXsucQPU2eFsJW971cAMWV8 vTv02zZnW9gu5cN+rWciy5cSxROBcpyqsaxJEEdLGBYX3D8f8MODpcUKHA2/clcM3v8D vRcw== X-Forwarded-Encrypted: i=1; AJvYcCUIf5NI3AI4oXpMW3QqFYxVCt4qCI/Le4vAQdmnQo7cPwKsF9qxepDYgQwE6vl1hQpKn+QnR4i/3ZOx+oA=@vger.kernel.org X-Gm-Message-State: AOJu0YxijewR0E1xDTsgWrFG7WkLdsGKfIAsFZ+oXG62UcIOq378Emld Qpyu0Wpcc9oIIP3rle/AlXqnbW6XW0qvIDGQd16fxfXcIhZ19W6JnQzwaQ9W/Jq16miaeArc6mT vUrEh/i66kripZLk2CYQJ5K2MGQ== X-Google-Smtp-Source: AGHT+IFwRhrMNWbY27xjgLky+xuDZgpoiQb6iEc1dBa6/1lAvXmfz8U9WnJ0DFLv/7SmNdMeydFBL9ineFFXIDYMvg== X-Received: from plrj13.prod.google.com ([2002:a17:903:28d:b0:223:fab5:e761]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:3d07:b0:224:a96:e39 with SMTP id d9443c01a7336-231d438b420mr163717575ad.9.1747622135688; Sun, 18 May 2025 19:35:35 -0700 (PDT) Date: Mon, 19 May 2025 02:35:17 +0000 In-Reply-To: <20250519023517.4062941-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@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-10-almasrymina@google.com> Subject: [PATCH net-next v1 9/9] 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/test= ing/selftests/drivers/net/hw/ncdevmem.c index ca723722a810..a86e4ce5e65d 100644 --- a/tools/testing/selftests/drivers/net/hw/ncdevmem.c +++ b/tools/testing/selftests/drivers/net/hw/ncdevmem.c @@ -526,7 +526,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 =3D 0; struct sockaddr_in6 client_addr; struct sockaddr_in6 server_sin; --=20 2.49.0.1101.gccaa498523-goog