From: Peter Kosyh <p.kosyh@gmail.com>
To: netdev@vger.kernel.org
Cc: Peter Kosyh <p.kosyh@gmail.com>,
'Mikhail Smirnov' <smirnov@factor-ts.ru>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH] udp: compute_score and sk_bound_dev_if regression
Date: Wed, 09 Jun 2021 18:47:51 +0300 [thread overview]
Message-ID: <87a6nzrqe0.fsf@factor-ts.ru> (raw)
udp: commit 6da5b0f027a825df2aebc1927a27bda185dc03d4
introduced regression in compute_score() Previously for addr_any sockets an
interface bound socket had a higher priority than an unbound socket that
seems right. For example, this feature is used in dhcprelay daemon and now it
is broken.
So, this patch returns the old behavior and gives higher score for sk_bound_dev_if sockets.
Signed-off-by: Peter Kosyh <p.kosyh@gmail.com>
---
net/ipv4/udp.c | 3 ++-
net/ipv6/udp.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 15f5504adf5b..4239ffa93c6f 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -390,7 +390,8 @@ static int compute_score(struct sock *sk, struct net *net,
dif, sdif);
if (!dev_match)
return -1;
- score += 4;
+ if (sk->sk_bound_dev_if)
+ score += 4;
if (READ_ONCE(sk->sk_incoming_cpu) == raw_smp_processor_id())
score++;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 199b080d418a..c2f88b5def25 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -133,7 +133,8 @@ static int compute_score(struct sock *sk, struct net *net,
dev_match = udp_sk_bound_dev_eq(net, sk->sk_bound_dev_if, dif, sdif);
if (!dev_match)
return -1;
- score++;
+ if (sk->sk_bound_dev_if)
+ score++;
if (READ_ONCE(sk->sk_incoming_cpu) == raw_smp_processor_id())
score++;
--
2.31.1
next reply other threads:[~2021-06-09 15:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 15:47 Peter Kosyh [this message]
2021-06-09 19:44 ` [PATCH] udp: compute_score and sk_bound_dev_if regression Willem de Bruijn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a6nzrqe0.fsf@factor-ts.ru \
--to=p.kosyh@gmail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=smirnov@factor-ts.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.