From patchwork Fri Feb 5 16:32:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1436726 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=rEaBCaFQ; 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 4DXLYN6yBzz9sWX for ; Sat, 6 Feb 2021 03:32:24 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id BBF5F100EAB06; Fri, 5 Feb 2021 08:32:22 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::1035; helo=mail-pj1-x1035.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) (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 7D0E7100EBBC4 for ; Fri, 5 Feb 2021 08:32:21 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id m12so3906617pjs.4 for ; Fri, 05 Feb 2021 08:32:21 -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=OeG1PdDt53MvlSTh0Ua/jR4NMkFpUk6X1k1acIbuFfg=; b=rEaBCaFQ6uDLCRMQAR7Eg6S+HFQFp7oiqDoMGh9bSnDqw7ObuIuFaAyF3LeretdOBO PADuRISUWFcYSgOzEXscEkrs35bsRlF6ZMuyW9rA9mnhg2uVw9/Rt+O5Qy6zeCAVoqhZ wNeFiQdQ777rAn7XSKCZykcoKwDEDy7L23/KYtC0vpF6vUf+NNPinJj4oLoO5ISz0Rx2 MSG1ahm+mDQ/73yajPjBtPWFOLZsj9zQUnqpBJ78N61ogd4N3PbKntiEhe2K1reKYZZT Fa1MOq6F9em/aaZ1vdMvzTA1Rs4Uu2kyDeEhag1NLfn3zVDDdxfsB77RIXLVaUA5TiW8 e9tw== 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=OeG1PdDt53MvlSTh0Ua/jR4NMkFpUk6X1k1acIbuFfg=; b=ZalpH6fh9UYOJnT3Of24AsCdBgeC7RVKis6iyQt7rtRflmNPw12BpdZBiKxstHx0Wu PoqLz2CKkMGsGvEz6WZcTZRGh5e9kx+mQEWPlmH8w8Ucw+B9ajvHOVr9wmyZKykKyHWT Y3dYgrwNq1blNmyRnaJTo2AQxiXTz7XKfDpj85jAQk9tfB1yAHh6fc3Un/ED8CqxiPrd QWL0VTKSBwFWiYeRHA9trVlBIP9WZY4YCso2oo3v1BclUFdlrDPXXtTXc6kbUucWAy/L n17ySad4dzDKAdvR055NkmewLLG1e13fw2/mzvw4lcQ/DyBWa5kZSS+7p1SydKJK2BCC pptw== X-Gm-Message-State: AOAM532K1Cjjr/xykKB9GADJclwn5IF22kCLObVjUv597thzHZG07Auh ZUwUjmUF0tXNwXz5384DU9YFA9jooyAm2Q== X-Google-Smtp-Source: ABdhPJxZU6JQAd7q7pNnRn3H08EDFNfEXPm/H5Sz1Clt54/jpWctE/qAjzPXfXA/n7QR1oMb9066WA== X-Received: by 2002:a17:902:e886:b029:de:57b2:da69 with SMTP id w6-20020a170902e886b02900de57b2da69mr4757685plg.65.1612542740726; Fri, 05 Feb 2021 08:32:20 -0800 (PST) Received: from localhost ([43.224.245.179]) by smtp.gmail.com with ESMTPSA id g17sm10081730pfq.135.2021.02.05.08.32.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 08:32:19 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Sat, 6 Feb 2021 00:32:11 +0800 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: 45AXSTI3GTOOHXL7IUCNI5WZSLMZ72WH X-Message-ID-Hash: 45AXSTI3GTOOHXL7IUCNI5WZSLMZ72WH 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 mptcp-next 1/2] mptcp: reserve the MAX_ADDR_ID assignment List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Reserve the MAX_ADDR_ID assignment in the address IDs bitmap, leave it to mark the end of valid IDs in the removing addresses array. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index d4810c31bc4d..7b919c72a406 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1295,6 +1295,7 @@ static int mptcp_nl_cmd_flush_addrs(struct sk_buff *skb, struct genl_info *info) __reset_counters(pernet); pernet->next_id = 1; bitmap_zero(pernet->id_bitmap, MAX_ADDR_ID + 1); + __set_bit(MAX_ADDR_ID, pernet->id_bitmap); spin_unlock_bh(&pernet->lock); mptcp_nl_remove_addrs_list(sock_net(skb->sk), &free_list); @@ -1881,6 +1882,7 @@ static int __net_init pm_nl_init_net(struct net *net) __reset_counters(pernet); pernet->next_id = 1; bitmap_zero(pernet->id_bitmap, MAX_ADDR_ID + 1); + __set_bit(MAX_ADDR_ID, pernet->id_bitmap); spin_lock_init(&pernet->lock); return 0; } From patchwork Fri Feb 5 16:32:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1436728 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=2001:19d0:306:5::1; 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=jhxTXFbn; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXLYT5YZnz9sWc for ; Sat, 6 Feb 2021 03:32:29 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C9E53100EA2D2; Fri, 5 Feb 2021 08:32:27 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::530; helo=mail-pg1-x530.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) (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 094F7100EAB12 for ; Fri, 5 Feb 2021 08:32:25 -0800 (PST) Received: by mail-pg1-x530.google.com with SMTP id o7so4920995pgl.1 for ; Fri, 05 Feb 2021 08:32:25 -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=+xrbONK2APQZhYh9s0a6s6FnX7g17dly+7fYOAr3C+0=; b=jhxTXFbnxbAKt+U0RH9Ag5H15kZvCSKkjYU+m0XR24DpqVBw8h/QZXbiQpX42JRIFj 2fnnmxdMY2v8eoAZFhecHTapv60wzHSVvbjPbGNNDPt/+C/OfSmIHJdibYEz0ZpP/Wwq TZ/T2wUn8a127dX3b80KkxjHpufjTMflm9wBc1j4ftfc7bp1it+PSYTgCh51CVZKwady KFSaT4YC35ODq0ZngaRvCpwTRI/wwc0l4+7qyg3iaCGjm8fWonjqcMUFBM4Ls9K8SoMn vn+WYgxNfHZT9nN9pc8raTMpePiD/Ny7N2kmpveW5VXMv5aSY0/dqvidhoeDtJmU83Pz u7jw== 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=+xrbONK2APQZhYh9s0a6s6FnX7g17dly+7fYOAr3C+0=; b=REl4c0P3ezXPaWAs4jsv8M9wn8+vl5EW8a+Qz6jI7lVJLre9qsh8k1FLZreIvSJzll 7ixyHEjR4wAy2v21Szc68KBe4CcwxvF/lbNSBEamc/uYNPprUbHNG5aBZWqXBEKbvg3L rcZdEPnRh+65rNeNv54ydX/jcjx+/wr019V2PgayKc6AG4xdfJJaQw/pApU5d9aknfDh TMSUElThqh7/NOd4v9UwLCRO9jta9Ra5pIGziBpbj6Aw5ScUzeFtILg0AstZKGWCIA4z nv3RbQQhpRG0vPB/5O0fLsCyOgVcEn3nQCO9gMCQ9hn7KK7UQp1pbbL6Gg/pYd2/CLUX IJ+A== X-Gm-Message-State: AOAM531KyhdQgaQXaJzUagTmHbnEb+t7oYk0sgN7VyyzUWJ2YJsYX+Wf lWMORd8atThB9MGKKWvHP7saV6NwwI8MmQ== X-Google-Smtp-Source: ABdhPJwtnN6O3odtPRJcsPP8ipqLlyr52MtFrBAHzl9oY8Lseo7yBH5B/K6uTinTVr5U8JDyozwk0g== X-Received: by 2002:aa7:8ed2:0:b029:1b9:7c87:8f44 with SMTP id b18-20020aa78ed20000b02901b97c878f44mr5209224pfr.49.1612542744137; Fri, 05 Feb 2021 08:32:24 -0800 (PST) Received: from localhost ([43.224.245.179]) by smtp.gmail.com with ESMTPSA id b206sm10289294pfb.73.2021.02.05.08.32.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 08:32:23 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Sat, 6 Feb 2021 00:32:12 +0800 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: GFBQTGB6SZBGVX3SSKEBR644AGTAWQIG X-Message-ID-Hash: GFBQTGB6SZBGVX3SSKEBR644AGTAWQIG 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 mptcp-next 2/2] selftests: mptcp: skip MAX_ADDR_ID in IDs assignment testcases List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Since the MAX_ADDR_ID assignment had been reserved in the address IDs bitmap, skip it in the pm_netlink.sh testcases. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/pm_netlink.sh | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh index a617e293734c..e3b9a0ddc248 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -105,13 +105,13 @@ for i in `seq 9 256`; do ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.9 id $((i+1)) done check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1 -id 2 flags 10.0.0.9 id 3 flags signal,backup 10.0.1.3 id 4 flags signal 10.0.1.4 id 5 flags signal 10.0.1.5 id 6 flags signal 10.0.1.6 id 7 flags signal 10.0.1.7 -id 8 flags signal 10.0.1.8" "id limit" +id 8 flags signal 10.0.1.8 +id 254 flags 10.0.0.9" "id limit" ip netns exec $ns1 ./pm_nl_ctl flush check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "flush addrs" @@ -139,12 +139,12 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.7 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.8 check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1 id 2 flags 10.0.1.2 -id 3 flags 10.0.1.7 -id 4 flags 10.0.1.8 +id 3 flags 10.0.1.6 +id 4 flags 10.0.1.7 +id 5 flags 10.0.1.8 id 100 flags 10.0.1.3 id 101 flags 10.0.1.4 -id 254 flags 10.0.1.5 -id 255 flags 10.0.1.6" "set ids" +id 254 flags 10.0.1.5" "set ids" ip netns exec $ns1 ./pm_nl_ctl flush ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.1 @@ -156,12 +156,12 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.6 ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.7 ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.8 check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.0.1 -id 2 flags 10.0.0.4 -id 3 flags 10.0.0.6 -id 4 flags 10.0.0.7 -id 5 flags 10.0.0.8 +id 2 flags 10.0.0.3 +id 3 flags 10.0.0.4 +id 4 flags 10.0.0.6 +id 5 flags 10.0.0.7 +id 6 flags 10.0.0.8 id 253 flags 10.0.0.5 -id 254 flags 10.0.0.2 -id 255 flags 10.0.0.3" "wrap-around ids" +id 254 flags 10.0.0.2" "wrap-around ids" exit $ret