From patchwork Mon Dec 6 09:09:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammad Heib X-Patchwork-Id: 1563846 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PtOhA3uz; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J6yLl1nVYz9s1l for ; Mon, 6 Dec 2021 20:10:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 85C5F60673; Mon, 6 Dec 2021 09:10:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NfEU4OXyf4wc; Mon, 6 Dec 2021 09:10:03 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 67E8C600C6; Mon, 6 Dec 2021 09:10:02 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3080EC002F; Mon, 6 Dec 2021 09:10:02 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id A8F5AC002F for ; Mon, 6 Dec 2021 09:10:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 89060400C6 for ; Mon, 6 Dec 2021 09:10:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tpwImQ6w-dnr for ; Mon, 6 Dec 2021 09:10:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id 1B8C7400A4 for ; Mon, 6 Dec 2021 09:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638781798; 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; bh=pp+huZ3DqbUY0BI5SbUwYMh6yV1zIg6FTYhP6dOkgQE=; b=PtOhA3uz0E+9UnHfS6kGf/jPkvO3NNmlCP3x6PHgkcqLNMb8PAzupnJMCvZ8Q6IX3kieiW DVt5jmZj3Ll6s85BneQJ01JjSKKIQMb6xEnBki5OvmtA5wti9oHU0EhZWwz3IlP4NQ5Uqr IFB/fHXpO69vvuh3U/oSRK3chLWDZ1c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-314-PzqU3GEqOTqwg-dDbLzdvw-1; Mon, 06 Dec 2021 04:09:56 -0500 X-MC-Unique: PzqU3GEqOTqwg-dDbLzdvw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 268701006AA1 for ; Mon, 6 Dec 2021 09:09:56 +0000 (UTC) Received: from mheiblap.localdomain.com (unknown [10.35.206.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2F0919C59; Mon, 6 Dec 2021 09:09:54 +0000 (UTC) From: Mohammad Heib To: dev@openvswitch.org Date: Mon, 6 Dec 2021 11:09:50 +0200 Message-Id: <20211206090950.1959998-1-mheib@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mheib@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v3] controller/pinctrl: improve packet-in debuggability X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Improve packet-in debuggability within pinctrl module by printing basic details about each received packet-in message, those messages will be printed to the logs only when DBG log level is enabled. Also, add two coverage counters that will indicate the total packet-in messages that were received and the number of times that the pinctrl main thread was notified to handle a change in the local DBs, those counters can be used by the user as an indicator to enable the DBG logs level and see more details about the received packet-in in the logs. Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1821965 Signed-off-by: Mohammad Heib --- controller/pinctrl.c | 39 ++++++++++++++ include/ovn/actions.h | 1 + lib/actions.c | 123 ++++++++++++++++++++++++++++++++++++++++++ tests/ovn.at | 8 +++ 4 files changed, 171 insertions(+) diff --git a/controller/pinctrl.c b/controller/pinctrl.c index 0d443c150..4ce16ac74 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -364,6 +364,8 @@ COVERAGE_DEFINE(pinctrl_drop_put_mac_binding); COVERAGE_DEFINE(pinctrl_drop_buffered_packets_map); COVERAGE_DEFINE(pinctrl_drop_controller_event); COVERAGE_DEFINE(pinctrl_drop_put_vport_binding); +COVERAGE_DEFINE(pinctrl_notify_main_thread); +COVERAGE_DEFINE(pinctrl_total_pin_pkts); struct empty_lb_backends_event { struct hmap_node hmap_node; @@ -3268,6 +3270,41 @@ process_packet_in(struct rconn *swconn, const struct ofp_header *msg) ntohl(ah->opcode)); break; } + + + if (VLOG_IS_DBG_ENABLED()) { + struct ds pin_str = DS_EMPTY_INITIALIZER; + char * opc_str = ovnact_op_to_string(ntohl(ah->opcode)); + + ds_put_format(&pin_str, + "pinctrl received packet-in | opcode=%s", + opc_str); + + ds_put_format(&pin_str, "| OF_Table_ID=%u", pin.table_id); + ds_put_format(&pin_str, "| OF_Cookie_ID=0x%"PRIx64, + ntohll(pin.cookie)); + + if (pin.flow_metadata.flow.in_port.ofp_port) { + ds_put_format(&pin_str, "| in-port=%u", + pin.flow_metadata.flow.in_port.ofp_port); + } + + ds_put_format(&pin_str, "| src-mac="ETH_ADDR_FMT",", + ETH_ADDR_ARGS(headers.dl_src)); + ds_put_format(&pin_str, " dst-mac="ETH_ADDR_FMT, + ETH_ADDR_ARGS(headers.dl_dst)); + if (headers.dl_type != htons(ETH_TYPE_IPV6)) { + ds_put_format(&pin_str, "| src-ip="IP_FMT",", + IP_ARGS(headers.nw_src)); + ds_put_format(&pin_str, " dst-ip="IP_FMT, + IP_ARGS(headers.nw_dst)); + } + + VLOG_DBG("%s \n", ds_cstr(&pin_str)); + ds_destroy(&pin_str); + free(opc_str); + } + } /* Called with in the pinctrl_handler thread context. */ @@ -3285,6 +3322,7 @@ pinctrl_recv(struct rconn *swconn, const struct ofp_header *oh, config.miss_send_len = UINT16_MAX; set_switch_config(swconn, &config); } else if (type == OFPTYPE_PACKET_IN) { + COVERAGE_INC(pinctrl_total_pin_pkts); process_packet_in(swconn, oh); } else { if (VLOG_IS_DBG_ENABLED()) { @@ -3309,6 +3347,7 @@ notify_pinctrl_handler(void) static void notify_pinctrl_main(void) { + COVERAGE_INC(pinctrl_notify_main_thread); seq_change(pinctrl_main_seq); } diff --git a/include/ovn/actions.h b/include/ovn/actions.h index ede5eb93c..cdef5fb03 100644 --- a/include/ovn/actions.h +++ b/include/ovn/actions.h @@ -806,5 +806,6 @@ void ovnacts_encode(const struct ovnact[], size_t ovnacts_len, struct ofpbuf *ofpacts); void ovnacts_free(struct ovnact[], size_t ovnacts_len); +char *ovnact_op_to_string(uint32_t); #endif /* ovn/actions.h */ diff --git a/lib/actions.c b/lib/actions.c index 6b9a426ae..a0ff0cb6a 100644 --- a/lib/actions.c +++ b/lib/actions.c @@ -4315,3 +4315,126 @@ ovnacts_free(struct ovnact *ovnacts, size_t ovnacts_len) } } } + +/* Return ovn action opcode string representation. + * The returned memory is dynamically allocated + * and the caller must free it using free(). + */ + +char * +ovnact_op_to_string(uint32_t ovnact_opc) +{ + struct ds opc_str = DS_EMPTY_INITIALIZER; + + switch (ovnact_opc) { + case ACTION_OPCODE_ARP: + ds_put_cstr(&opc_str, "ARP"); + break; + case ACTION_OPCODE_IGMP: + ds_put_cstr(&opc_str, "IGMP"); + break; + + case ACTION_OPCODE_PUT_ARP: + ds_put_cstr(&opc_str, "PUT_ARP"); + break; + + case ACTION_OPCODE_PUT_DHCP_OPTS: + ds_put_cstr(&opc_str, "PUT_DHCP_OPTS"); + break; + + case ACTION_OPCODE_ND_NA: + ds_put_cstr(&opc_str, "ND_NA"); + break; + + case ACTION_OPCODE_ND_NA_ROUTER: + ds_put_cstr(&opc_str, "ND_NA_ROUTER"); + break; + + case ACTION_OPCODE_PUT_ND: + ds_put_cstr(&opc_str, "PUT_ND"); + break; + + case ACTION_OPCODE_PUT_FDB: + ds_put_cstr(&opc_str, "PUT_FDB"); + break; + + case ACTION_OPCODE_PUT_DHCPV6_OPTS: + ds_put_cstr(&opc_str, "PUT_DHCPV6_OPTS"); + break; + + case ACTION_OPCODE_DNS_LOOKUP: + ds_put_cstr(&opc_str, "DNS_LOOKUP"); + break; + + case ACTION_OPCODE_LOG: + ds_put_cstr(&opc_str, "LOG"); + break; + + case ACTION_OPCODE_PUT_ND_RA_OPTS: + ds_put_cstr(&opc_str, "PUT_ND_RA_OPTS"); + break; + + case ACTION_OPCODE_ND_NS: + ds_put_cstr(&opc_str, "ND_NS"); + break; + + case ACTION_OPCODE_ICMP: + ds_put_cstr(&opc_str, "ICMP"); + break; + + case ACTION_OPCODE_ICMP4_ERROR: + case ACTION_OPCODE_ICMP6_ERROR: + if (ovnact_opc == ACTION_OPCODE_ICMP4_ERROR) { + ds_put_cstr(&opc_str, "ICMP4_ERROR"); + } else { + ds_put_cstr(&opc_str, "ICMP6_ERROR"); + } + break; + + case ACTION_OPCODE_TCP_RESET: + ds_put_cstr(&opc_str, "TCP_RESET"); + break; + + case ACTION_OPCODE_SCTP_ABORT: + ds_put_cstr(&opc_str, "SCTP_ABORT"); + break; + + case ACTION_OPCODE_REJECT: + ds_put_cstr(&opc_str, "REJECT"); + break; + + case ACTION_OPCODE_PUT_ICMP4_FRAG_MTU: + case ACTION_OPCODE_PUT_ICMP6_FRAG_MTU: + if (ovnact_opc == ACTION_OPCODE_PUT_ICMP4_FRAG_MTU) { + ds_put_cstr(&opc_str, "PUT_ICMP4_FRAG_MTU"); + } else { + ds_put_cstr(&opc_str, "PUT_ICMP6_FRAG_MTU"); + } + break; + + case ACTION_OPCODE_EVENT: + ds_put_cstr(&opc_str, "EVENT"); + break; + + case ACTION_OPCODE_BIND_VPORT: + ds_put_cstr(&opc_str, "BIND_VPORT"); + break; + case ACTION_OPCODE_DHCP6_SERVER: + ds_put_cstr(&opc_str, "DHCP6_SERVER"); + break; + + case ACTION_OPCODE_HANDLE_SVC_CHECK: + ds_put_cstr(&opc_str, "HANDLE_SVC_CHECK"); + break; + + case ACTION_OPCODE_BFD_MSG: + ds_put_cstr(&opc_str, "BFD_MSG"); + break; + + default: + ds_put_format(&opc_str, "unrecognized(%"PRIu32")", + ovnact_opc); + break; + } + return ds_steal_cstr(&opc_str); +} diff --git a/tests/ovn.at b/tests/ovn.at index a4ed03041..9ec62e321 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -18283,6 +18283,8 @@ ovs-vsctl -- add-port br-int hv1-vif3 -- \ options:rxq_pcap=hv1/vif3-rx.pcap \ ofport-request=3 +ovs-appctl -t ovn-controller vlog/set dbg + sim_add hv2 as hv2 ovs-vsctl add-br br-phys @@ -18473,6 +18475,8 @@ wait_row_count Port_Binding 1 logical_port=sw0-vir chassis=$hv1_ch_uuid check_row_count Port_Binding 1 logical_port=sw0-vir virtual_parent=sw0-p1 wait_for_ports_up sw0-vir check ovn-nbctl --wait=hv sync +AT_CHECK([test 2 = `cat hv1/ovn-controller.log | grep "pinctrl received packet-in" | \ +grep opcode=BIND_VPORT | grep OF_Table_ID=24 | wc -l`]) wait_row_count Port_Binding 1 logical_port=sw0-vir6 chassis=$hv1_ch_uuid check_row_count Port_Binding 1 logical_port=sw0-vir6 virtual_parent=sw0-p1 @@ -21339,6 +21343,10 @@ list mac_binding], [0], [lr0-sw0 AT_CHECK([test 1 = `cat hv1/ovn-controller.log | grep NXT_PACKET_IN2 | \ grep table_id=10 | wc -l`]) + +AT_CHECK([test 1 = `cat hv1/ovn-controller.log | grep "pinctrl received packet-in" | \ +grep opcode=PUT_ARP | grep OF_Table_ID=10 | wc -l`]) + AT_CHECK([test 1 = `as hv1 ovs-ofctl dump-flows br-int table=10 | grep arp | \ grep controller | grep -v n_packets=0 | wc -l`])