From patchwork Sun Apr 22 13:50:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 902628 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="fkm2U/wc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40TWFT3jJhz9s1d for ; Sun, 22 Apr 2018 23:50:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751994AbeDVNu0 (ORCPT ); Sun, 22 Apr 2018 09:50:26 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34047 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053AbeDVNuX (ORCPT ); Sun, 22 Apr 2018 09:50:23 -0400 Received: by mail-pf0-f195.google.com with SMTP id q9so7089947pff.1; Sun, 22 Apr 2018 06:50:23 -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=3wZ4cUf6HB3wMN7aiZGBtBPKHkkZuogQYrULPDpWyYs=; b=fkm2U/wcyQhnplvqi9br9D19x6fACqQBHf8NwZHr5ov6U5ineU5vpXCpxoW7M9QZ7d cP9lj6MmQg5zYXoBLcCSZyD/L0wT4WsVE6j7OkjGwl3OKeDr6v0Ek3gzWg9DaBdMALJz OqSeu/bqIrKv8NsbNeYELvCKX7gLVId8GS6Wol2slMCJmpvPuTJDqyMOb/4qWak+YaH/ RBFDK5dey5u7R+zwEU6cFszMLqHoOHxlng4uskNdISffg4l1e7PLr9qfj5Sa5j+TQvnD 629V/CTqtW+kTKBVbEPDiJ8TdT+rBIx42lC4gdA+zk8l07uz/C+4HUcwggSsmbi8SvuG KFVA== 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=3wZ4cUf6HB3wMN7aiZGBtBPKHkkZuogQYrULPDpWyYs=; b=qOmfmt4FinFjumhymvFodd2DIi4GC/ECAu3Skm67zX1ItfJwEpc3YUU8mAtVSnOIEZ 1cIy39wxQuE+oOHOoH2fg530qlNEVQ/8HpUd+4HpEhLomQttz04/1fk8ubrPuuHeQwib 8jeH52Ja8WIKycZvvGxsx1t8RqSqfq9qaFznA/l73kW4hOWET/7Ynau+CyxdETyQCD3i EV8ZPrNpr3tEC9Jv/RF+OC7yqUsAK5Qk26kDQEW4GXodciTs8wf5MKF3la61IMrapaZo wW5/KAAcq6BVvIT7B5Lilz4Bcb6hcCGJroev5S94/zwsF6q0pwS966zjuoAkQCe89NDo Ub6A== X-Gm-Message-State: ALQs6tAqCNKWWe3NjejF2t5CciVRpsXV6Safj8bwqwtWZMgjpU2g+/4Z GHOrloaZXR4kXlFubJtd+fA= X-Google-Smtp-Source: AIpwx4+zOi5lmPqSGpSmmrCsPMS2eJs8DBsamxlURMAME0MV6q8NDIUGcPnfVfWAMUiNDX0oVUy/GQ== X-Received: by 10.99.131.72 with SMTP id h69mr13963307pge.378.1524405023169; Sun, 22 Apr 2018 06:50:23 -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 k24sm14825415pff.147.2018.04.22.06.50.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 06:50:22 -0700 (PDT) From: Yafang Shao To: eric.dumazet@gmail.com, alexei.starovoitov@gmail.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH net-next] net: init sk_cookie for inet socket Date: Sun, 22 Apr 2018 21:50:04 +0800 Message-Id: <1524405004-10960-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 With sk_cookie we can identify a socket, that is very helpful for traceing and statistic, i.e. tcp tracepiont and ebpf. So we'd better init it by default for inet socket. When using it, we just need call atomic64_read(&sk->sk_cookie). Signed-off-by: Yafang Shao --- include/linux/sock_diag.h | 9 +++++++++ net/ipv4/tcp_input.c | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h index 15fe980..5c916e6 100644 --- a/include/linux/sock_diag.h +++ b/include/linux/sock_diag.h @@ -25,6 +25,15 @@ 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 0396fb9..e6a64a3 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -78,6 +78,7 @@ #include #include #include +#include int sysctl_tcp_max_orphans __read_mostly = NR_FILE; @@ -6188,10 +6189,15 @@ 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;