From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A94D1C433EF for ; Mon, 27 Jun 2022 10:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234192AbiF0KUa (ORCPT ); Mon, 27 Jun 2022 06:20:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234096AbiF0KU2 (ORCPT ); Mon, 27 Jun 2022 06:20:28 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C95B10FB; Mon, 27 Jun 2022 03:20:27 -0700 (PDT) Received: from [192.168.10.6] (unknown [39.45.206.71]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id 98CEE6601822; Mon, 27 Jun 2022 11:20:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1656325226; bh=A9r/BSry6EJHsBgDufrR9K+SKyuhrzoYWIWq3KRiJoU=; h=Date:Cc:Subject:To:References:From:In-Reply-To:From; b=SCPIB5zfhRm85OMUNUvxAS01wbSjUx/hvQS/YVerLcCtUPyqEp8b1Ul/Uh14ZPddU buQGjzKEDvEW/b3E3b0yc0D9qyU388lUPH6Btl+2bfjQ7br2tgqnlNAivbN1DidRxA CDcL7TckuRPUYMWoPDtj1apYcQn2WnMwkaQsCSHJ+UW+gQMY8YV1lv4Uzh/K8eJyRt nGNYR5e3vMUlOXS/jWQIiJDjq+E5c5xE+MKd6oiS9s30DWT7YOKH5YPhJcO2RRYPRu 8NPPgn8k7zhljmlk4q6nOvBWlxudlWhJGTP/OPo/FJKDEhVmG62mWxiN/Rn2psUh6D 3IVw7jYasXD8A== Message-ID: <63316ba7-f612-af5a-3f33-125cf89de754@collabora.com> Date: Mon, 27 Jun 2022 15:20:16 +0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Cc: usama.anjum@collabora.com, "David S. Miller" , Hideaki YOSHIFUJI , David Ahern , Jakub Kicinski , Paolo Abeni , Gabriel Krisman Bertazi , open list , Collabora Kernel ML , Paul Gofman , "open list:NETWORKING [TCP]" , Sami Farin Subject: Re: [RFC] EADDRINUSE from bind() on application restart after killing Content-Language: en-US To: Eric Dumazet References: <5099dc39-c6d9-115a-855b-6aa98d17eb4b@collabora.com> <8eb9b438-7018-4fe3-8be6-bb023df99594@collabora.com> From: Muhammad Usama Anjum In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Eric, On 5/30/22 8:28 PM, Eric Dumazet wrote: >> The following command and patch work for my use case. The socket in >> TIME_WAIT_2 or TIME_WAIT state are closed when zapped. >> >> Can you please upstream this patch? > Yes, I will when net-next reopens, thanks for testing it. Have you tried upstreaming it? Tested-by: Muhammad Usama Anjum > >>> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c >>> index 9984d23a7f3e1353d2e1fc9053d98c77268c577e..1b7bde889096aa800b2994c64a3a68edf3b62434 >>> 100644 >>> --- a/net/ipv4/tcp.c >>> +++ b/net/ipv4/tcp.c >>> @@ -4519,6 +4519,15 @@ int tcp_abort(struct sock *sk, int err) >>> local_bh_enable(); >>> return 0; >>> } >>> + if (sk->sk_state == TCP_TIME_WAIT) { >>> + struct inet_timewait_sock *tw = inet_twsk(sk); >>> + >>> + refcount_inc(&tw->tw_refcnt); >>> + local_bh_disable(); >>> + inet_twsk_deschedule_put(tw); >>> + local_bh_enable(); >>> + return 0; >>> + } >>> return -EOPNOTSUPP; >>> } -- Muhammad Usama Anjum