* [PATCH] net-sctp: replace some sock_net(sk) with just 'net'
@ 2019-11-24 10:47 Maciej Żenczykowski
2019-11-25 18:50 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Maciej Żenczykowski @ 2019-11-24 10:47 UTC (permalink / raw)
To: Maciej Żenczykowski, David S . Miller; +Cc: netdev
From: Maciej Żenczykowski <maze@google.com>
It already existed in part of the function, but move it
to a higher level and use it consistently throughout.
Safe since sk is never written to.
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
net/sctp/socket.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 83e4ca1fabda..f57a83d54583 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -8264,6 +8264,7 @@ static struct sctp_bind_bucket *sctp_bucket_create(
static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
{
+ struct net *net = sock_net(sk);
struct sctp_sock *sp = sctp_sk(sk);
bool reuse = (sk->sk_reuse || sp->reuse);
struct sctp_bind_hashbucket *head; /* hash list */
@@ -8282,7 +8283,6 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
/* Search for an available port. */
int low, high, remaining, index;
unsigned int rover;
- struct net *net = sock_net(sk);
inet_get_local_port_range(net, &low, &high);
remaining = (high - low) + 1;
@@ -8294,12 +8294,12 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
rover = low;
if (inet_is_local_reserved_port(net, rover))
continue;
- index = sctp_phashfn(sock_net(sk), rover);
+ index = sctp_phashfn(net, rover);
head = &sctp_port_hashtable[index];
spin_lock(&head->lock);
sctp_for_each_hentry(pp, &head->chain)
if ((pp->port == rover) &&
- net_eq(sock_net(sk), pp->net))
+ net_eq(net, pp->net))
goto next;
break;
next:
@@ -8323,10 +8323,10 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
* to the port number (snum) - we detect that with the
* port iterator, pp being NULL.
*/
- head = &sctp_port_hashtable[sctp_phashfn(sock_net(sk), snum)];
+ head = &sctp_port_hashtable[sctp_phashfn(net, snum)];
spin_lock(&head->lock);
sctp_for_each_hentry(pp, &head->chain) {
- if ((pp->port == snum) && net_eq(pp->net, sock_net(sk)))
+ if ((pp->port == snum) && net_eq(pp->net, net))
goto pp_found;
}
}
@@ -8382,7 +8382,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
pp_not_found:
/* If there was a hash table miss, create a new port. */
ret = 1;
- if (!pp && !(pp = sctp_bucket_create(head, sock_net(sk), snum)))
+ if (!pp && !(pp = sctp_bucket_create(head, net, snum)))
goto fail_unlock;
/* In either case (hit or miss), make sure fastreuse is 1 only
--
2.24.0.432.g9d3f5f5b63-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] net-sctp: replace some sock_net(sk) with just 'net'
2019-11-24 10:47 [PATCH] net-sctp: replace some sock_net(sk) with just 'net' Maciej Żenczykowski
@ 2019-11-25 18:50 ` David Miller
2019-11-25 23:09 ` [PATCH v2] " Maciej Żenczykowski
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2019-11-25 18:50 UTC (permalink / raw)
To: zenczykowski; +Cc: maze, netdev
From: Maciej Żenczykowski <zenczykowski@gmail.com>
Date: Sun, 24 Nov 2019 02:47:27 -0800
> @@ -8264,6 +8264,7 @@ static struct sctp_bind_bucket *sctp_bucket_create(
>
> static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
> {
> + struct net *net = sock_net(sk);
> struct sctp_sock *sp = sctp_sk(sk);
> bool reuse = (sk->sk_reuse || sp->reuse);
> struct sctp_bind_hashbucket *head; /* hash list */
Please don't make the reverse christmas tree situation here worse,
thank you.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] net-sctp: replace some sock_net(sk) with just 'net'
2019-11-25 18:50 ` David Miller
@ 2019-11-25 23:09 ` Maciej Żenczykowski
2019-11-26 21:01 ` Marcelo Ricardo Leitner
2019-11-26 21:18 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Maciej Żenczykowski @ 2019-11-25 23:09 UTC (permalink / raw)
To: Maciej Żenczykowski, David S . Miller; +Cc: netdev
From: Maciej Żenczykowski <maze@google.com>
It already existed in part of the function, but move it
to a higher level and use it consistently throughout.
Safe since sk is never written to.
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
net/sctp/socket.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 83e4ca1fabda..e4c398db07a0 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -8267,6 +8267,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
struct sctp_sock *sp = sctp_sk(sk);
bool reuse = (sk->sk_reuse || sp->reuse);
struct sctp_bind_hashbucket *head; /* hash list */
+ struct net *net = sock_net(sk);
kuid_t uid = sock_i_uid(sk);
struct sctp_bind_bucket *pp;
unsigned short snum;
@@ -8282,7 +8283,6 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
/* Search for an available port. */
int low, high, remaining, index;
unsigned int rover;
- struct net *net = sock_net(sk);
inet_get_local_port_range(net, &low, &high);
remaining = (high - low) + 1;
@@ -8294,12 +8294,12 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
rover = low;
if (inet_is_local_reserved_port(net, rover))
continue;
- index = sctp_phashfn(sock_net(sk), rover);
+ index = sctp_phashfn(net, rover);
head = &sctp_port_hashtable[index];
spin_lock(&head->lock);
sctp_for_each_hentry(pp, &head->chain)
if ((pp->port == rover) &&
- net_eq(sock_net(sk), pp->net))
+ net_eq(net, pp->net))
goto next;
break;
next:
@@ -8323,10 +8323,10 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
* to the port number (snum) - we detect that with the
* port iterator, pp being NULL.
*/
- head = &sctp_port_hashtable[sctp_phashfn(sock_net(sk), snum)];
+ head = &sctp_port_hashtable[sctp_phashfn(net, snum)];
spin_lock(&head->lock);
sctp_for_each_hentry(pp, &head->chain) {
- if ((pp->port == snum) && net_eq(pp->net, sock_net(sk)))
+ if ((pp->port == snum) && net_eq(pp->net, net))
goto pp_found;
}
}
@@ -8382,7 +8382,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
pp_not_found:
/* If there was a hash table miss, create a new port. */
ret = 1;
- if (!pp && !(pp = sctp_bucket_create(head, sock_net(sk), snum)))
+ if (!pp && !(pp = sctp_bucket_create(head, net, snum)))
goto fail_unlock;
/* In either case (hit or miss), make sure fastreuse is 1 only
--
2.24.0.432.g9d3f5f5b63-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] net-sctp: replace some sock_net(sk) with just 'net'
2019-11-25 23:09 ` [PATCH v2] " Maciej Żenczykowski
@ 2019-11-26 21:01 ` Marcelo Ricardo Leitner
2019-11-26 21:18 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: Marcelo Ricardo Leitner @ 2019-11-26 21:01 UTC (permalink / raw)
To: Maciej Żenczykowski
Cc: Maciej Żenczykowski, David S . Miller, netdev
On Mon, Nov 25, 2019 at 03:09:37PM -0800, Maciej Żenczykowski wrote:
> From: Maciej Żenczykowski <maze@google.com>
>
> It already existed in part of the function, but move it
> to a higher level and use it consistently throughout.
>
> Safe since sk is never written to.
>
> Signed-off-by: Maciej Żenczykowski <maze@google.com>
Please Cc linux-sctp@ on sctp patches.
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] net-sctp: replace some sock_net(sk) with just 'net'
2019-11-25 23:09 ` [PATCH v2] " Maciej Żenczykowski
2019-11-26 21:01 ` Marcelo Ricardo Leitner
@ 2019-11-26 21:18 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2019-11-26 21:18 UTC (permalink / raw)
To: zenczykowski; +Cc: maze, netdev
From: Maciej Żenczykowski <zenczykowski@gmail.com>
Date: Mon, 25 Nov 2019 15:09:37 -0800
> From: Maciej Żenczykowski <maze@google.com>
>
> It already existed in part of the function, but move it
> to a higher level and use it consistently throughout.
>
> Safe since sk is never written to.
>
> Signed-off-by: Maciej Żenczykowski <maze@google.com>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-26 21:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-24 10:47 [PATCH] net-sctp: replace some sock_net(sk) with just 'net' Maciej Żenczykowski
2019-11-25 18:50 ` David Miller
2019-11-25 23:09 ` [PATCH v2] " Maciej Żenczykowski
2019-11-26 21:01 ` Marcelo Ricardo Leitner
2019-11-26 21:18 ` David Miller
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.