Commit fd6dad4e authored by Byungchul Park's avatar Byungchul Park Committed by Jakub Kicinski
Browse files

netmem: remove the pp fields from net_iov 



Now that the pp fields in net_iov have no users, remove them from
net_iov and clean up.

Signed-off-by: default avatarByungchul Park <byungchul@sk.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Link: https://patch.msgid.link/20260224061424.11219-1-byungchul@sk.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent aebf15e8

include/net/netmem.h

+1 −37
Original line number Diff line number Diff line
@@ -93,23 +93,7 @@ enum net_iov_type { 
 *		supported.

 */

struct net_iov {

	union {

	struct netmem_desc desc;



		/* XXX: The following part should be removed once all

		 * the references to them are converted so as to be

		 * accessed via netmem_desc e.g. niov->desc.pp instead

		 * of niov->pp.

		 */

		struct {

			unsigned long _flags;

			unsigned long pp_magic;

			struct page_pool *pp;

			unsigned long _pp_mapping_pad;

			unsigned long dma_addr;

			atomic_long_t pp_ref_count;

		};

	};

	struct net_iov_area *owner;

	enum net_iov_type type;

};
@@ -123,26 +107,6 @@ struct net_iov_area { 
	unsigned long base_virtual;

};



/* net_iov is union'ed with struct netmem_desc mirroring struct page, so

 * the page_pool can access these fields without worrying whether the

 * underlying fields are accessed via netmem_desc or directly via

 * net_iov, until all the references to them are converted so as to be

 * accessed via netmem_desc e.g. niov->desc.pp instead of niov->pp.

 *

 * The non-net stack fields of struct page are private to the mm stack

 * and must never be mirrored to net_iov.

 */

#define NET_IOV_ASSERT_OFFSET(desc, iov)                    \

	static_assert(offsetof(struct netmem_desc, desc) == \

		      offsetof(struct net_iov, iov))

NET_IOV_ASSERT_OFFSET(_flags, _flags);

NET_IOV_ASSERT_OFFSET(pp_magic, pp_magic);

NET_IOV_ASSERT_OFFSET(pp, pp);

NET_IOV_ASSERT_OFFSET(_pp_mapping_pad, _pp_mapping_pad);

NET_IOV_ASSERT_OFFSET(dma_addr, dma_addr);

NET_IOV_ASSERT_OFFSET(pp_ref_count, pp_ref_count);

#undef NET_IOV_ASSERT_OFFSET



static inline struct net_iov_area *net_iov_owner(const struct net_iov *niov)

{

	return niov->owner;