by Mathieu Poirier

Hi Guennadi,

Apologies for the late reply, I've been away.

On Wed, Sep 30, 2020 at 09:03:45AM +0200, Guennadi Liakhovetski wrote:
> On Mon, Sep 21, 2020 at 06:09:55PM -0600, Mathieu Poirier wrote:
> > Move structure virtiproc_info and virtio_rpmsg_channel to rpmsg_internal.h
> > so that they can be used by rpmsg_ns.c
> >
> > Signed-off-by: Mathieu Poirier <[email protected]>
> > ---
> > drivers/rpmsg/rpmsg_internal.h | 62 ++++++++++++++++++++++++++++++++
> > drivers/rpmsg/virtio_rpmsg_bus.c | 57 -----------------------------
> > 2 files changed, 62 insertions(+), 57 deletions(-)
> >
> > diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h
> > index 587f723757d4..3ea9cec26fc0 100644
> > --- a/drivers/rpmsg/rpmsg_internal.h
> > +++ b/drivers/rpmsg/rpmsg_internal.h
> > @@ -12,12 +12,74 @@
> > #ifndef __RPMSG_INTERNAL_H__
> > #define __RPMSG_INTERNAL_H__
> >
> > +#include <linux/idr.h>
> > +#include <linux/mutex.h>
> > #include <linux/rpmsg.h>
> > +#include <linux/types.h>
> > +#include <linux/virtio.h>
>
> I think it would be better to not add any VirtIO dependencies here even
> temporarily.
>
> > +#include <linux/wait.h>
> > #include <linux/poll.h>
> >
> > #define to_rpmsg_device(d) container_of(d, struct rpmsg_device, dev)
> > #define to_rpmsg_driver(d) container_of(d, struct rpmsg_driver, drv)
> >
> > +/**
> > + * struct virtproc_info - virtual remote processor state
>
> This struct shouldn't be here, let's first prepare the NS callback by
> removing any VirtIO dependencies and only then move it to the generic
> driver.

I agree... I will proceed differently in the next revision.

>
> Thanks
> Guennadi
>
> > + * @vdev: the virtio device
> > + * @rvq: rx virtqueue
> > + * @svq: tx virtqueue
> > + * @rbufs: kernel address of rx buffers
> > + * @sbufs: kernel address of tx buffers
> > + * @num_bufs: total number of buffers for rx and tx
> > + * @buf_size: size of one rx or tx buffer
> > + * @last_sbuf: index of last tx buffer used
> > + * @bufs_dma: dma base addr of the buffers
> > + * @tx_lock: protects svq, sbufs and sleepers, to allow concurrent senders.
> > + * sending a message might require waking up a dozing remote
> > + * processor, which involves sleeping, hence the mutex.
> > + * @endpoints: idr of local endpoints, allows fast retrieval
> > + * @endpoints_lock: lock of the endpoints set
> > + * @sendq: wait queue of sending contexts waiting for a tx buffers
> > + * @sleepers: number of senders that are waiting for a tx buffer
> > + * @ns_ept: the bus's name service endpoint
> > + *
> > + * This structure stores the rpmsg state of a given virtio remote processor
> > + * device (there might be several virtio proc devices for each physical
> > + * remote processor).
> > + */
> > +struct virtproc_info {
> > + struct virtio_device *vdev;
> > + struct virtqueue *rvq, *svq;
> > + void *rbufs, *sbufs;
> > + unsigned int num_bufs;
> > + unsigned int buf_size;
> > + int last_sbuf;
> > + dma_addr_t bufs_dma;
> > + struct mutex tx_lock;
> > + struct idr endpoints;
> > + struct mutex endpoints_lock;
> > + wait_queue_head_t sendq;
> > + atomic_t sleepers;
> > + struct rpmsg_endpoint *ns_ept;
> > +};
> > +
> > +/**
> > + * struct virtio_rpmsg_channel - rpmsg channel descriptor
> > + * @rpdev: the rpmsg channel device
> > + * @vrp: the virtio remote processor device this channel belongs to
> > + *
> > + * This structure stores the channel that links the rpmsg device to the virtio
> > + * remote processor device.
> > + */
> > +struct virtio_rpmsg_channel {
> > + struct rpmsg_device rpdev;
> > +
> > + struct virtproc_info *vrp;
> > +};
> > +
> > +#define to_virtio_rpmsg_channel(_rpdev) \
> > + container_of(_rpdev, struct virtio_rpmsg_channel, rpdev)
> > +
> > /**
> > * struct rpmsg_device_ops - indirection table for the rpmsg_device operations
> > * @create_channel: create backend-specific channel, optional
> > diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
> > index eaf3b2c012c8..0635d86d490f 100644
> > --- a/drivers/rpmsg/virtio_rpmsg_bus.c
> > +++ b/drivers/rpmsg/virtio_rpmsg_bus.c
> > @@ -32,63 +32,6 @@
> >
> > #include "rpmsg_internal.h"
> >
> > -/**
> > - * struct virtproc_info - virtual remote processor state
> > - * @vdev: the virtio device
> > - * @rvq: rx virtqueue
> > - * @svq: tx virtqueue
> > - * @rbufs: kernel address of rx buffers
> > - * @sbufs: kernel address of tx buffers
> > - * @num_bufs: total number of buffers for rx and tx
> > - * @buf_size: size of one rx or tx buffer
> > - * @last_sbuf: index of last tx buffer used
> > - * @bufs_dma: dma base addr of the buffers
> > - * @tx_lock: protects svq, sbufs and sleepers, to allow concurrent senders.
> > - * sending a message might require waking up a dozing remote
> > - * processor, which involves sleeping, hence the mutex.
> > - * @endpoints: idr of local endpoints, allows fast retrieval
> > - * @endpoints_lock: lock of the endpoints set
> > - * @sendq: wait queue of sending contexts waiting for a tx buffers
> > - * @sleepers: number of senders that are waiting for a tx buffer
> > - * @ns_ept: the bus's name service endpoint
> > - *
> > - * This structure stores the rpmsg state of a given virtio remote processor
> > - * device (there might be several virtio proc devices for each physical
> > - * remote processor).
> > - */
> > -struct virtproc_info {
> > - struct virtio_device *vdev;
> > - struct virtqueue *rvq, *svq;
> > - void *rbufs, *sbufs;
> > - unsigned int num_bufs;
> > - unsigned int buf_size;
> > - int last_sbuf;
> > - dma_addr_t bufs_dma;
> > - struct mutex tx_lock;
> > - struct idr endpoints;
> > - struct mutex endpoints_lock;
> > - wait_queue_head_t sendq;
> > - atomic_t sleepers;
> > - struct rpmsg_endpoint *ns_ept;
> > -};
> > -
> > -/**
> > - * struct virtio_rpmsg_channel - rpmsg channel descriptor
> > - * @rpdev: the rpmsg channel device
> > - * @vrp: the virtio remote processor device this channel belongs to
> > - *
> > - * This structure stores the channel that links the rpmsg device to the virtio
> > - * remote processor device.
> > - */
> > -struct virtio_rpmsg_channel {
> > - struct rpmsg_device rpdev;
> > -
> > - struct virtproc_info *vrp;
> > -};
> > -
> > -#define to_virtio_rpmsg_channel(_rpdev) \
> > - container_of(_rpdev, struct virtio_rpmsg_channel, rpdev)
> > -
> > /*
> > * Local addresses are dynamically allocated on-demand.
> > * We do not dynamically assign addresses from the low 1024 range,
> > --
> > 2.25.1
> >

2020-10-07 19:27:52

by Mathieu Poirier

[permalink] [raw]

Subject: Re: [PATCH 10/10] rpmsg: ns: Make Name service module transport agnostic

On Wed, Sep 30, 2020 at 09:13:27AM +0200, Guennadi Liakhovetski wrote:
> On Mon, Sep 21, 2020 at 06:10:00PM -0600, Mathieu Poirier wrote:
> > Make name service module transport agnostic by using the rpmsg
> > device specific byte conversion routine.
> >
> > Signed-off-by: Mathieu Poirier <[email protected]>
> > ---
> > drivers/rpmsg/rpmsg_ns.c | 10 ++++------
> > include/linux/rpmsg_ns.h | 4 ++--
> > 2 files changed, 6 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/rpmsg/rpmsg_ns.c b/drivers/rpmsg/rpmsg_ns.c
> > index b3318bf84433..1df3aaadfe10 100644
> > --- a/drivers/rpmsg/rpmsg_ns.c
> > +++ b/drivers/rpmsg/rpmsg_ns.c
> > @@ -18,9 +18,7 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,
> > struct rpmsg_ns_msg *msg = data;
> > struct rpmsg_device *newch;
> > struct rpmsg_channel_info chinfo;
> > - struct virtio_rpmsg_channel *vch = to_virtio_rpmsg_channel(rpdev);
> > - struct virtproc_info *vrp = vch->vrp;
> > - struct device *dev = &vrp->vdev->dev;
> > + struct device *dev = &rpdev->dev;
> > int ret;
> >
> > #if defined(CONFIG_DYNAMIC_DEBUG)
> > @@ -38,13 +36,13 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,
> >
> > strncpy(chinfo.name, msg->name, sizeof(chinfo.name));
> > chinfo.src = RPMSG_ADDR_ANY;
> > - chinfo.dst = virtio32_to_cpu(vrp->vdev, msg->addr);
> > + chinfo.dst = rpmsg32_to_cpu(rpdev, msg->addr);
> >
> > dev_info(dev, "%sing channel %s addr 0x%x\n",
> > - virtio32_to_cpu(vrp->vdev, msg->flags) & RPMSG_NS_DESTROY ?
> > + rpmsg32_to_cpu(rpdev, msg->flags) & RPMSG_NS_DESTROY ?
> > "destroy" : "creat", msg->name, chinfo.dst);
> >
> > - if (virtio32_to_cpu(vrp->vdev, msg->flags) & RPMSG_NS_DESTROY) {
> > + if (rpmsg32_to_cpu(rpdev, msg->flags) & RPMSG_NS_DESTROY) {
> > ret = rpmsg_release_channel(rpdev, &chinfo);
> > if (ret)
> > dev_err(dev, "rpmsg_destroy_channel failed: %d\n", ret);
> > diff --git a/include/linux/rpmsg_ns.h b/include/linux/rpmsg_ns.h
> > index aabc6c3c0d6d..9f3030b2145b 100644
> > --- a/include/linux/rpmsg_ns.h
> > +++ b/include/linux/rpmsg_ns.h
> > @@ -41,8 +41,8 @@ struct rpmsg_hdr {
> > */
> > struct rpmsg_ns_msg {
> > char name[RPMSG_NAME_SIZE];
> > - __virtio32 addr;
> > - __virtio32 flags;
> > + u32 addr;
> > + u32 flags;
>
> These aren't (necessarily) native endianness, right? Don't they deserve a
> separate type? __rpmsg32?
>

I kept them as u32 type to be as generic as possible and let the endianness
conversion callback do the work. Making them a __rpmsg32 is a good idea, it
would force a proper implementation.

> Thanks
> Guennadi
>
> > } __packed;
> >
> > /**
> > --
> > 2.25.1
> >