From patchwork Mon May 6 03:22:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: shaozhengchao X-Patchwork-Id: 13654871 X-Patchwork-Delegate: kuba@kernel.org Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (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 B36CC38384; Mon, 6 May 2024 03:17:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714965464; cv=none; b=hTek/iO9AE0aMyXKnd3K41mftrTUoYyzIaLQBFvSKyGmp2pV5Ua+wlExq/BGoHFH+iFzIvoVO4yx7PbcY51G/Z315W/xUninY12lwy1xdwH6Ei11fwMgIpPXf/OhozOLgpk3Wsg71d0AJzUVP3WuApw/nHEfUivDjOEQKTgdj0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714965464; c=relaxed/simple; bh=J7hf10hlA64v+NAl7fAVZclLVGYm8b6X3e4p8vnsg2U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eHvGID+Wyupy2Lcr6mjmnTnv52b03gMh6w9JTEWiTRohaJmjU8aVY1MQp3H067j3tBkeNtq7e3pD+RvZbUVKWY455EOht1XVEYb6gq6N/UMgP4Mehrn5Rsf/3jRj9sgCrB4pJGRYxUHxsZaKam1H8uLluNW9He24cH0/s1/iEb8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.163]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4VXmjr5cJHz1yp7l; Mon, 6 May 2024 11:14:56 +0800 (CST) Received: from dggpeml500026.china.huawei.com (unknown [7.185.36.106]) by mail.maildlp.com (Postfix) with ESMTPS id 8C65418002D; Mon, 6 May 2024 11:17:40 +0800 (CST) Received: from huawei.com (10.175.101.6) by dggpeml500026.china.huawei.com (7.185.36.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 6 May 2024 11:17:39 +0800 From: Zhengchao Shao To: CC: , , , , , , , , , , Subject: [PATCH stable,4.19 1/2] Revert "tcp: Fix NEW_SYN_RECV handling in inet_twsk_purge()" Date: Mon, 6 May 2024 11:22:39 +0800 Message-ID: <20240506032240.3170844-2-shaozhengchao@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240506032240.3170844-1-shaozhengchao@huawei.com> References: <20240506032240.3170844-1-shaozhengchao@huawei.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500026.china.huawei.com (7.185.36.106) X-Patchwork-Delegate: kuba@kernel.org This reverts commit 4212fa80f700b06358a13cc7ea9d25788beff877. In order to revert commit 9f06ebd1daf5("tcp: Clean up kernel listener's reqsk in inet_twsk_purge()"), revert this patch. Signed-off-by: Zhengchao Shao --- net/ipv4/inet_timewait_sock.c | 41 +++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c index fc01efef980a..0ab4e0e28baf 100644 --- a/net/ipv4/inet_timewait_sock.c +++ b/net/ipv4/inet_timewait_sock.c @@ -253,12 +253,12 @@ void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo, bool rearm) } EXPORT_SYMBOL_GPL(__inet_twsk_schedule); -/* Remove all non full sockets (TIME_WAIT and NEW_SYN_RECV) for dead netns */ void inet_twsk_purge(struct inet_hashinfo *hashinfo, int family) { + struct inet_timewait_sock *tw; + struct sock *sk; struct hlist_nulls_node *node; unsigned int slot; - struct sock *sk; for (slot = 0; slot <= hashinfo->ehash_mask; slot++) { struct inet_ehash_bucket *head = &hashinfo->ehash[slot]; @@ -267,35 +267,38 @@ void inet_twsk_purge(struct inet_hashinfo *hashinfo, int family) rcu_read_lock(); restart: sk_nulls_for_each_rcu(sk, node, &head->chain) { - int state = inet_sk_state_load(sk); + if (sk->sk_state != TCP_TIME_WAIT) { + /* A kernel listener socket might not hold refcnt for net, + * so reqsk_timer_handler() could be fired after net is + * freed. Userspace listener and reqsk never exist here. + */ + if (unlikely(sk->sk_state == TCP_NEW_SYN_RECV && + hashinfo->pernet)) { + struct request_sock *req = inet_reqsk(sk); + + inet_csk_reqsk_queue_drop_and_put(req->rsk_listener, req); + } - if ((1 << state) & ~(TCPF_TIME_WAIT | - TCPF_NEW_SYN_RECV)) continue; + } - if (sk->sk_family != family || - refcount_read(&sock_net(sk)->count)) + tw = inet_twsk(sk); + if ((tw->tw_family != family) || + refcount_read(&twsk_net(tw)->count)) continue; - if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt))) + if (unlikely(!refcount_inc_not_zero(&tw->tw_refcnt))) continue; - if (unlikely(sk->sk_family != family || - refcount_read(&sock_net(sk)->count))) { - sock_gen_put(sk); + if (unlikely((tw->tw_family != family) || + refcount_read(&twsk_net(tw)->count))) { + inet_twsk_put(tw); goto restart; } rcu_read_unlock(); local_bh_disable(); - if (state == TCP_TIME_WAIT) { - inet_twsk_deschedule_put(inet_twsk(sk)); - } else { - struct request_sock *req = inet_reqsk(sk); - - inet_csk_reqsk_queue_drop_and_put(req->rsk_listener, - req); - } + inet_twsk_deschedule_put(tw); local_bh_enable(); goto restart_rcu; } From patchwork Mon May 6 03:22:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: shaozhengchao X-Patchwork-Id: 13654872 X-Patchwork-Delegate: kuba@kernel.org Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (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 5F64638DFB; Mon, 6 May 2024 03:17:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714965465; cv=none; b=C0rcqejhdfj7XG/2M+uvjJNDrGEl7e5YOfShDzk9amEW6bUrvPpskDc/yHN/aRlzzCxuKyNXiCLJL3VOaknWHcU2YqPiPBasqkZVh0D23DzWNgDZaSRW8LimOaKvEl2Q1qiklWjDtF3/Ar+ULjG0nC25ebLE0amssxF5GY0jttM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714965465; c=relaxed/simple; bh=yb0NMuBOXoJKKqN+RciDOBTeClDZiACfaU+F4d67opw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GN9QqRjV4sKmyqbPKs19spuKfheonjl7SmkiYEjv4N/xxPDGT0KnwTEhtpwXdqX93ceQAaymM96ojaXKGsbqkf3gzovmeW+COaEXY0UWTnwP1GiBHObvhp+1kK2effHFlfv35RhdrhpR9yAmRJlXs2QxCF22tCrq/m50SUzKjqM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4VXmlg0jgczccxC; Mon, 6 May 2024 11:16:31 +0800 (CST) Received: from dggpeml500026.china.huawei.com (unknown [7.185.36.106]) by mail.maildlp.com (Postfix) with ESMTPS id 2592C18007B; Mon, 6 May 2024 11:17:41 +0800 (CST) Received: from huawei.com (10.175.101.6) by dggpeml500026.china.huawei.com (7.185.36.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 6 May 2024 11:17:40 +0800 From: Zhengchao Shao To: CC: , , , , , , , , , , Subject: [PATCH stable,4.19 2/2] Revert "tcp: Clean up kernel listener's reqsk in inet_twsk_purge()" Date: Mon, 6 May 2024 11:22:40 +0800 Message-ID: <20240506032240.3170844-3-shaozhengchao@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240506032240.3170844-1-shaozhengchao@huawei.com> References: <20240506032240.3170844-1-shaozhengchao@huawei.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500026.china.huawei.com (7.185.36.106) X-Patchwork-Delegate: kuba@kernel.org This reverts commit 9f06ebd1daf5914afb21b95781cf637a025e9f9a. There's no "pernet" variable in the struct hashinfo. The "pernet" variable is introduced from v6.1-rc1. Revert this patch. Signed-off-by: Zhengchao Shao --- net/ipv4/inet_timewait_sock.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c index 0ab4e0e28baf..88c5069b5d20 100644 --- a/net/ipv4/inet_timewait_sock.c +++ b/net/ipv4/inet_timewait_sock.c @@ -267,21 +267,8 @@ void inet_twsk_purge(struct inet_hashinfo *hashinfo, int family) rcu_read_lock(); restart: sk_nulls_for_each_rcu(sk, node, &head->chain) { - if (sk->sk_state != TCP_TIME_WAIT) { - /* A kernel listener socket might not hold refcnt for net, - * so reqsk_timer_handler() could be fired after net is - * freed. Userspace listener and reqsk never exist here. - */ - if (unlikely(sk->sk_state == TCP_NEW_SYN_RECV && - hashinfo->pernet)) { - struct request_sock *req = inet_reqsk(sk); - - inet_csk_reqsk_queue_drop_and_put(req->rsk_listener, req); - } - + if (sk->sk_state != TCP_TIME_WAIT) continue; - } - tw = inet_twsk(sk); if ((tw->tw_family != family) || refcount_read(&twsk_net(tw)->count))