From: Christoph Hellwig <hch@lst.de>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
Eric Dumazet <edumazet@google.com>,
linux-nvme@lists.infradead.org, linux-sctp@vger.kernel.org,
target-devel@vger.kernel.org, linux-afs@lists.infradead.org,
linux-cifs@vger.kernel.org, rds-devel@oss.oracle.com,
linux-rdma@vger.kernel.org, cluster-devel@redhat.com,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
linux-block@vger.kernel.org, drbd-dev@tron.linbit.com,
ceph-devel@vger.kernel.org, linux-nfs@vger.kernel.org,
Neil Horman <nhorman@tuxdriver.com>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
netdev@vger.kernel.org, Vlad Yasevich <vyasevich@gmail.com>,
linux-kernel@vger.kernel.org, Jon Maloy <jmaloy@redhat.com>,
Ying Xue <ying.xue@windriver.com>,
ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH 25/33] ipv6: add ip6_sock_set_recvpktinfo
Date: Wed, 13 May 2020 08:26:40 +0200 [thread overview]
Message-ID: <20200513062649.2100053-26-hch@lst.de> (raw)
In-Reply-To: <20200513062649.2100053-1-hch@lst.de>
Add a helper to directly set the IPV6_RECVPKTINFO sockopt from kernel
space without going through a fake uaccess.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/net/ipv6.h | 1 +
net/ipv6/ipv6_sockglue.c | 8 ++++++++
net/sunrpc/svcsock.c | 11 +++--------
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 04b2bc1935054..170872bc4e960 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -1178,5 +1178,6 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex,
int ip6_sock_set_v6only(struct sock *sk, bool val);
void ip6_sock_set_recverr(struct sock *sk, bool val);
int ip6_sock_set_addr_preferences(struct sock *sk, bool val);
+void ip6_sock_set_recvpktinfo(struct sock *sk, bool val);
#endif /* _NET_IPV6_H */
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index c23d42e809d7e..d60adb018d71c 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -225,6 +225,14 @@ int ip6_sock_set_addr_preferences(struct sock *sk, bool val)
}
EXPORT_SYMBOL(ip6_sock_set_addr_preferences);
+void ip6_sock_set_recvpktinfo(struct sock *sk, bool val)
+{
+ lock_sock(sk);
+ inet6_sk(sk)->rxopt.bits.rxinfo = val;
+ release_sock(sk);
+}
+EXPORT_SYMBOL(ip6_sock_set_recvpktinfo);
+
static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
char __user *optval, unsigned int optlen)
{
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 7fa7fedec3c5a..7cf8389b6f46f 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -595,8 +595,6 @@ static struct svc_xprt_class svc_udp_class = {
static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)
{
- int err, level, optname, one = 1;
-
svc_xprt_init(sock_net(svsk->sk_sock->sk), &svc_udp_class,
&svsk->sk_xprt, serv);
clear_bit(XPT_CACHE_AUTH, &svsk->sk_xprt.xpt_flags);
@@ -617,17 +615,14 @@ static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)
switch (svsk->sk_sk->sk_family) {
case AF_INET:
ip_sock_set_pktinfo(svsk->sk_sock->sk, true);
- return;
+ break;
case AF_INET6:
- level = SOL_IPV6;
- optname = IPV6_RECVPKTINFO;
+ if (IS_REACHABLE(CONFIG_IPV6))
+ ip6_sock_set_recvpktinfo(svsk->sk_sock->sk, true);
break;
default:
BUG();
}
- err = kernel_setsockopt(svsk->sk_sock, level, optname,
- (char *)&one, sizeof(one));
- dprintk("svc: kernel_setsockopt returned %d\n", err);
}
/*
--
2.26.2
next prev parent reply other threads:[~2020-05-13 6:26 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 6:26 [Ocfs2-devel] remove kernel_setsockopt and kernel_getsockopt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 01/33] net: add sock_set_reuseaddr Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 02/33] net: add sock_set_linger Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 03/33] net: add sock_set_priority Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 04/33] net: add sock_set_sndtimeo Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 05/33] net: add sock_bindtoindex Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 06/33] net: add sock_set_timestamps Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 07/33] net: add sock_set_keepalive Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 08/33] net: add sock_set_rcvbuf Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 09/33] net: add sock_set_reuseport Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 10/33] tcp: add tcp_sock_set_cork Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 11/33] tcp: tcp_sock_set_nodelay Christoph Hellwig
2020-05-13 12:51 ` Jason Gunthorpe
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 12/33] tcp: add tcp_sock_set_quickack Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 13/33] tcp: add tcp_sock_set_syncnt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 14/33] tcp: add tcp_sock_set_user_timeout Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 15/33] tcp: add tcp_sock_set_keepidle Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 16/33] tcp: add tcp_sock_set_keepintvl Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 17/33] tcp: add tcp_sock_set_keepcnt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 18/33] ipv4: add ip_sock_set_tos Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 19/33] ipv4: add ip_sock_set_freebind Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 20/33] ipv4: add ip_sock_set_recverr Christoph Hellwig
2020-05-13 21:00 ` Joe Perches
2020-05-14 10:30 ` Christoph Hellwig
2020-05-14 11:51 ` Joe Perches
2020-05-20 14:18 ` Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 21/33] ipv4: add ip_sock_set_mtu_discover Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 22/33] ipv6: add ip6_sock_set_v6only Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 23/33] ipv6: add ip6_sock_set_recverr Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 24/33] ipv6: add ip6_sock_set_addr_preferences Christoph Hellwig
2020-05-13 6:26 ` Christoph Hellwig [this message]
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 26/33] sctp: lift copying in addrs into sctp_setsockopt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 27/33] sctp: export sctp_setsockopt_bindx Christoph Hellwig
2020-05-13 18:00 ` Marcelo Ricardo Leitner
2020-05-14 6:28 ` Christoph Hellwig
2020-05-14 8:23 ` David Laight
2020-05-14 10:40 ` [Ocfs2-devel] is it ok to always pull in sctp for dlm, was: " Christoph Hellwig
2020-05-14 14:24 ` David Teigland
2020-05-15 15:20 ` [Ocfs2-devel] " David Howells
2020-05-15 15:24 ` Christoph Hellwig
2020-05-16 15:21 ` David Laight
2020-05-16 15:11 ` David Laight
2020-05-16 15:36 ` Matthew Wilcox
2020-05-17 8:48 ` David Laight
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 28/33] sctp: add sctp_sock_set_nodelay Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 29/33] rxrpc_sock_set_min_security_level Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 30/33] tipc: call tsk_set_importance from tipc_topsrv_create_listener Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 31/33] net: remove kernel_setsockopt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 32/33] sctp: add sctp_sock_get_primary_addr Christoph Hellwig
2020-05-13 18:03 ` Marcelo Ricardo Leitner
2020-05-14 9:51 ` David Laight
2020-05-14 12:30 ` David Laight
2020-05-14 13:27 ` David Laight
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 33/33] net: remove kernel_getsockopt Christoph Hellwig
2020-05-13 13:13 ` [Ocfs2-devel] [PATCH 29/33] rxrpc_sock_set_min_security_level David Howells
2020-05-14 10:29 ` Christoph Hellwig
2020-05-15 15:13 ` David Howells
2020-05-13 13:17 ` [Ocfs2-devel] [PATCH 21/33] ipv4: add ip_sock_set_mtu_discover David Howells
2020-05-14 6:26 ` Christoph Hellwig
2020-05-15 15:15 ` David Howells
2020-05-13 13:24 ` [Ocfs2-devel] [PATCH 20/33] ipv4: add ip_sock_set_recverr David Howells
2020-05-13 13:25 ` [Ocfs2-devel] [PATCH 23/33] ipv6: add ip6_sock_set_recverr David Howells
2020-05-13 13:27 ` [Ocfs2-devel] [PATCH 06/33] net: add sock_set_timestamps David Howells
2020-05-13 17:38 ` [Ocfs2-devel] remove kernel_setsockopt and kernel_getsockopt Joe Perches
2020-05-14 6:27 ` Christoph Hellwig
2020-05-14 8:29 ` David Laight
2020-05-14 10:18 ` Christoph Hellwig
2020-05-14 10:26 ` David Laight
2020-05-14 10:34 ` 'Christoph Hellwig'
2020-05-14 11:11 ` David Laight
2020-05-14 19:35 ` Matthew Wilcox
2020-05-14 20:03 ` David Miller
2020-05-15 8:14 ` David Laight
2020-05-14 19:57 ` David Miller
2020-05-13 18:45 ` Sagi Grimberg
2020-05-13 19:12 ` David Miller
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=20200513062649.2100053-26-hch@lst.de \
--to=hch@lst.de \
--cc=ceph-devel@vger.kernel.org \
--cc=cluster-devel@redhat.com \
--cc=davem@davemloft.net \
--cc=drbd-dev@tron.linbit.com \
--cc=edumazet@google.com \
--cc=jmaloy@redhat.com \
--cc=kuba@kernel.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-afs@lists.infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=rds-devel@oss.oracle.com \
--cc=target-devel@vger.kernel.org \
--cc=vyasevich@gmail.com \
--cc=ying.xue@windriver.com \
--cc=yoshfuji@linux-ipv6.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).