lkml.org 
[lkml]   [2022]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 031/102] tipc: simplify the finalize work queue
    Date
    From: Xin Long <lucien.xin@gmail.com>

    [ Upstream commit be07f056396d6bb40963c45a02951c566ddeef8e ]

    This patch is to use "struct work_struct" for the finalize work queue
    instead of "struct tipc_net_work", as it can get the "net" and "addr"
    from tipc_net's other members and there is no need to add extra net
    and addr in tipc_net by defining "struct tipc_net_work".

    Note that it's safe to get net from tn->bcl as bcl is always released
    after the finalize work queue is done.

    Signed-off-by: Xin Long <lucien.xin@gmail.com>
    Acked-by: Jon Maloy <jmaloy@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/tipc/core.c | 4 ++--
    net/tipc/core.h | 8 +-------
    net/tipc/discover.c | 4 ++--
    net/tipc/link.c | 5 +++++
    net/tipc/link.h | 1 +
    net/tipc/net.c | 15 +++------------
    6 files changed, 14 insertions(+), 23 deletions(-)

    diff --git a/net/tipc/core.c b/net/tipc/core.c
    index 40c03085c0ea..96bfcb2986f5 100644
    --- a/net/tipc/core.c
    +++ b/net/tipc/core.c
    @@ -60,7 +60,7 @@ static int __net_init tipc_init_net(struct net *net)
    tn->trial_addr = 0;
    tn->addr_trial_end = 0;
    tn->capabilities = TIPC_NODE_CAPABILITIES;
    - INIT_WORK(&tn->final_work.work, tipc_net_finalize_work);
    + INIT_WORK(&tn->work, tipc_net_finalize_work);
    memset(tn->node_id, 0, sizeof(tn->node_id));
    memset(tn->node_id_string, 0, sizeof(tn->node_id_string));
    tn->mon_threshold = TIPC_DEF_MON_THRESHOLD;
    @@ -112,7 +112,7 @@ static void __net_exit tipc_exit_net(struct net *net)

    tipc_detach_loopback(net);
    /* Make sure the tipc_net_finalize_work() finished */
    - cancel_work_sync(&tn->final_work.work);
    + cancel_work_sync(&tn->work);
    tipc_net_stop(net);

    tipc_bcast_stop(net);
    diff --git a/net/tipc/core.h b/net/tipc/core.h
    index 992924a849be..73a26b0b9ca1 100644
    --- a/net/tipc/core.h
    +++ b/net/tipc/core.h
    @@ -90,12 +90,6 @@ extern unsigned int tipc_net_id __read_mostly;
    extern int sysctl_tipc_rmem[3] __read_mostly;
    extern int sysctl_tipc_named_timeout __read_mostly;

    -struct tipc_net_work {
    - struct work_struct work;
    - struct net *net;
    - u32 addr;
    -};
    -
    struct tipc_net {
    u8 node_id[NODE_ID_LEN];
    u32 node_addr;
    @@ -150,7 +144,7 @@ struct tipc_net {
    struct tipc_crypto *crypto_tx;
    #endif
    /* Work item for net finalize */
    - struct tipc_net_work final_work;
    + struct work_struct work;
    /* The numbers of work queues in schedule */
    atomic_t wq_count;
    };
    diff --git a/net/tipc/discover.c b/net/tipc/discover.c
    index d4ecacddb40c..14bc20604051 100644
    --- a/net/tipc/discover.c
    +++ b/net/tipc/discover.c
    @@ -167,7 +167,7 @@ static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d,

    /* Apply trial address if we just left trial period */
    if (!trial && !self) {
    - tipc_sched_net_finalize(net, tn->trial_addr);
    + schedule_work(&tn->work);
    msg_set_prevnode(buf_msg(d->skb), tn->trial_addr);
    msg_set_type(buf_msg(d->skb), DSC_REQ_MSG);
    }
    @@ -307,7 +307,7 @@ static void tipc_disc_timeout(struct timer_list *t)
    if (!time_before(jiffies, tn->addr_trial_end) && !tipc_own_addr(net)) {
    mod_timer(&d->timer, jiffies + TIPC_DISC_INIT);
    spin_unlock_bh(&d->lock);
    - tipc_sched_net_finalize(net, tn->trial_addr);
    + schedule_work(&tn->work);
    return;
    }

    diff --git a/net/tipc/link.c b/net/tipc/link.c
    index 7a353ff62844..064fdb8e50e1 100644
    --- a/net/tipc/link.c
    +++ b/net/tipc/link.c
    @@ -344,6 +344,11 @@ char tipc_link_plane(struct tipc_link *l)
    return l->net_plane;
    }

    +struct net *tipc_link_net(struct tipc_link *l)
    +{
    + return l->net;
    +}
    +
    void tipc_link_update_caps(struct tipc_link *l, u16 capabilities)
    {
    l->peer_caps = capabilities;
    diff --git a/net/tipc/link.h b/net/tipc/link.h
    index fc07232c9a12..a16f401fdabd 100644
    --- a/net/tipc/link.h
    +++ b/net/tipc/link.h
    @@ -156,4 +156,5 @@ int tipc_link_bc_sync_rcv(struct tipc_link *l, struct tipc_msg *hdr,
    int tipc_link_bc_nack_rcv(struct tipc_link *l, struct sk_buff *skb,
    struct sk_buff_head *xmitq);
    bool tipc_link_too_silent(struct tipc_link *l);
    +struct net *tipc_link_net(struct tipc_link *l);
    #endif
    diff --git a/net/tipc/net.c b/net/tipc/net.c
    index 0bb2323201da..671cb4f9d563 100644
    --- a/net/tipc/net.c
    +++ b/net/tipc/net.c
    @@ -41,6 +41,7 @@
    #include "socket.h"
    #include "node.h"
    #include "bcast.h"
    +#include "link.h"
    #include "netlink.h"
    #include "monitor.h"

    @@ -138,19 +139,9 @@ static void tipc_net_finalize(struct net *net, u32 addr)

    void tipc_net_finalize_work(struct work_struct *work)
    {
    - struct tipc_net_work *fwork;
    + struct tipc_net *tn = container_of(work, struct tipc_net, work);

    - fwork = container_of(work, struct tipc_net_work, work);
    - tipc_net_finalize(fwork->net, fwork->addr);
    -}
    -
    -void tipc_sched_net_finalize(struct net *net, u32 addr)
    -{
    - struct tipc_net *tn = tipc_net(net);
    -
    - tn->final_work.net = net;
    - tn->final_work.addr = addr;
    - schedule_work(&tn->final_work.work);
    + tipc_net_finalize(tipc_link_net(tn->bcl), tn->trial_addr);
    }

    void tipc_net_stop(struct net *net)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-27 13:26    [W:2.985 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site