From patchwork Fri Dec 15 17:56:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 849329 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="CEE598m2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yyyng3WV7z9t34 for ; Sat, 16 Dec 2017 04:57:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756159AbdLOR5l (ORCPT ); Fri, 15 Dec 2017 12:57:41 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:38909 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755864AbdLOR5i (ORCPT ); Fri, 15 Dec 2017 12:57:38 -0500 Received: by mail-pg0-f67.google.com with SMTP id f12so6274106pgo.5; Fri, 15 Dec 2017 09:57:38 -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=qkRK1DDwa6k/o9l2u/KVLFvTZnB+dq73BSYvrRA+uew=; b=CEE598m2kKOLtPltDrVDcaD2iCXlMO2P33d+X0m5EekEwsYA/JchCe1gdB011u+Rkw d/3T98r04q/sMsDrFuOzqmZNOpq1EgyfgvUhLlcTgnMM2YVG+kASpZrr+qZiLsMNB7IY 3irvvAZHAd3HFUza5pyp62lK7QqRgyj4b8yilGxcoWxasNHjV7Rxuimg4pR+HqvEvOyc 1Uj1L3Y0Pq/idy5PeN639tbxenAvEEjVysGbDgAdak1q7Siz/8PowSzuL2V+BVlU038p VWknD6JeVLqGrnlK40dBwHUYEwywi4KvxOvvLif2XH0i6w4W53AE894fkxw78iwjXZxz 6VLw== 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=qkRK1DDwa6k/o9l2u/KVLFvTZnB+dq73BSYvrRA+uew=; b=qhOItA3VpgBnvybUL3UB2bXAUkmkaA40CpqBo1KNPNcJPKmchlKGVd6JULhF5gNxWv 0SrZUd+i59+7L8pYUqo4vXnUYF2/5bUXIV1bTdgBxpn1DD/qFJlMfWG8O08fGRv9adn5 z6YrHQTIkuJ4unmOJ4IL4wT2OnjgkklAer+XFMMvN05jm2PI0serJLKUlBW8bWHXIeZ9 o6ElC5RXjPVqmgxdf/hYiGyU4VHbX92oZ/1XuNvy2cheb1Us1GcbW7wedLWVI3NeGbnv wjDiZDCQROG1zDSzVkn8eeCy+a06QQkKNdVwN2s0SycEOHyujdL7WNRygmj/1lCrg/24 uHGA== X-Gm-Message-State: AKGB3mIOamT44oDqnGVqZaznq35lnLG9iuMVrSn9XKoVQR9bnmzaHnEu yHODeCqVb649/xcMjs6CV70= X-Google-Smtp-Source: ACJfBovoRS9C+6hhKIKB3zHUlRTEN1jf4lXH3X2Ghp8byy03ElpTdB8wFGFcAWUH7HbDi5fK6/o0rA== X-Received: by 10.101.101.12 with SMTP id x12mr12713001pgv.420.1513360657896; Fri, 15 Dec 2017 09:57:37 -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 u68sm13242329pfu.17.2017.12.15.09.57.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Dec 2017 09:57:37 -0800 (PST) From: Yafang Shao To: songliubraving@fb.com, davem@davemloft.net, marcelo.leitner@gmail.com, rostedt@goodmis.org Cc: bgregg@netflix.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH v2 net-next 4/4] net: tracepoint: using sock_set_state tracepoint to trace SCTP state transition Date: Sat, 16 Dec 2017 01:56:51 +0800 Message-Id: <1513360611-11392-5-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513360611-11392-1-git-send-email-laoar.shao@gmail.com> References: <1513360611-11392-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 | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) -- 1.8.3.1 diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index ee1e601..5e129df 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 8adde71..22ab3b4 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 7eec0a0..ecb532c 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1544,7 +1544,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; @@ -4653,7 +4653,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); @@ -7509,13 +7509,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; } } @@ -8538,10 +8538,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);