Print this page
NEX-6778 NFS kstats leak and cause system to hang
Revert "NEX-4261 Per-client NFS server IOPS, bandwidth, and latency kstats"
This reverts commit 586c3ab1927647487f01c337ddc011c642575a52.
Revert "NEX-5354 Aggregated IOPS, bandwidth, and latency kstats for NFS server"
This reverts commit c91d7614da8618ef48018102b077f60ecbbac8c2.
Revert "NEX-5667 nfssrv_stats_flags does not work for aggregated kstats"
This reverts commit 3dcf42618be7dd5f408c327f429c81e07ca08e74.
Revert "NEX-5750 Time values for aggregated NFS server kstats should be normalized"
This reverts commit 1f4d4f901153b0191027969fa4a8064f9d3b9ee1.
Revert "NEX-5942 Panic in rfs4_minorvers_mismatch() with NFSv4.1 client"
This reverts commit 40766417094a162f5e4cc8786c0fa0a7e5871cd9.
Revert "NEX-5752 NFS server: namespace collision in kstats"
This reverts commit ae81e668db86050da8e483264acb0cce0444a132.
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-4261 Per-client NFS server IOPS, bandwidth, and latency kstats
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-3097 IOPS, bandwidth, and latency kstats for NFS server
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/nfs/nfs4_kprot.h
          +++ new/usr/src/uts/common/nfs/nfs4_kprot.h
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  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  /*
  23      - * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
       23 + * Copyright 2016 Nexenta Systems, Inc.  All rights reserved.
  24   24   */
  25   25  
  26   26  /*
  27   27   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  28   28   * Use is subject to license terms.
  29   29   */
  30   30  
  31   31  #ifndef _NFS4_KPROT_H
  32   32  #define _NFS4_KPROT_H
  33   33  
↓ open down ↓ 1421 lines elided ↑ open up ↑
1455 1455                  RENEW4args oprenew;
1456 1456                  SECINFO4args opsecinfo;
1457 1457                  SECINFO4cargs opcsecinfo;
1458 1458                  SETATTR4args opsetattr;
1459 1459                  SETCLIENTID4args opsetclientid;
1460 1460                  SETCLIENTID_CONFIRM4args opsetclientid_confirm;
1461 1461                  VERIFY4args opverify;
1462 1462                  WRITE4args opwrite;
1463 1463                  RELEASE_LOCKOWNER4args oprelease_lockowner;
1464 1464          } nfs_argop4_u;
     1465 +        size_t opsize;          /* the number of bytes occupied by the */
     1466 +                                /* particular operation in the XDR stream */
     1467 +                                /* (set during the decode only) */
1465 1468  };
1466 1469  typedef struct nfs_argop4 nfs_argop4;
1467 1470  
1468 1471  struct nfs_resop4 {
1469 1472          nfs_opnum4 resop;
1470 1473          union {
1471 1474                  ACCESS4res opaccess;
1472 1475                  CLOSE4res opclose;
1473 1476                  COMMIT4res opcommit;
1474 1477                  CREATE4res opcreate;
↓ open down ↓ 26 lines elided ↑ open up ↑
1501 1504                  SAVEFH4res opsavefh;
1502 1505                  SECINFO4res opsecinfo;
1503 1506                  SETATTR4res opsetattr;
1504 1507                  SETCLIENTID4res opsetclientid;
1505 1508                  SETCLIENTID_CONFIRM4res opsetclientid_confirm;
1506 1509                  VERIFY4res opverify;
1507 1510                  WRITE4res opwrite;
1508 1511                  RELEASE_LOCKOWNER4res oprelease_lockowner;
1509 1512                  ILLEGAL4res opillegal;
1510 1513          } nfs_resop4_u;
     1514 +        size_t opsize;          /* the number of bytes occupied by the */
     1515 +                                /* particular operation in the XDR stream */
     1516 +                                /* (set during the encode only) */
     1517 +        struct exportinfo *exi; /* the exportinfo where the operation should */
     1518 +                                /* be counted in (support for per-exportinfo */
     1519 +                                /* kstats) */
1511 1520  };
1512 1521  typedef struct nfs_resop4 nfs_resop4;
1513 1522  
1514 1523  /*
1515 1524   * Fixed size tag string for easy client encoding
1516 1525   */
1517 1526  struct _ctag {
1518 1527          int ct_type;
1519 1528          char *ct_str;
1520 1529          uint32_t ct_tag[3];
↓ open down ↓ 149 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX