From patchwork Sun Dec 10 15:31:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 846674 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JLg8ZmTf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yvqpr14h7z9s74 for ; Mon, 11 Dec 2017 02:32:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752515AbdLJPcl (ORCPT ); Sun, 10 Dec 2017 10:32:41 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36312 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752373AbdLJPcV (ORCPT ); Sun, 10 Dec 2017 10:32:21 -0500 Received: by mail-pf0-f193.google.com with SMTP id p84so9787439pfd.3; Sun, 10 Dec 2017 07:32:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QrL1b5Qo2/wH+w6Ugej66ppPSLgTguzm2K8mp+vPJvU=; b=JLg8ZmTfcPyCBcOskIIBc3LHAQG6g0qczpz3I5dJA5DnbT6/LfmwYcjUYOb9gbNd7A mBspx5a1ss5rL6Ug1R0UhjZEs2oge4NW4FdmGU69VmBST7M/hwg9awxZ0APRR4kXE0WO eDk7NAqDRPgI17BcpmbrpCAkr7SRdTSBgWq+3CIbjKOEYW5JYVgUmBONXv4IYuD2ngGg zD4A0UOArDb6bnJ9S8OobciTWZgNaqjOQ+yp1747cYtB7wm7aCfGX6m2gdz1DcHHNqO7 6K570+run4p3avjE9H8q9WRap6S9/jznRiRo0EUv2RZoLQj44j1ElMNwg45m6/l2GiBu 4RiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QrL1b5Qo2/wH+w6Ugej66ppPSLgTguzm2K8mp+vPJvU=; b=aNx4EQ4sA/P1N7lXvBFEYMBYU3jMPZKwEphw+GYF2W9a0ZPRQB3PLEIn4uuPRuZ+I0 pTr0NeaEyZCf9qfG1PkRmhYd1H8wR8pMp8dxJORO3SUMkKY9ptQaTsK9LxcxsHLf87HL cCBJLh3IqZNYqhh4ZSETkzCVmKtQg7niev254/rQNiDMewC7erkCLkNYSTVhtvZagJRE DegbGyIOmuyRc4aVQoJA7HxxaeWOm0eBOgsAMHZGPYILjmuv+1QqhNnzGLQrwu/o0e8/ JuJ09XBskVbHBok9DNrfiOC6eq2SCmpg4aJJOr3kZq4xchip7yeE0okM+ACSlPY6uWzf 9d7g== X-Gm-Message-State: AJaThX7Qu9faieeeea2zOOCrGAdfrjXiJoL/2+V2uCYChauoamMvRWua 7pQv6eMNVgdWkapgp25Yc7g= X-Google-Smtp-Source: AGs4zMY+jiEBmqZ2EKoDeoYt/99AZUF+AbRAG7y+zTUO5OiOGkAzVtEieN9W2XHgK7zgz2VL4YLIxA== X-Received: by 10.99.49.135 with SMTP id x129mr35075612pgx.188.1512919940349; Sun, 10 Dec 2017 07:32:20 -0800 (PST) Received: from li1588-6.members.linode.com (li1588-6.members.linode.com. [139.162.104.6]) by smtp.gmail.com with ESMTPSA id n22sm20644548pgc.4.2017.12.10.07.32.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 07:32:19 -0800 (PST) From: Yafang Shao To: davem@davemloft.net, songliubraving@fb.com, marcelo.leitner@gmail.com Cc: edumazet@google.com, xiyou.wangcong@gmail.com, mingo@redhat.com, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, rostedt@goodmis.org, bgregg@netflix.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH net-next 3/3] net:tracepoint: using sock_set_state tracepoint to trace SCTP state transition Date: Sun, 10 Dec 2017 23:31:44 +0800 Message-Id: <1512919904-14166-4-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512919904-14166-1-git-send-email-laoar.shao@gmail.com> References: <1512919904-14166-1-git-send-email-laoar.shao@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org With changes in inet_ files, SCTP state transitions are traced with sockt_set_state tracepoint. Signed-off-by: Yafang Shao --- net/sctp/endpointola.c | 2 +- net/sctp/sm_sideeffect.c | 4 ++-- net/sctp/socket.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) -- 1.8.3.1 diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index ee1e601..52d2bb3 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c @@ -232,7 +232,7 @@ void sctp_endpoint_free(struct sctp_endpoint *ep) { ep->base.dead = true; - ep->base.sk->sk_state = SCTP_SS_CLOSED; + sk_set_state(ep->base.sk, SCTP_SS_CLOSED); /* Unlink this endpoint, so we can't find it again! */ sctp_unhash_endpoint(ep); diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index df94d77..dd2d7f8 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -878,12 +878,12 @@ static void sctp_cmd_new_state(struct sctp_cmd_seq *cmds, * successfully completed a connect() call. */ if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED)) - sk->sk_state = SCTP_SS_ESTABLISHED; + sk_set_state(sk, SCTP_SS_ESTABLISHED); /* Set the RCV_SHUTDOWN flag when a SHUTDOWN is received. */ if (sctp_state(asoc, SHUTDOWN_RECEIVED) && sctp_sstate(sk, ESTABLISHED)) { - sk->sk_state = SCTP_SS_CLOSING; + sk_set_state(sk, SCTP_SS_CLOSING); sk->sk_shutdown |= RCV_SHUTDOWN; } } diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 014847e..51ebb38 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1528,7 +1528,7 @@ static void sctp_close(struct sock *sk, long timeout) lock_sock_nested(sk, SINGLE_DEPTH_NESTING); sk->sk_shutdown = SHUTDOWN_MASK; - sk->sk_state = SCTP_SS_CLOSING; + sk_set_state(sk, SCTP_SS_CLOSING); ep = sctp_sk(sk)->ep; @@ -4582,7 +4582,7 @@ static void sctp_shutdown(struct sock *sk, int how) if (how & SEND_SHUTDOWN && !list_empty(&ep->asocs)) { struct sctp_association *asoc; - sk->sk_state = SCTP_SS_CLOSING; + sk_set_state(sk, SCTP_SS_CLOSING); asoc = list_entry(ep->asocs.next, struct sctp_association, asocs); sctp_primitive_SHUTDOWN(net, asoc, NULL); @@ -7405,13 +7405,13 @@ static int sctp_listen_start(struct sock *sk, int backlog) * sockets. * */ - sk->sk_state = SCTP_SS_LISTENING; + sk_set_state(sk, SCTP_SS_LISTENING); if (!ep->base.bind_addr.port) { if (sctp_autobind(sk)) return -EAGAIN; } else { if (sctp_get_port(sk, inet_sk(sk)->inet_num)) { - sk->sk_state = SCTP_SS_CLOSED; + sk_set_state(sk, SCTP_SS_CLOSED); return -EADDRINUSE; } } @@ -7463,7 +7463,7 @@ int sctp_inet_listen(struct socket *sock, int backlog) err = 0; sctp_unhash_endpoint(ep); - sk->sk_state = SCTP_SS_CLOSED; + sk_set_state(sk, SCTP_SS_CLOSED); if (sk->sk_reuse) sctp_sk(sk)->bind_hash->fastreuse = 1; goto out; @@ -8438,10 +8438,10 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, * is called, set RCV_SHUTDOWN flag. */ if (sctp_state(assoc, CLOSED) && sctp_style(newsk, TCP)) { - newsk->sk_state = SCTP_SS_CLOSED; + sk_set_state(newsk, SCTP_SS_CLOSED); newsk->sk_shutdown |= RCV_SHUTDOWN; } else { - newsk->sk_state = SCTP_SS_ESTABLISHED; + sk_set_state(newsk, SCTP_SS_ESTABLISHED); } release_sock(newsk);