From patchwork Fri Nov 20 10:06:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1403573 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=198.145.21.10; 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=JWvZdu4Q; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (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 4CcsfJ4sXFz9sT6 for ; Fri, 20 Nov 2020 21:07:04 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3FD9A100EBBBA; Fri, 20 Nov 2020 02:07:02 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (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 24154100EC1FB for ; Fri, 20 Nov 2020 02:07:00 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id t18so4637267plo.0 for ; Fri, 20 Nov 2020 02:07:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FR4efg1IPUIGHiF/WD1Mt+ru2vN95dk0eE99erTmXkA=; b=JWvZdu4QALWzEmwF0XejQZ2D35BdMX4n3gBfz0ESpHUwbEVbC369ZnIoBRlHIgRc6e c3D7jpxzD9RvWgFedvVdDa+ZSLH9rOvLrVff4MecTPmgq02iOb121ax7jUHCp3VVr3Bb vPNZXm9DHXAPGhiKc47hhNKt297pyZjmmm2BLNskHCtOKUTsDSC9B1Ro4N8yPo7QBTNN UtvGKdoWsfqyycJZODyHS0w2IQBRggDt8PpB/xOl40A1KKyADncmzrhSbZDM86IgMHlY loh0lrZBHJIXSYoHC/lb6qeHtIBj/OzrotstgY5e5vvXo2PyJ2lzxva2H9SRE6oHvGRv iyVw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=FR4efg1IPUIGHiF/WD1Mt+ru2vN95dk0eE99erTmXkA=; b=H2IRJQMru8qRGq5la9Ln7j6j8cHLxnyxqFuElzzsNtasW6GOGp0SkGNXy+CXRxUeXg nzLYKb6mW6djpTd35JJusskAojGuunAVOmNijSOO4+tLDIWz8HhYSUmj3aI91Z9McXYk jKAsFTNNcbqGSJ/81mlSfsDHakvWgLNWMG1/07vtRtliY3+rpqK9ZBBrrJk1Gu+jcNlf bvwScyvnF3HbCCak3cFvvtUaq3ybL3Rm+2HZlDTsOwSTLJF+ttwNovT4KhLoQB4Q7ld9 9SVdKa/i1iDDeCUotmvIx9CgELzSRNC9vkKdepsisZw6c+Kv9GlCik3yqSccGGmWW3cD 6B5Q== X-Gm-Message-State: AOAM533w9Ty9xbnpvbHsaLc4QaA6m1Jy+Oq6Iu7HF2CA3k2W/Fr+rpxF SL5BlCcDS/xfj1LF8Wxd/+OGw9oYd4DQYQ== X-Google-Smtp-Source: ABdhPJzV+9xrUuYxsjQaSjh7mJGSL+BdBjdhXYHdjg40yqeclG3izFD0rx12G8b9U7FMsWO7xPXHwQ== X-Received: by 2002:a17:902:8a8c:b029:d8:c4bb:e427 with SMTP id p12-20020a1709028a8cb02900d8c4bbe427mr12773108plo.23.1605866819389; Fri, 20 Nov 2020 02:06:59 -0800 (PST) Received: from localhost ([2400:8800:300:11c:159b:910c:dcdb:922b]) by smtp.gmail.com with ESMTPSA id a23sm2587269pgv.35.2020.11.20.02.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 02:06:58 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Fri, 20 Nov 2020 18:06:46 +0800 Message-Id: <5082347bf6a6974609bc411598480aceb9871320.1605866519.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <3d9cfa584f992f387bf4722693f4edfc79b9f6af.1605866519.git.geliangtang@gmail.com> References: <3d9cfa584f992f387bf4722693f4edfc79b9f6af.1605866519.git.geliangtang@gmail.com> MIME-Version: 1.0 Message-ID-Hash: N6P3H7YK6ZWJUIBGS5LSEDAM6PGFKGUP X-Message-ID-Hash: N6P3H7YK6ZWJUIBGS5LSEDAM6PGFKGUP 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 v4 mptcp-next 2/2] mptcp: rename add_addr_signal and mptcp_add_addr_status List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Since the RM_ADDR signal had been reused with add_addr_signal, it's not suitable to call it add_addr_signal or mptcp_add_addr_status. So this patch renamed add_addr_signal to addr_signal, and renamed mptcp_add_addr_status to mptcp_addr_signal_status. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 14 +++++++------- net/mptcp/pm_netlink.c | 4 ++-- net/mptcp/protocol.h | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 09d6e736161d..9256bd5d02ed 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -16,7 +16,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool echo, bool port) { - u8 add_addr = READ_ONCE(msk->pm.add_addr_signal); + u8 add_addr = READ_ONCE(msk->pm.addr_signal); pr_debug("msk=%p, local_id=%d", msk, addr->id); @@ -33,13 +33,13 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, add_addr |= BIT(MPTCP_ADD_ADDR_IPV6); if (port) add_addr |= BIT(MPTCP_ADD_ADDR_PORT); - WRITE_ONCE(msk->pm.add_addr_signal, add_addr); + WRITE_ONCE(msk->pm.addr_signal, add_addr); return 0; } int mptcp_pm_remove_addr(struct mptcp_sock *msk, u8 local_id) { - u8 rm_addr = READ_ONCE(msk->pm.add_addr_signal); + u8 rm_addr = READ_ONCE(msk->pm.addr_signal); pr_debug("msk=%p, local_id=%d", msk, local_id); @@ -50,7 +50,7 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, u8 local_id) msk->pm.rm_id = local_id; rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL); - WRITE_ONCE(msk->pm.add_addr_signal, rm_addr); + WRITE_ONCE(msk->pm.addr_signal, rm_addr); return 0; } @@ -221,7 +221,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, goto out_unlock; *saddr = msk->pm.local; - WRITE_ONCE(msk->pm.add_addr_signal, 0); + WRITE_ONCE(msk->pm.addr_signal, 0); ret = true; out_unlock: @@ -244,7 +244,7 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, goto out_unlock; *rm_id = msk->pm.rm_id; - WRITE_ONCE(msk->pm.add_addr_signal, 0); + WRITE_ONCE(msk->pm.addr_signal, 0); ret = true; out_unlock: @@ -265,7 +265,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) msk->pm.subflows = 0; msk->pm.rm_id = 0; WRITE_ONCE(msk->pm.work_pending, false); - WRITE_ONCE(msk->pm.add_addr_signal, 0); + WRITE_ONCE(msk->pm.addr_signal, 0); WRITE_ONCE(msk->pm.accept_addr, false); WRITE_ONCE(msk->pm.accept_subflow, false); msk->pm.status = 0; diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index bb01b0f3e131..0e7c8a64604f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -504,12 +504,12 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) release_sock(ssk); spin_lock_bh(&msk->pm.lock); - add_addr = READ_ONCE(msk->pm.add_addr_signal); + add_addr = READ_ONCE(msk->pm.addr_signal); if (mptcp_pm_should_add_signal_ipv6(msk)) add_addr &= ~BIT(MPTCP_ADD_ADDR_IPV6); if (mptcp_pm_should_add_signal_port(msk)) add_addr &= ~BIT(MPTCP_ADD_ADDR_PORT); - WRITE_ONCE(msk->pm.add_addr_signal, add_addr); + WRITE_ONCE(msk->pm.addr_signal, add_addr); } } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index e14d21609c61..737c7c30eadd 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -169,7 +169,7 @@ enum mptcp_pm_status { MPTCP_PM_SUBFLOW_ESTABLISHED, }; -enum mptcp_add_addr_status { +enum mptcp_addr_signal_status { MPTCP_ADD_ADDR_SIGNAL, MPTCP_ADD_ADDR_ECHO, MPTCP_ADD_ADDR_IPV6, @@ -184,7 +184,7 @@ struct mptcp_pm_data { spinlock_t lock; /*protects the whole PM data */ - u8 add_addr_signal; + u8 addr_signal; bool server_side; bool work_pending; bool accept_addr; @@ -570,27 +570,27 @@ struct socket *mptcp_pm_get_listen_socket(struct mptcp_sock *msk); 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); + return READ_ONCE(msk->pm.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); + return READ_ONCE(msk->pm.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); + return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6); } static inline bool mptcp_pm_should_add_signal_port(struct mptcp_sock *msk) { - return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_ADD_ADDR_PORT); + return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_PORT); } static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk) { - return READ_ONCE(msk->pm.add_addr_signal) & BIT(MPTCP_RM_ADDR_SIGNAL); + return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_RM_ADDR_SIGNAL); } static inline unsigned int mptcp_add_addr_len(int family, bool echo, bool port)