lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 511/879] amt: fix gateway mode stuck
    Date
    From: Taehee Yoo <ap420073@gmail.com>

    [ Upstream commit 937956ba404e70a765ca5aa39d3d7564d86a8872 ]

    If a gateway can not receive any response to requests from a relay,
    gateway resets status from SENT_REQUEST to INIT and variable about a
    relay as well. And then it should start the full establish step
    from sending a discovery message and receiving advertisement message.
    But, after failure in amt_req_work() it continues sending a request
    message step with flushed(invalid) relay information and sets SENT_REQUEST.
    So, a gateway can't be established with a relay.
    In order to avoid this situation, it stops sending the request message
    step if it fails.

    Fixes: cbc21dc1cfe9 ("amt: add data plane of amt interface")
    Signed-off-by: Taehee Yoo <ap420073@gmail.com>
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/amt.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/amt.c b/drivers/net/amt.c
    index 10455c9b9da0..2b4ce3869f08 100644
    --- a/drivers/net/amt.c
    +++ b/drivers/net/amt.c
    @@ -943,7 +943,7 @@ static void amt_req_work(struct work_struct *work)
    if (amt->status < AMT_STATUS_RECEIVED_ADVERTISEMENT)
    goto out;

    - if (amt->req_cnt++ > AMT_MAX_REQ_COUNT) {
    + if (amt->req_cnt > AMT_MAX_REQ_COUNT) {
    netdev_dbg(amt->dev, "Gateway is not ready");
    amt->qi = AMT_INIT_REQ_TIMEOUT;
    amt->ready4 = false;
    @@ -951,13 +951,15 @@ static void amt_req_work(struct work_struct *work)
    amt->remote_ip = 0;
    __amt_update_gw_status(amt, AMT_STATUS_INIT, false);
    amt->req_cnt = 0;
    + goto out;
    }
    spin_unlock_bh(&amt->lock);

    amt_send_request(amt, false);
    amt_send_request(amt, true);
    - amt_update_gw_status(amt, AMT_STATUS_SENT_REQUEST, true);
    spin_lock_bh(&amt->lock);
    + __amt_update_gw_status(amt, AMT_STATUS_SENT_REQUEST, true);
    + amt->req_cnt++;
    out:
    exp = min_t(u32, (1 * (1 << amt->req_cnt)), AMT_MAX_REQ_TIMEOUT);
    mod_delayed_work(amt_wq, &amt->req_wq, msecs_to_jiffies(exp * 1000));
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 03:46    [W:3.168 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site