Commit 15fd943a authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen

rpmsg: make sure inflight messages don't invoke just-removed callbacks

When inbound messages arrive, rpmsg core looks up their associated
endpoint (by destination address) and then invokes their callback.

We've made sure that endpoints will never be de-allocated after they
were found by rpmsg core, but we also need to protect against the
(rare) scenario where the rpmsg driver was just removed, and its
callback function isn't available anymore.

This is achieved by introducing a callback mutex, which must be taken
before the callback is invoked, and, obviously, before it is removed.

Cc: stable <stable@vger.kernel.org>
Reported-by: default avatarFernando Guzman Lugo <fernando.lugo@ti.com>
Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
parent 5a081caa
...@@ -227,6 +227,7 @@ static struct rpmsg_endpoint *__rpmsg_create_ept(struct virtproc_info *vrp, ...@@ -227,6 +227,7 @@ static struct rpmsg_endpoint *__rpmsg_create_ept(struct virtproc_info *vrp,
} }
kref_init(&ept->refcount); kref_init(&ept->refcount);
mutex_init(&ept->cb_lock);
ept->rpdev = rpdev; ept->rpdev = rpdev;
ept->cb = cb; ept->cb = cb;
...@@ -324,10 +325,16 @@ EXPORT_SYMBOL(rpmsg_create_ept); ...@@ -324,10 +325,16 @@ EXPORT_SYMBOL(rpmsg_create_ept);
static void static void
__rpmsg_destroy_ept(struct virtproc_info *vrp, struct rpmsg_endpoint *ept) __rpmsg_destroy_ept(struct virtproc_info *vrp, struct rpmsg_endpoint *ept)
{ {
/* make sure new inbound messages can't find this ept anymore */
mutex_lock(&vrp->endpoints_lock); mutex_lock(&vrp->endpoints_lock);
idr_remove(&vrp->endpoints, ept->addr); idr_remove(&vrp->endpoints, ept->addr);
mutex_unlock(&vrp->endpoints_lock); mutex_unlock(&vrp->endpoints_lock);
/* make sure in-flight inbound messages won't invoke cb anymore */
mutex_lock(&ept->cb_lock);
ept->cb = NULL;
mutex_unlock(&ept->cb_lock);
kref_put(&ept->refcount, __ept_release); kref_put(&ept->refcount, __ept_release);
} }
...@@ -821,14 +828,20 @@ static void rpmsg_recv_done(struct virtqueue *rvq) ...@@ -821,14 +828,20 @@ static void rpmsg_recv_done(struct virtqueue *rvq)
mutex_unlock(&vrp->endpoints_lock); mutex_unlock(&vrp->endpoints_lock);
if (ept && ept->cb) if (ept) {
ept->cb(ept->rpdev, msg->data, msg->len, ept->priv, msg->src); /* make sure ept->cb doesn't go away while we use it */
else mutex_lock(&ept->cb_lock);
dev_warn(dev, "msg received with no recepient\n");
if (ept->cb)
ept->cb(ept->rpdev, msg->data, msg->len, ept->priv,
msg->src);
mutex_unlock(&ept->cb_lock);
/* farewell, ept, we don't need you anymore */ /* farewell, ept, we don't need you anymore */
if (ept)
kref_put(&ept->refcount, __ept_release); kref_put(&ept->refcount, __ept_release);
} else
dev_warn(dev, "msg received with no recepient\n");
/* publish the real size of the buffer */ /* publish the real size of the buffer */
sg_init_one(&sg, msg, RPMSG_BUF_SIZE); sg_init_one(&sg, msg, RPMSG_BUF_SIZE);
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/mutex.h>
/* The feature bitmap for virtio rpmsg */ /* The feature bitmap for virtio rpmsg */
#define VIRTIO_RPMSG_F_NS 0 /* RP supports name service notifications */ #define VIRTIO_RPMSG_F_NS 0 /* RP supports name service notifications */
...@@ -123,6 +124,7 @@ typedef void (*rpmsg_rx_cb_t)(struct rpmsg_channel *, void *, int, void *, u32); ...@@ -123,6 +124,7 @@ typedef void (*rpmsg_rx_cb_t)(struct rpmsg_channel *, void *, int, void *, u32);
* @rpdev: rpmsg channel device * @rpdev: rpmsg channel device
* @refcount: when this drops to zero, the ept is deallocated * @refcount: when this drops to zero, the ept is deallocated
* @cb: rx callback handler * @cb: rx callback handler
* @cb_lock: must be taken before accessing/changing @cb
* @addr: local rpmsg address * @addr: local rpmsg address
* @priv: private data for the driver's use * @priv: private data for the driver's use
* *
...@@ -144,6 +146,7 @@ struct rpmsg_endpoint { ...@@ -144,6 +146,7 @@ struct rpmsg_endpoint {
struct rpmsg_channel *rpdev; struct rpmsg_channel *rpdev;
struct kref refcount; struct kref refcount;
rpmsg_rx_cb_t cb; rpmsg_rx_cb_t cb;
struct mutex cb_lock;
u32 addr; u32 addr;
void *priv; void *priv;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment