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=-17.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 7B088C0650E for ; Mon, 1 Jul 2019 20:48:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FE1520663 for ; Mon, 1 Jul 2019 20:48:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="MFTt/l0K" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726896AbfGAUsg (ORCPT ); Mon, 1 Jul 2019 16:48:36 -0400 Received: from mail-vk1-f202.google.com ([209.85.221.202]:53023 "EHLO mail-vk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726963AbfGAUsf (ORCPT ); Mon, 1 Jul 2019 16:48:35 -0400 Received: by mail-vk1-f202.google.com with SMTP id l186so3914453vke.19 for ; Mon, 01 Jul 2019 13:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=pVikEg8jjnvM0Q28LM7sWpY08h9CumZd8qGejdWCdLY=; b=MFTt/l0Ktxh+G4sjegR1dnw1FepmgMdcBQHxO0sDejqpeapdfhyli2EUq/r7ytQsO3 do0x39FK1WqmbJDhz+tudp3ca4VHnghWvAIi4SBNyou9howUW/TGdeKlH2Q+ZZDncOL1 u09WOJj08Bw7LMUNgG/AXIXpFrC8mz5xPJN0h3CE1KQimh4jw2O9oN4uwiYWI/4y70l2 CtCUA8heNY3Lnldkadw+/nReVaFk/mTto21TBiDj/VkhWRYxfS8mh/3IWf2R2wbfwp81 i4adZKj2LI9NX5NXjT0PJ1/uYc+VuxNRikUQF6AC1mnn7ShvckEwVRNgemU2P5kl5b9j I+IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=pVikEg8jjnvM0Q28LM7sWpY08h9CumZd8qGejdWCdLY=; b=BUY0XyD20ZnLeVnC4Z+A3w19KKmddm+JH41it2nuA/HuBfb+MIWlex8r3X6NYa+pYt wYpYAl+usLxrnYFP5qzJ8jAe/bKdOrwCq0TGfsHuamfbQRE4NXW0nlWDE5zElhfVsPI8 6J5h1m+oRyWM2i3nZi5QEzsqMxLRO6kUJDtJodN3fNFgcCy3EXptGRW+cLHFQDtXYRor Dg0lcIwh+3gZ3lQs5jCgGODHY3hgD6bVaZRXdLBMNgOV2n8SRHh+TqpXNqQZd3UoQzlc e4GZaCIS3gEvWOD/fBk7h9HLO9rIOzbpenaJkrgzKYCYehPQ9Grxq0rylHy43DtOBUAg cqrw== X-Gm-Message-State: APjAAAU/p/mlvyqw5wwLYoK/yUsLXecaHE1b7jx56haZg7/D5hg1Doxd qh8XlRAqctMtEL2RpMQ6rfq+ymiVyZVVeSj+BdJ2dl8LtboF1w3eefOWNt3U5cua7DT5PcI4maN 7lfJF69ukaAHa1nJQBi9uiXpa0PDlpr6/owPM1viMO/fYWQ/2BF39tw== X-Google-Smtp-Source: APXvYqxRizHEqb38RLLpSnKtke5tWnEtl1FdzxTuJoLYKxThF94TMRPyjJRCUG91ip2fTjwmCV7AKv4= X-Received: by 2002:a1f:200b:: with SMTP id g11mr9069177vkg.26.1562014114519; Mon, 01 Jul 2019 13:48:34 -0700 (PDT) Date: Mon, 1 Jul 2019 13:48:17 -0700 In-Reply-To: <20190701204821.44230-1-sdf@google.com> Message-Id: <20190701204821.44230-5-sdf@google.com> Mime-Version: 1.0 References: <20190701204821.44230-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH bpf-next 4/8] bpf: add icsk_retransmits to bpf_tcp_sock From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Eric Dumazet , Priyaranjan Jha , Yuchung Cheng , Soheil Hassas Yeganeh Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add some inet_connection_sock fields to bpf_tcp_sock that might be useful for debugging congestion control issues. Cc: Eric Dumazet Cc: Priyaranjan Jha Cc: Yuchung Cheng Cc: Soheil Hassas Yeganeh Signed-off-by: Stanislav Fomichev --- include/uapi/linux/bpf.h | 1 + net/core/filter.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index bfb0b1a76684..ead27aebf491 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -3078,6 +3078,7 @@ struct bpf_tcp_sock { */ __u32 delivered; /* Total data packets delivered incl. rexmits */ __u32 delivered_ce; /* Like the above but only ECE marked packets */ + __u32 icsk_retransmits; /* Number of unrecovered [RTO] timeouts */ }; struct bpf_sock_tuple { diff --git a/net/core/filter.c b/net/core/filter.c index 3da4b6c38b46..089aaea0ccc6 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5544,7 +5544,8 @@ static const struct bpf_func_proto bpf_sock_addr_sk_lookup_udp_proto = { bool bpf_tcp_sock_is_valid_access(int off, int size, enum bpf_access_type type, struct bpf_insn_access_aux *info) { - if (off < 0 || off >= offsetofend(struct bpf_tcp_sock, delivered_ce)) + if (off < 0 || off >= offsetofend(struct bpf_tcp_sock, + icsk_retransmits)) return false; if (off % size != 0) @@ -5575,6 +5576,20 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type, offsetof(struct tcp_sock, FIELD)); \ } while (0) +#define BPF_INET_SOCK_GET_COMMON(FIELD) \ + do { \ + BUILD_BUG_ON(FIELD_SIZEOF(struct inet_connection_sock, \ + FIELD) > \ + FIELD_SIZEOF(struct bpf_tcp_sock, FIELD)); \ + *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( \ + struct inet_connection_sock, \ + FIELD), \ + si->dst_reg, si->src_reg, \ + offsetof( \ + struct inet_connection_sock, \ + FIELD)); \ + } while (0) + if (insn > insn_buf) return insn - insn_buf; @@ -5661,6 +5676,9 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type, case offsetof(struct bpf_tcp_sock, delivered_ce): BPF_TCP_SOCK_GET_COMMON(delivered_ce); break; + case offsetof(struct bpf_tcp_sock, icsk_retransmits): + BPF_INET_SOCK_GET_COMMON(icsk_retransmits); + break; } return insn - insn_buf; -- 2.22.0.410.gd8fdbe21b5-goog