From patchwork Thu Oct 29 03:52:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1389827 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=aZtqBXGu; 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 4CMBN148xPz9sSP for ; Thu, 29 Oct 2020 14:52:17 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1659316389733; Wed, 28 Oct 2020 20:52:12 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::429; helo=mail-pf1-x429.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) (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 A265B163831A8 for ; Wed, 28 Oct 2020 20:52:09 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id y14so1212368pfp.13 for ; Wed, 28 Oct 2020 20:52:09 -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=DENneBNEL/8DjVG2ZwooFEyAWjTq/SmmdIJPAsG0PgI=; b=aZtqBXGuS0xzFwis2rakrmcxOwZC+fZBRUkzqpLKBf4Czh1/Qdaqg4aWRsN0dIW9hG 1fVCeoSiRlgyKSPTyn7/OtHZ8vfCvmQPSsTpnWBttpvy1PH08IChU0BESBxT6Avs6y57 IWreGVAp7jwirmuxAsRJpglHaSTmKQQdPPGVzIizPwtKpZT/vvT+e71YepzRazv6sfXr kZxT5AhWdubgLs6eKxn7KobKcTGRT1tJVbUq5FkKa6GsK13RWaXPDJz34/EIxT8RCM2R k7e0rUZuGeaPL/Md5d8DoUHOw7HXfwrmQPiuBPR9ulOy+xI3gV72Kj4s5H7AKFle+vKA BfIw== 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=DENneBNEL/8DjVG2ZwooFEyAWjTq/SmmdIJPAsG0PgI=; b=nWiBMK1nWVT5+4YKndVutfB7BqSEU4IbFm4B6zMZC+KnRRIoAhQs2uTXMnGJA2hpT0 hnPhR0uQ+1k+xQ9XsNipgDJU5sDCEhdwohAjoI9SFMxLl14Ur08X0rzuIgJroeQ/Dx7M 4/7/pff81Uzbal7xn5DoLkUbgzJHwEamY2pQW3Kl7IoITs/m0DMjw1jDHolTPNlpwpH5 xGpV4XNMoPNm49ZTXFlSlBGPBte8CDy1NKY8b0OCsaxOgO8b9s6oeB24HLKKZ4YP+c+m w5Jx0NOVcpsYfvoHxT5Gkyg7xDisvuvTpvePQq9VLnledmw0LCwiDVDf8hx1N0CsZWE9 RE3g== X-Gm-Message-State: AOAM531yQc4Y1O0sJkvjO1b3LYgvPUIh44eNfYkVyHd8ik/961jpIsEo DqcVW5B0BSeNgLfQfCGh1Goh0dkm01nUPQ== X-Google-Smtp-Source: ABdhPJyrYWRvGFQlj0j1ELgw0KvryvmhDkIdqG5uJISbNpOxWNVGPCR51TVnc+yVlAho1UyMxiDx2Q== X-Received: by 2002:a17:90a:8906:: with SMTP id u6mr2204442pjn.35.1603943528632; Wed, 28 Oct 2020 20:52:08 -0700 (PDT) Received: from localhost ([2400:8800:300:11c:18a:42ae:244a:91a5]) by smtp.gmail.com with ESMTPSA id j20sm1142844pfd.40.2020.10.28.20.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 20:52:07 -0700 (PDT) From: Geliang Tang To: mptcp@lists.01.org Date: Thu, 29 Oct 2020 11:52:03 +0800 Message-Id: <9b71955a98bb1d28d8c5603d007a6a22aa584082.1603943436.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Message-ID-Hash: VQS6QQVQAX7FKY7I42ZSXNRM5SVAT4LB X-Message-ID-Hash: VQS6QQVQAX7FKY7I42ZSXNRM5SVAT4LB 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 mptcp-next] mptcp: add mptcp_pm_should_add_signal_echo helper 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. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- 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 83f59a428560..75c5040e8d5d 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -198,7 +198,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 7a5c16f176c0..d29c6a4749eb 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -529,6 +529,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_add_signal_ipv6(struct mptcp_sock *msk) { return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6);