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 X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B181C43381 for ; Fri, 8 Mar 2019 22:34:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26CBA20643 for ; Fri, 8 Mar 2019 22:34:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FA1oMnUk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726446AbfCHWeL (ORCPT ); Fri, 8 Mar 2019 17:34:11 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:34801 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726307AbfCHWeL (ORCPT ); Fri, 8 Mar 2019 17:34:11 -0500 Received: by mail-pf1-f194.google.com with SMTP id u9so15143681pfn.1 for ; Fri, 08 Mar 2019 14:34:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=xxzGE3f3MiGmDDjv2mG5QcByfDy3azl+KUovvEsi3N0=; b=FA1oMnUk5cYM/eXT0O++SL6PLsuvTjgWa4XfEMJSmzPjbFc9ckh9IjKWsRUOR0CAIG j8t50BxO5Ak0zeP2lLQZvsbpmQWIW3PqqHl+T1ZX1kUHtGdEvHbDnfYGA+3qsi7dxFpN gwJn+sUgfcN5k4735mLcXXuDEoMcPPWYwCFs63SeEIpMQl4EerW8pkee204fKmkIlBLC iN721IM++mi5QkjdeqIdjGsbYJ63wtPdtTBJim+kVGlbFuZphLU+92EXP/oNcLl49zcj d7M99JAsI/cEHYffW8S/5pd+MaHmiVVEGoNZjxL+GYiZV0lmwVxoOAL3uu5a++3TgE44 JimA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=xxzGE3f3MiGmDDjv2mG5QcByfDy3azl+KUovvEsi3N0=; b=W4fwIIMRFvcUeIoz4YAnSr7WFg/M3+T5zC+FpnkwdgSMVOB6+wRcjhEff7kdYqdKFG +Danl0trPBfvNwmTsUO/nv4dJZvkgFABeTHzNROuBHKEUj7mDyml7DA0vZApTgr5YyPq j4ANvRuBs/JlSDObiaGDPiaCUpzYJkmadYKYbem+e571x+FyO1d7He5n8OSswQKvZf1M 2KTBf75lRnBWirouJYoq0tqHo4bkJso3XP6lJXPtG++Imuc5at7vykasq/wiwGCog5DI ET21uMu1ZP3n/Ak0EEwJetdoBxmNdJkQpIV1VuTTHejqfEgpVyOHI4JFgh3ihJgqofe6 iCQQ== X-Gm-Message-State: APjAAAUPYh096hhNNn1bt9gYKDuryfRt1uvICijMhAJBOCIcXHj8qPa/ NKzn5MLrI9cS7mStrE0lgaa2g+ZT X-Google-Smtp-Source: APXvYqzyQn4tkEHg41nCFdAcoZqoVphxFZEAqnVtuFVhVGqibMEwpxxWdxlxkk5VMijudBhWLOT0cw== X-Received: by 2002:a65:620f:: with SMTP id d15mr18889295pgv.112.1552084449758; Fri, 08 Mar 2019 14:34:09 -0800 (PST) Received: from ?IPv6:2620:15c:2c1:200:55c7:81e6:c7d8:94b? ([2620:15c:2c1:200:55c7:81e6:c7d8:94b]) by smtp.gmail.com with ESMTPSA id x15sm11577594pfn.74.2019.03.08.14.34.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 14:34:09 -0800 (PST) Subject: Re: [PATCH net] tcp: handle inet_csk_reqsk_queue_add() failures To: Guillaume Nault Cc: netdev@vger.kernel.org References: <9b8502f9cec31c971e480ee2281f5cd7088b50df.1552077823.git.gnault@redhat.com> <20190308222231.GA26006@pc-2.home> From: Eric Dumazet Message-ID: Date: Fri, 8 Mar 2019 14:34:07 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190308222231.GA26006@pc-2.home> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 03/08/2019 02:22 PM, Guillaume Nault wrote: > On Fri, Mar 08, 2019 at 01:33:02PM -0800, Eric Dumazet wrote: >> >> >> On 03/08/2019 01:09 PM, Guillaume Nault wrote: >>> @@ -216,7 +216,12 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb, >>> refcount_set(&req->rsk_refcnt, 1); >>> tcp_sk(child)->tsoffset = tsoff; >>> sock_rps_save_rxhash(child, skb); >>> - inet_csk_reqsk_queue_add(sk, req, child); >>> + if (!inet_csk_reqsk_queue_add(sk, req, child)) { >>> + bh_unlock_sock(child); >>> + sock_put(child); >>> + child = NULL; >>> + reqsk_put(req); >> >> Since we use reqsk_free(req) in the same function, we can use reqsk_free(req) >> here as well ? >> > That was my first approach, but reqsk_free() doesn't like it: > > static inline void reqsk_free(struct request_sock *req) > { > /* temporary debugging */ > WARN_ON_ONCE(refcount_read(&req->rsk_refcnt) != 0); > ... > } Oh right, there is this refcount_set(&req->rsk_refcnt, 1) before the call to inet_csk_reqsk_queue_add(sk, req, child); So just change the TFO case only :)