lkml.org 
[lkml]   [2018]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 032/165] hv_netvsc: Split netvsc_revoke_buf() and netvsc_teardown_gpadl()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mohammed Gamal <mgamal@redhat.com>

    [ Commit 7992894c305eaf504d005529637ff8283d0a849d upstream. ]

    Split each of the functions into two for each of send/recv buffers.
    This will be needed in order to implement a fine-grained messaging
    sequence to the host so that we accommodate the requirements of
    different Windows versions

    Fixes: 0ef58b0a05c12 ("hv_netvsc: change GPAD teardown order on older versions")
    Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/hyperv/netvsc.c | 46 ++++++++++++++++++++++++++++++++------------
    1 file changed, 34 insertions(+), 12 deletions(-)

    --- a/drivers/net/hyperv/netvsc.c
    +++ b/drivers/net/hyperv/netvsc.c
    @@ -105,11 +105,11 @@ static void free_netvsc_device_rcu(struc
    call_rcu(&nvdev->rcu, free_netvsc_device);
    }

    -static void netvsc_revoke_buf(struct hv_device *device,
    - struct netvsc_device *net_device)
    +static void netvsc_revoke_recv_buf(struct hv_device *device,
    + struct netvsc_device *net_device)
    {
    - struct nvsp_message *revoke_packet;
    struct net_device *ndev = hv_get_drvdata(device);
    + struct nvsp_message *revoke_packet;
    int ret;

    /*
    @@ -151,6 +151,14 @@ static void netvsc_revoke_buf(struct hv_
    }
    net_device->recv_section_cnt = 0;
    }
    +}
    +
    +static void netvsc_revoke_send_buf(struct hv_device *device,
    + struct netvsc_device *net_device)
    +{
    + struct net_device *ndev = hv_get_drvdata(device);
    + struct nvsp_message *revoke_packet;
    + int ret;

    /* Deal with the send buffer we may have setup.
    * If we got a send section size, it means we received a
    @@ -194,8 +202,8 @@ static void netvsc_revoke_buf(struct hv_
    }
    }

    -static void netvsc_teardown_gpadl(struct hv_device *device,
    - struct netvsc_device *net_device)
    +static void netvsc_teardown_recv_gpadl(struct hv_device *device,
    + struct netvsc_device *net_device)
    {
    struct net_device *ndev = hv_get_drvdata(device);
    int ret;
    @@ -214,6 +222,13 @@ static void netvsc_teardown_gpadl(struct
    }
    net_device->recv_buf_gpadl_handle = 0;
    }
    +}
    +
    +static void netvsc_teardown_send_gpadl(struct hv_device *device,
    + struct netvsc_device *net_device)
    +{
    + struct net_device *ndev = hv_get_drvdata(device);
    + int ret;

    if (net_device->send_buf_gpadl_handle) {
    ret = vmbus_teardown_gpadl(device->channel,
    @@ -423,8 +438,10 @@ static int netvsc_init_buf(struct hv_dev
    goto exit;

    cleanup:
    - netvsc_revoke_buf(device, net_device);
    - netvsc_teardown_gpadl(device, net_device);
    + netvsc_revoke_recv_buf(device, net_device);
    + netvsc_revoke_send_buf(device, net_device);
    + netvsc_teardown_recv_gpadl(device, net_device);
    + netvsc_teardown_send_gpadl(device, net_device);

    exit:
    return ret;
    @@ -554,7 +571,8 @@ void netvsc_device_remove(struct hv_devi
    = rtnl_dereference(net_device_ctx->nvdev);
    int i;

    - netvsc_revoke_buf(device, net_device);
    + netvsc_revoke_recv_buf(device, net_device);
    + netvsc_revoke_send_buf(device, net_device);

    RCU_INIT_POINTER(net_device_ctx->nvdev, NULL);

    @@ -569,14 +587,18 @@ void netvsc_device_remove(struct hv_devi
    netdev_dbg(ndev, "net device safe to remove\n");

    /* older versions require that buffer be revoked before close */
    - if (vmbus_proto_version < VERSION_WIN10)
    - netvsc_teardown_gpadl(device, net_device);
    + if (vmbus_proto_version < VERSION_WIN10) {
    + netvsc_teardown_recv_gpadl(device, net_device);
    + netvsc_teardown_send_gpadl(device, net_device);
    + }

    /* Now, we can close the channel safely */
    vmbus_close(device->channel);

    - if (vmbus_proto_version >= VERSION_WIN10)
    - netvsc_teardown_gpadl(device, net_device);
    + if (vmbus_proto_version >= VERSION_WIN10) {
    + netvsc_teardown_recv_gpadl(device, net_device);
    + netvsc_teardown_send_gpadl(device, net_device);
    + }

    /* Release all resources */
    free_netvsc_device_rcu(net_device);

    \
     
     \ /
      Last update: 2018-05-24 13:22    [W:2.052 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site