OS-7125 Need mitigation of L1TF (CVE-2018-3646)
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

          --- old/usr/src/uts/sparc/zfs/Makefile
          +++ new/usr/src/uts/sparc/zfs/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  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  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  #       This makefile drives the production of the zfs file system
  26   26  #       kernel module.
  27   27  #
  28   28  # Copyright 2013 Saso Kiselkov. All rights reserved.
  29   29  #
  30   30  # Copyright (c) 2016 by Delphix. All rights reserved.
  31   31  #
       32 +# Copyright 2018 Joyent, Inc.
       33 +#
  32   34  
  33   35  #
  34   36  #       Path to the base of the uts directory tree (usually /usr/src/uts).
  35   37  #
  36   38  UTSBASE = ../..
  37   39  
  38   40  ARCHDIR:sh = cd ..; basename `pwd`
  39   41  
  40   42  #
  41   43  #       Define the module and object file sets.

  42   44  #
  43   45  MODULE          = zfs
  44   46  OBJECTS         = $(ZFS_OBJS:%=$(OBJS_DIR)/%) $(LUA_OBJS:%=$(OBJS_DIR)/%)
  45   47  # LUA_OBJS are intentionally omitted from LINTS
  46   48  LINTS           = $(ZFS_OBJS:%.o=$(LINTS_DIR)/%.ln)
  47   49  ROOTMODULE      = $(ROOT_DRV_DIR)/$(MODULE)
  48   50  ROOTLINK        = $(ROOT_FS_DIR)/$(MODULE)
  49   51  CONF_SRCDIR     = $(UTSBASE)/common/fs/zfs
  50   52  
  51   53  #
  52   54  #       Include common rules.
  53   55  #
  54   56  include ../Makefile.$(ARCHDIR)
  55   57  
  56   58  #
  57   59  #       Define targets
  58   60  #
  59   61  ALL_TARGET      = $(BINARY) $(SRC_CONFILE)
  60   62  LINT_TARGET     = $(MODULE).lint
  61   63  INSTALL_TARGET  = $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
  62   64  
  63   65  #
  64   66  #       Overrides and depends_on
  65   67  #
  66   68  #       We require sched/SDC because by the time vfs_mountroot() runs,

  67   69  #       we can no longer load modules through OBP.
  68   70  #
  69   71  MODSTUBS_DIR     = $(OBJS_DIR)
  70   72  LDFLAGS         += -dy -Nfs/specfs -Ncrypto/swrand -Nmisc/idmap \
  71   73          -Nsched/SDC -Nmisc/sha2 -Nmisc/skein -Nmisc/edonr
  72   74  
  73   75  INC_PATH        += -I$(UTSBASE)/common/fs/zfs
  74   76  INC_PATH        += -I$(UTSBASE)/common/fs/zfs/lua
  75   77  INC_PATH        += -I$(SRC)/common
  76   78  INC_PATH        += -I$(COMMONBASE)/zfs
       79 +INC_PATH        += -I$(UTSBASE)/sun4
  77   80  
  78   81  C99LMODE=       -Xc99=%all
  79   82  
  80   83  #
  81   84  # For now, disable these lint checks; maintainers should endeavor
  82   85  # to investigate and remove these for maximum lint coverage.
  83   86  # Please do not carry these forward to new Makefiles.
  84   87  #
  85   88  LINTTAGS        += -erroff=E_SUSPICIOUS_COMPARISON
  86   89  LINTTAGS        += -erroff=E_BAD_PTR_CAST_ALIGN

  87   90  LINTTAGS        += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
  88   91  LINTTAGS        += -erroff=E_STATIC_UNUSED
  89   92  LINTTAGS        += -erroff=E_PTRDIFF_OVERFLOW
  90   93  LINTTAGS        += -erroff=E_ASSIGN_NARROW_CONV
  91   94  
  92   95  CERRWARN        += -_gcc=-Wno-type-limits
  93   96  CERRWARN        += -_gcc=-Wno-switch
  94   97  CERRWARN        += -_gcc=-Wno-parentheses
  95   98  CERRWARN        += -_gcc=-Wno-unused-variable
  96   99  CERRWARN        += -_gcc=-Wno-unused-function
  97  100  CERRWARN        += -_gcc=-Wno-unused-label
  98  101  
  99  102  #
 100  103  #       Default build targets.
 101  104  #
 102  105  .KEEP_STATE:
 103  106  
 104  107  def:            $(DEF_DEPS)
 105  108  
 106  109  all:            $(ALL_DEPS)
 107  110  
 108  111  clean:          $(CLEAN_DEPS)
 109  112  
 110  113  clobber:        $(CLOBBER_DEPS)
 111  114  
 112  115  lint:           $(LINT_DEPS)
 113  116  
 114  117  modlintlib:     $(MODLINTLIB_DEPS)
 115  118  
 116  119  clean.lint:     $(CLEAN_LINT_DEPS)
 117  120  
 118  121  install:        $(INSTALL_DEPS)
 119  122  
 120  123  $(ROOTLINK):    $(ROOT_FS_DIR) $(ROOTMODULE)
 121  124          -$(RM) $@; ln $(ROOTMODULE) $@
 122  125  
 123  126  #
 124  127  #       Include common targets.
 125  128  #
 126  129  include ../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX