Commit d2ef6aa0 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Paolo Abeni
Browse files

net: page_pool: add netlink notifications for state changes 



Generate netlink notifications about page pool state changes.

Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarJesper Dangaard Brouer <hawk@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 950ab53b

Documentation/netlink/specs/netdev.yaml

+20 −0
Original line number Diff line number Diff line
@@ -166,8 +166,28 @@ operations: 
      dump:

        reply: *pp-reply

      config-cond: page-pool

    -

      name: page-pool-add-ntf

      doc: Notification about page pool appearing.

      notify: page-pool-get

      mcgrp: page-pool

      config-cond: page-pool

    -

      name: page-pool-del-ntf

      doc: Notification about page pool disappearing.

      notify: page-pool-get

      mcgrp: page-pool

      config-cond: page-pool

    -

      name: page-pool-change-ntf

      doc: Notification about page pool configuration being changed.

      notify: page-pool-get

      mcgrp: page-pool

      config-cond: page-pool



mcast-groups:

  list:

    -

      name: mgmt

    -

      name: page-pool

include/uapi/linux/netdev.h

+4 −0
Original line number Diff line number Diff line
@@ -79,11 +79,15 @@ enum { 
	NETDEV_CMD_DEV_DEL_NTF,

	NETDEV_CMD_DEV_CHANGE_NTF,

	NETDEV_CMD_PAGE_POOL_GET,

	NETDEV_CMD_PAGE_POOL_ADD_NTF,

	NETDEV_CMD_PAGE_POOL_DEL_NTF,

	NETDEV_CMD_PAGE_POOL_CHANGE_NTF,



	__NETDEV_CMD_MAX,

	NETDEV_CMD_MAX = (__NETDEV_CMD_MAX - 1)

};



#define NETDEV_MCGRP_MGMT	"mgmt"

#define NETDEV_MCGRP_PAGE_POOL	"page-pool"



#endif /* _UAPI_LINUX_NETDEV_H */

net/core/netdev-genl-gen.c

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static const struct genl_split_ops netdev_nl_ops[] = { 


static const struct genl_multicast_group netdev_nl_mcgrps[] = {

	[NETDEV_NLGRP_MGMT] = { "mgmt", },

	[NETDEV_NLGRP_PAGE_POOL] = { "page-pool", },

};



struct genl_family netdev_nl_family __ro_after_init = {

net/core/netdev-genl-gen.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ int netdev_nl_page_pool_get_dumpit(struct sk_buff *skb, 


enum {

	NETDEV_NLGRP_MGMT,

	NETDEV_NLGRP_PAGE_POOL,

};



extern struct genl_family netdev_nl_family;

net/core/page_pool_user.c

+36 −0
Original line number Diff line number Diff line
@@ -135,6 +135,37 @@ page_pool_nl_fill(struct sk_buff *rsp, const struct page_pool *pool, 
	return -EMSGSIZE;

}



static void netdev_nl_page_pool_event(const struct page_pool *pool, u32 cmd)

{

	struct genl_info info;

	struct sk_buff *ntf;

	struct net *net;



	lockdep_assert_held(&page_pools_lock);



	/* 'invisible' page pools don't matter */

	if (hlist_unhashed(&pool->user.list))

		return;

	net = dev_net(pool->slow.netdev);



	if (!genl_has_listeners(&netdev_nl_family, net, NETDEV_NLGRP_PAGE_POOL))

		return;



	genl_info_init_ntf(&info, &netdev_nl_family, cmd);



	ntf = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!ntf)

		return;



	if (page_pool_nl_fill(ntf, pool, &info)) {

		nlmsg_free(ntf);

		return;

	}



	genlmsg_multicast_netns(&netdev_nl_family, net, ntf,

				0, NETDEV_NLGRP_PAGE_POOL, GFP_KERNEL);

}



int netdev_nl_page_pool_get_doit(struct sk_buff *skb, struct genl_info *info)

{

	u32 id;
@@ -168,6 +199,8 @@ int page_pool_list(struct page_pool *pool) 
		hlist_add_head(&pool->user.list,

			       &pool->slow.netdev->page_pools);

		pool->user.napi_id = pool->p.napi ? pool->p.napi->napi_id : 0;



		netdev_nl_page_pool_event(pool, NETDEV_CMD_PAGE_POOL_ADD_NTF);

	}



	mutex_unlock(&page_pools_lock);
@@ -181,6 +214,7 @@ int page_pool_list(struct page_pool *pool) 
void page_pool_unlist(struct page_pool *pool)

{

	mutex_lock(&page_pools_lock);

	netdev_nl_page_pool_event(pool, NETDEV_CMD_PAGE_POOL_DEL_NTF);

	xa_erase(&page_pools, pool->user.id);

	hlist_del(&pool->user.list);

	mutex_unlock(&page_pools_lock);
@@ -210,6 +244,8 @@ static void page_pool_unreg_netdev(struct net_device *netdev) 
	last = NULL;

	hlist_for_each_entry(pool, &netdev->page_pools, user.list) {

		pool->slow.netdev = lo;

		netdev_nl_page_pool_event(pool,

					  NETDEV_CMD_PAGE_POOL_CHANGE_NTF);

		last = pool;

	}

	if (last)