From patchwork Wed Mar 3 13:13:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1446635 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com 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; 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=mB3Dn/AJ; 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 4DrDw24Cprz9sPf for ; Thu, 4 Mar 2021 00:13:37 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3DB53100EB333; Wed, 3 Mar 2021 05:13:35 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::62e; helo=mail-pl1-x62e.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (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 F1B0B100EB332 for ; Wed, 3 Mar 2021 05:13:31 -0800 (PST) Received: by mail-pl1-x62e.google.com with SMTP id p5so14024928plo.4 for ; Wed, 03 Mar 2021 05:13:31 -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=cKmKdUL9WFpzf7z0QgxF9eAqCqqeV8ytl4yvIzPWVrU=; b=mB3Dn/AJz4vnXbVyPZ71l6XQRZf7C/I8eDaQgsDKd/S/5AGGzi4kMZWCuXtsRPTwo9 1fdyNgkfhn4a9E8/NE0i14AqpkyHpjiwsPFRgE0MzoYsGjs5zMjItx4AreLDygJPmj/L vcns2Eoz5L/cCvN0CRYFgcgUO7HjUwidYIRDqBfLIEw5Jjj4Zv4nBpNvyoL14A8IFLcb 6I82XB2sjHU4py3nkNZmWpyIVV1HpWSTrTEy/84mg77Ne7Tzz8o1pyE2+HAyWbihlD0q 3lqMKdyCX7YY9bhpEj3FidK3uJ1zJNsrJV/QRt0IDGMycTZ9y8og37GanQNwq5IWcbUb 8hjg== 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=cKmKdUL9WFpzf7z0QgxF9eAqCqqeV8ytl4yvIzPWVrU=; b=LEQUtenjhI9J+jhIUSfX1Zp0CSHu4oE5h3oqFTXTIyVkIZZ8IhVROemYF+uG7Tys9J UNEfQtUpz9ktNGOxbOs5DbsagQ3BqP2VunthE6IPRTmWYdSTZUMZNrvdRSmRD3b6qZj3 nKbPxXf6j58zYyRMkL56frMVVlnXWZv2GEBCL04bPJENUhRpu5NKsKBLLDR49GaDuk8O CPD0sabP5575mlagslOdiuCjXzBbhk3ByMxWNNopw49WLqMG3/0dEfjP2XoSmoKonCXj z5roXdCc9LyUKqWbT6ean+UASEOfrMpL8qwxhX4LF93gcMsKqIXWKKfmph176uQB23PP g3jw== X-Gm-Message-State: AOAM531lqjfhiEeySsuJMZOF6lEedZeSbpF7MtGR1Dob2MuGiFcAPqGF sTvKkYlU/vgx10MCJCe3aBDjfciuGlaklA== X-Google-Smtp-Source: ABdhPJz9wO/3wFBgBEZgLTk/MsaJmifN1vVVdSC5EOkupQmLtviyjDIiOs4xsgwAWNTQFGvD/8fLtA== X-Received: by 2002:a17:902:9304:b029:e4:12f4:bdb0 with SMTP id bc4-20020a1709029304b02900e412f4bdb0mr2749562plb.55.1614777210794; Wed, 03 Mar 2021 05:13:30 -0800 (PST) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id i7sm6740757pjs.1.2021.03.03.05.13.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 05:13:30 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Wed, 3 Mar 2021 21:13:16 +0800 Message-Id: <3e2dc12697da18322648e21f245c0072871c1acd.1614776769.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: ZHXX3DMML42XRRTJL4C3HG3JO74ZCTKS X-Message-ID-Hash: ZHXX3DMML42XRRTJL4C3HG3JO74ZCTKS 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 v5 mptcp-next 1/5] mptcp: avoid passing rm_list as a struct List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This patch changed the type of argument rm_list from "struct mptcp_rm_list rm_list" to "const struct mptcp_rm_list *rm_list". Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang --- net/mptcp/options.c | 4 ++-- net/mptcp/pm.c | 23 ++++++++++++----------- net/mptcp/pm_netlink.c | 21 +++++++++++---------- net/mptcp/protocol.h | 16 +++++++++------- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index f95643d820fe..9600b4f4caa5 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -698,7 +698,7 @@ static bool mptcp_established_options_rm_addr(struct sock *sk, !(mptcp_pm_rm_addr_signal(msk, remaining, &rm_list))) return false; - len = mptcp_rm_addr_len(rm_list); + len = mptcp_rm_addr_len(&rm_list); if (len < 0) return false; if (remaining < len) @@ -1076,7 +1076,7 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) } if (mp_opt.rm_addr) { - mptcp_pm_rm_addr_received(msk, mp_opt.rm_list); + mptcp_pm_rm_addr_received(msk, &mp_opt.rm_list); mp_opt.rm_addr = 0; } diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 51534bed5dbe..966942d1013f 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -39,26 +39,26 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, return 0; } -int mptcp_pm_remove_addr(struct mptcp_sock *msk, struct mptcp_rm_list rm_list) +int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list) { u8 rm_addr = READ_ONCE(msk->pm.addr_signal); - pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list.nr); + pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list->nr); if (rm_addr) { pr_warn("addr_signal error, rm_addr=%d", rm_addr); return -EINVAL; } - msk->pm.rm_list_tx = rm_list; + msk->pm.rm_list_tx = *rm_list; rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL); WRITE_ONCE(msk->pm.addr_signal, rm_addr); return 0; } -int mptcp_pm_remove_subflow(struct mptcp_sock *msk, struct mptcp_rm_list rm_list) +int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list) { - pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list.nr); + pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list->nr); spin_lock_bh(&msk->pm.lock); mptcp_pm_nl_rm_subflow_received(msk, rm_list); @@ -219,19 +219,20 @@ void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk) mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_SEND_ACK); } -void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_list) +void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list) { struct mptcp_pm_data *pm = &msk->pm; u8 i; - pr_debug("msk=%p remote_ids_nr=%d", msk, rm_list.nr); + pr_debug("msk=%p remote_ids_nr=%d", msk, rm_list->nr); - for (i = 0; i < rm_list.nr; i++) - mptcp_event_addr_removed(msk, rm_list.ids[i]); + for (i = 0; i < rm_list->nr; i++) + mptcp_event_addr_removed(msk, rm_list->ids[i]); spin_lock_bh(&pm->lock); mptcp_pm_schedule_work(msk, MPTCP_PM_RM_ADDR_RECEIVED); - pm->rm_list_rx = rm_list; + pm->rm_list_rx = *rm_list; spin_unlock_bh(&pm->lock); } @@ -284,7 +285,7 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, if (!mptcp_pm_should_rm_signal(msk)) goto out_unlock; - len = mptcp_rm_addr_len(msk->pm.rm_list_tx); + len = mptcp_rm_addr_len(&msk->pm.rm_list_tx); if (len < 0) { WRITE_ONCE(msk->pm.addr_signal, 0); goto out_unlock; diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 328fdcc35bfd..fa1dd6b8ec2f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -668,31 +668,32 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk) spin_unlock_bh(&msk->pm.lock); } -void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_list) +void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list) { struct mptcp_subflow_context *subflow, *tmp; struct sock *sk = (struct sock *)msk; u8 i; - pr_debug("subflow rm_list_nr %d", rm_list.nr); + pr_debug("subflow rm_list_nr %d", rm_list->nr); msk_owned_by_me(msk); - if (!rm_list.nr) + if (!rm_list->nr) return; if (list_empty(&msk->conn_list)) return; - for (i = 0; i < rm_list.nr; i++) { + for (i = 0; i < rm_list->nr; i++) { list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) { struct sock *ssk = mptcp_subflow_tcp_sock(subflow); int how = RCV_SHUTDOWN | SEND_SHUTDOWN; - if (rm_list.ids[i] != subflow->local_id) + if (rm_list->ids[i] != subflow->local_id) continue; - pr_debug(" -> subflow rm_list_ids[%d]=%u", i, rm_list.ids[i]); + pr_debug(" -> subflow rm_list_ids[%d]=%u", i, rm_list->ids[i]); spin_unlock_bh(&msk->pm.lock); mptcp_subflow_shutdown(sk, ssk, how); mptcp_close_ssk(sk, ssk, subflow); @@ -1110,7 +1111,7 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, ret = remove_anno_list_by_saddr(msk, addr); if (ret || force) { spin_lock_bh(&msk->pm.lock); - mptcp_pm_remove_addr(msk, list); + mptcp_pm_remove_addr(msk, &list); spin_unlock_bh(&msk->pm.lock); } return ret; @@ -1140,7 +1141,7 @@ static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net, remove_subflow = lookup_subflow_by_saddr(&msk->conn_list, addr); mptcp_pm_remove_anno_addr(msk, addr, remove_subflow); if (remove_subflow) - mptcp_pm_remove_subflow(msk, list); + mptcp_pm_remove_subflow(msk, &list); release_sock(sk); next: @@ -1242,11 +1243,11 @@ static void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, if (alist.nr) { spin_lock_bh(&msk->pm.lock); - mptcp_pm_remove_addr(msk, alist); + mptcp_pm_remove_addr(msk, &alist); spin_unlock_bh(&msk->pm.lock); } if (slist.nr) - mptcp_pm_remove_subflow(msk, slist); + mptcp_pm_remove_subflow(msk, &slist); } static void mptcp_nl_remove_addrs_list(struct net *net, diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 4bf8536b7406..d9b403c4b338 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -661,7 +661,8 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, struct mptcp_addr_info *addr); void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk); -void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_list); +void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list); void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup); int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct mptcp_addr_info *addr, @@ -678,8 +679,8 @@ mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk, int mptcp_pm_announce_addr(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool echo); -int mptcp_pm_remove_addr(struct mptcp_sock *msk, struct mptcp_rm_list rm_list); -int mptcp_pm_remove_subflow(struct mptcp_sock *msk, struct mptcp_rm_list rm_list); +int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); +int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp); @@ -725,12 +726,12 @@ static inline unsigned int mptcp_add_addr_len(int family, bool echo, bool port) return len; } -static inline int mptcp_rm_addr_len(struct mptcp_rm_list rm_list) +static inline int mptcp_rm_addr_len(const struct mptcp_rm_list *rm_list) { - if (rm_list.nr == 0 || rm_list.nr >= MPTCP_RM_IDS_MAX) + if (rm_list->nr == 0 || rm_list->nr >= MPTCP_RM_IDS_MAX) return -EINVAL; - return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list.nr - 1, 4) + 1; + return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list->nr - 1, 4) + 1; } bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, @@ -742,7 +743,8 @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); void __init mptcp_pm_nl_init(void); void mptcp_pm_nl_data_init(struct mptcp_sock *msk); void mptcp_pm_nl_work(struct mptcp_sock *msk); -void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_list); +void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list); int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk); unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk);