Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Song Liu <songliubraving@fb.com>
To:     Yafang Shao <laoar.shao@gmail.com>
CC:     "davem@davemloft.net" <davem@davemloft.net>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 net-next] tcp: use data length instead of skb->len in
 tcp_probe
Thread-Topic: [PATCH v2 net-next] tcp: use data length instead of skb->len in
 tcp_probe
Thread-Index: AQHT9BEzdsZVRYb1gUyc62SrUQVIhqRA/wqA
Date:   Fri, 25 May 2018 21:59:02 +0000
Message-ID: <CBE161A9-5116-4866-BC89-CFF6B2509E0C@fb.com>
References: <1527243245-29582-1-git-send-email-laoar.shao@gmail.com>
In-Reply-To: <1527243245-29582-1-git-send-email-laoar.shao@gmail.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: fb.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-ID: <C3D8E0BD2A29FD46A8A6F3F5377544FC@namprd15.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 79eaa413-15ce-4c38-84ba-08d5c28aba20
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 May 2018 21:59:02.4886
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1214
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-05-25_08:,,
 signatures=0
X-Proofpoint-Spam-Reason: safe
X-FB-Internal: Safe
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On May 25, 2018, at 3:14 AM, Yafang Shao <laoar.shao@gmail.com> wrote:
>=20
> skb->len is meaningless to user.
> data length could be more helpful, with which we can easily filter out
> the packet without payload.
>=20
> Signed-off-by: Yafang Shao <laoar.shao@gmail.com>

Acked-by: Song Liu <songliubraving@fb.com>


> ---
> include/trace/events/tcp.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>=20
> diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
> index c1a5284..703abb6 100644
> --- a/include/trace/events/tcp.h
> +++ b/include/trace/events/tcp.h
> @@ -236,7 +236,7 @@
> 		__field(__u16, sport)
> 		__field(__u16, dport)
> 		__field(__u32, mark)
> -		__field(__u16, length)
> +		__field(__u16, data_len)
> 		__field(__u32, snd_nxt)
> 		__field(__u32, snd_una)
> 		__field(__u32, snd_cwnd)
> @@ -261,7 +261,7 @@
> 		__entry->dport =3D ntohs(inet->inet_dport);
> 		__entry->mark =3D skb->mark;
>=20
> -		__entry->length =3D skb->len;
> +		__entry->data_len =3D skb->len - tcp_hdrlen(skb);
> 		__entry->snd_nxt =3D tp->snd_nxt;
> 		__entry->snd_una =3D tp->snd_una;
> 		__entry->snd_cwnd =3D tp->snd_cwnd;
> @@ -272,9 +272,9 @@
> 		__entry->sock_cookie =3D sock_gen_cookie(sk);
> 	),
>=20
> -	TP_printk("src=3D%pISpc dest=3D%pISpc mark=3D%#x length=3D%d snd_nxt=3D=
%#x snd_una=3D%#x snd_cwnd=3D%u ssthresh=3D%u snd_wnd=3D%u srtt=3D%u rcv_wn=
d=3D%u sock_cookie=3D%llx",
> +	TP_printk("src=3D%pISpc dest=3D%pISpc mark=3D%#x data_len=3D%d snd_nxt=
=3D%#x snd_una=3D%#x snd_cwnd=3D%u ssthresh=3D%u snd_wnd=3D%u srtt=3D%u rcv=
_wnd=3D%u sock_cookie=3D%llx",
> 		  __entry->saddr, __entry->daddr, __entry->mark,
> -		  __entry->length, __entry->snd_nxt, __entry->snd_una,
> +		  __entry->data_len, __entry->snd_nxt, __entry->snd_una,
> 		  __entry->snd_cwnd, __entry->ssthresh, __entry->snd_wnd,
> 		  __entry->srtt, __entry->rcv_wnd, __entry->sock_cookie)
> );
> --=20
> 1.8.3.1
>=20