From patchwork Mon Oct 21 20:09:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 1180841 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 (no SPF record) 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=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="NZZyn7yd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46xnpF4rJRz9sPT for ; Tue, 22 Oct 2019 07:11:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730327AbfJUULO (ORCPT ); Mon, 21 Oct 2019 16:11:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27822 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730106AbfJUULN (ORCPT ); Mon, 21 Oct 2019 16:11:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571688672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FXZ+SxgXr/2IGwUb0gOTBXyZ2gLzS6PaHZmM+kn9m+w=; b=NZZyn7ydNCA72ESKbU5cfsOCOtQvG5clDa/Yro9b1y/CNmEVd/a2GP2Wm9Y0TQ1JDWclwC pY4iV34EvHZTaRUAZ69NdNrVcCR4u9ioHRfRrlyXO5aZdlzYj0faPRzcEzIL07PTZ8fYlQ NnQm+AhthhWGBCABPa0W2XLYUPRli/g= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-372-bcYYO6lyP16HLdl7KU64bA-1; Mon, 21 Oct 2019 16:11:04 -0400 Received: by mail-wm1-f70.google.com with SMTP id a81so2897144wma.4 for ; Mon, 21 Oct 2019 13:11:04 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=jJvmymGcUv0ZDOsi0Z21jQGhJ08AOs478/mU5pDqUEY=; b=cWefM6KXqcYyC3pJHaUld29xNBkSUsk54rmCzwnqx1S8uVACE0wao/O29dK5LMJkSb huPUVGdGmMvkyZzolqYoTsyyHxPd0aLp619YSU31KnUVgcmPJIbb2qdHBX0y1tZVF8y/ gEUW3bx1iFhsZ8hQ9pZGbcW3UP6+yhnV26lfah/DEk8KMzpRmBXACk/i3VqOCC1+ndMB BCa2r3dwDFL36gyFa507X5k2MC2nWf+v1XESFuj/WPhXBoOu9/Mi0yjdiwshFNnPL8au abpZQ55VlHGTXbbOnreqy/vNDXw8EDzJQ8SvnkHPTfFXxMGz4X1wLpDZZdODaYuqlw7I 1AyQ== X-Gm-Message-State: APjAAAVWibYoVh/4jnRjZHnKV4iQ/5h71vYGOyydL7xXNlP0d8KkdUnM /TpJ3KJTSF23I4PMTO4gwR1ub1dWO77GgcOYgZM2ztP5qlRocl2TawUQFvuo3IBnTlgKSvmJhzd 2ee0EWK67TImPbh4E X-Received: by 2002:adf:f145:: with SMTP id y5mr66183wro.330.1571688662755; Mon, 21 Oct 2019 13:11:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+sI/Xw1A3bu0WOul8+P7IPlqyM4jG0vQhFy1OpPQi1LCIpA14yvUaDPuSrhvcoK7tVZPyXA== X-Received: by 2002:adf:f145:: with SMTP id y5mr66158wro.330.1571688662477; Mon, 21 Oct 2019 13:11:02 -0700 (PDT) Received: from turbo.teknoraver.net (net-109-115-41-234.cust.vodafonedsl.it. [109.115.41.234]) by smtp.gmail.com with ESMTPSA id l18sm20701933wrn.48.2019.10.21.13.11.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 13:11:01 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org Cc: Jay Vosburgh , Veaceslav Falico , Andy Gospodarek , "David S . Miller " , Stanislav Fomichev , Daniel Borkmann , Song Liu , Alexei Starovoitov , Paul Blakey , linux-kernel@vger.kernel.org Subject: [PATCH net-next 3/4] flow_dissector: extract more ICMP information Date: Mon, 21 Oct 2019 22:09:47 +0200 Message-Id: <20191021200948.23775-4-mcroce@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191021200948.23775-1-mcroce@redhat.com> References: <20191021200948.23775-1-mcroce@redhat.com> MIME-Version: 1.0 X-MC-Unique: bcYYO6lyP16HLdl7KU64bA-1 X-Mimecast-Spam-Score: 0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ICMP flow dissector currently parses only the Type and Code fields. Some ICMP packets (echo, timestamp) have a 16 bit Identifier field which is used to correlate packets. Add such field in flow_dissector_key_icmp and replace skb_flow_get_be16() with a more complex function which populate this field. Signed-off-by: Matteo Croce --- include/net/flow_dissector.h | 10 +++++- net/core/flow_dissector.c | 64 ++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 25 deletions(-) diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h index 7747af3cc500..86c6bf5eab31 100644 --- a/include/net/flow_dissector.h +++ b/include/net/flow_dissector.h @@ -6,6 +6,8 @@ #include #include +struct sk_buff; + /** * struct flow_dissector_key_control: * @thoff: Transport header offset @@ -160,6 +162,7 @@ struct flow_dissector_key_ports { * icmp: ICMP type (high) and code (low) * type: ICMP type * code: ICMP code + * id: session identifier */ struct flow_dissector_key_icmp { union { @@ -169,6 +172,7 @@ struct flow_dissector_key_icmp { u8 code; }; }; + u16 id; }; /** @@ -282,6 +286,7 @@ struct flow_keys { struct flow_dissector_key_vlan cvlan; struct flow_dissector_key_keyid keyid; struct flow_dissector_key_ports ports; + struct flow_dissector_key_icmp icmp; /* 'addrs' must be the last member */ struct flow_dissector_key_addrs addrs; }; @@ -312,10 +317,13 @@ void make_flow_keys_digest(struct flow_keys_digest *digest, static inline bool flow_keys_have_l4(const struct flow_keys *keys) { - return (keys->ports.ports || keys->tags.flow_label); + return keys->ports.ports || keys->tags.flow_label || keys->icmp.id; } u32 flow_hash_from_keys(struct flow_keys *keys); +void skb_flow_get_icmp_tci(const struct sk_buff *skb, + struct flow_dissector_key_icmp *key_icmp, + void *data, int thoff, int hlen); static inline bool dissector_uses_key(const struct flow_dissector *flow_dissector, enum flow_dissector_key_id key_id) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 6443fac65ce8..90dcf6f2ef19 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -147,27 +147,6 @@ int skb_flow_dissector_bpf_prog_detach(const union bpf_attr *attr) mutex_unlock(&flow_dissector_mutex); return 0; } -/** - * skb_flow_get_be16 - extract be16 entity - * @skb: sk_buff to extract from - * @poff: offset to extract at - * @data: raw buffer pointer to the packet - * @hlen: packet header length - * - * The function will try to retrieve a be32 entity at - * offset poff - */ -static __be16 skb_flow_get_be16(const struct sk_buff *skb, int poff, - void *data, int hlen) -{ - __be16 *u, _u; - - u = __skb_header_pointer(skb, poff, sizeof(_u), data, hlen, &_u); - if (u) - return *u; - - return 0; -} /** * __skb_flow_get_ports - extract the upper layer ports and return them @@ -203,8 +182,44 @@ __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto, } EXPORT_SYMBOL(__skb_flow_get_ports); -/* If FLOW_DISSECTOR_KEY_ICMP is set, get the Type and Code from an ICMP packet - * using skb_flow_get_be16(). +/** + * skb_flow_get_icmp_tci - extract ICMP(6) Type, Code and Identifier fields + * @skb: sk_buff to extract from + * @key_icmp: struct flow_dissector_key_icmp to fill + * @data: raw buffer pointer to the packet + * @toff: offset to extract at + * @hlen: packet header length + */ +void skb_flow_get_icmp_tci(const struct sk_buff *skb, + struct flow_dissector_key_icmp *key_icmp, + void *data, int thoff, int hlen) +{ + struct icmphdr *ih, _ih; + + ih = __skb_header_pointer(skb, thoff, sizeof(_ih), data, hlen, &_ih); + if (!ih) + return; + + key_icmp->type = ih->type; + key_icmp->code = ih->code; + key_icmp->id = 0; + switch (ih->type) { + case ICMP_ECHO: + case ICMP_ECHOREPLY: + case ICMP_TIMESTAMP: + case ICMP_TIMESTAMPREPLY: + case ICMPV6_ECHO_REQUEST: + case ICMPV6_ECHO_REPLY: + /* As we use 0 to signal that the Id field is not present, + * avoid confusion with packets without such field + */ + key_icmp->id = ih->un.echo.id ? : 1; + } +} +EXPORT_SYMBOL(skb_flow_get_icmp_tci); + +/* If FLOW_DISSECTOR_KEY_ICMP is set, dissect an ICMP packet + * using skb_flow_get_icmp_tci(). */ static void __skb_flow_dissect_icmp(const struct sk_buff *skb, struct flow_dissector *flow_dissector, @@ -219,7 +234,8 @@ static void __skb_flow_dissect_icmp(const struct sk_buff *skb, key_icmp = skb_flow_dissector_target(flow_dissector, FLOW_DISSECTOR_KEY_ICMP, target_container); - key_icmp->icmp = skb_flow_get_be16(skb, thoff, data, hlen); + + skb_flow_get_icmp_tci(skb, key_icmp, data, thoff, hlen); } void skb_flow_dissect_meta(const struct sk_buff *skb,