Print this page
NEX-16712 NFS dtrace providers do not support per-share filtering
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Yuri Pankon <yuri.pankov@nexenta.com>
NEX-15555 SMB2 async redesign
NEX-15061 smtorture smb2.lock.cancel.cancel is failed
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Also follow-up change to:
 NEX-1643 dtrace provider for smbsrv (remove "done2" probes,
 which don't make sense with the new async design)
NEX-15555 SMB2 async redesign
NEX-15061 smtorture smb2.lock.cancel.cancel is failed
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Also follow-up change to:
 NEX-1643 dtrace provider for smbsrv (remove "done2" probes,
 which don't make sense with the new async design)
NEX-1643 dtrace provider for smbsrv
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/sdt.h
          +++ new/usr/src/uts/common/sys/sdt.h
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23   * Copyright (c) 2013 by Delphix. All rights reserved.
       24 + * Copyright 2018 Nexenta Systems, Inc.  All rights reserved.
  24   25   */
  25   26  
  26   27  #ifndef _SYS_SDT_H
  27   28  #define _SYS_SDT_H
  28   29  
  29   30  #include <sys/stdint.h>
  30   31  
  31   32  #ifdef  __cplusplus
  32   33  extern "C" {
  33   34  #endif
↓ open down ↓ 189 lines elided ↑ open up ↑
 223  224      type3, arg3, type4, arg4, type5, arg5, type6, arg6,                 \
 224  225      type7, arg7, type8, arg8)                                           \
 225  226          DTRACE_PROBE8(__iscsi_##name, type1, arg1, type2, arg2,         \
 226  227              type3, arg3, type4, arg4, type5, arg5, type6, arg6,         \
 227  228              type7, arg7, type8, arg8);
 228  229  
 229  230  #define DTRACE_NFSV3_3(name, type1, arg1, type2, arg2,                  \
 230  231      type3, arg3)                                                        \
 231  232          DTRACE_PROBE3(__nfsv3_##name, type1, arg1, type2, arg2,         \
 232  233              type3, arg3);
      234 +
 233  235  #define DTRACE_NFSV3_4(name, type1, arg1, type2, arg2,                  \
 234  236      type3, arg3, type4, arg4)                                           \
 235  237          DTRACE_PROBE4(__nfsv3_##name, type1, arg1, type2, arg2,         \
 236  238              type3, arg3, type4, arg4);
 237  239  
      240 +#define DTRACE_NFSV3_5(name, type1, arg1, type2, arg2,                  \
      241 +    type3, arg3, type4, arg4, type5, arg5)                              \
      242 +        DTRACE_PROBE5(__nfsv3_##name, type1, arg1, type2, arg2,         \
      243 +            type3, arg3, type4, arg4, type5, arg5);
      244 +
 238  245  #define DTRACE_NFSV4_1(name, type1, arg1) \
 239  246          DTRACE_PROBE1(__nfsv4_##name, type1, arg1);
 240  247  
 241  248  #define DTRACE_NFSV4_2(name, type1, arg1, type2, arg2) \
 242  249          DTRACE_PROBE2(__nfsv4_##name, type1, arg1, type2, arg2);
 243  250  
 244  251  #define DTRACE_NFSV4_3(name, type1, arg1, type2, arg2, type3, arg3) \
 245  252          DTRACE_PROBE3(__nfsv4_##name, type1, arg1, type2, arg2, type3, arg3);
 246  253  
 247      -#define DTRACE_SMB_1(name, type1, arg1) \
 248      -        DTRACE_PROBE1(__smb_##name, type1, arg1);
      254 +/*
      255 + * The SMB probes are done a little differently from the other probes
      256 + * in this file for the benefit of the libfksmbsrv USDT provider.
      257 + * See: lib/smbsrv/libfksmbsrv/common/sys/sdt.h
      258 + */
      259 +#define DTRACE_SMB_START(name, type1, arg1) \
      260 +        DTRACE_PROBE1(__smb_##name##__start, type1, arg1);
      261 +#define DTRACE_SMB_DONE(name, type1, arg1) \
      262 +        DTRACE_PROBE1(__smb_##name##__done, type1, arg1);
 249  263  
 250      -#define DTRACE_SMB_2(name, type1, arg1, type2, arg2) \
 251      -        DTRACE_PROBE2(__smb_##name, type1, arg1, type2, arg2);
      264 +#define DTRACE_SMB2_START(name, type1, arg1) \
      265 +        DTRACE_PROBE1(__smb2_##name##__start, type1, arg1);
      266 +#define DTRACE_SMB2_DONE(name, type1, arg1) \
      267 +        DTRACE_PROBE1(__smb2_##name##__done, type1, arg1);
 252  268  
 253  269  #define DTRACE_IP(name)                                         \
 254  270          DTRACE_PROBE(__ip_##name);
 255  271  
 256  272  #define DTRACE_IP1(name, type1, arg1)                                   \
 257  273          DTRACE_PROBE1(__ip_##name, type1, arg1);
 258  274  
 259  275  #define DTRACE_IP2(name, type1, arg1, type2, arg2)                      \
 260  276          DTRACE_PROBE2(__ip_##name, type1, arg1, type2, arg2);
 261  277  
↓ open down ↓ 178 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX