Merge "net: qrtr: Ignore ENODEV failures in ns" (8f9e8265) · Commits · e / devices / android_kernel_fairphone_FP5

net/qrtr/ns.c

+47 −36

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
		/*
		* Copyright (c) 2015, Sony Mobile Communications Inc.
		* Copyright (c) 2013, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013, 2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2020, Linaro Ltd.
		*/

		#define pr_fmt(fmt) "qrtr: %s(): " fmt, __func__

		#include <linux/module.h>
		#include <linux/qrtr.h>
		#include <linux/workqueue.h>
		@@ -149,8 +151,8 @@ static int service_announce_del(struct sockaddr_qrtr *dest,
		msg.msg_namelen = sizeof(*dest);

		ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
		if (ret < 0)
		pr_err("failed to announce del service\n");
		if (ret < 0 && ret != -ENODEV)
		pr_err("failed to announce del service %d\n", ret);

		return ret;
		}
		@@ -180,8 +182,8 @@ static void lookup_notify(struct sockaddr_qrtr to, struct qrtr_server srv,
		msg.msg_namelen = sizeof(*to);

		ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
		if (ret < 0)
		pr_err("failed to send lookup notification\n");
		if (ret < 0 && ret != -ENODEV)
		pr_err("failed to send lookup notification %d\n", ret);
		}

		static int announce_servers(struct sockaddr_qrtr *sq)
		@@ -202,7 +204,10 @@ static int announce_servers(struct sockaddr_qrtr *sq)

		ret = service_announce_new(sq, srv);
		if (ret < 0) {
		pr_err("failed to announce new service\n");
		if (ret == -ENODEV)
		continue;

		pr_err("failed to announce new service %d\n", ret);
		return ret;
		}
		}
		@@ -286,9 +291,38 @@ static int server_del(struct qrtr_node *node, unsigned int port)
		return 0;
		}

		static int say_hello(struct sockaddr_qrtr *dest)
		{
		struct qrtr_ctrl_pkt pkt;
		struct msghdr msg = { };
		struct kvec iv;
		int ret;

		iv.iov_base = &pkt;
		iv.iov_len = sizeof(pkt);

		memset(&pkt, 0, sizeof(pkt));
		pkt.cmd = cpu_to_le32(QRTR_TYPE_HELLO);

		msg.msg_name = (struct sockaddr *)dest;
		msg.msg_namelen = sizeof(*dest);

		ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
		if (ret < 0)
		pr_err("failed to send hello msg %d\n", ret);

		return ret;
		}

		/* Announce the list of servers registered on the local node */
		static int ctrl_cmd_hello(struct sockaddr_qrtr *sq)
		{
		int ret;

		ret = say_hello(sq);
		if (ret < 0)
		return ret;

		return announce_servers(sq);
		}

		@@ -338,8 +372,8 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from)
		msg.msg_namelen = sizeof(sq);

		ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
		if (ret < 0) {
		pr_err("failed to send bye cmd\n");
		if (ret < 0 && ret != -ENODEV) {
		pr_err("failed to send bye cmd %d\n", ret);
		return ret;
		}
		}
		@@ -413,8 +447,8 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *from,
		msg.msg_namelen = sizeof(sq);

		ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
		if (ret < 0) {
		pr_err("failed to send del client cmd\n");
		if (ret < 0 && ret != -ENODEV) {
		pr_err("failed to send del client cmd %d\n", ret);
		return ret;
		}
		}
		@@ -448,7 +482,7 @@ static int ctrl_cmd_new_server(struct sockaddr_qrtr *from,
		if (srv->node == qrtr_ns.local_node) {
		ret = service_announce_new(&qrtr_ns.bcast_sq, srv);
		if (ret < 0) {
		pr_err("failed to announce new service\n");
		pr_err("failed to announce new service %d\n", ret);
		return ret;
		}
		}
		@@ -566,29 +600,6 @@ static void ctrl_cmd_del_lookup(struct sockaddr_qrtr *from,
		}
		}

		static int say_hello(void)
		{
		struct qrtr_ctrl_pkt pkt;
		struct msghdr msg = { };
		struct kvec iv;
		int ret;

		iv.iov_base = &pkt;
		iv.iov_len = sizeof(pkt);

		memset(&pkt, 0, sizeof(pkt));
		pkt.cmd = cpu_to_le32(QRTR_TYPE_HELLO);

		msg.msg_name = (struct sockaddr *)&qrtr_ns.bcast_sq;
		msg.msg_namelen = sizeof(qrtr_ns.bcast_sq);

		ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
		if (ret < 0)
		pr_err("failed to send hello msg\n");

		return ret;
		}

		static void qrtr_ns_worker(struct work_struct *work)
		{
		const struct qrtr_ctrl_pkt *pkt;
		@@ -687,7 +698,7 @@ static void qrtr_ns_data_ready(struct sock *sk)
		queue_work(qrtr_ns.workqueue, &qrtr_ns.work);
		}

		void qrtr_ns_init(struct work_struct *work)
		void qrtr_ns_init(void)
		{
		struct sockaddr_qrtr sq;
		int ret;
		@@ -725,7 +736,7 @@ void qrtr_ns_init(struct work_struct *work)
		if (!qrtr_ns.workqueue)
		goto err_sock;

		ret = say_hello();
		ret = say_hello(&qrtr_ns.bcast_sq);
		if (ret < 0)
		goto err_wq;

net/qrtr/qrtr.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@
		#include <linux/numa.h>
		#include <linux/spinlock.h>
		#include <linux/wait.h>
		#include <linux/workqueue.h>
		#include <linux/rwsem.h>
		#include <linux/uidgid.h>
		#include <linux/pm_wakeup.h>
		@@ -131,8 +130,6 @@ static DECLARE_RWSEM(qrtr_epts_lock);
		static DEFINE_IDR(qrtr_ports);
		static DEFINE_SPINLOCK(qrtr_port_lock);

		static struct delayed_work qrtr_ns_work;

		/**
		* struct qrtr_node - endpoint node
		* @ep_lock: lock for endpoint management and callbacks
		@@ -1921,11 +1918,7 @@ static int __init qrtr_proto_init(void)
		return rc;
		}

		/* FIXME: Currently, this 2s delay is required to catch the NEW_SERVER
		* messages from routers. But the fix could be somewhere else.
		*/
		INIT_DELAYED_WORK(&qrtr_ns_work, qrtr_ns_init);
		schedule_delayed_work(&qrtr_ns_work, msecs_to_jiffies(2000));
		qrtr_ns_init();

		return rc;
		}
		@@ -1933,7 +1926,6 @@ postcore_initcall(qrtr_proto_init);

		static void __exit qrtr_proto_fini(void)
		{
		cancel_delayed_work_sync(&qrtr_ns_work);
		qrtr_ns_remove();
		sock_unregister(qrtr_family.family);
		proto_unregister(&qrtr_proto);

net/qrtr/qrtr.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep);

		int qrtr_endpoint_post(struct qrtr_endpoint ep, const void data, size_t len);

		void qrtr_ns_init(struct work_struct *work);
		void qrtr_ns_init(void);

		void qrtr_ns_remove(void);