From nobody Tue Feb 10 19:14:59 2026 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 D74471ACEDF for ; Thu, 24 Apr 2025 04:03:05 +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=1745467388; cv=none; b=VKA34bDDgJERuXu7Z09CiICLGcaTx8aR4WLU11BVZwznpB2SzkLx8ivsi+qnEHgGsRqmepUwdR3wnKrX7ptOoQsiwysIG9KwAafUge7TQrXjeQxBPH1lqjN9878k5J9vTD8U9J50VTjqtUtSXQN987vN9LE1aKtsudxeuwNNP+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745467388; c=relaxed/simple; bh=4G6PWQVuDvN75y22hCzNOaMSSVueFKJQsuXjCZZMx9k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fOAipRO7QrZx4VRffzJ2VJanxdEnxF/sVetRpSzWtFCoqlVLgcES/h8iQrUGXmUy3Ur7o57Kk1a/FZYEtdSypshf5QjuBtMvkuHSRXuwNthGrk96asxtP2RgOQt6GuW2yzD5vsTxPBfaLxjvakIu8l9IfJ0/2YS/1mxxfY8MABI= 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=a5pJADMU; 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="a5pJADMU" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-225107fbdc7so5442675ad.0 for ; Wed, 23 Apr 2025 21:03:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745467385; x=1746072185; 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=V8selbbQToSUa/Bg+HZMawzfuX6zEarAEcQjX78fl4Q=; b=a5pJADMUGFeuTFDk3ssjzFL9dshF0fXby2ckg6WJw6aGJsMwiA1Tf3KW+SGE3K2QiO Qo8mlSy3Co5weQgLVxWHEZXbk/3uAAe0/5R/ECD5GYdXw75bOcubHIfBks8t0cLXtxMC o7eq9K648pDwLGwrE8BzUap+3l1EQLI/TJWsIcPBzzzNlFTOCZFoCytxrwSNhAdaXVEB PrHJkQ2+XPMkoGAaHVsZMcSzdrUiRosoMvP30W+TclSRqpswk7RcTKNT5+J/6bBD225G GlnxhzRPhRDDvTQvxzGv44tNhwLDL1WJy+iYzrRpif8IsWuVjzyenq9lfM7mZVo9/46h sKEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745467385; x=1746072185; 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=V8selbbQToSUa/Bg+HZMawzfuX6zEarAEcQjX78fl4Q=; b=GfvGvWdnefbNg79OPfEVGoW5wvd05XnE1Uxee/WEVIWH4bGN4x9PFuSqUTy/OH8sm2 CMTT7T2vXtR3YwFJ15/eBkcr6sVCCSgMaXx4OyoWwkiV2xjExESFT4SKQzLvA/0Q0m43 /f/dYsnD9YMTr+m8Hg7z8L8dgR8/bD49VHMziPt3Ijy0xMmdt3uxRf+cjmbdIPV8TS+4 pXrlYGLQrZijMnb6hW1hKKYr7JC+aJrz6gNClKL0GjtYyE/3IK+2icF1TR4C4u+CaCA8 1wSl6HS5J0eWG7G4Q5R6A2+KR9HtRJmQLuXOELYCWas1BvZZpKRW9YGqPVnkxMwNGWwI YL1A== X-Forwarded-Encrypted: i=1; AJvYcCVH+vhnXgNDKwMigExkhEfD2mpIvrM6ue8VmigGoJsFcZq7khTFuBWhF6tKLUH9d8avRLD7fPSCPc1ihKw=@vger.kernel.org X-Gm-Message-State: AOJu0YzWaXKEdNhsxtX85e90J5TnQ566wONJVhOX5fgn2h9m7DJgjuIT lVYdvXfN5jci1FiTliTLYF4+25ICElLJ/s9W1eT2ldR18/fXkmQxlcIVjlj5NAPjMAuZvCNMqSV mmubzyc2X6yA1wSdHsRv+iQ== X-Google-Smtp-Source: AGHT+IGK7UYRkqxJlzG4egQUL0etMs/8hnfBJu3kSoKaPIbND5acRDwRmuLJDjQ8rd9K1P4hPANpxbQRx4HCkhuwpw== X-Received: from pjbqo4.prod.google.com ([2002:a17:90b:3dc4:b0:2fa:1fac:2695]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:28c:b0:21f:bd66:cafa with SMTP id d9443c01a7336-22db3c0d5f1mr15899025ad.17.1745467384900; Wed, 23 Apr 2025 21:03:04 -0700 (PDT) Date: Thu, 24 Apr 2025 04:02:53 +0000 In-Reply-To: <20250424040301.2480876-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: <20250424040301.2480876-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.805.g082f7c87e0-goog Message-ID: <20250424040301.2480876-2-almasrymina@google.com> Subject: [PATCH net-next v11 1/8] netmem: add niov->type attribute to distinguish different net_iov types From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, io-uring@vger.kernel.org, virtualization@lists.linux.dev, kvm@vger.kernel.org Cc: Mina Almasry , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Donald Hunter , Jonathan Corbet , Andrew Lunn , Jeroen de Borst , Harshitha Ramamurthy , Kuniyuki Iwashima , Willem de Bruijn , Jens Axboe , Pavel Begunkov , David Ahern , Neal Cardwell , Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , "=?UTF-8?q?Eugenio=20P=C3=A9rez?=" , sdf@fomichev.me, dw@davidwei.uk, Jamal Hadi Salim , Victor Nogueira , Pedro Tammela , Samiullah Khawaja Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Later patches in the series adds TX net_iovs where there is no pp associated, so we can't rely on niov->pp->mp_ops to tell what is the type of the net_iov. Add a type enum to the net_iov which tells us the net_iov type. Signed-off-by: Mina Almasry --- v8: - Since io_uring zcrx is now in net-next, update io_uring net_iov type setting and remove the NET_IOV_UNSPECIFIED type v7: - New patch fix iouring --- include/net/netmem.h | 11 ++++++++++- io_uring/zcrx.c | 1 + net/core/devmem.c | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/net/netmem.h b/include/net/netmem.h index c61d5b21e7b42..64af9a288c80c 100644 --- a/include/net/netmem.h +++ b/include/net/netmem.h @@ -20,8 +20,17 @@ DECLARE_STATIC_KEY_FALSE(page_pool_mem_providers); */ #define NET_IOV 0x01UL =20 +enum net_iov_type { + NET_IOV_DMABUF, + NET_IOV_IOURING, + + /* Force size to unsigned long to make the NET_IOV_ASSERTS below pass. + */ + NET_IOV_MAX =3D ULONG_MAX, +}; + struct net_iov { - unsigned long __unused_padding; + enum net_iov_type type; unsigned long pp_magic; struct page_pool *pp; struct net_iov_area *owner; diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 0f46e0404c045..17a54e74ed5d5 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -247,6 +247,7 @@ static int io_zcrx_create_area(struct io_zcrx_ifq *ifq, niov->owner =3D &area->nia; area->freelist[i] =3D i; atomic_set(&area->user_refs[i], 0); + niov->type =3D NET_IOV_IOURING; } =20 area->free_count =3D nr_iovs; diff --git a/net/core/devmem.c b/net/core/devmem.c index 6e27a47d04935..f5c3a7e6dbb7b 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -30,7 +30,7 @@ static const struct memory_provider_ops dmabuf_devmem_ops; =20 bool net_is_devmem_iov(struct net_iov *niov) { - return niov->pp->mp_ops =3D=3D &dmabuf_devmem_ops; + return niov->type =3D=3D NET_IOV_DMABUF; } =20 static void net_devmem_dmabuf_free_chunk_owner(struct gen_pool *genpool, @@ -266,6 +266,7 @@ net_devmem_bind_dmabuf(struct net_device *dev, unsigned= int dmabuf_fd, =20 for (i =3D 0; i < owner->area.num_niovs; i++) { niov =3D &owner->area.niovs[i]; + niov->type =3D NET_IOV_DMABUF; niov->owner =3D &owner->area; page_pool_set_dma_addr_netmem(net_iov_to_netmem(niov), net_devmem_get_dma_addr(niov)); --=20 2.49.0.805.g082f7c87e0-goog