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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 6870BC4360F for ; Mon, 25 Feb 2019 21:32:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F25E21841 for ; Mon, 25 Feb 2019 21:32:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130373; bh=jqh5FIcgS/aRPo4+eTVYEVGqAYg850r13mWWe7dC9IA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fTpb07doD2ydyz7CRsYZsDYbT6h7baT4+IT9wlvWv/buJRsbU18doAktc3ddNx0E3 qgMGp37X8FmrzQLNOrnxImCgkiytT0FK68NeD8Wx5JyRvT4gJDkYx5qtbBTputBmoW QGbC78dbvyXZ2VNfikDBVXzHpxatfxu/PpL+2Gg8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732555AbfBYVcw (ORCPT ); Mon, 25 Feb 2019 16:32:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:38688 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732540AbfBYVcu (ORCPT ); Mon, 25 Feb 2019 16:32:50 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C45C321841; Mon, 25 Feb 2019 21:32:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130369; bh=jqh5FIcgS/aRPo4+eTVYEVGqAYg850r13mWWe7dC9IA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B5TUbFx2TqXvtSNoP7uitmMI1sssnF6fh103ETpUcHukMiSSQQDkZWUnD+4W47uqg 3QkryWUOgAPdKM7WLANiYqq2BUE/xMH+yxxmT7PTT/90aoO5gwnGi7znS71P1A2FNB DnMlP2FgefQc/DdhcYidK33QIt5NzQ00rNq7/qWM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yuchung Cheng , Neal Cardwell , Lawrence Brakmo , Alexei Starovoitov , Sasha Levin Subject: [PATCH 4.20 062/183] bpf: correctly set initial window on active Fast Open sender Date: Mon, 25 Feb 2019 22:10:35 +0100 Message-Id: <20190225195104.928559337@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 eb0007f30142b..fa9452406f214 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4019,7 +4019,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