From 36e660958f09a00be706152211484780d4afe483 Mon Sep 17 00:00:00 2001 From: pfg Date: Fri, 10 May 2013 21:39:41 +0000 Subject: [PATCH] MFC r249526, r249600: DTrace: NFS translators should be split into client/server pieces Merge change from illumos: 1731 DTrace NFS translators should be split into client/server pieces Include Changes from OpenSolaris: PSARC 2008/050 DTrace NFS v3 Provider 6696397 NFS v3 provider reports all UDP clients as 0.0.0.0 6711844 assert: vp-->v_shrlocks Illumos Revision: 13523:6763769941d2 This code seems to be currently unused on FreeBSD. Reference: https://www.illumos.org/issues/1731 Obtained from: Illumos git-svn-id: svn://svn.freebsd.org/base/stable/9@250486 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- cddl/lib/libdtrace/nfs.d | 76 +++++++++++++++++++++---------------- cddl/lib/libdtrace/nfssrv.d | 54 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 33 deletions(-) create mode 100644 cddl/lib/libdtrace/nfssrv.d diff --git a/cddl/lib/libdtrace/nfs.d b/cddl/lib/libdtrace/nfs.d index 0f936c4af..be342286f 100644 --- a/cddl/lib/libdtrace/nfs.d +++ b/cddl/lib/libdtrace/nfs.d @@ -28,11 +28,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #pragma D depends_on library ip.d #pragma D depends_on library net.d -#pragma D depends_on module genunix +#pragma D depends_on module nfs typedef struct nfsv4opinfo { uint64_t noi_xid; /* unique transation ID */ @@ -47,50 +45,62 @@ typedef struct nfsv4cbinfo { #pragma D binding "1.5" translator translator conninfo_t < struct svc_req *P > { ci_protocol = P->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" : + P->rq_xprt->xp_master->xp_netid == "udp" ? "ipv4" : P->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" : + P->rq_xprt->xp_master->xp_netid == "udp6" ? "ipv6" : ""; - ci_local = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc. - xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr); - - ci_remote = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc. - xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr); + ci_local = (P->rq_xprt->xp_master->xp_netid == "tcp" || + P->rq_xprt->xp_master->xp_netid == "udp") ? + inet_ntoa(&((struct sockaddr_in *) + P->rq_xprt->xp_xpc.xpc_lcladdr.buf)->sin_addr.S_un.S_addr) : + (P->rq_xprt->xp_master->xp_netid == "tcp6" || + P->rq_xprt->xp_master->xp_netid == "udp6") ? + inet_ntoa6(&((struct sockaddr_in6 *) + P->rq_xprt->xp_xpc.xpc_lcladdr.buf)->sin6_addr) : + "unknown"; + + ci_remote = (P->rq_xprt->xp_master->xp_netid == "tcp" || + P->rq_xprt->xp_master->xp_netid == "udp") ? + inet_ntoa(&((struct sockaddr_in *) + P->rq_xprt->xp_xpc.xpc_rtaddr.buf)->sin_addr.S_un.S_addr) : + (P->rq_xprt->xp_master->xp_netid == "tcp6" || + P->rq_xprt->xp_master->xp_netid == "udp6") ? + inet_ntoa6(&((struct sockaddr_in6 *) + P->rq_xprt->xp_xpc.xpc_rtaddr.buf)->sin6_addr) : + "unknown"; }; #pragma D binding "1.5" translator -translator conninfo_t < struct compound_state *P > { - ci_protocol = P->req->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" : - P->req->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" : - ""; +translator conninfo_t < rfs4_client_t *P > { + ci_protocol = (P->rc_addr.ss_family == AF_INET) ? "ipv4" : "ipv6"; - ci_local = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc. - xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr); + ci_local = ""; - ci_remote = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc. - xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr); + ci_remote = (P->rc_addr.ss_family == AF_INET) ? + inet_ntoa((ipaddr_t *) + &((struct sockaddr_in *)&P->rc_addr)->sin_addr) : + inet_ntoa6(&((struct sockaddr_in6 *)&P->rc_addr)->sin6_addr); }; #pragma D binding "1.5" translator -translator nfsv4opinfo_t < struct compound_state *P > { - noi_xid = P->req->rq_xprt->xp_xid; - noi_cred = P->basecr; - noi_curpath = (P->vp == NULL) ? "" : P->vp->v_path; +translator nfsv4cbinfo_t < rfs4_deleg_state_t *P > { + nci_curpath = (P->rds_finfo->rf_vp == NULL) ? "" : + P->rds_finfo->rf_vp->v_path; }; -#pragma D binding "1.5" translator -translator conninfo_t < rfs4_client_t *P > { - ci_protocol = (P->cl_addr.ss_family == AF_INET) ? "ipv4" : "ipv6"; - - ci_local = ""; +typedef struct nfsv3opinfo { + uint64_t noi_xid; /* unique transation ID */ + cred_t *noi_cred; /* credentials for operation */ + string noi_curpath; /* current file handle path (if any) */ +} nfsv3opinfo_t; - ci_remote = (P->cl_addr.ss_family == AF_INET) ? - inet_ntoa((ipaddr_t *) - &((struct sockaddr_in *)&P->cl_addr)->sin_addr) : - inet_ntoa6(&((struct sockaddr_in6 *)&P->cl_addr)->sin6_addr); -}; +typedef struct nfsv3oparg nfsv3oparg_t; #pragma D binding "1.5" translator -translator nfsv4cbinfo_t < rfs4_deleg_state_t *P > { - nci_curpath = (P->finfo->vp == NULL) ? "" : - P->finfo->vp->v_path; +translator nfsv3opinfo_t < nfsv3oparg_t *P > { + noi_xid = ((struct svc_req *)arg0)->rq_xprt->xp_xid; + noi_cred = (cred_t *)arg1; + noi_curpath = (arg2 == 0 || ((vnode_t *)arg2)->v_path == NULL) ? + "" : ((vnode_t *)arg2)->v_path; }; diff --git a/cddl/lib/libdtrace/nfssrv.d b/cddl/lib/libdtrace/nfssrv.d new file mode 100644 index 000000000..68ac08b58 --- /dev/null +++ b/cddl/lib/libdtrace/nfssrv.d @@ -0,0 +1,54 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + * + * Portions Copyright 2006-2008 John Birrell jb@freebsd.org + * + * $FreeBSD$ + */ + +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#pragma D depends_on library ip.d +#pragma D depends_on library net.d +#pragma D depends_on module nfs.d +#pragma D depends_on module nfssrv + +#pragma D binding "1.5" translator +translator conninfo_t < struct compound_state *P > { + ci_protocol = P->req->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" : + P->req->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" : + ""; + + ci_local = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc. + xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr); + + ci_remote = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc. + xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr); +}; + +#pragma D binding "1.5" translator +translator nfsv4opinfo_t < struct compound_state *P > { + noi_xid = P->req->rq_xprt->xp_xid; + noi_cred = P->basecr; + noi_curpath = (P->vp == NULL) ? "" : P->vp->v_path; +}; -- 2.45.0