From nobody Mon Feb 9 08:28:02 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a17:907:7811:b0:6d8:2910:9a8 with SMTP id la17csp4144816ejc; Mon, 28 Mar 2022 05:49:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKd2oFUZbcarQfFNGYJfysv9psZn7K858MHPIeAJa6LEbbA0b5GvEMQ3pYVS46pSzpahxc X-Received: by 2002:a67:c912:0:b0:325:456b:4cdd with SMTP id w18-20020a67c912000000b00325456b4cddmr9873412vsk.66.1648471769674; Mon, 28 Mar 2022 05:49:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648471769; cv=none; d=google.com; s=arc-20160816; b=ZpJ7HZzUC+ChEwSsnRucejWIMXdVDLglJi0/UGaQHSrDF5mdpajAG/M4Wk8HKo6s9q 4ybqqrfreGvpmyarqFYKNkgJ14VyeDh9/hcXenVhpOxMSo2YmTEwemh8Hti3Ur20OGLS mBPMvS7eliW8jh87M6CqBA/7nVFSINuzlXpBhSTp/h69JuMiVlt6l+9wC8JYOR//jgbA 3ulkLkNxgck06S1p4cjoOyxv/YOITINLOFRUYiPjlTnRDW3rVxdE8CAPWC8DXLeVlFwR ZQN0Bo4/CAYSNP62Nr8u6A4IqSslbdoJb8aMTbbLhzAgJP9fNkNiuWujoEv+862Swzyp +1dA== 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=FCZZZNlaLCSL7BezYluWRRVwt4bX5jv4Vm++zc9hoWA=; b=bprP84olOayXzT5FlPQt/z5Od0rPBoCfaXHhZtd82aXlw+cs4LFMHS/dfwBHpjYozV K3+5VVf0P2gBm29Ovb9I8jZuwhLUK/1usaSus6JQjNsn+5MWuAXMXCq3AzAkdbvZKGqP E9Vy4IknPDYBM1CGokk9LpgGszOxfmwQIpDfJuGCJP5Wu0Jvd8EHwzWkgOdb26lZ7zPn rAHREKPKPWg5coOpEfEcY1syyNjckEl4XZMrckBxTrVS5JlZA4VBgmjKICxIdCp14sm2 yKbaMHPqtXFaS3L1cL1Zdia2FRE2Qv3t5nCpSBZNVfoW9hftB6jyN/bMU6BZl8LQariR FB3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4477-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4477-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id c3-20020a05612214a300b0033ee1caa1fasi1429182vkq.155.2022.03.28.05.49.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Mar 2022 05:49:29 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4477-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4477-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4477-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 B7F733E0E65 for ; Mon, 28 Mar 2022 12:49:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D38FB3D95; Mon, 28 Mar 2022 12:49:27 +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 188BC3202 for ; Mon, 28 Mar 2022 12:49:26 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nYooG-00068r-57; Mon, 28 Mar 2022 14:49:24 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next v2 1/3] mptcp: diag: switch to context structure Date: Mon, 28 Mar 2022 14:49:11 +0200 Message-Id: <20220328124913.29768-2-fw@strlen.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220328124913.29768-1-fw@strlen.de> References: <20220328124913.29768-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.35.1