From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 899FAC282C4 for ; Wed, 13 Feb 2019 02:48:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40DFA2175B for ; Wed, 13 Feb 2019 02:48:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550026096; bh=uVuE2H/hRlXdoJY9hDPQKdLcOjU9Wg7w2c1OfGL7Gp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=S8BJwcgCZuf0/iVcJx41xsogaJEnbchqneexp09RGj8vzuuzJIMSPUkN3XHDXYcf6 8Izy10Zpw9oFxXCDTSBBGFXuA5duzK9cp8Mvda52Dfz5HbQBpx2jtSUitV4/juotKn zk7XklM8hMc2pJ0HlOrqsoDYLG+yI66lDtjyy//E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389308AbfBMCsP (ORCPT ); Tue, 12 Feb 2019 21:48:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:44078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388936AbfBMCkW (ORCPT ); Tue, 12 Feb 2019 21:40:22 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 27BF9222C2; Wed, 13 Feb 2019 02:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025621; bh=uVuE2H/hRlXdoJY9hDPQKdLcOjU9Wg7w2c1OfGL7Gp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iG9dp3uIhBrifhaLB8aAwjHl3G5vYzNN73m9MaU0DJrwi4cD/fs6789eEhCbpoVjU 914JjQwFYfMxopLdsrtCLfD7S6d9gdqiQkB5RW2s3BbIGdQixokFNeWPudlZsgtDbO qzAMtFRZ8WLDD5R7rJzjw8Ushva4hYAo5vtexhx4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yuchung Cheng , Alexei Starovoitov , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 21/34] bpf: correctly set initial window on active Fast Open sender Date: Tue, 12 Feb 2019 21:39:39 -0500 Message-Id: <20190213023952.21311-21-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023952.21311-1-sashal@kernel.org> References: <20190213023952.21311-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yuchung Cheng [ Upstream commit 31aa6503a15ba00182ea6dbbf51afb63bf9e851d ] The existing BPF TCP initial congestion window (TCP_BPF_IW) does not to work on (active) Fast Open sender. This is because it changes the (initial) window only if data_segs_out is zero -- but data_segs_out is also incremented on SYN-data. This patch fixes the issue by proerly accounting for SYN-data additionally. Fixes: fc7478103c84 ("bpf: Adds support for setting initial cwnd") Signed-off-by: Yuchung Cheng Reviewed-by: Neal Cardwell Acked-by: Lawrence Brakmo Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index 542fd04bc44d..a8a9ff0568b9 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3128,7 +3128,7 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock, /* Only some options are supported */ switch (optname) { case TCP_BPF_IW: - if (val <= 0 || tp->data_segs_out > 0) + if (val <= 0 || tp->data_segs_out > tp->syn_data) ret = -EINVAL; else tp->snd_cwnd = val; -- 2.19.1