From patchwork Tue Oct 1 13:00:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ales Musil X-Patchwork-Id: 1991456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=L/1Hh4kk; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XHyj36MCHz1xtY for ; Tue, 1 Oct 2024 23:00:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2AFBE405A0; Tue, 1 Oct 2024 13:00:22 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 4ra9BDzobPRU; Tue, 1 Oct 2024 13:00:21 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E5545404F9 Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=L/1Hh4kk Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id E5545404F9; Tue, 1 Oct 2024 13:00:20 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BDBB2C002B; Tue, 1 Oct 2024 13:00:20 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3B4E3C002A for ; Tue, 1 Oct 2024 13:00:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 299F5403E7 for ; Tue, 1 Oct 2024 13:00:19 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id a9mio4WPANN8 for ; Tue, 1 Oct 2024 13:00:18 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=amusil@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 39AD440589 Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 39AD440589 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 39AD440589 for ; Tue, 1 Oct 2024 13:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727787616; 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=8cVn7mx+A39W5gdsxfaBMGnvgkCAQq/C6KER1zx05E8=; b=L/1Hh4kkgzvvpXljlLfJdwshtlS/u8lJmZ1US+BUwYBgPnDGEjALstHSXRD+CHzQZJGPbB yzuh2oQ9i2k35LB3gQVvjqKJZ8CFH2wyJ72XO7fenGESYIwsJPBlAqUrJGBMrDiFknF4aZ m+Na9qhGs82NFwMNYN1+D5alV/tkKWc= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-183-pWedOafnMg6hDXCd9uhywQ-1; Tue, 01 Oct 2024 09:00:15 -0400 X-MC-Unique: pWedOafnMg6hDXCd9uhywQ-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2FB291944D43 for ; Tue, 1 Oct 2024 13:00:15 +0000 (UTC) Received: from amusil.redhat.com (unknown [10.45.224.103]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 26E961979066; Tue, 1 Oct 2024 13:00:13 +0000 (UTC) From: Ales Musil To: dev@openvswitch.org Date: Tue, 1 Oct 2024 15:00:12 +0200 Message-ID: <20241001130012.380645-1-amusil@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn] ovn-trace: Fix copy-paste error for tracing put_nd_ra_opts(). X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The nd_ra_opts() would try to pull put_dhcpv6_opts() instead which would lead to assert and crash of the ovn-trace: ovn-trace: ./include/ovn/actions.h:601: assertion ovnact->type == OVNACT_PUT_DHCPV6_OPTS failed in ovnact_get_PUT_DHCPV6_OPTS() Fixes: ec5bcc68b34e ("ovn-controller: Add a new action - 'put_nd_ra_opts'") Signed-off-by: Ales Musil --- utilities/ovn-trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/ovn-trace.c b/utilities/ovn-trace.c index 13a4ea490..f9cc2463b 100644 --- a/utilities/ovn-trace.c +++ b/utilities/ovn-trace.c @@ -3308,7 +3308,7 @@ trace_actions(const struct ovnact *ovnacts, size_t ovnacts_len, break; case OVNACT_PUT_ND_RA_OPTS: - execute_put_nd_ra_opts(ovnact_get_PUT_DHCPV6_OPTS(a), + execute_put_nd_ra_opts(ovnact_get_PUT_ND_RA_OPTS(a), "put_nd_ra_opts", uflow, super); break;