From nobody Thu Mar 28 09:33:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp1632601uao; Tue, 6 Sep 2022 13:56:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR5ubyVCbHm7RYHKWY7jJbrRSqsc6A9Olu50BcZxN0fckcgWaiwlgiKLfMjr2Xoelw+lGY/H X-Received: by 2002:a17:902:e844:b0:16f:9d2:f4ff with SMTP id t4-20020a170902e84400b0016f09d2f4ffmr484637plg.27.1662497799069; Tue, 06 Sep 2022 13:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662497799; cv=none; d=google.com; s=arc-20160816; b=XJGoIzuliXR3CJrFZXdHKj8a9sNcK+IgflaXz5PS2XRLX8DXf6p9/hHzHcK1EWFB16 P9aHInIBWQ/WXou5qCHGGLuh4e171uyA2++ovmdj8o9Dj8hbGk10CD5VKW0dtVR7g7G5 m9b9qmrWBcDJpGKOKOHHet6MIN6tEnkDU1JRvwkhyTOwAdfvjwnUYulqsUjrZ+RvzY0x Z5cMOnaPTt109jxE7tfmitPzLKTk3zQYvQaCDnbwxtoOw4lS5Nh1PPMk3FtcGMqryG1J gAp1QHOd4W3wIMtUbN1rm+JUs0BZV9bETfbXyujdAAHRoN7F5PuU5FgBezFPMztnYtq8 p8SA== 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:dkim-signature; bh=Bzx+cD7xk0ffAd/x0upRKnsqyh6CtsmmDF1m6ENUxaM=; b=miFw14eIvcb8Vk+M9y5AGBZdBoiTPYjJK3d+Hxk9WKn87eOx0Rd6yDsJ3PFdJy4uub S8/L9B+/XnTsIz0J7EXPVJb9BF9JpUcFRSs0UhDBtmxqs6mpl1E2wGWzl16nMXQ1zpku tsQDkFskRSLH2jiJ2aV+PbVHmlsq1qRfqLGlN5TQ23zOugJ5mZkhnVAY/uUe17enDQub CCGJwYht8WDTTHsYAC3I98GPUV8IC2fiDaEv8J4GCA36UbtmdnDwyKatSNxlOLw3PJVX gQ9ERb0P+6TZ+89/6NEw/x+/gqXVvwtOmb+iH4tzE+HOr2FUt8mqKTkyOaZEnxyKldeK 4vqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=IpNFDVAB; spf=pass (google.com: domain of mptcp+bounces-6200-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6200-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id m14-20020a63ed4e000000b00429ee0682b5si10136173pgk.404.2022.09.06.13.56.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2022 13:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6200-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=IpNFDVAB; spf=pass (google.com: domain of mptcp+bounces-6200-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6200-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 8D15E280C1C for ; Tue, 6 Sep 2022 20:56:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DA34286EF; Tue, 6 Sep 2022 20:56:37 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 087192F4E for ; Tue, 6 Sep 2022 20:56:35 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id bj14so3976388wrb.12 for ; Tue, 06 Sep 2022 13:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Bzx+cD7xk0ffAd/x0upRKnsqyh6CtsmmDF1m6ENUxaM=; b=IpNFDVABVsbGTVL4O05HzyVsipCk56tBqMmYN3RVWBY3xdRsLjzWYVOwhOfY9EnSZT 2u6617ukv5IOnBEqJWzwq3qWtdkSd/UefYW5LT7pf8Pb9FnttIfbc7hN+l2hJTFbTxsi MzeVctChyR3S7W4U8ap5yYKknGIlYYCBVwPpXmEU6Dxg76CZYZCe3rzUiimvmpVdRAt5 F0OOfxq11cQbdnydVLNpF/LHbdKu0RFzlfyNoZgxyJEnGen843AmYW70oKP3raLZQuWX x4Tuog8sPIgh2DtJpdk/YIwCNRnD32OGNUierc4TXMqmmnTAJ8xT4/Zmrwlh80pH71j8 46nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Bzx+cD7xk0ffAd/x0upRKnsqyh6CtsmmDF1m6ENUxaM=; b=6zX4XMNIPWsNRvqZ8l6Vl1tI6yuAZOLTwKYmEYb8JhWYW67dEL8GzPIIqZh8iir4KB OGL0RXeUxnKB2bqpV5DpYW0nLsAaWH4xy/wmdIDy2U1Fgy9x+jT8M5x65WqI+jwl/Eau W/hH/kBZyrHVgwJf18UFBl/XYGEFXxXdAE5hLFpZmIVlNhhf1UzrykinMPgJcZMmC5Tx z0GFm3GGqdgmxbVrv/dlhk51aS2Hr2avhQIApqKIqN2wU1mHbPpzZbZCYeh08/FqnUKa P6jGALvKFttikGYisGIANfGm7wJsYkoVHYFeIrDzxc3rMJ6u5ExFzwILM8ppt842TQjV JI6A== X-Gm-Message-State: ACgBeo3kRoYMyTyh70iSNO4tnLFUOUTp1WFaczqoe5gR1KX5lNUaYcgS C/RJn5F2Obnsx8kU1bcSCK3qgA== X-Received: by 2002:adf:f4cc:0:b0:228:ab76:fa13 with SMTP id h12-20020adff4cc000000b00228ab76fa13mr176515wrp.110.1662497794138; Tue, 06 Sep 2022 13:56:34 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id n24-20020a1c7218000000b003a317ee3036sm15735887wmc.2.2022.09.06.13.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 13:56:32 -0700 (PDT) From: Matthieu Baerts To: Mat Martineau , Matthieu Baerts , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/5] mptcp: add mptcp_for_each_subflow_safe helper Date: Tue, 6 Sep 2022 22:55:39 +0200 Message-Id: <20220906205545.1623193-2-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220906205545.1623193-1-matthieu.baerts@tessares.net> References: <20220906205545.1623193-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2778; i=matthieu.baerts@tessares.net; h=from:subject; bh=FzIWMWFonpoxcP1L4R9vUfT0ariFVPfRrgBWzxMq3A4=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjF7O5M9GDs9tE3T0u9pD8nPu9iCoCtaH4vovheHBF 6ifLOcqJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCYxezuQAKCRD2t4JPQmmgc0PGEA Cuipi8+Slnngy8VjGZnlG7dgxNZ+n1VE6WdfroG8gP/pqr5CVioCmHKwKK2n3nJPcAnE9QYxjRYPoT 0a9K/XAJCqFm59av5uXcrYab0mgVvl6SgSXB+tDXGoQb9mRYhAdHrzdd/n+O/jqfMZgHYANCtKr2Mp UMf751iAQvZAFC1cpsNrb1i9ZsQKatBdAaV6plI+lY+j71zsCURB+T9gk6rRK8znxndk27+49n9tfR 9j8cbZmDXH0StxbDzyH63j3drLOD0+g3z9gCUJyicE4bXLI24QzpRsvOZ+yGThXVodkVLkyqCd+fTT WADc8jbnAr/C9MlGDB1u951ZsZK7A9PkU2br47vXIAif5DJYMHlug+EpVFubBJGwQqOQNbxyD4kdvF EZhE5ehr5flBZztz0+w2tGI/oDoQ+PAd5XZo3Gi04GkZprbrxEPNj/mLRsa0/M2qRBEG+6ZO72bLra FrK6KLtLgoHKR2KqJWlw2j8M8xOIFNtRca4XNYjtYtTLt8LSj4AM0+gdsljC3fQAiNOMi2HB2MIOAS OukMMjwwYjO9YUW6hZxnP03n/sRsrTSUTQa41PCh5TztOxh+7wZ2ArR+XKUubBc3gsOUR2IIHXN8be nAqEEWQALEwYLirGj7hvv9q/PKSVGnC/Rk9D6uGmRhNJrZQUl58e+RpeKU+w== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Similar to mptcp_for_each_subflow(): this is clearer now that the _safe version is used in multiple places. Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts --- net/mptcp/pm_netlink.c | 2 +- net/mptcp/protocol.c | 6 +++--- net/mptcp/protocol.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index a3e4ee7af0ee..5e142c0c597a 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -796,7 +796,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp= _sock *msk, u8 rm_id =3D rm_list->ids[i]; bool removed =3D false; =20 - list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) { + mptcp_for_each_subflow_safe(msk, subflow, tmp) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); int how =3D RCV_SHUTDOWN | SEND_SHUTDOWN; u8 id =3D subflow->local_id; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d398f3810662..fc782d693eaf 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2357,7 +2357,7 @@ static void __mptcp_close_subflow(struct mptcp_sock *= msk) =20 might_sleep(); =20 - list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) { + mptcp_for_each_subflow_safe(msk, subflow, tmp) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 if (inet_sk_state_load(ssk) !=3D TCP_CLOSE) @@ -2400,7 +2400,7 @@ static void mptcp_check_fastclose(struct mptcp_sock *= msk) =20 mptcp_token_destroy(msk); =20 - list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) { + mptcp_for_each_subflow_safe(msk, subflow, tmp) { struct sock *tcp_sk =3D mptcp_subflow_tcp_sock(subflow); bool slow; =20 @@ -3047,7 +3047,7 @@ void mptcp_destroy_common(struct mptcp_sock *msk, uns= igned int flags) __mptcp_clear_xmit(sk); =20 /* join list will be eventually flushed (with rst) at sock lock release t= ime */ - list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) + mptcp_for_each_subflow_safe(msk, subflow, tmp) __mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow), subflow, flags); =20 /* move to sk_receive_queue, sk_stream_kill_queues will purge it */ diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 132d50833df1..c1b12318535d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -314,6 +314,8 @@ struct mptcp_sock { =20 #define mptcp_for_each_subflow(__msk, __subflow) \ list_for_each_entry(__subflow, &((__msk)->conn_list), node) +#define mptcp_for_each_subflow_safe(__msk, __subflow, __tmp) \ + list_for_each_entry_safe(__subflow, __tmp, &((__msk)->conn_list), node) =20 static inline void msk_owned_by_me(const struct mptcp_sock *msk) { --=20 2.37.2 From nobody Thu Mar 28 09:33:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp1632624uao; Tue, 6 Sep 2022 13:56:42 -0700 (PDT) X-Google-Smtp-Source: AA6agR6wAGIXAF0YwGMZHD2N3G97mIEbzkEP4lPz92qkiysNPJRtE8463qVhtGhy5+Us3Q/jW1da X-Received: by 2002:a62:6347:0:b0:531:c5a7:b209 with SMTP id x68-20020a626347000000b00531c5a7b209mr347736pfb.60.1662497802637; Tue, 06 Sep 2022 13:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662497802; cv=none; d=google.com; s=arc-20160816; b=VCJpbJ3r1xQUQaz75kInC9TD1ozstyAeG79zZdAgf2HDfk+vFOcAYjyzTNjsIbitRc hNjOv1EQbDZ/g3Oy6DiD/4rgwsebsrCo1zC0dBnbMHE4OXIZKUuMV2cDp+MBLLqyIG67 /HFxfqxmCSpU8m8uzKI6MV3UBoQ6MfFju6Sb55u9wKmmvKAT/LP4G7/rOGq751m82WIk z5nDa4CtWIBrDSr1wtRxP+8sulnMumgso9/HnEhvoMETFtvvzYdszBobQQncN8RcQToe Nbm6WSigK7RRoufdSW5RajE5bJavTi9gg4bMXumNFs33jt28knM7TNOxsAAsDBF8BrFN xhvA== 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:dkim-signature; bh=uWCP10+KdM1mM0Umgl1CW1tpnCShY3VRv2KhK/s50Pc=; b=PgllpG/Ti9SWkMCplle08+iYy32DwTmIvSmVw6jbOptIha3DSqGcnYXNV73UyjP+zZ 0uJxgvyz6J/rwPB+MhYbB3Dl6ulVrUTQMpQtUMY3/sbQ8I1xzWWY3MvX69SnIwiQKh8E JSE4KbedEEnnfdSsO3MbLDvfk39JcKqBzjMxsU8+WN4tIqLR1R0eeaGS+GbSEu7+ibbN zC6JxgBp9iR4xgrYhYTzjG+E3wXGBfmTmvEpGGPYce5r+E6vd3bvQzczhRk+6WzN7gbf 4QE0G/TxCySQcS3RE6JTkEI1ywoHLm+vEgqBLKmSAf4nov2EKcAuOl//Z8t9DpzNsL5X TUBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=hA0aVCFd; spf=pass (google.com: domain of mptcp+bounces-6201-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6201-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id w199-20020a627bd0000000b0050dcf85b9e1si13767182pfc.141.2022.09.06.13.56.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2022 13:56:42 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6201-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=hA0aVCFd; spf=pass (google.com: domain of mptcp+bounces-6201-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6201-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 0158D280C40 for ; Tue, 6 Sep 2022 20:56:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 143AA86EB; Tue, 6 Sep 2022 20:56:41 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 556FA29A5 for ; Tue, 6 Sep 2022 20:56:39 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id c11so13026320wrp.11 for ; Tue, 06 Sep 2022 13:56:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=uWCP10+KdM1mM0Umgl1CW1tpnCShY3VRv2KhK/s50Pc=; b=hA0aVCFd6I916GvNfIBOiPT70SlSP/gKustpzyybixkWURvyjrKTmq6eVMPCH14/fc H0bbFN1BzpqTyiFaiU6KRqcAEDSiUuBDEUIq6q4hRuYD8SgrlH5pfhn5TIUOO3h3u0kQ 0N8vEq5S3qpKVzCwXaBJpLgjsPineUBdGmDRjTOmtS/D9rW0VTf5JR/6GeN0UyA9XT+R SqNG70Nvxe9rSZw+BFmszsL/1XhVh5OvkmbGBY/sBk0okhFoVxY1fy0RYqdsdl3lTVot JRpRfM/CdLZtyoFcJUKWx2Rgqch1n5Z60hSkS3YN8l3Bh93KxIpuDGnzi/TF/VL5uUj/ mmQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=uWCP10+KdM1mM0Umgl1CW1tpnCShY3VRv2KhK/s50Pc=; b=kQRvnjOK+tJ7VXaKXXt/wlpggO6rgtlCpJzG0Bn2eMCyFNNeenpTwWsi/5BWEYTUJ5 P5fkhb9w6bqDTsvwDT6Qz184lfRBExzvk44I/Bm7685wCv9ywCV79cY3RtrjPn3KuzrO T0A7cDGY29W32TlfX/4CXZICgcE4DG2iHhRIqAE5AtsOlsij7E5Cbd01GVpTOisG69sZ l4Ek/JpJ4javh3YcusHjDAnlKZqhgUEH41M3GKvarwGCvTHvmeRPOtlFe0TRukjVTtnt YKCRnu0FQ9wPK518c0j7lKYZf9GsjxGtOxWfNkZN8eMABTGaHY68xey2z640Dr7dD8oD MwOw== X-Gm-Message-State: ACgBeo31Um/L5nUVNI6GzFSNfRI4Rt12nF5iingj3Ltex4aQHwZFBvCU UmQ7PNdVY8Z0Vl+GhzLaQPCAEQ== X-Received: by 2002:a5d:5312:0:b0:228:cc9e:b70f with SMTP id e18-20020a5d5312000000b00228cc9eb70fmr163892wrv.11.1662497797565; Tue, 06 Sep 2022 13:56:37 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id n24-20020a1c7218000000b003a317ee3036sm15735887wmc.2.2022.09.06.13.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 13:56:35 -0700 (PDT) From: Matthieu Baerts To: Mat Martineau , Matthieu Baerts , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: Geliang Tang , netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/5] selftests: mptcp: move prefix tests of addr_nr_ns2 together Date: Tue, 6 Sep 2022 22:55:40 +0200 Message-Id: <20220906205545.1623193-3-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220906205545.1623193-1-matthieu.baerts@tessares.net> References: <20220906205545.1623193-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1553; i=matthieu.baerts@tessares.net; h=from:subject; bh=yUhUy0ygZaIKGg/DCAYpwAsfqZXiS1Iioh7QiRlCzI8=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjF7O5XYAZvCDzDsZTKMXAqDaby25FIJ6aR+JYa7Jc Ihvfp4WJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCYxezuQAKCRD2t4JPQmmgc4fYD/ 9tVps4gMGcGcuZq6GiLT1IUNS3czrpayKljF1dvYaofmEc8O45T+Ovey42AGosrXSta3l/hghtQue/ 3c56h0DdEJAX9wtcAqbiZF9vuLSst2af0aKAZO/0nxMq9y6D6eNTl0vbT3VG04Pm2W45+wo0S2dr3+ B2O6qpteWsu0lca2BF2SrVVUMXGcLvvaVEWxxnTDFbjnuNXqZCoBVfcQeeycR80BlFW1b7n4Jba4FN 35qaba07wM1L1zAKRPitFr/6/FNyF/4AoK7vvFsGIMwOl9MnKrVtnwvX2WyrWgD7eu7bjyXmsGwVbJ zWE3keai1HrMpJOBSnJe6MzAZOO+R8r9Tz+93kdPlJkNnumGcKfdnpUY358rsWn9UBeTZ7I2SWBLXS +7kmlA0NNmzLjWSaB1bGEay88It/5LO0dPAsXApReACPNjgPs7RnhfLWzAz/9LlrgUlszBFhGpFr8X 8vhePUDTbYfBhB41MSB41oBumCpG0WezKZMcOx2zSA2TKyDChwEfkNj3UbKTVpu8DfKtug9/3hyqho bYHnByPY+gbawDib80omMF+8CineZtAsSE7IBQ2ZKjz1H6EUTkaG4Z03gnD3qwrQSxK9j2S0FlCD2m wSh/CesmSQ1xh9Pq2xhmAwGtH04Cp+VUJGpoJZTc1K3iYQ7B74eRJcWGRuBA== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Move the fullmesh prefix test of addr_nr_ns2 together with its other prefix tests. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ff83ef426df5..2957fe414639 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -706,6 +706,7 @@ do_transfer() addr_nr_ns1=3D${addr_nr_ns1:10} fi =20 + local flags=3D"subflow" if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then # disconnect extra_args=3D"$extra_args -I ${addr_nr_ns2:10}" @@ -713,6 +714,9 @@ do_transfer() elif [[ "${addr_nr_ns2}" =3D "userspace_"* ]]; then userspace_pm=3D1 addr_nr_ns2=3D${addr_nr_ns2:10} + elif [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then + flags=3D"${flags},fullmesh" + addr_nr_ns2=3D${addr_nr_ns2:9} fi =20 if [ $userspace_pm -eq 1 ]; then @@ -832,12 +836,6 @@ do_transfer() fi fi =20 - local flags=3D"subflow" - if [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then - flags=3D"${flags},fullmesh" - addr_nr_ns2=3D${addr_nr_ns2:9} - fi - # if newly added endpoints must be deleted, give the background msk # some time to created them [ $addr_nr_ns1 -gt 0 ] && [ $addr_nr_ns2 -lt 0 ] && sleep 1 --=20 2.37.2 From nobody Thu Mar 28 09:33:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp1632651uao; Tue, 6 Sep 2022 13:56:48 -0700 (PDT) X-Google-Smtp-Source: AA6agR6jqLSME1/TQQs/nV6HfUrKOmG4E8cBA5oCRCnMzQXAT/RKGyvOyk83LnhMq8i70WSw6DlD X-Received: by 2002:a05:6214:d04:b0:498:f0ed:fa0c with SMTP id 4-20020a0562140d0400b00498f0edfa0cmr136978qvh.104.1662497807934; Tue, 06 Sep 2022 13:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662497807; cv=none; d=google.com; s=arc-20160816; b=Ge9QvxNUN862KOMw+svgDHtgbiUaxIoqbNSQ1LtaSHohU3tBK7DwM+gNnKT6O9QjUE xglwCkN6aRmFmZGPA4oafuEy1riXKivz7zXIWtZij4wnSd2h79QW/rBmf02+mkKAEtZG j3zc38WaGXSMrWSDUd7YCtYORVA7a+nsABpzYQOpezO0ygW0m7BmD2oDz5Er0jJl87ib 4qD851gf1kRfo+QP1JhIcr2X/ZAxgjxqCKwdlwL7Jf/WZu5kLCZWD2S4EUX3WmnbfpOU 3JGmPIRjp0kNkMzP5YITTiDCXkqPk8BHwv1atUBWOumqFGPWDh6Xe11H7u6iDgfKZOT5 OC+Q== 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:dkim-signature; bh=Yl6+l6Tz5nZm4wkgL71pM9KuNzn5abHVXtmHe0YrRrQ=; b=JjqqQ6zdpzCyI0sjQ78fLkhY+UMhqTC29YUxpSKNbT7Nefusvu13GoTIt+t18b+k+q zD7QK+dzHd0dC8fFJYGDFeBzIjkB5aUdcTRJDdC1WSlsinabWOHxNxM3z56vn8jnOnaJ T134C9X1Qu4UILL1ZOozjpSlSlYc/drgZ6qi8pwuvgUuUESvUj97qsVwwgAMCOUqsPDn 1VGIr7yBmIlirkuM4mzFGjsAKNYbW6u+IjFQmV+enb3ovIQ/NSihPk1bUc/E7yqDqAX3 VnqOooxoCv0HCG97OJZ67NI4dNBGYtDPSBOGjHyPYTF98y5Yi6JgXLOdW9XY94VgV1g4 qmiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=Wsk6eP+i; spf=pass (google.com: domain of mptcp+bounces-6202-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6202-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id m15-20020ac8688f000000b003445501b5c2si6701564qtq.382.2022.09.06.13.56.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2022 13:56:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6202-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=Wsk6eP+i; spf=pass (google.com: domain of mptcp+bounces-6202-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6202-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id A08591C2083F for ; Tue, 6 Sep 2022 20:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6FD9086EB; Tue, 6 Sep 2022 20:56:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC24C29A5 for ; Tue, 6 Sep 2022 20:56:44 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id bj14so3976980wrb.12 for ; Tue, 06 Sep 2022 13:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Yl6+l6Tz5nZm4wkgL71pM9KuNzn5abHVXtmHe0YrRrQ=; b=Wsk6eP+iYpej7PR3Z12QkHrVvOqdtkrqUS6r1jIHv/1OI454NV/w11aRkiYkHpjUpv 5cXZNQzHi8s5nAf2hTWOCxXkhLon7O514CL7Ea0+H01Z75AFt1mP7REKi9jQ/DCZ2ujn EufF9s7tb32bAqsfjRTmrtkiiZA9WQUKrK1PVmZ9MdkfAlsl6R2Hwr+3WR/nVCgGwKbI cUZTd7NNJe3vcog5Z3kPZuVr7wR+ImCV4B+ffjm7k0H1MLR4GCGezLeHzRdZ2pAIXxyG fnaBElVLxDMswzMVLxg6jlDtBR5d7RtM3LolxuFmP1dSpYzCPxb6Euwjt20o1ZhdPyyt w2tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Yl6+l6Tz5nZm4wkgL71pM9KuNzn5abHVXtmHe0YrRrQ=; b=owJQZOUW5TC5CtnNWPYVcHjbHemNIWNY051j7/bUk/ZRj7/7QwdAg8ixQmyCGOr1QD Cp7t/bYDWJfXajoNlCz6cQyc7ldeVtQILRPwIEbn2ltwEyNsfnGwsvi3qOKsaceJqVg3 b21Q0Z7fbe2HgDExJZTQMbd/7OUseemKOGyApYkVfEy+YkKkCmZwH0AEoE3xFTbJ7o5j zTmqR9w/Nfx61kQSjYlraSxf4I8+5kyoqq1T411q9czttLcxXIeZaNVFVVk6e8VwvJXp IYzZbqFnlLpwkb4/sjeOeoqw2YLdeVVIY63QXszjdr6ALVnPqMmA/canpUxaNTuUCZuL 5MMg== X-Gm-Message-State: ACgBeo0Wgu3JNYF0ID5kMTvFtq9+vIrts87nxWSuUPQE0A7znNCV6C8o iA9uLG0cGcxLVAy2iCVc3DGwEQ== X-Received: by 2002:adf:e508:0:b0:228:62fd:932b with SMTP id j8-20020adfe508000000b0022862fd932bmr172063wrm.410.1662497804186; Tue, 06 Sep 2022 13:56:44 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id n24-20020a1c7218000000b003a317ee3036sm15735887wmc.2.2022.09.06.13.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 13:56:38 -0700 (PDT) From: Matthieu Baerts To: Mat Martineau , Matthieu Baerts , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Geliang Tang , netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH net-next 3/5] mptcp: add do_check_data_fin to replace copied Date: Tue, 6 Sep 2022 22:55:41 +0200 Message-Id: <20220906205545.1623193-4-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220906205545.1623193-1-matthieu.baerts@tessares.net> References: <20220906205545.1623193-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1570; i=matthieu.baerts@tessares.net; h=from:subject; bh=+g38Y+mWkUnFq5R25N4kk6AO7g0tjZvhLM1UE5s88uo=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjF7O526/+GZWT9lBKJnLQ/VE3wnDNU3rQklnMFTjr Pa+rFmCJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCYxezuQAKCRD2t4JPQmmgc7aJD/ 493eZXF51bN99DL4y0aof8awj3f9U0k03ET0iUc+u6kQKiM+7RqelfEaugu4JnTcUIRiHf3IqCPGyT crKMnxwJpe37U0CfKX3AqRpdnCDHcxuj6T1Dj3Z6/n/pUwK3n5vQ2GAiIDNhs+5tLyBfPiEFXxlDX/ Sr+wQxmD/lfS8LI4LhW6pdXp8ZhZ7x5Dq8kA3hFzzAbkKN3bTPIs2lh3JfZmmB8czOt3rXx1LOOnBi woF4vcdJPOlI74D5Vi8yLeTehH9i0nrneyvvgIiCkUi0rLc+mslEmf2re/mrrtV8duIrObcg16hr8O c4WEUSTCNO0E0Icvm7B+EjDgQB2oGWjz78c7VgondZnqt4EpG/y6+fA4Q+b33gfL/9Zon/ANJU8XTU 1gd0Ohrgl5GFlE8MJ9UOyfB8XcaMdLoWmgWZu8haUmYpmxHHH/Qv7QrXjvcHYhyE6SLmQxBxsiy5T1 P/9bh6CRk6AA/W2obIm7JyzqB7WLdL/Czq3B/7crOhenilNM0v9VWfZWhOB5dbCH9Md3wLg34uBOlm LEYAubzcel7PUx60+yXNiU1pUZI0LkpPja4/5vwxfbOTuf8V0sel0L19jlkCSmc/GArmsUyXOfCpA8 K4pULk5mS9c/IRGmonP8qGTiyM2o5Zn3KshQQPEbphLfGQ1NDUbV9qTfdh4g== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch adds a new bool variable 'do_check_data_fin' to replace the original int variable 'copied' in __mptcp_push_pending(), check it to determine whether to call __mptcp_check_send_data_fin(). Suggested-by: Mat Martineau Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts --- net/mptcp/protocol.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index fc782d693eaf..47931f6cf387 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1538,8 +1538,9 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) struct mptcp_sendmsg_info info =3D { .flags =3D flags, }; + bool do_check_data_fin =3D false; struct mptcp_data_frag *dfrag; - int len, copied =3D 0; + int len; =20 while ((dfrag =3D mptcp_send_head(sk))) { info.sent =3D dfrag->already_sent; @@ -1574,8 +1575,8 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) goto out; } =20 + do_check_data_fin =3D true; info.sent +=3D ret; - copied +=3D ret; len -=3D ret; =20 mptcp_update_post_push(msk, dfrag, ret); @@ -1591,7 +1592,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); - if (copied) + if (do_check_data_fin) __mptcp_check_send_data_fin(sk); } =20 --=20 2.37.2 From nobody Thu Mar 28 09:33:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp1632736uao; Tue, 6 Sep 2022 13:56:59 -0700 (PDT) X-Google-Smtp-Source: AA6agR6ozJimmU652GuGL4Im4p1u6cowAlKJtijulvxV5w0D5lsBTZAiDoO/d2PQH5dte73FOwS9 X-Received: by 2002:a63:dd51:0:b0:430:18d9:edf8 with SMTP id g17-20020a63dd51000000b0043018d9edf8mr413610pgj.163.1662497819577; Tue, 06 Sep 2022 13:56:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662497819; cv=none; d=google.com; s=arc-20160816; b=GN+5jt8btW41i2+Y3lZlYaRRzlqTKmCFTOCycwwpgtpUoheS+LL09D4AbytnAzyyag S4FSDtjAmrcW351R2X4GK7EY4B84fb2fVg3wrhO7I5z+7Vx9WSbYR8QN0qI/o2eyHz4B 3E3RkilZvZJ6+WP77vYaQNT+u2RKqDGJZPlvIovX3kxFULrcZClZl4gmxfvlqKmgIqq2 2NbicoZwU6msDiGuAnOB7XAslTW9oxOZdfzobcClq8Y2hpUwUd/K7xYhjGc24qfsd+s+ FfOkRc0guSurzr6/giCy21Gusog2zR69KhHG/y+RiIuzEL5B1okG/XZA1iaBJwmu4PaS 3Dmw== 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:dkim-signature; bh=PRqsWYZZH0s3GHQzsnOmHr+CxH/u15ul/CIYu9EYojs=; b=rpGMcCG9M/jPiociSTPcl5xdEj5H1lEJeHgEcaUlXhLf0lMsjPnHlp4f4hLROGPmG7 XxjzjRjladj2TqndaRfweERYwYzeqBsoUyimftvgtQ0SjWoFb8Nrx1Xo2CqiiF/7kQuv P7NmDFARZlmBGxldDimds5yWtZMG9YxYFBsgCsWvIWSkrzBOBDmEdtO+XEnwUBLjvVC6 xSd5VX2ituZCT9dlFXTdCyjNmI3Qv8IX6rb97FVNd0LqqBLOkuxuH/iOTDSgsH6iPryR mWJVEG9i5bEFMDjxDFx2vojOZJfDwmcwOmxerOjKU1kHBcJlYQ5QB6HWt/QU2S2+FPJ9 JCwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=Vc9QaQE8; spf=pass (google.com: domain of mptcp+bounces-6203-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6203-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id pm17-20020a17090b3c5100b002004aaf69c1si7529367pjb.73.2022.09.06.13.56.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2022 13:56:59 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6203-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=Vc9QaQE8; spf=pass (google.com: domain of mptcp+bounces-6203-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6203-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id C96D1280C50 for ; Tue, 6 Sep 2022 20:56:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D57E386EB; Tue, 6 Sep 2022 20:56:57 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FDA529A5 for ; Tue, 6 Sep 2022 20:56:52 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id t7so12224168wrm.10 for ; Tue, 06 Sep 2022 13:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=PRqsWYZZH0s3GHQzsnOmHr+CxH/u15ul/CIYu9EYojs=; b=Vc9QaQE8ZfUf7ItbFMvQYVkMnX0f6ekQuvgXGvdF+seJxFAmGhZU4/sZzM4XxEMjKp Bw4VDC2zn+lHjwmmG+ga0OBUM9JHJjbAyQB7SRIgwBk4bFfGlXBe+AQwr0m2ooiMB1E6 g0cjqP/MqzHpMFPaGU3LVjHNXSUv8yvec13xLxDaL4Ovjt8BeNHEQDmJoonssHWgvx/X PB4zHTc8Scb4UxDj9J0GCFqWPzYUCnllyPh1nxFrqwEA0J5vIX6zHkudspLS2HrA8us/ fBZ7/Fno7MCwVrTyw0FSjccMQ+pSLZ9FfgMhHHnDfRVLwSZ6O4lKKGPPFkGRrUXvP93B MuyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=PRqsWYZZH0s3GHQzsnOmHr+CxH/u15ul/CIYu9EYojs=; b=ybixGrcIgX4PRARPr0I7RhudOOvGL1oWYRJkYztYCdwZPGNrW1d9MsHWsDc0bgVzLQ ge8U9Cc8zPG9B57NwJMtDbJPhRfecrPuIY1RN7irnCdjKTfXpIiZlJaFCYYVuSKjcU9K gvaKJ8gyJN4kodQsFqs9Y9T9MgStSa8G/PSOXQLa7zH7mv1sHtd7r1sRZoUP9EZCqXWf tvB1is4j/1pwySIlZmyx6K4AT1x4FQgh7lRec1lAflc76TQ79Q1aQ1jFUp3gMWempMSY fdLet0x16bVUuO7pV7ibEBC9OjD3DbbBNdmutlqC3YIfV/E9Xn/Wj2GVLKGe8pM3USgY GamA== X-Gm-Message-State: ACgBeo0iLi9Wo6AAa6iqaqeA3p8QBsWcE8xyoM/LJzZC1vj1CwuYJTHn bE1LXkuN+M4kMrQHHDIH6NTsBZfQRRqklqvQ X-Received: by 2002:adf:fb10:0:b0:228:9072:72e1 with SMTP id c16-20020adffb10000000b00228907272e1mr150723wrr.459.1662497810733; Tue, 06 Sep 2022 13:56:50 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id n24-20020a1c7218000000b003a317ee3036sm15735887wmc.2.2022.09.06.13.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 13:56:48 -0700 (PDT) From: Matthieu Baerts To: Mat Martineau , Matthieu Baerts , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Thomas Haller , netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH net-next 4/5] mptcp: allow privileged operations from user namespaces Date: Tue, 6 Sep 2022 22:55:42 +0200 Message-Id: <20220906205545.1623193-5-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220906205545.1623193-1-matthieu.baerts@tessares.net> References: <20220906205545.1623193-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2701; i=matthieu.baerts@tessares.net; h=from:subject; bh=3W6+TJOTAo68xHMXohFmObHMW6ruenZqCo5JEcs+SRE=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjF7O5PKfhLXp46IKTuhbxFJRXEMBLqpmcSLP2ZsMV idUjSFuJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCYxezuQAKCRD2t4JPQmmgc+q3D/ 9tWNzntGdWV3cJtFlqYZ74eleNBcqTmo/FFcgACrAoZRGXRSMygfyVd7RcWw6pxTrlCqCLxwTQcn7I K7eq5EmHyB0CIYg8ZMiEFR8s3joxLddN3xLmRELV3Sob8pAKc0lRF/FEGkHz0pMGb3cIzaLTezAXas pJkx0ufs0rPG6T2oZ0oxWuohbp26Hrd2EjWTdDb/gpwnhJT9aLhD6OmhwpVEKAiN6OJ+faxMRyoooG 6lM1nifQobB0aO+3ZOLU/DmhZzVtx1d/Vn/i+EO5jBuk9TmLFHo5UVG0V61wGjKbXrqE1V88Lj8Z0k 5RzVJcD8ekYq2EKBJm5MhIifxIudDkDFV62mgYfSg9v8Qlv2fBEr1HnQUIEhyr7E2ryYt+0sIpSazD sJfzTXXqEEaPXRZTV5dvCsoO4uw0GfIiNaDybuqTWUApeKdb/xNGJOkZp+Ta9WDq2Wcnwl454wEME2 /q/x78qdSX3RPmKuDKcEr5VnZGwDd8qraCNbysp1c2N2+G0E7FvHBYqmaM4koDoR7d6SrLqmGxyXc3 nz0537mhcNanyF0YOZdZot8GxiW9gh1SWld8y53nL2Iv/kYulTzM5VHX9Oju3ObpCJfn+CczCzYWB9 5NYFg2Zzc4rhc5PtgXHmAhFQycp4WyOiFYiWsvG/HnIi77b/qUzRwuI+kEjA== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Thomas Haller GENL_ADMIN_PERM checks that the user has CAP_NET_ADMIN in the initial namespace by calling netlink_capable(). Instead, use GENL_UNS_ADMIN_PERM which uses netlink_ns_capable(). This checks that the caller has CAP_NET_ADMIN in the current user namespace. See also commit 4a92602aa1cd ("openvswitch: allow management from inside user name= spaces") which introduced this mechanism. See also commit 5617c6cd6f84 ("nl80211: Allow privileged operations from user name= spaces") which introduced this for nl80211. Signed-off-by: Thomas Haller Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts --- net/mptcp/pm_netlink.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 5e142c0c597a..afc98adf2746 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -2218,17 +2218,17 @@ static const struct genl_small_ops mptcp_pm_ops[] = =3D { { .cmd =3D MPTCP_PM_CMD_ADD_ADDR, .doit =3D mptcp_nl_cmd_add_addr, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_DEL_ADDR, .doit =3D mptcp_nl_cmd_del_addr, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_FLUSH_ADDRS, .doit =3D mptcp_nl_cmd_flush_addrs, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_GET_ADDR, @@ -2238,7 +2238,7 @@ static const struct genl_small_ops mptcp_pm_ops[] =3D= { { .cmd =3D MPTCP_PM_CMD_SET_LIMITS, .doit =3D mptcp_nl_cmd_set_limits, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_GET_LIMITS, @@ -2247,27 +2247,27 @@ static const struct genl_small_ops mptcp_pm_ops[] = =3D { { .cmd =3D MPTCP_PM_CMD_SET_FLAGS, .doit =3D mptcp_nl_cmd_set_flags, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_ANNOUNCE, .doit =3D mptcp_nl_cmd_announce, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_REMOVE, .doit =3D mptcp_nl_cmd_remove, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_SUBFLOW_CREATE, .doit =3D mptcp_nl_cmd_sf_create, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, { .cmd =3D MPTCP_PM_CMD_SUBFLOW_DESTROY, .doit =3D mptcp_nl_cmd_sf_destroy, - .flags =3D GENL_ADMIN_PERM, + .flags =3D GENL_UNS_ADMIN_PERM, }, }; =20 --=20 2.37.2 From nobody Thu Mar 28 09:33:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp1632776uao; Tue, 6 Sep 2022 13:57:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR7g3LklQnofzbNZWs8GSwXKruQHvdiBdha44Bsffp2IIlyAFp7QQIWefkfG25Ymphhfkc0/ X-Received: by 2002:a17:902:f787:b0:172:f321:2fd1 with SMTP id q7-20020a170902f78700b00172f3212fd1mr123164pln.121.1662497824243; Tue, 06 Sep 2022 13:57:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662497824; cv=none; d=google.com; s=arc-20160816; b=L7pDRaZNgMURAYkGzYiUdeolpY2eJsTkuzPOjsKVkfOiEb0RMxbeUTniK14A3DJMTW W+HP11CGS9yQUeM1S99BHBwcmNJIw4E3WTSNKmj8qDdyCnV5GqlpzMvZkc+e0aNxprVe 6+p6VqmJKBjmT7eLrhPlc1BltYj9p87DIibuFXxTUZXijGgVgh8QwdXi7OcXXqyOYB1Y i5UjAxcF5BjuVcPz1d+EUMuzJ7CFXtSkojcTwwRMUgwHW+wJeGQifNFRUXVsTkWtzXdk OqfELpaBTTD7cKgurJVz+zl0XVbBVPdbek4HK719+J+EIhMCVz9tgVQ8Kn8lw10gYGoS 30bg== 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:dkim-signature; bh=yMM2FY3IJOc8ZIC+YBU+PmCr88InYvCeIt5RFR0M8Pk=; b=QsVgqUxsWYHaqFj4nZMQKsPe1htAHpbi0Nh4vz9gHrm4ypG3fKjVjhLaDxhZh1+860 mamRCWNmjVWlbvUfKHAFGJznl/FSjX/31e/2sbaSgg9CUNj5HqRqww+5bpUC4Kq5+a/r fdQstUTnBLJ6TdTrRMB+t8A0qEIhNxem8CSx7a5fCg39O7pLKipZozO+yCpTgTgZFZPi RFIY2+shonwqccSw9Vj6XSRroekF516m48Wtb1LhMo7zzt5KfKb1a3JrNuQRsmQtpfsO LN8p3aCaLHLrZsR4qZKYDv2yYoQ7cMGxfgo9g1PHRHTJ7tPz4iCLR1BOvsTTiLoacl6e C6Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=X+Trjh9r; spf=pass (google.com: domain of mptcp+bounces-6204-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6204-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id t16-20020a63f350000000b004305c5d804fsi13899903pgj.114.2022.09.06.13.57.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2022 13:57:04 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6204-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=X+Trjh9r; spf=pass (google.com: domain of mptcp+bounces-6204-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6204-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id C6885280C45 for ; Tue, 6 Sep 2022 20:57:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C236D86EB; Tue, 6 Sep 2022 20:57:02 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84A352F4E for ; Tue, 6 Sep 2022 20:56:57 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id bq9so4344432wrb.4 for ; Tue, 06 Sep 2022 13:56:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=yMM2FY3IJOc8ZIC+YBU+PmCr88InYvCeIt5RFR0M8Pk=; b=X+Trjh9rPGbs7UPhbuvHibypqjrCN55jfWvRbMk2FxxXv9XSvr/JCZRxehh4P2rxRd enCv/OBAErOTA7xi9ki3iIRmvPIOI8cz0o5C5rq1Z2JsqZD7UNTWLFmoFXoVr1GXKI+J AbnYCgmGnf7kyzoqWsUUclps9Y1474jh7R99y/LoGyAwkE2EJbdxwNAEk+y87+GkrTIF ihIua75zQcntpzpVXAXrObMGh9GMCdWd3PqKSCRBnvoexrt6knZbXMQpd4aJm4UoGg4E kIgGf9+y9hPYHOp83DsKRyoiDVxLtdckdjjt+4TqvyiE1Bq+/x4QL4GnrD41xJZjoV2S ZgLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=yMM2FY3IJOc8ZIC+YBU+PmCr88InYvCeIt5RFR0M8Pk=; b=LasiQYD3jHtp1UEbrit1LP3gFpTRKY1Az+/A2j3UAYNHf2eJy5sk5+GhIJsrPTC5ub ++aTjqdAe0iwFTPbux2UCHT8V5gnqbRmu/ivxBJfSEzmrr87crRaWprCzI4sIbbSFsw6 OG4P7ue9d5B7PkYgtC4xTaYcKNWSzCH8gGzXFimqnx0yEH9OkdWZVuiGH4GNuMtrNUPC TacY4r20mXJbPvcv9u0tRpHYpTMRktyxYoHee4J5NRCHNMD3HhyDfDze2pt9dd4+m8ha y3wuq7LJ69Jotp05ZEu6iJ5nMA4faRKNjjxEqPZdVPSaOomyqPo5yDun9in5pcKKo/uU W/lw== X-Gm-Message-State: ACgBeo1S+HxxWY+asd0rlpeg03P9RfOoQ8mpNLQ3e8Fp/mx1U2hpb/62 oME03sDyVOahvgmnny3r8To1lA== X-Received: by 2002:a5d:4534:0:b0:228:a411:1145 with SMTP id j20-20020a5d4534000000b00228a4111145mr165002wra.222.1662497815748; Tue, 06 Sep 2022 13:56:55 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id n24-20020a1c7218000000b003a317ee3036sm15735887wmc.2.2022.09.06.13.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 13:56:52 -0700 (PDT) From: Matthieu Baerts To: Mat Martineau , Matthieu Baerts , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Thomas Haller , netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH net-next 5/5] mptcp: account memory allocation in mptcp_nl_cmd_add_addr() to user Date: Tue, 6 Sep 2022 22:55:43 +0200 Message-Id: <20220906205545.1623193-6-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220906205545.1623193-1-matthieu.baerts@tessares.net> References: <20220906205545.1623193-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=865; i=matthieu.baerts@tessares.net; h=from:subject; bh=hqQtNGfqEcSdigDLJiA3QmJUymEPTwMdYwGqPXFlNhA=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjF7O5vhEtOWQ/pfczdwco8rjLVXWSgmW0J1lYVXuy Z/n7UFCJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCYxezuQAKCRD2t4JPQmmgcyagEA COkVtEkFDeK16sX1ShQiSuLqXI8eeLGbzuEd6GSJ2TQS2vOlYP9aw6gYwraBV+mCCzQx6TicRsWC6p bMjqzjwROu98J7e4ZG0/eWDeqTUVPE8FG2kNbMhOPIopWDr0mRG4kUP5ixQuDixOXSLXY9/0wVcAcQ Y6VJlG6f0dxRSitFjOCUN57qxiA4qC/o/y1D0JN7LDBIAbEty4Q0FKMzux+9kSI2bdF4O2LjCYt/XE oClVp6vFG5VdbSFZVrDamFsRdXOS66w8VYYchqogE6MRzEYUvAAy1gBA5dHJWaZKXq4aHtXY6dbZJ8 eY32rg159zmUy3dPquMmnMRJckEXBpABx4QYeqEcj80b2Ihvq15nxxS8C+lyZ3AJI/O8ielu8wmR45 X0kq/DXWmwPH8fq7TGVKvJVSh2LGHRxqWskmSOGsraHhR2CE5Sf/BKBTF0cfDIYgsB1waN2fw4aaDG Ue2Ea/UDJ3N2LoLG7jQ2dw44+vHuJGaW9RGtxVmjE09ECrF+3Wzq/0BoCx/YxDNw/n42/E6G2FrBtQ NtsRmjkKjir8JSZNnqiJ6VgX+X/P2QWhtMDkUcog49bmeexNm0kUXFqn/8L55EucUvgQXzNPCYIjIZ fuG5TolplUBupmQg6iH5BuSPRn+LnBOwvdcJIXbQqKDJp2uMw7Z2NtzTLG9A== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Thomas Haller Now that non-root users can configure MPTCP endpoints, account the memory allocation to the user. Signed-off-by: Thomas Haller Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts --- net/mptcp/pm_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index afc98adf2746..9813ed0fde9b 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1327,7 +1327,7 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb,= struct genl_info *info) return -EINVAL; } =20 - entry =3D kmalloc(sizeof(*entry), GFP_KERNEL); + entry =3D kmalloc(sizeof(*entry), GFP_KERNEL_ACCOUNT); if (!entry) { GENL_SET_ERR_MSG(info, "can't allocate addr"); return -ENOMEM; --=20 2.37.2