#include <linux/version.h>
-#ifdef AFS_LINUX22_ENV
#include "rx/rx_kcommon.h"
-#if defined(AFS_LINUX24_ENV)
-#include "h/smp_lock.h"
-#endif
+#include "rx.h"
+#include "rx_atomic.h"
+#include "rx_globals.h"
+#include "rx_stats.h"
+#include "rx_peer.h"
+#include "rx_packet.h"
+#include "rx_internal.h"
+#if defined(HAVE_LINUX_UACCESS_H)
+#include <linux/uaccess.h>
+#else
#include <asm/uaccess.h>
-#ifdef ADAPT_PMTU
+#endif
+#ifdef AFS_RXERRQ_ENV
#include <linux/errqueue.h>
#include <linux/icmp.h>
#endif
+#include "osi_compat.h"
/* rxk_NewSocket
* open and bind RX socket
struct socket *sockp;
struct sockaddr_in myaddr;
int code;
- KERNEL_SPACE_DECL;
-#ifdef ADAPT_PMTU
+#ifdef AFS_ADAPT_PMTU
int pmtu = IP_PMTUDISC_WANT;
- int do_recverr = 1;
#else
int pmtu = IP_PMTUDISC_DONT;
#endif
- /* We need a better test for this. if you need it back, tell us
- * how to detect it.
- */
-#ifdef LINUX_KERNEL_SOCK_CREATE_V
+#ifdef HAVE_LINUX_SOCK_CREATE_KERN_NS
+ code = sock_create_kern(&init_net, AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp);
+#elif defined(HAVE_LINUX_SOCK_CREATE_KERN)
+ code = sock_create_kern(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp);
+#elif defined(LINUX_KERNEL_SOCK_CREATE_V)
code = sock_create(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp, 0);
#else
code = sock_create(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp);
sockp->ops->bind(sockp, (struct sockaddr *)&myaddr, sizeof(myaddr));
if (code < 0) {
-#if defined(AFS_LINUX24_ENV)
printk("sock_release(rx_socket) FIXME\n");
-#else
- sock_release(sockp);
-#endif
return NULL;
}
- TO_USER_SPACE();
- sockp->ops->setsockopt(sockp, SOL_IP, IP_MTU_DISCOVER, (char *)&pmtu,
- sizeof(pmtu));
-#ifdef ADAPT_PMTU
- sockp->ops->setsockopt(sockp, SOL_IP, IP_RECVERR, (char *)&do_recverr,
- sizeof(do_recverr));
+ afs_linux_sock_set_mtu_discover(sockp, pmtu);
+
+#ifdef AFS_RXERRQ_ENV
+ afs_linux_sock_set_recverr(sockp);
#endif
- TO_KERNEL_SPACE();
return (osi_socket *)sockp;
}
/* free socket allocated by osi_NetSocket */
int
-rxk_FreeSocket(register struct socket *asocket)
+rxk_FreeSocket(struct socket *asocket)
{
AFS_STATCNT(osi_FreeSocket);
return 0;
}
-#ifdef ADAPT_PMTU
-void
-handle_socket_error(osi_socket so)
+#ifdef AFS_RXERRQ_ENV
+int
+osi_HandleSocketError(osi_socket so, void *cmsgbuf, size_t cmsgbuf_len)
{
- KERNEL_SPACE_DECL;
struct msghdr msg;
struct cmsghdr *cmsg;
struct sock_extended_err *err;
struct sockaddr_in addr;
- struct sockaddr *offender;
- char *controlmsgbuf;
int code;
struct socket *sop = (struct socket *)so;
- if (!(controlmsgbuf=rxi_Alloc(256)))
- return;
msg.msg_name = &addr;
msg.msg_namelen = sizeof(addr);
- msg.msg_iov = NULL;
- msg.msg_iovlen = 0;
- msg.msg_control = controlmsgbuf;
- msg.msg_controllen = 256;
+ msg.msg_control = cmsgbuf;
+ msg.msg_controllen = cmsgbuf_len;
msg.msg_flags = 0;
- TO_USER_SPACE();
- code = sock_recvmsg(sop, &msg, 256, MSG_ERRQUEUE|MSG_DONTWAIT|MSG_TRUNC);
- TO_KERNEL_SPACE();
+ code = kernel_recvmsg(sop, &msg, NULL, 0, 0,
+ MSG_ERRQUEUE|MSG_DONTWAIT|MSG_TRUNC);
if (code < 0 || !(msg.msg_flags & MSG_ERRQUEUE))
- goto out;
+ return 0;
- for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
- if (CMSG_OK(&msg, cmsg) && cmsg->cmsg_level == SOL_IP &&
- cmsg->cmsg_type == IP_RECVERR)
- break;
- }
- if (!cmsg)
- goto out;
- err = CMSG_DATA(cmsg);
- offender = SO_EE_OFFENDER(err);
-
- if (offender->sa_family != AF_INET)
- goto out;
-
- memcpy(&addr, offender, sizeof(addr));
-
- if (err->ee_origin == SO_EE_ORIGIN_ICMP &&
- err->ee_type == ICMP_DEST_UNREACH &&
- err->ee_code == ICMP_FRAG_NEEDED) {
- rxi_SetPeerMtu(ntohl(addr.sin_addr.s_addr), ntohs(addr.sin_port),
- err->ee_info);
+ /* kernel_recvmsg changes msg_control to point at the _end_ of the buffer,
+ * and msg_controllen is set to the number of bytes remaining */
+ msg.msg_controllen = ((char*)msg.msg_control - (char*)cmsgbuf);
+ msg.msg_control = cmsgbuf;
+
+ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg && CMSG_OK(&msg, cmsg);
+ cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+
+ if (cmsg->cmsg_level != SOL_IP || cmsg->cmsg_type != IP_RECVERR) {
+ continue;
+ }
+
+ err = CMSG_DATA(cmsg);
+ rxi_ProcessNetError(err, addr.sin_addr.s_addr, addr.sin_port);
}
- /* other DEST_UNREACH's and TIME_EXCEEDED should be dealt with too */
-out:
- rxi_Free(controlmsgbuf, 256);
- return;
+ return 1;
}
#endif
osi_NetSend(osi_socket sop, struct sockaddr_in *to, struct iovec *iovec,
int iovcnt, afs_int32 size, int istack)
{
- KERNEL_SPACE_DECL;
struct msghdr msg;
- int code, sockerr;
- size_t esize;
-
-#ifdef ADAPT_PMTU
- while (1) {
- sockerr=0;
- esize = sizeof(sockerr);
- TO_USER_SPACE();
- sop->ops->getsockopt(sop, SOL_SOCKET, SO_ERROR, (char *)&sockerr,
- &esize);
- TO_KERNEL_SPACE();
- if (sockerr == 0)
- break;
- handle_socket_error(sop);
- }
-#endif
+ int code;
+
- msg.msg_iovlen = iovcnt;
- msg.msg_iov = iovec;
msg.msg_name = to;
msg.msg_namelen = sizeof(*to);
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
- TO_USER_SPACE();
- code = sock_sendmsg(sop, &msg, size);
- TO_KERNEL_SPACE();
+ code = kernel_sendmsg(sop, &msg, (struct kvec *) iovec, iovcnt, size);
+
return (code < 0) ? code : 0;
}
osi_NetReceive(osi_socket so, struct sockaddr_in *from, struct iovec *iov,
int iovcnt, int *lengthp)
{
- KERNEL_SPACE_DECL;
struct msghdr msg;
- int code, sockerr;
- size_t esize;
+ int code;
struct iovec tmpvec[RX_MAXWVECS + 2];
struct socket *sop = (struct socket *)so;
if (iovcnt > RX_MAXWVECS + 2) {
osi_Panic("Too many (%d) iovecs passed to osi_NetReceive\n", iovcnt);
}
-#ifdef ADAPT_PMTU
- while (1) {
- sockerr=0;
- esize = sizeof(sockerr);
- TO_USER_SPACE();
- sop->ops->getsockopt(sop, SOL_SOCKET, SO_ERROR, (char *)&sockerr,
- &esize);
- TO_KERNEL_SPACE();
- if (sockerr == 0)
- break;
- handle_socket_error(so);
- }
-#endif
+
memcpy(tmpvec, iov, iovcnt * sizeof(struct iovec));
msg.msg_name = from;
+#if defined(STRUCT_MSGHDR_HAS_MSG_ITER)
+ msg.msg_iter.iov = tmpvec;
+ msg.msg_iter.nr_segs = iovcnt;
+#else
msg.msg_iov = tmpvec;
msg.msg_iovlen = iovcnt;
+#endif
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
- TO_USER_SPACE();
- code = sock_recvmsg(sop, &msg, *lengthp, 0);
- TO_KERNEL_SPACE();
-
+ code = kernel_recvmsg(sop, &msg, (struct kvec *)tmpvec, iovcnt,
+ *lengthp, 0);
if (code < 0) {
-#ifdef AFS_LINUX26_ENV
-#ifdef CONFIG_PM
- if (
-#ifdef PF_FREEZE
- current->flags & PF_FREEZE
-#else
-#if defined(STRUCT_TASK_STRUCT_HAS_TODO)
- !current->todo
-#else
-#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
- test_ti_thread_flag(current->thread_info, TIF_FREEZE)
-#else
- test_ti_thread_flag(task_thread_info(current), TIF_FREEZE)
-#endif
-#endif
-#endif
- )
-#ifdef LINUX_REFRIGERATOR_TAKES_PF_FREEZE
- refrigerator(PF_FREEZE);
-#else
- refrigerator();
-#endif
- set_current_state(TASK_INTERRUPTIBLE);
-#endif
-#endif
+ afs_try_to_freeze();
/* Clear the error before using the socket again.
* Oh joy, Linux has hidden header files as well. It appears we can
* simply call again and have it clear itself via sock_error().
*/
-#ifdef AFS_LINUX22_ENV
flush_signals(current); /* We don't want no stinkin' signals. */
-#else
- current->signal = 0; /* We don't want no stinkin' signals. */
-#endif
rxk_lastSocketError = code;
rxk_nSocketErrors++;
+
+ rxi_HandleSocketErrors(so);
} else {
*lengthp = code;
code = 0;
return code;
}
-#ifdef EXPORTED_TASKLIST_LOCK
-extern rwlock_t tasklist_lock __attribute__((weak));
-#endif
+
void
osi_StopListener(void)
{
while (rxk_ListenerTask) {
if (rxk_ListenerTask) {
flush_signals(rxk_ListenerTask);
- force_sig(SIGKILL, rxk_ListenerTask);
+ send_sig(SIGKILL, rxk_ListenerTask, 1);
}
if (!rxk_ListenerTask)
break;
rx_socket = NULL;
}
-#endif /* AFS_LINUX22_ENV */
git://git.openafs.org / openafs.git / blobdiff