From nobody Fri Dec 19 16:11:17 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 37396214A6E for ; Fri, 23 May 2025 23:05:30 +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=1748041532; cv=none; b=cZQjCiWjUZkayOEiXTXGy49CdE0GwfzM9eIYdyxSR7wiGtcEq/B5SaXe4MBXZ+son66lg8nWpaUBqtEqWi+89nlJ4bXSiuiFxbCtI1rCq/AtQMZq+jxK0m+6Y2QseFixvl5QfhFKBaXbIEhrvWl7Ox8eNSHHtcsmN9THRok6z/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041532; c=relaxed/simple; bh=9bBgqUTKUTvL8dGZ7fOUimIIQDGeubiMLtI87rh+SaI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RrrnY/UJMUlz9ALrm35BgU96lv9710lV1iTamg01PFe2q0u21MT13D3YyLZbMZr1ck1olzpk6ZXiw+/akoizO5tOhRYL/4HneBoFdaGEHF32zWwuG63zKfiFxoUalNGmk6vKI/mY8C3vruoYvpDO+LjZ2LxGkZTGM6O5t6NmvX4= 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=F1QLlBBn; 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="F1QLlBBn" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-231d7f590ffso2178825ad.1 for ; Fri, 23 May 2025 16:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748041530; x=1748646330; 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=A3Y8BwizNgJ8oalQ93WgymucSdo1pRhF9lv1bG0FZic=; b=F1QLlBBneBeoElw7DJswg/g5uXYv9TFmvDrqhKzxQUfws2IsMC916485EaxFTM96Oa fZLQ52K/8SjCvPUZOt/mMeXfHvLi0dErA4lS/PmFYBYCaK2444GN1ITxuG9tN1p40TbU XQbe4KHujYF/XKSKubK8LcufP8fALHCWt7fAV9bREvkyYip9z/zUembynr1+iztHD/KL NQUTNinrdr/ZL9RxeSSEKQi0bINZroJr1bYLDO2GvxS2i31ei/C0T6sZPMVZM9PbiiII YJV/1WzCBpAP2aYhI204toJ0YcmZxE4GK4FySlFbCmwKZI3fM9nYWQgW6daXjb174A2Y L08Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748041530; x=1748646330; 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=A3Y8BwizNgJ8oalQ93WgymucSdo1pRhF9lv1bG0FZic=; b=nmq501XHOdVmM9c0+NN7XcCX8SUrPdDp7BCOLnN9lyq1lyIZtHTNGBgQ/mAnatXKS+ 1O63EC4LCiy96zI5KNrnyv64mRe0oGyNIYyazruaLmvoaaEVUHtWkLszEluDigG3RRUu GaVcGVijckzHulbdJQRLI+K4ZEysDDWdW7MlAU3Qsx7i904IsMNqZDUJ+srR3pqWuKso f9AI9/u6hl52QJfjTPeWh7msmsvmIPu2OgAo0uf+b9UbHJ0moBAbQKnkYkyr5bX/pHbu f4SK/MOE+mY0SsxIqGuDt8gp9OqYvLeycCPbFtQZKgpQJQBGHgCGu96Y79NoUBlYRuR2 Y/OQ== X-Forwarded-Encrypted: i=1; AJvYcCXv+nyvXcmqobdGdwZwc+nkvNt6390g2F3wVNwKhCFnDZCMlzqMJrQAUWGreRS+NTtGSBE4fot0Zu2aHYg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyr0hFZ0Gy4gkjcXX5cH7GTVxr8dPdMfI6ozNkbOMTK9c6IDScR 440hUdJ374BzVDqHeJcheBVqW65L1xiC3+T6bw7UrZwYsCzdJ6qBsoktBxLn8CTAouBxIhXr2uE ZQAJGLUFzsLEbiUo6CJidDrwLTw== X-Google-Smtp-Source: AGHT+IH4Fzn2Wn5un9IcegOD3XvdTAfnS/c9KAmp12UOskBBU8tWlxhI3ZaVLU3vOkIU9iaEtUmCYsqbvBCAu6Fdxg== X-Received: from plil14.prod.google.com ([2002:a17:903:17ce:b0:21f:4f0a:c7e2]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:d2d1:b0:234:e88:f23 with SMTP id d9443c01a7336-23414f34dd5mr16574955ad.6.1748041530499; Fri, 23 May 2025 16:05:30 -0700 (PDT) Date: Fri, 23 May 2025 23:05:17 +0000 In-Reply-To: <20250523230524.1107879-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: <20250523230524.1107879-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523230524.1107879-2-almasrymina@google.com> Subject: [PATCH net-next v2 1/8] 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 Acked-by: Stanislav Fomichev --- 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.1151.ga128411c76-goog From nobody Fri Dec 19 16:11:17 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 BC570217679 for ; Fri, 23 May 2025 23:05:32 +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=1748041534; cv=none; b=jTCS4t3E2sukebqmLb+Mc+H5vx+TpNu6twvFjadXTktZV7YMfzIt71WCM8emh/dHAF8MeknTxsg5CChnApRhMCnjuHPyFitOJ4fPnvdSuEkuY1nn+sOSNp+5Pt5vz9J0LxlK+4Dd8q3bYR3kOd4bHx8RDoFITH+3gF7eXJlgeTo= 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.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="S1237oP2" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-23415056f5bso3559605ad.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=r30TX4kGDQtc1isBNhpUix/O7h6NcSfOCtmJzv99dOHfkjVxEy5mJHP3hxq0fzoi6k NXDC5Fkd96ihayt3y/WTL0noxsWi4a9A+41LfVXLECyBbE8WQblDu585bOVL0vQw085m D3hS2UL/AnjYHN0T8ibbgaxSjBRuQgxl/5a2sBV/u7SiBhZdbwHECoWPK/kk2dYS8T1u gMEUo8S6WjPCuibKMN5FBd23EV02CGkbh/Vh+4+ZmWlbTyRolQIl78M8PySbpgBetg3O D2Lgz/FKN3NXS96e1/d9KLNDegAiavGhoIlMejlfEgUBPMyAPXWvTKOMl0kKad94GZG9 SnQg== X-Forwarded-Encrypted: i=1; AJvYcCX7Mu9pPNQ1NPQn5msqjVLzrwJaWXCpJKT6HWgx3mcFMXQM9e3B/eoy/PirkfE4gE/4sxS213T3VYSy9lY=@vger.kernel.org X-Gm-Message-State: AOJu0Yx79NcUWTRxyd1Z/sN7KvhfN9YTfIE4jvJB8JR+JwfVMtJSreLz GBRObN5s5CF/TPIIsvSahIRBNHnQSSSjaIDIaLfr+ScS0XWmGuqPq3iiR+Zq5DOMTDXENkXlZq+ npEmLKeeFnvBUMyXabMvJVOy39Q== 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-kernel@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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Minor cleanup; this line is badly formatted. Signed-off-by: Mina Almasry Acked-by: Stanislav Fomichev --- 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.1151.ga128411c76-goog From nobody Fri Dec 19 16:11:17 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 BFA8E21C165 for ; Fri, 23 May 2025 23:05:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041536; cv=none; b=nKY8460/pRZVOcxPyJ+Lpf08QWVhcGFqi+E7w8nciMZxI+0Hn7kmWEC4ZlPfsxJYcNR8ybOywlyyAp0rxBz1gxO6eI7uxqA3tQNKDIR3HEWo6krQMSdX/riO58F7AvCuhQqaB13Xp0Za2QN+apLX6WHuQVa33pCq96C+bir4bxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041536; c=relaxed/simple; bh=0WyWdlblD1opyDXTAcioi+FN4eUkunAJc10HflKJZ/c=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=O1SspBEiV1q4WUxdicCz7zlavQ5tHHMlWEfO8GqY9qm/VQKdyhCkt5OHjof4giPUNtRdz9lnHA1JdBii8Zw37HxAbLTz29MtnK9AMD3znK6aYEDXA3kNO77cDeprXNMnZEKoxOfhSSxsfwt7XCg3eSHjIEajry+4k3v86mmMDwo= 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=lNUvomD7; arc=none smtp.client-ip=209.85.210.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="lNUvomD7" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-745fd5b7b65so230331b3a.0 for ; Fri, 23 May 2025 16:05:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748041534; x=1748646334; 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=YGa5vpAckjVMn+DJyOLrdnNXFOJ4oaSqmPoGO5u/7eQ=; b=lNUvomD7i7tGLs/vaOZUxg6uA6poEZN8LRuzYQd4pL/PAo4Fom3TB3R04f8MBjcyjA N23tYzilqGHH/tRF79eP4vP+MUmxTg7TYp+LeTjxlo9zRaRLVu3SQ+CgUiTaK3KVsth3 43YN09MakutY9jpxGqONFlJSkpRniEjzBKINHDT9eEr/MrcU2mIEXMwLeqyXp/4cl+ML gbGTGmWGEu/McnGQypnKZKAowzKwyxUZHXWOQ6zyg7W75upQnprlTuHdN3lw7CceQeGd hoWrjv55FGZ16JYdHhBH5//EeZ91yOIaXy4TXl+5Pkf++CgsdCzPJImXlrse037JqBsR 0l1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748041534; x=1748646334; 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=YGa5vpAckjVMn+DJyOLrdnNXFOJ4oaSqmPoGO5u/7eQ=; b=VPcxcZHOiS3y1VK1aUlR2QZYlXy8jBdbl3AUGMiy+1vyGK1ETsjpBrhiQyUJ4fggBG p1cDx2mCXb3FFlBkxTv/Ygu61AMDlkmQgnut31oavg0TUF8yB4tQHj3TCuCE+OogY4/n XWsXsvubC2KTg9b6QCQJHDnACp3Do3lV0d+aVl64Tm/PUtUvYVtJy2l+YPczsxiakMdp 1EY1KCWHXBuk101WzXMigKsPpv0p3QOJYpWsz6rDRkL0VVuv0n8TMAXxa8JuxKWYxEVA gGQyc4Qmk88rcf9kjmtvMl7qc/B6K8cSK7NObSHxI6vI1hIXJxG9vYeeOAY1opkPrOTQ c/UA== X-Forwarded-Encrypted: i=1; AJvYcCVmSsK1BxR67oeqFLJRB36JV4EzFYUdl+QzjCKXSA48z2TyEKFFxfqZhcowUAvIh5XwY05VFVvCjoX4w+o=@vger.kernel.org X-Gm-Message-State: AOJu0YzEov16muz4sBjlmEK3DsRPwfEgPydDK/KrsOLwgqcAoOdVgpj9 0glBtl1e7TIj71FU+dSH2Qh1jGWERVChyurbPTNPnFpiBtrZxTGH67go1frVzIRePgFQwEdhVw8 45b/tafHpgCn9Wbiuqfblw4chqw== X-Google-Smtp-Source: AGHT+IFiPOxxNaYi6AA9Ymvqa8x0QHUR555swbbPaDyHWJAxkZVauCz0orPrUoUSiBGG+ARldTE4WLtzf4erBOqE5w== X-Received: from pfpk9.prod.google.com ([2002:aa7:9d09:0:b0:742:a99a:ec59]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:a84:b0:736:6ecd:8e34 with SMTP id d2e1a72fcca58-745fe014bf1mr1931755b3a.18.1748041533972; Fri, 23 May 2025 16:05:33 -0700 (PDT) Date: Fri, 23 May 2025 23:05:19 +0000 In-Reply-To: <20250523230524.1107879-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: <20250523230524.1107879-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523230524.1107879-4-almasrymina@google.com> Subject: [PATCH net-next v2 3/8] 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 Acked-by: Stanislav Fomichev --- v2: - Remove unnecessary !! (Stan) --- 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..f64f8276a73c 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.1151.ga128411c76-goog From nobody Fri Dec 19 16:11:17 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 1F12F21D3D6 for ; Fri, 23 May 2025 23:05:35 +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=1748041537; cv=none; b=HHBbbCON7g7PMpUGpJNoPaPsxYZGK6igqFmD61IgSP+34R4pPVth9j+Ec+S3ykbaf1SZSmyTkulHiZD1mEBJZYjjVb4ziL1V/amGSAcbanVf7zaX/vdZTO5hXLYDkPY1FSnwY8E9Khjauvh0lJJNp+o3Va7U1e6Nc4PLqPmHVx8= 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.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="vfgZa8iZ" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2340c08b412so3339265ad.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=OH8Bs7TLVawxKbclFtri8wDYZETupvjUEbhOMbwhPkhLEHDzNQkLWH3DDrWfqFSxNH AcbOy6pI1/ZqIcaohGP75z+D21rkC6iv3LDF796mEG78Y0pNZ2WQBbmaa3I8Prbb4f/H heuPAeYSZkuVFbydtjzC49/iiX/Wm3XwUdu0UNv+X1hcfBIICLIvdu0SoA4ygieY/FMW V35CTj++g99b8i2Q7JhNGoDrgJ4aldXI0DzJHorrr2LMluMbIdCU8bYnUW9FuIFj5wuD /XocIYVjOe7wh+Ijbu5EdZfy0+lDuYGtUu7guKxsiN0m3KHo/yX1T5xFUVGcgLEviSbI x69Q== X-Forwarded-Encrypted: i=1; AJvYcCXxY8GqjwU7sGj7HLozKzWRKW0kgTEZkaJQzpfypKe6gGWjEYJ8HtuEMoKMfwI6owaMMoSPrs6/913ncQY=@vger.kernel.org X-Gm-Message-State: AOJu0YwQcKDvt1yYMZi9PQDizemNCrms7YbuvaMCDt6MNZJvbK176lJQ yPUyBYczwOf0UODSpzRkpch4Wvc2nyQXjKYRqsDQxqglxU1EynobVp5O12Ca3ySdx21R/Ntx5uB yilPi1EDy0xi48vvB0Ct+F0seww== 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-kernel@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 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 Acked-by: Stanislav Fomichev --- 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/testi= ng/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): =20 @ksft_disruptive def check_rx(cfg) -> None: - cfg.require_ipver("6") require_devmem(cfg) =20 port =3D rand_port() - listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr_v['6'= ]} -p {port}" + listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -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 -u - TCP{cfg.addr_ipver}:{c= fg.addr}:{port}", host=3Dcfg.remote, shell=3DTrue) =20 - ksft_eq(socat.stdout.strip(), "hello\nworld") + ksft_eq(ncdevmem.stdout.strip(), "hello\nworld") =20 =20 @ksft_disruptive def check_tx(cfg) -> None: - cfg.require_ipver("6") require_devmem(cfg) =20 port =3D rand_port() - listen_cmd =3D f"socat -U - TCP6-LISTEN:{port}" + listen_cmd =3D f"socat -U - TCP{cfg.addr_ipver}-LISTEN:{port}" =20 - with bkg(listen_cmd, exit_wait=3DTrue) 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=3Dcfg.remote, shell=3DTrue) + cmd(f"echo -e \"hello\\nworld\"| {cfg.bin_remote} -f {cfg.ifname} = -s {cfg.addr} -p {port}", host=3Dcfg.remote, shell=3DTrue) =20 ksft_eq(socat.stdout.strip(), "hello\nworld") =20 --=20 2.49.0.1151.ga128411c76-goog From nobody Fri Dec 19 16:11:17 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 CE75321FF47 for ; Fri, 23 May 2025 23:05:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041539; cv=none; b=Bn5ODum4aUtUiR8OX4E9PQw7Ng7gEWBk/KYM7CCVyYdLtwtNsgBUIca0KHfQ+R4IUaRhfHRoC7WFumW6CxCOK3zXBT9cebolBsHNG+5zyn13muuwGAFX7xqgKCGQK5nZUGsxJY2ArpTJS1C1MjYq1Q9y65rpQUcOM9HRLYb30M8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041539; c=relaxed/simple; bh=SIJBs96ZP3TjrQVbKdqlUnzxUYhpJqa8IzMH0N3Au9k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fM/lUJKpy343p+s4nYNedzTGw5yF/Kvr0PZPF7HEU6/iMNM2peY/tOINlxB/upLAXuo7dsT1GxPxCkdBhMOjPS9yc9+2Sc2Ow8EFw9g1hMis6V1ljES4web9lFsO6ZdJC5XE8Ocytg+b/VIYF2vBiFsJ13kvq2t8104tIOf62yI= 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=2Ak0UH5a; arc=none smtp.client-ip=209.85.210.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="2Ak0UH5a" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-745e89b0c32so704604b3a.3 for ; Fri, 23 May 2025 16:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748041537; x=1748646337; 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=Qq3MiSoN85Fd7+UjYw33GE3Gx+T8lZk2tdUUfBjVWzU=; b=2Ak0UH5aep5LFN+ctDLa5d3tgrBGVz55INoZ1p9FPO7DINx2MjVpqiClKGvFr07m3X sK6zNas/j/JZwlUzElyWqz977wGiVqJZy7B7wG/g35ntFojcacHEk5qWo1TqX7I8Mn48 squUp6r0HLI28vaE9rsl2CWfskxiy6SgHtyUdvGQ0Y6LFGkEgoUY3igESaki6OBG5Mzd pujJOKAnRn6KDkNUrjGglgmAWi1wQCupWNhzZbRc5qceOcTH4WXf/T3R1DSGBLKsFWrL ipp+8gFZfIM5i5rUamkWnoavpuP8SbigsEMXGz57NZV8rodprywfr4GitH1DwXojtPmF 7BeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748041537; x=1748646337; 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=Qq3MiSoN85Fd7+UjYw33GE3Gx+T8lZk2tdUUfBjVWzU=; b=XOfQiXQtEmzd1YD3gskYcN7XzSDLjdnBIEvrxx6twy9tGVw2Z+CDScxoX+0sVJVV+D LTx9q6Ttd9Li5msFPFiA1TCCCCbAo179IkIwM13ZXZQK468EMb3BjvttdWZ5N7WlOUfD eIPtMh4e25rLrE9ejv3p7N+yS/OiENraBPHzTC53AEJmcOZNCtL3oUkfeK3tlwMEQV6x H6DjMY3pIoMR+4kaj0ADZp8TK0yAPPK6EZsmA8RUMGndUCgmOp85gvnp4uZB50j92k6q nxbUqA1TNX23SJoQ3IsDNhQ5lBTrkKgoPdHf1D5twczj96Mby+4t1eU35nlZosXQGc86 1uoA== X-Forwarded-Encrypted: i=1; AJvYcCWo9SKy+dy3THZiEdVzJoze85bhFlbvJnnsZIP617RA+pNr3zVKG6sfMMwFn2Xu9vbcv0nVZev8DAhhncU=@vger.kernel.org X-Gm-Message-State: AOJu0YwxR1e4FJZpiznvF8hCZJPLJmu/8CPKiLp76v++tFETYFpYO+PA nYG6ihklb7IZyMsQ6yDirGOzYlz70+bWBRKrNOmetnOHgajDgNwmZYKIBlNW+Kqt11GNcbX43Gq sA9ROH7lidIoOLZqogYgBbShgKA== X-Google-Smtp-Source: AGHT+IG51r7w5vVd7tKoIq/pEiL9OrbNLMGxS3kuiPEdD1pFnzFqPLxgz+6QVaSF58OZ1dsgx5z5OO52eQLnZEtFAw== X-Received: from pfht14.prod.google.com ([2002:a62:ea0e:0:b0:73b:bbec:17e9]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:c6cb:b0:1f5:9175:2596 with SMTP id adf61e73a8af0-2188c24060bmr1641078637.13.1748041537083; Fri, 23 May 2025 16:05:37 -0700 (PDT) Date: Fri, 23 May 2025 23:05:21 +0000 In-Reply-To: <20250523230524.1107879-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: <20250523230524.1107879-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523230524.1107879-6-almasrymina@google.com> Subject: [PATCH net-next v2 5/8] 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 9b3e2c78f457..6effb9e33fd8 100755 --- a/tools/testing/selftests/drivers/net/hw/devmem.py +++ b/tools/testing/selftests/drivers/net/hw/devmem.py @@ -26,7 +26,7 @@ def check_rx(cfg) -> None: port =3D rand_port() listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -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 -u - TCP{cfg.addr_ipver}:{c= fg.addr}:{port}", host=3Dcfg.remote, shell=3DTrue) =20 --=20 2.49.0.1151.ga128411c76-goog From nobody Fri Dec 19 16:11:17 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 82710220F4F 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=1748041541; cv=none; b=qgHFEqQ823KHDZ8f+pcpYpM2u1mEapCXTSE8j46MMc2gMGoKcV5APaiT6oWozN+oW2auLgrIo9DwUt6aX3kwdBemMu3th/TJ9dKDVS7aFDa5Mv/yMdQY9Gas6xINFFF2hSi0cQIQGbSZREApT7DLMrGYNoWnFCwKoVJEw0v1HnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041541; c=relaxed/simple; bh=PGtt9R/6JfJeszrvD0Vt1f7tbDi7oeGP/GPYQOO0a24=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dDPLb1BKMwJbaPoi7cM+TAHxiSiwQ8p8MKyxbce8xO6S6PfoW/nVYqmVdMU1awfA6aXPIclEvbaTDNr8m2oNOg8FdMMf5Tp4k/ozL51UGnmnrZ6zYzfWymupnELRkupo+N4cICz96u5RXyTFyhm/YCpULXQksWPqhox0iTf1NVA= 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-231e059b34dso2384575ad.0 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=wQMy2WLBQvIpVJv3mqMgA2NFGhdGNL2cXi6xnaD5pl9p5ZObkLGfVi5m/w6q31ios2 cCG2va0rpND2o0tMXPJ9yn8GrXPea7S+fmilQzswTXeart0zJQeZySQDg/M7gyW5flNI YQuqej3HWFfcr2is0uV56IlwDlcrsTnyNNkU2p9TFfhaIgcDa9x3VSSS85meGrgISGVr AAts8/hGnqIayx9YsQe5uUfytLIvQ3Ju0QRtZmK+vvmQ5g8DmqUvDdzSipX0JOonAehD XHjXrUZUSA256jxvugOfga07HZ2QN4ItcXf//s3BbVwzNDfPJNlQtZVpC2ShehR1n4qc 43KQ== X-Forwarded-Encrypted: i=1; AJvYcCXxaW2liv5y9I75QxCMQ3EQ0F7ICKPDCQ8DLDBcibK9bV/2yLEfCQfIoX1KVMmO1T5EUiv5bghPG2/Gsno=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4+Ag50ICZ0+tNQcKqKbAjvSmyVjlOS/J9tJzG5wLR+pFtmB+S tfQmELOp96HkpzH/VGPuGQji/7EzqnE1u+LUuAaWN8DxH2Vf2S1tq1g4gF22zc915jRamTqo2dl OVjcFV0vuw+nnz3d0As3eo6vSYg== 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-kernel@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 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 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/testi= ng/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) =20 port =3D rand_port() - listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -p {= port}" + listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -p {= port} -c {cfg.remote_addr}" =20 with bkg(listen_cmd, exit_wait=3DTrue) as ncdevmem: wait_port_listen(port) - cmd(f"echo -e \"hello\\nworld\"| socat -u - TCP{cfg.addr_ipver}:{c= fg.addr}:{port}", host=3Dcfg.remote, shell=3DTrue) + cmd(f"echo -e \"hello\\nworld\"| socat -u - TCP{cfg.addr_ipver}:{c= fg.addr}:{port},bind=3D{cfg.remote_addr}:{port}", host=3Dcfg.remote, shell= =3DTrue) =20 ksft_eq(ncdevmem.stdout.strip(), "hello\nworld") =20 diff --git a/tools/testing/selftests/drivers/net/hw/ncdevmem.c b/tools/test= ing/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 =3D strrchr(server_addr, ':') + 1; } =20 - 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 ds= t-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 q= ueue %d >&2", + ifname, + type, + server_addr, + port, start_queue)) + /* If that fails, return error */ + return -1; + + return 0; } =20 static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd, --=20 2.49.0.1151.ga128411c76-goog From nobody Fri Dec 19 16:11:17 2025 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 59756221731 for ; Fri, 23 May 2025 23:05:41 +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=1748041542; cv=none; b=JrDlhIaA0uzr3a6mDzgaAcDocTtojoRLzaznN6jM1uE0T6dzprjLfJpSG7riof6zthBhLw6iCxOZYWlDr1oHaYY5lVJ6q3prSMkpLWSrv9kiNVQcVt2oF/gfDODmWH3Q5z09CO2Zff7Q7/tkFW+mKvFlSGE879XFzdM9silgbOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041542; c=relaxed/simple; bh=ldkQQKsDkGAhHJXZx571WMeCR3RMcX+z4Wvjc5zN2jE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TwjhPmUTYWpTH//v6yoNOkGqu0ve1XMQT/HBTJvMyG0N4yLAifDpLsZiO8Nq+J9dIdFa3VrQBU8xq1X6ZmTVfTy0/aUEV56Nbo1imNL9VC/6iRdJ9Ir3jVFrLLTnVaSg8k97MAn5p5G4pQteE/8PuMxYidkxeDWM1pX3rhkUtgg= 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=u2lWaYOg; 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="u2lWaYOg" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-23415056f5bso3560695ad.3 for ; Fri, 23 May 2025 16:05:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748041540; x=1748646340; 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=eFit4se3dsmsa9HWMx2TSuaow40Adh4DQRq38+N1c8s=; b=u2lWaYOgHBWCiq0wl9OU39MUFic1B98eONiguqSoOin8Z7JukLMe2piVpvaoOy4Rn/ 0pjxhG5axvb1o2fMVao6JAn/SAXyF8LQk4FgWICu465WNaTn/obZm+UTB9UK5foe2C0F HSaM/egLdHwuHAtaHvz6kt5Au2C3TuFQ7jCrS8ozkQ6JT79D1uQIYRjk4dN1LJsi7IAh IY69lPbTcmQ4ZfDMqYZOx9iFmHxPeRy4PNsQEhXxbWewgr4RiVkSm2knC8Qrrc0IJjEE o6Rl6yi8eR1LtUg2+C2VfhX9ESKxu9OWGbhRxOKe/GqvWfHoIbeytWRglnSsQfzHKoXJ MLnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748041540; x=1748646340; 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=eFit4se3dsmsa9HWMx2TSuaow40Adh4DQRq38+N1c8s=; b=l5BFcoULR/o/goYVvT0VRNXsjyuHBbEdljbq2sSmRo3RvcCN/TtSs7F7GExNglJBP0 mP3SVXjHLC3FhB3pBjsfWnR5+f3tUHcM0zAzv9jiH527fppAbg51OOuYtRLMCvdEai+J MhvxIPiC5gSQnz+Wo3iAjqZ8SKvVX8lZ5k7zkvlbRLa7iO17u9GUmJ/6abHQLOciHrAW MipAW3jAVxdFrQY+UngltWxRtD/Wl9Oe1BlbM3L1yH3EFW/yfoak8HUoJwuP3GW7i4SD +4StDNQrYU9lJkBI+jLxZ8tUixPU5q7+NrqxfWfEUFjTo2v6IWJy/cspozRcUiYj91DH O+2Q== X-Forwarded-Encrypted: i=1; AJvYcCXBOly/Y7bk+NErCLdCPZhIyfAAh54k670ruCrP56cQO6Pi+yWILAfaB+9Y0dMHxhswpTCdb+Pi6DEcegQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwF2/XbzS5mFLSvziE2GGjOy+7aYABhLLbVhxHWTckC5Fi4lvk6 6jIGp4wHI8EUxtrukjM6BJ+kuAjxzFxSLu5BCLzzIMbi0op5SJdUbfIKaBnDwW3FJXCzO/p4vyj 7WsHb74khIW/aRPqkHBVfL/fLqg== X-Google-Smtp-Source: AGHT+IHVEbxlP+HY5bODAxLKx8PUqiPk9HlkasKey/MBvVDDURED0/am87bZ3OsPQT+WnaEFbk9KFBHAAnfm2vQgGQ== X-Received: from plbjk15.prod.google.com ([2002:a17:903:330f:b0:233:fdae:780f]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:3d0e:b0:231:7f29:bda0 with SMTP id d9443c01a7336-23414fca909mr16630345ad.52.1748041540566; Fri, 23 May 2025 16:05:40 -0700 (PDT) Date: Fri, 23 May 2025 23:05:23 +0000 In-Reply-To: <20250523230524.1107879-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: <20250523230524.1107879-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523230524.1107879-8-almasrymina@google.com> Subject: [PATCH net-next v2 7/8] 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 | 8 +++++--- 1 file changed, 5 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 553ebf669a71..0484bda63886 100755 --- a/tools/testing/selftests/drivers/net/hw/devmem.py +++ b/tools/testing/selftests/drivers/net/hw/devmem.py @@ -24,13 +24,15 @@ def check_rx(cfg) -> None: require_devmem(cfg) =20 port =3D rand_port() - listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -p {= port} -c {cfg.remote_addr}" + socat =3D f"socat -u - TCP{cfg.addr_ipver}:{cfg.addr}:{port},bind=3D{c= fg.remote_addr}:{port}" + listen_cmd =3D f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -p {= port} -c {cfg.remote_addr} -v 7" =20 with bkg(listen_cmd, exit_wait=3DTrue) as ncdevmem: wait_port_listen(port) - cmd(f"echo -e \"hello\\nworld\"| socat -u - TCP{cfg.addr_ipver}:{c= fg.addr}:{port},bind=3D{cfg.remote_addr}:{port}", host=3Dcfg.remote, shell= =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 @ksft_disruptive --=20 2.49.0.1151.ga128411c76-goog From nobody Fri Dec 19 16:11:17 2025 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 E0986222584 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=1748041544; cv=none; b=Ma+EUaXHoI/iZIwulB0aMK0GLFgEeqgRvhiUXpgcKA3Y/mOvA1psAGJVT+SH2KcSC9T0moQibMgmJztrodU+zek+atY5egpitSXycwIvW6b7kKoBAsJ3eUFx3+JIVIdkTDi7ZrkVLOvK5G56KjIK4RPk38ONj+Fun5tX1uYu/zw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041544; c=relaxed/simple; bh=0JqtZHm1FjwTp/r9FfFXp2DhxiRW0Bdbv5viNa2gMfU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=F0WfqBD4HsX5FtijjTLYU+HRiCxt2eRc1sra6jxO5y8Tu0cUvXhFi/vRLuk3wY3GvdjEr/PS6FMOgFkMO5achsif2hexmTusIGZEvKOyJMjdqpiF7v8t2yF36QhdgNEwOCN6NMc7URfPFsHn6pe9MhsBoP54gQD//RyPqIzvDq4= 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-231e76f6eafso3017245ad.0 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=TT79nwAZOFgmLmmwXcXJh0nXIETHxEMuqd2DtV9SZHHKfyeCzNBBW7xwLny2yqe8Ae brmB+VGgnGmaMODdhGkGcZvE8N5h5Q/BRZNz+BM1nGwRseKm88a4oiFaKHJsbZ+gOech Tazc6tIx2NeIpJ77LvXy/MmUuq3+Cy6TXeq4jyhOAzngTIgwAcZouyH1JexpNNnkbuct yPT8sswURDROPBpxOP/zA6p2g4Gia01iyGBaT87gRZ6t9OnNlW0ZhqNadxzQQFl7iNvK U5vvRVJUf3hl3EyYHxD59tGvpsWAeTuCB/XTiiyjzTNwX0G4R1l2pUQXmsZzSJ7v1Ti0 l/PA== X-Forwarded-Encrypted: i=1; AJvYcCXddKXofCCH8OP6c6sPcT07vKGk9nYAZ09wnaSctKhrtI9E6eHFRuePXR37vbqxIoi92fNV6ThgRg2eP0Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxPa/tSngWKeoT5mnNsjvg1tQjlXB5esw2HJ531Iz+ioDkFBOGY qo/vtF9npm3Jke26Kgbby2yqZv2Gzn2DFl29B7UzcV8z5cnVttYHAtqy7vJYs19aSYdtjw1eke8 Lt8gCmZndoERDOGuZ7MnUT9PaLQ== 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-kernel@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 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 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 =3D 0; struct sockaddr_in6 client_addr; struct sockaddr_in6 server_sin; --=20 2.49.0.1151.ga128411c76-goog