lkml.org 
[lkml]   [2023]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 6/9] vdpa_sim: make devices agnostic for work management
    Date
    Let's move work management inside the vdpa_sim core.
    This way we can easily change how we manage the works, without
    having to change the devices each time.

    Acked-by: Eugenio Pérez Martin <eperezma@redhat.com>
    Acked-by: Jason Wang <jasowang@redhat.com>
    Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
    ---
    drivers/vdpa/vdpa_sim/vdpa_sim.h | 3 ++-
    drivers/vdpa/vdpa_sim/vdpa_sim.c | 17 +++++++++++++++--
    drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 6 ++----
    drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 6 ++----
    4 files changed, 21 insertions(+), 11 deletions(-)

    diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.h b/drivers/vdpa/vdpa_sim/vdpa_sim.h
    index 144858636c10..acee20faaf6a 100644
    --- a/drivers/vdpa/vdpa_sim/vdpa_sim.h
    +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.h
    @@ -45,7 +45,7 @@ struct vdpasim_dev_attr {
    u32 ngroups;
    u32 nas;

    - work_func_t work_fn;
    + void (*work_fn)(struct vdpasim *vdpasim);
    void (*get_config)(struct vdpasim *vdpasim, void *config);
    void (*set_config)(struct vdpasim *vdpasim, const void *config);
    int (*get_stats)(struct vdpasim *vdpasim, u16 idx,
    @@ -78,6 +78,7 @@ struct vdpasim {

    struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *attr,
    const struct vdpa_dev_set_config *config);
    +void vdpasim_schedule_work(struct vdpasim *vdpasim);

    /* TODO: cross-endian support */
    static inline bool vdpasim_is_little_endian(struct vdpasim *vdpasim)
    diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
    index eea23c630f7c..2df5227e0b62 100644
    --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
    +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
    @@ -127,6 +127,13 @@ static void vdpasim_do_reset(struct vdpasim *vdpasim)
    static const struct vdpa_config_ops vdpasim_config_ops;
    static const struct vdpa_config_ops vdpasim_batch_config_ops;

    +static void vdpasim_work_fn(struct work_struct *work)
    +{
    + struct vdpasim *vdpasim = container_of(work, struct vdpasim, work);
    +
    + vdpasim->dev_attr.work_fn(vdpasim);
    +}
    +
    struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr,
    const struct vdpa_dev_set_config *config)
    {
    @@ -163,7 +170,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr,

    vdpasim = vdpa_to_sim(vdpa);
    vdpasim->dev_attr = *dev_attr;
    - INIT_WORK(&vdpasim->work, dev_attr->work_fn);
    + INIT_WORK(&vdpasim->work, vdpasim_work_fn);
    spin_lock_init(&vdpasim->lock);
    spin_lock_init(&vdpasim->iommu_lock);

    @@ -214,6 +221,12 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr,
    }
    EXPORT_SYMBOL_GPL(vdpasim_create);

    +void vdpasim_schedule_work(struct vdpasim *vdpasim)
    +{
    + schedule_work(&vdpasim->work);
    +}
    +EXPORT_SYMBOL_GPL(vdpasim_schedule_work);
    +
    static int vdpasim_set_vq_address(struct vdpa_device *vdpa, u16 idx,
    u64 desc_area, u64 driver_area,
    u64 device_area)
    @@ -248,7 +261,7 @@ static void vdpasim_kick_vq(struct vdpa_device *vdpa, u16 idx)
    }

    if (vq->ready)
    - schedule_work(&vdpasim->work);
    + vdpasim_schedule_work(vdpasim);
    }

    static void vdpasim_set_vq_cb(struct vdpa_device *vdpa, u16 idx,
    diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c
    index 5117959bed8a..eb4897c8541e 100644
    --- a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c
    +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c
    @@ -11,7 +11,6 @@
    #include <linux/module.h>
    #include <linux/device.h>
    #include <linux/kernel.h>
    -#include <linux/sched.h>
    #include <linux/blkdev.h>
    #include <linux/vringh.h>
    #include <linux/vdpa.h>
    @@ -286,9 +285,8 @@ static bool vdpasim_blk_handle_req(struct vdpasim *vdpasim,
    return handled;
    }

    -static void vdpasim_blk_work(struct work_struct *work)
    +static void vdpasim_blk_work(struct vdpasim *vdpasim)
    {
    - struct vdpasim *vdpasim = container_of(work, struct vdpasim, work);
    bool reschedule = false;
    int i;

    @@ -326,7 +324,7 @@ static void vdpasim_blk_work(struct work_struct *work)
    spin_unlock(&vdpasim->lock);

    if (reschedule)
    - schedule_work(&vdpasim->work);
    + vdpasim_schedule_work(vdpasim);
    }

    static void vdpasim_blk_get_config(struct vdpasim *vdpasim, void *config)
    diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c
    index 862f405362de..e61a9ecbfafe 100644
    --- a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c
    +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c
    @@ -11,7 +11,6 @@
    #include <linux/module.h>
    #include <linux/device.h>
    #include <linux/kernel.h>
    -#include <linux/sched.h>
    #include <linux/etherdevice.h>
    #include <linux/vringh.h>
    #include <linux/vdpa.h>
    @@ -192,9 +191,8 @@ static void vdpasim_handle_cvq(struct vdpasim *vdpasim)
    u64_stats_update_end(&net->cq_stats.syncp);
    }

    -static void vdpasim_net_work(struct work_struct *work)
    +static void vdpasim_net_work(struct vdpasim *vdpasim)
    {
    - struct vdpasim *vdpasim = container_of(work, struct vdpasim, work);
    struct vdpasim_virtqueue *txq = &vdpasim->vqs[1];
    struct vdpasim_virtqueue *rxq = &vdpasim->vqs[0];
    struct vdpasim_net *net = sim_to_net(vdpasim);
    @@ -260,7 +258,7 @@ static void vdpasim_net_work(struct work_struct *work)
    vdpasim_net_complete(rxq, write);

    if (tx_pkts > 4) {
    - schedule_work(&vdpasim->work);
    + vdpasim_schedule_work(vdpasim);
    goto out;
    }
    }
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-03-27 01:16    [W:4.495 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site