From nobody Thu May 2 09:59:40 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1883315jam; Wed, 9 Feb 2022 01:50:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpCibcfAJYEugLXTvkJ7mqPfb5AVFhgsXiD+zoYdRMcfN0i7+SZBhHj4Uii6oc51mIDAJA X-Received: by 2002:a17:90b:1e06:: with SMTP id pg6mr1682527pjb.4.1644400242240; Wed, 09 Feb 2022 01:50:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644400242; cv=none; d=google.com; s=arc-20160816; b=Z9oqwG8vifEbR8VrlvvEOCxZECpBxEuScHTAxF4gGPL4dosIODmupTZjWkEMlEZH0n W4waIHoTIc7w3ZtcuQ6XZ4J65Errm8BCdb1iOMEgBZM1vtomyQtuG8UXboZIoxKg/7ya bDobk7I/A0+W+HVIGDcgaFzsiPLHDLSJk2eN1M8o4IguHOwV1p4V/fl7iln+h5vnl6mG fiwL2iWnMFDlpoIvaS84z9BOqseIUmob/W950q9SqeJMQyXUmLTES6M8tcQEy/UQ87XF j+O9coX+cKf/zzdDwLksuX/YW9oKA5Q/aLAkixLAjj9Hjpjtl8s8V1RaTI38rXSQJizU PZBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:to:from :dkim-signature; bh=zTta6WcfnQOy/Nfg122QMTpER/Ey7+Csez0DS3Vjx60=; b=e7XZ9fJAzdRTULHQHLkNcRFy52T2R0xbHrTuiTJHULedQu10/wDF0IxKqtxuOxWsY0 HeII3mm5cksN0e7c6hkQMlq8AWOFOkRfnD6a2h1HKwQnunEAX/+3pOhXk1AeDKYwjOGm tAz6ymOtW7YbaY485aSD3Dob0HVxE4q6BHwpHxV6O7cEOJAAKWLASyI1D/+0VkUo+d8f 4zuF7ho2UDyyuQQunS6PFHJWa4h8LXEkhj1TrcQYIIf173Ud9vi9229fJYs8c3IAsj0L hQTGpFORxJ3WBJQAoYGl17yqoR8XZSZ1dB5ItCgmgeFPB4uOuKbP4troWB72ZlTvIHZd 7Mkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TFNsyXk6; spf=pass (google.com: domain of mptcp+bounces-3565-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3565-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id h12si7899920plo.442.2022.02.09.01.50.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 01:50:42 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3565-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TFNsyXk6; spf=pass (google.com: domain of mptcp+bounces-3565-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3565-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 9FAC03E0FEE for ; Wed, 9 Feb 2022 09:50:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A659E29CA; Wed, 9 Feb 2022 09:50:40 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4973C2F25 for ; Wed, 9 Feb 2022 09:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644400238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTta6WcfnQOy/Nfg122QMTpER/Ey7+Csez0DS3Vjx60=; b=TFNsyXk6Sp/Q+mcim1QnbMKiLmIh/kLbpeRY07b0VG02vQVffr9VI5+fYD8nXTUj2RfT4g Ti1sIZljlJ30lmPSzZt12OHpAcggOjTysqpMR/NtsVi2Z949LnBfxZl3trl3VKuNzyZXt9 Udk0JdqfDxBCR+R68tZHgZZBNfj7ugw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-414-q8atJQgUP-mLaF7et7KVHw-1; Wed, 09 Feb 2022 04:50:37 -0500 X-MC-Unique: q8atJQgUP-mLaF7et7KVHw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D5D1814245 for ; Wed, 9 Feb 2022 09:50:36 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id C026A7B6D3 for ; Wed, 9 Feb 2022 09:50:35 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next] mptcp: constify a bunch of of helpers Date: Wed, 9 Feb 2022 10:50:32 +0100 Message-Id: <8d4babebbd177de911a30c256b0b68742b09f607.1644400229.git.pabeni@redhat.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A few pm-related helpers don't touch arguments which lacking the const modifier, let's constify them. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/pm.c | 4 ++-- net/mptcp/pm_netlink.c | 38 +++++++++++++++++++------------------- net/mptcp/protocol.h | 18 +++++++++--------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index c28dd5c21cbe..f5a8796470ff 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -221,7 +221,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, } =20 void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, - struct mptcp_addr_info *addr) + const struct mptcp_addr_info *addr) { struct mptcp_pm_data *pm =3D &msk->pm; =20 @@ -285,7 +285,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fai= l_seq) =20 /* path manager helpers */ =20 -bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, +bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff= *skb, unsigned int opt_size, unsigned int remaining, struct mptcp_addr_info *addr, bool *echo, bool *port, bool *drop_other_suboptions) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 98b485406afa..46346f009485 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -120,7 +120,7 @@ static void remote_address(const struct sock_common *sk= c, } =20 static bool lookup_subflow_by_saddr(const struct list_head *list, - struct mptcp_addr_info *saddr) + const struct mptcp_addr_info *saddr) { struct mptcp_subflow_context *subflow; struct mptcp_addr_info cur; @@ -138,7 +138,7 @@ static bool lookup_subflow_by_saddr(const struct list_h= ead *list, } =20 static bool lookup_subflow_by_daddr(const struct list_head *list, - struct mptcp_addr_info *daddr) + const struct mptcp_addr_info *daddr) { struct mptcp_subflow_context *subflow; struct mptcp_addr_info cur; @@ -157,10 +157,10 @@ static bool lookup_subflow_by_daddr(const struct list= _head *list, =20 static struct mptcp_pm_addr_entry * select_local_address(const struct pm_nl_pernet *pernet, - struct mptcp_sock *msk) + const struct mptcp_sock *msk) { + const struct sock *sk =3D (const struct sock *)msk; struct mptcp_pm_addr_entry *entry, *ret =3D NULL; - struct sock *sk =3D (struct sock *)msk; =20 msk_owned_by_me(msk); =20 @@ -190,7 +190,7 @@ select_local_address(const struct pm_nl_pernet *pernet, } =20 static struct mptcp_pm_addr_entry * -select_signal_address(struct pm_nl_pernet *pernet, struct mptcp_sock *msk) +select_signal_address(struct pm_nl_pernet *pernet, const struct mptcp_sock= *msk) { struct mptcp_pm_addr_entry *entry, *ret =3D NULL; =20 @@ -214,16 +214,16 @@ select_signal_address(struct pm_nl_pernet *pernet, st= ruct mptcp_sock *msk) return ret; } =20 -unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk) +unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk) { - struct pm_nl_pernet *pernet; + const struct pm_nl_pernet *pernet; =20 - pernet =3D net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); + pernet =3D net_generic(sock_net((const struct sock *)msk), pm_nl_pernet_i= d); return READ_ONCE(pernet->add_addr_signal_max); } EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_signal_max); =20 -unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk) +unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk) { struct pm_nl_pernet *pernet; =20 @@ -232,7 +232,7 @@ unsigned int mptcp_pm_get_add_addr_accept_max(struct mp= tcp_sock *msk) } EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_accept_max); =20 -unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk) +unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk) { struct pm_nl_pernet *pernet; =20 @@ -241,7 +241,7 @@ unsigned int mptcp_pm_get_subflows_max(struct mptcp_soc= k *msk) } EXPORT_SYMBOL_GPL(mptcp_pm_get_subflows_max); =20 -unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk) +unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk) { struct pm_nl_pernet *pernet; =20 @@ -264,8 +264,8 @@ bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *= msk) } =20 struct mptcp_pm_add_entry * -mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk, - struct mptcp_addr_info *addr) +mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, + const struct mptcp_addr_info *addr) { struct mptcp_pm_add_entry *entry; =20 @@ -346,7 +346,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) =20 struct mptcp_pm_add_entry * mptcp_pm_del_add_timer(struct mptcp_sock *msk, - struct mptcp_addr_info *addr, bool check_id) + const struct mptcp_addr_info *addr, bool check_id) { struct mptcp_pm_add_entry *entry; struct sock *sk =3D (struct sock *)msk; @@ -364,7 +364,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, } =20 static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - struct mptcp_pm_addr_entry *entry) + const struct mptcp_pm_addr_entry *entry) { struct mptcp_pm_add_entry *add_entry =3D NULL; struct sock *sk =3D (struct sock *)msk; @@ -410,8 +410,8 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk) } } =20 -static bool lookup_address_in_vec(struct mptcp_addr_info *addrs, unsigned = int nr, - struct mptcp_addr_info *addr) +static bool lookup_address_in_vec(const struct mptcp_addr_info *addrs, uns= igned int nr, + const struct mptcp_addr_info *addr) { int i; =20 @@ -493,9 +493,9 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct= mptcp_addr_info *info, } =20 static int -lookup_id_by_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_inf= o *addr) +lookup_id_by_addr(const struct pm_nl_pernet *pernet, const struct mptcp_ad= dr_info *addr) { - struct mptcp_pm_addr_entry *entry; + const struct mptcp_pm_addr_entry *entry; int ret =3D -1; =20 rcu_read_lock(); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index f37f087caab3..beb5ee38656a 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -754,7 +754,7 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *msk= , const struct sock *ssk, void mptcp_pm_add_addr_received(struct mptcp_sock *msk, const struct mptcp_addr_info *addr); void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, - struct mptcp_addr_info *addr); + const struct mptcp_addr_info *addr); void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk); void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk); void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, @@ -765,10 +765,10 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk); bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock= *sk); struct mptcp_pm_add_entry * mptcp_pm_del_add_timer(struct mptcp_sock *msk, - struct mptcp_addr_info *addr, bool check_id); + const struct mptcp_addr_info *addr, bool check_id); struct mptcp_pm_add_entry * -mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk, - struct mptcp_addr_info *addr); +mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, + const struct mptcp_addr_info *addr); int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id, u8 *flags, int *ifindex); =20 @@ -832,7 +832,7 @@ static inline int mptcp_rm_addr_len(const struct mptcp_= rm_list *rm_list) return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list->nr - 1, 4) + 1; } =20 -bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, +bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff= *skb, unsigned int opt_size, unsigned int remaining, struct mptcp_addr_info *addr, bool *echo, bool *port, bool *drop_other_suboptions); @@ -845,10 +845,10 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk); 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 *s= kc); -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); -unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk); -unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk); +unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk= ); +unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk= ); +unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk); +unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk); =20 void mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk); void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk); --=20 2.34.1