From patchwork Thu Nov 14 16:03:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13875332 X-Patchwork-Delegate: kuba@kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 937CA133987 for ; Thu, 14 Nov 2024 16:03:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600211; cv=none; b=u3Wq9CYPKkQqWgA6SV+oedwZyasDS6lE9lBmyEXQQaVTotPJJsTgbEWTbAfpBzObaX8zSjtEbbdTf+mzWIFtixOf4xzFfS084rnnQ4d/Ho04h8feiFmHpLJts9KWLfVrzWHhTmXBPd2hFzBQkqt/8U/fPMqmq9tyDdbMQrrn9to= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600211; c=relaxed/simple; bh=jcb9INSeS+o4efk8lCAVbHCe4vqWALUQyWP3Atueu9w=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=S50o5DSf2fCSOCnmZiAu+xWMZ/ScE/tNEaKt3cKnJhGFlNsYo4/oD8tVLRpsVaOxDLbPQcRknBEdMk4anStGYjr6wJ5rHh0ASskXPEQTi6Mu19aQ7KuZlf/ao2+Pps2obpAI6r1VclTqBFhhvNiRvceDw6UoZMTPnqESs01xMW8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SAK9fHz1; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SAK9fHz1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731600208; 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: in-reply-to:in-reply-to:references:references; bh=PAq1VgZl8277b2O0WHyEF4cn1whtIrQG1NG+aLkeoAA=; b=SAK9fHz1Uhkt5Fa8Mmsnr9abs8aa8jiTC8vKerH1w0IG7i70tXAaEUwKWUV8FpSOKjttiv 2jHEX+tCdecEFoE8gkxB1sryTLIzNrXx/aKJXceiaZyKzMu52KywfWRboR8sPtOf9cKjXb ya94qOcW/gtPgNMOwme9DfXiZC1zhEI= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-179-3lLaw1ZJNCuMUKDDMbLqag-1; Thu, 14 Nov 2024 11:03:26 -0500 X-MC-Unique: 3lLaw1ZJNCuMUKDDMbLqag-1 X-Mimecast-MFC-AGG-ID: 3lLaw1ZJNCuMUKDDMbLqag Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-53da09b1ca1so671448e87.3 for ; Thu, 14 Nov 2024 08:03:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731600205; x=1732205005; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PAq1VgZl8277b2O0WHyEF4cn1whtIrQG1NG+aLkeoAA=; b=wzlT95fVQgqJ3gDQ20FJJAtbqs1u3nQh5qyHKXUKmLn1a3DSe4GhK+P5syfDUmX3nx NO7PXo87o5vT58gKy8k32M+wRLAvhExtwkTw1sf7VMjDFTuAzUveJIk59R/PfHnv9neH /Jsf2TeMWsFl9mwPbQZoXEbTlGBO7VvYAny7wUo2PijMKQzlDPKtk/2yGBn14Yq4bBsw 44xpSUkZ+OgyPATWTiBiKynp+VXGbs+4Mgp4bUIXUX8MYTUttOsGz/UAHIO1VHBNcLPN laN9qRLdvllOqVBxtiwlAKfumm0/7+azZ9mr3GINJ4Q5iuXs3xHd205uMZEG2UNaAJGy xI+g== X-Forwarded-Encrypted: i=1; AJvYcCXzjrXK6fh+jafvkvaJhAnTfnVVPy7c8XHK3xRMWtFAPUqpPCbaafj+oIRKwRKOYuH5IBKSEhU=@vger.kernel.org X-Gm-Message-State: AOJu0Yxfi+9LDVzcKOrec17yBLDQE9Mr3kdb2eDhXO2iMPAaOYwIOoKZ z+1KVCANReh7z0UYLAa1v0knFcR8GNu+dTAhqIVsmoWlGJhiXE0jD/lAdgZenefQAUQSw255O8E EgsAjwZ8gMipZxyqQzdAePbW1+/QGZO1d1A/fbdK8lnZNaLE11iPYPQ== X-Received: by 2002:ac2:4c4f:0:b0:53a:16b:f14f with SMTP id 2adb3069b0e04-53d862c5a61mr12562605e87.19.1731600204442; Thu, 14 Nov 2024 08:03:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IFvbxPIAEHdn1mPbERhtCD7kSP6yeYuHglo67Z1qmJWvSZ/FPH+ZbCoGPmAtUoM379TrofBvw== X-Received: by 2002:ac2:4c4f:0:b0:53a:16b:f14f with SMTP id 2adb3069b0e04-53d862c5a61mr12562551e87.19.1731600203888; Thu, 14 Nov 2024 08:03:23 -0800 (PST) Received: from debian (2a01cb058d23d600b637ad91a758ba3f.ipv6.abo.wanadoo.fr. [2a01:cb05:8d23:d600:b637:ad91:a758:ba3f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432da265f28sm28577095e9.17.2024.11.14.08.03.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 08:03:23 -0800 (PST) Date: Thu, 14 Nov 2024 17:03:21 +0100 From: Guillaume Nault To: Pablo Neira Ayuso , Jozsef Kadlecsik Cc: netfilter-devel@vger.kernel.org, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , coreteam@netfilter.org, netdev@vger.kernel.org, Ido Schimmel Subject: [PATCH nf-next 1/5] netfilter: ipv4: Convert ip_route_me_harder() to dscp_t. Message-ID: <799ab09e1cbd8b2070f8891518647352c82c3b02.1731599482.git.gnault@redhat.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Patchwork-Delegate: kuba@kernel.org Use ip4h_dscp()instead of reading iph->tos directly. ip4h_dscp() returns a dscp_t value which is temporarily converted back to __u8 with inet_dscp_to_dsfield(). When converting ->flowi4_tos to dscp_t in the future, we'll only have to remove that inet_dscp_to_dsfield() call. Signed-off-by: Guillaume Nault --- net/ipv4/netfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c index e0aab66cd925..08bc3f2c0078 100644 --- a/net/ipv4/netfilter.c +++ b/net/ipv4/netfilter.c @@ -44,7 +44,7 @@ int ip_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb, un */ fl4.daddr = iph->daddr; fl4.saddr = saddr; - fl4.flowi4_tos = iph->tos & INET_DSCP_MASK; + fl4.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(iph)); fl4.flowi4_oif = sk ? sk->sk_bound_dev_if : 0; fl4.flowi4_l3mdev = l3mdev_master_ifindex(dev); fl4.flowi4_mark = skb->mark; From patchwork Thu Nov 14 16:03:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13875334 X-Patchwork-Delegate: kuba@kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C1E415DBB3 for ; Thu, 14 Nov 2024 16:03:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600224; cv=none; b=gMUYj3eJubGNZhFaf+rMpzVCNzgTfThsaJZYyjFYX3Dwyc0XBsf6/PUrwWa+3vg2zGBxmfQnOZW6af3klLY4UVFVZJ0sIponiq64MqU8ztGIcWYb7YlRvASOHGMvnPnDg4f1ctO2t7bYLe8p/37RsSoBD+LCXkJKY4rXNiMVlAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600224; c=relaxed/simple; bh=5RknSn7bVZ9Sp8G0NfIi7txZbEwVmyyLhHOcziJAz7E=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=m8JfWwPGlTjCRtPW+lG2ThebbFW0VjZq0MiaOJ4al96OJ8y6DDSojgkJyljd+de19PuLrnr9mZPLPOeyKp+nOjXd3v8FgjyJW5aXXaX5Than0e6nQaif0gEvP7JUy9cSUlPCsWIlBiJhVg/+NseeGlzHYLUpMvz9lX7ey1ovBJg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=CiBN7u9n; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CiBN7u9n" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731600222; 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: in-reply-to:in-reply-to:references:references; bh=jFJBfZsuRNKlRmGlsq7skNCrEogTFO/7vDcCzJF9P+M=; b=CiBN7u9nWM1MmEM9knVa7AEkJVoDYOmYi/8QhQ7RFrL4iXNOegHNUe8g0DZfgLrxJOPt1l r53YBTqvtrTZNeNAQQbBUC0IEk+1qpVY9jqduBjjL4SBW31jKEH9RqZwUnUQRLf7JNsNc9 sapm4PGKOrcB5G5eGFlBuYrFAFQ+2XU= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553--5LtHiQzPG-QFpXPJdgHBw-1; Thu, 14 Nov 2024 11:03:41 -0500 X-MC-Unique: -5LtHiQzPG-QFpXPJdgHBw-1 X-Mimecast-MFC-AGG-ID: -5LtHiQzPG-QFpXPJdgHBw Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-43157e3521dso5826325e9.1 for ; Thu, 14 Nov 2024 08:03:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731600217; x=1732205017; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jFJBfZsuRNKlRmGlsq7skNCrEogTFO/7vDcCzJF9P+M=; b=U7pRhoiuxAjFNFBV7BvM+HcrJCtbw+IFMrFWHwBa4mXxVgjm38TnHKbBH29p6yemSh dt1seDsxX7phMVrk+WAen+tVHoqQZfm9Yimp6imQwsDd9WG1YNgioCfDFvVICNfZ9V9C dY/A+FBH/nGFOLH069prQDJEHcWEKy79QStQXh7IHxUDDa9+/baeGhJNUjF3rItYMklV TtDacI5+ZsiPgAgV7ZQgNLI+HsvLsQm3TAE0zXLWS4Fh6tWTFf7aFsVInTmcPlX+euc8 YQ91GXu8V5vROVwM7yhiPA95uXRTq3jjMtrKr9TvNU3KU4aUvTHhiei8AHea80B8WS9z eIFg== X-Forwarded-Encrypted: i=1; AJvYcCXba1KqEZ4WKsxvkBz7owYspn5eFgyCiqLeDiHfdinHgwqYdtrfG6lsz2auxSu3W7tbkKrbN5U=@vger.kernel.org X-Gm-Message-State: AOJu0YyHuXAGmmq5bUe77lQietej4psPhkivtcJPOM5oFvu7rs17mIZH omV+kGkSlCLcloqPkIb+eicVsK4H9J8yJkmoAHfDBaSioCDtWgZPYKWqYR6RIuNsujphaa8AiuM efxtjP95yrHtRtqNrXPeJQxhv6ckser+IH58WxT4+/ruDJ+/e2vlq8A== X-Received: by 2002:a05:600c:468d:b0:425:80d5:b8b2 with SMTP id 5b1f17b1804b1-432da790aa3mr28802695e9.16.1731600215799; Thu, 14 Nov 2024 08:03:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPYCo/VbNnJPfZ9jCSUk1Uk+WXO2Lu9MT54UrcQ1GHUqbnEPX5xx7mMsc6HvBXUQYcJYRBSA== X-Received: by 2002:a05:600c:468d:b0:425:80d5:b8b2 with SMTP id 5b1f17b1804b1-432da790aa3mr28800225e9.16.1731600213753; Thu, 14 Nov 2024 08:03:33 -0800 (PST) Received: from debian (2a01cb058d23d600b637ad91a758ba3f.ipv6.abo.wanadoo.fr. [2a01:cb05:8d23:d600:b637:ad91:a758:ba3f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3821ada3199sm1826311f8f.22.2024.11.14.08.03.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 08:03:33 -0800 (PST) Date: Thu, 14 Nov 2024 17:03:31 +0100 From: Guillaume Nault To: Pablo Neira Ayuso , Jozsef Kadlecsik Cc: netfilter-devel@vger.kernel.org, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , coreteam@netfilter.org, netdev@vger.kernel.org, Ido Schimmel Subject: [PATCH nf-next 2/5] netfilter: flow_offload: Convert nft_flow_route() to dscp_t. Message-ID: <36ab64916593c2cd88cbc17b8369ee4bbe97182d.1731599482.git.gnault@redhat.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Patchwork-Delegate: kuba@kernel.org Use ip4h_dscp()instead of reading ip_hdr()->tos directly. ip4h_dscp() returns a dscp_t value which is temporarily converted back to __u8 with inet_dscp_to_dsfield(). When converting ->flowi4_tos to dscp_t in the future, we'll only have to remove that inet_dscp_to_dsfield() call. Also, remove the comment about the net/ip.h include file, since it's now required for the ip4h_dscp() helper too. Signed-off-by: Guillaume Nault --- net/netfilter/nft_flow_offload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c index 65199c23c75c..3b474d235663 100644 --- a/net/netfilter/nft_flow_offload.c +++ b/net/netfilter/nft_flow_offload.c @@ -8,7 +8,7 @@ #include #include #include -#include /* for ipv4 options. */ +#include #include #include #include @@ -236,7 +236,7 @@ static int nft_flow_route(const struct nft_pktinfo *pkt, fl.u.ip4.saddr = ct->tuplehash[!dir].tuple.src.u3.ip; fl.u.ip4.flowi4_oif = nft_in(pkt)->ifindex; fl.u.ip4.flowi4_iif = this_dst->dev->ifindex; - fl.u.ip4.flowi4_tos = ip_hdr(pkt->skb)->tos & INET_DSCP_MASK; + fl.u.ip4.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(ip_hdr(pkt->skb))); fl.u.ip4.flowi4_mark = pkt->skb->mark; fl.u.ip4.flowi4_flags = FLOWI_FLAG_ANYSRC; break; From patchwork Thu Nov 14 16:03:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13875335 X-Patchwork-Delegate: kuba@kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1EC93D96D for ; Thu, 14 Nov 2024 16:03:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600226; cv=none; b=DN8q5Q3MRKy07XCeKxnizqtzqS5bMY0QMVR9QPYUoAUa7zZrE/S84zzOkFQLn6E3r9/RN6gWUymLdU9ORcb7LIhHZALODnEprRbLlcg6sA4DB383MOFRG03a/LaR5KHSyuvXb9fXiH1KXqHhy834sSwGI4g08oaGUlGf4rUS37k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600226; c=relaxed/simple; bh=Hg/efvizYk8WzQ8t6Lg1MCcYIg9RXN1TCtGqMqSSU8o=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=GNNZ1sxJc3llhzfihhqPaaY1xTsjwhhBPE3kRadhcjWtx/ZUvqa7kBMi5qfDRzM8484U/hKT8psj0Dqz6g3s5QmCCtoc7nwvg0/TGWilN2wGvaOXRLgScXFgGto+ThniVplr0Fj64Mjf9K5eb/72wiWgzucjnOHKAUqraweGcSY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=AkCqgOVj; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AkCqgOVj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731600224; 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: in-reply-to:in-reply-to:references:references; bh=1ZK9SQWS0kJT4zJcnUWs+bLoqvQwItt4OaoBKbfggh0=; b=AkCqgOVjX49lKdX4l/tPxuCFemsTPIPsHQ1O+cWrk9XugrE2FOcsknTcPRmbPdHl1BqIAn 4KhrHUAIsC9sZSi8YUU7SjK9eLmLy8qDz1sFu3I3nYNWWaqtaI6T1pa80s1/pS2BeO6+xn rYJWjBHO287QkNV3fbCNGk4amX05cTM= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-301-GV0FEpHqPNSv-XcqXOr-MA-1; Thu, 14 Nov 2024 11:03:42 -0500 X-MC-Unique: GV0FEpHqPNSv-XcqXOr-MA-1 X-Mimecast-MFC-AGG-ID: GV0FEpHqPNSv-XcqXOr-MA Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-37d45f1e935so463923f8f.0 for ; Thu, 14 Nov 2024 08:03:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731600221; x=1732205021; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1ZK9SQWS0kJT4zJcnUWs+bLoqvQwItt4OaoBKbfggh0=; b=DUtYl4EM9ikWnp57INKRIlLepKh/pftNSOTfeh6RIgUIuPnzvpYl1EYq28ZM2ITao6 wZh5TQsxJs0bJlGS4O/1002eoBrP8K1b94ntyqT+L+wP5/Egy92WEvbfXQcoKNLXLUSW PRWqRKo8xUzCCBKegD54Ch97a6hegFVCrqqr3t4bGS+e7Fa7C4w16Uueg9vsD8Sk5y1I TVZrMVi1e75wcXny1O97GHRaWx6SLn1Ad+QmrP11NpNOrXF9HNUPuwzxbo2380yXx7ew dC6rWgrAr6zstjLTJHuSjKNNKc0Ho4kN3ZCQ3vbQ6Iuv3Paqk22ekz1P0iiFKqOK2Zxs ZYAQ== X-Forwarded-Encrypted: i=1; AJvYcCU2ZnY6CebUkwl/iUXaFHd4AYXNBHIUiJK4rXTnOkebKZjRjw7c00RWtxAl4aTKGpBE7dWxfUo=@vger.kernel.org X-Gm-Message-State: AOJu0YzZPW+m56LgCiH9gM7CVQxl15LSZ3coN88RT3toaIVxufzIri3M 8yGpeYr6OW2yRfk8/F3NTm5ORpjMzEgT/aMaDOjeEqvcioACOlytTB9DAkb7s85SgzJurotLmWC Ataec+KabexnfvqANLBocc9Krxd7iEpl5vSypqznUnyXTw2PlDICr3g== X-Received: by 2002:a5d:5985:0:b0:37c:babe:2c49 with SMTP id ffacd0b85a97d-38218503517mr1977158f8f.19.1731600221349; Thu, 14 Nov 2024 08:03:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFfSQUSDvP1nWEf6H6Zqi3hDixWY32tbX9uiJ7MWMgWsWz+YUcQP0Fk0Y+bRF07oOjfdSFOBg== X-Received: by 2002:a5d:5985:0:b0:37c:babe:2c49 with SMTP id ffacd0b85a97d-38218503517mr1977125f8f.19.1731600220785; Thu, 14 Nov 2024 08:03:40 -0800 (PST) Received: from debian (2a01cb058d23d600b637ad91a758ba3f.ipv6.abo.wanadoo.fr. [2a01:cb05:8d23:d600:b637:ad91:a758:ba3f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3821adad9cesm1813271f8f.37.2024.11.14.08.03.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 08:03:40 -0800 (PST) Date: Thu, 14 Nov 2024 17:03:38 +0100 From: Guillaume Nault To: Pablo Neira Ayuso , Jozsef Kadlecsik Cc: netfilter-devel@vger.kernel.org, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , coreteam@netfilter.org, netdev@vger.kernel.org, Ido Schimmel Subject: [PATCH nf-next 3/5] netfilter: rpfilter: Convert rpfilter_mt() to dscp_t. Message-ID: <20c7fe0c2c84b3fec77cdbfd7df4b587a0225fcd.1731599482.git.gnault@redhat.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Patchwork-Delegate: kuba@kernel.org Use ip4h_dscp() instead of reading iph->tos directly. ip4h_dscp() returns a dscp_t value which is temporarily converted back to __u8 with inet_dscp_to_dsfield(). When converting ->flowi4_tos to dscp_t in the future, we'll only have to remove that inet_dscp_to_dsfield() call. Signed-off-by: Guillaume Nault --- net/ipv4/netfilter/ipt_rpfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/netfilter/ipt_rpfilter.c b/net/ipv4/netfilter/ipt_rpfilter.c index 1ce7a1655b97..a27782d7653e 100644 --- a/net/ipv4/netfilter/ipt_rpfilter.c +++ b/net/ipv4/netfilter/ipt_rpfilter.c @@ -76,7 +76,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) flow.daddr = iph->saddr; flow.saddr = rpfilter_get_saddr(iph->daddr); flow.flowi4_mark = info->flags & XT_RPFILTER_VALID_MARK ? skb->mark : 0; - flow.flowi4_tos = iph->tos & INET_DSCP_MASK; + flow.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(iph)); flow.flowi4_scope = RT_SCOPE_UNIVERSE; flow.flowi4_l3mdev = l3mdev_master_ifindex_rcu(xt_in(par)); flow.flowi4_uid = sock_net_uid(xt_net(par), NULL); From patchwork Thu Nov 14 16:03:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13875353 X-Patchwork-Delegate: kuba@kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00E00165EFC for ; Thu, 14 Nov 2024 16:03:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600233; cv=none; b=O2PAH8vddalwMe6iKyCMVgOFALcemmLh2HSaZfw3k9MMesj2KCIBlbGUortJynuM1UjlQRTVGpXBX/v5OnEJid95VKweOC50SZh4CJspMxUmJ31eHH5HW54WfiipXpozVgiq2KPOk1IbWR1JpEaxC775YNLL1DtQL3iyl28mq2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600233; c=relaxed/simple; bh=v0kwmtFfnXfpy5cKJxovL0kPGe2aqm4prwx082mj9sE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=mghO1kt6gXEmovozUnEWa5e81TO4GxDGlEmRRJTc1/IdrjEMpq4QDBAS22NBeagj6vZL1fZPkt9ken2V/dkN5VF9PyUyAl/zC8Ia/wQKCBXFNBXkOAGt4E5OktKNToSEV9hy/qzqwYtT2/URYFdBZc9IawfyLgKDPfzClYqQBAM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VGcgJIqg; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VGcgJIqg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731600231; 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: in-reply-to:in-reply-to:references:references; bh=EdliM8Z7gt2RM9bOVe4sgL9YGb6zubuIY0PyqbDtTg8=; b=VGcgJIqgkdhiWVkLtCBGWlIVJB6CswatwMRH+Ih6iVnOcImUG53SAXuwVma8Hb+l8uH6d5 zvMnRfw+fgi8UcbTpVQ4f39m1YMnG2Y7prGaYJ8/mz1Irs8YOSgBXX70clE0InuD44uSn1 ZJCKvMNzSegEAGLjCGMJ5BxKFsybobM= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-76-G179PfG2N16UGJ2lQYlLEA-1; Thu, 14 Nov 2024 11:03:50 -0500 X-MC-Unique: G179PfG2N16UGJ2lQYlLEA-1 X-Mimecast-MFC-AGG-ID: G179PfG2N16UGJ2lQYlLEA Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-37d5ca192b8so505162f8f.1 for ; Thu, 14 Nov 2024 08:03:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731600229; x=1732205029; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EdliM8Z7gt2RM9bOVe4sgL9YGb6zubuIY0PyqbDtTg8=; b=Y/83QW+2FE0s2nQp6vWZvCUDzSuAUSUGQeVr0Ci3PcgTl5bPiiz6aKv99Zq0vRb3UB CSGSDXxoEwZnd2sAhxsCGkIist7EnrlXMzeKaOngI7CfZq/UI5RQSOX4WM94gwA8MEea R1jtpJnEQs2sK/Y8x/19hFb+iBNu9UnXrDy+s9LGRYyyNGjBqnq8bbZDrQFFRr082jcn LHQp/WMDm9S7QJcr5qza1WRHqnwo7TB8pnJ4YlP+McNjntMVV55/yURQjdsnHxowsYyd ONrGLqFUydm+DUw4MZcpgtiyUqNji8GiibcY9rMg8qipZF2fye3ewvKLX5RaUwLCYv3Z 3nOA== X-Forwarded-Encrypted: i=1; AJvYcCV42H4tEMlXUFtSWTyMafYkCrE0ZSfM3evFoPkCNG00NiiBIWK3Bmep1mw+D5+Wg/T4ECxG++g=@vger.kernel.org X-Gm-Message-State: AOJu0Yyvkf4eiUCl8/+4kWbjS0wz//9QBflWcF3KlXFTEB4B3AAyQ1Kq yvhV2it51aWU6AqqxoRyNAYsAQLyx6W3t+IAOnSFcg8kQE2/hFddDfowDrpOC81yeZ80Bg+aBd9 qymagFafqXmxF8C18KzvU28OBJnWntBxEugTlgsNTEdIc+n+is21wdA== X-Received: by 2002:a5d:5f43:0:b0:37d:5251:e5ad with SMTP id ffacd0b85a97d-38213fe93femr3410130f8f.2.1731600228602; Thu, 14 Nov 2024 08:03:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmzBFIAWUMu8T177cyJQovSzl+Bfg2xMH/w7cpjzmzMiQkbhzX/e3tpT04f7jPfRKFJIHXbA== X-Received: by 2002:a5d:5f43:0:b0:37d:5251:e5ad with SMTP id ffacd0b85a97d-38213fe93femr3410053f8f.2.1731600227803; Thu, 14 Nov 2024 08:03:47 -0800 (PST) Received: from debian (2a01cb058d23d600b637ad91a758ba3f.ipv6.abo.wanadoo.fr. [2a01:cb05:8d23:d600:b637:ad91:a758:ba3f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3821adbe7dfsm1812740f8f.56.2024.11.14.08.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 08:03:47 -0800 (PST) Date: Thu, 14 Nov 2024 17:03:45 +0100 From: Guillaume Nault To: Pablo Neira Ayuso , Jozsef Kadlecsik Cc: netfilter-devel@vger.kernel.org, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , coreteam@netfilter.org, netdev@vger.kernel.org, Ido Schimmel Subject: [PATCH nf-next 4/5] netfilter: nft_fib: Convert nft_fib4_eval() to dscp_t. Message-ID: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Patchwork-Delegate: kuba@kernel.org Use ip4h_dscp() instead of reading iph->tos directly. ip4h_dscp() returns a dscp_t value which is temporarily converted back to __u8 with inet_dscp_to_dsfield(). When converting ->flowi4_tos to dscp_t in the future, we'll only have to remove that inet_dscp_to_dsfield() call. Signed-off-by: Guillaume Nault --- net/ipv4/netfilter/nft_fib_ipv4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/netfilter/nft_fib_ipv4.c b/net/ipv4/netfilter/nft_fib_ipv4.c index 09fff5d424ef..625adbc42037 100644 --- a/net/ipv4/netfilter/nft_fib_ipv4.c +++ b/net/ipv4/netfilter/nft_fib_ipv4.c @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -107,7 +108,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs, if (priv->flags & NFTA_FIB_F_MARK) fl4.flowi4_mark = pkt->skb->mark; - fl4.flowi4_tos = iph->tos & INET_DSCP_MASK; + fl4.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(iph)); if (priv->flags & NFTA_FIB_F_DADDR) { fl4.daddr = iph->daddr; From patchwork Thu Nov 14 16:03:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13875354 X-Patchwork-Delegate: kuba@kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0F8116BE3A for ; Thu, 14 Nov 2024 16:03:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600241; cv=none; b=oX6AJ2/3uSBHG+3xTioejfU1GLkEMDHYaw6lDLt+YiJ87CTnEG2jzp8Bs7O5JqHn2PL/mD9Ov34qN/Ygu5pySVQxbOaKG1UcwJTPTu1SyXc6GMe6jRUhLMqqRbJYbWgZBNuYMvfkJMNrV2q7PLackvKH/4hiuALo7D/0vTaedZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731600241; c=relaxed/simple; bh=/2yVgvPPv3aXfOQJi71q4daFQATxY9ZKELeWvPMBSik=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Y3SsonjMRXtjgNDUcTWecqLyuxSYDMwN3A4PsC9FTHThtXPYjZMABhiVM6cOyVQz7hqsdJYvqhs4li8HllAuxUgOEJADL17oBVNgUbY5xzu7FQqi3OgbJSnba6dDPQsVisCcKevi87xxdzsgSdjdlobs1SI4vy7HJsRd3FMmsDc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VuSNhs9z; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VuSNhs9z" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731600238; 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: in-reply-to:in-reply-to:references:references; bh=EjlJE+/lC5L7ZPMGgtq/FoQp051qXaiSxy9vB4GYSH0=; b=VuSNhs9zaDDTLYB68WCisPdVpfX0g9/iNbzUDdijnPXkz3KQ6dFD6fMHZDx0u9ZbOdRaaD vspfldNZHisOrDpG3flYjJNeOIEV0LK56+hobSvICS0Cqobt21Z5+tb7Y6iA7Q4MR2wXM1 LK8busVf4clfk7xkELwErLN6NKR1/i8= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-489-CKfNHSeMMlGxEPI2RBwBrA-1; Thu, 14 Nov 2024 11:03:56 -0500 X-MC-Unique: CKfNHSeMMlGxEPI2RBwBrA-1 X-Mimecast-MFC-AGG-ID: CKfNHSeMMlGxEPI2RBwBrA Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4315b7b0c16so6886385e9.1 for ; Thu, 14 Nov 2024 08:03:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731600235; x=1732205035; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EjlJE+/lC5L7ZPMGgtq/FoQp051qXaiSxy9vB4GYSH0=; b=obJcvICyiho8MzByq8928Q0ga6Mgfce4NYzQ96IlEdrs4s3DMird3JPlJKjT5UUb/9 7KPu5RqCKNET/WRDIAMmdw4kWQfG0XvH8Aa9lk4UxEeCUVE3XH/7L8I5djrsxt/+XzLQ twY0UXGJk1KTvUwoYtzm5MV3DI75WoA++x3YLda3+lPynAetqKVCMczFxGitfF0WuXDH 0vBpPlc4LqgnsmuoFLmEP50OCaUnOEtSPcImaRUxu5iU9c0g4OUg8wmrB5L2v2Zvh5t4 GZ/g4ahsaHxlaB83PkJJcnHwBhRXw6DZ85vrv15aI+1QHkeB59eSh5quY3XcP0VZ8si0 tUqg== X-Forwarded-Encrypted: i=1; AJvYcCWZt+YRxnDbkW+0QMQL1vVRYs07o7DfIDQvx/sI/rBWtD5s7qMtBdd+Q1o5/L6EW9Xj3rpwilk=@vger.kernel.org X-Gm-Message-State: AOJu0YxNhgAFZT5aIeikBXM/smXs1InpdgrgzCop4Mi10J547dwuALOV iKjFcEcVF5hr9t+QnYuSV2n6GQO+ojjhqxup5qPt19sHwRmmkPb+SGeNgOQFi9DN3KRNf5Uz/fy tZnhIAtGe6XvRfaNm7DGUG45TnePPTVA9Ur6bKR31iISCTnV9chlzqA== X-Received: by 2002:a05:600c:4445:b0:431:3933:1d30 with SMTP id 5b1f17b1804b1-432b74fa9ebmr206811025e9.5.1731600235240; Thu, 14 Nov 2024 08:03:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IEIq0+gxNtceIikEHqFUZPtVSZ/7OAVpCZWCan8/A7VNDPjxn0VoCwdnyW4RTJA13xeF7j+aQ== X-Received: by 2002:a05:600c:4445:b0:431:3933:1d30 with SMTP id 5b1f17b1804b1-432b74fa9ebmr206810235e9.5.1731600234490; Thu, 14 Nov 2024 08:03:54 -0800 (PST) Received: from debian (2a01cb058d23d600b637ad91a758ba3f.ipv6.abo.wanadoo.fr. [2a01:cb05:8d23:d600:b637:ad91:a758:ba3f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432da24498csm29001615e9.1.2024.11.14.08.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 08:03:54 -0800 (PST) Date: Thu, 14 Nov 2024 17:03:52 +0100 From: Guillaume Nault To: Pablo Neira Ayuso , Jozsef Kadlecsik Cc: netfilter-devel@vger.kernel.org, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , coreteam@netfilter.org, netdev@vger.kernel.org, Ido Schimmel Subject: [PATCH nf-next 5/5] netfilter: nf_dup4: Convert nf_dup_ipv4_route() to dscp_t. Message-ID: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Patchwork-Delegate: kuba@kernel.org Use ip4h_dscp() instead of reading iph->tos directly. ip4h_dscp() returns a dscp_t value which is temporarily converted back to __u8 with inet_dscp_to_dsfield(). When converting ->flowi4_tos to dscp_t in the future, we'll only have to remove that inet_dscp_to_dsfield() call. Signed-off-by: Guillaume Nault --- net/ipv4/netfilter/nf_dup_ipv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/netfilter/nf_dup_ipv4.c b/net/ipv4/netfilter/nf_dup_ipv4.c index ec94ee1051c7..25e1e8eb18dd 100644 --- a/net/ipv4/netfilter/nf_dup_ipv4.c +++ b/net/ipv4/netfilter/nf_dup_ipv4.c @@ -33,7 +33,7 @@ static bool nf_dup_ipv4_route(struct net *net, struct sk_buff *skb, fl4.flowi4_oif = oif; fl4.daddr = gw->s_addr; - fl4.flowi4_tos = iph->tos & INET_DSCP_MASK; + fl4.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(iph)); fl4.flowi4_scope = RT_SCOPE_UNIVERSE; fl4.flowi4_flags = FLOWI_FLAG_KNOWN_NH; rt = ip_route_output_key(net, &fl4);