From nobody Mon Feb 9 03:12:01 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a17:907:7811:b0:6d8:2910:9a8 with SMTP id la17csp2185409ejc; Thu, 24 Mar 2022 06:58:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwI/J0AUjFoJbe9IwL4+uaRy8arvD7AoVGLb9AqE1cjm6fobwJ2B5+RIeXhlitddw/ZlwG X-Received: by 2002:a17:90b:1bc6:b0:1c7:f32:3aa0 with SMTP id oa6-20020a17090b1bc600b001c70f323aa0mr18791804pjb.168.1648130302000; Thu, 24 Mar 2022 06:58:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648130301; cv=none; d=google.com; s=arc-20160816; b=CEjNwnwEeywnjNtx7Z2cdUSJ5rIQV5gel+LmG8Eq7xqkSMLkOKW3vNCGf5QMxiKULf CHYNmXRrVWQFw1nZJIiOWfPlpmxU/Ikb5SFM44NYILN1cDE0aNZgghR2D09TEBRLJ5jm IQYRtydiDbhlL/k7Z0J6gtiu7bc5ELbAOxAFF54bQpgHoFuagOJg8Vr+3mSuPyiyOjK/ Tn8a2kPa5Ke1yZEe18y31uOjVqqbdQakGMYgrY8FwZ5+6GP0xtHnDIYvHS1oQOz6wceb k5YCZyx6E8zxuLu2g+dUi6qNw6+BUN2pLrwx3km3aEwkloPxrJFjw68YCMeF2gEfoi5z SYSg== 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:references:in-reply-to:message-id :date:subject:cc:to:from; bh=A88Bew1DtScohFliaYGCq4fjcSotJAPhGm1JaavSZvk=; b=nw5SqCHEgaOTGgb95CJ6Hwlrroux9snY73A7Xp9pH2InewhBdhM/wNpMyAHJLSgIPR /PU1LXR2I/8P0yaG3NW1IUi/eCmCZy/16leLcsvDOvL00MUtpXJZJH9U/VrhwkoVYJ+Q 8BIOYz5ahFjxgTRcdZTJVT3KBrSKMKTOTTT21MZ+DjQi2L3CXi5axrJ3BgURY9V/8kIj mXWX2uLISQoFSUHL67QDugtxsJ2uuIqyG9G7b5fzttJnbjA2Se4+nztiUTv2oe6+ZVY3 WI3jRTCsYkbfYoLIw1KGROZ5zlPSRvNBJd7USYFtp+/gYBr7eKMIXe0nVYP7xo5Ys4ca RAtw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4399-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4399-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id bf6-20020a656d06000000b00383f7ddd81fsi8435716pgb.346.2022.03.24.06.58.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Mar 2022 06:58:21 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4399-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; spf=pass (google.com: domain of mptcp+bounces-4399-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4399-wpasupplicant.patchew=gmail.com@lists.linux.dev" 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 205BA3E0FEA for ; Thu, 24 Mar 2022 13:58:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0CE161FC8; Thu, 24 Mar 2022 13:58:20 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [193.142.43.52]) (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 9236D1FC0 for ; Thu, 24 Mar 2022 13:58:18 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nXNyb-0006zi-O4; Thu, 24 Mar 2022 14:58:09 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next 1/4] mptcp: diag: switch to context structure Date: Thu, 24 Mar 2022 14:57:50 +0100 Message-Id: <20220324135753.25182-2-fw@strlen.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220324135753.25182-1-fw@strlen.de> References: <20220324135753.25182-1-fw@strlen.de> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Raw access to cb->arg[] is deprecated, use a context structure. Signed-off-by: Florian Westphal --- net/mptcp/mptcp_diag.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/net/mptcp/mptcp_diag.c b/net/mptcp/mptcp_diag.c index f44125dd6697..c4992eeb67d8 100644 --- a/net/mptcp/mptcp_diag.c +++ b/net/mptcp/mptcp_diag.c @@ -66,20 +66,28 @@ static int mptcp_diag_dump_one(struct netlink_callback = *cb, return err; } =20 +struct mptcp_diag_ctx { + long s_slot; + long s_num; +}; + static void mptcp_diag_dump(struct sk_buff *skb, struct netlink_callback *= cb, const struct inet_diag_req_v2 *r) { bool net_admin =3D netlink_net_capable(cb->skb, CAP_NET_ADMIN); + struct mptcp_diag_ctx *diag_ctx =3D (void *)cb->ctx; struct net *net =3D sock_net(skb->sk); struct inet_diag_dump_data *cb_data; struct mptcp_sock *msk; struct nlattr *bc; =20 + BUILD_BUG_ON(sizeof(cb->ctx) < sizeof(*diag_ctx)); + cb_data =3D cb->data; bc =3D cb_data->inet_diag_nla_bc; =20 - while ((msk =3D mptcp_token_iter_next(net, &cb->args[0], &cb->args[1])) != =3D - NULL) { + while ((msk =3D mptcp_token_iter_next(net, &diag_ctx->s_slot, + &diag_ctx->s_num)) !=3D NULL) { struct inet_sock *inet =3D (struct inet_sock *)msk; struct sock *sk =3D (struct sock *)msk; int ret =3D 0; @@ -101,7 +109,7 @@ static void mptcp_diag_dump(struct sk_buff *skb, struct= netlink_callback *cb, sock_put(sk); if (ret < 0) { /* will retry on the same position */ - cb->args[1]--; + diag_ctx->s_num--; break; } cond_resched(); --=20 2.34.1