From 0dfe541e13279d277d838d6a27e55188b9486cb1 Mon Sep 17 00:00:00 2001 From: Evan Layton Date: Mon, 5 Mar 2018 20:41:49 -0800 Subject: 11083 support NFS server in zone Portions contributed by: Dan Kruchinin Portions contributed by: Stepan Zastupov Portions contributed by: Joyce McIntosh Portions contributed by: Mike Zeller Portions contributed by: Dan McDonald Portions contributed by: Gordon Ross Portions contributed by: Vitaliy Gusev Reviewed by: Rick McNeal Reviewed by: Rob Gittins Reviewed by: Sanjay Nadkarni Reviewed by: Jason King Reviewed by: C Fraire Approved by: Garrett D'Amore --- usr/src/cmd/smbsrv/dtrace/smb-trace.d | 39 +++++++++++++++++++++++++++++++++- usr/src/cmd/smbsrv/dtrace/smb2-trace.d | 39 +++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 2 deletions(-) (limited to 'usr/src/cmd/smbsrv') diff --git a/usr/src/cmd/smbsrv/dtrace/smb-trace.d b/usr/src/cmd/smbsrv/dtrace/smb-trace.d index 32162dca2b..40b3cba219 100644 --- a/usr/src/cmd/smbsrv/dtrace/smb-trace.d +++ b/usr/src/cmd/smbsrv/dtrace/smb-trace.d @@ -1,3 +1,4 @@ +#!/usr/sbin/dtrace -s /* * This file and its contents are supplied under the terms of the * Common Development and Distribution License ("CDDL"), version 1.0. @@ -10,7 +11,7 @@ */ /* - * Copyright 2017 Nexenta Systems, Inc. All rights reserved. + * Copyright 2018 Nexenta Systems, Inc. All rights reserved. */ /* @@ -24,9 +25,38 @@ * args[2] smb_name_args_t * args[2] smb_open_args_t * args[2] smb_rw_args_t + * + * Usage: smb-trace.d [|all [|all] []]] + * + * example: smb_trace.d 192.168.012.001 mypool_fs1 0 + * + * It is valid to specify or as "all" to + * print data for all clients and/or all shares. + * Omitting will print data for all zones. */ +#pragma D option defaultargs + +dtrace:::BEGIN +{ + all_clients = (($$1 == NULL) || ($$1 == "all")) ? 1 : 0; + all_shares = (($$2 == NULL) || ($$2 == "all")) ? 1 : 0; + all_zones = ($$3 == NULL) ? 1 : 0; + + client = $$1; + share = $$2; + zoneid = $3; + + printf("%Y - client=%s share=%s zone=%s)\n", walltimestamp, + (all_clients) ? "all" : client, + (all_shares) ? "all" : share, + (all_zones) ? "all" : $$3); +} + smb:::op-*-start +/ ((all_clients) || (args[0]->ci_remote == client)) && + ((all_shares) || (args[1]->soi_share == share)) && + ((all_zones) || (args[1]->soi_zoneid == zoneid)) / { printf("clnt=%s mid=0x%x uid=0x%x tid=0x%x\n", args[0]->ci_remote, @@ -36,9 +66,16 @@ smb:::op-*-start } smb:::op-*-done +/ ((all_clients) || (args[0]->ci_remote == client)) && + ((all_shares) || (args[1]->soi_share == share)) && + ((all_zones) || (args[1]->soi_zoneid == zoneid)) / { printf("clnt=%s mid=0x%x status=0x%x\n", args[0]->ci_remote, args[1]->soi_mid, args[1]->soi_status); } + +dtrace:::END +{ +} diff --git a/usr/src/cmd/smbsrv/dtrace/smb2-trace.d b/usr/src/cmd/smbsrv/dtrace/smb2-trace.d index 4e83216785..409d878dea 100644 --- a/usr/src/cmd/smbsrv/dtrace/smb2-trace.d +++ b/usr/src/cmd/smbsrv/dtrace/smb2-trace.d @@ -1,3 +1,4 @@ +#!/usr/sbin/dtrace -s /* * This file and its contents are supplied under the terms of the * Common Development and Distribution License ("CDDL"), version 1.0. @@ -10,7 +11,7 @@ */ /* - * Copyright 2017 Nexenta Systems, Inc. All rights reserved. + * Copyright 2018 Nexenta Systems, Inc. All rights reserved. */ /* @@ -23,9 +24,38 @@ * Some also provide one of: (not used here) * args[2] smb_open_args_t * args[2] smb_rw_args_t + * + * Usage: smb2-trace.d [|all [|all] []]] + * + * example: smb2_trace.d 192.168.012.001 mypool_fs1 0 + * + * It is valid to specify or as "all" to + * print data for all clients and/or all shares. + * Omitting will print data for all zones. */ +#pragma D option defaultargs + +dtrace:::BEGIN +{ + all_clients = (($$1 == NULL) || ($$1 == "all")) ? 1 : 0; + all_shares = (($$2 == NULL) || ($$2 == "all")) ? 1 : 0; + all_zones = ($$3 == NULL) ? 1 : 0; + + client = $$1; + share = $$2; + zoneid = $3; + + printf("%Y - client=%s share=%s zone=%s)\n", walltimestamp, + (all_clients) ? "all" : client, + (all_shares) ? "all" : share, + (all_zones) ? "all" : $$3); +} + smb2:::op-*-start +/ ((all_clients == 1) || (args[0]->ci_remote == client)) && + ((all_shares == 1) || (args[1]->soi_share == share)) && + ((all_zones == 1) || (args[1]->soi_zoneid == zoneid)) / { printf("clnt=%s mid=0x%x uid=0x%x tid=0x%x\n", args[0]->ci_remote, @@ -35,9 +65,16 @@ smb2:::op-*-start } smb2:::op-*-done +/ ((all_clients == 1) || (args[0]->ci_remote == client)) && + ((all_shares == 1) || (args[1]->soi_share == share)) && + ((all_zones == 1) || (args[1]->soi_zoneid == zoneid)) / { printf("clnt=%s mid=0x%x status=0x%x\n", args[0]->ci_remote, args[1]->soi_mid, args[1]->soi_status); } + +dtrace:::END +{ +} -- cgit v1.2.3