From patchwork Sun Mar 4 18:38:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Priyaranjan Jha X-Patchwork-Id: 881217 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; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="nbt5Iuq5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zvWz64kV5z9sX4 for ; Mon, 5 Mar 2018 05:39:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751990AbeCDSjL (ORCPT ); Sun, 4 Mar 2018 13:39:11 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:44371 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751791AbeCDSjJ (ORCPT ); Sun, 4 Mar 2018 13:39:09 -0500 Received: by mail-pl0-f65.google.com with SMTP id 9-v6so2930064ple.11 for ; Sun, 04 Mar 2018 10:39:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=63Gj0qJLg5D4wnxU+kr1FnVTORYTuwVcilhohFVav1g=; b=nbt5Iuq5fcD77nA6sNGdMptrB91sifv9crGegMxLxH8oece5k+5gTiDCOcHulEFY5+ jq7pgvzBVoVMa+s/rsFBexLs4eb5OsOYjUPy8bcmkRdNLDZSvgIwCnBXFVsUUZgj1sKp h7GdI+uniio/bRwicGT7dJnvx7dnbVfhqMB9zdUk6Io3m/h7inUbu/+5Gde/vUaIjf4E r58ZFS1OAzeHO5D+WOBuKuv7LncnblQyj63V+5SUQci/UGCjIGXw1pGGsTphwGMTM/xD 1tJMoykslTICQuyrdZ/4g45TeVPsKYN5/mTWDfZjTU7xs0dCdwu5E6c1jAK9dFJEMy3I AVRA== 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; bh=63Gj0qJLg5D4wnxU+kr1FnVTORYTuwVcilhohFVav1g=; b=iMZYA7KXzPRU8/Ll9RM9J3ksuxZbkAd1CFWj5/WdtJBO7L6KzwnVLtk7LFGQRN2nZW rzDYOsXKHVU9IjhaHpSNttqOiNJBsHoTx0vssCncwntw3YkURR+GCaoBASLarPACLYrM kXJ67pEoj6UAucggbAqzrn+drjVmX2hK7kXpSONPhi3MG6i3xTtfUWzAXJ2+ofr/Fewa CvEQlMIIF6mknZJsRgF4RDuIfSr+av9etpsHKba5UCHW7taCebtC38iF4kBYgTxVntTF xYE9pA/JmTLiETklVtMzumpvU1VyyxqIxKyWlhjh4UQOYZiTrEouviz226dII3LA60Js OvxQ== X-Gm-Message-State: APf1xPDOitaVvBdbUjnNeMRGAi4A4rGfwWF4nmjUvx4dwx0BHvWIheaH 45cj8HZGuh8ffYp1FD+N5+rJ2gbU/AU= X-Google-Smtp-Source: AG47ELtMUUAAEtpicLHz5epRmw8+WCed9Oog7bekyLsVUtwQpyEfi603z3XiPX2TXWyQJRFgTJkoAg== X-Received: by 2002:a17:902:6116:: with SMTP id t22-v6mr10786988plj.307.1520188748423; Sun, 04 Mar 2018 10:39:08 -0800 (PST) Received: from priyarjha.svl.corp.google.com ([2620:15c:2c4:201:2f3a:16d1:85cd:2af]) by smtp.gmail.com with ESMTPSA id r30sm22284471pff.7.2018.03.04.10.39.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Mar 2018 10:39:07 -0800 (PST) From: Priyaranjan Jha To: David Miller Cc: netdev@vger.kernel.org, Priyaranjan Jha , Neal Cardwell , Yuchung Cheng , Soheil Hassas Yeganeh Subject: [PATCH net-next 1/2] tcp: add send queue size stat in SCM_TIMESTAMPING_OPT_STATS Date: Sun, 4 Mar 2018 10:38:35 -0800 Message-Id: <20180304183836.156268-1-priyarjha@google.com> X-Mailer: git-send-email 2.16.2.395.g2e18187dfd-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds TCP_NLA_SENDQ_SIZE stat into SCM_TIMESTAMPING_OPT_STATS. It reports no. of bytes present in send queue, when timestamp is generated. Signed-off-by: Priyaranjan Jha Signed-off-by: Neal Cardwell Signed-off-by: Yuchung Cheng Signed-off-by: Soheil Hassas Yeganeh --- include/uapi/linux/tcp.h | 1 + net/ipv4/tcp.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index b4a4f64635fa..93bad2128ef6 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -241,6 +241,7 @@ enum { TCP_NLA_MIN_RTT, /* minimum RTT */ TCP_NLA_RECUR_RETRANS, /* Recurring retransmits for the current pkt */ TCP_NLA_DELIVERY_RATE_APP_LMT, /* delivery rate application limited ? */ + TCP_NLA_SNDQ_SIZE, /* Data (bytes) pending in send queue */ }; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index a33539798bf6..162ba4227446 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3031,7 +3031,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) u32 rate; stats = alloc_skb(7 * nla_total_size_64bit(sizeof(u64)) + - 3 * nla_total_size(sizeof(u32)) + + 4 * nla_total_size(sizeof(u32)) + 2 * nla_total_size(sizeof(u8)), GFP_ATOMIC); if (!stats) return NULL; @@ -3061,6 +3061,8 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) nla_put_u8(stats, TCP_NLA_RECUR_RETRANS, inet_csk(sk)->icsk_retransmits); nla_put_u8(stats, TCP_NLA_DELIVERY_RATE_APP_LMT, !!tp->rate_app_limited); + + nla_put_u32(stats, TCP_NLA_SNDQ_SIZE, tp->write_seq - tp->snd_una); return stats; }