From patchwork Fri Oct 30 03:00:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1390711 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=vgykbvNO; 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 4CMnBY5n9bz9sSn for ; Fri, 30 Oct 2020 14:01:09 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id AD02716560DA8; Thu, 29 Oct 2020 20:01:04 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::542; helo=mail-pg1-x542.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (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 4B51016542DD7 for ; Thu, 29 Oct 2020 20:01:03 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id r10so3972383pgb.10 for ; Thu, 29 Oct 2020 20:01:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HQCOTDq8nO5MisRPxxmFWaB6ub4dkL2BZBEwPwxen7k=; b=vgykbvNOZJEml3UwemTqgnj7CgAS8IoK1+FbmOfM7e24mbmzuk7uc1Mw0rNpkyOeZ3 jrDC3DFNrZ9YUshb2M+p2r9fy0fPJN6Fy5bSGE4+ML0IkyUS/1TirwO9lQ8M9otqyqef RukIALWzboEoSgCVlkbz/ReoRHyktreh/w9hxVdT4bhZ9+g0KGUnpfLjorsBfahpScaB YkIpF4Qq4Bpz+TIdIklW8T+tZnmBfSju/tI3SlApHti0D0/88HHC2ezhnFk4RkkuDLU0 ng24Mt8ZNKQUYsoqkt6N5R5qXk/yVHr1MOv+gJ9B12VJomu4PAH0B98MVolhkpScLfLD Zz9A== 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:mime-version :content-transfer-encoding; bh=HQCOTDq8nO5MisRPxxmFWaB6ub4dkL2BZBEwPwxen7k=; b=BddjIltSiGiy0vyW9/6CdIGTv1gP59g80kbP8L95kbWejz5coLvYqVafebkYzf/l6J 4gTmGcSPHiI1j6TuxfIEHC4DqPPRkbmtLJnkFuIjEmV4QoPlpY2R7+a8J3wydBdCLVP1 GXtuTMZNeM9skCu3ZqvAEB4FLbeujn/ULeD78xFHmvllsCmM5Garh/ZwGT7FKHb3JvZ6 MjcR5EU5dOxH2WwvPaa47I5cEbWY7iuWkhd32B0S9oo1LUGBeo4+orDG6FBL7BdvNK5h mqHpIO7PGkzPNHUuMD9k3nP8Wn7ZQbmuZQtnNFiJXBqvMXu/6wsMCqBbq3oa9sOgadsN QXoA== X-Gm-Message-State: AOAM533x4dJwYWXaim3bMhshoCV8cgv+JspMu7146JTDQ2ageZgVoviE 4wk8v3qQK8q6hRobXsuihixfzV5gBDUVQw== X-Google-Smtp-Source: ABdhPJw+lwHTNZ3RiScjTuy75Ww1eQX+GvomMvpskHxxfdiuk/sLIT1stG1BrrULtqEYe9tV0HiDVQ== X-Received: by 2002:a17:90a:ab8b:: with SMTP id n11mr246086pjq.162.1604026861714; Thu, 29 Oct 2020 20:01:01 -0700 (PDT) Received: from localhost ([2400:8800:300:11c:18a:42ae:244a:91a5]) by smtp.gmail.com with ESMTPSA id 14sm1193026pjn.48.2020.10.29.20.00.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 20:01:00 -0700 (PDT) From: Geliang Tang To: mptcp@lists.01.org Date: Fri, 30 Oct 2020 11:00:55 +0800 Message-Id: <2e843951407af41605d55c56e4b55009b873e154.1604025904.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Message-ID-Hash: 3L4QT5DF4ZTUG7ERXNX3UQ75EXRWPGWR X-Message-ID-Hash: 3L4QT5DF4ZTUG7ERXNX3UQ75EXRWPGWR X-MailFrom: geliangtang@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Geliang Tang X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [MPTCP][PATCH v2 mptcp-next] Squash to "mptcp: change add_addr_signal type" List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This patch added a new helper mptcp_pm_should_add_signal_echo. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- v2: - make it as a squash-to patch. - change 'Subject' from 'mptcp: add mptcp_pm_should_add_signal_echo helper' to 'Squash to "mptcp: change add_addr_signal type"' This patch will conflict with 'mptcp: send out dedicated ADD_ADDR packet': """ <<<<<<< HEAD static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk) { return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); ======= static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk) { return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6); >>>>>>> 20761fc28b53... mptcp: send out dedicated ADD_ADDR packet } """ Please resolve the conflict like this: """ static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk) { return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); } static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk) { return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6); } """ --- net/mptcp/pm.c | 2 +- net/mptcp/protocol.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index bc6619670d37..c2c12f02a263 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -186,7 +186,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, if (!mptcp_pm_should_add_signal(msk)) goto out_unlock; - *echo = READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); + *echo = mptcp_pm_should_add_signal_echo(msk); if (remaining < mptcp_add_addr_len(msk->pm.local.family, *echo)) goto out_unlock; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 977e74dc45eb..77eae8addc91 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -524,6 +524,11 @@ static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk) return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_SIGNAL); } +static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk) +{ + return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO); +} + static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk) { return READ_ONCE(msk->pm.rm_addr_signal);