From patchwork Mon Jul 17 13:53:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13315806 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 4120BBE46 for ; Mon, 17 Jul 2023 13:53:49 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01689FF for ; Mon, 17 Jul 2023 06:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689602023; 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=K56/Xqw2n1ZvKULuZ30MMWN4kbPwGNfcAsA3x+nB8mA=; b=fJS/4NKzBZ2IFjWRwY4oiTr/c0O1Kb/v16sk31Jk68Lzx3CWY9/VL6xlnSTGFyRPS47Sf4 58+OdOt4ZaB911G4SEq4LDhEb88a4/KkHhej7HhNK/c27jl1BkBaS5JE7x41AxiBxNEIn3 i/HqQQzMQlwZRa5gkCYXamFs9B2IHgE= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-416-Xiw9bWnvPa6UJuAWNu9Xkw-1; Mon, 17 Jul 2023 09:53:39 -0400 X-MC-Unique: Xiw9bWnvPa6UJuAWNu9Xkw-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-635f38834acso52280986d6.0 for ; Mon, 17 Jul 2023 06:53:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689602016; x=1692194016; 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=K56/Xqw2n1ZvKULuZ30MMWN4kbPwGNfcAsA3x+nB8mA=; b=EVDuJ949aGWXLhR33k7wO/wXErfx9I9NOgQlMiG5FkfHoLLJ62p5deZc5VW9sR0IwS ApxDe+a/k9uo/KWaWicEtGHziwyQjoG8wfloG5cuKErer6eoEFEXjSwWf3TsHKGm10wx XuXIkCP2ETZx2fFU23/ZpELtdayvmK7jtVee5w2QbGAnse3xkY/nZKIlIlYqljYt7FIL CCQNpeDlWphUlLSurjM62z9IQ78hUohVX019RFiwHFtkn4NRZ4vJxQg61jJlXlA6N84E 2CbXLv0GIwXo0vh2QIU3YnfQMxLN8EK0gX1n+R6S/bJpXf0Gp614wKQmbhw1LVbXd3pT yvyQ== X-Gm-Message-State: ABy/qLbTL4kE/CiXWUSjmP0PMIKJI78+6g5USZM4iQaJxK5UjVIgQ3a/ y/5TxTWAo0hNLvfIaJ0wbw0Q6CZwhWninUiNWp+xDw/DhcR2Ly5JJgQHVM21GjwHh1DSy+b/zOx Ch8o3sE2RDcj31tc5l0U0+uxz X-Received: by 2002:a0c:f194:0:b0:635:5a95:bb48 with SMTP id m20-20020a0cf194000000b006355a95bb48mr12113022qvl.24.1689602016387; Mon, 17 Jul 2023 06:53:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlFV5fomCE7nyPplywCBoISP71GTts2gOATnk7D/Tsz54T+B6cPi/kr9VTBv7MVGW3wH/asTNw== X-Received: by 2002:a0c:f194:0:b0:635:5a95:bb48 with SMTP id m20-20020a0cf194000000b006355a95bb48mr12113012qvl.24.1689602016127; Mon, 17 Jul 2023 06:53:36 -0700 (PDT) Received: from debian ([92.62.32.42]) by smtp.gmail.com with ESMTPSA id b10-20020a0cf04a000000b0063c79938606sm2541741qvl.120.2023.07.17.06.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jul 2023 06:53:35 -0700 (PDT) Date: Mon, 17 Jul 2023 15:53:30 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: netdev@vger.kernel.org, Pablo Neira Ayuso , Harald Welte , osmocom-net-gprs@lists.osmocom.org Subject: [PATCH net-next 1/3] gtp: Set TOS and routing scope independently for fib lookups. Message-ID: <239feab76be1770fd8ed43e7ce6e004a2a7f8471.1689600901.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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org There's no reason for setting the RTO_ONLINK flag in ->flowi4_tos as RT_CONN_FLAGS() does. We can easily set ->flowi4_scope properly instead. This makes the code more explicit and will allow to convert ->flowi4_tos to dscp_t in the future. Signed-off-by: Guillaume Nault --- drivers/net/gtp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index acb20ad4e37e..144ec626230d 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -243,7 +243,8 @@ static struct rtable *ip4_route_output_gtp(struct flowi4 *fl4, fl4->flowi4_oif = sk->sk_bound_dev_if; fl4->daddr = daddr; fl4->saddr = saddr; - fl4->flowi4_tos = RT_CONN_FLAGS(sk); + fl4->flowi4_tos = ip_sock_rt_tos(sk); + fl4->flowi4_scope = ip_sock_rt_scope(sk); fl4->flowi4_proto = sk->sk_protocol; return ip_route_output_key(sock_net(sk), fl4); From patchwork Mon Jul 17 13:53:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13315805 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 1541FBA2E for ; Mon, 17 Jul 2023 13:53:44 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19315F5 for ; Mon, 17 Jul 2023 06:53:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689602022; 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=fJ7M8ndWWkx3e/2RVZAso//ELmQ26/rKM/2vgLOQ29k=; b=EqOOqx5+LcmZ5if9Ef1gZORjO9ygNJtA2KrvdUQy8Yo5CfgB4zhyNHGVDNSJEKjwZZg9mf VU1FtNn2Ima+nGPducsk28J7MJLCpRPwywG4pazBhy5TguzH+UGwCEogoZVVglXPhBfjmp PTdvBmg+RqzqFgE5f2ma9sGFc+bl4Zg= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-250-oq97MgMCP7aUTHaXaUMFVg-1; Mon, 17 Jul 2023 09:53:40 -0400 X-MC-Unique: oq97MgMCP7aUTHaXaUMFVg-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-76746f54ba9so613264185a.0 for ; Mon, 17 Jul 2023 06:53:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689602020; x=1692194020; 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=fJ7M8ndWWkx3e/2RVZAso//ELmQ26/rKM/2vgLOQ29k=; b=QFWd2EBjiPCVklkJnwB2LCU3N1UrQtmHZa6m7/FFnkDoiW/ox6XQRy9uatZlMLZaW7 UUgm/XvUy4STFEY+cNC+XPfWW1u+fZbzjfJfI9bhx+oUx+xkSwuOF+qchfiGtLEjAUqH E9pnnZCgvcgYdweDIUZcbNCn9kcmmEWTXGiYoy+vTFgrFXHe7EPny5sfdu5JUWbmZiMt E+KKeDuW3FJ8n9rW7IekiCZ8avFGjQfuyb5DSPkNKThQITZacI5bXZUx386Q4xLo0WGb eewGVDAxLtXPgxwy26fUYDaaMr8GgwPYVTmSKwwhTZ/oWzyy+U/G8pTmBZdpscsNNk3h fwlg== X-Gm-Message-State: ABy/qLYhihzwELC1KVqmG0ucFnZd6VKD3MRRnGwbmz5Oyq9K0U7D24ic PbQPNMCdqpW+yooupV+ecm7OaRgYZ472o2wywJNxpm7AFf8b0GJribAW70h3giwpJaGtYKoKjUu AmeoOsj8VFMDvfM17 X-Received: by 2002:a05:620a:1a0d:b0:765:3e03:10db with SMTP id bk13-20020a05620a1a0d00b007653e0310dbmr15047525qkb.48.1689602020510; Mon, 17 Jul 2023 06:53:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlFzWZdgTUrzDhDU1m1IObzlkNO78/Af8/69MC3hhvRl/+ryasnFWZC/PcNIbS+6mi1LboTVdQ== X-Received: by 2002:a05:620a:1a0d:b0:765:3e03:10db with SMTP id bk13-20020a05620a1a0d00b007653e0310dbmr15047511qkb.48.1689602020293; Mon, 17 Jul 2023 06:53:40 -0700 (PDT) Received: from debian ([92.62.32.42]) by smtp.gmail.com with ESMTPSA id g18-20020a05620a13d200b00767cd2dbd82sm6108028qkl.15.2023.07.17.06.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jul 2023 06:53:39 -0700 (PDT) Date: Mon, 17 Jul 2023 15:53:35 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: netdev@vger.kernel.org, dccp@vger.kernel.org Subject: [PATCH net-next 2/3] dccp: Set TOS and routing scope independently for fib lookups. 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org There's no reason for setting the RTO_ONLINK flag in ->flowi4_tos as RT_CONN_FLAGS() does. We can easily set ->flowi4_scope properly instead. This makes the code more explicit and will allow to convert ->flowi4_tos to dscp_t in the future. Signed-off-by: Guillaume Nault --- net/dccp/ipv4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index fa8079303cb0..8e919cfe6e23 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -474,7 +474,8 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk, .flowi4_oif = inet_iif(skb), .daddr = iph->saddr, .saddr = iph->daddr, - .flowi4_tos = RT_CONN_FLAGS(sk), + .flowi4_tos = ip_sock_rt_tos(sk), + .flowi4_scope = ip_sock_rt_scope(sk), .flowi4_proto = sk->sk_protocol, .fl4_sport = dccp_hdr(skb)->dccph_dport, .fl4_dport = dccp_hdr(skb)->dccph_sport, From patchwork Mon Jul 17 13:53:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 13315807 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 5A9ACBE49 for ; Mon, 17 Jul 2023 13:53:49 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03389103 for ; Mon, 17 Jul 2023 06:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689602027; 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=FaL2wcUnzSu1vhXihNYR8wHXoQel/dQpHY6Vim2NOYE=; b=aEo0lUZQqqFd3Z7SFmj1ZIxyk19c2CNSoGibUTRzMfi6e96pAqQR/z96udh+SQbxol8Ny0 gDQOIATOSWMMwJtzvC3fQzXdZV11OzDOEdr14y3PWbbQ6jMobtZrjCm4CIam8OK1+8vN2c 1zXRl9qd0AVhrBzV+p4TAN/T7OMhyVk= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-467-Z1lFuUU_M9K5pJHd-3lvDg-1; Mon, 17 Jul 2023 09:53:46 -0400 X-MC-Unique: Z1lFuUU_M9K5pJHd-3lvDg-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7679e5ebad2so692804485a.3 for ; Mon, 17 Jul 2023 06:53:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689602025; x=1692194025; 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=FaL2wcUnzSu1vhXihNYR8wHXoQel/dQpHY6Vim2NOYE=; b=KlKom7NKK3DmBJF46ITVgtDbYinO3tBrCBjjBh4/5yDx7/628hREFFKheJxUNQ+FAV 8MRNr/x31WwLfFnltoKTVvIRnR6y5xEsxDKDl2MXHsDCuCjwUYf0PfBh2BN+Y6Hz6cnV BGLd3C62fSLG2DoBFlhPWckX+TFha4Oy2Zsy6XrYpg9jqmzFajYRc8GkCsMZ6odVojEs yEW5/RFkBXQ3wAjIzsOyWzkWpxPuF1g/093fa24brXz2I8xa6ItlJkZX+dYSIJg5OqHv YGkQUlZpM684GpEC0Rg8zYOINzrPVrebObB0IeNfcXlWiX0f0lMFfn1bLpIAvfwYZIjb TLXw== X-Gm-Message-State: ABy/qLYTeP359WC5YxE9lP3wrohGqYLNAdu8JFWXWjJnoNwn24tV5TeS YrUsJOCHzVYCcYfF+YytNfufaFrL79VEQXaCISUKW2k07w55CtclgMqQ4wj49/BQECgfwD1dpz3 DSYUBRWzNzUV1wwfy X-Received: by 2002:a05:620a:1a90:b0:768:1e31:db83 with SMTP id bl16-20020a05620a1a9000b007681e31db83mr4067794qkb.17.1689602025553; Mon, 17 Jul 2023 06:53:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlGweCsSR9gCfZzTn6i1Ji1R15Px6FwQk49TxS1l0nFmF1AM1O1d+wX5CSPTKaBcC3vqMulNxg== X-Received: by 2002:a05:620a:1a90:b0:768:1e31:db83 with SMTP id bl16-20020a05620a1a9000b007681e31db83mr4067777qkb.17.1689602025324; Mon, 17 Jul 2023 06:53:45 -0700 (PDT) Received: from debian ([92.62.32.42]) by smtp.gmail.com with ESMTPSA id pe20-20020a05620a851400b00767502e8601sm6134375qkn.35.2023.07.17.06.53.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jul 2023 06:53:45 -0700 (PDT) Date: Mon, 17 Jul 2023 15:53:40 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: netdev@vger.kernel.org, Marcelo Ricardo Leitner , Xin Long , linux-sctp@vger.kernel.org Subject: [PATCH net-next 3/3] sctp: Set TOS and routing scope independently for fib lookups. Message-ID: <8ecb4d62fea0ba72bc8a5525d097b36a6c6d0b32.1689600901.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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org There's no reason for setting the RTO_ONLINK flag in ->flowi4_tos as RT_CONN_FLAGS() does. We can easily set ->flowi4_scope properly instead. This makes the code more explicit and will allow to convert ->flowi4_tos to dscp_t in the future. Signed-off-by: Guillaume Nault Reviewed-by: Xin Long --- net/sctp/protocol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 274d07bd774f..33c0895e101c 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -435,7 +435,8 @@ static void sctp_v4_get_dst(struct sctp_transport *t, union sctp_addr *saddr, fl4->fl4_dport = daddr->v4.sin_port; fl4->flowi4_proto = IPPROTO_SCTP; if (asoc) { - fl4->flowi4_tos = RT_CONN_FLAGS_TOS(asoc->base.sk, tos); + fl4->flowi4_tos = RT_TOS(tos); + fl4->flowi4_scope = ip_sock_rt_scope(asoc->base.sk); fl4->flowi4_oif = asoc->base.sk->sk_bound_dev_if; fl4->fl4_sport = htons(asoc->base.bind_addr.port); }