From patchwork Thu Apr 17 23:15:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 882060 Received: from mail-oa1-f74.google.com (mail-oa1-f74.google.com [209.85.160.74]) (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 AE285221F0A for ; Thu, 17 Apr 2025 23:15:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744931747; cv=none; b=q3DJt0tHoAJa2EyW9E6a4j6PCvDnJcCno0DY3lHhFDpWDu48TN08/7AeQV1Q2/u3phQqU6DOgjcdpWfei6JJRjzR69le/nnChA7DOL5Haq3Ec5E/dC56By96MYjpuKjylC08KOkuthitA/H4HLViwHuNl6C8wG2igBT+b1d+lRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744931747; c=relaxed/simple; bh=PxUi6PMnLLjyTGTj+svoqP26/eSAQtm8kaSii0Qle9k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=W6rzSVThOBuV/E6MieYxwvzzLrgjuwVeJoibKbBjXPP4V7aw52e0A+1Np7JZ9VxlL4sed9bId+aL5pJEaZl8zjHYL/vb6wp9sMoPGFY1rRqZy5CF1awF9r5geaZGS/KqCOfRsqbRI3AupKCCokl+VFS/ZOlt3PQt1qXT3p/vjvc= 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=dz7gatTo; arc=none smtp.client-ip=209.85.160.74 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="dz7gatTo" Received: by mail-oa1-f74.google.com with SMTP id 586e51a60fabf-2c6efde9f1dso828271fac.0 for ; Thu, 17 Apr 2025 16:15:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744931745; x=1745536545; 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=5104Ofe9FKOPF1WtDB1Sgb/hE4K8EHHAmPkusRmzhtE=; b=dz7gatToHLnZmHiKH0vabB3re5gTshFo+KD9uo5e+diX8L6TerG/15Lh4IATYtJTNx 6H7Xn3PaRKY/3Ofokyn9TXM+GblA6BVgN4xoQpB1cCnuP6nnHpTtD5W+M9he6Uqx3tZj PmSissMbJnYLO4JCoq0VH62P6kwSdoEgOobFdQs5pLy9ZybMJGH6+Wbzd2qHCigqFxmg 0Jw3UlHseD7XoWUgG3GMdf+zhItey41nicJEpBnCXveGpElxEIt7Yug5ATVL1H9HnqsV 2uxaAnic40c1KH22KCQ0EPo4rWyC9y9QVg8vyjNbtHEthZHZw75Rr7HkrrWFuuzMkgw8 6n2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744931745; x=1745536545; 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=5104Ofe9FKOPF1WtDB1Sgb/hE4K8EHHAmPkusRmzhtE=; b=k3VxfYkyleuMIaJDE9EfsazvyubXq0MrVQ3lDnIG9gt7gHQbT0hx6tpjDyIs43Bq0T xF8ATkK8qyG2hdMWMh5zi6ilD+DrXfY+6S8oHBRAZr4liiC0ZUW8rOwOGcuxN76LML4p PHfd9YVbAGL4zMflbdTsD8C6DMW7fT+LMZiMY8Q8OgDt0n5i75fqBRf3N0qG8ZwMV9pP ieYUr5FzxQlwAvXa1cLFGbDWI3Okq2oTzKgK+t3PV7Qd56+mfsQodQP80wB80sgkZdPc 43bOLmzqJBjc8xHAcW7O8vRGTQkmq03SJCzWGzcn6OvjPFXAleU7BsgL49ts5gXHhgHo jscQ== X-Forwarded-Encrypted: i=1; AJvYcCVKjOEW+EK0XwTZ1pgsIq8FLzOe+RtTepkvbA7rwpIeP8Wkou1jyAnW44PGMpdtJjufHOdZREiMCVjNZM3g1Lk=@vger.kernel.org X-Gm-Message-State: AOJu0YxSndZPc4yslZ9VuG0+alxn3oxM9ay6KYBhtulmYOEOOqxC2cPT U9xEsic48Jsab5CPtU0RHt7aKKBFrWg8UAKK7+5dVLhhOsn7vPPSJzm4U63RSQ5CGEIlj1yFmqh 8FPtrYLNz+OBVjS8MDu7TDw== X-Google-Smtp-Source: AGHT+IEMqL9YOVOmk+jyRPo0f1di937KXmsXcGEDfTc+n7gctIS6OyoI5UKywgc4XZvX4lCMTpokjhEqxuCoIrGZyg== X-Received: from oabvp23.prod.google.com ([2002:a05:6871:a017:b0:2b8:1fa:4ac5]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6871:6216:b0:2c2:b85b:71ff with SMTP id 586e51a60fabf-2d526973eafmr406639fac.8.1744931744709; Thu, 17 Apr 2025 16:15:44 -0700 (PDT) Date: Thu, 17 Apr 2025 23:15:32 +0000 In-Reply-To: <20250417231540.2780723-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250417231540.2780723-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.805.g082f7c87e0-goog Message-ID: <20250417231540.2780723-2-almasrymina@google.com> Subject: [PATCH net-next v9 1/9] 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, linux-kselftest@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 , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , " =?utf-8?q?Eugenio_P=C3=A9rez?= " , Stefan Hajnoczi , Stefano Garzarella , Shuah Khan , sdf@fomichev.me, dw@davidwei.uk, Jamal Hadi Salim , Victor Nogueira , Pedro Tammela , Samiullah Khawaja 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 c61d5b21e7b4..64af9a288c80 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 +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 = 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 0f46e0404c04..17a54e74ed5d 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 = &area->nia; area->freelist[i] = i; atomic_set(&area->user_refs[i], 0); + niov->type = NET_IOV_IOURING; } area->free_count = nr_iovs; diff --git a/net/core/devmem.c b/net/core/devmem.c index 6e27a47d0493..f5c3a7e6dbb7 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -30,7 +30,7 @@ static const struct memory_provider_ops dmabuf_devmem_ops; bool net_is_devmem_iov(struct net_iov *niov) { - return niov->pp->mp_ops == &dmabuf_devmem_ops; + return niov->type == NET_IOV_DMABUF; } 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, for (i = 0; i < owner->area.num_niovs; i++) { niov = &owner->area.niovs[i]; + niov->type = NET_IOV_DMABUF; niov->owner = &owner->area; page_pool_set_dma_addr_netmem(net_iov_to_netmem(niov), net_devmem_get_dma_addr(niov));