Seth Forshee [Thu, 19 Jan 2017 22:05:12 +0000 (16:05 -0600)]
UBUNTU: [Config] Fix up s390x config options changed during 4.10 rebase
Fix the following options mistakenly changed during the rebase
from 4.9 to 4.10.
- CONFIG_I2C was selected by CONFIG_SFC_FALCON but should be
disabled because s390x lacks hw support. Revert these and
related options, and enforce the CONFIG_I2C values to prevent
this in the future.
Ming Lei [Sat, 17 Dec 2016 10:49:09 +0000 (18:49 +0800)]
block: relax check on sg gap
BugLink: http://bugs.launchpad.net/bugs/1657539
If the last bvec of the 1st bio and the 1st bvec of the next
bio are physically contigious, and the latter can be merged
to last segment of the 1st bio, we should think they don't
violate sg gap(or virt boundary) limit.
Both Vitaly and Dexuan reported lots of unmergeable small bios
are observed when running mkfs on Hyper-V virtual storage, and
performance becomes quite low. This patch fixes that performance
issue.
The same issue should exist on NVMe, since it sets virt boundary too.
Reported-by: Vitaly Kuznetsov <vkuznets@redhat.com> Reported-by: Dexuan Cui <decui@microsoft.com> Tested-by: Dexuan Cui <decui@microsoft.com> Cc: Keith Busch <keith.busch@intel.com> Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from linux-next commit 729204ef49ec00b788ce23deb9eb922a5769f55d) Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Wed, 18 Jan 2017 18:43:34 +0000 (11:43 -0700)]
UBUNTU: [Config] CONFIG_DEFAULT_IOSCHED=cfq
Hi there,
after several days of running (way too) many tests, I've got some data
to show that it may be a good idea to drop the DEADLINE I/O scheduler
for Zesty and move to CFQ with buffered writeback throttling (WBT) +
WBT_MQ (WBT multi-queu) enabled.
We originally moved to DEADLINE because of the issues with slow I/O (say
to flash drives) causing applications to hang while blocked on the slow
I/O being flushed out. It seems that with the recent 4.10 WBT driver
and (possibly other block driver changes) we see some performance
benefits also with CFQ, namely:
1. Faster boots. On a 8 thread Xeon CPU E3-1275 I'm seeing a reduction
in usertime boots from 33.92s (Deadline) to ~24.5s (CFQ)
There are some places where CFQ + MQ is less performant than CFQ + MQ +
SQ, and vice-versa. However, my general feeling for Zesty is that we
should give this a try as it seems to work well. The config changes are:
This will give us plenty of time to give this a good test in the next
few months and revert them if we find any problematic corner cases.
(The win on boot time, build times and writes to slow devices) is
probably the most compelling choice for these changes IMHO.
Colin King
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Seth Forshee [Tue, 17 Jan 2017 21:19:39 +0000 (15:19 -0600)]
UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware
BugLink: http://bugs.launchpad.net/bugs/1626740
Intel has added MODULE_FIRMWARE statements to i915 which refer to
firmware files that they have not yet pushed out to upstream
linux-firmware. This causes the following warnings when
generating the initrd:
W: Possible missing firmware /lib/firmware/i915/kbl_guc_ver9_14.bin for module i915
W: Possible missing firmware /lib/firmware/i915/bxt_guc_ver8_7.bin for module i915
This firmware is clearly optional, and the warnings have been
generating a lot of confusion for users. Remove the offending
MODULE_FIRMWARE statements until Intel makes these files
available.
Tim Gardner [Wed, 11 Jan 2017 14:12:13 +0000 (07:12 -0700)]
UBUNTU: [Config] linux-source Provides should not be a macro
Addresses a review comment from Adam Conrad:
debian.master/control.stub.in:
- when changing linux-source to SRCPKGNAME-source, you also changed the
Provides, which doesn't make sense. That should change back.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Seth Forshee [Fri, 6 Jan 2017 17:18:41 +0000 (11:18 -0600)]
UBUNTU: [Config] Disble stack protector for powerpc-smp
Fixes FTBFS:
arch/powerpc/platforms/built-in.o: In function `bootx_add_display_props':
/<<PKGBUILDDIR>>/arch/powerpc/platforms/powermac/bootx_init.c:211: undefined reference to `__stack_chk_fail_local'
arch/powerpc/platforms/built-in.o: In function `bootx_scan_dt_build_struct':
/<<PKGBUILDDIR>>/arch/powerpc/platforms/powermac/bootx_init.c:350: undefined reference to `__stack_chk_fail_local'
arch/powerpc/platforms/built-in.o: In function `bootx_init':
/<<PKGBUILDDIR>>/arch/powerpc/platforms/powermac/bootx_init.c:596: undefined reference to `__stack_chk_fail_local'
ld: .tmp_vmlinux1: hidden symbol `__stack_chk_fail_local' isn't defined
ld: final link failed: Bad value
Seth Forshee [Fri, 6 Jan 2017 15:58:11 +0000 (09:58 -0600)]
UBUNTU: [Config] Update and enforce IMA options
BugLink: http://bugs.launchpad.net/bugs/1643652
Set CONFIG_IMA_KEXEC=y for supported powerpc architectures.
Update the annotations for this option, and mark all IMA options
for enforcment. Remove notes for options which have no prompt and
are thus not included in the annotations file.
Seth Forshee [Wed, 4 Jan 2017 16:08:38 +0000 (10:08 -0600)]
UBUNTU: [Config] CONFIG_IPDDP=n
BugLink: http://bugs.launchpad.net/bugs/1559772
This module isn't being actively maintained, and when it is
enabled it prevents a newer userspace implementation from
working.
Craig Magina [Thu, 8 Dec 2016 10:39:31 +0000 (11:39 +0100)]
UBUNTU: d-i initrd needs additional usb modules to support the merlin platform
BugLink: https://launchpad.net/bugs/1625222
Ubuntu builds the uas and xhci-plat-hcd usb drivers as modules, these
module are needed for d-i to use usb in the installer on the merlin platform.
Signed-off-by: Craig Magina <craig.magina@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Seth Forshee [Tue, 6 Dec 2016 15:51:01 +0000 (09:51 -0600)]
UBUNTU: SAUCE: aufs -- Add flags argument to aufs_rename()
Starting with Linux 4.9-rc1 the rename2 inode operation has
replaced the rename op, so filesystem rename implementations
require an extra flags argument. Add the argument to fix the
FTBFS with Linux 4.9, but since aufs doesn't support any of the
flags return an error if it is non-zero.
Seth Forshee [Tue, 6 Dec 2016 15:27:46 +0000 (09:27 -0600)]
UBUNTU: SAUCE: aufs -- Convert to use xattr handlers
Starting with Linux 4.9-rc1 the {get,set,remove}xattr inode
operations have been removed, and filesystems are required to use
xattr handlers instead. There's some partially implemented xattr
handlers commented out in aufs already. Finish those handlers and
convert aufs over to use them.
Ming Lei [Tue, 6 Dec 2016 17:20:03 +0000 (01:20 +0800)]
UBUNTU: [Config] CONFIG_ARM64_ERRATUM_845719=y
BugLink: http://bugs.launchpad.net/bugs/1647793
Looks this option is missed in Yakkety, and should have been
enabled. It is enabled on Xenial, and used for workaround
the issue of "Cortex-A53: 845719: a load might read incorrect data".
Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Seth Forshee [Thu, 1 Dec 2016 18:18:28 +0000 (12:18 -0600)]
UBUNTU: Set build_arch=x86 for amd64 and x32
The kernel build infrastructure expects the value of ARCH to be
the same as the architecture subdirectory in arch/*. The values
for amd64 and x32 are not, so fix them to be what the kernel
expects.
Seth Forshee [Tue, 29 Nov 2016 04:02:48 +0000 (22:02 -0600)]
UBUNTU: [Config] Update annotations
Update the annotations file based on the current configurations.
Add bug numbers for some options, and flag some options for
review which require another look.
Seth Forshee [Fri, 18 Nov 2016 19:37:40 +0000 (13:37 -0600)]
UBUNTU: [Config] Fix up CONFIG_I2C_SLAVE values
The annotations file says this should be =n on all architectures
except for armhf, but it is currently =y on several others. This
is because it's being selected by CONFIG_I2C_EMEV2, which is only
really relevant for armhf, and CONFIG_I2C_RCAR, which is only
relevant on armhf and arm64. Disable CONFIG_I2C_EMEV2 and
CONFIG_I2C_SLAVE for all other architectures, and update the
annotations file entry for CONFIG_I2C_EMEV2 accordingly.
Seth Forshee [Tue, 15 Nov 2016 16:36:49 +0000 (10:36 -0600)]
UBUNTU: [Config] Fix s390x config carnage
In all the config carnage during the yakkety cycle some of the
s390x config options got changed by mistake. Try to fix this
based on xenial's config and the git history from yakkety.
Seth Forshee [Tue, 22 Nov 2016 14:32:17 +0000 (08:32 -0600)]
UBUNTU: [Debian] config-check -- Make it easier to find annotations syntax errors
The errors from eval due to malformed annotations values often
are not very helpful in tracking down the source of the error.
Make this easier by printing the name of the confguration option
along with the error string.
UBUNTU: SAUCE: (namespace) block_dev: Forbid unprivileged mounting when device is opened for writing
For unprivileged mounts to be safe the user must not be able to
make changes to the backing store while it is mounted. This patch
takes a step towards preventing this by refusing to mount in a
user namepspace if the block device is open for writing and
refusing attempts to open the block device for writing by non-
root while it is mounted in a user namespace.
To prevent this from happening we use i_writecount in the inodes
of the bdev filesystem similarly to how it is used for regular
files. Whenever the device is opened for writing i_writecount
is checked; if it is negative the open returns -EBUSY, otherwise
i_writecount is incremented. On mount, a positive i_writecount
results in mount_bdev returning -EBUSY, otherwise i_writecount
is decremented. Opens by root and mounts from init_user_ns do not
check nor modify i_writecount.
Seth Forshee [Tue, 9 Feb 2016 19:26:34 +0000 (13:26 -0600)]
UBUNTU: SAUCE: (namespace) ext4: Add module parameter to enable user namespace mounts
This is still an experimental feature, so disable it by default
and allow it only when the system administrator supplies the
userns_mounts=true module parameter.
Seth Forshee [Sat, 18 Oct 2014 11:02:09 +0000 (13:02 +0200)]
UBUNTU: SAUCE: (namespace) ext4: Add support for unprivileged mounts from user namespaces
Support unprivileged mounting of ext4 volumes from user
namespaces. This requires the following changes:
- Perform all uid, gid, and projid conversions to/from disk
relative to s_user_ns. In many cases this will already be
handled by the vfs helper functions. This also requires
updates to handle cases where ids may not map into s_user_ns.
A new helper, projid_valid_eq(), is added to help with this.
- Update most capability checks to check for capabilities in
s_user_ns rather than init_user_ns. These mostly reflect
changes to the filesystem that a user in s_user_ns could
already make externally by virtue of having write access to
the backing device.
- Restrict unsafe options in either the mount options or the
ext4 superblock. Currently the only concerning option is
errors=panic, and this is made to require CAP_SYS_ADMIN in
init_user_ns.
- Verify that unprivileged users have the required access to the
journal device at the path passed via the journal_path mount
option.
Note that for the journal_path and the journal_dev mount
options, and for external journal devices specified in the
ext4 superblock, devcgroup restrictions will be enforced by
__blkdev_get(), (via blkdev_get_by_dev()), ensuring that the
user has been granted appropriate access to the block device.
- Set the FS_USERNS_MOUNT flag on the filesystem types supported
by ext4.
sysfs attributes for ext4 mounts remain writable only by real
root.
Seth Forshee [Thu, 2 Oct 2014 20:34:45 +0000 (15:34 -0500)]
UBUNTU: SAUCE: (namespace) fuse: Restrict allow_other to the superblock's namespace or a descendant
Unprivileged users are normally restricted from mounting with the
allow_other option by system policy, but this could be bypassed
for a mount done with user namespace root permissions. In such
cases allow_other should not allow users outside the userns
to access the mount as doing so would give the unprivileged user
the ability to manipulate processes it would otherwise be unable
to manipulate. Restrict allow_other to apply to users in the same
userns used at mount or a descendant of that namespace. Also
export current_in_userns() for use by fuse when built as a
module.
Seth Forshee [Wed, 24 Aug 2016 16:47:05 +0000 (11:47 -0500)]
UBUNTU: SAUCE: (namespace) fuse: Translate ids in posix acl xattrs
Fuse currently lacks comprehensive support for posix ACLs, but
some fuse filesystems process the acl xattrs internally. For this
to continue to work the ids within the xattrs need to be mapped
into s_user_ns when written to the filesystem and mapped from
s_user_ns when read.
Seth Forshee [Thu, 26 Jun 2014 16:58:11 +0000 (11:58 -0500)]
UBUNTU: SAUCE: (namespace) fuse: Support fuse filesystems outside of init_user_ns
In order to support mounts from namespaces other than
init_user_ns, fuse must translate uids and gids to/from the
userns of the process servicing requests on /dev/fuse. This
patch does that, with a couple of restrictions on the namespace:
- The userns for the fuse connection is fixed to the namespace
from which /dev/fuse is opened.
- The namespace must be the same as s_user_ns.
These restrictions simplify the implementation by avoiding the
need to pass around userns references and by allowing fuse to
rely on the checks in inode_change_ok for ownership changes.
Either restriction could be relaxed in the future if needed.
For cuse the namespace used for the connection is also simply
current_user_ns() at the time /dev/cuse is opened.
UBUNTU: SAUCE: (namespace) fuse: Add support for pid namespaces
When the userspace process servicing fuse requests is running in
a pid namespace then pids passed via the fuse fd are not being
translated into that process' namespace. Translation is necessary
for the pid to be useful to that process.
Since no use case currently exists for changing namespaces all
translations can be done relative to the pid namespace in use
when fuse_conn_init() is called. For fuse this translates to
mount time, and for cuse this is when /dev/cuse is opened. IO for
this connection from another namespace will return errors.
Requests from processes whose pid cannot be translated into the
target namespace will have a value of 0 for in.h.pid.
File locking changes based on previous work done by Eric
Biederman.
projects / mirror_ubuntu-zesty-kernel.git / log