From patchwork Tue Apr 24 12:05:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 903383 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NBmVprDU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vhqn55Tzz9ry1 for ; Tue, 24 Apr 2018 22:05:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754280AbeDXMFx (ORCPT ); Tue, 24 Apr 2018 08:05:53 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36402 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751279AbeDXMFv (ORCPT ); Tue, 24 Apr 2018 08:05:51 -0400 Received: by mail-pf0-f193.google.com with SMTP id g14so12084805pfh.3 for ; Tue, 24 Apr 2018 05:05:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0zkRG36wQLbr82wsgq50ppwKB17gN4zUn3Zg+MbeO6c=; b=NBmVprDUklQq59KXBpMWoQDqD3s0rDU7NyR0Q/1AKu+ZNwEM0w1/TA2y7hn2Zr4z8S MLosP1pNLe8uF2xS/S/y74HXQvzY194cPGkPQop/rtijuEbE30VMC71th0Y/Dap+hHOP X1K2xXN05eB+T7V1qqLbQoT9pwDhnl+XYoTL3iDZxiGikjFXOa03JGF0D4D60hZVeX23 NKZMt1Ln8SLk68gYb7RMQDKMYqFItCN77l52gPDRAw12AGFaLaPJy16k6/ilL4RN+60M Llm34TSlVZX6ZFw9BYzskHYXXgrTDUfwxvW3fBENzmEq1zqn1gm/PReAEz5SjGX8ldxc rlKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0zkRG36wQLbr82wsgq50ppwKB17gN4zUn3Zg+MbeO6c=; b=F4+pgin4G46DOliC/MCctnjiUyauEqeLyCQuBP9p1OyQTq7itm9ESXP0HQK3qeneu7 C/mYLJvQafPh/ojcRonF/6HcGEcM5whzkCDfpFmSoJcMMrN5nE3cm4flAnE5FRSRUCKS S9HtagGmEcTlLGH02mZ3yeogPSXZBvphiWF3zpIg7E3xS335MHDRJ552S4biSlpNVfjW YlsqL4sAXmUqZyfyUX69m6DyU+eqK/7xYYOZnf6+01CA0Legm1XRT7tvQmPP1+FWkS9h ZzqEyCIODTujcTDivKogAR5sl2OqGuldiveUsRQgLgSVZ0bGww8MFWAntELCuEY7GqNZ 1HzQ== X-Gm-Message-State: ALQs6tAU2G9AHelxXoLSodPraiDJLGNrJf4YL+0BR1CDAatMJ+wgEtr/ REYaJmIww4lSrGdzqHD3as/zVg== X-Google-Smtp-Source: AB8JxZqWGhPol3WXy6GkwhHJs04wE49lYNlDVZzYxlrUDb6UgaAFbMY5xybPY4T/vhj2eYnF0gjE3A== X-Received: by 2002:a17:902:b492:: with SMTP id y18-v6mr1359890plr.2.1524571551335; Tue, 24 Apr 2018 05:05:51 -0700 (PDT) Received: from li1588-6.members.linode.com (li1588-6.members.linode.com. [139.162.104.6]) by smtp.gmail.com with ESMTPSA id e13sm20895895pga.53.2018.04.24.05.05.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 05:05:50 -0700 (PDT) From: Yafang Shao To: eric.dumazet@gmail.com, davem@davemloft.net Cc: netdev@vger.kernel.org, Yafang Shao Subject: [PATCH net-next] Revert "net: init sk_cookie for inet socket" Date: Tue, 24 Apr 2018 20:05:37 +0800 Message-Id: <1524571537-9781-1-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This revert commit ("net: init sk_cookie for inet socket") Per discussion with Eric. Signed-off-by: Yafang Shao --- include/linux/sock_diag.h | 9 --------- net/ipv4/tcp_input.c | 8 +------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h index 5c916e6..15fe980 100644 --- a/include/linux/sock_diag.h +++ b/include/linux/sock_diag.h @@ -25,15 +25,6 @@ struct sock_diag_handler { void sock_diag_register_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh)); void sock_diag_unregister_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh)); -static inline -void sock_init_cookie(struct sock *sk) -{ - u64 res; - - res = atomic64_inc_return(&sock_net(sk)->cookie_gen); - atomic64_set(&sk->sk_cookie, res); -} - u64 sock_gen_cookie(struct sock *sk); int sock_diag_check_cookie(struct sock *sk, const __u32 *cookie); void sock_diag_save_cookie(struct sock *sk, __u32 *cookie); diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 17b7858..5a17cfc 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -78,7 +78,6 @@ #include #include #include -#include int sysctl_tcp_max_orphans __read_mostly = NR_FILE; @@ -6191,15 +6190,10 @@ struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops, #if IS_ENABLED(CONFIG_IPV6) ireq->pktopts = NULL; #endif + atomic64_set(&ireq->ir_cookie, 0); ireq->ireq_state = TCP_NEW_SYN_RECV; write_pnet(&ireq->ireq_net, sock_net(sk_listener)); ireq->ireq_family = sk_listener->sk_family; - - BUILD_BUG_ON(offsetof(struct inet_request_sock, ir_cookie) != - offsetof(struct sock, sk_cookie)); - BUILD_BUG_ON(offsetof(struct inet_request_sock, ireq_net) != - offsetof(struct sock, sk_net)); - sock_init_cookie((struct sock *)ireq); } return req;