| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 22 Sep 2020 16:27:56 +0200
From: Arnaud POULIQUEN <arnaud.pouliquen@...com>
To: Mathieu Poirier <mathieu.poirier@...aro.org>,
"ohad@...ery.com" <ohad@...ery.com>,
"bjorn.andersson@...aro.org" <bjorn.andersson@...aro.org>,
"guennadi.liakhovetski@...ux.intel.com"
<guennadi.liakhovetski@...ux.intel.com>
CC: Loic PALLARDY <loic.pallardy@...com>,
"linux-remoteproc@...r.kernel.org" <linux-remoteproc@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 05/10] rpmsg: virtio: Move virtio RPMSG structures to
private header
On 9/22/20 2:09 AM, 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 <mathieu.poirier@...aro.org>
> ---
> 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>
This also creates a dependency with virtio
This file is included by several drivers...
Regards,
Arnaud
> +#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
> + * @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,
>
Powered by blists - more mailing lists