From patchwork Fri Jan 18 05:00:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1027114 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="ZfsSAhGI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43gpgb0Mzfz9sDr for ; Fri, 18 Jan 2019 16:01:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726381AbfARFBM (ORCPT ); Fri, 18 Jan 2019 00:01:12 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:45110 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725962AbfARFBM (ORCPT ); Fri, 18 Jan 2019 00:01:12 -0500 Received: by mail-pg1-f196.google.com with SMTP id y4so5452191pgc.12 for ; Thu, 17 Jan 2019 21:01:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vudXniPV2SCT4vctRsnZtQ9JLgW6ORCRtNDezv4PHAY=; b=ZfsSAhGIKNS0ytwCbGMTtFrDg6TazIBKI5dfH3f40+hXVWIhl5s4wt38+BIgOzdmaJ AS4AR4MI5+HyC5lY27/+zsCJLR/upseCfEwkDY9it9bu1vfQ38UB32guD2WZ6lKa/RQO ou+q3b5aVS+MYZdIdTe7vk6QmV/G9foFcNe6EmcrTLEaj4RPMkcwRhwZOCbXP4ewGK3a nEoTtrwiWziULHrShkAZfLhn0+0gGCycqn6q+xB9nQth+G35Jo1UWE6pLEL6yN74HZrE EZDcson7DIGTgpyQE0u/uGrDQVVNsZSFMyjYVe3/ZDPikI60hblpTgLMS36i73NT3n00 fGLw== 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=vudXniPV2SCT4vctRsnZtQ9JLgW6ORCRtNDezv4PHAY=; b=r78wdqv2/p08IXy94q+xM+e7mX/LUBiKSwC9E7iALpkUJ7wD18rRrY35iQJfdPeztt Xhks7KHPjKN+2woiiUQfTKN31onetABpEKWa2gOS91xdfshv0qhDgEQfDdNhFwokd2Nl 65KuppYVlewd+Ow3Lpp5qhNaG7egJet5o+VhD51UxOiS8bU4idbggmro0gJdyHj5khAT hL9pl9MbizIfQcz+EEBSc6g/h18NTKIr0SiQFIdcknnmhRfKEOdzDnOIKfPGOwPfGAXx 0Lklzm08YWm0HGcmx+ip2IKNeCqSCWVoUukAMCu5wsCaHHjS7/vEcub6Z/EXijjvmJFF FvuQ== X-Gm-Message-State: AJcUukdhC18gEojBpLW0wK1v/8BFcGG4bG7Phw5Yt9QjGTKsxxix4G7C DpxGmeDueT6Jpe8KbtgIJqE= X-Google-Smtp-Source: ALg8bN7EunvmMDWxPmt0OXdXLtwJRavxhQL9XhrkiOn0ifSXwrrxPoyA9RX9VhztB2G4dayyJkCgVw== X-Received: by 2002:a62:9683:: with SMTP id s3mr17780611pfk.60.1547787671572; Thu, 17 Jan 2019 21:01:11 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id l185sm4935963pfl.54.2019.01.17.21.01.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jan 2019 21:01:11 -0800 (PST) From: Yafang Shao To: davem@davemloft.net, edumazet@google.com Cc: netdev@vger.kernel.org, shaoyafang@didiglobal.com, Yafang Shao Subject: [PATCH v2 net-next] net: sock: do not set sk_cookie in sk_clone_lock() Date: Fri, 18 Jan 2019 13:00:51 +0800 Message-Id: <1547787651-5119-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 The only call site of sk_clone_lock is in inet_csk_clone_lock, and sk_cookie will be set there. So we don't need to set sk_cookie in sk_clone_lock(). Reviewed-by: Eric Dumazet Signed-off-by: Yafang Shao --- net/core/sock.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/core/sock.c b/net/core/sock.c index f00902c..21e2a84 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1726,7 +1726,6 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) newsk->sk_err_soft = 0; newsk->sk_priority = 0; newsk->sk_incoming_cpu = raw_smp_processor_id(); - atomic64_set(&newsk->sk_cookie, 0); if (likely(newsk->sk_net_refcnt)) sock_inuse_add(sock_net(newsk), 1);