Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccfe8e1b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: qrtr: ns: Change servers radix tree to xarray"

parents 6ee581de 5dc5204c

net/qrtr/ns.c

+28 −40
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/module.h>

#include <linux/qrtr.h>

#include <linux/workqueue.h>

#include <linux/xarray.h>

#include <net/sock.h>



#include "qrtr.h"
@@ -22,7 +23,7 @@ 
static void *ns_ilc;

#define NS_INFO(x, ...) ipc_log_string(ns_ilc, x, ##__VA_ARGS__)



static RADIX_TREE(nodes, GFP_KERNEL);

static DEFINE_XARRAY(nodes);



static struct {

	struct socket *sock;
@@ -72,14 +73,14 @@ struct qrtr_server { 


struct qrtr_node {

	unsigned int id;

	struct radix_tree_root servers;

	struct xarray servers;

};



static struct qrtr_node *node_get(unsigned int node_id)

{

	struct qrtr_node *node;



	node = radix_tree_lookup(&nodes, node_id);

	node = xa_load(&nodes, node_id);

	if (node)

		return node;
@@ -89,8 +90,9 @@ static struct qrtr_node *node_get(unsigned int node_id) 
		return NULL;



	node->id = node_id;

	xa_init(&node->servers);



	radix_tree_insert(&nodes, node_id, node);

	xa_store(&nodes, node_id, node, GFP_KERNEL);



	return node;

}
@@ -201,10 +203,9 @@ static void lookup_notify(struct sockaddr_qrtr *to, struct qrtr_server *srv, 


static int announce_servers(struct sockaddr_qrtr *sq)

{

	struct radix_tree_iter iter;

	struct qrtr_server *srv;

	struct qrtr_node *node;

	void __rcu **slot;

	unsigned long index;

	int ret;



	node = node_get(qrtr_ns.local_node);
@@ -212,9 +213,7 @@ static int announce_servers(struct sockaddr_qrtr *sq) 
		return 0;



	/* Announce the list of servers registered in this node */

	radix_tree_for_each_slot(slot, &node->servers, &iter, 0) {

		srv = radix_tree_deref_slot(slot);



	xa_for_each(&node->servers, index, srv) {

		ret = service_announce_new(sq, srv);

		if (ret < 0) {

			if (ret == -ENODEV)
@@ -254,13 +253,16 @@ static struct qrtr_server *server_add(unsigned int service, 
		goto err;



	/* Delete the old server on the same port */

	old = radix_tree_lookup(&node->servers, port);

	old = xa_store(&node->servers, port, srv, GFP_KERNEL);

	if (old) {

		radix_tree_delete(&node->servers, port);

		if (xa_is_err(old)) {

			pr_err("failed to add server [0x%x:0x%x] ret:%d\n",

			       srv->service, srv->instance, xa_err(old));

			goto err;

		} else {

			kfree(old);

		}



	radix_tree_insert(&node->servers, port, srv);

	}



	trace_qrtr_ns_server_add(srv->service, srv->instance,

				 srv->node, srv->port);
@@ -281,11 +283,11 @@ static int server_del(struct qrtr_node *node, unsigned int port) 
	struct qrtr_server *srv;

	struct list_head *li;



	srv = radix_tree_lookup(&node->servers, port);

	srv = xa_load(&node->servers, port);

	if (!srv)

		return -ENOENT;



	radix_tree_delete(&node->servers, port);

	xa_erase(&node->servers, port);



	/* Broadcast the removal of local servers */

	if (srv->node == qrtr_ns.local_node)
@@ -345,13 +347,12 @@ static int ctrl_cmd_hello(struct sockaddr_qrtr *sq) 
static int ctrl_cmd_bye(struct sockaddr_qrtr *from)

{

	struct qrtr_node *local_node;

	struct radix_tree_iter iter;

	struct qrtr_ctrl_pkt pkt;

	struct qrtr_server *srv;

	struct sockaddr_qrtr sq;

	struct msghdr msg = { };

	struct qrtr_node *node;

	void __rcu **slot;

	unsigned long index;

	struct kvec iv;

	int ret;
@@ -363,8 +364,7 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) 
		return 0;



	/* Advertise removal of this client to all servers of remote node */

	radix_tree_for_each_slot(slot, &node->servers, &iter, 0) {

		srv = radix_tree_deref_slot(slot);

	xa_for_each(&node->servers, index, srv) {

		server_del(node, srv->port);

	}
@@ -377,9 +377,7 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) 
	pkt.cmd = cpu_to_le32(QRTR_TYPE_BYE);

	pkt.client.node = cpu_to_le32(from->sq_node);



	radix_tree_for_each_slot(slot, &local_node->servers, &iter, 0) {

		srv = radix_tree_deref_slot(slot);



	xa_for_each(&local_node->servers, index, srv) {

		sq.sq_family = AF_QIPCRTR;

		sq.sq_node = srv->node;

		sq.sq_port = srv->port;
@@ -400,7 +398,6 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *from, 
			       unsigned int node_id, unsigned int port)

{

	struct qrtr_node *local_node;

	struct radix_tree_iter iter;

	struct qrtr_lookup *lookup;

	struct qrtr_ctrl_pkt pkt;

	struct msghdr msg = { };
@@ -409,7 +406,7 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *from, 
	struct qrtr_node *node;

	struct list_head *tmp;

	struct list_head *li;

	void __rcu **slot;

	unsigned long index;

	struct kvec iv;

	int ret;
@@ -451,9 +448,7 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *from, 
	pkt.client.node = cpu_to_le32(node_id);

	pkt.client.port = cpu_to_le32(port);



	radix_tree_for_each_slot(slot, &local_node->servers, &iter, 0) {

		srv = radix_tree_deref_slot(slot);



	xa_for_each(&local_node->servers, index, srv) {

		sq.sq_family = AF_QIPCRTR;

		sq.sq_node = srv->node;

		sq.sq_port = srv->port;
@@ -545,13 +540,12 @@ static int ctrl_cmd_del_server(struct sockaddr_qrtr *from, 
static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from,

			       unsigned int service, unsigned int instance)

{

	struct radix_tree_iter node_iter;

	struct qrtr_server_filter filter;

	struct radix_tree_iter srv_iter;

	struct qrtr_lookup *lookup;

	struct qrtr_server *srv;

	struct qrtr_node *node;

	void __rcu **node_slot;

	void __rcu **srv_slot;

	unsigned long node_idx;

	unsigned long srv_idx;



	/* Accept only local observers */

	if (from->sq_node != qrtr_ns.local_node)
@@ -570,14 +564,8 @@ static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from, 
	filter.service = service;

	filter.instance = instance;



	radix_tree_for_each_slot(node_slot, &nodes, &node_iter, 0) {

		node = radix_tree_deref_slot(node_slot);



		radix_tree_for_each_slot(srv_slot, &node->servers,

					 &srv_iter, 0) {

			struct qrtr_server *srv;



			srv = radix_tree_deref_slot(srv_slot);

	xa_for_each(&nodes, node_idx, node) {

		xa_for_each(&node->servers, srv_idx, srv) {

			if (!server_match(srv, &filter))

				continue;