From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTP id 7CD145A026D for ; Fri, 8 Mar 2024 00:27:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709854038; 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=76yKj8p/u3RBQQkrWHNDwQxR4OglZraF5HfIi8vJ5BY=; b=SKn4lasQu8w5tOz3izWbeXgQgJEdPF3GEOjt85bJEJOmOPg3gcWDUTrA4KdgH3ZpsttJ07 WhJR5VnOBPB3Wk74GHpXuiIDFfONk2Fy+d/Q7WCClnMphflRb9HtzMwrov015UK7Piqp5F 0NcuGXpvbSrQFsVhVd9qB+Sg9E/6u3k= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-brJTkRBUMc6r4nOq8iBt6w-1; Thu, 07 Mar 2024 18:27:16 -0500 X-MC-Unique: brJTkRBUMc6r4nOq8iBt6w-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a44143c8908so145075966b.1 for ; Thu, 07 Mar 2024 15:27:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709854035; x=1710458835; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=76yKj8p/u3RBQQkrWHNDwQxR4OglZraF5HfIi8vJ5BY=; b=ikUctMPVnXlH+nThtC6L4I5aVzKZRKjk17PJyFNxN6He/A2NBueBVG+4xvQYW8uhF+ ZBOV5jzPcqak5VS4mNbYlGcb/YHq7+ylTsVEWoKYztf+98lKAxv2NOk+OGdH03oDHMVa R9B2qOdT2s7RRMJm7PWFLMmS28ysglG+wJy6OITqTlbF99VsvpfnHtAnWsAJ3dDpeKUa a0b39b2DheoW1tTkF2CR4RYU3dq44J4sC//iDs24IBi9BE9SJEI0xk+8Bukk74/KAshI r3lXk27CEYrg7XCH8ETPNG/pYxZiJC3j1RobrTMtq+clBsGL7Q2Ewnbs+xa6pYJRBVNT 4K1Q== X-Gm-Message-State: AOJu0YyQxZPpZ6GQu/JPyR0o2cFzP/JGsVFRhikS17U8hgV21GzsfK5Q 0/ZwiLI0YnOKZszEUNFCdksEh4uxVLJpUc/I7EtFzkz4IRSCtVMTsdzS5RpM4afG1m2Tz+pmFh/ 4FWqYtXD27iv28LtKE5oq/eTj3lQk4MNff3f2jNsZUehLfiAPTKxQ2/HypjyC X-Received: by 2002:a17:906:b293:b0:a45:b7aa:ca29 with SMTP id q19-20020a170906b29300b00a45b7aaca29mr2869167ejz.22.1709854034999; Thu, 07 Mar 2024 15:27:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGIAAYWBv8hf3T7O3MnucASmj/g20G7hLxvC7G7i+EWz8LvoEoM1Ps1rG++E13n7qF0mrhK2g== X-Received: by 2002:a17:906:b293:b0:a45:b7aa:ca29 with SMTP id q19-20020a170906b29300b00a45b7aaca29mr2869148ejz.22.1709854034361; Thu, 07 Mar 2024 15:27:14 -0800 (PST) Received: from maya.cloud.tilaa.com (maya.cloud.tilaa.com. [164.138.29.33]) by smtp.gmail.com with ESMTPSA id em2-20020a056402364200b0056650031d94sm1077431edb.90.2024.03.07.15.27.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2024 15:27:13 -0800 (PST) Date: Fri, 8 Mar 2024 00:26:40 +0100 From: Stefano Brivio To: David Gibson Subject: Re: [PATCH 2/3] icmp: Flow based error reporting Message-ID: <20240308002640.15b631b9@elisabeth> In-Reply-To: <20240229041534.2573559-3-david@gibson.dropbear.id.au> References: <20240229041534.2573559-1-david@gibson.dropbear.id.au> <20240229041534.2573559-3-david@gibson.dropbear.id.au> Organization: Red Hat X-Mailer: Claws Mail 4.2.0 (GTK 3.24.36; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: S2GDN7Z5UFSO33U7EHTDNDMOHSYYCXYD X-Message-ID-Hash: S2GDN7Z5UFSO33U7EHTDNDMOHSYYCXYD X-MailFrom: sbrivio@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Thu, 29 Feb 2024 15:15:33 +1100 David Gibson wrote: > Use flow_dbg() and flow_err() helpers to generate flow-linked error > messages in most places. Make a few small improvements to the messages > while we're at it. This allows us to avoid the awkward 'pname' variables > since whether we're dealing with ICMP or ICMPv6 is already built into the > flow type which these helpers include. > > Signed-off-by: David Gibson > --- > icmp.c | 31 ++++++++++++++----------------- > 1 file changed, 14 insertions(+), 17 deletions(-) > > diff --git a/icmp.c b/icmp.c > index 1caf791d..63adafcf 100644 > --- a/icmp.c > +++ b/icmp.c > @@ -61,7 +61,6 @@ void icmp_sock_handler(const struct ctx *c, sa_family_t af, union epoll_ref ref) > { > struct icmp_ping_flow *pingf = af == AF_INET > ? icmp_id_map[V4][ref.icmp.id] : icmp_id_map[V6][ref.icmp.id]; > - const char *const pname = af == AF_INET ? "ICMP" : "ICMPv6"; > union sockaddr_inany sr; > socklen_t sl = sizeof(sr); > char buf[USHRT_MAX]; > @@ -75,8 +74,7 @@ void icmp_sock_handler(const struct ctx *c, sa_family_t af, union epoll_ref ref) > > n = recvfrom(ref.fd, buf, sizeof(buf), 0, &sr.sa, &sl); > if (n < 0) { > - warn("%s: recvfrom() error on ping socket: %s", > - pname, strerror(errno)); > + flow_err(pingf, "recvfrom() error: %s", strerror(errno)); > return; > } > if (sr.sa_family != af) > @@ -113,8 +111,9 @@ void icmp_sock_handler(const struct ctx *c, sa_family_t af, union epoll_ref ref) > pingf->seq = seq; > } > > - debug("%s: echo reply to tap, ID: %"PRIu16", seq: %"PRIu16, pname, > - ref.icmp.id, seq); > + flow_dbg(pingf, "echo reply to tap, ID: %"PRIu16", seq: %"PRIu16, > + ref.icmp.id, seq); > + > if (af == AF_INET) > tap_icmp4_send(c, sr.sa4.sin_addr, tap_ip4_daddr(c), buf, n); > else if (af == AF_INET6) > @@ -123,7 +122,7 @@ void icmp_sock_handler(const struct ctx *c, sa_family_t af, union epoll_ref ref) > return; > > unexpected: > - warn("%s: Unexpected packet on ping socket", pname); > + flow_err(pingf, "Unexpected packet on ping socket"); > } > > /** > @@ -158,7 +157,6 @@ static struct icmp_ping_flow *icmp_ping_new(const struct ctx *c, > struct icmp_ping_flow **id_sock, > sa_family_t af, uint16_t id) > { > - const char *const pname = af == AF_INET ? "ICMP" : "ICMPv6"; > uint8_t flowtype = af == AF_INET ? FLOW_PING4 : FLOW_PING6; > union icmp_epoll_ref iref = { .id = id }; > union flow *flow = flow_alloc(); > @@ -195,9 +193,9 @@ static struct icmp_ping_flow *icmp_ping_new(const struct ctx *c, > if (pingf->sock > FD_REF_MAX) > goto cancel; > > - *id_sock = pingf; > + flow_dbg(pingf, "new socket %i for echo ID %"PRIu16, pingf->sock, id); > > - debug("%s: new socket %i for echo ID %"PRIu16, pname, pingf->sock, id); > + *id_sock = pingf; > > return pingf; > > @@ -222,7 +220,6 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, > const void *saddr, const void *daddr, > const struct pool *p, const struct timespec *now) > { > - const char *const pname = af == AF_INET ? "ICMP" : "ICMPv6"; > union sockaddr_inany sa = { .sa_family = af }; > const socklen_t sl = af == AF_INET ? sizeof(sa.sa4) : sizeof(sa.sa6); > struct icmp_ping_flow *pingf, **id_sock; > @@ -276,13 +273,13 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, > > pingf->ts = now->tv_sec; > > - if (sendto(pingf->sock, pkt, plen, MSG_NOSIGNAL, &sa.sa, sl) < 0) { > - debug("%s: failed to relay request to socket: %s", > - pname, strerror(errno)); > - } else { > - debug("%s: echo request to socket, ID: %"PRIu16", seq: %"PRIu16, > - pname, id, seq); > - } > + if (sendto(pingf->sock, pkt, plen, MSG_NOSIGNAL, &sa.sa, sl) < 0) > + flow_dbg(pingf, "failed to relay request to socket: %s", > + strerror(errno)); > + else > + flow_dbg(pingf, > + "echo request to socket, ID: %"PRIu16", seq: %"PRIu16, > + id, seq); I can add the usual curly brackets on merge. The rest of the series looks good to me. -- Stefano