From patchwork Fri Dec 6 16:13:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 1205182 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tessares.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=tessares-net.20150623.gappssmtp.com header.i=@tessares-net.20150623.gappssmtp.com header.b="F44OGtgQ"; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47TyM02CfYz9sRG for ; Sat, 7 Dec 2019 03:13:47 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A1BBE1011351A; Fri, 6 Dec 2019 08:17:07 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::343; helo=mail-wm1-x343.google.com; envelope-from=matthieu.baerts@tessares.net; receiver= Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A5248100EA549 for ; Fri, 6 Dec 2019 08:17:04 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id p9so8380532wmc.2 for ; Fri, 06 Dec 2019 08:13:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20150623.gappssmtp.com; s=20150623; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=7lU2OZFNsJ2o70zSH0eXczKTb+PNEUQaYVaWGrWka2o=; b=F44OGtgQkTtDzdmExO8k2SWCOK3cW+toZGt9E6Gm4JAg9n7hyEoUZXoIppUUMD1Z20 +hDOK6blMEniKUcZBF8Ldt5VyzSzATLcttSzDmQFxoDaHB1IXeNDABL9XiQQeKB7hLex xa2oWX18VJ8c8j9hM9KBoOzIMURV8DigSx11NECJhhTZY1G/YB8HXpaLoabnAOchcg3B dzfdoFm7BKS127dM8sCuJIACItw9tPufOT11xRXAKuX5W05Tk1LDYDp8MGVtmkAYUaSJ GTvQPtB9OupZrc6DGk1xrOlQnj/KNTO3pfYRvRtCRO2gT870X7EnkgurTJVo5IOBWhxQ +VTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=7lU2OZFNsJ2o70zSH0eXczKTb+PNEUQaYVaWGrWka2o=; b=KuZ5IO7BfBT8Y7vuJwgX84OEtYJqGe3YAOCDjptL3n6/bfYRB7AzZsCj8Tz5cpk0oK lkzAp76ZkM1Irxx/RRbxVJHwM6ElU4FU9JphhVFBmNIUxKG9le1PU4QgcmKspYCBdXvv 48ICBRsZmqOcfGaIY68MfK7P4mErJ8e1ZFsNPWtYJTlsEBpoSWUOee4ufIhiXlMY/i92 ns9ZDCucTugtO11shIhJCVbWu1dgFfgB7if5CovuyO//iZ65GI6HY91FHMdcROoE/6JK Nopdym3C+918RepL6cB78uhKbhqAelGbbji8LDQT6s/zDRH+7yys9E26FLAHT/ynAV1y WRuw== X-Gm-Message-State: APjAAAWsD7eUWGACqX6Eoj/A9vQ0PNVm+CoT11zT2Lp4dHbwK9bQ42Qx jm2r+6ISRttbWQifWyi6c3164iXOf664Nw== X-Google-Smtp-Source: APXvYqwA49iPYTn4iEjq0dSI7RZ/OyQEhEBfh5dWuh7btESF9mVrKdwtsQU67Ri+uwg/N3bi/+BAbw== X-Received: by 2002:a1c:e909:: with SMTP id q9mr11831038wmc.30.1575648820379; Fri, 06 Dec 2019 08:13:40 -0800 (PST) Received: from tsr-lap-08.nix.tessares.net (hag0-main.tessares.net. [87.98.252.165]) by smtp.gmail.com with ESMTPSA id j184sm3827183wmb.44.2019.12.06.08.13.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Dec 2019 08:13:39 -0800 (PST) To: Peter Krystad , Davide Caratti , pabeni@redhat.com, cpaasch@apple.com References: <3879c4d2c681483d5549f4662b058d69bcd402e3.camel@linux.intel.com> From: Matthieu Baerts Message-ID: Date: Fri, 6 Dec 2019 17:13:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <3879c4d2c681483d5549f4662b058d69bcd402e3.camel@linux.intel.com> Content-Language: en-US Message-ID-Hash: FX7EMLKVKKF5PZOOTL4R4SGE62TLTLSL X-Message-ID-Hash: FX7EMLKVKKF5PZOOTL4R4SGE62TLTLSL X-MailFrom: matthieu.baerts@tessares.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: mptcp@lists.01.org X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] Re: [PATCH v4] mptcp: fix option length of mp_capable syn/ack List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Hi Davide, Peter, On 05/12/2019 19:14, Peter Krystad wrote: > > Looks good. Thank you for the new version and the review! - 40c5aac59cf7: "squashed" part 1 in "mptcp: Handle MPTCP TCP options" - 29710f885028: "Signed-off-by" + "Co-developed-by" - 36e93ae12137: "squashed" part 2 in "mptcp: Create SUBFLOW socket for incoming connections" - cab89c119b1c: conflict in t/mptcp-parse-and-emit-MP_CAPABLE-option-according-to-v1-spec - in this commit, for mptcp_synack_options(), only this change was left over: === } === I then undo this change. That's also the only change we can see as a result (as expected): 7e9aa2a662bf..7c57362bfddb Tests and re-creation of the 'export' branch is in progress. Cheers, Matt diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 701b6243c377..da94c263197a 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -476,7 +476,7 @@ bool mptcp_synack_options(const struct request_sock *req, unsigned int *size, opts->suboptions = OPTION_MPTCP_MPC_SYNACK; opts->sndr_key = subflow_req->local_key; *size = TCPOLEN_MPTCP_MPC_SYNACK; - pr_debug("subflow_req=%p, local_key=%llu", + pr_debug("req=%p, local_key=%llu", subflow_req, subflow_req->local_key); return true;