Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 19 May 2021 23:26:48 -0700
From:   Martin KaFai Lau <kafai@fb.com>
To:     Kuniyuki Iwashima <kuniyu@amazon.co.jp>
CC:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Benjamin Herrenschmidt <benh@amazon.com>,
        Kuniyuki Iwashima <kuni1840@gmail.com>, <bpf@vger.kernel.org>,
        <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v6 bpf-next 03/11] tcp: Keep TCP_CLOSE sockets in the
 reuseport group.
Message-ID: <20210520062648.ejqufb6m5wr6z7k2@kafai-mbp.dhcp.thefacebook.com>
References: <20210517002258.75019-1-kuniyu@amazon.co.jp>
 <20210517002258.75019-4-kuniyu@amazon.co.jp>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20210517002258.75019-4-kuniyu@amazon.co.jp>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from kafai-mbp.dhcp.thefacebook.com (2620:10d:c090:400::5:1f3d) by MW4PR03CA0260.namprd03.prod.outlook.com (2603:10b6:303:b4::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Thu, 20 May 2021 06:26:50 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: cce4ff6a-7fcc-40fe-8039-08d91b58416c
X-MS-TrafficTypeDiagnostic: BYAPR15MB2455:
X-Microsoft-Antispam-PRVS: <BYAPR15MB245561528FBB70C7BD48A3C3D52A9@BYAPR15MB2455.namprd15.prod.outlook.com>
X-FB-Source: Internal
X-MS-Oob-TLC-OOBClassifiers: OLM:7219;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: AuhJ73OfKn97gmOxRt5se0eN+thtrBJuBdZtOJ2R2MYb2BoNHf/BfcjXt3R2UtjmDg0/i21rwQymBHpZFwAC0yCy39Ltryt5RpzO904UJ25XfocLbXORsagpkyy5L4p0Uj6Oh+0Q4B5jFkkZiMzOmvnSrczfbcJvJIskE4KJmLOzb8mtqKSM2kb2vD2F4gbQtZBcVvqCn9QsrXlaM9KOrtJHlmLOCaQbHxAU7vDT+EtLG82lCl9wUjUtbgDpPdbfJWl/byBxYxUwfCbV9lan0MuwlZUtXhciTbuzvXYxaSscpjbOw6EyWQf4UPVARkx8Ez5BzYbu+L3Ek9HkybzeqDMKnaxR5Yd0aK1NFpN8XJuVfkfMoq5V0j1oreS8mcjp9XGUswcrX9aso4lGHWDxhr7AbBc3bpBk1ze/t0Jx+S6/e/GKY9pqYw+KiCc0QxAQ1u+MS2RQCzBX6HFgzsJe5hcddQugmFMYUVv4tSwSoNf3knA6sc83qJt/28yDRHN4rzYZoyXY3OP/u0EdZh+msCMSXIrhgAhWmREo4x6W3Rza0hpCIEHBByMcjJh0AH4XydG2Vo+SLZkZKNoyfTGygwRKEW6y+SSZAhhdx0ohXaA=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR15MB3571.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(376002)(39860400002)(366004)(346002)(136003)(83380400001)(2906002)(316002)(6916009)(38100700002)(54906003)(66946007)(7416002)(66556008)(66476007)(55016002)(7696005)(52116002)(8936002)(86362001)(1076003)(6506007)(186003)(16526019)(9686003)(4326008)(8676002)(5660300002)(478600001);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: qwHDB3+Vzw5EJPibqdoJDvlQ+GxZS87E3lLuusWaHFmx16RM+4GWTm3xRTmWMJCguwJsRCvd155+p1gWvRawSpVin1eVSfBBUUQuqJN+cNq88cIkoc7KjdgqWn5/UJBko9+q4TeimaC0b2ph7LY+9hVA4THrehjmBx3bYkNnORvItBTF9E/jJQ0XPYtAYuw5uXjhQIuc4/BDbN1KMjOzxuTBc5Hye3hxBeFH4kfkE2zOoWN021RsPnFQKwTnUUqxQD7Nqo7YBfbXKVFN6zhl9pIKfT+4LXl8aZU2r4CYaLl/RffUFq7uJASYweWlMflqxo5FcBgUt1cPS/eqkxhzlbzFQpcsfnhjNFUlFQyPVmwe2nKf+PlUwed4FYzDa/U53nJIzwJqrbSRBorngMhRmsgq24NAioACLK7JS0mOSBP4rUxGph4wyBsORkR0ZujIgU/jX3rD28gTbwAQpCAUEYFbnIBoCqqfym057ZYl1myc5cmV6FZCwsdPjTd8GUe/hwilLMayJBcML1Q1ntsKWqWLF8T6NRjVgAZZOZ69mQEbXnkphOJ20MknEy2Iv9Pz768IYIPHh8I0wi1C+fxyObjrsQ8YYGUSULdEGX54fVNSIH1bfSNa6Ik59NjVVuvVlzm5KmW0Kb30H3ygIfkX6MD1aeWPhi9oVhws0VDo1TgWosXG4SFEZ7dbCmxuXlTXM86WwOA0okspAXzVs+bad1co7h0edBLUKaFuzoMKS9WRg2C7aEP4RR75SEt6p4I+lawr1GgJv/bjuKs9xxVDMQ==
X-MS-Exchange-CrossTenant-Network-Message-Id: cce4ff6a-7fcc-40fe-8039-08d91b58416c
X-MS-Exchange-CrossTenant-AuthSource: BY5PR15MB3571.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2021 06:26:52.1215
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2cpfhkoFr3hmzgmRCCYUANzF6x0AMi1EOhovyyasmFfUeq+IHV4SzRMxepRO11y8
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB2455
X-OriginatorOrg: fb.com
X-Proofpoint-ORIG-GUID: FlVLX34j4wOv0Y2GhGlRMeVVz4vvtI3_
X-Proofpoint-GUID: FlVLX34j4wOv0Y2GhGlRMeVVz4vvtI3_
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761
 definitions=2021-05-19_10:2021-05-19,2021-05-19 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 phishscore=0
 mlxlogscore=915 impostorscore=0 lowpriorityscore=0 adultscore=0
 malwarescore=0 suspectscore=0 clxscore=1015 priorityscore=1501 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2104190000 definitions=main-2105200051
X-FB-Internal: deliver
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, May 17, 2021 at 09:22:50AM +0900, Kuniyuki Iwashima wrote:

> +static int reuseport_resurrect(struct sock *sk, struct sock_reuseport *old_reuse,
> +			       struct sock_reuseport *reuse, bool bind_inany)
> +{
> +	if (old_reuse == reuse) {
> +		/* If sk was in the same reuseport group, just pop sk out of
> +		 * the closed section and push sk into the listening section.
> +		 */
> +		__reuseport_detach_closed_sock(sk, old_reuse);
> +		__reuseport_add_sock(sk, old_reuse);
> +		return 0;
> +	}
> +
> +	if (!reuse) {
> +		/* In bind()/listen() path, we cannot carry over the eBPF prog
> +		 * for the shutdown()ed socket. In setsockopt() path, we should
> +		 * not change the eBPF prog of listening sockets by attaching a
> +		 * prog to the shutdown()ed socket. Thus, we will allocate a new
> +		 * reuseport group and detach sk from the old group.
> +		 */
For the reuseport_attach_prog() path, I think it needs to consider
the reuse->num_closed_socks != 0 case also and that should belong
to the resurrect case.  For example, when
sk_unhashed(sk) but sk->sk_reuseport == 0.