Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp1077590rwi; Mon, 10 Oct 2022 10:51:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5lb/nVGGFSZ4D2G4DjnXy0lM1OMZKOndk8F+62EG86vgFJCQaTHfd5p5bhwNPvZJMMhgrG X-Received: by 2002:a17:906:4786:b0:78d:c3c0:1508 with SMTP id cw6-20020a170906478600b0078dc3c01508mr2462749ejc.211.1665424267900; Mon, 10 Oct 2022 10:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665424267; cv=none; d=google.com; s=arc-20160816; b=oDsTgRTFqPqzzCrUe5BAsvFyTyi0rIGY72fKeB3I7iIh4/4aQZ8gbtXgt+Pf0q1zr4 7PlySnQWwDUT5u0g43S4cW/4NB+OUznoRCh1mSWx2A1aXSHtQleqFZza7PJtOhRMqnYC 3GrJm39GaRvbWBrIHTVRWgeO5ZwLaN8mRxWwnXgb7s6BXsT9eVBNadDXxC/sHXs4P6D9 M42oc0vJGEJcTnAn3IoTWEoHKWV0+kp7Spt1Xe5MzzdqGCsCWBG67Hp43B9Yuco/DtLj fGC7f7l5gy9C776yvXhV9v0R/4Lb+chf6H6wqCphEaGqL0qZh8LL/dl33blQUYQe+oen o+fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=aOVqe8qY0CLYp+T5y2hQD02VItYHe5ZY1yOFJrIXF48=; b=uIiFftlxL/GW7O8Ot/yQYRlL1QMwJLBZv5gOWl39MewuI9HBbIIeVnEqfIN7EMxyTq rC3PqSmVCT4N5E1nfHwZ81bqjEx2Dgp7HPj0CI9hTOaGtqadP58LijmH00s4YmzvSd42 qKQKyUuqKkz9eFTfHXtRSk+K+zhbGw1Cg26CDMX/VhvAT6byjhvPSPbeQg7M7lDHZ1JN wUCKBqhbJKdsPpS8YGLoxhi8vr6FeaQ0LX8DE91s2Zi4IbzdejvN0VIhPY3oeBMTo1Qs K03LGQKXHsWWCDFD8NwenhVc3EU1RKinie9RyzYJiASSLrLWSfKdhH/PTrMceuk4tzau Qw6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b="KC/Uk/6D"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id da20-20020a056402177400b00459cbb8074asi10223540edb.439.2022.10.10.10.50.42; Mon, 10 Oct 2022 10:51:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b="KC/Uk/6D"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229778AbiJJRoh (ORCPT + 99 others); Mon, 10 Oct 2022 13:44:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229747AbiJJRoe (ORCPT ); Mon, 10 Oct 2022 13:44:34 -0400 Received: from smtp-fw-6002.amazon.com (smtp-fw-6002.amazon.com [52.95.49.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 494AE76767; Mon, 10 Oct 2022 10:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1665423872; x=1696959872; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=aOVqe8qY0CLYp+T5y2hQD02VItYHe5ZY1yOFJrIXF48=; b=KC/Uk/6DXVGfEM9ufD6EpN5ExqXy/RIWV9Iku+F2Hxr7jJmizBqJ0Pkk v5INsgsOECTmPWMXWNdvwIKRAY4x7F9QIinU5YBjSgUfFHxLjupqnhnXs 9+3wn6dDsj52GeKRzqsuR8hvnKA8L/zf5Q46tcpO9dWlMHEEkv0892Lab g=; X-IronPort-AV: E=Sophos;i="5.95,173,1661817600"; d="scan'208";a="253833678" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-iad-1a-c92fe759.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-6002.iad6.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 17:44:20 +0000 Received: from EX13MTAUWB001.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan2.iad.amazon.com [10.40.163.34]) by email-inbound-relay-iad-1a-c92fe759.us-east-1.amazon.com (Postfix) with ESMTPS id 17631C0433; Mon, 10 Oct 2022 17:44:20 +0000 (UTC) Received: from EX19D004ANA001.ant.amazon.com (10.37.240.138) by EX13MTAUWB001.ant.amazon.com (10.43.161.249) with Microsoft SMTP Server (TLS) id 15.0.1497.38; Mon, 10 Oct 2022 17:44:19 +0000 Received: from 88665a182662.ant.amazon.com (10.43.160.124) by EX19D004ANA001.ant.amazon.com (10.37.240.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1118.12; Mon, 10 Oct 2022 17:44:13 +0000 From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Hideaki YOSHIFUJI , David Ahern , Martin KaFai Lau CC: Craig Gallek , Willem de Bruijn , Kuniyuki Iwashima , Kuniyuki Iwashima , , Subject: [PATCH v1 net 0/3] soreuseport: Fix issues related to the faster selection algorithm. Date: Mon, 10 Oct 2022 10:43:48 -0700 Message-ID: <20221010174351.11024-1-kuniyu@amazon.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.43.160.124] X-ClientProxiedBy: EX13D22UWC002.ant.amazon.com (10.43.162.29) To EX19D004ANA001.ant.amazon.com (10.37.240.138) X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org setsockopt(SO_INCOMING_CPU) for UDP/TCP is broken since 4.5/4.6 due to these commits: * e32ea7e74727 ("soreuseport: fast reuseport UDP socket selection") * c125e80b8868 ("soreuseport: fast reuseport TCP socket selection") These commits introduced the O(1) socket selection algorithm and removed O(n) iteration over the list, but it ignores the score calculated by compute_score(). As a result, it caused two misbehaviours: * Unconnected sockets receive packets sent to connected sockets * SO_INCOMING_CPU does not work The former is fixed by commit acdcecc61285 ("udp: correct reuseport selection with connected sockets"), but it introduced a rare race, which the first patch fixes. The second patch fixes the latter, and the third adds a test for SO_INCOMING_CPU. Kuniyuki Iwashima (3): udp: Update reuse->has_conns under reuseport_lock. soreuseport: Fix socket selection for SO_INCOMING_CPU. selftest: Add test for SO_INCOMING_CPU. include/net/sock_reuseport.h | 25 ++- net/core/sock.c | 5 +- net/core/sock_reuseport.c | 88 ++++++++++- net/ipv4/datagram.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/datagram.c | 2 +- net/ipv6/udp.c | 2 +- tools/testing/selftests/net/.gitignore | 1 + tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/so_incoming_cpu.c | 148 ++++++++++++++++++ 10 files changed, 260 insertions(+), 16 deletions(-) create mode 100644 tools/testing/selftests/net/so_incoming_cpu.c -- 2.30.2