lkml.org 
[lkml]   [2021]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 21/71] inet_diag: use jiffies_delta_to_msecs()
    Date
    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 3828a93f5cfdf5d8a4ff9dead741e9a2871ff57b ]

    Use jiffies_delta_to_msecs() to avoid reporting 'infinite'
    timeouts and to cleanup code.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/ipv4/inet_diag.c | 15 ++++++---------
    1 file changed, 6 insertions(+), 9 deletions(-)

    diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
    index 4f71aca156662..6f8118b29ba51 100644
    --- a/net/ipv4/inet_diag.c
    +++ b/net/ipv4/inet_diag.c
    @@ -240,17 +240,17 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
    r->idiag_timer = 1;
    r->idiag_retrans = icsk->icsk_retransmits;
    r->idiag_expires =
    - jiffies_to_msecs(icsk->icsk_timeout - jiffies);
    + jiffies_delta_to_msecs(icsk->icsk_timeout - jiffies);
    } else if (icsk->icsk_pending == ICSK_TIME_PROBE0) {
    r->idiag_timer = 4;
    r->idiag_retrans = icsk->icsk_probes_out;
    r->idiag_expires =
    - jiffies_to_msecs(icsk->icsk_timeout - jiffies);
    + jiffies_delta_to_msecs(icsk->icsk_timeout - jiffies);
    } else if (timer_pending(&sk->sk_timer)) {
    r->idiag_timer = 2;
    r->idiag_retrans = icsk->icsk_probes_out;
    r->idiag_expires =
    - jiffies_to_msecs(sk->sk_timer.expires - jiffies);
    + jiffies_delta_to_msecs(sk->sk_timer.expires - jiffies);
    } else {
    r->idiag_timer = 0;
    r->idiag_expires = 0;
    @@ -338,16 +338,13 @@ static int inet_twsk_diag_fill(struct sock *sk,
    r = nlmsg_data(nlh);
    BUG_ON(tw->tw_state != TCP_TIME_WAIT);

    - tmo = tw->tw_timer.expires - jiffies;
    - if (tmo < 0)
    - tmo = 0;
    -
    inet_diag_msg_common_fill(r, sk);
    r->idiag_retrans = 0;

    r->idiag_state = tw->tw_substate;
    r->idiag_timer = 3;
    - r->idiag_expires = jiffies_to_msecs(tmo);
    + tmo = tw->tw_timer.expires - jiffies;
    + r->idiag_expires = jiffies_delta_to_msecs(tmo);
    r->idiag_rqueue = 0;
    r->idiag_wqueue = 0;
    r->idiag_uid = 0;
    @@ -381,7 +378,7 @@ static int inet_req_diag_fill(struct sock *sk, struct sk_buff *skb,
    offsetof(struct sock, sk_cookie));

    tmo = inet_reqsk(sk)->rsk_timer.expires - jiffies;
    - r->idiag_expires = (tmo >= 0) ? jiffies_to_msecs(tmo) : 0;
    + r->idiag_expires = jiffies_delta_to_msecs(tmo);
    r->idiag_rqueue = 0;
    r->idiag_wqueue = 0;
    r->idiag_uid = 0;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-12-20 15:51    [W:4.070 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site