diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-10 17:40:42 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-10 17:40:42 -0400 |
| commit | b769fefb68cd70385d68220ae341e5a10723fbc0 (patch) | |
| tree | a2881410c9dc5a3474619d155fac981cfbd4ee8f | |
| parent | 1420f63b8207e966f54caec26d08abdc2ff37193 (diff) | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
Backmerge tag 'v4.11-rc6' into drm-next
Linux 4.11-rc6
drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
476 files changed, 6926 insertions, 2824 deletions
| @@ -171,6 +171,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com> | |||
| 171 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com> | 171 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com> |
| 172 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com> | 172 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com> |
| 173 | Takashi YOSHII <takashi.yoshii.zj@renesas.com> | 173 | Takashi YOSHII <takashi.yoshii.zj@renesas.com> |
| 174 | Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com> | ||
| 174 | Yusuke Goda <goda.yusuke@renesas.com> | 175 | Yusuke Goda <goda.yusuke@renesas.com> |
| 175 | Gustavo Padovan <gustavo@las.ic.unicamp.br> | 176 | Gustavo Padovan <gustavo@las.ic.unicamp.br> |
| 176 | Gustavo Padovan <padovan@profusion.mobi> | 177 | Gustavo Padovan <padovan@profusion.mobi> |
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 2ba45caabada..facc20a3f962 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt | |||
| @@ -1725,6 +1725,12 @@ | |||
| 1725 | kernel and module base offset ASLR (Address Space | 1725 | kernel and module base offset ASLR (Address Space |
| 1726 | Layout Randomization). | 1726 | Layout Randomization). |
| 1727 | 1727 | ||
| 1728 | kasan_multi_shot | ||
| 1729 | [KNL] Enforce KASAN (Kernel Address Sanitizer) to print | ||
| 1730 | report on every invalid memory access. Without this | ||
| 1731 | parameter KASAN will print report only for the first | ||
| 1732 | invalid access. | ||
| 1733 | |||
| 1728 | keepinitrd [HW,ARM] | 1734 | keepinitrd [HW,ARM] |
| 1729 | 1735 | ||
| 1730 | kernelcore= [KNL,X86,IA-64,PPC] | 1736 | kernelcore= [KNL,X86,IA-64,PPC] |
diff --git a/Documentation/devicetree/bindings/rng/omap_rng.txt b/Documentation/devicetree/bindings/rng/omap_rng.txt index 471477299ece..9cf7876ab434 100644 --- a/Documentation/devicetree/bindings/rng/omap_rng.txt +++ b/Documentation/devicetree/bindings/rng/omap_rng.txt | |||
| @@ -12,7 +12,8 @@ Required properties: | |||
| 12 | - reg : Offset and length of the register set for the module | 12 | - reg : Offset and length of the register set for the module |
| 13 | - interrupts : the interrupt number for the RNG module. | 13 | - interrupts : the interrupt number for the RNG module. |
| 14 | Used for "ti,omap4-rng" and "inside-secure,safexcel-eip76" | 14 | Used for "ti,omap4-rng" and "inside-secure,safexcel-eip76" |
| 15 | - clocks: the trng clock source | 15 | - clocks: the trng clock source. Only mandatory for the |
| 16 | "inside-secure,safexcel-eip76" compatible. | ||
| 16 | 17 | ||
| 17 | Example: | 18 | Example: |
| 18 | /* AM335x */ | 19 | /* AM335x */ |
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index fdcfdd79682a..fe25787ff6d4 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
| @@ -58,8 +58,7 @@ prototypes: | |||
| 58 | int (*permission) (struct inode *, int, unsigned int); | 58 | int (*permission) (struct inode *, int, unsigned int); |
| 59 | int (*get_acl)(struct inode *, int); | 59 | int (*get_acl)(struct inode *, int); |
| 60 | int (*setattr) (struct dentry *, struct iattr *); | 60 | int (*setattr) (struct dentry *, struct iattr *); |
| 61 | int (*getattr) (const struct path *, struct dentry *, struct kstat *, | 61 | int (*getattr) (const struct path *, struct kstat *, u32, unsigned int); |
| 62 | u32, unsigned int); | ||
| 63 | ssize_t (*listxattr) (struct dentry *, char *, size_t); | 62 | ssize_t (*listxattr) (struct dentry *, char *, size_t); |
| 64 | int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); | 63 | int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); |
| 65 | void (*update_time)(struct inode *, struct timespec *, int); | 64 | void (*update_time)(struct inode *, struct timespec *, int); |
diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting index 95280079c0b3..5fb17f49f7a2 100644 --- a/Documentation/filesystems/porting +++ b/Documentation/filesystems/porting | |||
| @@ -600,3 +600,9 @@ in your dentry operations instead. | |||
| 600 | [recommended] | 600 | [recommended] |
| 601 | ->readlink is optional for symlinks. Don't set, unless filesystem needs | 601 | ->readlink is optional for symlinks. Don't set, unless filesystem needs |
| 602 | to fake something for readlink(2). | 602 | to fake something for readlink(2). |
| 603 | -- | ||
| 604 | [mandatory] | ||
| 605 | ->getattr() is now passed a struct path rather than a vfsmount and | ||
| 606 | dentry separately, and it now has request_mask and query_flags arguments | ||
| 607 | to specify the fields and sync type requested by statx. Filesystems not | ||
| 608 | supporting any statx-specific features may ignore the new arguments. | ||
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 569211703721..94dd27ef4a76 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt | |||
| @@ -382,8 +382,7 @@ struct inode_operations { | |||
| 382 | int (*permission) (struct inode *, int); | 382 | int (*permission) (struct inode *, int); |
| 383 | int (*get_acl)(struct inode *, int); | 383 | int (*get_acl)(struct inode *, int); |
| 384 | int (*setattr) (struct dentry *, struct iattr *); | 384 | int (*setattr) (struct dentry *, struct iattr *); |
| 385 | int (*getattr) (const struct path *, struct dentry *, struct kstat *, | 385 | int (*getattr) (const struct path *, struct kstat *, u32, unsigned int); |
| 386 | u32, unsigned int); | ||
| 387 | ssize_t (*listxattr) (struct dentry *, char *, size_t); | 386 | ssize_t (*listxattr) (struct dentry *, char *, size_t); |
| 388 | void (*update_time)(struct inode *, struct timespec *, int); | 387 | void (*update_time)(struct inode *, struct timespec *, int); |
| 389 | int (*atomic_open)(struct inode *, struct dentry *, struct file *, | 388 | int (*atomic_open)(struct inode *, struct dentry *, struct file *, |
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt index 54bd5faa8782..f2af35f6d6b2 100644 --- a/Documentation/pinctrl.txt +++ b/Documentation/pinctrl.txt | |||
| @@ -77,9 +77,15 @@ static struct pinctrl_desc foo_desc = { | |||
| 77 | 77 | ||
| 78 | int __init foo_probe(void) | 78 | int __init foo_probe(void) |
| 79 | { | 79 | { |
| 80 | int error; | ||
| 81 | |||
| 80 | struct pinctrl_dev *pctl; | 82 | struct pinctrl_dev *pctl; |
| 81 | 83 | ||
| 82 | return pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl); | 84 | error = pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl); |
| 85 | if (error) | ||
| 86 | return error; | ||
| 87 | |||
| 88 | return pinctrl_enable(pctl); | ||
| 83 | } | 89 | } |
| 84 | 90 | ||
| 85 | To enable the pinctrl subsystem and the subgroups for PINMUX and PINCONF and | 91 | To enable the pinctrl subsystem and the subgroups for PINMUX and PINCONF and |
diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst index 11ec2d93a5e0..61e9c78bd6d1 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst | |||
| @@ -124,7 +124,7 @@ specified in the following format in the sign-off area: | |||
| 124 | 124 | ||
| 125 | .. code-block:: none | 125 | .. code-block:: none |
| 126 | 126 | ||
| 127 | Cc: <stable@vger.kernel.org> # 3.3.x- | 127 | Cc: <stable@vger.kernel.org> # 3.3.x |
| 128 | 128 | ||
| 129 | The tag has the meaning of: | 129 | The tag has the meaning of: |
| 130 | 130 | ||
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 3c248f772ae6..fd106899afd1 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt | |||
| @@ -3377,6 +3377,69 @@ struct kvm_ppc_resize_hpt { | |||
| 3377 | __u32 pad; | 3377 | __u32 pad; |
| 3378 | }; | 3378 | }; |
| 3379 | 3379 | ||
| 3380 | 4.104 KVM_X86_GET_MCE_CAP_SUPPORTED | ||
| 3381 | |||
| 3382 | Capability: KVM_CAP_MCE | ||
| 3383 | Architectures: x86 | ||
| 3384 | Type: system ioctl | ||
| 3385 | Parameters: u64 mce_cap (out) | ||
| 3386 | Returns: 0 on success, -1 on error | ||
| 3387 | |||
| 3388 | Returns supported MCE capabilities. The u64 mce_cap parameter | ||
| 3389 | has the same format as the MSR_IA32_MCG_CAP register. Supported | ||
| 3390 | capabilities will have the corresponding bits set. | ||
| 3391 | |||
| 3392 | 4.105 KVM_X86_SETUP_MCE | ||
| 3393 | |||
| 3394 | Capability: KVM_CAP_MCE | ||
| 3395 | Architectures: x86 | ||
| 3396 | Type: vcpu ioctl | ||
| 3397 | Parameters: u64 mcg_cap (in) | ||
| 3398 | Returns: 0 on success, | ||
| 3399 | -EFAULT if u64 mcg_cap cannot be read, | ||
| 3400 | -EINVAL if the requested number of banks is invalid, | ||
| 3401 | -EINVAL if requested MCE capability is not supported. | ||
| 3402 | |||
| 3403 | Initializes MCE support for use. The u64 mcg_cap parameter | ||
| 3404 | has the same format as the MSR_IA32_MCG_CAP register and | ||
| 3405 | specifies which capabilities should be enabled. The maximum | ||
| 3406 | supported number of error-reporting banks can be retrieved when | ||
| 3407 | checking for KVM_CAP_MCE. The supported capabilities can be | ||
| 3408 | retrieved with KVM_X86_GET_MCE_CAP_SUPPORTED. | ||
| 3409 | |||
| 3410 | 4.106 KVM_X86_SET_MCE | ||
| 3411 | |||
| 3412 | Capability: KVM_CAP_MCE | ||
| 3413 | Architectures: x86 | ||
| 3414 | Type: vcpu ioctl | ||
| 3415 | Parameters: struct kvm_x86_mce (in) | ||
| 3416 | Returns: 0 on success, | ||
| 3417 | -EFAULT if struct kvm_x86_mce cannot be read, | ||
| 3418 | -EINVAL if the bank number is invalid, | ||
| 3419 | -EINVAL if VAL bit is not set in status field. | ||
| 3420 | |||
| 3421 | Inject a machine check error (MCE) into the guest. The input | ||
| 3422 | parameter is: | ||
| 3423 | |||
| 3424 | struct kvm_x86_mce { | ||
| 3425 | __u64 status; | ||
| 3426 | __u64 addr; | ||
| 3427 | __u64 misc; | ||
| 3428 | __u64 mcg_status; | ||
| 3429 | __u8 bank; | ||
| 3430 | __u8 pad1[7]; | ||
| 3431 | __u64 pad2[3]; | ||
| 3432 | }; | ||
| 3433 | |||
| 3434 | If the MCE being reported is an uncorrected error, KVM will | ||
| 3435 | inject it as an MCE exception into the guest. If the guest | ||
| 3436 | MCG_STATUS register reports that an MCE is in progress, KVM | ||
| 3437 | causes an KVM_EXIT_SHUTDOWN vmexit. | ||
| 3438 | |||
| 3439 | Otherwise, if the MCE is a corrected error, KVM will just | ||
| 3440 | store it in the corresponding bank (provided this bank is | ||
| 3441 | not holding a previously reported uncorrected error). | ||
| 3442 | |||
| 3380 | 5. The kvm_run structure | 3443 | 5. The kvm_run structure |
| 3381 | ------------------------ | 3444 | ------------------------ |
| 3382 | 3445 | ||
diff --git a/Documentation/virtual/kvm/devices/arm-vgic.txt b/Documentation/virtual/kvm/devices/arm-vgic.txt index 76e61c883347..b2f60ca8b60c 100644 --- a/Documentation/virtual/kvm/devices/arm-vgic.txt +++ b/Documentation/virtual/kvm/devices/arm-vgic.txt | |||
| @@ -83,6 +83,12 @@ Groups: | |||
| 83 | 83 | ||
| 84 | Bits for undefined preemption levels are RAZ/WI. | 84 | Bits for undefined preemption levels are RAZ/WI. |
| 85 | 85 | ||
| 86 | For historical reasons and to provide ABI compatibility with userspace we | ||
| 87 | export the GICC_PMR register in the format of the GICH_VMCR.VMPriMask | ||
| 88 | field in the lower 5 bits of a word, meaning that userspace must always | ||
| 89 | use the lower 5 bits to communicate with the KVM device and must shift the | ||
| 90 | value left by 3 places to obtain the actual priority mask level. | ||
| 91 | |||
| 86 | Limitations: | 92 | Limitations: |
| 87 | - Priorities are not implemented, and registers are RAZ/WI | 93 | - Priorities are not implemented, and registers are RAZ/WI |
| 88 | - Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2. | 94 | - Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2. |
diff --git a/MAINTAINERS b/MAINTAINERS index bac1a88cdd4a..c2eb0373a02d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4117,14 +4117,13 @@ F: drivers/block/drbd/ | |||
| 4117 | F: lib/lru_cache.c | 4117 | F: lib/lru_cache.c |
| 4118 | F: Documentation/blockdev/drbd/ | 4118 | F: Documentation/blockdev/drbd/ |
| 4119 | 4119 | ||
| 4120 | DRIVER CORE, KOBJECTS, DEBUGFS, KERNFS AND SYSFS | 4120 | DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS |
| 4121 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 4121 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 4122 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git | 4122 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git |
| 4123 | S: Supported | 4123 | S: Supported |
| 4124 | F: Documentation/kobject.txt | 4124 | F: Documentation/kobject.txt |
| 4125 | F: drivers/base/ | 4125 | F: drivers/base/ |
| 4126 | F: fs/debugfs/ | 4126 | F: fs/debugfs/ |
| 4127 | F: fs/kernfs/ | ||
| 4128 | F: fs/sysfs/ | 4127 | F: fs/sysfs/ |
| 4129 | F: include/linux/debugfs.h | 4128 | F: include/linux/debugfs.h |
| 4130 | F: include/linux/kobj* | 4129 | F: include/linux/kobj* |
| @@ -4784,6 +4783,12 @@ L: linux-edac@vger.kernel.org | |||
| 4784 | S: Maintained | 4783 | S: Maintained |
| 4785 | F: drivers/edac/mpc85xx_edac.[ch] | 4784 | F: drivers/edac/mpc85xx_edac.[ch] |
| 4786 | 4785 | ||
| 4786 | EDAC-PND2 | ||
| 4787 | M: Tony Luck <tony.luck@intel.com> | ||
| 4788 | L: linux-edac@vger.kernel.org | ||
| 4789 | S: Maintained | ||
| 4790 | F: drivers/edac/pnd2_edac.[ch] | ||
| 4791 | |||
| 4787 | EDAC-PASEMI | 4792 | EDAC-PASEMI |
| 4788 | M: Egor Martovetsky <egor@pasemi.com> | 4793 | M: Egor Martovetsky <egor@pasemi.com> |
| 4789 | L: linux-edac@vger.kernel.org | 4794 | L: linux-edac@vger.kernel.org |
| @@ -4931,6 +4936,7 @@ F: include/linux/netfilter_bridge/ | |||
| 4931 | F: net/bridge/ | 4936 | F: net/bridge/ |
| 4932 | 4937 | ||
| 4933 | ETHERNET PHY LIBRARY | 4938 | ETHERNET PHY LIBRARY |
| 4939 | M: Andrew Lunn <andrew@lunn.ch> | ||
| 4934 | M: Florian Fainelli <f.fainelli@gmail.com> | 4940 | M: Florian Fainelli <f.fainelli@gmail.com> |
| 4935 | L: netdev@vger.kernel.org | 4941 | L: netdev@vger.kernel.org |
| 4936 | S: Maintained | 4942 | S: Maintained |
| @@ -7092,9 +7098,9 @@ S: Maintained | |||
| 7092 | F: fs/autofs4/ | 7098 | F: fs/autofs4/ |
| 7093 | 7099 | ||
| 7094 | KERNEL BUILD + files below scripts/ (unless maintained elsewhere) | 7100 | KERNEL BUILD + files below scripts/ (unless maintained elsewhere) |
| 7101 | M: Masahiro Yamada <yamada.masahiro@socionext.com> | ||
| 7095 | M: Michal Marek <mmarek@suse.com> | 7102 | M: Michal Marek <mmarek@suse.com> |
| 7096 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git for-next | 7103 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git |
| 7097 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes | ||
| 7098 | L: linux-kbuild@vger.kernel.org | 7104 | L: linux-kbuild@vger.kernel.org |
| 7099 | S: Maintained | 7105 | S: Maintained |
| 7100 | F: Documentation/kbuild/ | 7106 | F: Documentation/kbuild/ |
| @@ -7211,6 +7217,14 @@ F: arch/mips/include/uapi/asm/kvm* | |||
| 7211 | F: arch/mips/include/asm/kvm* | 7217 | F: arch/mips/include/asm/kvm* |
| 7212 | F: arch/mips/kvm/ | 7218 | F: arch/mips/kvm/ |
| 7213 | 7219 | ||
| 7220 | KERNFS | ||
| 7221 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
| 7222 | M: Tejun Heo <tj@kernel.org> | ||
| 7223 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git | ||
| 7224 | S: Supported | ||
| 7225 | F: include/linux/kernfs.h | ||
| 7226 | F: fs/kernfs/ | ||
| 7227 | |||
| 7214 | KEXEC | 7228 | KEXEC |
| 7215 | M: Eric Biederman <ebiederm@xmission.com> | 7229 | M: Eric Biederman <ebiederm@xmission.com> |
| 7216 | W: http://kernel.org/pub/linux/utils/kernel/kexec/ | 7230 | W: http://kernel.org/pub/linux/utils/kernel/kexec/ |
| @@ -10825,6 +10839,7 @@ F: drivers/s390/block/dasd* | |||
| 10825 | F: block/partitions/ibm.c | 10839 | F: block/partitions/ibm.c |
| 10826 | 10840 | ||
| 10827 | S390 NETWORK DRIVERS | 10841 | S390 NETWORK DRIVERS |
| 10842 | M: Julian Wiedmann <jwi@linux.vnet.ibm.com> | ||
| 10828 | M: Ursula Braun <ubraun@linux.vnet.ibm.com> | 10843 | M: Ursula Braun <ubraun@linux.vnet.ibm.com> |
| 10829 | L: linux-s390@vger.kernel.org | 10844 | L: linux-s390@vger.kernel.org |
| 10830 | W: http://www.ibm.com/developerworks/linux/linux390/ | 10845 | W: http://www.ibm.com/developerworks/linux/linux390/ |
| @@ -10855,6 +10870,7 @@ S: Supported | |||
| 10855 | F: drivers/s390/scsi/zfcp_* | 10870 | F: drivers/s390/scsi/zfcp_* |
| 10856 | 10871 | ||
| 10857 | S390 IUCV NETWORK LAYER | 10872 | S390 IUCV NETWORK LAYER |
| 10873 | M: Julian Wiedmann <jwi@linux.vnet.ibm.com> | ||
| 10858 | M: Ursula Braun <ubraun@linux.vnet.ibm.com> | 10874 | M: Ursula Braun <ubraun@linux.vnet.ibm.com> |
| 10859 | L: linux-s390@vger.kernel.org | 10875 | L: linux-s390@vger.kernel.org |
| 10860 | W: http://www.ibm.com/developerworks/linux/linux390/ | 10876 | W: http://www.ibm.com/developerworks/linux/linux390/ |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 4 | 1 | VERSION = 4 |
| 2 | PATCHLEVEL = 11 | 2 | PATCHLEVEL = 11 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = -rc4 | 4 | EXTRAVERSION = -rc6 |
| 5 | NAME = Fearless Coyote | 5 | NAME = Fearless Coyote |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -372,7 +372,7 @@ LDFLAGS_MODULE = | |||
| 372 | CFLAGS_KERNEL = | 372 | CFLAGS_KERNEL = |
| 373 | AFLAGS_KERNEL = | 373 | AFLAGS_KERNEL = |
| 374 | LDFLAGS_vmlinux = | 374 | LDFLAGS_vmlinux = |
| 375 | CFLAGS_GCOV = -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized | 375 | CFLAGS_GCOV := -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,) |
| 376 | CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,) | 376 | CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,) |
| 377 | 377 | ||
| 378 | 378 | ||
| @@ -653,6 +653,12 @@ KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \ | |||
| 653 | # Tell gcc to never replace conditional load with a non-conditional one | 653 | # Tell gcc to never replace conditional load with a non-conditional one |
| 654 | KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0) | 654 | KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0) |
| 655 | 655 | ||
| 656 | # check for 'asm goto' | ||
| 657 | ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) | ||
| 658 | KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO | ||
| 659 | KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO | ||
| 660 | endif | ||
| 661 | |||
| 656 | include scripts/Makefile.gcc-plugins | 662 | include scripts/Makefile.gcc-plugins |
| 657 | 663 | ||
| 658 | ifdef CONFIG_READABLE_ASM | 664 | ifdef CONFIG_READABLE_ASM |
| @@ -798,12 +804,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) | |||
| 798 | # use the deterministic mode of AR if available | 804 | # use the deterministic mode of AR if available |
| 799 | KBUILD_ARFLAGS := $(call ar-option,D) | 805 | KBUILD_ARFLAGS := $(call ar-option,D) |
| 800 | 806 | ||
| 801 | # check for 'asm goto' | ||
| 802 | ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) | ||
| 803 | KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO | ||
| 804 | KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO | ||
| 805 | endif | ||
| 806 | |||
| 807 | include scripts/Makefile.kasan | 807 | include scripts/Makefile.kasan |
| 808 | include scripts/Makefile.extrawarn | 808 | include scripts/Makefile.extrawarn |
| 809 | include scripts/Makefile.ubsan | 809 | include scripts/Makefile.ubsan |
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 0b961093ca5c..6d76e528ab8f 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
| @@ -1290,7 +1290,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) | |||
| 1290 | /* copy relevant bits of struct timex. */ | 1290 | /* copy relevant bits of struct timex. */ |
| 1291 | if (copy_from_user(&txc, txc_p, offsetof(struct timex32, time)) || | 1291 | if (copy_from_user(&txc, txc_p, offsetof(struct timex32, time)) || |
| 1292 | copy_from_user(&txc.tick, &txc_p->tick, sizeof(struct timex32) - | 1292 | copy_from_user(&txc.tick, &txc_p->tick, sizeof(struct timex32) - |
| 1293 | offsetof(struct timex32, time))) | 1293 | offsetof(struct timex32, tick))) |
| 1294 | return -EFAULT; | 1294 | return -EFAULT; |
| 1295 | 1295 | ||
| 1296 | ret = do_adjtimex(&txc); | 1296 | ret = do_adjtimex(&txc); |
diff --git a/arch/arc/boot/dts/skeleton.dtsi b/arch/arc/boot/dts/skeleton.dtsi index 65808fe0a290..2891cb266cf0 100644 --- a/arch/arc/boot/dts/skeleton.dtsi +++ b/arch/arc/boot/dts/skeleton.dtsi | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | device_type = "cpu"; | 26 | device_type = "cpu"; |
| 27 | compatible = "snps,arc770d"; | 27 | compatible = "snps,arc770d"; |
| 28 | reg = <0>; | 28 | reg = <0>; |
| 29 | clocks = <&core_clk>; | ||
| 29 | }; | 30 | }; |
| 30 | }; | 31 | }; |
| 31 | 32 | ||
diff --git a/arch/arc/boot/dts/skeleton_hs.dtsi b/arch/arc/boot/dts/skeleton_hs.dtsi index 2dfe8037dfbb..5e944d3e5b74 100644 --- a/arch/arc/boot/dts/skeleton_hs.dtsi +++ b/arch/arc/boot/dts/skeleton_hs.dtsi | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | device_type = "cpu"; | 21 | device_type = "cpu"; |
| 22 | compatible = "snps,archs38"; | 22 | compatible = "snps,archs38"; |
| 23 | reg = <0>; | 23 | reg = <0>; |
| 24 | clocks = <&core_clk>; | ||
| 24 | }; | 25 | }; |
| 25 | }; | 26 | }; |
| 26 | 27 | ||
diff --git a/arch/arc/boot/dts/skeleton_hs_idu.dtsi b/arch/arc/boot/dts/skeleton_hs_idu.dtsi index 4c11079f3565..54b277d7dea0 100644 --- a/arch/arc/boot/dts/skeleton_hs_idu.dtsi +++ b/arch/arc/boot/dts/skeleton_hs_idu.dtsi | |||
| @@ -19,8 +19,27 @@ | |||
| 19 | 19 | ||
| 20 | cpu@0 { | 20 | cpu@0 { |
| 21 | device_type = "cpu"; | 21 | device_type = "cpu"; |
| 22 | compatible = "snps,archs38xN"; | 22 | compatible = "snps,archs38"; |
| 23 | reg = <0>; | 23 | reg = <0>; |
| 24 | clocks = <&core_clk>; | ||
| 25 | }; | ||
| 26 | cpu@1 { | ||
| 27 | device_type = "cpu"; | ||
| 28 | compatible = "snps,archs38"; | ||
| 29 | reg = <1>; | ||
| 30 | clocks = <&core_clk>; | ||
| 31 | }; | ||
| 32 | cpu@2 { | ||
| 33 | device_type = "cpu"; | ||
| 34 | compatible = "snps,archs38"; | ||
| 35 | reg = <2>; | ||
| 36 | clocks = <&core_clk>; | ||
| 37 | }; | ||
| 38 | cpu@3 { | ||
| 39 | device_type = "cpu"; | ||
| 40 | compatible = "snps,archs38"; | ||
| 41 | reg = <3>; | ||
| 42 | clocks = <&core_clk>; | ||
| 24 | }; | 43 | }; |
| 25 | }; | 44 | }; |
| 26 | 45 | ||
diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi index f0df59b23e21..459fc656b759 100644 --- a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi +++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi | |||
| @@ -112,13 +112,19 @@ | |||
| 112 | interrupts = <7>; | 112 | interrupts = <7>; |
| 113 | bus-width = <4>; | 113 | bus-width = <4>; |
| 114 | }; | 114 | }; |
| 115 | }; | ||
| 115 | 116 | ||
| 116 | /* Embedded Vision subsystem UIO mappings; only relevant for EV VDK */ | 117 | /* |
| 117 | uio_ev: uio@0xD0000000 { | 118 | * Embedded Vision subsystem UIO mappings; only relevant for EV VDK |
| 118 | compatible = "generic-uio"; | 119 | * |
| 119 | reg = <0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000>; | 120 | * This node is intentionally put outside of MB above becase |
| 120 | reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem"; | 121 | * it maps areas outside of MB's 0xEz-0xFz. |
| 121 | interrupts = <23>; | 122 | */ |
| 122 | }; | 123 | uio_ev: uio@0xD0000000 { |
| 124 | compatible = "generic-uio"; | ||
| 125 | reg = <0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000>; | ||
| 126 | reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem"; | ||
| 127 | interrupt-parent = <&mb_intc>; | ||
| 128 | interrupts = <23>; | ||
| 123 | }; | 129 | }; |
| 124 | }; | 130 | }; |
diff --git a/arch/arc/include/asm/kprobes.h b/arch/arc/include/asm/kprobes.h index 00bdbe167615..2e52d18e6bc7 100644 --- a/arch/arc/include/asm/kprobes.h +++ b/arch/arc/include/asm/kprobes.h | |||
| @@ -54,9 +54,7 @@ int kprobe_fault_handler(struct pt_regs *regs, unsigned long cause); | |||
| 54 | void kretprobe_trampoline(void); | 54 | void kretprobe_trampoline(void); |
| 55 | void trap_is_kprobe(unsigned long address, struct pt_regs *regs); | 55 | void trap_is_kprobe(unsigned long address, struct pt_regs *regs); |
| 56 | #else | 56 | #else |
| 57 | static void trap_is_kprobe(unsigned long address, struct pt_regs *regs) | 57 | #define trap_is_kprobe(address, regs) |
| 58 | { | ||
| 59 | } | ||
| 60 | #endif /* CONFIG_KPROBES */ | 58 | #endif /* CONFIG_KPROBES */ |
| 61 | 59 | ||
| 62 | #endif /* _ARC_KPROBES_H */ | 60 | #endif /* _ARC_KPROBES_H */ |
diff --git a/arch/arc/kernel/entry-arcv2.S b/arch/arc/kernel/entry-arcv2.S index 2585632eaa68..cc558a25b8fa 100644 --- a/arch/arc/kernel/entry-arcv2.S +++ b/arch/arc/kernel/entry-arcv2.S | |||
| @@ -100,15 +100,21 @@ END(handle_interrupt) | |||
| 100 | ;################### Non TLB Exception Handling ############################# | 100 | ;################### Non TLB Exception Handling ############################# |
| 101 | 101 | ||
| 102 | ENTRY(EV_SWI) | 102 | ENTRY(EV_SWI) |
| 103 | flag 1 | 103 | ; TODO: implement this |
| 104 | EXCEPTION_PROLOGUE | ||
| 105 | b ret_from_exception | ||
| 104 | END(EV_SWI) | 106 | END(EV_SWI) |
| 105 | 107 | ||
| 106 | ENTRY(EV_DivZero) | 108 | ENTRY(EV_DivZero) |
| 107 | flag 1 | 109 | ; TODO: implement this |
| 110 | EXCEPTION_PROLOGUE | ||
| 111 | b ret_from_exception | ||
| 108 | END(EV_DivZero) | 112 | END(EV_DivZero) |
| 109 | 113 | ||
| 110 | ENTRY(EV_DCError) | 114 | ENTRY(EV_DCError) |
| 111 | flag 1 | 115 | ; TODO: implement this |
| 116 | EXCEPTION_PROLOGUE | ||
| 117 | b ret_from_exception | ||
| 112 | END(EV_DCError) | 118 | END(EV_DCError) |
| 113 | 119 | ||
| 114 | ; --------------------------------------------- | 120 | ; --------------------------------------------- |
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index 3093fa898a23..fa62404ba58f 100644 --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
| 11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
| 12 | #include <linux/root_dev.h> | 12 | #include <linux/root_dev.h> |
| 13 | #include <linux/clk.h> | ||
| 13 | #include <linux/clk-provider.h> | 14 | #include <linux/clk-provider.h> |
| 14 | #include <linux/clocksource.h> | 15 | #include <linux/clocksource.h> |
| 15 | #include <linux/console.h> | 16 | #include <linux/console.h> |
| @@ -488,8 +489,9 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 488 | { | 489 | { |
| 489 | char *str; | 490 | char *str; |
| 490 | int cpu_id = ptr_to_cpu(v); | 491 | int cpu_id = ptr_to_cpu(v); |
| 491 | struct device_node *core_clk = of_find_node_by_name(NULL, "core_clk"); | 492 | struct device *cpu_dev = get_cpu_device(cpu_id); |
| 492 | u32 freq = 0; | 493 | struct clk *cpu_clk; |
| 494 | unsigned long freq = 0; | ||
| 493 | 495 | ||
| 494 | if (!cpu_online(cpu_id)) { | 496 | if (!cpu_online(cpu_id)) { |
| 495 | seq_printf(m, "processor [%d]\t: Offline\n", cpu_id); | 497 | seq_printf(m, "processor [%d]\t: Offline\n", cpu_id); |
| @@ -502,9 +504,15 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 502 | 504 | ||
| 503 | seq_printf(m, arc_cpu_mumbojumbo(cpu_id, str, PAGE_SIZE)); | 505 | seq_printf(m, arc_cpu_mumbojumbo(cpu_id, str, PAGE_SIZE)); |
| 504 | 506 | ||
| 505 | of_property_read_u32(core_clk, "clock-frequency", &freq); | 507 | cpu_clk = clk_get(cpu_dev, NULL); |
| 508 | if (IS_ERR(cpu_clk)) { | ||
| 509 | seq_printf(m, "CPU speed \t: Cannot get clock for processor [%d]\n", | ||
| 510 | cpu_id); | ||
| 511 | } else { | ||
| 512 | freq = clk_get_rate(cpu_clk); | ||
| 513 | } | ||
| 506 | if (freq) | 514 | if (freq) |
| 507 | seq_printf(m, "CPU speed\t: %u.%02u Mhz\n", | 515 | seq_printf(m, "CPU speed\t: %lu.%02lu Mhz\n", |
| 508 | freq / 1000000, (freq / 10000) % 100); | 516 | freq / 1000000, (freq / 10000) % 100); |
| 509 | 517 | ||
| 510 | seq_printf(m, "Bogo MIPS\t: %lu.%02lu\n", | 518 | seq_printf(m, "Bogo MIPS\t: %lu.%02lu\n", |
diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c index d408fa21a07c..928562967f3c 100644 --- a/arch/arc/mm/cache.c +++ b/arch/arc/mm/cache.c | |||
| @@ -633,6 +633,9 @@ noinline static void slc_entire_op(const int op) | |||
| 633 | 633 | ||
| 634 | write_aux_reg(ARC_REG_SLC_INVALIDATE, 1); | 634 | write_aux_reg(ARC_REG_SLC_INVALIDATE, 1); |
| 635 | 635 | ||
| 636 | /* Make sure "busy" bit reports correct stataus, see STAR 9001165532 */ | ||
| 637 | read_aux_reg(r); | ||
| 638 | |||
| 636 | /* Important to wait for flush to complete */ | 639 | /* Important to wait for flush to complete */ |
| 637 | while (read_aux_reg(r) & SLC_CTRL_BUSY); | 640 | while (read_aux_reg(r) & SLC_CTRL_BUSY); |
| 638 | } | 641 | } |
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 18c174fef84f..0467fb365bfc 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi | |||
| @@ -113,8 +113,8 @@ | |||
| 113 | simple-audio-card,mclk-fs = <512>; | 113 | simple-audio-card,mclk-fs = <512>; |
| 114 | simple-audio-card,aux-devs = <&codec_analog>; | 114 | simple-audio-card,aux-devs = <&codec_analog>; |
| 115 | simple-audio-card,routing = | 115 | simple-audio-card,routing = |
| 116 | "Left DAC", "Digital Left DAC", | 116 | "Left DAC", "AIF1 Slot 0 Left", |
| 117 | "Right DAC", "Digital Right DAC"; | 117 | "Right DAC", "AIF1 Slot 0 Right"; |
| 118 | status = "disabled"; | 118 | status = "disabled"; |
| 119 | 119 | ||
| 120 | simple-audio-card,cpu { | 120 | simple-audio-card,cpu { |
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 96dba7cd8be7..314eb6abe1ff 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c | |||
| @@ -1124,6 +1124,9 @@ static void cpu_hyp_reinit(void) | |||
| 1124 | if (__hyp_get_vectors() == hyp_default_vectors) | 1124 | if (__hyp_get_vectors() == hyp_default_vectors) |
| 1125 | cpu_init_hyp_mode(NULL); | 1125 | cpu_init_hyp_mode(NULL); |
| 1126 | } | 1126 | } |
| 1127 | |||
| 1128 | if (vgic_present) | ||
| 1129 | kvm_vgic_init_cpu_hardware(); | ||
| 1127 | } | 1130 | } |
| 1128 | 1131 | ||
| 1129 | static void cpu_hyp_reset(void) | 1132 | static void cpu_hyp_reset(void) |
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 962616fd4ddd..582a972371cf 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c | |||
| @@ -292,11 +292,18 @@ static void unmap_stage2_range(struct kvm *kvm, phys_addr_t start, u64 size) | |||
| 292 | phys_addr_t addr = start, end = start + size; | 292 | phys_addr_t addr = start, end = start + size; |
| 293 | phys_addr_t next; | 293 | phys_addr_t next; |
| 294 | 294 | ||
| 295 | assert_spin_locked(&kvm->mmu_lock); | ||
| 295 | pgd = kvm->arch.pgd + stage2_pgd_index(addr); | 296 | pgd = kvm->arch.pgd + stage2_pgd_index(addr); |
| 296 | do { | 297 | do { |
| 297 | next = stage2_pgd_addr_end(addr, end); | 298 | next = stage2_pgd_addr_end(addr, end); |
| 298 | if (!stage2_pgd_none(*pgd)) | 299 | if (!stage2_pgd_none(*pgd)) |
| 299 | unmap_stage2_puds(kvm, pgd, addr, next); | 300 | unmap_stage2_puds(kvm, pgd, addr, next); |
| 301 | /* | ||
| 302 | * If the range is too large, release the kvm->mmu_lock | ||
| 303 | * to prevent starvation and lockup detector warnings. | ||
| 304 | */ | ||
| 305 | if (next != end) | ||
| 306 | cond_resched_lock(&kvm->mmu_lock); | ||
| 300 | } while (pgd++, addr = next, addr != end); | 307 | } while (pgd++, addr = next, addr != end); |
| 301 | } | 308 | } |
| 302 | 309 | ||
| @@ -803,6 +810,7 @@ void stage2_unmap_vm(struct kvm *kvm) | |||
| 803 | int idx; | 810 | int idx; |
| 804 | 811 | ||
| 805 | idx = srcu_read_lock(&kvm->srcu); | 812 | idx = srcu_read_lock(&kvm->srcu); |
| 813 | down_read(¤t->mm->mmap_sem); | ||
| 806 | spin_lock(&kvm->mmu_lock); | 814 | spin_lock(&kvm->mmu_lock); |
| 807 | 815 | ||
| 808 | slots = kvm_memslots(kvm); | 816 | slots = kvm_memslots(kvm); |
| @@ -810,6 +818,7 @@ void stage2_unmap_vm(struct kvm *kvm) | |||
| 810 | stage2_unmap_memslot(kvm, memslot); | 818 | stage2_unmap_memslot(kvm, memslot); |
| 811 | 819 | ||
| 812 | spin_unlock(&kvm->mmu_lock); | 820 | spin_unlock(&kvm->mmu_lock); |
| 821 | up_read(¤t->mm->mmap_sem); | ||
| 813 | srcu_read_unlock(&kvm->srcu, idx); | 822 | srcu_read_unlock(&kvm->srcu, idx); |
| 814 | } | 823 | } |
| 815 | 824 | ||
| @@ -829,7 +838,10 @@ void kvm_free_stage2_pgd(struct kvm *kvm) | |||
| 829 | if (kvm->arch.pgd == NULL) | 838 | if (kvm->arch.pgd == NULL) |
| 830 | return; | 839 | return; |
| 831 | 840 | ||
| 841 | spin_lock(&kvm->mmu_lock); | ||
| 832 | unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE); | 842 | unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE); |
| 843 | spin_unlock(&kvm->mmu_lock); | ||
| 844 | |||
| 833 | /* Free the HW pgd, one page at a time */ | 845 | /* Free the HW pgd, one page at a time */ |
| 834 | free_pages_exact(kvm->arch.pgd, S2_PGD_SIZE); | 846 | free_pages_exact(kvm->arch.pgd, S2_PGD_SIZE); |
| 835 | kvm->arch.pgd = NULL; | 847 | kvm->arch.pgd = NULL; |
| @@ -1801,6 +1813,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, | |||
| 1801 | (KVM_PHYS_SIZE >> PAGE_SHIFT)) | 1813 | (KVM_PHYS_SIZE >> PAGE_SHIFT)) |
| 1802 | return -EFAULT; | 1814 | return -EFAULT; |
| 1803 | 1815 | ||
| 1816 | down_read(¤t->mm->mmap_sem); | ||
| 1804 | /* | 1817 | /* |
| 1805 | * A memory region could potentially cover multiple VMAs, and any holes | 1818 | * A memory region could potentially cover multiple VMAs, and any holes |
| 1806 | * between them, so iterate over all of them to find out if we can map | 1819 | * between them, so iterate over all of them to find out if we can map |
| @@ -1844,8 +1857,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, | |||
| 1844 | pa += vm_start - vma->vm_start; | 1857 | pa += vm_start - vma->vm_start; |
| 1845 | 1858 | ||
| 1846 | /* IO region dirty page logging not allowed */ | 1859 | /* IO region dirty page logging not allowed */ |
| 1847 | if (memslot->flags & KVM_MEM_LOG_DIRTY_PAGES) | 1860 | if (memslot->flags & KVM_MEM_LOG_DIRTY_PAGES) { |
| 1848 | return -EINVAL; | 1861 | ret = -EINVAL; |
| 1862 | goto out; | ||
| 1863 | } | ||
| 1849 | 1864 | ||
| 1850 | ret = kvm_phys_addr_ioremap(kvm, gpa, pa, | 1865 | ret = kvm_phys_addr_ioremap(kvm, gpa, pa, |
| 1851 | vm_end - vm_start, | 1866 | vm_end - vm_start, |
| @@ -1857,7 +1872,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, | |||
| 1857 | } while (hva < reg_end); | 1872 | } while (hva < reg_end); |
| 1858 | 1873 | ||
| 1859 | if (change == KVM_MR_FLAGS_ONLY) | 1874 | if (change == KVM_MR_FLAGS_ONLY) |
| 1860 | return ret; | 1875 | goto out; |
| 1861 | 1876 | ||
| 1862 | spin_lock(&kvm->mmu_lock); | 1877 | spin_lock(&kvm->mmu_lock); |
| 1863 | if (ret) | 1878 | if (ret) |
| @@ -1865,6 +1880,8 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, | |||
| 1865 | else | 1880 | else |
| 1866 | stage2_flush_memslot(kvm, memslot); | 1881 | stage2_flush_memslot(kvm, memslot); |
| 1867 | spin_unlock(&kvm->mmu_lock); | 1882 | spin_unlock(&kvm->mmu_lock); |
| 1883 | out: | ||
| 1884 | up_read(¤t->mm->mmap_sem); | ||
| 1868 | return ret; | 1885 | return ret; |
| 1869 | } | 1886 | } |
| 1870 | 1887 | ||
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 63eabb06f9f1..475811f5383a 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
| @@ -935,13 +935,31 @@ static void arm_coherent_dma_free(struct device *dev, size_t size, void *cpu_add | |||
| 935 | __arm_dma_free(dev, size, cpu_addr, handle, attrs, true); | 935 | __arm_dma_free(dev, size, cpu_addr, handle, attrs, true); |
| 936 | } | 936 | } |
| 937 | 937 | ||
| 938 | /* | ||
| 939 | * The whole dma_get_sgtable() idea is fundamentally unsafe - it seems | ||
| 940 | * that the intention is to allow exporting memory allocated via the | ||
| 941 | * coherent DMA APIs through the dma_buf API, which only accepts a | ||
| 942 | * scattertable. This presents a couple of problems: | ||
| 943 | * 1. Not all memory allocated via the coherent DMA APIs is backed by | ||
| 944 | * a struct page | ||
| 945 | * 2. Passing coherent DMA memory into the streaming APIs is not allowed | ||
| 946 | * as we will try to flush the memory through a different alias to that | ||
| 947 | * actually being used (and the flushes are redundant.) | ||
| 948 | */ | ||
| 938 | int arm_dma_get_sgtable(struct device *dev, struct sg_table *sgt, | 949 | int arm_dma_get_sgtable(struct device *dev, struct sg_table *sgt, |
| 939 | void *cpu_addr, dma_addr_t handle, size_t size, | 950 | void *cpu_addr, dma_addr_t handle, size_t size, |
| 940 | unsigned long attrs) | 951 | unsigned long attrs) |
| 941 | { | 952 | { |
| 942 | struct page *page = pfn_to_page(dma_to_pfn(dev, handle)); | 953 | unsigned long pfn = dma_to_pfn(dev, handle); |
| 954 | struct page *page; | ||
| 943 | int ret; | 955 | int ret; |
| 944 | 956 | ||
| 957 | /* If the PFN is not valid, we do not have a struct page */ | ||
| 958 | if (!pfn_valid(pfn)) | ||
| 959 | return -ENXIO; | ||
| 960 | |||
| 961 | page = pfn_to_page(pfn); | ||
| 962 | |||
| 945 | ret = sg_alloc_table(sgt, 1, GFP_KERNEL); | 963 | ret = sg_alloc_table(sgt, 1, GFP_KERNEL); |
| 946 | if (unlikely(ret)) | 964 | if (unlikely(ret)) |
| 947 | return ret; | 965 | return ret; |
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 3b5c7aaf9c76..33a45bd96860 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c | |||
| @@ -303,7 +303,10 @@ static inline void set_vbar(unsigned long val) | |||
| 303 | */ | 303 | */ |
| 304 | static inline bool security_extensions_enabled(void) | 304 | static inline bool security_extensions_enabled(void) |
| 305 | { | 305 | { |
| 306 | return !!cpuid_feature_extract(CPUID_EXT_PFR1, 4); | 306 | /* Check CPUID Identification Scheme before ID_PFR1 read */ |
| 307 | if ((read_cpuid_id() & 0x000f0000) == 0x000f0000) | ||
| 308 | return !!cpuid_feature_extract(CPUID_EXT_PFR1, 4); | ||
| 309 | return 0; | ||
| 307 | } | 310 | } |
| 308 | 311 | ||
| 309 | static unsigned long __init setup_vectors_base(void) | 312 | static unsigned long __init setup_vectors_base(void) |
diff --git a/arch/arm/probes/kprobes/core.c b/arch/arm/probes/kprobes/core.c index b6dc9d838a9a..ad1f4e6a9e33 100644 --- a/arch/arm/probes/kprobes/core.c +++ b/arch/arm/probes/kprobes/core.c | |||
| @@ -266,11 +266,20 @@ void __kprobes kprobe_handler(struct pt_regs *regs) | |||
| 266 | #endif | 266 | #endif |
| 267 | 267 | ||
| 268 | if (p) { | 268 | if (p) { |
| 269 | if (cur) { | 269 | if (!p->ainsn.insn_check_cc(regs->ARM_cpsr)) { |
| 270 | /* | ||
| 271 | * Probe hit but conditional execution check failed, | ||
| 272 | * so just skip the instruction and continue as if | ||
| 273 | * nothing had happened. | ||
| 274 | * In this case, we can skip recursing check too. | ||
| 275 | */ | ||
| 276 | singlestep_skip(p, regs); | ||
| 277 | } else if (cur) { | ||
| 270 | /* Kprobe is pending, so we're recursing. */ | 278 | /* Kprobe is pending, so we're recursing. */ |
| 271 | switch (kcb->kprobe_status) { | 279 | switch (kcb->kprobe_status) { |
| 272 | case KPROBE_HIT_ACTIVE: | 280 | case KPROBE_HIT_ACTIVE: |
| 273 | case KPROBE_HIT_SSDONE: | 281 | case KPROBE_HIT_SSDONE: |
| 282 | case KPROBE_HIT_SS: | ||
| 274 | /* A pre- or post-handler probe got us here. */ | 283 | /* A pre- or post-handler probe got us here. */ |
| 275 | kprobes_inc_nmissed_count(p); | 284 | kprobes_inc_nmissed_count(p); |
| 276 | save_previous_kprobe(kcb); | 285 | save_previous_kprobe(kcb); |
| @@ -279,11 +288,16 @@ void __kprobes kprobe_handler(struct pt_regs *regs) | |||
| 279 | singlestep(p, regs, kcb); | 288 | singlestep(p, regs, kcb); |
| 280 | restore_previous_kprobe(kcb); | 289 | restore_previous_kprobe(kcb); |
| 281 | break; | 290 | break; |
| 291 | case KPROBE_REENTER: | ||
| 292 | /* A nested probe was hit in FIQ, it is a BUG */ | ||
| 293 | pr_warn("Unrecoverable kprobe detected at %p.\n", | ||
| 294 | p->addr); | ||
| 295 | /* fall through */ | ||
| 282 | default: | 296 | default: |
| 283 | /* impossible cases */ | 297 | /* impossible cases */ |
| 284 | BUG(); | 298 | BUG(); |
| 285 | } | 299 | } |
| 286 | } else if (p->ainsn.insn_check_cc(regs->ARM_cpsr)) { | 300 | } else { |
| 287 | /* Probe hit and conditional execution check ok. */ | 301 | /* Probe hit and conditional execution check ok. */ |
| 288 | set_current_kprobe(p); | 302 | set_current_kprobe(p); |
| 289 | kcb->kprobe_status = KPROBE_HIT_ACTIVE; | 303 | kcb->kprobe_status = KPROBE_HIT_ACTIVE; |
| @@ -304,13 +318,6 @@ void __kprobes kprobe_handler(struct pt_regs *regs) | |||
| 304 | } | 318 | } |
| 305 | reset_current_kprobe(); | 319 | reset_current_kprobe(); |
| 306 | } | 320 | } |
| 307 | } else { | ||
| 308 | /* | ||
| 309 | * Probe hit but conditional execution check failed, | ||
| 310 | * so just skip the instruction and continue as if | ||
| 311 | * nothing had happened. | ||
| 312 | */ | ||
| 313 | singlestep_skip(p, regs); | ||
| 314 | } | 321 | } |
| 315 | } else if (cur) { | 322 | } else if (cur) { |
| 316 | /* We probably hit a jprobe. Call its break handler. */ | 323 | /* We probably hit a jprobe. Call its break handler. */ |
| @@ -434,6 +441,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs) | |||
| 434 | struct hlist_node *tmp; | 441 | struct hlist_node *tmp; |
| 435 | unsigned long flags, orig_ret_address = 0; | 442 | unsigned long flags, orig_ret_address = 0; |
| 436 | unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline; | 443 | unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline; |
| 444 | kprobe_opcode_t *correct_ret_addr = NULL; | ||
| 437 | 445 | ||
| 438 | INIT_HLIST_HEAD(&empty_rp); | 446 | INIT_HLIST_HEAD(&empty_rp); |
| 439 | kretprobe_hash_lock(current, &head, &flags); | 447 | kretprobe_hash_lock(current, &head, &flags); |
| @@ -456,14 +464,34 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs) | |||
| 456 | /* another task is sharing our hash bucket */ | 464 | /* another task is sharing our hash bucket */ |
| 457 | continue; | 465 | continue; |
| 458 | 466 | ||
| 467 | orig_ret_address = (unsigned long)ri->ret_addr; | ||
| 468 | |||
| 469 | if (orig_ret_address != trampoline_address) | ||
| 470 | /* | ||
| 471 | * This is the real return address. Any other | ||
| 472 | * instances associated with this task are for | ||
| 473 | * other calls deeper on the call stack | ||
| 474 | */ | ||
| 475 | break; | ||
| 476 | } | ||
| 477 | |||
| 478 | kretprobe_assert(ri, orig_ret_address, trampoline_address); | ||
| 479 | |||
| 480 | correct_ret_addr = ri->ret_addr; | ||
| 481 | hlist_for_each_entry_safe(ri, tmp, head, hlist) { | ||
| 482 | if (ri->task != current) | ||
| 483 | /* another task is sharing our hash bucket */ | ||
| 484 | continue; | ||
| 485 | |||
| 486 | orig_ret_address = (unsigned long)ri->ret_addr; | ||
| 459 | if (ri->rp && ri->rp->handler) { | 487 | if (ri->rp && ri->rp->handler) { |
| 460 | __this_cpu_write(current_kprobe, &ri->rp->kp); | 488 | __this_cpu_write(current_kprobe, &ri->rp->kp); |
| 461 | get_kprobe_ctlblk()->kprobe_status = KPROBE_HIT_ACTIVE; | 489 | get_kprobe_ctlblk()->kprobe_status = KPROBE_HIT_ACTIVE; |
| 490 | ri->ret_addr = correct_ret_addr; | ||
| 462 | ri->rp->handler(ri, regs); | 491 | ri->rp->handler(ri, regs); |
| 463 | __this_cpu_write(current_kprobe, NULL); | 492 | __this_cpu_write(current_kprobe, NULL); |
| 464 | } | 493 | } |
| 465 | 494 | ||
| 466 | orig_ret_address = (unsigned long)ri->ret_addr; | ||
| 467 | recycle_rp_inst(ri, &empty_rp); | 495 | recycle_rp_inst(ri, &empty_rp); |
| 468 | 496 | ||
| 469 | if (orig_ret_address != trampoline_address) | 497 | if (orig_ret_address != trampoline_address) |
| @@ -475,7 +503,6 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs) | |||
| 475 | break; | 503 | break; |
| 476 | } | 504 | } |
| 477 | 505 | ||
| 478 | kretprobe_assert(ri, orig_ret_address, trampoline_address); | ||
| 479 | kretprobe_hash_unlock(current, &flags); | 506 | kretprobe_hash_unlock(current, &flags); |
| 480 | 507 | ||
| 481 | hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) { | 508 | hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) { |
diff --git a/arch/arm/probes/kprobes/test-core.c b/arch/arm/probes/kprobes/test-core.c index c893726aa52d..1c98a87786ca 100644 --- a/arch/arm/probes/kprobes/test-core.c +++ b/arch/arm/probes/kprobes/test-core.c | |||
| @@ -977,7 +977,10 @@ static void coverage_end(void) | |||
| 977 | void __naked __kprobes_test_case_start(void) | 977 | void __naked __kprobes_test_case_start(void) |
| 978 | { | 978 | { |
| 979 | __asm__ __volatile__ ( | 979 | __asm__ __volatile__ ( |
| 980 | "stmdb sp!, {r4-r11} \n\t" | 980 | "mov r2, sp \n\t" |
| 981 | "bic r3, r2, #7 \n\t" | ||
| 982 | "mov sp, r3 \n\t" | ||
| 983 | "stmdb sp!, {r2-r11} \n\t" | ||
| 981 | "sub sp, sp, #"__stringify(TEST_MEMORY_SIZE)"\n\t" | 984 | "sub sp, sp, #"__stringify(TEST_MEMORY_SIZE)"\n\t" |
| 982 | "bic r0, lr, #1 @ r0 = inline data \n\t" | 985 | "bic r0, lr, #1 @ r0 = inline data \n\t" |
| 983 | "mov r1, sp \n\t" | 986 | "mov r1, sp \n\t" |
| @@ -997,7 +1000,8 @@ void __naked __kprobes_test_case_end_32(void) | |||
| 997 | "movne pc, r0 \n\t" | 1000 | "movne pc, r0 \n\t" |
| 998 | "mov r0, r4 \n\t" | 1001 | "mov r0, r4 \n\t" |
| 999 | "add sp, sp, #"__stringify(TEST_MEMORY_SIZE)"\n\t" | 1002 | "add sp, sp, #"__stringify(TEST_MEMORY_SIZE)"\n\t" |
| 1000 | "ldmia sp!, {r4-r11} \n\t" | 1003 | "ldmia sp!, {r2-r11} \n\t" |
| 1004 | "mov sp, r2 \n\t" | ||
| 1001 | "mov pc, r0 \n\t" | 1005 | "mov pc, r0 \n\t" |
| 1002 | ); | 1006 | ); |
| 1003 | } | 1007 | } |
| @@ -1013,7 +1017,8 @@ void __naked __kprobes_test_case_end_16(void) | |||
| 1013 | "bxne r0 \n\t" | 1017 | "bxne r0 \n\t" |
| 1014 | "mov r0, r4 \n\t" | 1018 | "mov r0, r4 \n\t" |
| 1015 | "add sp, sp, #"__stringify(TEST_MEMORY_SIZE)"\n\t" | 1019 | "add sp, sp, #"__stringify(TEST_MEMORY_SIZE)"\n\t" |
| 1016 | "ldmia sp!, {r4-r11} \n\t" | 1020 | "ldmia sp!, {r2-r11} \n\t" |
| 1021 | "mov sp, r2 \n\t" | ||
| 1017 | "bx r0 \n\t" | 1022 | "bx r0 \n\t" |
| 1018 | ); | 1023 | ); |
| 1019 | } | 1024 | } |
diff --git a/arch/arm64/include/asm/current.h b/arch/arm64/include/asm/current.h index 86c404171305..f6580d4afb0e 100644 --- a/arch/arm64/include/asm/current.h +++ b/arch/arm64/include/asm/current.h | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
| 5 | 5 | ||
| 6 | #include <asm/sysreg.h> | ||
| 7 | |||
| 8 | #ifndef __ASSEMBLY__ | 6 | #ifndef __ASSEMBLY__ |
| 9 | 7 | ||
| 10 | struct task_struct; | 8 | struct task_struct; |
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index ef1caae02110..9b1036570586 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c | |||
| @@ -944,7 +944,7 @@ static bool have_cpu_die(void) | |||
| 944 | #ifdef CONFIG_HOTPLUG_CPU | 944 | #ifdef CONFIG_HOTPLUG_CPU |
| 945 | int any_cpu = raw_smp_processor_id(); | 945 | int any_cpu = raw_smp_processor_id(); |
| 946 | 946 | ||
| 947 | if (cpu_ops[any_cpu]->cpu_die) | 947 | if (cpu_ops[any_cpu] && cpu_ops[any_cpu]->cpu_die) |
| 948 | return true; | 948 | return true; |
| 949 | #endif | 949 | #endif |
| 950 | return false; | 950 | return false; |
diff --git a/arch/arm64/kernel/vdso/.gitignore b/arch/arm64/kernel/vdso/.gitignore index b8cc94e9698b..f8b69d84238e 100644 --- a/arch/arm64/kernel/vdso/.gitignore +++ b/arch/arm64/kernel/vdso/.gitignore | |||
| @@ -1,2 +1 @@ | |||
| 1 | vdso.lds | vdso.lds | |
| 2 | vdso-offsets.h | ||
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 4bf899fb451b..1b35b8bddbfb 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c | |||
| @@ -42,7 +42,20 @@ | |||
| 42 | #include <asm/pgtable.h> | 42 | #include <asm/pgtable.h> |
| 43 | #include <asm/tlbflush.h> | 43 | #include <asm/tlbflush.h> |
| 44 | 44 | ||
| 45 | static const char *fault_name(unsigned int esr); | 45 | struct fault_info { |
| 46 | int (*fn)(unsigned long addr, unsigned int esr, | ||
| 47 | struct pt_regs *regs); | ||
| 48 | int sig; | ||
| 49 | int code; | ||
| 50 | const char *name; | ||
| 51 | }; | ||
| 52 | |||
| 53 | static const struct fault_info fault_info[]; | ||
| 54 | |||
| 55 | static inline const struct fault_info *esr_to_fault_info(unsigned int esr) | ||
| 56 | { | ||
| 57 | return fault_info + (esr & 63); | ||
| 58 | } | ||
| 46 | 59 | ||
| 47 | #ifdef CONFIG_KPROBES | 60 | #ifdef CONFIG_KPROBES |
| 48 | static inline int notify_page_fault(struct pt_regs *regs, unsigned int esr) | 61 | static inline int notify_page_fault(struct pt_regs *regs, unsigned int esr) |
| @@ -197,10 +210,12 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr, | |||
| 197 | struct pt_regs *regs) | 210 | struct pt_regs *regs) |
| 198 | { | 211 | { |
| 199 | struct siginfo si; | 212 | struct siginfo si; |
| 213 | const struct fault_info *inf; | ||
| 200 | 214 | ||
| 201 | if (unhandled_signal(tsk, sig) && show_unhandled_signals_ratelimited()) { | 215 | if (unhandled_signal(tsk, sig) && show_unhandled_signals_ratelimited()) { |
| 216 | inf = esr_to_fault_info(esr); | ||
| 202 | pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", | 217 | pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", |
| 203 | tsk->comm, task_pid_nr(tsk), fault_name(esr), sig, | 218 | tsk->comm, task_pid_nr(tsk), inf->name, sig, |
| 204 | addr, esr); | 219 | addr, esr); |
| 205 | show_pte(tsk->mm, addr); | 220 | show_pte(tsk->mm, addr); |
| 206 | show_regs(regs); | 221 | show_regs(regs); |
| @@ -219,14 +234,16 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re | |||
| 219 | { | 234 | { |
| 220 | struct task_struct *tsk = current; | 235 | struct task_struct *tsk = current; |
| 221 | struct mm_struct *mm = tsk->active_mm; | 236 | struct mm_struct *mm = tsk->active_mm; |
| 237 | const struct fault_info *inf; | ||
| 222 | 238 | ||
| 223 | /* | 239 | /* |
| 224 | * If we are in kernel mode at this point, we have no context to | 240 | * If we are in kernel mode at this point, we have no context to |
| 225 | * handle this fault with. | 241 | * handle this fault with. |
| 226 | */ | 242 | */ |
| 227 | if (user_mode(regs)) | 243 | if (user_mode(regs)) { |
| 228 | __do_user_fault(tsk, addr, esr, SIGSEGV, SEGV_MAPERR, regs); | 244 | inf = esr_to_fault_info(esr); |
| 229 | else | 245 | __do_user_fault(tsk, addr, esr, inf->sig, inf->code, regs); |
| 246 | } else | ||
| 230 | __do_kernel_fault(mm, addr, esr, regs); | 247 | __do_kernel_fault(mm, addr, esr, regs); |
| 231 | } | 248 | } |
| 232 | 249 | ||
| @@ -488,12 +505,7 @@ static int do_bad(unsigned long addr, unsigned int esr, struct pt_regs *regs) | |||
| 488 | return 1; | 505 | return 1; |
| 489 | } | 506 | } |
| 490 | 507 | ||
| 491 | static const struct fault_info { | 508 | static const struct fault_info fault_info[] = { |
| 492 | int (*fn)(unsigned long addr, unsigned int esr, struct pt_regs *regs); | ||
| 493 | int sig; | ||
| 494 | int code; | ||
| 495 | const char *name; | ||
| 496 | } fault_info[] = { | ||
| 497 | { do_bad, SIGBUS, 0, "ttbr address size fault" }, | 509 | { do_bad, SIGBUS, 0, "ttbr address size fault" }, |
| 498 | { do_bad, SIGBUS, 0, "level 1 address size fault" }, | 510 | { do_bad, SIGBUS, 0, "level 1 address size fault" }, |
| 499 | { do_bad, SIGBUS, 0, "level 2 address size fault" }, | 511 | { do_bad, SIGBUS, 0, "level 2 address size fault" }, |
| @@ -560,19 +572,13 @@ static const struct fault_info { | |||
| 560 | { do_bad, SIGBUS, 0, "unknown 63" }, | 572 | { do_bad, SIGBUS, 0, "unknown 63" }, |
| 561 | }; | 573 | }; |
| 562 | 574 | ||
| 563 | static const char *fault_name(unsigned int esr) | ||
| 564 | { | ||
| 565 | const struct fault_info *inf = fault_info + (esr & 63); | ||
| 566 | return inf->name; | ||
| 567 | } | ||
| 568 | |||
| 569 | /* | 575 | /* |
| 570 | * Dispatch a data abort to the relevant handler. | 576 | * Dispatch a data abort to the relevant handler. |
| 571 | */ | 577 | */ |
| 572 | asmlinkage void __exception do_mem_abort(unsigned long addr, unsigned int esr, | 578 | asmlinkage void __exception do_mem_abort(unsigned long addr, unsigned int esr, |
| 573 | struct pt_regs *regs) | 579 | struct pt_regs *regs) |
| 574 | { | 580 | { |
| 575 | const struct fault_info *inf = fault_info + (esr & 63); | 581 | const struct fault_info *inf = esr_to_fault_info(esr); |
| 576 | struct siginfo info; | 582 | struct siginfo info; |
| 577 | 583 | ||
| 578 | if (!inf->fn(addr, esr, regs)) | 584 | if (!inf->fn(addr, esr, regs)) |
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index e25584d72396..7514a000e361 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c | |||
| @@ -294,10 +294,6 @@ static __init int setup_hugepagesz(char *opt) | |||
| 294 | hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT); | 294 | hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT); |
| 295 | } else if (ps == PUD_SIZE) { | 295 | } else if (ps == PUD_SIZE) { |
| 296 | hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT); | 296 | hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT); |
| 297 | } else if (ps == (PAGE_SIZE * CONT_PTES)) { | ||
| 298 | hugetlb_add_hstate(CONT_PTE_SHIFT); | ||
| 299 | } else if (ps == (PMD_SIZE * CONT_PMDS)) { | ||
| 300 | hugetlb_add_hstate((PMD_SHIFT + CONT_PMD_SHIFT) - PAGE_SHIFT); | ||
| 301 | } else { | 297 | } else { |
| 302 | hugetlb_bad_size(); | 298 | hugetlb_bad_size(); |
| 303 | pr_err("hugepagesz: Unsupported page size %lu K\n", ps >> 10); | 299 | pr_err("hugepagesz: Unsupported page size %lu K\n", ps >> 10); |
| @@ -306,13 +302,3 @@ static __init int setup_hugepagesz(char *opt) | |||
| 306 | return 1; | 302 | return 1; |
| 307 | } | 303 | } |
| 308 | __setup("hugepagesz=", setup_hugepagesz); | 304 | __setup("hugepagesz=", setup_hugepagesz); |
| 309 | |||
| 310 | #ifdef CONFIG_ARM64_64K_PAGES | ||
| 311 | static __init int add_default_hugepagesz(void) | ||
| 312 | { | ||
| 313 | if (size_to_hstate(CONT_PTES * PAGE_SIZE) == NULL) | ||
| 314 | hugetlb_add_hstate(CONT_PTE_SHIFT); | ||
| 315 | return 0; | ||
| 316 | } | ||
| 317 | arch_initcall(add_default_hugepagesz); | ||
| 318 | #endif | ||
diff --git a/arch/c6x/kernel/ptrace.c b/arch/c6x/kernel/ptrace.c index a27e1f02ce18..8801dc98fd44 100644 --- a/arch/c6x/kernel/ptrace.c +++ b/arch/c6x/kernel/ptrace.c | |||
| @@ -70,46 +70,6 @@ static int gpr_get(struct task_struct *target, | |||
| 70 | 0, sizeof(*regs)); | 70 | 0, sizeof(*regs)); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | static int gpr_set(struct task_struct *target, | ||
| 74 | const struct user_regset *regset, | ||
| 75 | unsigned int pos, unsigned int count, | ||
| 76 | const void *kbuf, const void __user *ubuf) | ||
| 77 | { | ||
| 78 | int ret; | ||
| 79 | struct pt_regs *regs = task_pt_regs(target); | ||
| 80 | |||
| 81 | /* Don't copyin TSR or CSR */ | ||
| 82 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | ||
| 83 | ®s, | ||
| 84 | 0, PT_TSR * sizeof(long)); | ||
| 85 | if (ret) | ||
| 86 | return ret; | ||
| 87 | |||
| 88 | ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf, | ||
| 89 | PT_TSR * sizeof(long), | ||
| 90 | (PT_TSR + 1) * sizeof(long)); | ||
| 91 | if (ret) | ||
| 92 | return ret; | ||
| 93 | |||
| 94 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | ||
| 95 | ®s, | ||
| 96 | (PT_TSR + 1) * sizeof(long), | ||
| 97 | PT_CSR * sizeof(long)); | ||
| 98 | if (ret) | ||
| 99 | return ret; | ||
| 100 | |||
| 101 | ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf, | ||
| 102 | PT_CSR * sizeof(long), | ||
| 103 | (PT_CSR + 1) * sizeof(long)); | ||
| 104 | if (ret) | ||
| 105 | return ret; | ||
| 106 | |||
| 107 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | ||
| 108 | ®s, | ||
| 109 | (PT_CSR + 1) * sizeof(long), -1); | ||
| 110 | return ret; | ||
| 111 | } | ||
| 112 | |||
| 113 | enum c6x_regset { | 73 | enum c6x_regset { |
| 114 | REGSET_GPR, | 74 | REGSET_GPR, |
| 115 | }; | 75 | }; |
| @@ -121,7 +81,6 @@ static const struct user_regset c6x_regsets[] = { | |||
| 121 | .size = sizeof(u32), | 81 | .size = sizeof(u32), |
| 122 | .align = sizeof(u32), | 82 | .align = sizeof(u32), |
| 123 | .get = gpr_get, | 83 | .get = gpr_get, |
| 124 | .set = gpr_set | ||
| 125 | }, | 84 | }, |
| 126 | }; | 85 | }; |
| 127 | 86 | ||
diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c index 92075544a19a..0dc1c8f622bc 100644 --- a/arch/h8300/kernel/ptrace.c +++ b/arch/h8300/kernel/ptrace.c | |||
| @@ -95,7 +95,8 @@ static int regs_get(struct task_struct *target, | |||
| 95 | long *reg = (long *)®s; | 95 | long *reg = (long *)®s; |
| 96 | 96 | ||
| 97 | /* build user regs in buffer */ | 97 | /* build user regs in buffer */ |
| 98 | for (r = 0; r < ARRAY_SIZE(register_offset); r++) | 98 | BUILD_BUG_ON(sizeof(regs) % sizeof(long) != 0); |
| 99 | for (r = 0; r < sizeof(regs) / sizeof(long); r++) | ||
| 99 | *reg++ = h8300_get_reg(target, r); | 100 | *reg++ = h8300_get_reg(target, r); |
| 100 | 101 | ||
| 101 | return user_regset_copyout(&pos, &count, &kbuf, &ubuf, | 102 | return user_regset_copyout(&pos, &count, &kbuf, &ubuf, |
| @@ -113,7 +114,8 @@ static int regs_set(struct task_struct *target, | |||
| 113 | long *reg; | 114 | long *reg; |
| 114 | 115 | ||
| 115 | /* build user regs in buffer */ | 116 | /* build user regs in buffer */ |
| 116 | for (reg = (long *)®s, r = 0; r < ARRAY_SIZE(register_offset); r++) | 117 | BUILD_BUG_ON(sizeof(regs) % sizeof(long) != 0); |
| 118 | for (reg = (long *)®s, r = 0; r < sizeof(regs) / sizeof(long); r++) | ||
| 117 | *reg++ = h8300_get_reg(target, r); | 119 | *reg++ = h8300_get_reg(target, r); |
| 118 | 120 | ||
| 119 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 121 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
| @@ -122,7 +124,7 @@ static int regs_set(struct task_struct *target, | |||
| 122 | return ret; | 124 | return ret; |
| 123 | 125 | ||
| 124 | /* write back to pt_regs */ | 126 | /* write back to pt_regs */ |
| 125 | for (reg = (long *)®s, r = 0; r < ARRAY_SIZE(register_offset); r++) | 127 | for (reg = (long *)®s, r = 0; r < sizeof(regs) / sizeof(long); r++) |
| 126 | h8300_put_reg(target, r, *reg++); | 128 | h8300_put_reg(target, r, *reg++); |
| 127 | return 0; | 129 | return 0; |
| 128 | } | 130 | } |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 048bf076f7df..531cb9eb3319 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
| @@ -25,6 +25,7 @@ CONFIG_SUN_PARTITION=y | |||
| 25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
| 26 | CONFIG_SYSV68_PARTITION=y | 26 | CONFIG_SYSV68_PARTITION=y |
| 27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
| 28 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 28 | CONFIG_KEXEC=y | 29 | CONFIG_KEXEC=y |
| 29 | CONFIG_BOOTINFO_PROC=y | 30 | CONFIG_BOOTINFO_PROC=y |
| 30 | CONFIG_M68020=y | 31 | CONFIG_M68020=y |
| @@ -60,6 +61,7 @@ CONFIG_NET_IPVTI=m | |||
| 60 | CONFIG_NET_FOU_IP_TUNNELS=y | 61 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 61 | CONFIG_INET_AH=m | 62 | CONFIG_INET_AH=m |
| 62 | CONFIG_INET_ESP=m | 63 | CONFIG_INET_ESP=m |
| 64 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 63 | CONFIG_INET_IPCOMP=m | 65 | CONFIG_INET_IPCOMP=m |
| 64 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 66 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 65 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 67 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -71,6 +73,7 @@ CONFIG_IPV6=m | |||
| 71 | CONFIG_IPV6_ROUTER_PREF=y | 73 | CONFIG_IPV6_ROUTER_PREF=y |
| 72 | CONFIG_INET6_AH=m | 74 | CONFIG_INET6_AH=m |
| 73 | CONFIG_INET6_ESP=m | 75 | CONFIG_INET6_ESP=m |
| 76 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 74 | CONFIG_INET6_IPCOMP=m | 77 | CONFIG_INET6_IPCOMP=m |
| 75 | CONFIG_IPV6_ILA=m | 78 | CONFIG_IPV6_ILA=m |
| 76 | CONFIG_IPV6_VTI=m | 79 | CONFIG_IPV6_VTI=m |
| @@ -101,6 +104,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 101 | CONFIG_NFT_CT=m | 104 | CONFIG_NFT_CT=m |
| 102 | CONFIG_NFT_SET_RBTREE=m | 105 | CONFIG_NFT_SET_RBTREE=m |
| 103 | CONFIG_NFT_SET_HASH=m | 106 | CONFIG_NFT_SET_HASH=m |
| 107 | CONFIG_NFT_SET_BITMAP=m | ||
| 104 | CONFIG_NFT_COUNTER=m | 108 | CONFIG_NFT_COUNTER=m |
| 105 | CONFIG_NFT_LOG=m | 109 | CONFIG_NFT_LOG=m |
| 106 | CONFIG_NFT_LIMIT=m | 110 | CONFIG_NFT_LIMIT=m |
| @@ -298,6 +302,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 298 | CONFIG_NET_L3_MASTER_DEV=y | 302 | CONFIG_NET_L3_MASTER_DEV=y |
| 299 | CONFIG_AF_KCM=m | 303 | CONFIG_AF_KCM=m |
| 300 | # CONFIG_WIRELESS is not set | 304 | # CONFIG_WIRELESS is not set |
| 305 | CONFIG_PSAMPLE=m | ||
| 306 | CONFIG_NET_IFE=m | ||
| 301 | CONFIG_NET_DEVLINK=m | 307 | CONFIG_NET_DEVLINK=m |
| 302 | # CONFIG_UEVENT_HELPER is not set | 308 | # CONFIG_UEVENT_HELPER is not set |
| 303 | CONFIG_DEVTMPFS=y | 309 | CONFIG_DEVTMPFS=y |
| @@ -371,6 +377,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 371 | CONFIG_MACVLAN=m | 377 | CONFIG_MACVLAN=m |
| 372 | CONFIG_MACVTAP=m | 378 | CONFIG_MACVTAP=m |
| 373 | CONFIG_IPVLAN=m | 379 | CONFIG_IPVLAN=m |
| 380 | CONFIG_IPVTAP=m | ||
| 374 | CONFIG_VXLAN=m | 381 | CONFIG_VXLAN=m |
| 375 | CONFIG_GENEVE=m | 382 | CONFIG_GENEVE=m |
| 376 | CONFIG_GTP=m | 383 | CONFIG_GTP=m |
| @@ -383,6 +390,7 @@ CONFIG_VETH=m | |||
| 383 | # CONFIG_NET_VENDOR_AMAZON is not set | 390 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 384 | CONFIG_A2065=y | 391 | CONFIG_A2065=y |
| 385 | CONFIG_ARIADNE=y | 392 | CONFIG_ARIADNE=y |
| 393 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 386 | # CONFIG_NET_VENDOR_ARC is not set | 394 | # CONFIG_NET_VENDOR_ARC is not set |
| 387 | # CONFIG_NET_CADENCE is not set | 395 | # CONFIG_NET_CADENCE is not set |
| 388 | # CONFIG_NET_VENDOR_BROADCOM is not set | 396 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -404,7 +412,6 @@ CONFIG_ZORRO8390=y | |||
| 404 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 412 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 405 | # CONFIG_NET_VENDOR_SMSC is not set | 413 | # CONFIG_NET_VENDOR_SMSC is not set |
| 406 | # CONFIG_NET_VENDOR_STMICRO is not set | 414 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 407 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 408 | # CONFIG_NET_VENDOR_VIA is not set | 415 | # CONFIG_NET_VENDOR_VIA is not set |
| 409 | # CONFIG_NET_VENDOR_WIZNET is not set | 416 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 410 | CONFIG_PPP=m | 417 | CONFIG_PPP=m |
| @@ -564,6 +571,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 564 | CONFIG_DLM=m | 571 | CONFIG_DLM=m |
| 565 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 572 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 566 | CONFIG_MAGIC_SYSRQ=y | 573 | CONFIG_MAGIC_SYSRQ=y |
| 574 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 575 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 567 | CONFIG_ASYNC_RAID6_TEST=m | 576 | CONFIG_ASYNC_RAID6_TEST=m |
| 568 | CONFIG_TEST_HEXDUMP=m | 577 | CONFIG_TEST_HEXDUMP=m |
| 569 | CONFIG_TEST_STRING_HELPERS=m | 578 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -594,6 +603,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 594 | CONFIG_CRYPTO_LRW=m | 603 | CONFIG_CRYPTO_LRW=m |
| 595 | CONFIG_CRYPTO_PCBC=m | 604 | CONFIG_CRYPTO_PCBC=m |
| 596 | CONFIG_CRYPTO_KEYWRAP=m | 605 | CONFIG_CRYPTO_KEYWRAP=m |
| 606 | CONFIG_CRYPTO_CMAC=m | ||
| 597 | CONFIG_CRYPTO_XCBC=m | 607 | CONFIG_CRYPTO_XCBC=m |
| 598 | CONFIG_CRYPTO_VMAC=m | 608 | CONFIG_CRYPTO_VMAC=m |
| 599 | CONFIG_CRYPTO_MICHAEL_MIC=m | 609 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -605,6 +615,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 605 | CONFIG_CRYPTO_SHA3=m | 615 | CONFIG_CRYPTO_SHA3=m |
| 606 | CONFIG_CRYPTO_TGR192=m | 616 | CONFIG_CRYPTO_TGR192=m |
| 607 | CONFIG_CRYPTO_WP512=m | 617 | CONFIG_CRYPTO_WP512=m |
| 618 | CONFIG_CRYPTO_AES_TI=m | ||
| 608 | CONFIG_CRYPTO_ANUBIS=m | 619 | CONFIG_CRYPTO_ANUBIS=m |
| 609 | CONFIG_CRYPTO_BLOWFISH=m | 620 | CONFIG_CRYPTO_BLOWFISH=m |
| 610 | CONFIG_CRYPTO_CAMELLIA=m | 621 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -629,4 +640,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 629 | CONFIG_CRYPTO_USER_API_RNG=m | 640 | CONFIG_CRYPTO_USER_API_RNG=m |
| 630 | CONFIG_CRYPTO_USER_API_AEAD=m | 641 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 631 | # CONFIG_CRYPTO_HW is not set | 642 | # CONFIG_CRYPTO_HW is not set |
| 643 | CONFIG_CRC32_SELFTEST=m | ||
| 632 | CONFIG_XZ_DEC_TEST=m | 644 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index d4de24963f5f..ca91d39555da 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
| @@ -26,6 +26,7 @@ CONFIG_SUN_PARTITION=y | |||
| 26 | # CONFIG_EFI_PARTITION is not set | 26 | # CONFIG_EFI_PARTITION is not set |
| 27 | CONFIG_SYSV68_PARTITION=y | 27 | CONFIG_SYSV68_PARTITION=y |
| 28 | CONFIG_IOSCHED_DEADLINE=m | 28 | CONFIG_IOSCHED_DEADLINE=m |
| 29 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 29 | CONFIG_KEXEC=y | 30 | CONFIG_KEXEC=y |
| 30 | CONFIG_BOOTINFO_PROC=y | 31 | CONFIG_BOOTINFO_PROC=y |
| 31 | CONFIG_M68020=y | 32 | CONFIG_M68020=y |
| @@ -58,6 +59,7 @@ CONFIG_NET_IPVTI=m | |||
| 58 | CONFIG_NET_FOU_IP_TUNNELS=y | 59 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 59 | CONFIG_INET_AH=m | 60 | CONFIG_INET_AH=m |
| 60 | CONFIG_INET_ESP=m | 61 | CONFIG_INET_ESP=m |
| 62 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 61 | CONFIG_INET_IPCOMP=m | 63 | CONFIG_INET_IPCOMP=m |
| 62 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 64 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 63 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 65 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -69,6 +71,7 @@ CONFIG_IPV6=m | |||
| 69 | CONFIG_IPV6_ROUTER_PREF=y | 71 | CONFIG_IPV6_ROUTER_PREF=y |
| 70 | CONFIG_INET6_AH=m | 72 | CONFIG_INET6_AH=m |
| 71 | CONFIG_INET6_ESP=m | 73 | CONFIG_INET6_ESP=m |
| 74 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 72 | CONFIG_INET6_IPCOMP=m | 75 | CONFIG_INET6_IPCOMP=m |
| 73 | CONFIG_IPV6_ILA=m | 76 | CONFIG_IPV6_ILA=m |
| 74 | CONFIG_IPV6_VTI=m | 77 | CONFIG_IPV6_VTI=m |
| @@ -99,6 +102,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 99 | CONFIG_NFT_CT=m | 102 | CONFIG_NFT_CT=m |
| 100 | CONFIG_NFT_SET_RBTREE=m | 103 | CONFIG_NFT_SET_RBTREE=m |
| 101 | CONFIG_NFT_SET_HASH=m | 104 | CONFIG_NFT_SET_HASH=m |
| 105 | CONFIG_NFT_SET_BITMAP=m | ||
| 102 | CONFIG_NFT_COUNTER=m | 106 | CONFIG_NFT_COUNTER=m |
| 103 | CONFIG_NFT_LOG=m | 107 | CONFIG_NFT_LOG=m |
| 104 | CONFIG_NFT_LIMIT=m | 108 | CONFIG_NFT_LIMIT=m |
| @@ -296,6 +300,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 296 | CONFIG_NET_L3_MASTER_DEV=y | 300 | CONFIG_NET_L3_MASTER_DEV=y |
| 297 | CONFIG_AF_KCM=m | 301 | CONFIG_AF_KCM=m |
| 298 | # CONFIG_WIRELESS is not set | 302 | # CONFIG_WIRELESS is not set |
| 303 | CONFIG_PSAMPLE=m | ||
| 304 | CONFIG_NET_IFE=m | ||
| 299 | CONFIG_NET_DEVLINK=m | 305 | CONFIG_NET_DEVLINK=m |
| 300 | # CONFIG_UEVENT_HELPER is not set | 306 | # CONFIG_UEVENT_HELPER is not set |
| 301 | CONFIG_DEVTMPFS=y | 307 | CONFIG_DEVTMPFS=y |
| @@ -353,6 +359,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 353 | CONFIG_MACVLAN=m | 359 | CONFIG_MACVLAN=m |
| 354 | CONFIG_MACVTAP=m | 360 | CONFIG_MACVTAP=m |
| 355 | CONFIG_IPVLAN=m | 361 | CONFIG_IPVLAN=m |
| 362 | CONFIG_IPVTAP=m | ||
| 356 | CONFIG_VXLAN=m | 363 | CONFIG_VXLAN=m |
| 357 | CONFIG_GENEVE=m | 364 | CONFIG_GENEVE=m |
| 358 | CONFIG_GTP=m | 365 | CONFIG_GTP=m |
| @@ -362,6 +369,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y | |||
| 362 | CONFIG_VETH=m | 369 | CONFIG_VETH=m |
| 363 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 370 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 364 | # CONFIG_NET_VENDOR_AMAZON is not set | 371 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 372 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 365 | # CONFIG_NET_VENDOR_ARC is not set | 373 | # CONFIG_NET_VENDOR_ARC is not set |
| 366 | # CONFIG_NET_CADENCE is not set | 374 | # CONFIG_NET_CADENCE is not set |
| 367 | # CONFIG_NET_VENDOR_BROADCOM is not set | 375 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -378,7 +386,6 @@ CONFIG_VETH=m | |||
| 378 | # CONFIG_NET_VENDOR_SEEQ is not set | 386 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 379 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 387 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 380 | # CONFIG_NET_VENDOR_STMICRO is not set | 388 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 381 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 382 | # CONFIG_NET_VENDOR_VIA is not set | 389 | # CONFIG_NET_VENDOR_VIA is not set |
| 383 | # CONFIG_NET_VENDOR_WIZNET is not set | 390 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 384 | CONFIG_PPP=m | 391 | CONFIG_PPP=m |
| @@ -523,6 +530,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 523 | CONFIG_DLM=m | 530 | CONFIG_DLM=m |
| 524 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 531 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 525 | CONFIG_MAGIC_SYSRQ=y | 532 | CONFIG_MAGIC_SYSRQ=y |
| 533 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 534 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 526 | CONFIG_ASYNC_RAID6_TEST=m | 535 | CONFIG_ASYNC_RAID6_TEST=m |
| 527 | CONFIG_TEST_HEXDUMP=m | 536 | CONFIG_TEST_HEXDUMP=m |
| 528 | CONFIG_TEST_STRING_HELPERS=m | 537 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -553,6 +562,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 553 | CONFIG_CRYPTO_LRW=m | 562 | CONFIG_CRYPTO_LRW=m |
| 554 | CONFIG_CRYPTO_PCBC=m | 563 | CONFIG_CRYPTO_PCBC=m |
| 555 | CONFIG_CRYPTO_KEYWRAP=m | 564 | CONFIG_CRYPTO_KEYWRAP=m |
| 565 | CONFIG_CRYPTO_CMAC=m | ||
| 556 | CONFIG_CRYPTO_XCBC=m | 566 | CONFIG_CRYPTO_XCBC=m |
| 557 | CONFIG_CRYPTO_VMAC=m | 567 | CONFIG_CRYPTO_VMAC=m |
| 558 | CONFIG_CRYPTO_MICHAEL_MIC=m | 568 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -564,6 +574,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 564 | CONFIG_CRYPTO_SHA3=m | 574 | CONFIG_CRYPTO_SHA3=m |
| 565 | CONFIG_CRYPTO_TGR192=m | 575 | CONFIG_CRYPTO_TGR192=m |
| 566 | CONFIG_CRYPTO_WP512=m | 576 | CONFIG_CRYPTO_WP512=m |
| 577 | CONFIG_CRYPTO_AES_TI=m | ||
| 567 | CONFIG_CRYPTO_ANUBIS=m | 578 | CONFIG_CRYPTO_ANUBIS=m |
| 568 | CONFIG_CRYPTO_BLOWFISH=m | 579 | CONFIG_CRYPTO_BLOWFISH=m |
| 569 | CONFIG_CRYPTO_CAMELLIA=m | 580 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -588,4 +599,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 588 | CONFIG_CRYPTO_USER_API_RNG=m | 599 | CONFIG_CRYPTO_USER_API_RNG=m |
| 589 | CONFIG_CRYPTO_USER_API_AEAD=m | 600 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 590 | # CONFIG_CRYPTO_HW is not set | 601 | # CONFIG_CRYPTO_HW is not set |
| 602 | CONFIG_CRC32_SELFTEST=m | ||
| 591 | CONFIG_XZ_DEC_TEST=m | 603 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index fc0fd3f871f3..23a3d8a691e2 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
| @@ -25,6 +25,7 @@ CONFIG_SUN_PARTITION=y | |||
| 25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
| 26 | CONFIG_SYSV68_PARTITION=y | 26 | CONFIG_SYSV68_PARTITION=y |
| 27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
| 28 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 28 | CONFIG_KEXEC=y | 29 | CONFIG_KEXEC=y |
| 29 | CONFIG_BOOTINFO_PROC=y | 30 | CONFIG_BOOTINFO_PROC=y |
| 30 | CONFIG_M68020=y | 31 | CONFIG_M68020=y |
| @@ -58,6 +59,7 @@ CONFIG_NET_IPVTI=m | |||
| 58 | CONFIG_NET_FOU_IP_TUNNELS=y | 59 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 59 | CONFIG_INET_AH=m | 60 | CONFIG_INET_AH=m |
| 60 | CONFIG_INET_ESP=m | 61 | CONFIG_INET_ESP=m |
| 62 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 61 | CONFIG_INET_IPCOMP=m | 63 | CONFIG_INET_IPCOMP=m |
| 62 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 64 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 63 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 65 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -69,6 +71,7 @@ CONFIG_IPV6=m | |||
| 69 | CONFIG_IPV6_ROUTER_PREF=y | 71 | CONFIG_IPV6_ROUTER_PREF=y |
| 70 | CONFIG_INET6_AH=m | 72 | CONFIG_INET6_AH=m |
| 71 | CONFIG_INET6_ESP=m | 73 | CONFIG_INET6_ESP=m |
| 74 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 72 | CONFIG_INET6_IPCOMP=m | 75 | CONFIG_INET6_IPCOMP=m |
| 73 | CONFIG_IPV6_ILA=m | 76 | CONFIG_IPV6_ILA=m |
| 74 | CONFIG_IPV6_VTI=m | 77 | CONFIG_IPV6_VTI=m |
| @@ -99,6 +102,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 99 | CONFIG_NFT_CT=m | 102 | CONFIG_NFT_CT=m |
| 100 | CONFIG_NFT_SET_RBTREE=m | 103 | CONFIG_NFT_SET_RBTREE=m |
| 101 | CONFIG_NFT_SET_HASH=m | 104 | CONFIG_NFT_SET_HASH=m |
| 105 | CONFIG_NFT_SET_BITMAP=m | ||
| 102 | CONFIG_NFT_COUNTER=m | 106 | CONFIG_NFT_COUNTER=m |
| 103 | CONFIG_NFT_LOG=m | 107 | CONFIG_NFT_LOG=m |
| 104 | CONFIG_NFT_LIMIT=m | 108 | CONFIG_NFT_LIMIT=m |
| @@ -296,6 +300,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 296 | CONFIG_NET_L3_MASTER_DEV=y | 300 | CONFIG_NET_L3_MASTER_DEV=y |
| 297 | CONFIG_AF_KCM=m | 301 | CONFIG_AF_KCM=m |
| 298 | # CONFIG_WIRELESS is not set | 302 | # CONFIG_WIRELESS is not set |
| 303 | CONFIG_PSAMPLE=m | ||
| 304 | CONFIG_NET_IFE=m | ||
| 299 | CONFIG_NET_DEVLINK=m | 305 | CONFIG_NET_DEVLINK=m |
| 300 | # CONFIG_UEVENT_HELPER is not set | 306 | # CONFIG_UEVENT_HELPER is not set |
| 301 | CONFIG_DEVTMPFS=y | 307 | CONFIG_DEVTMPFS=y |
| @@ -362,6 +368,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 362 | CONFIG_MACVLAN=m | 368 | CONFIG_MACVLAN=m |
| 363 | CONFIG_MACVTAP=m | 369 | CONFIG_MACVTAP=m |
| 364 | CONFIG_IPVLAN=m | 370 | CONFIG_IPVLAN=m |
| 371 | CONFIG_IPVTAP=m | ||
| 365 | CONFIG_VXLAN=m | 372 | CONFIG_VXLAN=m |
| 366 | CONFIG_GENEVE=m | 373 | CONFIG_GENEVE=m |
| 367 | CONFIG_GTP=m | 374 | CONFIG_GTP=m |
| @@ -372,6 +379,7 @@ CONFIG_VETH=m | |||
| 372 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 379 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 373 | # CONFIG_NET_VENDOR_AMAZON is not set | 380 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 374 | CONFIG_ATARILANCE=y | 381 | CONFIG_ATARILANCE=y |
| 382 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 375 | # CONFIG_NET_VENDOR_ARC is not set | 383 | # CONFIG_NET_VENDOR_ARC is not set |
| 376 | # CONFIG_NET_CADENCE is not set | 384 | # CONFIG_NET_CADENCE is not set |
| 377 | # CONFIG_NET_VENDOR_BROADCOM is not set | 385 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -389,7 +397,6 @@ CONFIG_NE2000=y | |||
| 389 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 397 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 390 | CONFIG_SMC91X=y | 398 | CONFIG_SMC91X=y |
| 391 | # CONFIG_NET_VENDOR_STMICRO is not set | 399 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 392 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 393 | # CONFIG_NET_VENDOR_VIA is not set | 400 | # CONFIG_NET_VENDOR_VIA is not set |
| 394 | # CONFIG_NET_VENDOR_WIZNET is not set | 401 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 395 | CONFIG_PPP=m | 402 | CONFIG_PPP=m |
| @@ -544,6 +551,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 544 | CONFIG_DLM=m | 551 | CONFIG_DLM=m |
| 545 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 552 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 546 | CONFIG_MAGIC_SYSRQ=y | 553 | CONFIG_MAGIC_SYSRQ=y |
| 554 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 555 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 547 | CONFIG_ASYNC_RAID6_TEST=m | 556 | CONFIG_ASYNC_RAID6_TEST=m |
| 548 | CONFIG_TEST_HEXDUMP=m | 557 | CONFIG_TEST_HEXDUMP=m |
| 549 | CONFIG_TEST_STRING_HELPERS=m | 558 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -574,6 +583,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 574 | CONFIG_CRYPTO_LRW=m | 583 | CONFIG_CRYPTO_LRW=m |
| 575 | CONFIG_CRYPTO_PCBC=m | 584 | CONFIG_CRYPTO_PCBC=m |
| 576 | CONFIG_CRYPTO_KEYWRAP=m | 585 | CONFIG_CRYPTO_KEYWRAP=m |
| 586 | CONFIG_CRYPTO_CMAC=m | ||
| 577 | CONFIG_CRYPTO_XCBC=m | 587 | CONFIG_CRYPTO_XCBC=m |
| 578 | CONFIG_CRYPTO_VMAC=m | 588 | CONFIG_CRYPTO_VMAC=m |
| 579 | CONFIG_CRYPTO_MICHAEL_MIC=m | 589 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -585,6 +595,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 585 | CONFIG_CRYPTO_SHA3=m | 595 | CONFIG_CRYPTO_SHA3=m |
| 586 | CONFIG_CRYPTO_TGR192=m | 596 | CONFIG_CRYPTO_TGR192=m |
| 587 | CONFIG_CRYPTO_WP512=m | 597 | CONFIG_CRYPTO_WP512=m |
| 598 | CONFIG_CRYPTO_AES_TI=m | ||
| 588 | CONFIG_CRYPTO_ANUBIS=m | 599 | CONFIG_CRYPTO_ANUBIS=m |
| 589 | CONFIG_CRYPTO_BLOWFISH=m | 600 | CONFIG_CRYPTO_BLOWFISH=m |
| 590 | CONFIG_CRYPTO_CAMELLIA=m | 601 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -609,4 +620,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 609 | CONFIG_CRYPTO_USER_API_RNG=m | 620 | CONFIG_CRYPTO_USER_API_RNG=m |
| 610 | CONFIG_CRYPTO_USER_API_AEAD=m | 621 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 611 | # CONFIG_CRYPTO_HW is not set | 622 | # CONFIG_CRYPTO_HW is not set |
| 623 | CONFIG_CRC32_SELFTEST=m | ||
| 612 | CONFIG_XZ_DEC_TEST=m | 624 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 52e984a0aa69..95deb95140fe 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
| @@ -25,6 +25,7 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
| 25 | CONFIG_SUN_PARTITION=y | 25 | CONFIG_SUN_PARTITION=y |
| 26 | # CONFIG_EFI_PARTITION is not set | 26 | # CONFIG_EFI_PARTITION is not set |
| 27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
| 28 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 28 | CONFIG_KEXEC=y | 29 | CONFIG_KEXEC=y |
| 29 | CONFIG_BOOTINFO_PROC=y | 30 | CONFIG_BOOTINFO_PROC=y |
| 30 | CONFIG_M68040=y | 31 | CONFIG_M68040=y |
| @@ -56,6 +57,7 @@ CONFIG_NET_IPVTI=m | |||
| 56 | CONFIG_NET_FOU_IP_TUNNELS=y | 57 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 57 | CONFIG_INET_AH=m | 58 | CONFIG_INET_AH=m |
| 58 | CONFIG_INET_ESP=m | 59 | CONFIG_INET_ESP=m |
| 60 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 59 | CONFIG_INET_IPCOMP=m | 61 | CONFIG_INET_IPCOMP=m |
| 60 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 62 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 61 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 63 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -67,6 +69,7 @@ CONFIG_IPV6=m | |||
| 67 | CONFIG_IPV6_ROUTER_PREF=y | 69 | CONFIG_IPV6_ROUTER_PREF=y |
| 68 | CONFIG_INET6_AH=m | 70 | CONFIG_INET6_AH=m |
| 69 | CONFIG_INET6_ESP=m | 71 | CONFIG_INET6_ESP=m |
| 72 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 70 | CONFIG_INET6_IPCOMP=m | 73 | CONFIG_INET6_IPCOMP=m |
| 71 | CONFIG_IPV6_ILA=m | 74 | CONFIG_IPV6_ILA=m |
| 72 | CONFIG_IPV6_VTI=m | 75 | CONFIG_IPV6_VTI=m |
| @@ -97,6 +100,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 97 | CONFIG_NFT_CT=m | 100 | CONFIG_NFT_CT=m |
| 98 | CONFIG_NFT_SET_RBTREE=m | 101 | CONFIG_NFT_SET_RBTREE=m |
| 99 | CONFIG_NFT_SET_HASH=m | 102 | CONFIG_NFT_SET_HASH=m |
| 103 | CONFIG_NFT_SET_BITMAP=m | ||
| 100 | CONFIG_NFT_COUNTER=m | 104 | CONFIG_NFT_COUNTER=m |
| 101 | CONFIG_NFT_LOG=m | 105 | CONFIG_NFT_LOG=m |
| 102 | CONFIG_NFT_LIMIT=m | 106 | CONFIG_NFT_LIMIT=m |
| @@ -294,6 +298,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 294 | CONFIG_NET_L3_MASTER_DEV=y | 298 | CONFIG_NET_L3_MASTER_DEV=y |
| 295 | CONFIG_AF_KCM=m | 299 | CONFIG_AF_KCM=m |
| 296 | # CONFIG_WIRELESS is not set | 300 | # CONFIG_WIRELESS is not set |
| 301 | CONFIG_PSAMPLE=m | ||
| 302 | CONFIG_NET_IFE=m | ||
| 297 | CONFIG_NET_DEVLINK=m | 303 | CONFIG_NET_DEVLINK=m |
| 298 | # CONFIG_UEVENT_HELPER is not set | 304 | # CONFIG_UEVENT_HELPER is not set |
| 299 | CONFIG_DEVTMPFS=y | 305 | CONFIG_DEVTMPFS=y |
| @@ -352,6 +358,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 352 | CONFIG_MACVLAN=m | 358 | CONFIG_MACVLAN=m |
| 353 | CONFIG_MACVTAP=m | 359 | CONFIG_MACVTAP=m |
| 354 | CONFIG_IPVLAN=m | 360 | CONFIG_IPVLAN=m |
| 361 | CONFIG_IPVTAP=m | ||
| 355 | CONFIG_VXLAN=m | 362 | CONFIG_VXLAN=m |
| 356 | CONFIG_GENEVE=m | 363 | CONFIG_GENEVE=m |
| 357 | CONFIG_GTP=m | 364 | CONFIG_GTP=m |
| @@ -361,6 +368,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y | |||
| 361 | CONFIG_VETH=m | 368 | CONFIG_VETH=m |
| 362 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 369 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 363 | # CONFIG_NET_VENDOR_AMAZON is not set | 370 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 371 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 364 | # CONFIG_NET_VENDOR_ARC is not set | 372 | # CONFIG_NET_VENDOR_ARC is not set |
| 365 | # CONFIG_NET_CADENCE is not set | 373 | # CONFIG_NET_CADENCE is not set |
| 366 | # CONFIG_NET_VENDOR_BROADCOM is not set | 374 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -377,7 +385,6 @@ CONFIG_BVME6000_NET=y | |||
| 377 | # CONFIG_NET_VENDOR_SEEQ is not set | 385 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 378 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 386 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 379 | # CONFIG_NET_VENDOR_STMICRO is not set | 387 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 380 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 381 | # CONFIG_NET_VENDOR_VIA is not set | 388 | # CONFIG_NET_VENDOR_VIA is not set |
| 382 | # CONFIG_NET_VENDOR_WIZNET is not set | 389 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 383 | CONFIG_PPP=m | 390 | CONFIG_PPP=m |
| @@ -515,6 +522,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 515 | CONFIG_DLM=m | 522 | CONFIG_DLM=m |
| 516 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 523 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 517 | CONFIG_MAGIC_SYSRQ=y | 524 | CONFIG_MAGIC_SYSRQ=y |
| 525 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 526 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 518 | CONFIG_ASYNC_RAID6_TEST=m | 527 | CONFIG_ASYNC_RAID6_TEST=m |
| 519 | CONFIG_TEST_HEXDUMP=m | 528 | CONFIG_TEST_HEXDUMP=m |
| 520 | CONFIG_TEST_STRING_HELPERS=m | 529 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -545,6 +554,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 545 | CONFIG_CRYPTO_LRW=m | 554 | CONFIG_CRYPTO_LRW=m |
| 546 | CONFIG_CRYPTO_PCBC=m | 555 | CONFIG_CRYPTO_PCBC=m |
| 547 | CONFIG_CRYPTO_KEYWRAP=m | 556 | CONFIG_CRYPTO_KEYWRAP=m |
| 557 | CONFIG_CRYPTO_CMAC=m | ||
| 548 | CONFIG_CRYPTO_XCBC=m | 558 | CONFIG_CRYPTO_XCBC=m |
| 549 | CONFIG_CRYPTO_VMAC=m | 559 | CONFIG_CRYPTO_VMAC=m |
| 550 | CONFIG_CRYPTO_MICHAEL_MIC=m | 560 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -556,6 +566,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 556 | CONFIG_CRYPTO_SHA3=m | 566 | CONFIG_CRYPTO_SHA3=m |
| 557 | CONFIG_CRYPTO_TGR192=m | 567 | CONFIG_CRYPTO_TGR192=m |
| 558 | CONFIG_CRYPTO_WP512=m | 568 | CONFIG_CRYPTO_WP512=m |
| 569 | CONFIG_CRYPTO_AES_TI=m | ||
| 559 | CONFIG_CRYPTO_ANUBIS=m | 570 | CONFIG_CRYPTO_ANUBIS=m |
| 560 | CONFIG_CRYPTO_BLOWFISH=m | 571 | CONFIG_CRYPTO_BLOWFISH=m |
| 561 | CONFIG_CRYPTO_CAMELLIA=m | 572 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -580,4 +591,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 580 | CONFIG_CRYPTO_USER_API_RNG=m | 591 | CONFIG_CRYPTO_USER_API_RNG=m |
| 581 | CONFIG_CRYPTO_USER_API_AEAD=m | 592 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 582 | # CONFIG_CRYPTO_HW is not set | 593 | # CONFIG_CRYPTO_HW is not set |
| 594 | CONFIG_CRC32_SELFTEST=m | ||
| 583 | CONFIG_XZ_DEC_TEST=m | 595 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index aaeed4422cc9..afae6958db2d 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
| @@ -26,6 +26,7 @@ CONFIG_SUN_PARTITION=y | |||
| 26 | # CONFIG_EFI_PARTITION is not set | 26 | # CONFIG_EFI_PARTITION is not set |
| 27 | CONFIG_SYSV68_PARTITION=y | 27 | CONFIG_SYSV68_PARTITION=y |
| 28 | CONFIG_IOSCHED_DEADLINE=m | 28 | CONFIG_IOSCHED_DEADLINE=m |
| 29 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 29 | CONFIG_KEXEC=y | 30 | CONFIG_KEXEC=y |
| 30 | CONFIG_BOOTINFO_PROC=y | 31 | CONFIG_BOOTINFO_PROC=y |
| 31 | CONFIG_M68020=y | 32 | CONFIG_M68020=y |
| @@ -58,6 +59,7 @@ CONFIG_NET_IPVTI=m | |||
| 58 | CONFIG_NET_FOU_IP_TUNNELS=y | 59 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 59 | CONFIG_INET_AH=m | 60 | CONFIG_INET_AH=m |
| 60 | CONFIG_INET_ESP=m | 61 | CONFIG_INET_ESP=m |
| 62 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 61 | CONFIG_INET_IPCOMP=m | 63 | CONFIG_INET_IPCOMP=m |
| 62 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 64 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 63 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 65 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -69,6 +71,7 @@ CONFIG_IPV6=m | |||
| 69 | CONFIG_IPV6_ROUTER_PREF=y | 71 | CONFIG_IPV6_ROUTER_PREF=y |
| 70 | CONFIG_INET6_AH=m | 72 | CONFIG_INET6_AH=m |
| 71 | CONFIG_INET6_ESP=m | 73 | CONFIG_INET6_ESP=m |
| 74 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 72 | CONFIG_INET6_IPCOMP=m | 75 | CONFIG_INET6_IPCOMP=m |
| 73 | CONFIG_IPV6_ILA=m | 76 | CONFIG_IPV6_ILA=m |
| 74 | CONFIG_IPV6_VTI=m | 77 | CONFIG_IPV6_VTI=m |
| @@ -99,6 +102,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 99 | CONFIG_NFT_CT=m | 102 | CONFIG_NFT_CT=m |
| 100 | CONFIG_NFT_SET_RBTREE=m | 103 | CONFIG_NFT_SET_RBTREE=m |
| 101 | CONFIG_NFT_SET_HASH=m | 104 | CONFIG_NFT_SET_HASH=m |
| 105 | CONFIG_NFT_SET_BITMAP=m | ||
| 102 | CONFIG_NFT_COUNTER=m | 106 | CONFIG_NFT_COUNTER=m |
| 103 | CONFIG_NFT_LOG=m | 107 | CONFIG_NFT_LOG=m |
| 104 | CONFIG_NFT_LIMIT=m | 108 | CONFIG_NFT_LIMIT=m |
| @@ -296,6 +300,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 296 | CONFIG_NET_L3_MASTER_DEV=y | 300 | CONFIG_NET_L3_MASTER_DEV=y |
| 297 | CONFIG_AF_KCM=m | 301 | CONFIG_AF_KCM=m |
| 298 | # CONFIG_WIRELESS is not set | 302 | # CONFIG_WIRELESS is not set |
| 303 | CONFIG_PSAMPLE=m | ||
| 304 | CONFIG_NET_IFE=m | ||
| 299 | CONFIG_NET_DEVLINK=m | 305 | CONFIG_NET_DEVLINK=m |
| 300 | # CONFIG_UEVENT_HELPER is not set | 306 | # CONFIG_UEVENT_HELPER is not set |
| 301 | CONFIG_DEVTMPFS=y | 307 | CONFIG_DEVTMPFS=y |
| @@ -353,6 +359,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 353 | CONFIG_MACVLAN=m | 359 | CONFIG_MACVLAN=m |
| 354 | CONFIG_MACVTAP=m | 360 | CONFIG_MACVTAP=m |
| 355 | CONFIG_IPVLAN=m | 361 | CONFIG_IPVLAN=m |
| 362 | CONFIG_IPVTAP=m | ||
| 356 | CONFIG_VXLAN=m | 363 | CONFIG_VXLAN=m |
| 357 | CONFIG_GENEVE=m | 364 | CONFIG_GENEVE=m |
| 358 | CONFIG_GTP=m | 365 | CONFIG_GTP=m |
| @@ -363,6 +370,7 @@ CONFIG_VETH=m | |||
| 363 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 370 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 364 | # CONFIG_NET_VENDOR_AMAZON is not set | 371 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 365 | CONFIG_HPLANCE=y | 372 | CONFIG_HPLANCE=y |
| 373 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 366 | # CONFIG_NET_VENDOR_ARC is not set | 374 | # CONFIG_NET_VENDOR_ARC is not set |
| 367 | # CONFIG_NET_CADENCE is not set | 375 | # CONFIG_NET_CADENCE is not set |
| 368 | # CONFIG_NET_VENDOR_BROADCOM is not set | 376 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -379,7 +387,6 @@ CONFIG_HPLANCE=y | |||
| 379 | # CONFIG_NET_VENDOR_SEEQ is not set | 387 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 380 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 388 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 381 | # CONFIG_NET_VENDOR_STMICRO is not set | 389 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 382 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 383 | # CONFIG_NET_VENDOR_VIA is not set | 390 | # CONFIG_NET_VENDOR_VIA is not set |
| 384 | # CONFIG_NET_VENDOR_WIZNET is not set | 391 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 385 | CONFIG_PPP=m | 392 | CONFIG_PPP=m |
| @@ -525,6 +532,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 525 | CONFIG_DLM=m | 532 | CONFIG_DLM=m |
| 526 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 533 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 527 | CONFIG_MAGIC_SYSRQ=y | 534 | CONFIG_MAGIC_SYSRQ=y |
| 535 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 536 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 528 | CONFIG_ASYNC_RAID6_TEST=m | 537 | CONFIG_ASYNC_RAID6_TEST=m |
| 529 | CONFIG_TEST_HEXDUMP=m | 538 | CONFIG_TEST_HEXDUMP=m |
| 530 | CONFIG_TEST_STRING_HELPERS=m | 539 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -555,6 +564,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 555 | CONFIG_CRYPTO_LRW=m | 564 | CONFIG_CRYPTO_LRW=m |
| 556 | CONFIG_CRYPTO_PCBC=m | 565 | CONFIG_CRYPTO_PCBC=m |
| 557 | CONFIG_CRYPTO_KEYWRAP=m | 566 | CONFIG_CRYPTO_KEYWRAP=m |
| 567 | CONFIG_CRYPTO_CMAC=m | ||
| 558 | CONFIG_CRYPTO_XCBC=m | 568 | CONFIG_CRYPTO_XCBC=m |
| 559 | CONFIG_CRYPTO_VMAC=m | 569 | CONFIG_CRYPTO_VMAC=m |
| 560 | CONFIG_CRYPTO_MICHAEL_MIC=m | 570 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -566,6 +576,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 566 | CONFIG_CRYPTO_SHA3=m | 576 | CONFIG_CRYPTO_SHA3=m |
| 567 | CONFIG_CRYPTO_TGR192=m | 577 | CONFIG_CRYPTO_TGR192=m |
| 568 | CONFIG_CRYPTO_WP512=m | 578 | CONFIG_CRYPTO_WP512=m |
| 579 | CONFIG_CRYPTO_AES_TI=m | ||
| 569 | CONFIG_CRYPTO_ANUBIS=m | 580 | CONFIG_CRYPTO_ANUBIS=m |
| 570 | CONFIG_CRYPTO_BLOWFISH=m | 581 | CONFIG_CRYPTO_BLOWFISH=m |
| 571 | CONFIG_CRYPTO_CAMELLIA=m | 582 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -590,4 +601,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 590 | CONFIG_CRYPTO_USER_API_RNG=m | 601 | CONFIG_CRYPTO_USER_API_RNG=m |
| 591 | CONFIG_CRYPTO_USER_API_AEAD=m | 602 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 592 | # CONFIG_CRYPTO_HW is not set | 603 | # CONFIG_CRYPTO_HW is not set |
| 604 | CONFIG_CRC32_SELFTEST=m | ||
| 593 | CONFIG_XZ_DEC_TEST=m | 605 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 3bbc9b2f0dac..b010734729a7 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
| @@ -25,6 +25,7 @@ CONFIG_SUN_PARTITION=y | |||
| 25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
| 26 | CONFIG_SYSV68_PARTITION=y | 26 | CONFIG_SYSV68_PARTITION=y |
| 27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
| 28 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 28 | CONFIG_KEXEC=y | 29 | CONFIG_KEXEC=y |
| 29 | CONFIG_BOOTINFO_PROC=y | 30 | CONFIG_BOOTINFO_PROC=y |
| 30 | CONFIG_M68020=y | 31 | CONFIG_M68020=y |
| @@ -57,6 +58,7 @@ CONFIG_NET_IPVTI=m | |||
| 57 | CONFIG_NET_FOU_IP_TUNNELS=y | 58 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 58 | CONFIG_INET_AH=m | 59 | CONFIG_INET_AH=m |
| 59 | CONFIG_INET_ESP=m | 60 | CONFIG_INET_ESP=m |
| 61 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 60 | CONFIG_INET_IPCOMP=m | 62 | CONFIG_INET_IPCOMP=m |
| 61 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 63 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 62 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 64 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -68,6 +70,7 @@ CONFIG_IPV6=m | |||
| 68 | CONFIG_IPV6_ROUTER_PREF=y | 70 | CONFIG_IPV6_ROUTER_PREF=y |
| 69 | CONFIG_INET6_AH=m | 71 | CONFIG_INET6_AH=m |
| 70 | CONFIG_INET6_ESP=m | 72 | CONFIG_INET6_ESP=m |
| 73 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 71 | CONFIG_INET6_IPCOMP=m | 74 | CONFIG_INET6_IPCOMP=m |
| 72 | CONFIG_IPV6_ILA=m | 75 | CONFIG_IPV6_ILA=m |
| 73 | CONFIG_IPV6_VTI=m | 76 | CONFIG_IPV6_VTI=m |
| @@ -98,6 +101,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 98 | CONFIG_NFT_CT=m | 101 | CONFIG_NFT_CT=m |
| 99 | CONFIG_NFT_SET_RBTREE=m | 102 | CONFIG_NFT_SET_RBTREE=m |
| 100 | CONFIG_NFT_SET_HASH=m | 103 | CONFIG_NFT_SET_HASH=m |
| 104 | CONFIG_NFT_SET_BITMAP=m | ||
| 101 | CONFIG_NFT_COUNTER=m | 105 | CONFIG_NFT_COUNTER=m |
| 102 | CONFIG_NFT_LOG=m | 106 | CONFIG_NFT_LOG=m |
| 103 | CONFIG_NFT_LIMIT=m | 107 | CONFIG_NFT_LIMIT=m |
| @@ -298,6 +302,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 298 | CONFIG_NET_L3_MASTER_DEV=y | 302 | CONFIG_NET_L3_MASTER_DEV=y |
| 299 | CONFIG_AF_KCM=m | 303 | CONFIG_AF_KCM=m |
| 300 | # CONFIG_WIRELESS is not set | 304 | # CONFIG_WIRELESS is not set |
| 305 | CONFIG_PSAMPLE=m | ||
| 306 | CONFIG_NET_IFE=m | ||
| 301 | CONFIG_NET_DEVLINK=m | 307 | CONFIG_NET_DEVLINK=m |
| 302 | # CONFIG_UEVENT_HELPER is not set | 308 | # CONFIG_UEVENT_HELPER is not set |
| 303 | CONFIG_DEVTMPFS=y | 309 | CONFIG_DEVTMPFS=y |
| @@ -369,6 +375,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 369 | CONFIG_MACVLAN=m | 375 | CONFIG_MACVLAN=m |
| 370 | CONFIG_MACVTAP=m | 376 | CONFIG_MACVTAP=m |
| 371 | CONFIG_IPVLAN=m | 377 | CONFIG_IPVLAN=m |
| 378 | CONFIG_IPVTAP=m | ||
| 372 | CONFIG_VXLAN=m | 379 | CONFIG_VXLAN=m |
| 373 | CONFIG_GENEVE=m | 380 | CONFIG_GENEVE=m |
| 374 | CONFIG_GTP=m | 381 | CONFIG_GTP=m |
| @@ -379,6 +386,7 @@ CONFIG_VETH=m | |||
| 379 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 386 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 380 | # CONFIG_NET_VENDOR_AMAZON is not set | 387 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 381 | CONFIG_MACMACE=y | 388 | CONFIG_MACMACE=y |
| 389 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 382 | # CONFIG_NET_VENDOR_ARC is not set | 390 | # CONFIG_NET_VENDOR_ARC is not set |
| 383 | # CONFIG_NET_CADENCE is not set | 391 | # CONFIG_NET_CADENCE is not set |
| 384 | # CONFIG_NET_VENDOR_BROADCOM is not set | 392 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -398,7 +406,6 @@ CONFIG_MAC8390=y | |||
| 398 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 406 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 399 | # CONFIG_NET_VENDOR_SMSC is not set | 407 | # CONFIG_NET_VENDOR_SMSC is not set |
| 400 | # CONFIG_NET_VENDOR_STMICRO is not set | 408 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 401 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 402 | # CONFIG_NET_VENDOR_VIA is not set | 409 | # CONFIG_NET_VENDOR_VIA is not set |
| 403 | # CONFIG_NET_VENDOR_WIZNET is not set | 410 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 404 | CONFIG_PPP=m | 411 | CONFIG_PPP=m |
| @@ -547,6 +554,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 547 | CONFIG_DLM=m | 554 | CONFIG_DLM=m |
| 548 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 555 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 549 | CONFIG_MAGIC_SYSRQ=y | 556 | CONFIG_MAGIC_SYSRQ=y |
| 557 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 558 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 550 | CONFIG_ASYNC_RAID6_TEST=m | 559 | CONFIG_ASYNC_RAID6_TEST=m |
| 551 | CONFIG_TEST_HEXDUMP=m | 560 | CONFIG_TEST_HEXDUMP=m |
| 552 | CONFIG_TEST_STRING_HELPERS=m | 561 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -577,6 +586,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 577 | CONFIG_CRYPTO_LRW=m | 586 | CONFIG_CRYPTO_LRW=m |
| 578 | CONFIG_CRYPTO_PCBC=m | 587 | CONFIG_CRYPTO_PCBC=m |
| 579 | CONFIG_CRYPTO_KEYWRAP=m | 588 | CONFIG_CRYPTO_KEYWRAP=m |
| 589 | CONFIG_CRYPTO_CMAC=m | ||
| 580 | CONFIG_CRYPTO_XCBC=m | 590 | CONFIG_CRYPTO_XCBC=m |
| 581 | CONFIG_CRYPTO_VMAC=m | 591 | CONFIG_CRYPTO_VMAC=m |
| 582 | CONFIG_CRYPTO_MICHAEL_MIC=m | 592 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -588,6 +598,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 588 | CONFIG_CRYPTO_SHA3=m | 598 | CONFIG_CRYPTO_SHA3=m |
| 589 | CONFIG_CRYPTO_TGR192=m | 599 | CONFIG_CRYPTO_TGR192=m |
| 590 | CONFIG_CRYPTO_WP512=m | 600 | CONFIG_CRYPTO_WP512=m |
| 601 | CONFIG_CRYPTO_AES_TI=m | ||
| 591 | CONFIG_CRYPTO_ANUBIS=m | 602 | CONFIG_CRYPTO_ANUBIS=m |
| 592 | CONFIG_CRYPTO_BLOWFISH=m | 603 | CONFIG_CRYPTO_BLOWFISH=m |
| 593 | CONFIG_CRYPTO_CAMELLIA=m | 604 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -612,4 +623,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 612 | CONFIG_CRYPTO_USER_API_RNG=m | 623 | CONFIG_CRYPTO_USER_API_RNG=m |
| 613 | CONFIG_CRYPTO_USER_API_AEAD=m | 624 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 614 | # CONFIG_CRYPTO_HW is not set | 625 | # CONFIG_CRYPTO_HW is not set |
| 626 | CONFIG_CRC32_SELFTEST=m | ||
| 615 | CONFIG_XZ_DEC_TEST=m | 627 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 8f2c0decb2f8..0e414549b235 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
| @@ -21,6 +21,7 @@ CONFIG_SOLARIS_X86_PARTITION=y | |||
| 21 | CONFIG_UNIXWARE_DISKLABEL=y | 21 | CONFIG_UNIXWARE_DISKLABEL=y |
| 22 | # CONFIG_EFI_PARTITION is not set | 22 | # CONFIG_EFI_PARTITION is not set |
| 23 | CONFIG_IOSCHED_DEADLINE=m | 23 | CONFIG_IOSCHED_DEADLINE=m |
| 24 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 24 | CONFIG_KEXEC=y | 25 | CONFIG_KEXEC=y |
| 25 | CONFIG_BOOTINFO_PROC=y | 26 | CONFIG_BOOTINFO_PROC=y |
| 26 | CONFIG_M68020=y | 27 | CONFIG_M68020=y |
| @@ -67,6 +68,7 @@ CONFIG_NET_IPVTI=m | |||
| 67 | CONFIG_NET_FOU_IP_TUNNELS=y | 68 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 68 | CONFIG_INET_AH=m | 69 | CONFIG_INET_AH=m |
| 69 | CONFIG_INET_ESP=m | 70 | CONFIG_INET_ESP=m |
| 71 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 70 | CONFIG_INET_IPCOMP=m | 72 | CONFIG_INET_IPCOMP=m |
| 71 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 73 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 72 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 74 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -78,6 +80,7 @@ CONFIG_IPV6=m | |||
| 78 | CONFIG_IPV6_ROUTER_PREF=y | 80 | CONFIG_IPV6_ROUTER_PREF=y |
| 79 | CONFIG_INET6_AH=m | 81 | CONFIG_INET6_AH=m |
| 80 | CONFIG_INET6_ESP=m | 82 | CONFIG_INET6_ESP=m |
| 83 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 81 | CONFIG_INET6_IPCOMP=m | 84 | CONFIG_INET6_IPCOMP=m |
| 82 | CONFIG_IPV6_ILA=m | 85 | CONFIG_IPV6_ILA=m |
| 83 | CONFIG_IPV6_VTI=m | 86 | CONFIG_IPV6_VTI=m |
| @@ -108,6 +111,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 108 | CONFIG_NFT_CT=m | 111 | CONFIG_NFT_CT=m |
| 109 | CONFIG_NFT_SET_RBTREE=m | 112 | CONFIG_NFT_SET_RBTREE=m |
| 110 | CONFIG_NFT_SET_HASH=m | 113 | CONFIG_NFT_SET_HASH=m |
| 114 | CONFIG_NFT_SET_BITMAP=m | ||
| 111 | CONFIG_NFT_COUNTER=m | 115 | CONFIG_NFT_COUNTER=m |
| 112 | CONFIG_NFT_LOG=m | 116 | CONFIG_NFT_LOG=m |
| 113 | CONFIG_NFT_LIMIT=m | 117 | CONFIG_NFT_LIMIT=m |
| @@ -308,6 +312,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 308 | CONFIG_NET_L3_MASTER_DEV=y | 312 | CONFIG_NET_L3_MASTER_DEV=y |
| 309 | CONFIG_AF_KCM=m | 313 | CONFIG_AF_KCM=m |
| 310 | # CONFIG_WIRELESS is not set | 314 | # CONFIG_WIRELESS is not set |
| 315 | CONFIG_PSAMPLE=m | ||
| 316 | CONFIG_NET_IFE=m | ||
| 311 | CONFIG_NET_DEVLINK=m | 317 | CONFIG_NET_DEVLINK=m |
| 312 | # CONFIG_UEVENT_HELPER is not set | 318 | # CONFIG_UEVENT_HELPER is not set |
| 313 | CONFIG_DEVTMPFS=y | 319 | CONFIG_DEVTMPFS=y |
| @@ -402,6 +408,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 402 | CONFIG_MACVLAN=m | 408 | CONFIG_MACVLAN=m |
| 403 | CONFIG_MACVTAP=m | 409 | CONFIG_MACVTAP=m |
| 404 | CONFIG_IPVLAN=m | 410 | CONFIG_IPVLAN=m |
| 411 | CONFIG_IPVTAP=m | ||
| 405 | CONFIG_VXLAN=m | 412 | CONFIG_VXLAN=m |
| 406 | CONFIG_GENEVE=m | 413 | CONFIG_GENEVE=m |
| 407 | CONFIG_GTP=m | 414 | CONFIG_GTP=m |
| @@ -419,6 +426,7 @@ CONFIG_HPLANCE=y | |||
| 419 | CONFIG_MVME147_NET=y | 426 | CONFIG_MVME147_NET=y |
| 420 | CONFIG_SUN3LANCE=y | 427 | CONFIG_SUN3LANCE=y |
| 421 | CONFIG_MACMACE=y | 428 | CONFIG_MACMACE=y |
| 429 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 422 | # CONFIG_NET_VENDOR_ARC is not set | 430 | # CONFIG_NET_VENDOR_ARC is not set |
| 423 | # CONFIG_NET_CADENCE is not set | 431 | # CONFIG_NET_CADENCE is not set |
| 424 | # CONFIG_NET_VENDOR_BROADCOM is not set | 432 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -444,7 +452,6 @@ CONFIG_ZORRO8390=y | |||
| 444 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 452 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 445 | CONFIG_SMC91X=y | 453 | CONFIG_SMC91X=y |
| 446 | # CONFIG_NET_VENDOR_STMICRO is not set | 454 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 447 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 448 | # CONFIG_NET_VENDOR_VIA is not set | 455 | # CONFIG_NET_VENDOR_VIA is not set |
| 449 | # CONFIG_NET_VENDOR_WIZNET is not set | 456 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 450 | CONFIG_PLIP=m | 457 | CONFIG_PLIP=m |
| @@ -627,6 +634,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 627 | CONFIG_DLM=m | 634 | CONFIG_DLM=m |
| 628 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 635 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 629 | CONFIG_MAGIC_SYSRQ=y | 636 | CONFIG_MAGIC_SYSRQ=y |
| 637 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 638 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 630 | CONFIG_ASYNC_RAID6_TEST=m | 639 | CONFIG_ASYNC_RAID6_TEST=m |
| 631 | CONFIG_TEST_HEXDUMP=m | 640 | CONFIG_TEST_HEXDUMP=m |
| 632 | CONFIG_TEST_STRING_HELPERS=m | 641 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -657,6 +666,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 657 | CONFIG_CRYPTO_LRW=m | 666 | CONFIG_CRYPTO_LRW=m |
| 658 | CONFIG_CRYPTO_PCBC=m | 667 | CONFIG_CRYPTO_PCBC=m |
| 659 | CONFIG_CRYPTO_KEYWRAP=m | 668 | CONFIG_CRYPTO_KEYWRAP=m |
| 669 | CONFIG_CRYPTO_CMAC=m | ||
| 660 | CONFIG_CRYPTO_XCBC=m | 670 | CONFIG_CRYPTO_XCBC=m |
| 661 | CONFIG_CRYPTO_VMAC=m | 671 | CONFIG_CRYPTO_VMAC=m |
| 662 | CONFIG_CRYPTO_MICHAEL_MIC=m | 672 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -668,6 +678,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 668 | CONFIG_CRYPTO_SHA3=m | 678 | CONFIG_CRYPTO_SHA3=m |
| 669 | CONFIG_CRYPTO_TGR192=m | 679 | CONFIG_CRYPTO_TGR192=m |
| 670 | CONFIG_CRYPTO_WP512=m | 680 | CONFIG_CRYPTO_WP512=m |
| 681 | CONFIG_CRYPTO_AES_TI=m | ||
| 671 | CONFIG_CRYPTO_ANUBIS=m | 682 | CONFIG_CRYPTO_ANUBIS=m |
| 672 | CONFIG_CRYPTO_BLOWFISH=m | 683 | CONFIG_CRYPTO_BLOWFISH=m |
| 673 | CONFIG_CRYPTO_CAMELLIA=m | 684 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -692,4 +703,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 692 | CONFIG_CRYPTO_USER_API_RNG=m | 703 | CONFIG_CRYPTO_USER_API_RNG=m |
| 693 | CONFIG_CRYPTO_USER_API_AEAD=m | 704 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 694 | # CONFIG_CRYPTO_HW is not set | 705 | # CONFIG_CRYPTO_HW is not set |
| 706 | CONFIG_CRC32_SELFTEST=m | ||
| 695 | CONFIG_XZ_DEC_TEST=m | 707 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index c743dd22e96f..b2e687a0ec3d 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
| @@ -25,6 +25,7 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
| 25 | CONFIG_SUN_PARTITION=y | 25 | CONFIG_SUN_PARTITION=y |
| 26 | # CONFIG_EFI_PARTITION is not set | 26 | # CONFIG_EFI_PARTITION is not set |
| 27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
| 28 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 28 | CONFIG_KEXEC=y | 29 | CONFIG_KEXEC=y |
| 29 | CONFIG_BOOTINFO_PROC=y | 30 | CONFIG_BOOTINFO_PROC=y |
| 30 | CONFIG_M68030=y | 31 | CONFIG_M68030=y |
| @@ -55,6 +56,7 @@ CONFIG_NET_IPVTI=m | |||
| 55 | CONFIG_NET_FOU_IP_TUNNELS=y | 56 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 56 | CONFIG_INET_AH=m | 57 | CONFIG_INET_AH=m |
| 57 | CONFIG_INET_ESP=m | 58 | CONFIG_INET_ESP=m |
| 59 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 58 | CONFIG_INET_IPCOMP=m | 60 | CONFIG_INET_IPCOMP=m |
| 59 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 61 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 60 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 62 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -66,6 +68,7 @@ CONFIG_IPV6=m | |||
| 66 | CONFIG_IPV6_ROUTER_PREF=y | 68 | CONFIG_IPV6_ROUTER_PREF=y |
| 67 | CONFIG_INET6_AH=m | 69 | CONFIG_INET6_AH=m |
| 68 | CONFIG_INET6_ESP=m | 70 | CONFIG_INET6_ESP=m |
| 71 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 69 | CONFIG_INET6_IPCOMP=m | 72 | CONFIG_INET6_IPCOMP=m |
| 70 | CONFIG_IPV6_ILA=m | 73 | CONFIG_IPV6_ILA=m |
| 71 | CONFIG_IPV6_VTI=m | 74 | CONFIG_IPV6_VTI=m |
| @@ -96,6 +99,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 96 | CONFIG_NFT_CT=m | 99 | CONFIG_NFT_CT=m |
| 97 | CONFIG_NFT_SET_RBTREE=m | 100 | CONFIG_NFT_SET_RBTREE=m |
| 98 | CONFIG_NFT_SET_HASH=m | 101 | CONFIG_NFT_SET_HASH=m |
| 102 | CONFIG_NFT_SET_BITMAP=m | ||
| 99 | CONFIG_NFT_COUNTER=m | 103 | CONFIG_NFT_COUNTER=m |
| 100 | CONFIG_NFT_LOG=m | 104 | CONFIG_NFT_LOG=m |
| 101 | CONFIG_NFT_LIMIT=m | 105 | CONFIG_NFT_LIMIT=m |
| @@ -293,6 +297,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 293 | CONFIG_NET_L3_MASTER_DEV=y | 297 | CONFIG_NET_L3_MASTER_DEV=y |
| 294 | CONFIG_AF_KCM=m | 298 | CONFIG_AF_KCM=m |
| 295 | # CONFIG_WIRELESS is not set | 299 | # CONFIG_WIRELESS is not set |
| 300 | CONFIG_PSAMPLE=m | ||
| 301 | CONFIG_NET_IFE=m | ||
| 296 | CONFIG_NET_DEVLINK=m | 302 | CONFIG_NET_DEVLINK=m |
| 297 | # CONFIG_UEVENT_HELPER is not set | 303 | # CONFIG_UEVENT_HELPER is not set |
| 298 | CONFIG_DEVTMPFS=y | 304 | CONFIG_DEVTMPFS=y |
| @@ -351,6 +357,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 351 | CONFIG_MACVLAN=m | 357 | CONFIG_MACVLAN=m |
| 352 | CONFIG_MACVTAP=m | 358 | CONFIG_MACVTAP=m |
| 353 | CONFIG_IPVLAN=m | 359 | CONFIG_IPVLAN=m |
| 360 | CONFIG_IPVTAP=m | ||
| 354 | CONFIG_VXLAN=m | 361 | CONFIG_VXLAN=m |
| 355 | CONFIG_GENEVE=m | 362 | CONFIG_GENEVE=m |
| 356 | CONFIG_GTP=m | 363 | CONFIG_GTP=m |
| @@ -361,6 +368,7 @@ CONFIG_VETH=m | |||
| 361 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 368 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 362 | # CONFIG_NET_VENDOR_AMAZON is not set | 369 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 363 | CONFIG_MVME147_NET=y | 370 | CONFIG_MVME147_NET=y |
| 371 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 364 | # CONFIG_NET_VENDOR_ARC is not set | 372 | # CONFIG_NET_VENDOR_ARC is not set |
| 365 | # CONFIG_NET_CADENCE is not set | 373 | # CONFIG_NET_CADENCE is not set |
| 366 | # CONFIG_NET_VENDOR_BROADCOM is not set | 374 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -377,7 +385,6 @@ CONFIG_MVME147_NET=y | |||
| 377 | # CONFIG_NET_VENDOR_SEEQ is not set | 385 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 378 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 386 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 379 | # CONFIG_NET_VENDOR_STMICRO is not set | 387 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 380 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 381 | # CONFIG_NET_VENDOR_VIA is not set | 388 | # CONFIG_NET_VENDOR_VIA is not set |
| 382 | # CONFIG_NET_VENDOR_WIZNET is not set | 389 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 383 | CONFIG_PPP=m | 390 | CONFIG_PPP=m |
| @@ -515,6 +522,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 515 | CONFIG_DLM=m | 522 | CONFIG_DLM=m |
| 516 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 523 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 517 | CONFIG_MAGIC_SYSRQ=y | 524 | CONFIG_MAGIC_SYSRQ=y |
| 525 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 526 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 518 | CONFIG_ASYNC_RAID6_TEST=m | 527 | CONFIG_ASYNC_RAID6_TEST=m |
| 519 | CONFIG_TEST_HEXDUMP=m | 528 | CONFIG_TEST_HEXDUMP=m |
| 520 | CONFIG_TEST_STRING_HELPERS=m | 529 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -545,6 +554,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 545 | CONFIG_CRYPTO_LRW=m | 554 | CONFIG_CRYPTO_LRW=m |
| 546 | CONFIG_CRYPTO_PCBC=m | 555 | CONFIG_CRYPTO_PCBC=m |
| 547 | CONFIG_CRYPTO_KEYWRAP=m | 556 | CONFIG_CRYPTO_KEYWRAP=m |
| 557 | CONFIG_CRYPTO_CMAC=m | ||
| 548 | CONFIG_CRYPTO_XCBC=m | 558 | CONFIG_CRYPTO_XCBC=m |
| 549 | CONFIG_CRYPTO_VMAC=m | 559 | CONFIG_CRYPTO_VMAC=m |
| 550 | CONFIG_CRYPTO_MICHAEL_MIC=m | 560 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -556,6 +566,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 556 | CONFIG_CRYPTO_SHA3=m | 566 | CONFIG_CRYPTO_SHA3=m |
| 557 | CONFIG_CRYPTO_TGR192=m | 567 | CONFIG_CRYPTO_TGR192=m |
| 558 | CONFIG_CRYPTO_WP512=m | 568 | CONFIG_CRYPTO_WP512=m |
| 569 | CONFIG_CRYPTO_AES_TI=m | ||
| 559 | CONFIG_CRYPTO_ANUBIS=m | 570 | CONFIG_CRYPTO_ANUBIS=m |
| 560 | CONFIG_CRYPTO_BLOWFISH=m | 571 | CONFIG_CRYPTO_BLOWFISH=m |
| 561 | CONFIG_CRYPTO_CAMELLIA=m | 572 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -580,4 +591,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 580 | CONFIG_CRYPTO_USER_API_RNG=m | 591 | CONFIG_CRYPTO_USER_API_RNG=m |
| 581 | CONFIG_CRYPTO_USER_API_AEAD=m | 592 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 582 | # CONFIG_CRYPTO_HW is not set | 593 | # CONFIG_CRYPTO_HW is not set |
| 594 | CONFIG_CRC32_SELFTEST=m | ||
| 583 | CONFIG_XZ_DEC_TEST=m | 595 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 2ccaca858f05..cbd8ee24d1bc 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
| @@ -25,6 +25,7 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
| 25 | CONFIG_SUN_PARTITION=y | 25 | CONFIG_SUN_PARTITION=y |
| 26 | # CONFIG_EFI_PARTITION is not set | 26 | # CONFIG_EFI_PARTITION is not set |
| 27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
| 28 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 28 | CONFIG_KEXEC=y | 29 | CONFIG_KEXEC=y |
| 29 | CONFIG_BOOTINFO_PROC=y | 30 | CONFIG_BOOTINFO_PROC=y |
| 30 | CONFIG_M68040=y | 31 | CONFIG_M68040=y |
| @@ -56,6 +57,7 @@ CONFIG_NET_IPVTI=m | |||
| 56 | CONFIG_NET_FOU_IP_TUNNELS=y | 57 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 57 | CONFIG_INET_AH=m | 58 | CONFIG_INET_AH=m |
| 58 | CONFIG_INET_ESP=m | 59 | CONFIG_INET_ESP=m |
| 60 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 59 | CONFIG_INET_IPCOMP=m | 61 | CONFIG_INET_IPCOMP=m |
| 60 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 62 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 61 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 63 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -67,6 +69,7 @@ CONFIG_IPV6=m | |||
| 67 | CONFIG_IPV6_ROUTER_PREF=y | 69 | CONFIG_IPV6_ROUTER_PREF=y |
| 68 | CONFIG_INET6_AH=m | 70 | CONFIG_INET6_AH=m |
| 69 | CONFIG_INET6_ESP=m | 71 | CONFIG_INET6_ESP=m |
| 72 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 70 | CONFIG_INET6_IPCOMP=m | 73 | CONFIG_INET6_IPCOMP=m |
| 71 | CONFIG_IPV6_ILA=m | 74 | CONFIG_IPV6_ILA=m |
| 72 | CONFIG_IPV6_VTI=m | 75 | CONFIG_IPV6_VTI=m |
| @@ -97,6 +100,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 97 | CONFIG_NFT_CT=m | 100 | CONFIG_NFT_CT=m |
| 98 | CONFIG_NFT_SET_RBTREE=m | 101 | CONFIG_NFT_SET_RBTREE=m |
| 99 | CONFIG_NFT_SET_HASH=m | 102 | CONFIG_NFT_SET_HASH=m |
| 103 | CONFIG_NFT_SET_BITMAP=m | ||
| 100 | CONFIG_NFT_COUNTER=m | 104 | CONFIG_NFT_COUNTER=m |
| 101 | CONFIG_NFT_LOG=m | 105 | CONFIG_NFT_LOG=m |
| 102 | CONFIG_NFT_LIMIT=m | 106 | CONFIG_NFT_LIMIT=m |
| @@ -294,6 +298,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 294 | CONFIG_NET_L3_MASTER_DEV=y | 298 | CONFIG_NET_L3_MASTER_DEV=y |
| 295 | CONFIG_AF_KCM=m | 299 | CONFIG_AF_KCM=m |
| 296 | # CONFIG_WIRELESS is not set | 300 | # CONFIG_WIRELESS is not set |
| 301 | CONFIG_PSAMPLE=m | ||
| 302 | CONFIG_NET_IFE=m | ||
| 297 | CONFIG_NET_DEVLINK=m | 303 | CONFIG_NET_DEVLINK=m |
| 298 | # CONFIG_UEVENT_HELPER is not set | 304 | # CONFIG_UEVENT_HELPER is not set |
| 299 | CONFIG_DEVTMPFS=y | 305 | CONFIG_DEVTMPFS=y |
| @@ -352,6 +358,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 352 | CONFIG_MACVLAN=m | 358 | CONFIG_MACVLAN=m |
| 353 | CONFIG_MACVTAP=m | 359 | CONFIG_MACVTAP=m |
| 354 | CONFIG_IPVLAN=m | 360 | CONFIG_IPVLAN=m |
| 361 | CONFIG_IPVTAP=m | ||
| 355 | CONFIG_VXLAN=m | 362 | CONFIG_VXLAN=m |
| 356 | CONFIG_GENEVE=m | 363 | CONFIG_GENEVE=m |
| 357 | CONFIG_GTP=m | 364 | CONFIG_GTP=m |
| @@ -361,6 +368,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y | |||
| 361 | CONFIG_VETH=m | 368 | CONFIG_VETH=m |
| 362 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 369 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 363 | # CONFIG_NET_VENDOR_AMAZON is not set | 370 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 371 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 364 | # CONFIG_NET_VENDOR_ARC is not set | 372 | # CONFIG_NET_VENDOR_ARC is not set |
| 365 | # CONFIG_NET_CADENCE is not set | 373 | # CONFIG_NET_CADENCE is not set |
| 366 | # CONFIG_NET_VENDOR_BROADCOM is not set | 374 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -377,7 +385,6 @@ CONFIG_MVME16x_NET=y | |||
| 377 | # CONFIG_NET_VENDOR_SEEQ is not set | 385 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 378 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 386 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 379 | # CONFIG_NET_VENDOR_STMICRO is not set | 387 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 380 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 381 | # CONFIG_NET_VENDOR_VIA is not set | 388 | # CONFIG_NET_VENDOR_VIA is not set |
| 382 | # CONFIG_NET_VENDOR_WIZNET is not set | 389 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 383 | CONFIG_PPP=m | 390 | CONFIG_PPP=m |
| @@ -515,6 +522,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 515 | CONFIG_DLM=m | 522 | CONFIG_DLM=m |
| 516 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 523 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 517 | CONFIG_MAGIC_SYSRQ=y | 524 | CONFIG_MAGIC_SYSRQ=y |
| 525 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 526 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 518 | CONFIG_ASYNC_RAID6_TEST=m | 527 | CONFIG_ASYNC_RAID6_TEST=m |
| 519 | CONFIG_TEST_HEXDUMP=m | 528 | CONFIG_TEST_HEXDUMP=m |
| 520 | CONFIG_TEST_STRING_HELPERS=m | 529 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -545,6 +554,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 545 | CONFIG_CRYPTO_LRW=m | 554 | CONFIG_CRYPTO_LRW=m |
| 546 | CONFIG_CRYPTO_PCBC=m | 555 | CONFIG_CRYPTO_PCBC=m |
| 547 | CONFIG_CRYPTO_KEYWRAP=m | 556 | CONFIG_CRYPTO_KEYWRAP=m |
| 557 | CONFIG_CRYPTO_CMAC=m | ||
| 548 | CONFIG_CRYPTO_XCBC=m | 558 | CONFIG_CRYPTO_XCBC=m |
| 549 | CONFIG_CRYPTO_VMAC=m | 559 | CONFIG_CRYPTO_VMAC=m |
| 550 | CONFIG_CRYPTO_MICHAEL_MIC=m | 560 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -556,6 +566,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 556 | CONFIG_CRYPTO_SHA3=m | 566 | CONFIG_CRYPTO_SHA3=m |
| 557 | CONFIG_CRYPTO_TGR192=m | 567 | CONFIG_CRYPTO_TGR192=m |
| 558 | CONFIG_CRYPTO_WP512=m | 568 | CONFIG_CRYPTO_WP512=m |
| 569 | CONFIG_CRYPTO_AES_TI=m | ||
| 559 | CONFIG_CRYPTO_ANUBIS=m | 570 | CONFIG_CRYPTO_ANUBIS=m |
| 560 | CONFIG_CRYPTO_BLOWFISH=m | 571 | CONFIG_CRYPTO_BLOWFISH=m |
| 561 | CONFIG_CRYPTO_CAMELLIA=m | 572 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -580,4 +591,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 580 | CONFIG_CRYPTO_USER_API_RNG=m | 591 | CONFIG_CRYPTO_USER_API_RNG=m |
| 581 | CONFIG_CRYPTO_USER_API_AEAD=m | 592 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 582 | # CONFIG_CRYPTO_HW is not set | 593 | # CONFIG_CRYPTO_HW is not set |
| 594 | CONFIG_CRC32_SELFTEST=m | ||
| 583 | CONFIG_XZ_DEC_TEST=m | 595 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 5599f3fd5fcd..1e82cc944339 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
| @@ -26,6 +26,7 @@ CONFIG_SUN_PARTITION=y | |||
| 26 | # CONFIG_EFI_PARTITION is not set | 26 | # CONFIG_EFI_PARTITION is not set |
| 27 | CONFIG_SYSV68_PARTITION=y | 27 | CONFIG_SYSV68_PARTITION=y |
| 28 | CONFIG_IOSCHED_DEADLINE=m | 28 | CONFIG_IOSCHED_DEADLINE=m |
| 29 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 29 | CONFIG_KEXEC=y | 30 | CONFIG_KEXEC=y |
| 30 | CONFIG_BOOTINFO_PROC=y | 31 | CONFIG_BOOTINFO_PROC=y |
| 31 | CONFIG_M68040=y | 32 | CONFIG_M68040=y |
| @@ -56,6 +57,7 @@ CONFIG_NET_IPVTI=m | |||
| 56 | CONFIG_NET_FOU_IP_TUNNELS=y | 57 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 57 | CONFIG_INET_AH=m | 58 | CONFIG_INET_AH=m |
| 58 | CONFIG_INET_ESP=m | 59 | CONFIG_INET_ESP=m |
| 60 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 59 | CONFIG_INET_IPCOMP=m | 61 | CONFIG_INET_IPCOMP=m |
| 60 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 62 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 61 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 63 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -67,6 +69,7 @@ CONFIG_IPV6=m | |||
| 67 | CONFIG_IPV6_ROUTER_PREF=y | 69 | CONFIG_IPV6_ROUTER_PREF=y |
| 68 | CONFIG_INET6_AH=m | 70 | CONFIG_INET6_AH=m |
| 69 | CONFIG_INET6_ESP=m | 71 | CONFIG_INET6_ESP=m |
| 72 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 70 | CONFIG_INET6_IPCOMP=m | 73 | CONFIG_INET6_IPCOMP=m |
| 71 | CONFIG_IPV6_ILA=m | 74 | CONFIG_IPV6_ILA=m |
| 72 | CONFIG_IPV6_VTI=m | 75 | CONFIG_IPV6_VTI=m |
| @@ -97,6 +100,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 97 | CONFIG_NFT_CT=m | 100 | CONFIG_NFT_CT=m |
| 98 | CONFIG_NFT_SET_RBTREE=m | 101 | CONFIG_NFT_SET_RBTREE=m |
| 99 | CONFIG_NFT_SET_HASH=m | 102 | CONFIG_NFT_SET_HASH=m |
| 103 | CONFIG_NFT_SET_BITMAP=m | ||
| 100 | CONFIG_NFT_COUNTER=m | 104 | CONFIG_NFT_COUNTER=m |
| 101 | CONFIG_NFT_LOG=m | 105 | CONFIG_NFT_LOG=m |
| 102 | CONFIG_NFT_LIMIT=m | 106 | CONFIG_NFT_LIMIT=m |
| @@ -294,6 +298,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 294 | CONFIG_NET_L3_MASTER_DEV=y | 298 | CONFIG_NET_L3_MASTER_DEV=y |
| 295 | CONFIG_AF_KCM=m | 299 | CONFIG_AF_KCM=m |
| 296 | # CONFIG_WIRELESS is not set | 300 | # CONFIG_WIRELESS is not set |
| 301 | CONFIG_PSAMPLE=m | ||
| 302 | CONFIG_NET_IFE=m | ||
| 297 | CONFIG_NET_DEVLINK=m | 303 | CONFIG_NET_DEVLINK=m |
| 298 | # CONFIG_UEVENT_HELPER is not set | 304 | # CONFIG_UEVENT_HELPER is not set |
| 299 | CONFIG_DEVTMPFS=y | 305 | CONFIG_DEVTMPFS=y |
| @@ -358,6 +364,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 358 | CONFIG_MACVLAN=m | 364 | CONFIG_MACVLAN=m |
| 359 | CONFIG_MACVTAP=m | 365 | CONFIG_MACVTAP=m |
| 360 | CONFIG_IPVLAN=m | 366 | CONFIG_IPVLAN=m |
| 367 | CONFIG_IPVTAP=m | ||
| 361 | CONFIG_VXLAN=m | 368 | CONFIG_VXLAN=m |
| 362 | CONFIG_GENEVE=m | 369 | CONFIG_GENEVE=m |
| 363 | CONFIG_GTP=m | 370 | CONFIG_GTP=m |
| @@ -369,6 +376,7 @@ CONFIG_VETH=m | |||
| 369 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 376 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 370 | # CONFIG_NET_VENDOR_AMAZON is not set | 377 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 371 | # CONFIG_NET_VENDOR_AMD is not set | 378 | # CONFIG_NET_VENDOR_AMD is not set |
| 379 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 372 | # CONFIG_NET_VENDOR_ARC is not set | 380 | # CONFIG_NET_VENDOR_ARC is not set |
| 373 | # CONFIG_NET_CADENCE is not set | 381 | # CONFIG_NET_CADENCE is not set |
| 374 | # CONFIG_NET_VENDOR_BROADCOM is not set | 382 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -388,7 +396,6 @@ CONFIG_NE2000=y | |||
| 388 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 396 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 389 | # CONFIG_NET_VENDOR_SMSC is not set | 397 | # CONFIG_NET_VENDOR_SMSC is not set |
| 390 | # CONFIG_NET_VENDOR_STMICRO is not set | 398 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 391 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 392 | # CONFIG_NET_VENDOR_VIA is not set | 399 | # CONFIG_NET_VENDOR_VIA is not set |
| 393 | # CONFIG_NET_VENDOR_WIZNET is not set | 400 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 394 | CONFIG_PLIP=m | 401 | CONFIG_PLIP=m |
| @@ -538,6 +545,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 538 | CONFIG_DLM=m | 545 | CONFIG_DLM=m |
| 539 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 546 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 540 | CONFIG_MAGIC_SYSRQ=y | 547 | CONFIG_MAGIC_SYSRQ=y |
| 548 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 549 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 541 | CONFIG_ASYNC_RAID6_TEST=m | 550 | CONFIG_ASYNC_RAID6_TEST=m |
| 542 | CONFIG_TEST_HEXDUMP=m | 551 | CONFIG_TEST_HEXDUMP=m |
| 543 | CONFIG_TEST_STRING_HELPERS=m | 552 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -568,6 +577,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 568 | CONFIG_CRYPTO_LRW=m | 577 | CONFIG_CRYPTO_LRW=m |
| 569 | CONFIG_CRYPTO_PCBC=m | 578 | CONFIG_CRYPTO_PCBC=m |
| 570 | CONFIG_CRYPTO_KEYWRAP=m | 579 | CONFIG_CRYPTO_KEYWRAP=m |
| 580 | CONFIG_CRYPTO_CMAC=m | ||
| 571 | CONFIG_CRYPTO_XCBC=m | 581 | CONFIG_CRYPTO_XCBC=m |
| 572 | CONFIG_CRYPTO_VMAC=m | 582 | CONFIG_CRYPTO_VMAC=m |
| 573 | CONFIG_CRYPTO_MICHAEL_MIC=m | 583 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -579,6 +589,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 579 | CONFIG_CRYPTO_SHA3=m | 589 | CONFIG_CRYPTO_SHA3=m |
| 580 | CONFIG_CRYPTO_TGR192=m | 590 | CONFIG_CRYPTO_TGR192=m |
| 581 | CONFIG_CRYPTO_WP512=m | 591 | CONFIG_CRYPTO_WP512=m |
| 592 | CONFIG_CRYPTO_AES_TI=m | ||
| 582 | CONFIG_CRYPTO_ANUBIS=m | 593 | CONFIG_CRYPTO_ANUBIS=m |
| 583 | CONFIG_CRYPTO_BLOWFISH=m | 594 | CONFIG_CRYPTO_BLOWFISH=m |
| 584 | CONFIG_CRYPTO_CAMELLIA=m | 595 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -603,4 +614,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 603 | CONFIG_CRYPTO_USER_API_RNG=m | 614 | CONFIG_CRYPTO_USER_API_RNG=m |
| 604 | CONFIG_CRYPTO_USER_API_AEAD=m | 615 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 605 | # CONFIG_CRYPTO_HW is not set | 616 | # CONFIG_CRYPTO_HW is not set |
| 617 | CONFIG_CRC32_SELFTEST=m | ||
| 606 | CONFIG_XZ_DEC_TEST=m | 618 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index 313bf0a562ad..f9e77f57a972 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
| @@ -25,6 +25,7 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
| 25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
| 26 | CONFIG_SYSV68_PARTITION=y | 26 | CONFIG_SYSV68_PARTITION=y |
| 27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
| 28 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 28 | CONFIG_KEXEC=y | 29 | CONFIG_KEXEC=y |
| 29 | CONFIG_BOOTINFO_PROC=y | 30 | CONFIG_BOOTINFO_PROC=y |
| 30 | CONFIG_SUN3=y | 31 | CONFIG_SUN3=y |
| @@ -53,6 +54,7 @@ CONFIG_NET_IPVTI=m | |||
| 53 | CONFIG_NET_FOU_IP_TUNNELS=y | 54 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 54 | CONFIG_INET_AH=m | 55 | CONFIG_INET_AH=m |
| 55 | CONFIG_INET_ESP=m | 56 | CONFIG_INET_ESP=m |
| 57 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 56 | CONFIG_INET_IPCOMP=m | 58 | CONFIG_INET_IPCOMP=m |
| 57 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 59 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 58 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 60 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -64,6 +66,7 @@ CONFIG_IPV6=m | |||
| 64 | CONFIG_IPV6_ROUTER_PREF=y | 66 | CONFIG_IPV6_ROUTER_PREF=y |
| 65 | CONFIG_INET6_AH=m | 67 | CONFIG_INET6_AH=m |
| 66 | CONFIG_INET6_ESP=m | 68 | CONFIG_INET6_ESP=m |
| 69 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 67 | CONFIG_INET6_IPCOMP=m | 70 | CONFIG_INET6_IPCOMP=m |
| 68 | CONFIG_IPV6_ILA=m | 71 | CONFIG_IPV6_ILA=m |
| 69 | CONFIG_IPV6_VTI=m | 72 | CONFIG_IPV6_VTI=m |
| @@ -94,6 +97,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 94 | CONFIG_NFT_CT=m | 97 | CONFIG_NFT_CT=m |
| 95 | CONFIG_NFT_SET_RBTREE=m | 98 | CONFIG_NFT_SET_RBTREE=m |
| 96 | CONFIG_NFT_SET_HASH=m | 99 | CONFIG_NFT_SET_HASH=m |
| 100 | CONFIG_NFT_SET_BITMAP=m | ||
| 97 | CONFIG_NFT_COUNTER=m | 101 | CONFIG_NFT_COUNTER=m |
| 98 | CONFIG_NFT_LOG=m | 102 | CONFIG_NFT_LOG=m |
| 99 | CONFIG_NFT_LIMIT=m | 103 | CONFIG_NFT_LIMIT=m |
| @@ -291,6 +295,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 291 | CONFIG_NET_L3_MASTER_DEV=y | 295 | CONFIG_NET_L3_MASTER_DEV=y |
| 292 | CONFIG_AF_KCM=m | 296 | CONFIG_AF_KCM=m |
| 293 | # CONFIG_WIRELESS is not set | 297 | # CONFIG_WIRELESS is not set |
| 298 | CONFIG_PSAMPLE=m | ||
| 299 | CONFIG_NET_IFE=m | ||
| 294 | CONFIG_NET_DEVLINK=m | 300 | CONFIG_NET_DEVLINK=m |
| 295 | # CONFIG_UEVENT_HELPER is not set | 301 | # CONFIG_UEVENT_HELPER is not set |
| 296 | CONFIG_DEVTMPFS=y | 302 | CONFIG_DEVTMPFS=y |
| @@ -349,6 +355,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 349 | CONFIG_MACVLAN=m | 355 | CONFIG_MACVLAN=m |
| 350 | CONFIG_MACVTAP=m | 356 | CONFIG_MACVTAP=m |
| 351 | CONFIG_IPVLAN=m | 357 | CONFIG_IPVLAN=m |
| 358 | CONFIG_IPVTAP=m | ||
| 352 | CONFIG_VXLAN=m | 359 | CONFIG_VXLAN=m |
| 353 | CONFIG_GENEVE=m | 360 | CONFIG_GENEVE=m |
| 354 | CONFIG_GTP=m | 361 | CONFIG_GTP=m |
| @@ -359,6 +366,7 @@ CONFIG_VETH=m | |||
| 359 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 366 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 360 | # CONFIG_NET_VENDOR_AMAZON is not set | 367 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 361 | CONFIG_SUN3LANCE=y | 368 | CONFIG_SUN3LANCE=y |
| 369 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 362 | # CONFIG_NET_VENDOR_ARC is not set | 370 | # CONFIG_NET_VENDOR_ARC is not set |
| 363 | # CONFIG_NET_CADENCE is not set | 371 | # CONFIG_NET_CADENCE is not set |
| 364 | # CONFIG_NET_VENDOR_EZCHIP is not set | 372 | # CONFIG_NET_VENDOR_EZCHIP is not set |
| @@ -375,7 +383,6 @@ CONFIG_SUN3_82586=y | |||
| 375 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 383 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 376 | # CONFIG_NET_VENDOR_STMICRO is not set | 384 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 377 | # CONFIG_NET_VENDOR_SUN is not set | 385 | # CONFIG_NET_VENDOR_SUN is not set |
| 378 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 379 | # CONFIG_NET_VENDOR_VIA is not set | 386 | # CONFIG_NET_VENDOR_VIA is not set |
| 380 | # CONFIG_NET_VENDOR_WIZNET is not set | 387 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 381 | CONFIG_PPP=m | 388 | CONFIG_PPP=m |
| @@ -517,6 +524,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 517 | CONFIG_DLM=m | 524 | CONFIG_DLM=m |
| 518 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 525 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 519 | CONFIG_MAGIC_SYSRQ=y | 526 | CONFIG_MAGIC_SYSRQ=y |
| 527 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 528 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 520 | CONFIG_ASYNC_RAID6_TEST=m | 529 | CONFIG_ASYNC_RAID6_TEST=m |
| 521 | CONFIG_TEST_HEXDUMP=m | 530 | CONFIG_TEST_HEXDUMP=m |
| 522 | CONFIG_TEST_STRING_HELPERS=m | 531 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -546,6 +555,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 546 | CONFIG_CRYPTO_LRW=m | 555 | CONFIG_CRYPTO_LRW=m |
| 547 | CONFIG_CRYPTO_PCBC=m | 556 | CONFIG_CRYPTO_PCBC=m |
| 548 | CONFIG_CRYPTO_KEYWRAP=m | 557 | CONFIG_CRYPTO_KEYWRAP=m |
| 558 | CONFIG_CRYPTO_CMAC=m | ||
| 549 | CONFIG_CRYPTO_XCBC=m | 559 | CONFIG_CRYPTO_XCBC=m |
| 550 | CONFIG_CRYPTO_VMAC=m | 560 | CONFIG_CRYPTO_VMAC=m |
| 551 | CONFIG_CRYPTO_MICHAEL_MIC=m | 561 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -557,6 +567,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 557 | CONFIG_CRYPTO_SHA3=m | 567 | CONFIG_CRYPTO_SHA3=m |
| 558 | CONFIG_CRYPTO_TGR192=m | 568 | CONFIG_CRYPTO_TGR192=m |
| 559 | CONFIG_CRYPTO_WP512=m | 569 | CONFIG_CRYPTO_WP512=m |
| 570 | CONFIG_CRYPTO_AES_TI=m | ||
| 560 | CONFIG_CRYPTO_ANUBIS=m | 571 | CONFIG_CRYPTO_ANUBIS=m |
| 561 | CONFIG_CRYPTO_BLOWFISH=m | 572 | CONFIG_CRYPTO_BLOWFISH=m |
| 562 | CONFIG_CRYPTO_CAMELLIA=m | 573 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -581,4 +592,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 581 | CONFIG_CRYPTO_USER_API_RNG=m | 592 | CONFIG_CRYPTO_USER_API_RNG=m |
| 582 | CONFIG_CRYPTO_USER_API_AEAD=m | 593 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 583 | # CONFIG_CRYPTO_HW is not set | 594 | # CONFIG_CRYPTO_HW is not set |
| 595 | CONFIG_CRC32_SELFTEST=m | ||
| 584 | CONFIG_XZ_DEC_TEST=m | 596 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 38b61365f769..3c394fcfb368 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
| @@ -25,6 +25,7 @@ CONFIG_UNIXWARE_DISKLABEL=y | |||
| 25 | # CONFIG_EFI_PARTITION is not set | 25 | # CONFIG_EFI_PARTITION is not set |
| 26 | CONFIG_SYSV68_PARTITION=y | 26 | CONFIG_SYSV68_PARTITION=y |
| 27 | CONFIG_IOSCHED_DEADLINE=m | 27 | CONFIG_IOSCHED_DEADLINE=m |
| 28 | CONFIG_MQ_IOSCHED_DEADLINE=m | ||
| 28 | CONFIG_KEXEC=y | 29 | CONFIG_KEXEC=y |
| 29 | CONFIG_BOOTINFO_PROC=y | 30 | CONFIG_BOOTINFO_PROC=y |
| 30 | CONFIG_SUN3X=y | 31 | CONFIG_SUN3X=y |
| @@ -53,6 +54,7 @@ CONFIG_NET_IPVTI=m | |||
| 53 | CONFIG_NET_FOU_IP_TUNNELS=y | 54 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 54 | CONFIG_INET_AH=m | 55 | CONFIG_INET_AH=m |
| 55 | CONFIG_INET_ESP=m | 56 | CONFIG_INET_ESP=m |
| 57 | CONFIG_INET_ESP_OFFLOAD=m | ||
| 56 | CONFIG_INET_IPCOMP=m | 58 | CONFIG_INET_IPCOMP=m |
| 57 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 59 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 58 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 60 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| @@ -64,6 +66,7 @@ CONFIG_IPV6=m | |||
| 64 | CONFIG_IPV6_ROUTER_PREF=y | 66 | CONFIG_IPV6_ROUTER_PREF=y |
| 65 | CONFIG_INET6_AH=m | 67 | CONFIG_INET6_AH=m |
| 66 | CONFIG_INET6_ESP=m | 68 | CONFIG_INET6_ESP=m |
| 69 | CONFIG_INET6_ESP_OFFLOAD=m | ||
| 67 | CONFIG_INET6_IPCOMP=m | 70 | CONFIG_INET6_IPCOMP=m |
| 68 | CONFIG_IPV6_ILA=m | 71 | CONFIG_IPV6_ILA=m |
| 69 | CONFIG_IPV6_VTI=m | 72 | CONFIG_IPV6_VTI=m |
| @@ -94,6 +97,7 @@ CONFIG_NFT_NUMGEN=m | |||
| 94 | CONFIG_NFT_CT=m | 97 | CONFIG_NFT_CT=m |
| 95 | CONFIG_NFT_SET_RBTREE=m | 98 | CONFIG_NFT_SET_RBTREE=m |
| 96 | CONFIG_NFT_SET_HASH=m | 99 | CONFIG_NFT_SET_HASH=m |
| 100 | CONFIG_NFT_SET_BITMAP=m | ||
| 97 | CONFIG_NFT_COUNTER=m | 101 | CONFIG_NFT_COUNTER=m |
| 98 | CONFIG_NFT_LOG=m | 102 | CONFIG_NFT_LOG=m |
| 99 | CONFIG_NFT_LIMIT=m | 103 | CONFIG_NFT_LIMIT=m |
| @@ -291,6 +295,8 @@ CONFIG_MPLS_IPTUNNEL=m | |||
| 291 | CONFIG_NET_L3_MASTER_DEV=y | 295 | CONFIG_NET_L3_MASTER_DEV=y |
| 292 | CONFIG_AF_KCM=m | 296 | CONFIG_AF_KCM=m |
| 293 | # CONFIG_WIRELESS is not set | 297 | # CONFIG_WIRELESS is not set |
| 298 | CONFIG_PSAMPLE=m | ||
| 299 | CONFIG_NET_IFE=m | ||
| 294 | CONFIG_NET_DEVLINK=m | 300 | CONFIG_NET_DEVLINK=m |
| 295 | # CONFIG_UEVENT_HELPER is not set | 301 | # CONFIG_UEVENT_HELPER is not set |
| 296 | CONFIG_DEVTMPFS=y | 302 | CONFIG_DEVTMPFS=y |
| @@ -349,6 +355,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m | |||
| 349 | CONFIG_MACVLAN=m | 355 | CONFIG_MACVLAN=m |
| 350 | CONFIG_MACVTAP=m | 356 | CONFIG_MACVTAP=m |
| 351 | CONFIG_IPVLAN=m | 357 | CONFIG_IPVLAN=m |
| 358 | CONFIG_IPVTAP=m | ||
| 352 | CONFIG_VXLAN=m | 359 | CONFIG_VXLAN=m |
| 353 | CONFIG_GENEVE=m | 360 | CONFIG_GENEVE=m |
| 354 | CONFIG_GTP=m | 361 | CONFIG_GTP=m |
| @@ -359,6 +366,7 @@ CONFIG_VETH=m | |||
| 359 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 366 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
| 360 | # CONFIG_NET_VENDOR_AMAZON is not set | 367 | # CONFIG_NET_VENDOR_AMAZON is not set |
| 361 | CONFIG_SUN3LANCE=y | 368 | CONFIG_SUN3LANCE=y |
| 369 | # CONFIG_NET_VENDOR_AQUANTIA is not set | ||
| 362 | # CONFIG_NET_VENDOR_ARC is not set | 370 | # CONFIG_NET_VENDOR_ARC is not set |
| 363 | # CONFIG_NET_CADENCE is not set | 371 | # CONFIG_NET_CADENCE is not set |
| 364 | # CONFIG_NET_VENDOR_BROADCOM is not set | 372 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| @@ -375,7 +383,6 @@ CONFIG_SUN3LANCE=y | |||
| 375 | # CONFIG_NET_VENDOR_SEEQ is not set | 383 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 376 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 384 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
| 377 | # CONFIG_NET_VENDOR_STMICRO is not set | 385 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 378 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 379 | # CONFIG_NET_VENDOR_VIA is not set | 386 | # CONFIG_NET_VENDOR_VIA is not set |
| 380 | # CONFIG_NET_VENDOR_WIZNET is not set | 387 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 381 | CONFIG_PPP=m | 388 | CONFIG_PPP=m |
| @@ -517,6 +524,8 @@ CONFIG_NLS_MAC_TURKISH=m | |||
| 517 | CONFIG_DLM=m | 524 | CONFIG_DLM=m |
| 518 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set | 525 | # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set |
| 519 | CONFIG_MAGIC_SYSRQ=y | 526 | CONFIG_MAGIC_SYSRQ=y |
| 527 | CONFIG_WW_MUTEX_SELFTEST=m | ||
| 528 | CONFIG_ATOMIC64_SELFTEST=m | ||
| 520 | CONFIG_ASYNC_RAID6_TEST=m | 529 | CONFIG_ASYNC_RAID6_TEST=m |
| 521 | CONFIG_TEST_HEXDUMP=m | 530 | CONFIG_TEST_HEXDUMP=m |
| 522 | CONFIG_TEST_STRING_HELPERS=m | 531 | CONFIG_TEST_STRING_HELPERS=m |
| @@ -547,6 +556,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m | |||
| 547 | CONFIG_CRYPTO_LRW=m | 556 | CONFIG_CRYPTO_LRW=m |
| 548 | CONFIG_CRYPTO_PCBC=m | 557 | CONFIG_CRYPTO_PCBC=m |
| 549 | CONFIG_CRYPTO_KEYWRAP=m | 558 | CONFIG_CRYPTO_KEYWRAP=m |
| 559 | CONFIG_CRYPTO_CMAC=m | ||
| 550 | CONFIG_CRYPTO_XCBC=m | 560 | CONFIG_CRYPTO_XCBC=m |
| 551 | CONFIG_CRYPTO_VMAC=m | 561 | CONFIG_CRYPTO_VMAC=m |
| 552 | CONFIG_CRYPTO_MICHAEL_MIC=m | 562 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| @@ -558,6 +568,7 @@ CONFIG_CRYPTO_SHA512=m | |||
| 558 | CONFIG_CRYPTO_SHA3=m | 568 | CONFIG_CRYPTO_SHA3=m |
| 559 | CONFIG_CRYPTO_TGR192=m | 569 | CONFIG_CRYPTO_TGR192=m |
| 560 | CONFIG_CRYPTO_WP512=m | 570 | CONFIG_CRYPTO_WP512=m |
| 571 | CONFIG_CRYPTO_AES_TI=m | ||
| 561 | CONFIG_CRYPTO_ANUBIS=m | 572 | CONFIG_CRYPTO_ANUBIS=m |
| 562 | CONFIG_CRYPTO_BLOWFISH=m | 573 | CONFIG_CRYPTO_BLOWFISH=m |
| 563 | CONFIG_CRYPTO_CAMELLIA=m | 574 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -582,4 +593,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m | |||
| 582 | CONFIG_CRYPTO_USER_API_RNG=m | 593 | CONFIG_CRYPTO_USER_API_RNG=m |
| 583 | CONFIG_CRYPTO_USER_API_AEAD=m | 594 | CONFIG_CRYPTO_USER_API_AEAD=m |
| 584 | # CONFIG_CRYPTO_HW is not set | 595 | # CONFIG_CRYPTO_HW is not set |
| 596 | CONFIG_CRC32_SELFTEST=m | ||
| 585 | CONFIG_XZ_DEC_TEST=m | 597 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index b4a9b0d5928d..dda58cfe8c22 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h | |||
| @@ -148,7 +148,7 @@ static inline void bfchg_mem_change_bit(int nr, volatile unsigned long *vaddr) | |||
| 148 | #define __change_bit(nr, vaddr) change_bit(nr, vaddr) | 148 | #define __change_bit(nr, vaddr) change_bit(nr, vaddr) |
| 149 | 149 | ||
| 150 | 150 | ||
| 151 | static inline int test_bit(int nr, const unsigned long *vaddr) | 151 | static inline int test_bit(int nr, const volatile unsigned long *vaddr) |
| 152 | { | 152 | { |
| 153 | return (vaddr[nr >> 5] & (1UL << (nr & 31))) != 0; | 153 | return (vaddr[nr >> 5] & (1UL << (nr & 31))) != 0; |
| 154 | } | 154 | } |
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index a857d82ec509..aab1edd0d4ba 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include <uapi/asm/unistd.h> | 4 | #include <uapi/asm/unistd.h> |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | #define NR_syscalls 379 | 7 | #define NR_syscalls 380 |
| 8 | 8 | ||
| 9 | #define __ARCH_WANT_OLD_READDIR | 9 | #define __ARCH_WANT_OLD_READDIR |
| 10 | #define __ARCH_WANT_OLD_STAT | 10 | #define __ARCH_WANT_OLD_STAT |
diff --git a/arch/m68k/include/uapi/asm/unistd.h b/arch/m68k/include/uapi/asm/unistd.h index 9fe674bf911f..25589f5b8669 100644 --- a/arch/m68k/include/uapi/asm/unistd.h +++ b/arch/m68k/include/uapi/asm/unistd.h | |||
| @@ -384,5 +384,6 @@ | |||
| 384 | #define __NR_copy_file_range 376 | 384 | #define __NR_copy_file_range 376 |
| 385 | #define __NR_preadv2 377 | 385 | #define __NR_preadv2 377 |
| 386 | #define __NR_pwritev2 378 | 386 | #define __NR_pwritev2 378 |
| 387 | #define __NR_statx 379 | ||
| 387 | 388 | ||
| 388 | #endif /* _UAPI_ASM_M68K_UNISTD_H_ */ | 389 | #endif /* _UAPI_ASM_M68K_UNISTD_H_ */ |
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S index d6fd6d9ced24..8c9fcfafe0dd 100644 --- a/arch/m68k/kernel/syscalltable.S +++ b/arch/m68k/kernel/syscalltable.S | |||
| @@ -399,3 +399,4 @@ ENTRY(sys_call_table) | |||
| 399 | .long sys_copy_file_range | 399 | .long sys_copy_file_range |
| 400 | .long sys_preadv2 | 400 | .long sys_preadv2 |
| 401 | .long sys_pwritev2 | 401 | .long sys_pwritev2 |
| 402 | .long sys_statx | ||
diff --git a/arch/metag/include/asm/uaccess.h b/arch/metag/include/asm/uaccess.h index 273e61225c27..07238b39638c 100644 --- a/arch/metag/include/asm/uaccess.h +++ b/arch/metag/include/asm/uaccess.h | |||
| @@ -197,20 +197,21 @@ extern long __must_check strnlen_user(const char __user *src, long count); | |||
| 197 | 197 | ||
| 198 | #define strlen_user(str) strnlen_user(str, 32767) | 198 | #define strlen_user(str) strnlen_user(str, 32767) |
| 199 | 199 | ||
| 200 | extern unsigned long __must_check __copy_user_zeroing(void *to, | 200 | extern unsigned long raw_copy_from_user(void *to, const void __user *from, |
| 201 | const void __user *from, | 201 | unsigned long n); |
| 202 | unsigned long n); | ||
| 203 | 202 | ||
| 204 | static inline unsigned long | 203 | static inline unsigned long |
| 205 | copy_from_user(void *to, const void __user *from, unsigned long n) | 204 | copy_from_user(void *to, const void __user *from, unsigned long n) |
| 206 | { | 205 | { |
| 206 | unsigned long res = n; | ||
| 207 | if (likely(access_ok(VERIFY_READ, from, n))) | 207 | if (likely(access_ok(VERIFY_READ, from, n))) |
| 208 | return __copy_user_zeroing(to, from, n); | 208 | res = raw_copy_from_user(to, from, n); |
| 209 | memset(to, 0, n); | 209 | if (unlikely(res)) |
| 210 | return n; | 210 | memset(to + (n - res), 0, res); |
| 211 | return res; | ||
| 211 | } | 212 | } |
| 212 | 213 | ||
| 213 | #define __copy_from_user(to, from, n) __copy_user_zeroing(to, from, n) | 214 | #define __copy_from_user(to, from, n) raw_copy_from_user(to, from, n) |
| 214 | #define __copy_from_user_inatomic __copy_from_user | 215 | #define __copy_from_user_inatomic __copy_from_user |
| 215 | 216 | ||
| 216 | extern unsigned long __must_check __copy_user(void __user *to, | 217 | extern unsigned long __must_check __copy_user(void __user *to, |
diff --git a/arch/metag/kernel/ptrace.c b/arch/metag/kernel/ptrace.c index 5fd16ee5280c..e615603a4b0a 100644 --- a/arch/metag/kernel/ptrace.c +++ b/arch/metag/kernel/ptrace.c | |||
| @@ -26,6 +26,16 @@ | |||
| 26 | * user_regset definitions. | 26 | * user_regset definitions. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | static unsigned long user_txstatus(const struct pt_regs *regs) | ||
| 30 | { | ||
| 31 | unsigned long data = (unsigned long)regs->ctx.Flags; | ||
| 32 | |||
| 33 | if (regs->ctx.SaveMask & TBICTX_CBUF_BIT) | ||
| 34 | data |= USER_GP_REGS_STATUS_CATCH_BIT; | ||
| 35 | |||
| 36 | return data; | ||
| 37 | } | ||
| 38 | |||
| 29 | int metag_gp_regs_copyout(const struct pt_regs *regs, | 39 | int metag_gp_regs_copyout(const struct pt_regs *regs, |
| 30 | unsigned int pos, unsigned int count, | 40 | unsigned int pos, unsigned int count, |
| 31 | void *kbuf, void __user *ubuf) | 41 | void *kbuf, void __user *ubuf) |
| @@ -64,9 +74,7 @@ int metag_gp_regs_copyout(const struct pt_regs *regs, | |||
| 64 | if (ret) | 74 | if (ret) |
| 65 | goto out; | 75 | goto out; |
| 66 | /* TXSTATUS */ | 76 | /* TXSTATUS */ |
| 67 | data = (unsigned long)regs->ctx.Flags; | 77 | data = user_txstatus(regs); |
| 68 | if (regs->ctx.SaveMask & TBICTX_CBUF_BIT) | ||
| 69 | data |= USER_GP_REGS_STATUS_CATCH_BIT; | ||
| 70 | ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, | 78 | ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, |
| 71 | &data, 4*25, 4*26); | 79 | &data, 4*25, 4*26); |
| 72 | if (ret) | 80 | if (ret) |
| @@ -121,6 +129,7 @@ int metag_gp_regs_copyin(struct pt_regs *regs, | |||
| 121 | if (ret) | 129 | if (ret) |
| 122 | goto out; | 130 | goto out; |
| 123 | /* TXSTATUS */ | 131 | /* TXSTATUS */ |
| 132 | data = user_txstatus(regs); | ||
| 124 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 133 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
| 125 | &data, 4*25, 4*26); | 134 | &data, 4*25, 4*26); |
| 126 | if (ret) | 135 | if (ret) |
| @@ -246,6 +255,8 @@ int metag_rp_state_copyin(struct pt_regs *regs, | |||
| 246 | unsigned long long *ptr; | 255 | unsigned long long *ptr; |
| 247 | int ret, i; | 256 | int ret, i; |
| 248 | 257 | ||
| 258 | if (count < 4*13) | ||
| 259 | return -EINVAL; | ||
| 249 | /* Read the entire pipeline before making any changes */ | 260 | /* Read the entire pipeline before making any changes */ |
| 250 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 261 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
| 251 | &rp, 0, 4*13); | 262 | &rp, 0, 4*13); |
| @@ -305,7 +316,7 @@ static int metag_tls_set(struct task_struct *target, | |||
| 305 | const void *kbuf, const void __user *ubuf) | 316 | const void *kbuf, const void __user *ubuf) |
| 306 | { | 317 | { |
| 307 | int ret; | 318 | int ret; |
| 308 | void __user *tls; | 319 | void __user *tls = target->thread.tls_ptr; |
| 309 | 320 | ||
| 310 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &tls, 0, -1); | 321 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &tls, 0, -1); |
| 311 | if (ret) | 322 | if (ret) |
diff --git a/arch/metag/lib/usercopy.c b/arch/metag/lib/usercopy.c index b3ebfe9c8e88..2792fc621088 100644 --- a/arch/metag/lib/usercopy.c +++ b/arch/metag/lib/usercopy.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | COPY \ | 29 | COPY \ |
| 30 | "1:\n" \ | 30 | "1:\n" \ |
| 31 | " .section .fixup,\"ax\"\n" \ | 31 | " .section .fixup,\"ax\"\n" \ |
| 32 | " MOV D1Ar1,#0\n" \ | ||
| 33 | FIXUP \ | 32 | FIXUP \ |
| 34 | " MOVT D1Ar1,#HI(1b)\n" \ | 33 | " MOVT D1Ar1,#HI(1b)\n" \ |
| 35 | " JUMP D1Ar1,#LO(1b)\n" \ | 34 | " JUMP D1Ar1,#LO(1b)\n" \ |
| @@ -260,27 +259,31 @@ | |||
| 260 | "MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 259 | "MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 261 | "22:\n" \ | 260 | "22:\n" \ |
| 262 | "MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 261 | "MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 263 | "SUB %3, %3, #32\n" \ | ||
| 264 | "23:\n" \ | 262 | "23:\n" \ |
| 265 | "MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 263 | "SUB %3, %3, #32\n" \ |
| 266 | "24:\n" \ | 264 | "24:\n" \ |
| 265 | "MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | ||
| 266 | "25:\n" \ | ||
| 267 | "MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 267 | "MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 268 | "26:\n" \ | ||
| 268 | "SUB %3, %3, #32\n" \ | 269 | "SUB %3, %3, #32\n" \ |
| 269 | "DCACHE [%1+#-64], D0Ar6\n" \ | 270 | "DCACHE [%1+#-64], D0Ar6\n" \ |
| 270 | "BR $Lloop"id"\n" \ | 271 | "BR $Lloop"id"\n" \ |
| 271 | \ | 272 | \ |
| 272 | "MOV RAPF, %1\n" \ | 273 | "MOV RAPF, %1\n" \ |
| 273 | "25:\n" \ | 274 | "27:\n" \ |
| 274 | "MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 275 | "MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 275 | "26:\n" \ | 276 | "28:\n" \ |
| 276 | "MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 277 | "MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 278 | "29:\n" \ | ||
| 277 | "SUB %3, %3, #32\n" \ | 279 | "SUB %3, %3, #32\n" \ |
| 278 | "27:\n" \ | 280 | "30:\n" \ |
| 279 | "MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 281 | "MGETL D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 280 | "28:\n" \ | 282 | "31:\n" \ |
| 281 | "MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 283 | "MSETL [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 284 | "32:\n" \ | ||
| 282 | "SUB %0, %0, #8\n" \ | 285 | "SUB %0, %0, #8\n" \ |
| 283 | "29:\n" \ | 286 | "33:\n" \ |
| 284 | "SETL [%0++], D0.7, D1.7\n" \ | 287 | "SETL [%0++], D0.7, D1.7\n" \ |
| 285 | "SUB %3, %3, #32\n" \ | 288 | "SUB %3, %3, #32\n" \ |
| 286 | "1:" \ | 289 | "1:" \ |
| @@ -312,11 +315,15 @@ | |||
| 312 | " .long 26b,3b\n" \ | 315 | " .long 26b,3b\n" \ |
| 313 | " .long 27b,3b\n" \ | 316 | " .long 27b,3b\n" \ |
| 314 | " .long 28b,3b\n" \ | 317 | " .long 28b,3b\n" \ |
| 315 | " .long 29b,4b\n" \ | 318 | " .long 29b,3b\n" \ |
| 319 | " .long 30b,3b\n" \ | ||
| 320 | " .long 31b,3b\n" \ | ||
| 321 | " .long 32b,3b\n" \ | ||
| 322 | " .long 33b,4b\n" \ | ||
| 316 | " .previous\n" \ | 323 | " .previous\n" \ |
| 317 | : "=r" (to), "=r" (from), "=r" (ret), "=d" (n) \ | 324 | : "=r" (to), "=r" (from), "=r" (ret), "=d" (n) \ |
| 318 | : "0" (to), "1" (from), "2" (ret), "3" (n) \ | 325 | : "0" (to), "1" (from), "2" (ret), "3" (n) \ |
| 319 | : "D1Ar1", "D0Ar2", "memory") | 326 | : "D1Ar1", "D0Ar2", "cc", "memory") |
| 320 | 327 | ||
| 321 | /* rewind 'to' and 'from' pointers when a fault occurs | 328 | /* rewind 'to' and 'from' pointers when a fault occurs |
| 322 | * | 329 | * |
| @@ -342,7 +349,7 @@ | |||
| 342 | #define __asm_copy_to_user_64bit_rapf_loop(to, from, ret, n, id)\ | 349 | #define __asm_copy_to_user_64bit_rapf_loop(to, from, ret, n, id)\ |
| 343 | __asm_copy_user_64bit_rapf_loop(to, from, ret, n, id, \ | 350 | __asm_copy_user_64bit_rapf_loop(to, from, ret, n, id, \ |
| 344 | "LSR D0Ar2, D0Ar2, #8\n" \ | 351 | "LSR D0Ar2, D0Ar2, #8\n" \ |
| 345 | "AND D0Ar2, D0Ar2, #0x7\n" \ | 352 | "ANDS D0Ar2, D0Ar2, #0x7\n" \ |
| 346 | "ADDZ D0Ar2, D0Ar2, #4\n" \ | 353 | "ADDZ D0Ar2, D0Ar2, #4\n" \ |
| 347 | "SUB D0Ar2, D0Ar2, #1\n" \ | 354 | "SUB D0Ar2, D0Ar2, #1\n" \ |
| 348 | "MOV D1Ar1, #4\n" \ | 355 | "MOV D1Ar1, #4\n" \ |
| @@ -403,47 +410,55 @@ | |||
| 403 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 410 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 404 | "22:\n" \ | 411 | "22:\n" \ |
| 405 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 412 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 406 | "SUB %3, %3, #16\n" \ | ||
| 407 | "23:\n" \ | 413 | "23:\n" \ |
| 408 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | ||
| 409 | "24:\n" \ | ||
| 410 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | ||
| 411 | "SUB %3, %3, #16\n" \ | 414 | "SUB %3, %3, #16\n" \ |
| 412 | "25:\n" \ | 415 | "24:\n" \ |
| 413 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 416 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 414 | "26:\n" \ | 417 | "25:\n" \ |
| 415 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 418 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 419 | "26:\n" \ | ||
| 416 | "SUB %3, %3, #16\n" \ | 420 | "SUB %3, %3, #16\n" \ |
| 417 | "27:\n" \ | 421 | "27:\n" \ |
| 418 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 422 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 419 | "28:\n" \ | 423 | "28:\n" \ |
| 420 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 424 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 425 | "29:\n" \ | ||
| 426 | "SUB %3, %3, #16\n" \ | ||
| 427 | "30:\n" \ | ||
| 428 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | ||
| 429 | "31:\n" \ | ||
| 430 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | ||
| 431 | "32:\n" \ | ||
| 421 | "SUB %3, %3, #16\n" \ | 432 | "SUB %3, %3, #16\n" \ |
| 422 | "DCACHE [%1+#-64], D0Ar6\n" \ | 433 | "DCACHE [%1+#-64], D0Ar6\n" \ |
| 423 | "BR $Lloop"id"\n" \ | 434 | "BR $Lloop"id"\n" \ |
| 424 | \ | 435 | \ |
| 425 | "MOV RAPF, %1\n" \ | 436 | "MOV RAPF, %1\n" \ |
| 426 | "29:\n" \ | 437 | "33:\n" \ |
| 427 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 438 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 428 | "30:\n" \ | 439 | "34:\n" \ |
| 429 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 440 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 441 | "35:\n" \ | ||
| 430 | "SUB %3, %3, #16\n" \ | 442 | "SUB %3, %3, #16\n" \ |
| 431 | "31:\n" \ | 443 | "36:\n" \ |
| 432 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 444 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 433 | "32:\n" \ | 445 | "37:\n" \ |
| 434 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 446 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 447 | "38:\n" \ | ||
| 435 | "SUB %3, %3, #16\n" \ | 448 | "SUB %3, %3, #16\n" \ |
| 436 | "33:\n" \ | 449 | "39:\n" \ |
| 437 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 450 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 438 | "34:\n" \ | 451 | "40:\n" \ |
| 439 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 452 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 453 | "41:\n" \ | ||
| 440 | "SUB %3, %3, #16\n" \ | 454 | "SUB %3, %3, #16\n" \ |
| 441 | "35:\n" \ | 455 | "42:\n" \ |
| 442 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ | 456 | "MGETD D0FrT, D0.5, D0.6, D0.7, [%1++]\n" \ |
| 443 | "36:\n" \ | 457 | "43:\n" \ |
| 444 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ | 458 | "MSETD [%0++], D0FrT, D0.5, D0.6, D0.7\n" \ |
| 459 | "44:\n" \ | ||
| 445 | "SUB %0, %0, #4\n" \ | 460 | "SUB %0, %0, #4\n" \ |
| 446 | "37:\n" \ | 461 | "45:\n" \ |
| 447 | "SETD [%0++], D0.7\n" \ | 462 | "SETD [%0++], D0.7\n" \ |
| 448 | "SUB %3, %3, #16\n" \ | 463 | "SUB %3, %3, #16\n" \ |
| 449 | "1:" \ | 464 | "1:" \ |
| @@ -483,11 +498,19 @@ | |||
| 483 | " .long 34b,3b\n" \ | 498 | " .long 34b,3b\n" \ |
| 484 | " .long 35b,3b\n" \ | 499 | " .long 35b,3b\n" \ |
| 485 | " .long 36b,3b\n" \ | 500 | " .long 36b,3b\n" \ |
| 486 | " .long 37b,4b\n" \ | 501 | " .long 37b,3b\n" \ |
| 502 | " .long 38b,3b\n" \ | ||
| 503 | " .long 39b,3b\n" \ | ||
| 504 | " .long 40b,3b\n" \ | ||
| 505 | " .long 41b,3b\n" \ | ||
| 506 | " .long 42b,3b\n" \ | ||
| 507 | " .long 43b,3b\n" \ | ||
| 508 | " .long 44b,3b\n" \ | ||
| 509 | " .long 45b,4b\n" \ | ||
| 487 | " .previous\n" \ | 510 | " .previous\n" \ |
| 488 | : "=r" (to), "=r" (from), "=r" (ret), "=d" (n) \ | 511 | : "=r" (to), "=r" (from), "=r" (ret), "=d" (n) \ |
| 489 | : "0" (to), "1" (from), "2" (ret), "3" (n) \ | 512 | : "0" (to), "1" (from), "2" (ret), "3" (n) \ |
| 490 | : "D1Ar1", "D0Ar2", "memory") | 513 | : "D1Ar1", "D0Ar2", "cc", "memory") |
| 491 | 514 | ||
| 492 | /* rewind 'to' and 'from' pointers when a fault occurs | 515 | /* rewind 'to' and 'from' pointers when a fault occurs |
| 493 | * | 516 | * |
| @@ -513,7 +536,7 @@ | |||
| 513 | #define __asm_copy_to_user_32bit_rapf_loop(to, from, ret, n, id)\ | 536 | #define __asm_copy_to_user_32bit_rapf_loop(to, from, ret, n, id)\ |
| 514 | __asm_copy_user_32bit_rapf_loop(to, from, ret, n, id, \ | 537 | __asm_copy_user_32bit_rapf_loop(to, from, ret, n, id, \ |
| 515 | "LSR D0Ar2, D0Ar2, #8\n" \ | 538 | "LSR D0Ar2, D0Ar2, #8\n" \ |
| 516 | "AND D0Ar2, D0Ar2, #0x7\n" \ | 539 | "ANDS D0Ar2, D0Ar2, #0x7\n" \ |
| 517 | "ADDZ D0Ar2, D0Ar2, #4\n" \ | 540 | "ADDZ D0Ar2, D0Ar2, #4\n" \ |
| 518 | "SUB D0Ar2, D0Ar2, #1\n" \ | 541 | "SUB D0Ar2, D0Ar2, #1\n" \ |
| 519 | "MOV D1Ar1, #4\n" \ | 542 | "MOV D1Ar1, #4\n" \ |
| @@ -538,23 +561,31 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, | |||
| 538 | if ((unsigned long) src & 1) { | 561 | if ((unsigned long) src & 1) { |
| 539 | __asm_copy_to_user_1(dst, src, retn); | 562 | __asm_copy_to_user_1(dst, src, retn); |
| 540 | n--; | 563 | n--; |
| 564 | if (retn) | ||
| 565 | return retn + n; | ||
| 541 | } | 566 | } |
| 542 | if ((unsigned long) dst & 1) { | 567 | if ((unsigned long) dst & 1) { |
| 543 | /* Worst case - byte copy */ | 568 | /* Worst case - byte copy */ |
| 544 | while (n > 0) { | 569 | while (n > 0) { |
| 545 | __asm_copy_to_user_1(dst, src, retn); | 570 | __asm_copy_to_user_1(dst, src, retn); |
| 546 | n--; | 571 | n--; |
| 572 | if (retn) | ||
| 573 | return retn + n; | ||
| 547 | } | 574 | } |
| 548 | } | 575 | } |
| 549 | if (((unsigned long) src & 2) && n >= 2) { | 576 | if (((unsigned long) src & 2) && n >= 2) { |
| 550 | __asm_copy_to_user_2(dst, src, retn); | 577 | __asm_copy_to_user_2(dst, src, retn); |
| 551 | n -= 2; | 578 | n -= 2; |
| 579 | if (retn) | ||
| 580 | return retn + n; | ||
| 552 | } | 581 | } |
| 553 | if ((unsigned long) dst & 2) { | 582 | if ((unsigned long) dst & 2) { |
| 554 | /* Second worst case - word copy */ | 583 | /* Second worst case - word copy */ |
| 555 | while (n >= 2) { | 584 | while (n >= 2) { |
| 556 | __asm_copy_to_user_2(dst, src, retn); | 585 | __asm_copy_to_user_2(dst, src, retn); |
| 557 | n -= 2; | 586 | n -= 2; |
| 587 | if (retn) | ||
| 588 | return retn + n; | ||
| 558 | } | 589 | } |
| 559 | } | 590 | } |
| 560 | 591 | ||
| @@ -569,6 +600,8 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, | |||
| 569 | while (n >= 8) { | 600 | while (n >= 8) { |
| 570 | __asm_copy_to_user_8x64(dst, src, retn); | 601 | __asm_copy_to_user_8x64(dst, src, retn); |
| 571 | n -= 8; | 602 | n -= 8; |
| 603 | if (retn) | ||
| 604 | return retn + n; | ||
| 572 | } | 605 | } |
| 573 | } | 606 | } |
| 574 | if (n >= RAPF_MIN_BUF_SIZE) { | 607 | if (n >= RAPF_MIN_BUF_SIZE) { |
| @@ -581,6 +614,8 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, | |||
| 581 | while (n >= 8) { | 614 | while (n >= 8) { |
| 582 | __asm_copy_to_user_8x64(dst, src, retn); | 615 | __asm_copy_to_user_8x64(dst, src, retn); |
| 583 | n -= 8; | 616 | n -= 8; |
| 617 | if (retn) | ||
| 618 | return retn + n; | ||
| 584 | } | 619 | } |
| 585 | } | 620 | } |
| 586 | #endif | 621 | #endif |
| @@ -588,11 +623,15 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, | |||
| 588 | while (n >= 16) { | 623 | while (n >= 16) { |
| 589 | __asm_copy_to_user_16(dst, src, retn); | 624 | __asm_copy_to_user_16(dst, src, retn); |
| 590 | n -= 16; | 625 | n -= 16; |
| 626 | if (retn) | ||
| 627 | return retn + n; | ||
| 591 | } | 628 | } |
| 592 | 629 | ||
| 593 | while (n >= 4) { | 630 | while (n >= 4) { |
| 594 | __asm_copy_to_user_4(dst, src, retn); | 631 | __asm_copy_to_user_4(dst, src, retn); |
| 595 | n -= 4; | 632 | n -= 4; |
| 633 | if (retn) | ||
| 634 | return retn + n; | ||
| 596 | } | 635 | } |
| 597 | 636 | ||
| 598 | switch (n) { | 637 | switch (n) { |
| @@ -609,6 +648,10 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, | |||
| 609 | break; | 648 | break; |
| 610 | } | 649 | } |
| 611 | 650 | ||
| 651 | /* | ||
| 652 | * If we get here, retn correctly reflects the number of failing | ||
| 653 | * bytes. | ||
| 654 | */ | ||
| 612 | return retn; | 655 | return retn; |
| 613 | } | 656 | } |
| 614 | EXPORT_SYMBOL(__copy_user); | 657 | EXPORT_SYMBOL(__copy_user); |
| @@ -617,16 +660,14 @@ EXPORT_SYMBOL(__copy_user); | |||
| 617 | __asm_copy_user_cont(to, from, ret, \ | 660 | __asm_copy_user_cont(to, from, ret, \ |
| 618 | " GETB D1Ar1,[%1++]\n" \ | 661 | " GETB D1Ar1,[%1++]\n" \ |
| 619 | "2: SETB [%0++],D1Ar1\n", \ | 662 | "2: SETB [%0++],D1Ar1\n", \ |
| 620 | "3: ADD %2,%2,#1\n" \ | 663 | "3: ADD %2,%2,#1\n", \ |
| 621 | " SETB [%0++],D1Ar1\n", \ | ||
| 622 | " .long 2b,3b\n") | 664 | " .long 2b,3b\n") |
| 623 | 665 | ||
| 624 | #define __asm_copy_from_user_2x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | 666 | #define __asm_copy_from_user_2x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ |
| 625 | __asm_copy_user_cont(to, from, ret, \ | 667 | __asm_copy_user_cont(to, from, ret, \ |
| 626 | " GETW D1Ar1,[%1++]\n" \ | 668 | " GETW D1Ar1,[%1++]\n" \ |
| 627 | "2: SETW [%0++],D1Ar1\n" COPY, \ | 669 | "2: SETW [%0++],D1Ar1\n" COPY, \ |
| 628 | "3: ADD %2,%2,#2\n" \ | 670 | "3: ADD %2,%2,#2\n" FIXUP, \ |
| 629 | " SETW [%0++],D1Ar1\n" FIXUP, \ | ||
| 630 | " .long 2b,3b\n" TENTRY) | 671 | " .long 2b,3b\n" TENTRY) |
| 631 | 672 | ||
| 632 | #define __asm_copy_from_user_2(to, from, ret) \ | 673 | #define __asm_copy_from_user_2(to, from, ret) \ |
| @@ -636,145 +677,26 @@ EXPORT_SYMBOL(__copy_user); | |||
| 636 | __asm_copy_from_user_2x_cont(to, from, ret, \ | 677 | __asm_copy_from_user_2x_cont(to, from, ret, \ |
| 637 | " GETB D1Ar1,[%1++]\n" \ | 678 | " GETB D1Ar1,[%1++]\n" \ |
| 638 | "4: SETB [%0++],D1Ar1\n", \ | 679 | "4: SETB [%0++],D1Ar1\n", \ |
| 639 | "5: ADD %2,%2,#1\n" \ | 680 | "5: ADD %2,%2,#1\n", \ |
| 640 | " SETB [%0++],D1Ar1\n", \ | ||
| 641 | " .long 4b,5b\n") | 681 | " .long 4b,5b\n") |
| 642 | 682 | ||
| 643 | #define __asm_copy_from_user_4x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | 683 | #define __asm_copy_from_user_4x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ |
| 644 | __asm_copy_user_cont(to, from, ret, \ | 684 | __asm_copy_user_cont(to, from, ret, \ |
| 645 | " GETD D1Ar1,[%1++]\n" \ | 685 | " GETD D1Ar1,[%1++]\n" \ |
| 646 | "2: SETD [%0++],D1Ar1\n" COPY, \ | 686 | "2: SETD [%0++],D1Ar1\n" COPY, \ |
| 647 | "3: ADD %2,%2,#4\n" \ | 687 | "3: ADD %2,%2,#4\n" FIXUP, \ |
| 648 | " SETD [%0++],D1Ar1\n" FIXUP, \ | ||
| 649 | " .long 2b,3b\n" TENTRY) | 688 | " .long 2b,3b\n" TENTRY) |
| 650 | 689 | ||
| 651 | #define __asm_copy_from_user_4(to, from, ret) \ | 690 | #define __asm_copy_from_user_4(to, from, ret) \ |
| 652 | __asm_copy_from_user_4x_cont(to, from, ret, "", "", "") | 691 | __asm_copy_from_user_4x_cont(to, from, ret, "", "", "") |
| 653 | 692 | ||
| 654 | #define __asm_copy_from_user_5(to, from, ret) \ | ||
| 655 | __asm_copy_from_user_4x_cont(to, from, ret, \ | ||
| 656 | " GETB D1Ar1,[%1++]\n" \ | ||
| 657 | "4: SETB [%0++],D1Ar1\n", \ | ||
| 658 | "5: ADD %2,%2,#1\n" \ | ||
| 659 | " SETB [%0++],D1Ar1\n", \ | ||
| 660 | " .long 4b,5b\n") | ||
| 661 | |||
| 662 | #define __asm_copy_from_user_6x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
| 663 | __asm_copy_from_user_4x_cont(to, from, ret, \ | ||
| 664 | " GETW D1Ar1,[%1++]\n" \ | ||
| 665 | "4: SETW [%0++],D1Ar1\n" COPY, \ | ||
| 666 | "5: ADD %2,%2,#2\n" \ | ||
| 667 | " SETW [%0++],D1Ar1\n" FIXUP, \ | ||
| 668 | " .long 4b,5b\n" TENTRY) | ||
| 669 | |||
| 670 | #define __asm_copy_from_user_6(to, from, ret) \ | ||
| 671 | __asm_copy_from_user_6x_cont(to, from, ret, "", "", "") | ||
| 672 | |||
| 673 | #define __asm_copy_from_user_7(to, from, ret) \ | ||
| 674 | __asm_copy_from_user_6x_cont(to, from, ret, \ | ||
| 675 | " GETB D1Ar1,[%1++]\n" \ | ||
| 676 | "6: SETB [%0++],D1Ar1\n", \ | ||
| 677 | "7: ADD %2,%2,#1\n" \ | ||
| 678 | " SETB [%0++],D1Ar1\n", \ | ||
| 679 | " .long 6b,7b\n") | ||
| 680 | |||
| 681 | #define __asm_copy_from_user_8x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
| 682 | __asm_copy_from_user_4x_cont(to, from, ret, \ | ||
| 683 | " GETD D1Ar1,[%1++]\n" \ | ||
| 684 | "4: SETD [%0++],D1Ar1\n" COPY, \ | ||
| 685 | "5: ADD %2,%2,#4\n" \ | ||
| 686 | " SETD [%0++],D1Ar1\n" FIXUP, \ | ||
| 687 | " .long 4b,5b\n" TENTRY) | ||
| 688 | |||
| 689 | #define __asm_copy_from_user_8(to, from, ret) \ | ||
| 690 | __asm_copy_from_user_8x_cont(to, from, ret, "", "", "") | ||
| 691 | |||
| 692 | #define __asm_copy_from_user_9(to, from, ret) \ | ||
| 693 | __asm_copy_from_user_8x_cont(to, from, ret, \ | ||
| 694 | " GETB D1Ar1,[%1++]\n" \ | ||
| 695 | "6: SETB [%0++],D1Ar1\n", \ | ||
| 696 | "7: ADD %2,%2,#1\n" \ | ||
| 697 | " SETB [%0++],D1Ar1\n", \ | ||
| 698 | " .long 6b,7b\n") | ||
| 699 | |||
| 700 | #define __asm_copy_from_user_10x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
| 701 | __asm_copy_from_user_8x_cont(to, from, ret, \ | ||
| 702 | " GETW D1Ar1,[%1++]\n" \ | ||
| 703 | "6: SETW [%0++],D1Ar1\n" COPY, \ | ||
| 704 | "7: ADD %2,%2,#2\n" \ | ||
| 705 | " SETW [%0++],D1Ar1\n" FIXUP, \ | ||
| 706 | " .long 6b,7b\n" TENTRY) | ||
| 707 | |||
| 708 | #define __asm_copy_from_user_10(to, from, ret) \ | ||
| 709 | __asm_copy_from_user_10x_cont(to, from, ret, "", "", "") | ||
| 710 | |||
| 711 | #define __asm_copy_from_user_11(to, from, ret) \ | ||
| 712 | __asm_copy_from_user_10x_cont(to, from, ret, \ | ||
| 713 | " GETB D1Ar1,[%1++]\n" \ | ||
| 714 | "8: SETB [%0++],D1Ar1\n", \ | ||
| 715 | "9: ADD %2,%2,#1\n" \ | ||
| 716 | " SETB [%0++],D1Ar1\n", \ | ||
| 717 | " .long 8b,9b\n") | ||
| 718 | |||
| 719 | #define __asm_copy_from_user_12x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
| 720 | __asm_copy_from_user_8x_cont(to, from, ret, \ | ||
| 721 | " GETD D1Ar1,[%1++]\n" \ | ||
| 722 | "6: SETD [%0++],D1Ar1\n" COPY, \ | ||
| 723 | "7: ADD %2,%2,#4\n" \ | ||
| 724 | " SETD [%0++],D1Ar1\n" FIXUP, \ | ||
| 725 | " .long 6b,7b\n" TENTRY) | ||
| 726 | |||
| 727 | #define __asm_copy_from_user_12(to, from, ret) \ | ||
| 728 | __asm_copy_from_user_12x_cont(to, from, ret, "", "", "") | ||
| 729 | |||
| 730 | #define __asm_copy_from_user_13(to, from, ret) \ | ||
| 731 | __asm_copy_from_user_12x_cont(to, from, ret, \ | ||
| 732 | " GETB D1Ar1,[%1++]\n" \ | ||
| 733 | "8: SETB [%0++],D1Ar1\n", \ | ||
| 734 | "9: ADD %2,%2,#1\n" \ | ||
| 735 | " SETB [%0++],D1Ar1\n", \ | ||
| 736 | " .long 8b,9b\n") | ||
| 737 | |||
| 738 | #define __asm_copy_from_user_14x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
| 739 | __asm_copy_from_user_12x_cont(to, from, ret, \ | ||
| 740 | " GETW D1Ar1,[%1++]\n" \ | ||
| 741 | "8: SETW [%0++],D1Ar1\n" COPY, \ | ||
| 742 | "9: ADD %2,%2,#2\n" \ | ||
| 743 | " SETW [%0++],D1Ar1\n" FIXUP, \ | ||
| 744 | " .long 8b,9b\n" TENTRY) | ||
| 745 | |||
| 746 | #define __asm_copy_from_user_14(to, from, ret) \ | ||
| 747 | __asm_copy_from_user_14x_cont(to, from, ret, "", "", "") | ||
| 748 | |||
| 749 | #define __asm_copy_from_user_15(to, from, ret) \ | ||
| 750 | __asm_copy_from_user_14x_cont(to, from, ret, \ | ||
| 751 | " GETB D1Ar1,[%1++]\n" \ | ||
| 752 | "10: SETB [%0++],D1Ar1\n", \ | ||
| 753 | "11: ADD %2,%2,#1\n" \ | ||
| 754 | " SETB [%0++],D1Ar1\n", \ | ||
| 755 | " .long 10b,11b\n") | ||
| 756 | |||
| 757 | #define __asm_copy_from_user_16x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
| 758 | __asm_copy_from_user_12x_cont(to, from, ret, \ | ||
| 759 | " GETD D1Ar1,[%1++]\n" \ | ||
| 760 | "8: SETD [%0++],D1Ar1\n" COPY, \ | ||
| 761 | "9: ADD %2,%2,#4\n" \ | ||
| 762 | " SETD [%0++],D1Ar1\n" FIXUP, \ | ||
| 763 | " .long 8b,9b\n" TENTRY) | ||
| 764 | |||
| 765 | #define __asm_copy_from_user_16(to, from, ret) \ | ||
| 766 | __asm_copy_from_user_16x_cont(to, from, ret, "", "", "") | ||
| 767 | |||
| 768 | #define __asm_copy_from_user_8x64(to, from, ret) \ | 693 | #define __asm_copy_from_user_8x64(to, from, ret) \ |
| 769 | asm volatile ( \ | 694 | asm volatile ( \ |
| 770 | " GETL D0Ar2,D1Ar1,[%1++]\n" \ | 695 | " GETL D0Ar2,D1Ar1,[%1++]\n" \ |
| 771 | "2: SETL [%0++],D0Ar2,D1Ar1\n" \ | 696 | "2: SETL [%0++],D0Ar2,D1Ar1\n" \ |
| 772 | "1:\n" \ | 697 | "1:\n" \ |
| 773 | " .section .fixup,\"ax\"\n" \ | 698 | " .section .fixup,\"ax\"\n" \ |
| 774 | " MOV D1Ar1,#0\n" \ | ||
| 775 | " MOV D0Ar2,#0\n" \ | ||
| 776 | "3: ADD %2,%2,#8\n" \ | 699 | "3: ADD %2,%2,#8\n" \ |
| 777 | " SETL [%0++],D0Ar2,D1Ar1\n" \ | ||
| 778 | " MOVT D0Ar2,#HI(1b)\n" \ | 700 | " MOVT D0Ar2,#HI(1b)\n" \ |
| 779 | " JUMP D0Ar2,#LO(1b)\n" \ | 701 | " JUMP D0Ar2,#LO(1b)\n" \ |
| 780 | " .previous\n" \ | 702 | " .previous\n" \ |
| @@ -789,36 +711,57 @@ EXPORT_SYMBOL(__copy_user); | |||
| 789 | * | 711 | * |
| 790 | * Rationale: | 712 | * Rationale: |
| 791 | * A fault occurs while reading from user buffer, which is the | 713 | * A fault occurs while reading from user buffer, which is the |
| 792 | * source. Since the fault is at a single address, we only | 714 | * source. |
| 793 | * need to rewind by 8 bytes. | ||
| 794 | * Since we don't write to kernel buffer until we read first, | 715 | * Since we don't write to kernel buffer until we read first, |
| 795 | * the kernel buffer is at the right state and needn't be | 716 | * the kernel buffer is at the right state and needn't be |
| 796 | * corrected. | 717 | * corrected, but the source must be rewound to the beginning of |
| 718 | * the block, which is LSM_STEP*8 bytes. | ||
| 719 | * LSM_STEP is bits 10:8 in TXSTATUS which is already read | ||
| 720 | * and stored in D0Ar2 | ||
| 721 | * | ||
| 722 | * NOTE: If a fault occurs at the last operation in M{G,S}ETL | ||
| 723 | * LSM_STEP will be 0. ie: we do 4 writes in our case, if | ||
| 724 | * a fault happens at the 4th write, LSM_STEP will be 0 | ||
| 725 | * instead of 4. The code copes with that. | ||
| 797 | */ | 726 | */ |
| 798 | #define __asm_copy_from_user_64bit_rapf_loop(to, from, ret, n, id) \ | 727 | #define __asm_copy_from_user_64bit_rapf_loop(to, from, ret, n, id) \ |
| 799 | __asm_copy_user_64bit_rapf_loop(to, from, ret, n, id, \ | 728 | __asm_copy_user_64bit_rapf_loop(to, from, ret, n, id, \ |
| 800 | "SUB %1, %1, #8\n") | 729 | "LSR D0Ar2, D0Ar2, #5\n" \ |
| 730 | "ANDS D0Ar2, D0Ar2, #0x38\n" \ | ||
| 731 | "ADDZ D0Ar2, D0Ar2, #32\n" \ | ||
| 732 | "SUB %1, %1, D0Ar2\n") | ||
| 801 | 733 | ||
| 802 | /* rewind 'from' pointer when a fault occurs | 734 | /* rewind 'from' pointer when a fault occurs |
| 803 | * | 735 | * |
| 804 | * Rationale: | 736 | * Rationale: |
| 805 | * A fault occurs while reading from user buffer, which is the | 737 | * A fault occurs while reading from user buffer, which is the |
| 806 | * source. Since the fault is at a single address, we only | 738 | * source. |
| 807 | * need to rewind by 4 bytes. | ||
| 808 | * Since we don't write to kernel buffer until we read first, | 739 | * Since we don't write to kernel buffer until we read first, |
| 809 | * the kernel buffer is at the right state and needn't be | 740 | * the kernel buffer is at the right state and needn't be |
| 810 | * corrected. | 741 | * corrected, but the source must be rewound to the beginning of |
| 742 | * the block, which is LSM_STEP*4 bytes. | ||
| 743 | * LSM_STEP is bits 10:8 in TXSTATUS which is already read | ||
| 744 | * and stored in D0Ar2 | ||
| 745 | * | ||
| 746 | * NOTE: If a fault occurs at the last operation in M{G,S}ETL | ||
| 747 | * LSM_STEP will be 0. ie: we do 4 writes in our case, if | ||
| 748 | * a fault happens at the 4th write, LSM_STEP will be 0 | ||
| 749 | * instead of 4. The code copes with that. | ||
| 811 | */ | 750 | */ |
| 812 | #define __asm_copy_from_user_32bit_rapf_loop(to, from, ret, n, id) \ | 751 | #define __asm_copy_from_user_32bit_rapf_loop(to, from, ret, n, id) \ |
| 813 | __asm_copy_user_32bit_rapf_loop(to, from, ret, n, id, \ | 752 | __asm_copy_user_32bit_rapf_loop(to, from, ret, n, id, \ |
| 814 | "SUB %1, %1, #4\n") | 753 | "LSR D0Ar2, D0Ar2, #6\n" \ |
| 754 | "ANDS D0Ar2, D0Ar2, #0x1c\n" \ | ||
| 755 | "ADDZ D0Ar2, D0Ar2, #16\n" \ | ||
| 756 | "SUB %1, %1, D0Ar2\n") | ||
| 815 | 757 | ||
| 816 | 758 | ||
| 817 | /* Copy from user to kernel, zeroing the bytes that were inaccessible in | 759 | /* |
| 818 | userland. The return-value is the number of bytes that were | 760 | * Copy from user to kernel. The return-value is the number of bytes that were |
| 819 | inaccessible. */ | 761 | * inaccessible. |
| 820 | unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, | 762 | */ |
| 821 | unsigned long n) | 763 | unsigned long raw_copy_from_user(void *pdst, const void __user *psrc, |
| 764 | unsigned long n) | ||
| 822 | { | 765 | { |
| 823 | register char *dst asm ("A0.2") = pdst; | 766 | register char *dst asm ("A0.2") = pdst; |
| 824 | register const char __user *src asm ("A1.2") = psrc; | 767 | register const char __user *src asm ("A1.2") = psrc; |
| @@ -830,6 +773,8 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, | |||
| 830 | if ((unsigned long) src & 1) { | 773 | if ((unsigned long) src & 1) { |
| 831 | __asm_copy_from_user_1(dst, src, retn); | 774 | __asm_copy_from_user_1(dst, src, retn); |
| 832 | n--; | 775 | n--; |
| 776 | if (retn) | ||
| 777 | return retn + n; | ||
| 833 | } | 778 | } |
| 834 | if ((unsigned long) dst & 1) { | 779 | if ((unsigned long) dst & 1) { |
| 835 | /* Worst case - byte copy */ | 780 | /* Worst case - byte copy */ |
| @@ -837,12 +782,14 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, | |||
| 837 | __asm_copy_from_user_1(dst, src, retn); | 782 | __asm_copy_from_user_1(dst, src, retn); |
| 838 | n--; | 783 | n--; |
| 839 | if (retn) | 784 | if (retn) |
| 840 | goto copy_exception_bytes; | 785 | return retn + n; |
| 841 | } | 786 | } |
| 842 | } | 787 | } |
| 843 | if (((unsigned long) src & 2) && n >= 2) { | 788 | if (((unsigned long) src & 2) && n >= 2) { |
| 844 | __asm_copy_from_user_2(dst, src, retn); | 789 | __asm_copy_from_user_2(dst, src, retn); |
| 845 | n -= 2; | 790 | n -= 2; |
| 791 | if (retn) | ||
| 792 | return retn + n; | ||
| 846 | } | 793 | } |
| 847 | if ((unsigned long) dst & 2) { | 794 | if ((unsigned long) dst & 2) { |
| 848 | /* Second worst case - word copy */ | 795 | /* Second worst case - word copy */ |
| @@ -850,16 +797,10 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, | |||
| 850 | __asm_copy_from_user_2(dst, src, retn); | 797 | __asm_copy_from_user_2(dst, src, retn); |
| 851 | n -= 2; | 798 | n -= 2; |
| 852 | if (retn) | 799 | if (retn) |
| 853 | goto copy_exception_bytes; | 800 | return retn + n; |
| 854 | } | 801 | } |
| 855 | } | 802 | } |
| 856 | 803 | ||
| 857 | /* We only need one check after the unalignment-adjustments, | ||
| 858 | because if both adjustments were done, either both or | ||
| 859 | neither reference had an exception. */ | ||
| 860 | if (retn != 0) | ||
| 861 | goto copy_exception_bytes; | ||
| 862 | |||
| 863 | #ifdef USE_RAPF | 804 | #ifdef USE_RAPF |
| 864 | /* 64 bit copy loop */ | 805 | /* 64 bit copy loop */ |
| 865 | if (!(((unsigned long) src | (unsigned long) dst) & 7)) { | 806 | if (!(((unsigned long) src | (unsigned long) dst) & 7)) { |
| @@ -872,7 +813,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, | |||
| 872 | __asm_copy_from_user_8x64(dst, src, retn); | 813 | __asm_copy_from_user_8x64(dst, src, retn); |
| 873 | n -= 8; | 814 | n -= 8; |
| 874 | if (retn) | 815 | if (retn) |
| 875 | goto copy_exception_bytes; | 816 | return retn + n; |
| 876 | } | 817 | } |
| 877 | } | 818 | } |
| 878 | 819 | ||
| @@ -888,7 +829,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, | |||
| 888 | __asm_copy_from_user_8x64(dst, src, retn); | 829 | __asm_copy_from_user_8x64(dst, src, retn); |
| 889 | n -= 8; | 830 | n -= 8; |
| 890 | if (retn) | 831 | if (retn) |
| 891 | goto copy_exception_bytes; | 832 | return retn + n; |
| 892 | } | 833 | } |
| 893 | } | 834 | } |
| 894 | #endif | 835 | #endif |
| @@ -898,7 +839,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, | |||
| 898 | n -= 4; | 839 | n -= 4; |
| 899 | 840 | ||
| 900 | if (retn) | 841 | if (retn) |
| 901 | goto copy_exception_bytes; | 842 | return retn + n; |
| 902 | } | 843 | } |
| 903 | 844 | ||
| 904 | /* If we get here, there were no memory read faults. */ | 845 | /* If we get here, there were no memory read faults. */ |
| @@ -924,21 +865,8 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, | |||
| 924 | /* If we get here, retn correctly reflects the number of failing | 865 | /* If we get here, retn correctly reflects the number of failing |
| 925 | bytes. */ | 866 | bytes. */ |
| 926 | return retn; | 867 | return retn; |
| 927 | |||
| 928 | copy_exception_bytes: | ||
| 929 | /* We already have "retn" bytes cleared, and need to clear the | ||
| 930 | remaining "n" bytes. A non-optimized simple byte-for-byte in-line | ||
| 931 | memset is preferred here, since this isn't speed-critical code and | ||
| 932 | we'd rather have this a leaf-function than calling memset. */ | ||
| 933 | { | ||
| 934 | char *endp; | ||
| 935 | for (endp = dst + n; dst < endp; dst++) | ||
| 936 | *dst = 0; | ||
| 937 | } | ||
| 938 | |||
| 939 | return retn + n; | ||
| 940 | } | 868 | } |
| 941 | EXPORT_SYMBOL(__copy_user_zeroing); | 869 | EXPORT_SYMBOL(raw_copy_from_user); |
| 942 | 870 | ||
| 943 | #define __asm_clear_8x64(to, ret) \ | 871 | #define __asm_clear_8x64(to, ret) \ |
| 944 | asm volatile ( \ | 872 | asm volatile ( \ |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index a008a9f03072..e0bb576410bb 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -1531,7 +1531,7 @@ config CPU_MIPS64_R6 | |||
| 1531 | select CPU_SUPPORTS_HIGHMEM | 1531 | select CPU_SUPPORTS_HIGHMEM |
| 1532 | select CPU_SUPPORTS_MSA | 1532 | select CPU_SUPPORTS_MSA |
| 1533 | select GENERIC_CSUM | 1533 | select GENERIC_CSUM |
| 1534 | select MIPS_O32_FP64_SUPPORT if MIPS32_O32 | 1534 | select MIPS_O32_FP64_SUPPORT if 32BIT || MIPS32_O32 |
| 1535 | select HAVE_KVM | 1535 | select HAVE_KVM |
| 1536 | help | 1536 | help |
| 1537 | Choose this option to build a kernel for release 6 or later of the | 1537 | Choose this option to build a kernel for release 6 or later of the |
diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h index f94455f964ec..a2813fe381cf 100644 --- a/arch/mips/include/asm/fpu.h +++ b/arch/mips/include/asm/fpu.h | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <asm/cpu-features.h> | 21 | #include <asm/cpu-features.h> |
| 22 | #include <asm/fpu_emulator.h> | 22 | #include <asm/fpu_emulator.h> |
| 23 | #include <asm/hazards.h> | 23 | #include <asm/hazards.h> |
| 24 | #include <asm/ptrace.h> | ||
| 24 | #include <asm/processor.h> | 25 | #include <asm/processor.h> |
| 25 | #include <asm/current.h> | 26 | #include <asm/current.h> |
| 26 | #include <asm/msa.h> | 27 | #include <asm/msa.h> |
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h index 956db6e201d1..ddd1c918103b 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h | |||
| @@ -18,9 +18,24 @@ | |||
| 18 | #include <irq.h> | 18 | #include <irq.h> |
| 19 | 19 | ||
| 20 | #define IRQ_STACK_SIZE THREAD_SIZE | 20 | #define IRQ_STACK_SIZE THREAD_SIZE |
| 21 | #define IRQ_STACK_START (IRQ_STACK_SIZE - sizeof(unsigned long)) | ||
| 21 | 22 | ||
| 22 | extern void *irq_stack[NR_CPUS]; | 23 | extern void *irq_stack[NR_CPUS]; |
| 23 | 24 | ||
| 25 | /* | ||
| 26 | * The highest address on the IRQ stack contains a dummy frame put down in | ||
| 27 | * genex.S (handle_int & except_vec_vi_handler) which is structured as follows: | ||
| 28 | * | ||
| 29 | * top ------------ | ||
| 30 | * | task sp | <- irq_stack[cpu] + IRQ_STACK_START | ||
| 31 | * ------------ | ||
| 32 | * | | <- First frame of IRQ context | ||
| 33 | * ------------ | ||
| 34 | * | ||
| 35 | * task sp holds a copy of the task stack pointer where the struct pt_regs | ||
| 36 | * from exception entry can be found. | ||
| 37 | */ | ||
| 38 | |||
| 24 | static inline bool on_irq_stack(int cpu, unsigned long sp) | 39 | static inline bool on_irq_stack(int cpu, unsigned long sp) |
| 25 | { | 40 | { |
| 26 | unsigned long low = (unsigned long)irq_stack[cpu]; | 41 | unsigned long low = (unsigned long)irq_stack[cpu]; |
diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h index f485afe51514..a8df44d60607 100644 --- a/arch/mips/include/asm/spinlock.h +++ b/arch/mips/include/asm/spinlock.h | |||
| @@ -127,7 +127,7 @@ static inline void arch_spin_lock(arch_spinlock_t *lock) | |||
| 127 | " andi %[ticket], %[ticket], 0xffff \n" | 127 | " andi %[ticket], %[ticket], 0xffff \n" |
| 128 | " bne %[ticket], %[my_ticket], 4f \n" | 128 | " bne %[ticket], %[my_ticket], 4f \n" |
| 129 | " subu %[ticket], %[my_ticket], %[ticket] \n" | 129 | " subu %[ticket], %[my_ticket], %[ticket] \n" |
| 130 | "2: \n" | 130 | "2: .insn \n" |
| 131 | " .subsection 2 \n" | 131 | " .subsection 2 \n" |
| 132 | "4: andi %[ticket], %[ticket], 0xffff \n" | 132 | "4: andi %[ticket], %[ticket], 0xffff \n" |
| 133 | " sll %[ticket], 5 \n" | 133 | " sll %[ticket], 5 \n" |
| @@ -202,7 +202,7 @@ static inline unsigned int arch_spin_trylock(arch_spinlock_t *lock) | |||
| 202 | " sc %[ticket], %[ticket_ptr] \n" | 202 | " sc %[ticket], %[ticket_ptr] \n" |
| 203 | " beqz %[ticket], 1b \n" | 203 | " beqz %[ticket], 1b \n" |
| 204 | " li %[ticket], 1 \n" | 204 | " li %[ticket], 1 \n" |
| 205 | "2: \n" | 205 | "2: .insn \n" |
| 206 | " .subsection 2 \n" | 206 | " .subsection 2 \n" |
| 207 | "3: b 2b \n" | 207 | "3: b 2b \n" |
| 208 | " li %[ticket], 0 \n" | 208 | " li %[ticket], 0 \n" |
| @@ -382,7 +382,7 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) | |||
| 382 | " .set reorder \n" | 382 | " .set reorder \n" |
| 383 | __WEAK_LLSC_MB | 383 | __WEAK_LLSC_MB |
| 384 | " li %2, 1 \n" | 384 | " li %2, 1 \n" |
| 385 | "2: \n" | 385 | "2: .insn \n" |
| 386 | : "=" GCC_OFF_SMALL_ASM() (rw->lock), "=&r" (tmp), "=&r" (ret) | 386 | : "=" GCC_OFF_SMALL_ASM() (rw->lock), "=&r" (tmp), "=&r" (ret) |
| 387 | : GCC_OFF_SMALL_ASM() (rw->lock) | 387 | : GCC_OFF_SMALL_ASM() (rw->lock) |
| 388 | : "memory"); | 388 | : "memory"); |
| @@ -422,7 +422,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) | |||
| 422 | " lui %1, 0x8000 \n" | 422 | " lui %1, 0x8000 \n" |
| 423 | " sc %1, %0 \n" | 423 | " sc %1, %0 \n" |
| 424 | " li %2, 1 \n" | 424 | " li %2, 1 \n" |
| 425 | "2: \n" | 425 | "2: .insn \n" |
| 426 | : "=" GCC_OFF_SMALL_ASM() (rw->lock), "=&r" (tmp), | 426 | : "=" GCC_OFF_SMALL_ASM() (rw->lock), "=&r" (tmp), |
| 427 | "=&r" (ret) | 427 | "=&r" (ret) |
| 428 | : GCC_OFF_SMALL_ASM() (rw->lock) | 428 | : GCC_OFF_SMALL_ASM() (rw->lock) |
diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h index 3e940dbe0262..78faf4292e90 100644 --- a/arch/mips/include/uapi/asm/unistd.h +++ b/arch/mips/include/uapi/asm/unistd.h | |||
| @@ -386,17 +386,18 @@ | |||
| 386 | #define __NR_pkey_mprotect (__NR_Linux + 363) | 386 | #define __NR_pkey_mprotect (__NR_Linux + 363) |
| 387 | #define __NR_pkey_alloc (__NR_Linux + 364) | 387 | #define __NR_pkey_alloc (__NR_Linux + 364) |
| 388 | #define __NR_pkey_free (__NR_Linux + 365) | 388 | #define __NR_pkey_free (__NR_Linux + 365) |
| 389 | #define __NR_statx (__NR_Linux + 366) | ||
| 389 | 390 | ||
| 390 | 391 | ||
| 391 | /* | 392 | /* |
| 392 | * Offset of the last Linux o32 flavoured syscall | 393 | * Offset of the last Linux o32 flavoured syscall |
| 393 | */ | 394 | */ |
| 394 | #define __NR_Linux_syscalls 365 | 395 | #define __NR_Linux_syscalls 366 |
| 395 | 396 | ||
| 396 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 397 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
| 397 | 398 | ||
| 398 | #define __NR_O32_Linux 4000 | 399 | #define __NR_O32_Linux 4000 |
| 399 | #define __NR_O32_Linux_syscalls 365 | 400 | #define __NR_O32_Linux_syscalls 366 |
| 400 | 401 | ||
| 401 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 402 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
| 402 | 403 | ||
| @@ -730,16 +731,17 @@ | |||
| 730 | #define __NR_pkey_mprotect (__NR_Linux + 323) | 731 | #define __NR_pkey_mprotect (__NR_Linux + 323) |
| 731 | #define __NR_pkey_alloc (__NR_Linux + 324) | 732 | #define __NR_pkey_alloc (__NR_Linux + 324) |
| 732 | #define __NR_pkey_free (__NR_Linux + 325) | 733 | #define __NR_pkey_free (__NR_Linux + 325) |
| 734 | #define __NR_statx (__NR_Linux + 326) | ||
| 733 | 735 | ||
| 734 | /* | 736 | /* |
| 735 | * Offset of the last Linux 64-bit flavoured syscall | 737 | * Offset of the last Linux 64-bit flavoured syscall |
| 736 | */ | 738 | */ |
| 737 | #define __NR_Linux_syscalls 325 | 739 | #define __NR_Linux_syscalls 326 |
| 738 | 740 | ||
| 739 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ | 741 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
| 740 | 742 | ||
| 741 | #define __NR_64_Linux 5000 | 743 | #define __NR_64_Linux 5000 |
| 742 | #define __NR_64_Linux_syscalls 325 | 744 | #define __NR_64_Linux_syscalls 326 |
| 743 | 745 | ||
| 744 | #if _MIPS_SIM == _MIPS_SIM_NABI32 | 746 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
| 745 | 747 | ||
| @@ -1077,15 +1079,16 @@ | |||
| 1077 | #define __NR_pkey_mprotect (__NR_Linux + 327) | 1079 | #define __NR_pkey_mprotect (__NR_Linux + 327) |
| 1078 | #define __NR_pkey_alloc (__NR_Linux + 328) | 1080 | #define __NR_pkey_alloc (__NR_Linux + 328) |
| 1079 | #define __NR_pkey_free (__NR_Linux + 329) | 1081 | #define __NR_pkey_free (__NR_Linux + 329) |
| 1082 | #define __NR_statx (__NR_Linux + 330) | ||
| 1080 | 1083 | ||
| 1081 | /* | 1084 | /* |
| 1082 | * Offset of the last N32 flavoured syscall | 1085 | * Offset of the last N32 flavoured syscall |
| 1083 | */ | 1086 | */ |
| 1084 | #define __NR_Linux_syscalls 329 | 1087 | #define __NR_Linux_syscalls 330 |
| 1085 | 1088 | ||
| 1086 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 1089 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
| 1087 | 1090 | ||
| 1088 | #define __NR_N32_Linux 6000 | 1091 | #define __NR_N32_Linux 6000 |
| 1089 | #define __NR_N32_Linux_syscalls 329 | 1092 | #define __NR_N32_Linux_syscalls 330 |
| 1090 | 1093 | ||
| 1091 | #endif /* _UAPI_ASM_UNISTD_H */ | 1094 | #endif /* _UAPI_ASM_UNISTD_H */ |
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c index bb5c5d34ba81..a670c0c11875 100644 --- a/arch/mips/kernel/asm-offsets.c +++ b/arch/mips/kernel/asm-offsets.c | |||
| @@ -102,6 +102,7 @@ void output_thread_info_defines(void) | |||
| 102 | DEFINE(_THREAD_SIZE, THREAD_SIZE); | 102 | DEFINE(_THREAD_SIZE, THREAD_SIZE); |
| 103 | DEFINE(_THREAD_MASK, THREAD_MASK); | 103 | DEFINE(_THREAD_MASK, THREAD_MASK); |
| 104 | DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE); | 104 | DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE); |
| 105 | DEFINE(_IRQ_STACK_START, IRQ_STACK_START); | ||
| 105 | BLANK(); | 106 | BLANK(); |
| 106 | } | 107 | } |
| 107 | 108 | ||
diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S index 59476a607add..a00e87b0256d 100644 --- a/arch/mips/kernel/cps-vec.S +++ b/arch/mips/kernel/cps-vec.S | |||
| @@ -361,7 +361,7 @@ LEAF(mips_cps_get_bootcfg) | |||
| 361 | END(mips_cps_get_bootcfg) | 361 | END(mips_cps_get_bootcfg) |
| 362 | 362 | ||
| 363 | LEAF(mips_cps_boot_vpes) | 363 | LEAF(mips_cps_boot_vpes) |
| 364 | PTR_L ta2, COREBOOTCFG_VPEMASK(a0) | 364 | lw ta2, COREBOOTCFG_VPEMASK(a0) |
| 365 | PTR_L ta3, COREBOOTCFG_VPECONFIG(a0) | 365 | PTR_L ta3, COREBOOTCFG_VPECONFIG(a0) |
| 366 | 366 | ||
| 367 | #if defined(CONFIG_CPU_MIPSR6) | 367 | #if defined(CONFIG_CPU_MIPSR6) |
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 07718bb5fc9d..12422fd4af23 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
| @@ -1824,7 +1824,7 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) | |||
| 1824 | } | 1824 | } |
| 1825 | 1825 | ||
| 1826 | decode_configs(c); | 1826 | decode_configs(c); |
| 1827 | c->options |= MIPS_CPU_TLBINV | MIPS_CPU_LDPTE; | 1827 | c->options |= MIPS_CPU_FTLB | MIPS_CPU_TLBINV | MIPS_CPU_LDPTE; |
| 1828 | c->writecombine = _CACHE_UNCACHED_ACCELERATED; | 1828 | c->writecombine = _CACHE_UNCACHED_ACCELERATED; |
| 1829 | break; | 1829 | break; |
| 1830 | default: | 1830 | default: |
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index 7ec9612cb007..ae810da4d499 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S | |||
| @@ -215,9 +215,11 @@ NESTED(handle_int, PT_SIZE, sp) | |||
| 215 | beq t0, t1, 2f | 215 | beq t0, t1, 2f |
| 216 | 216 | ||
| 217 | /* Switch to IRQ stack */ | 217 | /* Switch to IRQ stack */ |
| 218 | li t1, _IRQ_STACK_SIZE | 218 | li t1, _IRQ_STACK_START |
| 219 | PTR_ADD sp, t0, t1 | 219 | PTR_ADD sp, t0, t1 |
| 220 | 220 | ||
| 221 | /* Save task's sp on IRQ stack so that unwinding can follow it */ | ||
| 222 | LONG_S s1, 0(sp) | ||
| 221 | 2: | 223 | 2: |
| 222 | jal plat_irq_dispatch | 224 | jal plat_irq_dispatch |
| 223 | 225 | ||
| @@ -325,9 +327,11 @@ NESTED(except_vec_vi_handler, 0, sp) | |||
| 325 | beq t0, t1, 2f | 327 | beq t0, t1, 2f |
| 326 | 328 | ||
| 327 | /* Switch to IRQ stack */ | 329 | /* Switch to IRQ stack */ |
| 328 | li t1, _IRQ_STACK_SIZE | 330 | li t1, _IRQ_STACK_START |
| 329 | PTR_ADD sp, t0, t1 | 331 | PTR_ADD sp, t0, t1 |
| 330 | 332 | ||
| 333 | /* Save task's sp on IRQ stack so that unwinding can follow it */ | ||
| 334 | LONG_S s1, 0(sp) | ||
| 331 | 2: | 335 | 2: |
| 332 | jalr v0 | 336 | jalr v0 |
| 333 | 337 | ||
| @@ -519,7 +523,7 @@ NESTED(nmi_handler, PT_SIZE, sp) | |||
| 519 | BUILD_HANDLER reserved reserved sti verbose /* others */ | 523 | BUILD_HANDLER reserved reserved sti verbose /* others */ |
| 520 | 524 | ||
| 521 | .align 5 | 525 | .align 5 |
| 522 | LEAF(handle_ri_rdhwr_vivt) | 526 | LEAF(handle_ri_rdhwr_tlbp) |
| 523 | .set push | 527 | .set push |
| 524 | .set noat | 528 | .set noat |
| 525 | .set noreorder | 529 | .set noreorder |
| @@ -538,7 +542,7 @@ NESTED(nmi_handler, PT_SIZE, sp) | |||
| 538 | .set pop | 542 | .set pop |
| 539 | bltz k1, handle_ri /* slow path */ | 543 | bltz k1, handle_ri /* slow path */ |
| 540 | /* fall thru */ | 544 | /* fall thru */ |
| 541 | END(handle_ri_rdhwr_vivt) | 545 | END(handle_ri_rdhwr_tlbp) |
| 542 | 546 | ||
| 543 | LEAF(handle_ri_rdhwr) | 547 | LEAF(handle_ri_rdhwr) |
| 544 | .set push | 548 | .set push |
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index fb6b6b650719..b68e10fc453d 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c | |||
| @@ -488,31 +488,52 @@ unsigned long notrace unwind_stack_by_address(unsigned long stack_page, | |||
| 488 | unsigned long pc, | 488 | unsigned long pc, |
| 489 | unsigned long *ra) | 489 | unsigned long *ra) |
| 490 | { | 490 | { |
| 491 | unsigned long low, high, irq_stack_high; | ||
| 491 | struct mips_frame_info info; | 492 | struct mips_frame_info info; |
| 492 | unsigned long size, ofs; | 493 | unsigned long size, ofs; |
| 494 | struct pt_regs *regs; | ||
| 493 | int leaf; | 495 | int leaf; |
| 494 | extern void ret_from_irq(void); | ||
| 495 | extern void ret_from_exception(void); | ||
| 496 | 496 | ||
| 497 | if (!stack_page) | 497 | if (!stack_page) |
| 498 | return 0; | 498 | return 0; |
| 499 | 499 | ||
| 500 | /* | 500 | /* |
| 501 | * If we reached the bottom of interrupt context, | 501 | * IRQ stacks start at IRQ_STACK_START |
| 502 | * return saved pc in pt_regs. | 502 | * task stacks at THREAD_SIZE - 32 |
| 503 | */ | 503 | */ |
| 504 | if (pc == (unsigned long)ret_from_irq || | 504 | low = stack_page; |
| 505 | pc == (unsigned long)ret_from_exception) { | 505 | if (!preemptible() && on_irq_stack(raw_smp_processor_id(), *sp)) { |
| 506 | struct pt_regs *regs; | 506 | high = stack_page + IRQ_STACK_START; |
| 507 | if (*sp >= stack_page && | 507 | irq_stack_high = high; |
| 508 | *sp + sizeof(*regs) <= stack_page + THREAD_SIZE - 32) { | 508 | } else { |
| 509 | regs = (struct pt_regs *)*sp; | 509 | high = stack_page + THREAD_SIZE - 32; |
| 510 | pc = regs->cp0_epc; | 510 | irq_stack_high = 0; |
| 511 | if (!user_mode(regs) && __kernel_text_address(pc)) { | 511 | } |
| 512 | *sp = regs->regs[29]; | 512 | |
| 513 | *ra = regs->regs[31]; | 513 | /* |
| 514 | return pc; | 514 | * If we reached the top of the interrupt stack, start unwinding |
| 515 | } | 515 | * the interrupted task stack. |
| 516 | */ | ||
| 517 | if (unlikely(*sp == irq_stack_high)) { | ||
| 518 | unsigned long task_sp = *(unsigned long *)*sp; | ||
| 519 | |||
| 520 | /* | ||
| 521 | * Check that the pointer saved in the IRQ stack head points to | ||
| 522 | * something within the stack of the current task | ||
| 523 | */ | ||
| 524 | if (!object_is_on_stack((void *)task_sp)) | ||
| 525 | return 0; | ||
| 526 | |||
| 527 | /* | ||
| 528 | * Follow pointer to tasks kernel stack frame where interrupted | ||
| 529 | * state was saved. | ||
| 530 | */ | ||
| 531 | regs = (struct pt_regs *)task_sp; | ||
| 532 | pc = regs->cp0_epc; | ||
| 533 | if (!user_mode(regs) && __kernel_text_address(pc)) { | ||
| 534 | *sp = regs->regs[29]; | ||
| 535 | *ra = regs->regs[31]; | ||
| 536 | return pc; | ||
| 516 | } | 537 | } |
| 517 | return 0; | 538 | return 0; |
| 518 | } | 539 | } |
| @@ -533,8 +554,7 @@ unsigned long notrace unwind_stack_by_address(unsigned long stack_page, | |||
| 533 | if (leaf < 0) | 554 | if (leaf < 0) |
| 534 | return 0; | 555 | return 0; |
| 535 | 556 | ||
| 536 | if (*sp < stack_page || | 557 | if (*sp < low || *sp + info.frame_size > high) |
| 537 | *sp + info.frame_size > stack_page + THREAD_SIZE - 32) | ||
| 538 | return 0; | 558 | return 0; |
| 539 | 559 | ||
| 540 | if (leaf) | 560 | if (leaf) |
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index 339601267265..6931fe722a0b 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c | |||
| @@ -456,7 +456,8 @@ static int fpr_set(struct task_struct *target, | |||
| 456 | &target->thread.fpu, | 456 | &target->thread.fpu, |
| 457 | 0, sizeof(elf_fpregset_t)); | 457 | 0, sizeof(elf_fpregset_t)); |
| 458 | 458 | ||
| 459 | for (i = 0; i < NUM_FPU_REGS; i++) { | 459 | BUILD_BUG_ON(sizeof(fpr_val) != sizeof(elf_fpreg_t)); |
| 460 | for (i = 0; i < NUM_FPU_REGS && count >= sizeof(elf_fpreg_t); i++) { | ||
| 460 | err = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 461 | err = user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
| 461 | &fpr_val, i * sizeof(elf_fpreg_t), | 462 | &fpr_val, i * sizeof(elf_fpreg_t), |
| 462 | (i + 1) * sizeof(elf_fpreg_t)); | 463 | (i + 1) * sizeof(elf_fpreg_t)); |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index c29d397eee86..80ed68b2c95e 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -600,3 +600,4 @@ EXPORT(sys_call_table) | |||
| 600 | PTR sys_pkey_mprotect | 600 | PTR sys_pkey_mprotect |
| 601 | PTR sys_pkey_alloc | 601 | PTR sys_pkey_alloc |
| 602 | PTR sys_pkey_free /* 4365 */ | 602 | PTR sys_pkey_free /* 4365 */ |
| 603 | PTR sys_statx | ||
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 0687f96ee912..49765b44aa9b 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
| @@ -438,4 +438,5 @@ EXPORT(sys_call_table) | |||
| 438 | PTR sys_pkey_mprotect | 438 | PTR sys_pkey_mprotect |
| 439 | PTR sys_pkey_alloc | 439 | PTR sys_pkey_alloc |
| 440 | PTR sys_pkey_free /* 5325 */ | 440 | PTR sys_pkey_free /* 5325 */ |
| 441 | PTR sys_statx | ||
| 441 | .size sys_call_table,.-sys_call_table | 442 | .size sys_call_table,.-sys_call_table |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 0331ba39a065..90bad2d1b2d3 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -433,4 +433,5 @@ EXPORT(sysn32_call_table) | |||
| 433 | PTR sys_pkey_mprotect | 433 | PTR sys_pkey_mprotect |
| 434 | PTR sys_pkey_alloc | 434 | PTR sys_pkey_alloc |
| 435 | PTR sys_pkey_free | 435 | PTR sys_pkey_free |
| 436 | PTR sys_statx /* 6330 */ | ||
| 436 | .size sysn32_call_table,.-sysn32_call_table | 437 | .size sysn32_call_table,.-sysn32_call_table |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 5a47042dd25f..2dd70bd104e1 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -588,4 +588,5 @@ EXPORT(sys32_call_table) | |||
| 588 | PTR sys_pkey_mprotect | 588 | PTR sys_pkey_mprotect |
| 589 | PTR sys_pkey_alloc | 589 | PTR sys_pkey_alloc |
| 590 | PTR sys_pkey_free /* 4365 */ | 590 | PTR sys_pkey_free /* 4365 */ |
| 591 | PTR sys_statx | ||
| 591 | .size sys32_call_table,.-sys32_call_table | 592 | .size sys32_call_table,.-sys32_call_table |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index c7d17cfb32f6..b49e7bf9f950 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -83,7 +83,7 @@ extern asmlinkage void handle_dbe(void); | |||
| 83 | extern asmlinkage void handle_sys(void); | 83 | extern asmlinkage void handle_sys(void); |
| 84 | extern asmlinkage void handle_bp(void); | 84 | extern asmlinkage void handle_bp(void); |
| 85 | extern asmlinkage void handle_ri(void); | 85 | extern asmlinkage void handle_ri(void); |
| 86 | extern asmlinkage void handle_ri_rdhwr_vivt(void); | 86 | extern asmlinkage void handle_ri_rdhwr_tlbp(void); |
| 87 | extern asmlinkage void handle_ri_rdhwr(void); | 87 | extern asmlinkage void handle_ri_rdhwr(void); |
| 88 | extern asmlinkage void handle_cpu(void); | 88 | extern asmlinkage void handle_cpu(void); |
| 89 | extern asmlinkage void handle_ov(void); | 89 | extern asmlinkage void handle_ov(void); |
| @@ -2408,9 +2408,18 @@ void __init trap_init(void) | |||
| 2408 | 2408 | ||
| 2409 | set_except_vector(EXCCODE_SYS, handle_sys); | 2409 | set_except_vector(EXCCODE_SYS, handle_sys); |
| 2410 | set_except_vector(EXCCODE_BP, handle_bp); | 2410 | set_except_vector(EXCCODE_BP, handle_bp); |
| 2411 | set_except_vector(EXCCODE_RI, rdhwr_noopt ? handle_ri : | 2411 | |
| 2412 | (cpu_has_vtag_icache ? | 2412 | if (rdhwr_noopt) |
| 2413 | handle_ri_rdhwr_vivt : handle_ri_rdhwr)); | 2413 | set_except_vector(EXCCODE_RI, handle_ri); |
| 2414 | else { | ||
| 2415 | if (cpu_has_vtag_icache) | ||
| 2416 | set_except_vector(EXCCODE_RI, handle_ri_rdhwr_tlbp); | ||
| 2417 | else if (current_cpu_type() == CPU_LOONGSON3) | ||
| 2418 | set_except_vector(EXCCODE_RI, handle_ri_rdhwr_tlbp); | ||
| 2419 | else | ||
| 2420 | set_except_vector(EXCCODE_RI, handle_ri_rdhwr); | ||
| 2421 | } | ||
| 2422 | |||
| 2414 | set_except_vector(EXCCODE_CPU, handle_cpu); | 2423 | set_except_vector(EXCCODE_CPU, handle_cpu); |
| 2415 | set_except_vector(EXCCODE_OV, handle_ov); | 2424 | set_except_vector(EXCCODE_OV, handle_ov); |
| 2416 | set_except_vector(EXCCODE_TR, handle_tr); | 2425 | set_except_vector(EXCCODE_TR, handle_tr); |
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c index 3c3aa05891dd..95bec460b651 100644 --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c | |||
| @@ -467,7 +467,7 @@ void __init ltq_soc_init(void) | |||
| 467 | 467 | ||
| 468 | if (!np_xbar) | 468 | if (!np_xbar) |
| 469 | panic("Failed to load xbar nodes from devicetree"); | 469 | panic("Failed to load xbar nodes from devicetree"); |
| 470 | if (of_address_to_resource(np_pmu, 0, &res_xbar)) | 470 | if (of_address_to_resource(np_xbar, 0, &res_xbar)) |
| 471 | panic("Failed to get xbar resources"); | 471 | panic("Failed to get xbar resources"); |
| 472 | if (!request_mem_region(res_xbar.start, resource_size(&res_xbar), | 472 | if (!request_mem_region(res_xbar.start, resource_size(&res_xbar), |
| 473 | res_xbar.name)) | 473 | res_xbar.name)) |
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index e7f798d55fbc..3fe99cb271a9 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
| @@ -1562,6 +1562,7 @@ static void probe_vcache(void) | |||
| 1562 | vcache_size = c->vcache.sets * c->vcache.ways * c->vcache.linesz; | 1562 | vcache_size = c->vcache.sets * c->vcache.ways * c->vcache.linesz; |
| 1563 | 1563 | ||
| 1564 | c->vcache.waybit = 0; | 1564 | c->vcache.waybit = 0; |
| 1565 | c->vcache.waysize = vcache_size / c->vcache.ways; | ||
| 1565 | 1566 | ||
| 1566 | pr_info("Unified victim cache %ldkB %s, linesize %d bytes.\n", | 1567 | pr_info("Unified victim cache %ldkB %s, linesize %d bytes.\n", |
| 1567 | vcache_size >> 10, way_string[c->vcache.ways], c->vcache.linesz); | 1568 | vcache_size >> 10, way_string[c->vcache.ways], c->vcache.linesz); |
| @@ -1664,6 +1665,7 @@ static void __init loongson3_sc_init(void) | |||
| 1664 | /* Loongson-3 has 4 cores, 1MB scache for each. scaches are shared */ | 1665 | /* Loongson-3 has 4 cores, 1MB scache for each. scaches are shared */ |
| 1665 | scache_size *= 4; | 1666 | scache_size *= 4; |
| 1666 | c->scache.waybit = 0; | 1667 | c->scache.waybit = 0; |
| 1668 | c->scache.waysize = scache_size / c->scache.ways; | ||
| 1667 | pr_info("Unified secondary cache %ldkB %s, linesize %d bytes.\n", | 1669 | pr_info("Unified secondary cache %ldkB %s, linesize %d bytes.\n", |
| 1668 | scache_size >> 10, way_string[c->scache.ways], c->scache.linesz); | 1670 | scache_size >> 10, way_string[c->scache.ways], c->scache.linesz); |
| 1669 | if (scache_size) | 1671 | if (scache_size) |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 9bfee8988eaf..4f642e07c2b1 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
| @@ -760,7 +760,8 @@ static void build_huge_update_entries(u32 **p, unsigned int pte, | |||
| 760 | static void build_huge_handler_tail(u32 **p, struct uasm_reloc **r, | 760 | static void build_huge_handler_tail(u32 **p, struct uasm_reloc **r, |
| 761 | struct uasm_label **l, | 761 | struct uasm_label **l, |
| 762 | unsigned int pte, | 762 | unsigned int pte, |
| 763 | unsigned int ptr) | 763 | unsigned int ptr, |
| 764 | unsigned int flush) | ||
| 764 | { | 765 | { |
| 765 | #ifdef CONFIG_SMP | 766 | #ifdef CONFIG_SMP |
| 766 | UASM_i_SC(p, pte, 0, ptr); | 767 | UASM_i_SC(p, pte, 0, ptr); |
| @@ -769,6 +770,22 @@ static void build_huge_handler_tail(u32 **p, struct uasm_reloc **r, | |||
| 769 | #else | 770 | #else |
| 770 | UASM_i_SW(p, pte, 0, ptr); | 771 | UASM_i_SW(p, pte, 0, ptr); |
| 771 | #endif | 772 | #endif |
| 773 | if (cpu_has_ftlb && flush) { | ||
| 774 | BUG_ON(!cpu_has_tlbinv); | ||
| 775 | |||
| 776 | UASM_i_MFC0(p, ptr, C0_ENTRYHI); | ||
| 777 | uasm_i_ori(p, ptr, ptr, MIPS_ENTRYHI_EHINV); | ||
| 778 | UASM_i_MTC0(p, ptr, C0_ENTRYHI); | ||
| 779 | build_tlb_write_entry(p, l, r, tlb_indexed); | ||
| 780 | |||
| 781 | uasm_i_xori(p, ptr, ptr, MIPS_ENTRYHI_EHINV); | ||
| 782 | UASM_i_MTC0(p, ptr, C0_ENTRYHI); | ||
| 783 | build_huge_update_entries(p, pte, ptr); | ||
| 784 | build_huge_tlb_write_entry(p, l, r, pte, tlb_random, 0); | ||
| 785 | |||
| 786 | return; | ||
| 787 | } | ||
| 788 | |||
| 772 | build_huge_update_entries(p, pte, ptr); | 789 | build_huge_update_entries(p, pte, ptr); |
| 773 | build_huge_tlb_write_entry(p, l, r, pte, tlb_indexed, 0); | 790 | build_huge_tlb_write_entry(p, l, r, pte, tlb_indexed, 0); |
| 774 | } | 791 | } |
| @@ -2199,7 +2216,7 @@ static void build_r4000_tlb_load_handler(void) | |||
| 2199 | uasm_l_tlbl_goaround2(&l, p); | 2216 | uasm_l_tlbl_goaround2(&l, p); |
| 2200 | } | 2217 | } |
| 2201 | uasm_i_ori(&p, wr.r1, wr.r1, (_PAGE_ACCESSED | _PAGE_VALID)); | 2218 | uasm_i_ori(&p, wr.r1, wr.r1, (_PAGE_ACCESSED | _PAGE_VALID)); |
| 2202 | build_huge_handler_tail(&p, &r, &l, wr.r1, wr.r2); | 2219 | build_huge_handler_tail(&p, &r, &l, wr.r1, wr.r2, 1); |
| 2203 | #endif | 2220 | #endif |
| 2204 | 2221 | ||
| 2205 | uasm_l_nopage_tlbl(&l, p); | 2222 | uasm_l_nopage_tlbl(&l, p); |
| @@ -2254,7 +2271,7 @@ static void build_r4000_tlb_store_handler(void) | |||
| 2254 | build_tlb_probe_entry(&p); | 2271 | build_tlb_probe_entry(&p); |
| 2255 | uasm_i_ori(&p, wr.r1, wr.r1, | 2272 | uasm_i_ori(&p, wr.r1, wr.r1, |
| 2256 | _PAGE_ACCESSED | _PAGE_MODIFIED | _PAGE_VALID | _PAGE_DIRTY); | 2273 | _PAGE_ACCESSED | _PAGE_MODIFIED | _PAGE_VALID | _PAGE_DIRTY); |
| 2257 | build_huge_handler_tail(&p, &r, &l, wr.r1, wr.r2); | 2274 | build_huge_handler_tail(&p, &r, &l, wr.r1, wr.r2, 1); |
| 2258 | #endif | 2275 | #endif |
| 2259 | 2276 | ||
| 2260 | uasm_l_nopage_tlbs(&l, p); | 2277 | uasm_l_nopage_tlbs(&l, p); |
| @@ -2310,7 +2327,7 @@ static void build_r4000_tlb_modify_handler(void) | |||
| 2310 | build_tlb_probe_entry(&p); | 2327 | build_tlb_probe_entry(&p); |
| 2311 | uasm_i_ori(&p, wr.r1, wr.r1, | 2328 | uasm_i_ori(&p, wr.r1, wr.r1, |
| 2312 | _PAGE_ACCESSED | _PAGE_MODIFIED | _PAGE_VALID | _PAGE_DIRTY); | 2329 | _PAGE_ACCESSED | _PAGE_MODIFIED | _PAGE_VALID | _PAGE_DIRTY); |
| 2313 | build_huge_handler_tail(&p, &r, &l, wr.r1, wr.r2); | 2330 | build_huge_handler_tail(&p, &r, &l, wr.r1, wr.r2, 0); |
| 2314 | #endif | 2331 | #endif |
| 2315 | 2332 | ||
| 2316 | uasm_l_nopage_tlbm(&l, p); | 2333 | uasm_l_nopage_tlbm(&l, p); |
diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c index c4ffd43d3996..48ce701557a4 100644 --- a/arch/mips/ralink/rt3883.c +++ b/arch/mips/ralink/rt3883.c | |||
| @@ -35,7 +35,7 @@ static struct rt2880_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 15, 2) }; | |||
| 35 | static struct rt2880_pmx_func jtag_func[] = { FUNC("jtag", 0, 17, 5) }; | 35 | static struct rt2880_pmx_func jtag_func[] = { FUNC("jtag", 0, 17, 5) }; |
| 36 | static struct rt2880_pmx_func mdio_func[] = { FUNC("mdio", 0, 22, 2) }; | 36 | static struct rt2880_pmx_func mdio_func[] = { FUNC("mdio", 0, 22, 2) }; |
| 37 | static struct rt2880_pmx_func lna_a_func[] = { FUNC("lna a", 0, 32, 3) }; | 37 | static struct rt2880_pmx_func lna_a_func[] = { FUNC("lna a", 0, 32, 3) }; |
| 38 | static struct rt2880_pmx_func lna_g_func[] = { FUNC("lna a", 0, 35, 3) }; | 38 | static struct rt2880_pmx_func lna_g_func[] = { FUNC("lna g", 0, 35, 3) }; |
| 39 | static struct rt2880_pmx_func pci_func[] = { | 39 | static struct rt2880_pmx_func pci_func[] = { |
| 40 | FUNC("pci-dev", 0, 40, 32), | 40 | FUNC("pci-dev", 0, 40, 32), |
| 41 | FUNC("pci-host2", 1, 40, 32), | 41 | FUNC("pci-host2", 1, 40, 32), |
| @@ -43,7 +43,7 @@ static struct rt2880_pmx_func pci_func[] = { | |||
| 43 | FUNC("pci-fnc", 3, 40, 32) | 43 | FUNC("pci-fnc", 3, 40, 32) |
| 44 | }; | 44 | }; |
| 45 | static struct rt2880_pmx_func ge1_func[] = { FUNC("ge1", 0, 72, 12) }; | 45 | static struct rt2880_pmx_func ge1_func[] = { FUNC("ge1", 0, 72, 12) }; |
| 46 | static struct rt2880_pmx_func ge2_func[] = { FUNC("ge1", 0, 84, 12) }; | 46 | static struct rt2880_pmx_func ge2_func[] = { FUNC("ge2", 0, 84, 12) }; |
| 47 | 47 | ||
| 48 | static struct rt2880_pmx_group rt3883_pinmux_data[] = { | 48 | static struct rt2880_pmx_group rt3883_pinmux_data[] = { |
| 49 | GRP("i2c", i2c_func, 1, RT3883_GPIO_MODE_I2C), | 49 | GRP("i2c", i2c_func, 1, RT3883_GPIO_MODE_I2C), |
diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c index 367c5426157b..3901b80d4420 100644 --- a/arch/nios2/kernel/prom.c +++ b/arch/nios2/kernel/prom.c | |||
| @@ -48,6 +48,13 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) | |||
| 48 | return alloc_bootmem_align(size, align); | 48 | return alloc_bootmem_align(size, align); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, | ||
| 52 | bool nomap) | ||
| 53 | { | ||
| 54 | reserve_bootmem(base, size, BOOTMEM_DEFAULT); | ||
| 55 | return 0; | ||
| 56 | } | ||
| 57 | |||
| 51 | void __init early_init_devtree(void *params) | 58 | void __init early_init_devtree(void *params) |
| 52 | { | 59 | { |
| 53 | __be32 *dtb = (u32 *)__dtb_start; | 60 | __be32 *dtb = (u32 *)__dtb_start; |
diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 6e57ffa5db27..6044d9be28b4 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c | |||
| @@ -201,6 +201,9 @@ void __init setup_arch(char **cmdline_p) | |||
| 201 | } | 201 | } |
| 202 | #endif /* CONFIG_BLK_DEV_INITRD */ | 202 | #endif /* CONFIG_BLK_DEV_INITRD */ |
| 203 | 203 | ||
| 204 | early_init_fdt_reserve_self(); | ||
| 205 | early_init_fdt_scan_reserved_mem(); | ||
| 206 | |||
| 204 | unflatten_and_copy_device_tree(); | 207 | unflatten_and_copy_device_tree(); |
| 205 | 208 | ||
| 206 | setup_cpuinfo(); | 209 | setup_cpuinfo(); |
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h index edfbf9d6a6dd..8442727f28d2 100644 --- a/arch/parisc/include/asm/uaccess.h +++ b/arch/parisc/include/asm/uaccess.h | |||
| @@ -65,6 +65,15 @@ struct exception_table_entry { | |||
| 65 | ".previous\n" | 65 | ".previous\n" |
| 66 | 66 | ||
| 67 | /* | 67 | /* |
| 68 | * ASM_EXCEPTIONTABLE_ENTRY_EFAULT() creates a special exception table entry | ||
| 69 | * (with lowest bit set) for which the fault handler in fixup_exception() will | ||
| 70 | * load -EFAULT into %r8 for a read or write fault, and zeroes the target | ||
| 71 | * register in case of a read fault in get_user(). | ||
| 72 | */ | ||
| 73 | #define ASM_EXCEPTIONTABLE_ENTRY_EFAULT( fault_addr, except_addr )\ | ||
| 74 | ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr + 1) | ||
| 75 | |||
| 76 | /* | ||
| 68 | * The page fault handler stores, in a per-cpu area, the following information | 77 | * The page fault handler stores, in a per-cpu area, the following information |
| 69 | * if a fixup routine is available. | 78 | * if a fixup routine is available. |
| 70 | */ | 79 | */ |
| @@ -91,7 +100,7 @@ struct exception_data { | |||
| 91 | #define __get_user(x, ptr) \ | 100 | #define __get_user(x, ptr) \ |
| 92 | ({ \ | 101 | ({ \ |
| 93 | register long __gu_err __asm__ ("r8") = 0; \ | 102 | register long __gu_err __asm__ ("r8") = 0; \ |
| 94 | register long __gu_val __asm__ ("r9") = 0; \ | 103 | register long __gu_val; \ |
| 95 | \ | 104 | \ |
| 96 | load_sr2(); \ | 105 | load_sr2(); \ |
| 97 | switch (sizeof(*(ptr))) { \ | 106 | switch (sizeof(*(ptr))) { \ |
| @@ -107,22 +116,23 @@ struct exception_data { | |||
| 107 | }) | 116 | }) |
| 108 | 117 | ||
| 109 | #define __get_user_asm(ldx, ptr) \ | 118 | #define __get_user_asm(ldx, ptr) \ |
| 110 | __asm__("\n1:\t" ldx "\t0(%%sr2,%2),%0\n\t" \ | 119 | __asm__("1: " ldx " 0(%%sr2,%2),%0\n" \ |
| 111 | ASM_EXCEPTIONTABLE_ENTRY(1b, fixup_get_user_skip_1)\ | 120 | "9:\n" \ |
| 121 | ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b) \ | ||
| 112 | : "=r"(__gu_val), "=r"(__gu_err) \ | 122 | : "=r"(__gu_val), "=r"(__gu_err) \ |
| 113 | : "r"(ptr), "1"(__gu_err) \ | 123 | : "r"(ptr), "1"(__gu_err)); |
| 114 | : "r1"); | ||
| 115 | 124 | ||
| 116 | #if !defined(CONFIG_64BIT) | 125 | #if !defined(CONFIG_64BIT) |
| 117 | 126 | ||
| 118 | #define __get_user_asm64(ptr) \ | 127 | #define __get_user_asm64(ptr) \ |
| 119 | __asm__("\n1:\tldw 0(%%sr2,%2),%0" \ | 128 | __asm__(" copy %%r0,%R0\n" \ |
| 120 | "\n2:\tldw 4(%%sr2,%2),%R0\n\t" \ | 129 | "1: ldw 0(%%sr2,%2),%0\n" \ |
| 121 | ASM_EXCEPTIONTABLE_ENTRY(1b, fixup_get_user_skip_2)\ | 130 | "2: ldw 4(%%sr2,%2),%R0\n" \ |
| 122 | ASM_EXCEPTIONTABLE_ENTRY(2b, fixup_get_user_skip_1)\ | 131 | "9:\n" \ |
| 132 | ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b) \ | ||
| 133 | ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 9b) \ | ||
| 123 | : "=r"(__gu_val), "=r"(__gu_err) \ | 134 | : "=r"(__gu_val), "=r"(__gu_err) \ |
| 124 | : "r"(ptr), "1"(__gu_err) \ | 135 | : "r"(ptr), "1"(__gu_err)); |
| 125 | : "r1"); | ||
| 126 | 136 | ||
| 127 | #endif /* !defined(CONFIG_64BIT) */ | 137 | #endif /* !defined(CONFIG_64BIT) */ |
| 128 | 138 | ||
| @@ -148,32 +158,31 @@ struct exception_data { | |||
| 148 | * The "__put_user/kernel_asm()" macros tell gcc they read from memory | 158 | * The "__put_user/kernel_asm()" macros tell gcc they read from memory |
| 149 | * instead of writing. This is because they do not write to any memory | 159 | * instead of writing. This is because they do not write to any memory |
| 150 | * gcc knows about, so there are no aliasing issues. These macros must | 160 | * gcc knows about, so there are no aliasing issues. These macros must |
| 151 | * also be aware that "fixup_put_user_skip_[12]" are executed in the | 161 | * also be aware that fixups are executed in the context of the fault, |
| 152 | * context of the fault, and any registers used there must be listed | 162 | * and any registers used there must be listed as clobbers. |
| 153 | * as clobbers. In this case only "r1" is used by the current routines. | 163 | * r8 is already listed as err. |
| 154 | * r8/r9 are already listed as err/val. | ||
| 155 | */ | 164 | */ |
| 156 | 165 | ||
| 157 | #define __put_user_asm(stx, x, ptr) \ | 166 | #define __put_user_asm(stx, x, ptr) \ |
| 158 | __asm__ __volatile__ ( \ | 167 | __asm__ __volatile__ ( \ |
| 159 | "\n1:\t" stx "\t%2,0(%%sr2,%1)\n\t" \ | 168 | "1: " stx " %2,0(%%sr2,%1)\n" \ |
| 160 | ASM_EXCEPTIONTABLE_ENTRY(1b, fixup_put_user_skip_1)\ | 169 | "9:\n" \ |
| 170 | ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b) \ | ||
| 161 | : "=r"(__pu_err) \ | 171 | : "=r"(__pu_err) \ |
| 162 | : "r"(ptr), "r"(x), "0"(__pu_err) \ | 172 | : "r"(ptr), "r"(x), "0"(__pu_err)) |
| 163 | : "r1") | ||
| 164 | 173 | ||
| 165 | 174 | ||
| 166 | #if !defined(CONFIG_64BIT) | 175 | #if !defined(CONFIG_64BIT) |
| 167 | 176 | ||
| 168 | #define __put_user_asm64(__val, ptr) do { \ | 177 | #define __put_user_asm64(__val, ptr) do { \ |
| 169 | __asm__ __volatile__ ( \ | 178 | __asm__ __volatile__ ( \ |
| 170 | "\n1:\tstw %2,0(%%sr2,%1)" \ | 179 | "1: stw %2,0(%%sr2,%1)\n" \ |
| 171 | "\n2:\tstw %R2,4(%%sr2,%1)\n\t" \ | 180 | "2: stw %R2,4(%%sr2,%1)\n" \ |
| 172 | ASM_EXCEPTIONTABLE_ENTRY(1b, fixup_put_user_skip_2)\ | 181 | "9:\n" \ |
| 173 | ASM_EXCEPTIONTABLE_ENTRY(2b, fixup_put_user_skip_1)\ | 182 | ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b) \ |
| 183 | ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 9b) \ | ||
| 174 | : "=r"(__pu_err) \ | 184 | : "=r"(__pu_err) \ |
| 175 | : "r"(ptr), "r"(__val), "0"(__pu_err) \ | 185 | : "r"(ptr), "r"(__val), "0"(__pu_err)); \ |
| 176 | : "r1"); \ | ||
| 177 | } while (0) | 186 | } while (0) |
| 178 | 187 | ||
| 179 | #endif /* !defined(CONFIG_64BIT) */ | 188 | #endif /* !defined(CONFIG_64BIT) */ |
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 7484b3d11e0d..c6d6272a934f 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c | |||
| @@ -47,16 +47,6 @@ EXPORT_SYMBOL(__cmpxchg_u64); | |||
| 47 | EXPORT_SYMBOL(lclear_user); | 47 | EXPORT_SYMBOL(lclear_user); |
| 48 | EXPORT_SYMBOL(lstrnlen_user); | 48 | EXPORT_SYMBOL(lstrnlen_user); |
| 49 | 49 | ||
| 50 | /* Global fixups - defined as int to avoid creation of function pointers */ | ||
| 51 | extern int fixup_get_user_skip_1; | ||
| 52 | extern int fixup_get_user_skip_2; | ||
| 53 | extern int fixup_put_user_skip_1; | ||
| 54 | extern int fixup_put_user_skip_2; | ||
| 55 | EXPORT_SYMBOL(fixup_get_user_skip_1); | ||
| 56 | EXPORT_SYMBOL(fixup_get_user_skip_2); | ||
| 57 | EXPORT_SYMBOL(fixup_put_user_skip_1); | ||
| 58 | EXPORT_SYMBOL(fixup_put_user_skip_2); | ||
| 59 | |||
| 60 | #ifndef CONFIG_64BIT | 50 | #ifndef CONFIG_64BIT |
| 61 | /* Needed so insmod can set dp value */ | 51 | /* Needed so insmod can set dp value */ |
| 62 | extern int $global$; | 52 | extern int $global$; |
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index b76f503eee4a..4516a5b53f38 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c | |||
| @@ -143,6 +143,8 @@ void machine_power_off(void) | |||
| 143 | printk(KERN_EMERG "System shut down completed.\n" | 143 | printk(KERN_EMERG "System shut down completed.\n" |
| 144 | "Please power this system off now."); | 144 | "Please power this system off now."); |
| 145 | 145 | ||
| 146 | /* prevent soft lockup/stalled CPU messages for endless loop. */ | ||
| 147 | rcu_sysrq_start(); | ||
| 146 | for (;;); | 148 | for (;;); |
| 147 | } | 149 | } |
| 148 | 150 | ||
diff --git a/arch/parisc/lib/Makefile b/arch/parisc/lib/Makefile index 8fa92b8d839a..f2dac4d73b1b 100644 --- a/arch/parisc/lib/Makefile +++ b/arch/parisc/lib/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Makefile for parisc-specific library files | 2 | # Makefile for parisc-specific library files |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | lib-y := lusercopy.o bitops.o checksum.o io.o memset.o fixup.o memcpy.o \ | 5 | lib-y := lusercopy.o bitops.o checksum.o io.o memset.o memcpy.o \ |
| 6 | ucmpdi2.o delay.o | 6 | ucmpdi2.o delay.o |
| 7 | 7 | ||
| 8 | obj-y := iomap.o | 8 | obj-y := iomap.o |
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S deleted file mode 100644 index a5b72f22c7a6..000000000000 --- a/arch/parisc/lib/fixup.S +++ /dev/null | |||
| @@ -1,98 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Linux/PA-RISC Project (http://www.parisc-linux.org/) | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Randolph Chung <tausq@debian.org> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation; either version 2, or (at your option) | ||
| 9 | * any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 19 | * | ||
| 20 | * Fixup routines for kernel exception handling. | ||
| 21 | */ | ||
| 22 | #include <asm/asm-offsets.h> | ||
| 23 | #include <asm/assembly.h> | ||
| 24 | #include <asm/errno.h> | ||
| 25 | #include <linux/linkage.h> | ||
| 26 | |||
| 27 | #ifdef CONFIG_SMP | ||
| 28 | .macro get_fault_ip t1 t2 | ||
| 29 | loadgp | ||
| 30 | addil LT%__per_cpu_offset,%r27 | ||
| 31 | LDREG RT%__per_cpu_offset(%r1),\t1 | ||
| 32 | /* t2 = smp_processor_id() */ | ||
| 33 | mfctl 30,\t2 | ||
| 34 | ldw TI_CPU(\t2),\t2 | ||
| 35 | #ifdef CONFIG_64BIT | ||
| 36 | extrd,u \t2,63,32,\t2 | ||
| 37 | #endif | ||
| 38 | /* t2 = &__per_cpu_offset[smp_processor_id()]; */ | ||
| 39 | LDREGX \t2(\t1),\t2 | ||
| 40 | addil LT%exception_data,%r27 | ||
| 41 | LDREG RT%exception_data(%r1),\t1 | ||
| 42 | /* t1 = this_cpu_ptr(&exception_data) */ | ||
| 43 | add,l \t1,\t2,\t1 | ||
| 44 | /* %r27 = t1->fault_gp - restore gp */ | ||
| 45 | LDREG EXCDATA_GP(\t1), %r27 | ||
| 46 | /* t1 = t1->fault_ip */ | ||
| 47 | LDREG EXCDATA_IP(\t1), \t1 | ||
| 48 | .endm | ||
| 49 | #else | ||
| 50 | .macro get_fault_ip t1 t2 | ||
| 51 | loadgp | ||
| 52 | /* t1 = this_cpu_ptr(&exception_data) */ | ||
| 53 | addil LT%exception_data,%r27 | ||
| 54 | LDREG RT%exception_data(%r1),\t2 | ||
| 55 | /* %r27 = t2->fault_gp - restore gp */ | ||
| 56 | LDREG EXCDATA_GP(\t2), %r27 | ||
| 57 | /* t1 = t2->fault_ip */ | ||
| 58 | LDREG EXCDATA_IP(\t2), \t1 | ||
| 59 | .endm | ||
| 60 | #endif | ||
| 61 | |||
| 62 | .level LEVEL | ||
| 63 | |||
| 64 | .text | ||
| 65 | .section .fixup, "ax" | ||
| 66 | |||
| 67 | /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */ | ||
| 68 | ENTRY_CFI(fixup_get_user_skip_1) | ||
| 69 | get_fault_ip %r1,%r8 | ||
| 70 | ldo 4(%r1), %r1 | ||
| 71 | ldi -EFAULT, %r8 | ||
| 72 | bv %r0(%r1) | ||
| 73 | copy %r0, %r9 | ||
| 74 | ENDPROC_CFI(fixup_get_user_skip_1) | ||
| 75 | |||
| 76 | ENTRY_CFI(fixup_get_user_skip_2) | ||
| 77 | get_fault_ip %r1,%r8 | ||
| 78 | ldo 8(%r1), %r1 | ||
| 79 | ldi -EFAULT, %r8 | ||
| 80 | bv %r0(%r1) | ||
| 81 | copy %r0, %r9 | ||
| 82 | ENDPROC_CFI(fixup_get_user_skip_2) | ||
| 83 | |||
| 84 | /* put_user() fixups, store -EFAULT in r8 */ | ||
| 85 | ENTRY_CFI(fixup_put_user_skip_1) | ||
| 86 | get_fault_ip %r1,%r8 | ||
| 87 | ldo 4(%r1), %r1 | ||
| 88 | bv %r0(%r1) | ||
| 89 | ldi -EFAULT, %r8 | ||
| 90 | ENDPROC_CFI(fixup_put_user_skip_1) | ||
| 91 | |||
| 92 | ENTRY_CFI(fixup_put_user_skip_2) | ||
| 93 | get_fault_ip %r1,%r8 | ||
| 94 | ldo 8(%r1), %r1 | ||
| 95 | bv %r0(%r1) | ||
| 96 | ldi -EFAULT, %r8 | ||
| 97 | ENDPROC_CFI(fixup_put_user_skip_2) | ||
| 98 | |||
diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S index 56845de6b5df..f01188c044ee 100644 --- a/arch/parisc/lib/lusercopy.S +++ b/arch/parisc/lib/lusercopy.S | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | * Copyright (C) 2000 Richard Hirst <rhirst with parisc-linux.org> | 5 | * Copyright (C) 2000 Richard Hirst <rhirst with parisc-linux.org> |
| 6 | * Copyright (C) 2001 Matthieu Delahaye <delahaym at esiee.fr> | 6 | * Copyright (C) 2001 Matthieu Delahaye <delahaym at esiee.fr> |
| 7 | * Copyright (C) 2003 Randolph Chung <tausq with parisc-linux.org> | 7 | * Copyright (C) 2003 Randolph Chung <tausq with parisc-linux.org> |
| 8 | * Copyright (C) 2017 Helge Deller <deller@gmx.de> | ||
| 9 | * Copyright (C) 2017 John David Anglin <dave.anglin@bell.net> | ||
| 8 | * | 10 | * |
| 9 | * | 11 | * |
| 10 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
| @@ -132,4 +134,320 @@ ENDPROC_CFI(lstrnlen_user) | |||
| 132 | 134 | ||
| 133 | .procend | 135 | .procend |
| 134 | 136 | ||
| 137 | |||
| 138 | |||
| 139 | /* | ||
| 140 | * unsigned long pa_memcpy(void *dstp, const void *srcp, unsigned long len) | ||
| 141 | * | ||
| 142 | * Inputs: | ||
| 143 | * - sr1 already contains space of source region | ||
| 144 | * - sr2 already contains space of destination region | ||
| 145 | * | ||
| 146 | * Returns: | ||
| 147 | * - number of bytes that could not be copied. | ||
| 148 | * On success, this will be zero. | ||
| 149 | * | ||
| 150 | * This code is based on a C-implementation of a copy routine written by | ||
| 151 | * Randolph Chung, which in turn was derived from the glibc. | ||
| 152 | * | ||
| 153 | * Several strategies are tried to try to get the best performance for various | ||
| 154 | * conditions. In the optimal case, we copy by loops that copy 32- or 16-bytes | ||
| 155 | * at a time using general registers. Unaligned copies are handled either by | ||
| 156 | * aligning the destination and then using shift-and-write method, or in a few | ||
| 157 | * cases by falling back to a byte-at-a-time copy. | ||
| 158 | * | ||
| 159 | * Testing with various alignments and buffer sizes shows that this code is | ||
| 160 | * often >10x faster than a simple byte-at-a-time copy, even for strangely | ||
| 161 | * aligned operands. It is interesting to note that the glibc version of memcpy | ||
| 162 | * (written in C) is actually quite fast already. This routine is able to beat | ||
| 163 | * it by 30-40% for aligned copies because of the loop unrolling, but in some | ||
| 164 | * cases the glibc version is still slightly faster. This lends more | ||
| 165 | * credibility that gcc can generate very good code as long as we are careful. | ||
| 166 | * | ||
| 167 | * Possible optimizations: | ||
| 168 | * - add cache prefetching | ||
| 169 | * - try not to use the post-increment address modifiers; they may create | ||
| 170 | * additional interlocks. Assumption is that those were only efficient on old | ||
| 171 | * machines (pre PA8000 processors) | ||
| 172 | */ | ||
| 173 | |||
| 174 | dst = arg0 | ||
| 175 | src = arg1 | ||
| 176 | len = arg2 | ||
| 177 | end = arg3 | ||
| 178 | t1 = r19 | ||
| 179 | t2 = r20 | ||
| 180 | t3 = r21 | ||
| 181 | t4 = r22 | ||
| 182 | srcspc = sr1 | ||
| 183 | dstspc = sr2 | ||
| 184 | |||
| 185 | t0 = r1 | ||
| 186 | a1 = t1 | ||
| 187 | a2 = t2 | ||
| 188 | a3 = t3 | ||
| 189 | a0 = t4 | ||
| 190 | |||
| 191 | save_src = ret0 | ||
| 192 | save_dst = ret1 | ||
| 193 | save_len = r31 | ||
| 194 | |||
| 195 | ENTRY_CFI(pa_memcpy) | ||
| 196 | .proc | ||
| 197 | .callinfo NO_CALLS | ||
| 198 | .entry | ||
| 199 | |||
| 200 | /* Last destination address */ | ||
| 201 | add dst,len,end | ||
| 202 | |||
| 203 | /* short copy with less than 16 bytes? */ | ||
| 204 | cmpib,>>=,n 15,len,.Lbyte_loop | ||
| 205 | |||
| 206 | /* same alignment? */ | ||
| 207 | xor src,dst,t0 | ||
| 208 | extru t0,31,2,t1 | ||
| 209 | cmpib,<>,n 0,t1,.Lunaligned_copy | ||
| 210 | |||
| 211 | #ifdef CONFIG_64BIT | ||
| 212 | /* only do 64-bit copies if we can get aligned. */ | ||
| 213 | extru t0,31,3,t1 | ||
| 214 | cmpib,<>,n 0,t1,.Lalign_loop32 | ||
| 215 | |||
| 216 | /* loop until we are 64-bit aligned */ | ||
| 217 | .Lalign_loop64: | ||
| 218 | extru dst,31,3,t1 | ||
| 219 | cmpib,=,n 0,t1,.Lcopy_loop_16 | ||
| 220 | 20: ldb,ma 1(srcspc,src),t1 | ||
| 221 | 21: stb,ma t1,1(dstspc,dst) | ||
| 222 | b .Lalign_loop64 | ||
| 223 | ldo -1(len),len | ||
| 224 | |||
| 225 | ASM_EXCEPTIONTABLE_ENTRY(20b,.Lcopy_done) | ||
| 226 | ASM_EXCEPTIONTABLE_ENTRY(21b,.Lcopy_done) | ||
| 227 | |||
| 228 | ldi 31,t0 | ||
| 229 | .Lcopy_loop_16: | ||
| 230 | cmpb,COND(>>=),n t0,len,.Lword_loop | ||
| 231 | |||
| 232 | 10: ldd 0(srcspc,src),t1 | ||
| 233 | 11: ldd 8(srcspc,src),t2 | ||
| 234 | ldo 16(src),src | ||
| 235 | 12: std,ma t1,8(dstspc,dst) | ||
| 236 | 13: std,ma t2,8(dstspc,dst) | ||
| 237 | 14: ldd 0(srcspc,src),t1 | ||
| 238 | 15: ldd 8(srcspc,src),t2 | ||
| 239 | ldo 16(src),src | ||
| 240 | 16: std,ma t1,8(dstspc,dst) | ||
| 241 | 17: std,ma t2,8(dstspc,dst) | ||
| 242 | |||
| 243 | ASM_EXCEPTIONTABLE_ENTRY(10b,.Lcopy_done) | ||
| 244 | ASM_EXCEPTIONTABLE_ENTRY(11b,.Lcopy16_fault) | ||
| 245 | ASM_EXCEPTIONTABLE_ENTRY(12b,.Lcopy_done) | ||
| 246 | ASM_EXCEPTIONTABLE_ENTRY(13b,.Lcopy_done) | ||
| 247 | ASM_EXCEPTIONTABLE_ENTRY(14b,.Lcopy_done) | ||
| 248 | ASM_EXCEPTIONTABLE_ENTRY(15b,.Lcopy16_fault) | ||
| 249 | ASM_EXCEPTIONTABLE_ENTRY(16b,.Lcopy_done) | ||
| 250 | ASM_EXCEPTIONTABLE_ENTRY(17b,.Lcopy_done) | ||
| 251 | |||
| 252 | b .Lcopy_loop_16 | ||
| 253 | ldo -32(len),len | ||
| 254 | |||
| 255 | .Lword_loop: | ||
| 256 | cmpib,COND(>>=),n 3,len,.Lbyte_loop | ||
| 257 | 20: ldw,ma 4(srcspc,src),t1 | ||
| 258 | 21: stw,ma t1,4(dstspc,dst) | ||
| 259 | b .Lword_loop | ||
| 260 | ldo -4(len),len | ||
| 261 | |||
| 262 | ASM_EXCEPTIONTABLE_ENTRY(20b,.Lcopy_done) | ||
| 263 | ASM_EXCEPTIONTABLE_ENTRY(21b,.Lcopy_done) | ||
| 264 | |||
| 265 | #endif /* CONFIG_64BIT */ | ||
| 266 | |||
| 267 | /* loop until we are 32-bit aligned */ | ||
| 268 | .Lalign_loop32: | ||
| 269 | extru dst,31,2,t1 | ||
| 270 | cmpib,=,n 0,t1,.Lcopy_loop_4 | ||
| 271 | 20: ldb,ma 1(srcspc,src),t1 | ||
| 272 | 21: stb,ma t1,1(dstspc,dst) | ||
| 273 | b .Lalign_loop32 | ||
| 274 | ldo -1(len),len | ||
| 275 | |||
| 276 | ASM_EXCEPTIONTABLE_ENTRY(20b,.Lcopy_done) | ||
| 277 | ASM_EXCEPTIONTABLE_ENTRY(21b,.Lcopy_done) | ||
| 278 | |||
| 279 | |||
| 280 | .Lcopy_loop_4: | ||
| 281 | cmpib,COND(>>=),n 15,len,.Lbyte_loop | ||
| 282 | |||
| 283 | 10: ldw 0(srcspc,src),t1 | ||
| 284 | 11: ldw 4(srcspc,src),t2 | ||
| 285 | 12: stw,ma t1,4(dstspc,dst) | ||
| 286 | 13: stw,ma t2,4(dstspc,dst) | ||
| 287 | 14: ldw 8(srcspc,src),t1 | ||
| 288 | 15: ldw 12(srcspc,src),t2 | ||
| 289 | ldo 16(src),src | ||
| 290 | 16: stw,ma t1,4(dstspc,dst) | ||
| 291 | 17: stw,ma t2,4(dstspc,dst) | ||
| 292 | |||
| 293 | ASM_EXCEPTIONTABLE_ENTRY(10b,.Lcopy_done) | ||
| 294 | ASM_EXCEPTIONTABLE_ENTRY(11b,.Lcopy8_fault) | ||
| 295 | ASM_EXCEPTIONTABLE_ENTRY(12b,.Lcopy_done) | ||
| 296 | ASM_EXCEPTIONTABLE_ENTRY(13b,.Lcopy_done) | ||
| 297 | ASM_EXCEPTIONTABLE_ENTRY(14b,.Lcopy_done) | ||
| 298 | ASM_EXCEPTIONTABLE_ENTRY(15b,.Lcopy8_fault) | ||
| 299 | ASM_EXCEPTIONTABLE_ENTRY(16b,.Lcopy_done) | ||
| 300 | ASM_EXCEPTIONTABLE_ENTRY(17b,.Lcopy_done) | ||
| 301 | |||
| 302 | b .Lcopy_loop_4 | ||
| 303 | ldo -16(len),len | ||
| 304 | |||
| 305 | .Lbyte_loop: | ||
| 306 | cmpclr,COND(<>) len,%r0,%r0 | ||
| 307 | b,n .Lcopy_done | ||
| 308 | 20: ldb 0(srcspc,src),t1 | ||
| 309 | ldo 1(src),src | ||
| 310 | 21: stb,ma t1,1(dstspc,dst) | ||
| 311 | b .Lbyte_loop | ||
| 312 | ldo -1(len),len | ||
| 313 | |||
| 314 | ASM_EXCEPTIONTABLE_ENTRY(20b,.Lcopy_done) | ||
| 315 | ASM_EXCEPTIONTABLE_ENTRY(21b,.Lcopy_done) | ||
| 316 | |||
| 317 | .Lcopy_done: | ||
| 318 | bv %r0(%r2) | ||
| 319 | sub end,dst,ret0 | ||
| 320 | |||
| 321 | |||
| 322 | /* src and dst are not aligned the same way. */ | ||
| 323 | /* need to go the hard way */ | ||
| 324 | .Lunaligned_copy: | ||
| 325 | /* align until dst is 32bit-word-aligned */ | ||
| 326 | extru dst,31,2,t1 | ||
| 327 | cmpib,COND(=),n 0,t1,.Lcopy_dstaligned | ||
| 328 | 20: ldb 0(srcspc,src),t1 | ||
| 329 | ldo 1(src),src | ||
| 330 | 21: stb,ma t1,1(dstspc,dst) | ||
| 331 | b .Lunaligned_copy | ||
| 332 | ldo -1(len),len | ||
| 333 | |||
| 334 | ASM_EXCEPTIONTABLE_ENTRY(20b,.Lcopy_done) | ||
| 335 | ASM_EXCEPTIONTABLE_ENTRY(21b,.Lcopy_done) | ||
| 336 | |||
| 337 | .Lcopy_dstaligned: | ||
| 338 | |||
| 339 | /* store src, dst and len in safe place */ | ||
| 340 | copy src,save_src | ||
| 341 | copy dst,save_dst | ||
| 342 | copy len,save_len | ||
| 343 | |||
| 344 | /* len now needs give number of words to copy */ | ||
| 345 | SHRREG len,2,len | ||
| 346 | |||
| 347 | /* | ||
| 348 | * Copy from a not-aligned src to an aligned dst using shifts. | ||
| 349 | * Handles 4 words per loop. | ||
| 350 | */ | ||
| 351 | |||
| 352 | depw,z src,28,2,t0 | ||
| 353 | subi 32,t0,t0 | ||
| 354 | mtsar t0 | ||
| 355 | extru len,31,2,t0 | ||
| 356 | cmpib,= 2,t0,.Lcase2 | ||
| 357 | /* Make src aligned by rounding it down. */ | ||
| 358 | depi 0,31,2,src | ||
| 359 | |||
| 360 | cmpiclr,<> 3,t0,%r0 | ||
| 361 | b,n .Lcase3 | ||
| 362 | cmpiclr,<> 1,t0,%r0 | ||
| 363 | b,n .Lcase1 | ||
| 364 | .Lcase0: | ||
| 365 | cmpb,= %r0,len,.Lcda_finish | ||
| 366 | nop | ||
| 367 | |||
| 368 | 1: ldw,ma 4(srcspc,src), a3 | ||
| 369 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 370 | 1: ldw,ma 4(srcspc,src), a0 | ||
| 371 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 372 | b,n .Ldo3 | ||
| 373 | .Lcase1: | ||
| 374 | 1: ldw,ma 4(srcspc,src), a2 | ||
| 375 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 376 | 1: ldw,ma 4(srcspc,src), a3 | ||
| 377 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 378 | ldo -1(len),len | ||
| 379 | cmpb,=,n %r0,len,.Ldo0 | ||
| 380 | .Ldo4: | ||
| 381 | 1: ldw,ma 4(srcspc,src), a0 | ||
| 382 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 383 | shrpw a2, a3, %sar, t0 | ||
| 384 | 1: stw,ma t0, 4(dstspc,dst) | ||
| 385 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcopy_done) | ||
| 386 | .Ldo3: | ||
| 387 | 1: ldw,ma 4(srcspc,src), a1 | ||
| 388 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 389 | shrpw a3, a0, %sar, t0 | ||
| 390 | 1: stw,ma t0, 4(dstspc,dst) | ||
| 391 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcopy_done) | ||
| 392 | .Ldo2: | ||
| 393 | 1: ldw,ma 4(srcspc,src), a2 | ||
| 394 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 395 | shrpw a0, a1, %sar, t0 | ||
| 396 | 1: stw,ma t0, 4(dstspc,dst) | ||
| 397 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcopy_done) | ||
| 398 | .Ldo1: | ||
| 399 | 1: ldw,ma 4(srcspc,src), a3 | ||
| 400 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 401 | shrpw a1, a2, %sar, t0 | ||
| 402 | 1: stw,ma t0, 4(dstspc,dst) | ||
| 403 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcopy_done) | ||
| 404 | ldo -4(len),len | ||
| 405 | cmpb,<> %r0,len,.Ldo4 | ||
| 406 | nop | ||
| 407 | .Ldo0: | ||
| 408 | shrpw a2, a3, %sar, t0 | ||
| 409 | 1: stw,ma t0, 4(dstspc,dst) | ||
| 410 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcopy_done) | ||
| 411 | |||
| 412 | .Lcda_rdfault: | ||
| 413 | .Lcda_finish: | ||
| 414 | /* calculate new src, dst and len and jump to byte-copy loop */ | ||
| 415 | sub dst,save_dst,t0 | ||
| 416 | add save_src,t0,src | ||
| 417 | b .Lbyte_loop | ||
| 418 | sub save_len,t0,len | ||
| 419 | |||
| 420 | .Lcase3: | ||
| 421 | 1: ldw,ma 4(srcspc,src), a0 | ||
| 422 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 423 | 1: ldw,ma 4(srcspc,src), a1 | ||
| 424 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 425 | b .Ldo2 | ||
| 426 | ldo 1(len),len | ||
| 427 | .Lcase2: | ||
| 428 | 1: ldw,ma 4(srcspc,src), a1 | ||
| 429 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 430 | 1: ldw,ma 4(srcspc,src), a2 | ||
| 431 | ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault) | ||
| 432 | b .Ldo1 | ||
| 433 | ldo 2(len),len | ||
| 434 | |||
| 435 | |||
| 436 | /* fault exception fixup handlers: */ | ||
| 437 | #ifdef CONFIG_64BIT | ||
| 438 | .Lcopy16_fault: | ||
| 439 | 10: b .Lcopy_done | ||
| 440 | std,ma t1,8(dstspc,dst) | ||
| 441 | ASM_EXCEPTIONTABLE_ENTRY(10b,.Lcopy_done) | ||
| 442 | #endif | ||
| 443 | |||
| 444 | .Lcopy8_fault: | ||
| 445 | 10: b .Lcopy_done | ||
| 446 | stw,ma t1,4(dstspc,dst) | ||
| 447 | ASM_EXCEPTIONTABLE_ENTRY(10b,.Lcopy_done) | ||
| 448 | |||
| 449 | .exit | ||
| 450 | ENDPROC_CFI(pa_memcpy) | ||
| 451 | .procend | ||
| 452 | |||
| 135 | .end | 453 | .end |
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c index f82ff10ed974..b3d47ec1d80a 100644 --- a/arch/parisc/lib/memcpy.c +++ b/arch/parisc/lib/memcpy.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * Optimized memory copy routines. | 2 | * Optimized memory copy routines. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2004 Randolph Chung <tausq@debian.org> | 4 | * Copyright (C) 2004 Randolph Chung <tausq@debian.org> |
| 5 | * Copyright (C) 2013 Helge Deller <deller@gmx.de> | 5 | * Copyright (C) 2013-2017 Helge Deller <deller@gmx.de> |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| 8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
| @@ -21,474 +21,21 @@ | |||
| 21 | * Portions derived from the GNU C Library | 21 | * Portions derived from the GNU C Library |
| 22 | * Copyright (C) 1991, 1997, 2003 Free Software Foundation, Inc. | 22 | * Copyright (C) 1991, 1997, 2003 Free Software Foundation, Inc. |
| 23 | * | 23 | * |
| 24 | * Several strategies are tried to try to get the best performance for various | ||
| 25 | * conditions. In the optimal case, we copy 64-bytes in an unrolled loop using | ||
| 26 | * fp regs. This is followed by loops that copy 32- or 16-bytes at a time using | ||
| 27 | * general registers. Unaligned copies are handled either by aligning the | ||
| 28 | * destination and then using shift-and-write method, or in a few cases by | ||
| 29 | * falling back to a byte-at-a-time copy. | ||
| 30 | * | ||
| 31 | * I chose to implement this in C because it is easier to maintain and debug, | ||
| 32 | * and in my experiments it appears that the C code generated by gcc (3.3/3.4 | ||
| 33 | * at the time of writing) is fairly optimal. Unfortunately some of the | ||
| 34 | * semantics of the copy routine (exception handling) is difficult to express | ||
| 35 | * in C, so we have to play some tricks to get it to work. | ||
| 36 | * | ||
| 37 | * All the loads and stores are done via explicit asm() code in order to use | ||
| 38 | * the right space registers. | ||
| 39 | * | ||
| 40 | * Testing with various alignments and buffer sizes shows that this code is | ||
| 41 | * often >10x faster than a simple byte-at-a-time copy, even for strangely | ||
| 42 | * aligned operands. It is interesting to note that the glibc version | ||
| 43 | * of memcpy (written in C) is actually quite fast already. This routine is | ||
| 44 | * able to beat it by 30-40% for aligned copies because of the loop unrolling, | ||
| 45 | * but in some cases the glibc version is still slightly faster. This lends | ||
| 46 | * more credibility that gcc can generate very good code as long as we are | ||
| 47 | * careful. | ||
| 48 | * | ||
| 49 | * TODO: | ||
| 50 | * - cache prefetching needs more experimentation to get optimal settings | ||
| 51 | * - try not to use the post-increment address modifiers; they create additional | ||
| 52 | * interlocks | ||
| 53 | * - replace byte-copy loops with stybs sequences | ||
| 54 | */ | 24 | */ |
| 55 | 25 | ||
| 56 | #ifdef __KERNEL__ | ||
| 57 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 58 | #include <linux/compiler.h> | 27 | #include <linux/compiler.h> |
| 59 | #include <linux/uaccess.h> | 28 | #include <linux/uaccess.h> |
| 60 | #define s_space "%%sr1" | ||
| 61 | #define d_space "%%sr2" | ||
| 62 | #else | ||
| 63 | #include "memcpy.h" | ||
| 64 | #define s_space "%%sr0" | ||
| 65 | #define d_space "%%sr0" | ||
| 66 | #define pa_memcpy new2_copy | ||
| 67 | #endif | ||
| 68 | 29 | ||
| 69 | DECLARE_PER_CPU(struct exception_data, exception_data); | 30 | DECLARE_PER_CPU(struct exception_data, exception_data); |
| 70 | 31 | ||
| 71 | #define preserve_branch(label) do { \ | ||
| 72 | volatile int dummy = 0; \ | ||
| 73 | /* The following branch is never taken, it's just here to */ \ | ||
| 74 | /* prevent gcc from optimizing away our exception code. */ \ | ||
| 75 | if (unlikely(dummy != dummy)) \ | ||
| 76 | goto label; \ | ||
| 77 | } while (0) | ||
| 78 | |||
| 79 | #define get_user_space() (segment_eq(get_fs(), KERNEL_DS) ? 0 : mfsp(3)) | 32 | #define get_user_space() (segment_eq(get_fs(), KERNEL_DS) ? 0 : mfsp(3)) |
| 80 | #define get_kernel_space() (0) | 33 | #define get_kernel_space() (0) |
| 81 | 34 | ||
| 82 | #define MERGE(w0, sh_1, w1, sh_2) ({ \ | ||
| 83 | unsigned int _r; \ | ||
| 84 | asm volatile ( \ | ||
| 85 | "mtsar %3\n" \ | ||
| 86 | "shrpw %1, %2, %%sar, %0\n" \ | ||
| 87 | : "=r"(_r) \ | ||
| 88 | : "r"(w0), "r"(w1), "r"(sh_2) \ | ||
| 89 | ); \ | ||
| 90 | _r; \ | ||
| 91 | }) | ||
| 92 | #define THRESHOLD 16 | ||
| 93 | |||
| 94 | #ifdef DEBUG_MEMCPY | ||
| 95 | #define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __func__ ); printk(KERN_DEBUG fmt, ##args ); } while (0) | ||
| 96 | #else | ||
| 97 | #define DPRINTF(fmt, args...) | ||
| 98 | #endif | ||
| 99 | |||
| 100 | #define def_load_ai_insn(_insn,_sz,_tt,_s,_a,_t,_e) \ | ||
| 101 | __asm__ __volatile__ ( \ | ||
| 102 | "1:\t" #_insn ",ma " #_sz "(" _s ",%1), %0\n\t" \ | ||
| 103 | ASM_EXCEPTIONTABLE_ENTRY(1b,_e) \ | ||
| 104 | : _tt(_t), "+r"(_a) \ | ||
| 105 | : \ | ||
| 106 | : "r8") | ||
| 107 | |||
| 108 | #define def_store_ai_insn(_insn,_sz,_tt,_s,_a,_t,_e) \ | ||
| 109 | __asm__ __volatile__ ( \ | ||
| 110 | "1:\t" #_insn ",ma %1, " #_sz "(" _s ",%0)\n\t" \ | ||
| 111 | ASM_EXCEPTIONTABLE_ENTRY(1b,_e) \ | ||
| 112 | : "+r"(_a) \ | ||
| 113 | : _tt(_t) \ | ||
| 114 | : "r8") | ||
| 115 | |||
| 116 | #define ldbma(_s, _a, _t, _e) def_load_ai_insn(ldbs,1,"=r",_s,_a,_t,_e) | ||
| 117 | #define stbma(_s, _t, _a, _e) def_store_ai_insn(stbs,1,"r",_s,_a,_t,_e) | ||
| 118 | #define ldwma(_s, _a, _t, _e) def_load_ai_insn(ldw,4,"=r",_s,_a,_t,_e) | ||
| 119 | #define stwma(_s, _t, _a, _e) def_store_ai_insn(stw,4,"r",_s,_a,_t,_e) | ||
| 120 | #define flddma(_s, _a, _t, _e) def_load_ai_insn(fldd,8,"=f",_s,_a,_t,_e) | ||
| 121 | #define fstdma(_s, _t, _a, _e) def_store_ai_insn(fstd,8,"f",_s,_a,_t,_e) | ||
| 122 | |||
| 123 | #define def_load_insn(_insn,_tt,_s,_o,_a,_t,_e) \ | ||
| 124 | __asm__ __volatile__ ( \ | ||
| 125 | "1:\t" #_insn " " #_o "(" _s ",%1), %0\n\t" \ | ||
| 126 | ASM_EXCEPTIONTABLE_ENTRY(1b,_e) \ | ||
| 127 | : _tt(_t) \ | ||
| 128 | : "r"(_a) \ | ||
| 129 | : "r8") | ||
| 130 | |||
| 131 | #define def_store_insn(_insn,_tt,_s,_t,_o,_a,_e) \ | ||
| 132 | __asm__ __volatile__ ( \ | ||
| 133 | "1:\t" #_insn " %0, " #_o "(" _s ",%1)\n\t" \ | ||
| 134 | ASM_EXCEPTIONTABLE_ENTRY(1b,_e) \ | ||
| 135 | : \ | ||
| 136 | : _tt(_t), "r"(_a) \ | ||
| 137 | : "r8") | ||
| 138 | |||
| 139 | #define ldw(_s,_o,_a,_t,_e) def_load_insn(ldw,"=r",_s,_o,_a,_t,_e) | ||
| 140 | #define stw(_s,_t,_o,_a,_e) def_store_insn(stw,"r",_s,_t,_o,_a,_e) | ||
| 141 | |||
| 142 | #ifdef CONFIG_PREFETCH | ||
| 143 | static inline void prefetch_src(const void *addr) | ||
| 144 | { | ||
| 145 | __asm__("ldw 0(" s_space ",%0), %%r0" : : "r" (addr)); | ||
| 146 | } | ||
| 147 | |||
| 148 | static inline void prefetch_dst(const void *addr) | ||
| 149 | { | ||
| 150 | __asm__("ldd 0(" d_space ",%0), %%r0" : : "r" (addr)); | ||
| 151 | } | ||
| 152 | #else | ||
| 153 | #define prefetch_src(addr) do { } while(0) | ||
| 154 | #define prefetch_dst(addr) do { } while(0) | ||
| 155 | #endif | ||
| 156 | |||
| 157 | #define PA_MEMCPY_OK 0 | ||
| 158 | #define PA_MEMCPY_LOAD_ERROR 1 | ||
| 159 | #define PA_MEMCPY_STORE_ERROR 2 | ||
| 160 | |||
| 161 | /* Copy from a not-aligned src to an aligned dst, using shifts. Handles 4 words | ||
| 162 | * per loop. This code is derived from glibc. | ||
| 163 | */ | ||
| 164 | static noinline unsigned long copy_dstaligned(unsigned long dst, | ||
| 165 | unsigned long src, unsigned long len) | ||
| 166 | { | ||
| 167 | /* gcc complains that a2 and a3 may be uninitialized, but actually | ||
| 168 | * they cannot be. Initialize a2/a3 to shut gcc up. | ||
| 169 | */ | ||
| 170 | register unsigned int a0, a1, a2 = 0, a3 = 0; | ||
| 171 | int sh_1, sh_2; | ||
| 172 | |||
| 173 | /* prefetch_src((const void *)src); */ | ||
| 174 | |||
| 175 | /* Calculate how to shift a word read at the memory operation | ||
| 176 | aligned srcp to make it aligned for copy. */ | ||
| 177 | sh_1 = 8 * (src % sizeof(unsigned int)); | ||
| 178 | sh_2 = 8 * sizeof(unsigned int) - sh_1; | ||
| 179 | |||
| 180 | /* Make src aligned by rounding it down. */ | ||
| 181 | src &= -sizeof(unsigned int); | ||
| 182 | |||
| 183 | switch (len % 4) | ||
| 184 | { | ||
| 185 | case 2: | ||
| 186 | /* a1 = ((unsigned int *) src)[0]; | ||
| 187 | a2 = ((unsigned int *) src)[1]; */ | ||
| 188 | ldw(s_space, 0, src, a1, cda_ldw_exc); | ||
| 189 | ldw(s_space, 4, src, a2, cda_ldw_exc); | ||
| 190 | src -= 1 * sizeof(unsigned int); | ||
| 191 | dst -= 3 * sizeof(unsigned int); | ||
| 192 | len += 2; | ||
| 193 | goto do1; | ||
| 194 | case 3: | ||
| 195 | /* a0 = ((unsigned int *) src)[0]; | ||
| 196 | a1 = ((unsigned int *) src)[1]; */ | ||
| 197 | ldw(s_space, 0, src, a0, cda_ldw_exc); | ||
| 198 | ldw(s_space, 4, src, a1, cda_ldw_exc); | ||
| 199 | src -= 0 * sizeof(unsigned int); | ||
| 200 | dst -= 2 * sizeof(unsigned int); | ||
| 201 | len += 1; | ||
| 202 | goto do2; | ||
| 203 | case 0: | ||
| 204 | if (len == 0) | ||
| 205 | return PA_MEMCPY_OK; | ||
| 206 | /* a3 = ((unsigned int *) src)[0]; | ||
| 207 | a0 = ((unsigned int *) src)[1]; */ | ||
| 208 | ldw(s_space, 0, src, a3, cda_ldw_exc); | ||
| 209 | ldw(s_space, 4, src, a0, cda_ldw_exc); | ||
| 210 | src -=-1 * sizeof(unsigned int); | ||
| 211 | dst -= 1 * sizeof(unsigned int); | ||
| 212 | len += 0; | ||
| 213 | goto do3; | ||
| 214 | case 1: | ||
| 215 | /* a2 = ((unsigned int *) src)[0]; | ||
| 216 | a3 = ((unsigned int *) src)[1]; */ | ||
| 217 | ldw(s_space, 0, src, a2, cda_ldw_exc); | ||
| 218 | ldw(s_space, 4, src, a3, cda_ldw_exc); | ||
| 219 | src -=-2 * sizeof(unsigned int); | ||
| 220 | dst -= 0 * sizeof(unsigned int); | ||
| 221 | len -= 1; | ||
| 222 | if (len == 0) | ||
| 223 | goto do0; | ||
| 224 | goto do4; /* No-op. */ | ||
| 225 | } | ||
| 226 | |||
| 227 | do | ||
| 228 | { | ||
| 229 | /* prefetch_src((const void *)(src + 4 * sizeof(unsigned int))); */ | ||
| 230 | do4: | ||
| 231 | /* a0 = ((unsigned int *) src)[0]; */ | ||
| 232 | ldw(s_space, 0, src, a0, cda_ldw_exc); | ||
| 233 | /* ((unsigned int *) dst)[0] = MERGE (a2, sh_1, a3, sh_2); */ | ||
| 234 | stw(d_space, MERGE (a2, sh_1, a3, sh_2), 0, dst, cda_stw_exc); | ||
| 235 | do3: | ||
| 236 | /* a1 = ((unsigned int *) src)[1]; */ | ||
| 237 | ldw(s_space, 4, src, a1, cda_ldw_exc); | ||
| 238 | /* ((unsigned int *) dst)[1] = MERGE (a3, sh_1, a0, sh_2); */ | ||
| 239 | stw(d_space, MERGE (a3, sh_1, a0, sh_2), 4, dst, cda_stw_exc); | ||
| 240 | do2: | ||
| 241 | /* a2 = ((unsigned int *) src)[2]; */ | ||
| 242 | ldw(s_space, 8, src, a2, cda_ldw_exc); | ||
| 243 | /* ((unsigned int *) dst)[2] = MERGE (a0, sh_1, a1, sh_2); */ | ||
| 244 | stw(d_space, MERGE (a0, sh_1, a1, sh_2), 8, dst, cda_stw_exc); | ||
| 245 | do1: | ||
| 246 | /* a3 = ((unsigned int *) src)[3]; */ | ||
| 247 | ldw(s_space, 12, src, a3, cda_ldw_exc); | ||
| 248 | /* ((unsigned int *) dst)[3] = MERGE (a1, sh_1, a2, sh_2); */ | ||
| 249 | stw(d_space, MERGE (a1, sh_1, a2, sh_2), 12, dst, cda_stw_exc); | ||
| 250 | |||
| 251 | src += 4 * sizeof(unsigned int); | ||
| 252 | dst += 4 * sizeof(unsigned int); | ||
| 253 | len -= 4; | ||
| 254 | } | ||
| 255 | while (len != 0); | ||
| 256 | |||
| 257 | do0: | ||
| 258 | /* ((unsigned int *) dst)[0] = MERGE (a2, sh_1, a3, sh_2); */ | ||
| 259 | stw(d_space, MERGE (a2, sh_1, a3, sh_2), 0, dst, cda_stw_exc); | ||
| 260 | |||
| 261 | preserve_branch(handle_load_error); | ||
| 262 | preserve_branch(handle_store_error); | ||
| 263 | |||
| 264 | return PA_MEMCPY_OK; | ||
| 265 | |||
| 266 | handle_load_error: | ||
| 267 | __asm__ __volatile__ ("cda_ldw_exc:\n"); | ||
| 268 | return PA_MEMCPY_LOAD_ERROR; | ||
| 269 | |||
| 270 | handle_store_error: | ||
| 271 | __asm__ __volatile__ ("cda_stw_exc:\n"); | ||
| 272 | return PA_MEMCPY_STORE_ERROR; | ||
| 273 | } | ||
| 274 | |||
| 275 | |||
| 276 | /* Returns PA_MEMCPY_OK, PA_MEMCPY_LOAD_ERROR or PA_MEMCPY_STORE_ERROR. | ||
| 277 | * In case of an access fault the faulty address can be read from the per_cpu | ||
| 278 | * exception data struct. */ | ||
| 279 | static noinline unsigned long pa_memcpy_internal(void *dstp, const void *srcp, | ||
| 280 | unsigned long len) | ||
| 281 | { | ||
| 282 | register unsigned long src, dst, t1, t2, t3; | ||
| 283 | register unsigned char *pcs, *pcd; | ||
| 284 | register unsigned int *pws, *pwd; | ||
| 285 | register double *pds, *pdd; | ||
| 286 | unsigned long ret; | ||
| 287 | |||
| 288 | src = (unsigned long)srcp; | ||
| 289 | dst = (unsigned long)dstp; | ||
| 290 | pcs = (unsigned char *)srcp; | ||
| 291 | pcd = (unsigned char *)dstp; | ||
| 292 | |||
| 293 | /* prefetch_src((const void *)srcp); */ | ||
| 294 | |||
| 295 | if (len < THRESHOLD) | ||
| 296 | goto byte_copy; | ||
| 297 | |||
| 298 | /* Check alignment */ | ||
| 299 | t1 = (src ^ dst); | ||
| 300 | if (unlikely(t1 & (sizeof(double)-1))) | ||
| 301 | goto unaligned_copy; | ||
| 302 | |||
| 303 | /* src and dst have same alignment. */ | ||
| 304 | |||
| 305 | /* Copy bytes till we are double-aligned. */ | ||
| 306 | t2 = src & (sizeof(double) - 1); | ||
| 307 | if (unlikely(t2 != 0)) { | ||
| 308 | t2 = sizeof(double) - t2; | ||
| 309 | while (t2 && len) { | ||
| 310 | /* *pcd++ = *pcs++; */ | ||
| 311 | ldbma(s_space, pcs, t3, pmc_load_exc); | ||
| 312 | len--; | ||
| 313 | stbma(d_space, t3, pcd, pmc_store_exc); | ||
| 314 | t2--; | ||
| 315 | } | ||
| 316 | } | ||
| 317 | |||
| 318 | pds = (double *)pcs; | ||
| 319 | pdd = (double *)pcd; | ||
| 320 | |||
| 321 | #if 0 | ||
| 322 | /* Copy 8 doubles at a time */ | ||
| 323 | while (len >= 8*sizeof(double)) { | ||
| 324 | register double r1, r2, r3, r4, r5, r6, r7, r8; | ||
| 325 | /* prefetch_src((char *)pds + L1_CACHE_BYTES); */ | ||
| 326 | flddma(s_space, pds, r1, pmc_load_exc); | ||
| 327 | flddma(s_space, pds, r2, pmc_load_exc); | ||
| 328 | flddma(s_space, pds, r3, pmc_load_exc); | ||
| 329 | flddma(s_space, pds, r4, pmc_load_exc); | ||
| 330 | fstdma(d_space, r1, pdd, pmc_store_exc); | ||
| 331 | fstdma(d_space, r2, pdd, pmc_store_exc); | ||
| 332 | fstdma(d_space, r3, pdd, pmc_store_exc); | ||
| 333 | fstdma(d_space, r4, pdd, pmc_store_exc); | ||
| 334 | |||
| 335 | #if 0 | ||
| 336 | if (L1_CACHE_BYTES <= 32) | ||
| 337 | prefetch_src((char *)pds + L1_CACHE_BYTES); | ||
| 338 | #endif | ||
| 339 | flddma(s_space, pds, r5, pmc_load_exc); | ||
| 340 | flddma(s_space, pds, r6, pmc_load_exc); | ||
| 341 | flddma(s_space, pds, r7, pmc_load_exc); | ||
| 342 | flddma(s_space, pds, r8, pmc_load_exc); | ||
| 343 | fstdma(d_space, r5, pdd, pmc_store_exc); | ||
| 344 | fstdma(d_space, r6, pdd, pmc_store_exc); | ||
| 345 | fstdma(d_space, r7, pdd, pmc_store_exc); | ||
| 346 | fstdma(d_space, r8, pdd, pmc_store_exc); | ||
| 347 | len -= 8*sizeof(double); | ||
| 348 | } | ||
| 349 | #endif | ||
| 350 | |||
| 351 | pws = (unsigned int *)pds; | ||
| 352 | pwd = (unsigned int *)pdd; | ||
| 353 | |||
| 354 | word_copy: | ||
| 355 | while (len >= 8*sizeof(unsigned int)) { | ||
| 356 | register unsigned int r1,r2,r3,r4,r5,r6,r7,r8; | ||
| 357 | /* prefetch_src((char *)pws + L1_CACHE_BYTES); */ | ||
| 358 | ldwma(s_space, pws, r1, pmc_load_exc); | ||
| 359 | ldwma(s_space, pws, r2, pmc_load_exc); | ||
| 360 | ldwma(s_space, pws, r3, pmc_load_exc); | ||
| 361 | ldwma(s_space, pws, r4, pmc_load_exc); | ||
| 362 | stwma(d_space, r1, pwd, pmc_store_exc); | ||
| 363 | stwma(d_space, r2, pwd, pmc_store_exc); | ||
| 364 | stwma(d_space, r3, pwd, pmc_store_exc); | ||
| 365 | stwma(d_space, r4, pwd, pmc_store_exc); | ||
| 366 | |||
| 367 | ldwma(s_space, pws, r5, pmc_load_exc); | ||
| 368 | ldwma(s_space, pws, r6, pmc_load_exc); | ||
| 369 | ldwma(s_space, pws, r7, pmc_load_exc); | ||
| 370 | ldwma(s_space, pws, r8, pmc_load_exc); | ||
| 371 | stwma(d_space, r5, pwd, pmc_store_exc); | ||
| 372 | stwma(d_space, r6, pwd, pmc_store_exc); | ||
| 373 | stwma(d_space, r7, pwd, pmc_store_exc); | ||
| 374 | stwma(d_space, r8, pwd, pmc_store_exc); | ||
| 375 | len -= 8*sizeof(unsigned int); | ||
| 376 | } | ||
| 377 | |||
| 378 | while (len >= 4*sizeof(unsigned int)) { | ||
| 379 | register unsigned int r1,r2,r3,r4; | ||
| 380 | ldwma(s_space, pws, r1, pmc_load_exc); | ||
| 381 | ldwma(s_space, pws, r2, pmc_load_exc); | ||
| 382 | ldwma(s_space, pws, r3, pmc_load_exc); | ||
| 383 | ldwma(s_space, pws, r4, pmc_load_exc); | ||
| 384 | stwma(d_space, r1, pwd, pmc_store_exc); | ||
| 385 | stwma(d_space, r2, pwd, pmc_store_exc); | ||
| 386 | stwma(d_space, r3, pwd, pmc_store_exc); | ||
| 387 | stwma(d_space, r4, pwd, pmc_store_exc); | ||
| 388 | len -= 4*sizeof(unsigned int); | ||
| 389 | } | ||
| 390 | |||
| 391 | pcs = (unsigned char *)pws; | ||
| 392 | pcd = (unsigned char *)pwd; | ||
| 393 | |||
| 394 | byte_copy: | ||
| 395 | while (len) { | ||
| 396 | /* *pcd++ = *pcs++; */ | ||
| 397 | ldbma(s_space, pcs, t3, pmc_load_exc); | ||
| 398 | stbma(d_space, t3, pcd, pmc_store_exc); | ||
| 399 | len--; | ||
| 400 | } | ||
| 401 | |||
| 402 | return PA_MEMCPY_OK; | ||
| 403 | |||
| 404 | unaligned_copy: | ||
| 405 | /* possibly we are aligned on a word, but not on a double... */ | ||
| 406 | if (likely((t1 & (sizeof(unsigned int)-1)) == 0)) { | ||
| 407 | t2 = src & (sizeof(unsigned int) - 1); | ||
| 408 | |||
| 409 | if (unlikely(t2 != 0)) { | ||
| 410 | t2 = sizeof(unsigned int) - t2; | ||
| 411 | while (t2) { | ||
| 412 | /* *pcd++ = *pcs++; */ | ||
| 413 | ldbma(s_space, pcs, t3, pmc_load_exc); | ||
| 414 | stbma(d_space, t3, pcd, pmc_store_exc); | ||
| 415 | len--; | ||
| 416 | t2--; | ||
| 417 | } | ||
| 418 | } | ||
| 419 | |||
| 420 | pws = (unsigned int *)pcs; | ||
| 421 | pwd = (unsigned int *)pcd; | ||
| 422 | goto word_copy; | ||
| 423 | } | ||
| 424 | |||
| 425 | /* Align the destination. */ | ||
| 426 | if (unlikely((dst & (sizeof(unsigned int) - 1)) != 0)) { | ||
| 427 | t2 = sizeof(unsigned int) - (dst & (sizeof(unsigned int) - 1)); | ||
| 428 | while (t2) { | ||
| 429 | /* *pcd++ = *pcs++; */ | ||
| 430 | ldbma(s_space, pcs, t3, pmc_load_exc); | ||
| 431 | stbma(d_space, t3, pcd, pmc_store_exc); | ||
| 432 | len--; | ||
| 433 | t2--; | ||
| 434 | } | ||
| 435 | dst = (unsigned long)pcd; | ||
| 436 | src = (unsigned long)pcs; | ||
| 437 | } | ||
| 438 | |||
| 439 | ret = copy_dstaligned(dst, src, len / sizeof(unsigned int)); | ||
| 440 | if (ret) | ||
| 441 | return ret; | ||
| 442 | |||
| 443 | pcs += (len & -sizeof(unsigned int)); | ||
| 444 | pcd += (len & -sizeof(unsigned int)); | ||
| 445 | len %= sizeof(unsigned int); | ||
| 446 | |||
| 447 | preserve_branch(handle_load_error); | ||
| 448 | preserve_branch(handle_store_error); | ||
| 449 | |||
| 450 | goto byte_copy; | ||
| 451 | |||
| 452 | handle_load_error: | ||
| 453 | __asm__ __volatile__ ("pmc_load_exc:\n"); | ||
| 454 | return PA_MEMCPY_LOAD_ERROR; | ||
| 455 | |||
| 456 | handle_store_error: | ||
| 457 | __asm__ __volatile__ ("pmc_store_exc:\n"); | ||
| 458 | return PA_MEMCPY_STORE_ERROR; | ||
| 459 | } | ||
| 460 | |||
| 461 | |||
| 462 | /* Returns 0 for success, otherwise, returns number of bytes not transferred. */ | 35 | /* Returns 0 for success, otherwise, returns number of bytes not transferred. */ |
| 463 | static unsigned long pa_memcpy(void *dstp, const void *srcp, unsigned long len) | 36 | extern unsigned long pa_memcpy(void *dst, const void *src, |
| 464 | { | 37 | unsigned long len); |
| 465 | unsigned long ret, fault_addr, reference; | ||
| 466 | struct exception_data *d; | ||
| 467 | |||
| 468 | ret = pa_memcpy_internal(dstp, srcp, len); | ||
| 469 | if (likely(ret == PA_MEMCPY_OK)) | ||
| 470 | return 0; | ||
| 471 | |||
| 472 | /* if a load or store fault occured we can get the faulty addr */ | ||
| 473 | d = this_cpu_ptr(&exception_data); | ||
| 474 | fault_addr = d->fault_addr; | ||
| 475 | |||
| 476 | /* error in load or store? */ | ||
| 477 | if (ret == PA_MEMCPY_LOAD_ERROR) | ||
| 478 | reference = (unsigned long) srcp; | ||
| 479 | else | ||
| 480 | reference = (unsigned long) dstp; | ||
| 481 | 38 | ||
| 482 | DPRINTF("pa_memcpy: fault type = %lu, len=%lu fault_addr=%lu ref=%lu\n", | ||
| 483 | ret, len, fault_addr, reference); | ||
| 484 | |||
| 485 | if (fault_addr >= reference) | ||
| 486 | return len - (fault_addr - reference); | ||
| 487 | else | ||
| 488 | return len; | ||
| 489 | } | ||
| 490 | |||
| 491 | #ifdef __KERNEL__ | ||
| 492 | unsigned long __copy_to_user(void __user *dst, const void *src, | 39 | unsigned long __copy_to_user(void __user *dst, const void *src, |
| 493 | unsigned long len) | 40 | unsigned long len) |
| 494 | { | 41 | { |
| @@ -537,5 +84,3 @@ long probe_kernel_read(void *dst, const void *src, size_t size) | |||
| 537 | 84 | ||
| 538 | return __probe_kernel_read(dst, src, size); | 85 | return __probe_kernel_read(dst, src, size); |
| 539 | } | 86 | } |
| 540 | |||
| 541 | #endif | ||
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index deab89a8915a..32ec22146141 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c | |||
| @@ -150,6 +150,23 @@ int fixup_exception(struct pt_regs *regs) | |||
| 150 | d->fault_space = regs->isr; | 150 | d->fault_space = regs->isr; |
| 151 | d->fault_addr = regs->ior; | 151 | d->fault_addr = regs->ior; |
| 152 | 152 | ||
| 153 | /* | ||
| 154 | * Fix up get_user() and put_user(). | ||
| 155 | * ASM_EXCEPTIONTABLE_ENTRY_EFAULT() sets the least-significant | ||
| 156 | * bit in the relative address of the fixup routine to indicate | ||
| 157 | * that %r8 should be loaded with -EFAULT to report a userspace | ||
| 158 | * access error. | ||
| 159 | */ | ||
| 160 | if (fix->fixup & 1) { | ||
| 161 | regs->gr[8] = -EFAULT; | ||
| 162 | |||
| 163 | /* zero target register for get_user() */ | ||
| 164 | if (parisc_acctyp(0, regs->iir) == VM_READ) { | ||
| 165 | int treg = regs->iir & 0x1f; | ||
| 166 | regs->gr[treg] = 0; | ||
| 167 | } | ||
| 168 | } | ||
| 169 | |||
| 153 | regs->iaoq[0] = (unsigned long)&fix->fixup + fix->fixup; | 170 | regs->iaoq[0] = (unsigned long)&fix->fixup + fix->fixup; |
| 154 | regs->iaoq[0] &= ~3; | 171 | regs->iaoq[0] &= ~3; |
| 155 | /* | 172 | /* |
diff --git a/arch/powerpc/crypto/crc32c-vpmsum_glue.c b/arch/powerpc/crypto/crc32c-vpmsum_glue.c index 411994551afc..f058e0c3e4d4 100644 --- a/arch/powerpc/crypto/crc32c-vpmsum_glue.c +++ b/arch/powerpc/crypto/crc32c-vpmsum_glue.c | |||
| @@ -33,10 +33,13 @@ static u32 crc32c_vpmsum(u32 crc, unsigned char const *p, size_t len) | |||
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | if (len & ~VMX_ALIGN_MASK) { | 35 | if (len & ~VMX_ALIGN_MASK) { |
| 36 | preempt_disable(); | ||
| 36 | pagefault_disable(); | 37 | pagefault_disable(); |
| 37 | enable_kernel_altivec(); | 38 | enable_kernel_altivec(); |
| 38 | crc = __crc32c_vpmsum(crc, p, len & ~VMX_ALIGN_MASK); | 39 | crc = __crc32c_vpmsum(crc, p, len & ~VMX_ALIGN_MASK); |
| 40 | disable_kernel_altivec(); | ||
| 39 | pagefault_enable(); | 41 | pagefault_enable(); |
| 42 | preempt_enable(); | ||
| 40 | } | 43 | } |
| 41 | 44 | ||
| 42 | tail = len & VMX_ALIGN_MASK; | 45 | tail = len & VMX_ALIGN_MASK; |
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c index cbc7c42cdb74..ec7a8b099dd9 100644 --- a/arch/powerpc/kernel/align.c +++ b/arch/powerpc/kernel/align.c | |||
| @@ -807,14 +807,25 @@ int fix_alignment(struct pt_regs *regs) | |||
| 807 | nb = aligninfo[instr].len; | 807 | nb = aligninfo[instr].len; |
| 808 | flags = aligninfo[instr].flags; | 808 | flags = aligninfo[instr].flags; |
| 809 | 809 | ||
| 810 | /* ldbrx/stdbrx overlap lfs/stfs in the DSISR unfortunately */ | 810 | /* |
| 811 | if (IS_XFORM(instruction) && ((instruction >> 1) & 0x3ff) == 532) { | 811 | * Handle some cases which give overlaps in the DSISR values. |
| 812 | nb = 8; | 812 | */ |
| 813 | flags = LD+SW; | 813 | if (IS_XFORM(instruction)) { |
| 814 | } else if (IS_XFORM(instruction) && | 814 | switch (get_xop(instruction)) { |
| 815 | ((instruction >> 1) & 0x3ff) == 660) { | 815 | case 532: /* ldbrx */ |
| 816 | nb = 8; | 816 | nb = 8; |
| 817 | flags = ST+SW; | 817 | flags = LD+SW; |
| 818 | break; | ||
| 819 | case 660: /* stdbrx */ | ||
| 820 | nb = 8; | ||
| 821 | flags = ST+SW; | ||
| 822 | break; | ||
| 823 | case 20: /* lwarx */ | ||
| 824 | case 84: /* ldarx */ | ||
| 825 | case 116: /* lharx */ | ||
| 826 | case 276: /* lqarx */ | ||
| 827 | return 0; /* not emulated ever */ | ||
| 828 | } | ||
| 818 | } | 829 | } |
| 819 | 830 | ||
| 820 | /* Byteswap little endian loads and stores */ | 831 | /* Byteswap little endian loads and stores */ |
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index ae179cb1bb3c..c119044cad0d 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S | |||
| @@ -67,7 +67,7 @@ PPC64_CACHES: | |||
| 67 | * flush all bytes from start through stop-1 inclusive | 67 | * flush all bytes from start through stop-1 inclusive |
| 68 | */ | 68 | */ |
| 69 | 69 | ||
| 70 | _GLOBAL(flush_icache_range) | 70 | _GLOBAL_TOC(flush_icache_range) |
| 71 | BEGIN_FTR_SECTION | 71 | BEGIN_FTR_SECTION |
| 72 | PURGE_PREFETCHED_INS | 72 | PURGE_PREFETCHED_INS |
| 73 | blr | 73 | blr |
| @@ -120,7 +120,7 @@ EXPORT_SYMBOL(flush_icache_range) | |||
| 120 | * | 120 | * |
| 121 | * flush all bytes from start to stop-1 inclusive | 121 | * flush all bytes from start to stop-1 inclusive |
| 122 | */ | 122 | */ |
| 123 | _GLOBAL(flush_dcache_range) | 123 | _GLOBAL_TOC(flush_dcache_range) |
| 124 | 124 | ||
| 125 | /* | 125 | /* |
| 126 | * Flush the data cache to memory | 126 | * Flush the data cache to memory |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 9cfaa8b69b5f..f997154dfc41 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -236,6 +236,15 @@ static void cpu_ready_for_interrupts(void) | |||
| 236 | mtspr(SPRN_LPCR, lpcr | LPCR_AIL_3); | 236 | mtspr(SPRN_LPCR, lpcr | LPCR_AIL_3); |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | /* | ||
| 240 | * Fixup HFSCR:TM based on CPU features. The bit is set by our | ||
| 241 | * early asm init because at that point we haven't updated our | ||
| 242 | * CPU features from firmware and device-tree. Here we have, | ||
| 243 | * so let's do it. | ||
| 244 | */ | ||
| 245 | if (cpu_has_feature(CPU_FTR_HVMODE) && !cpu_has_feature(CPU_FTR_TM_COMP)) | ||
| 246 | mtspr(SPRN_HFSCR, mfspr(SPRN_HFSCR) & ~HFSCR_TM); | ||
| 247 | |||
| 239 | /* Set IR and DR in PACA MSR */ | 248 | /* Set IR and DR in PACA MSR */ |
| 240 | get_paca()->kernel_msr = MSR_KERNEL; | 249 | get_paca()->kernel_msr = MSR_KERNEL; |
| 241 | } | 250 | } |
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index 8c68145ba1bd..710e491206ed 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c | |||
| @@ -1487,6 +1487,10 @@ long kvm_vm_ioctl_resize_hpt_prepare(struct kvm *kvm, | |||
| 1487 | /* start new resize */ | 1487 | /* start new resize */ |
| 1488 | 1488 | ||
| 1489 | resize = kzalloc(sizeof(*resize), GFP_KERNEL); | 1489 | resize = kzalloc(sizeof(*resize), GFP_KERNEL); |
| 1490 | if (!resize) { | ||
| 1491 | ret = -ENOMEM; | ||
| 1492 | goto out; | ||
| 1493 | } | ||
| 1490 | resize->order = shift; | 1494 | resize->order = shift; |
| 1491 | resize->kvm = kvm; | 1495 | resize->kvm = kvm; |
| 1492 | INIT_WORK(&resize->work, resize_hpt_prepare_work); | 1496 | INIT_WORK(&resize->work, resize_hpt_prepare_work); |
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c index cc332608e656..65bb8f33b399 100644 --- a/arch/powerpc/mm/hash_native_64.c +++ b/arch/powerpc/mm/hash_native_64.c | |||
| @@ -638,6 +638,10 @@ static void native_flush_hash_range(unsigned long number, int local) | |||
| 638 | unsigned long psize = batch->psize; | 638 | unsigned long psize = batch->psize; |
| 639 | int ssize = batch->ssize; | 639 | int ssize = batch->ssize; |
| 640 | int i; | 640 | int i; |
| 641 | unsigned int use_local; | ||
| 642 | |||
| 643 | use_local = local && mmu_has_feature(MMU_FTR_TLBIEL) && | ||
| 644 | mmu_psize_defs[psize].tlbiel && !cxl_ctx_in_use(); | ||
| 641 | 645 | ||
| 642 | local_irq_save(flags); | 646 | local_irq_save(flags); |
| 643 | 647 | ||
| @@ -667,8 +671,7 @@ static void native_flush_hash_range(unsigned long number, int local) | |||
| 667 | } pte_iterate_hashed_end(); | 671 | } pte_iterate_hashed_end(); |
| 668 | } | 672 | } |
| 669 | 673 | ||
| 670 | if (mmu_has_feature(MMU_FTR_TLBIEL) && | 674 | if (use_local) { |
| 671 | mmu_psize_defs[psize].tlbiel && local) { | ||
| 672 | asm volatile("ptesync":::"memory"); | 675 | asm volatile("ptesync":::"memory"); |
| 673 | for (i = 0; i < number; i++) { | 676 | for (i = 0; i < number; i++) { |
| 674 | vpn = batch->vpn[i]; | 677 | vpn = batch->vpn[i]; |
diff --git a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c index fa95041fa9f6..33ca29333e18 100644 --- a/arch/s390/boot/compressed/misc.c +++ b/arch/s390/boot/compressed/misc.c | |||
| @@ -141,31 +141,34 @@ static void check_ipl_parmblock(void *start, unsigned long size) | |||
| 141 | 141 | ||
| 142 | unsigned long decompress_kernel(void) | 142 | unsigned long decompress_kernel(void) |
| 143 | { | 143 | { |
| 144 | unsigned long output_addr; | 144 | void *output, *kernel_end; |
| 145 | unsigned char *output; | ||
| 146 | 145 | ||
| 147 | output_addr = ((unsigned long) &_end + HEAP_SIZE + 4095UL) & -4096UL; | 146 | output = (void *) ALIGN((unsigned long) &_end + HEAP_SIZE, PAGE_SIZE); |
| 148 | check_ipl_parmblock((void *) 0, output_addr + SZ__bss_start); | 147 | kernel_end = output + SZ__bss_start; |
| 149 | memset(&_bss, 0, &_ebss - &_bss); | 148 | check_ipl_parmblock((void *) 0, (unsigned long) kernel_end); |
| 150 | free_mem_ptr = (unsigned long)&_end; | ||
| 151 | free_mem_end_ptr = free_mem_ptr + HEAP_SIZE; | ||
| 152 | output = (unsigned char *) output_addr; | ||
| 153 | 149 | ||
| 154 | #ifdef CONFIG_BLK_DEV_INITRD | 150 | #ifdef CONFIG_BLK_DEV_INITRD |
| 155 | /* | 151 | /* |
| 156 | * Move the initrd right behind the end of the decompressed | 152 | * Move the initrd right behind the end of the decompressed |
| 157 | * kernel image. | 153 | * kernel image. This also prevents initrd corruption caused by |
| 154 | * bss clearing since kernel_end will always be located behind the | ||
| 155 | * current bss section.. | ||
| 158 | */ | 156 | */ |
| 159 | if (INITRD_START && INITRD_SIZE && | 157 | if (INITRD_START && INITRD_SIZE && kernel_end > (void *) INITRD_START) { |
| 160 | INITRD_START < (unsigned long) output + SZ__bss_start) { | 158 | check_ipl_parmblock(kernel_end, INITRD_SIZE); |
| 161 | check_ipl_parmblock(output + SZ__bss_start, | 159 | memmove(kernel_end, (void *) INITRD_START, INITRD_SIZE); |
| 162 | INITRD_START + INITRD_SIZE); | 160 | INITRD_START = (unsigned long) kernel_end; |
| 163 | memmove(output + SZ__bss_start, | ||
| 164 | (void *) INITRD_START, INITRD_SIZE); | ||
| 165 | INITRD_START = (unsigned long) output + SZ__bss_start; | ||
| 166 | } | 161 | } |
| 167 | #endif | 162 | #endif |
| 168 | 163 | ||
| 164 | /* | ||
| 165 | * Clear bss section. free_mem_ptr and free_mem_end_ptr need to be | ||
| 166 | * initialized afterwards since they reside in bss. | ||
| 167 | */ | ||
| 168 | memset(&_bss, 0, &_ebss - &_bss); | ||
| 169 | free_mem_ptr = (unsigned long) &_end; | ||
| 170 | free_mem_end_ptr = free_mem_ptr + HEAP_SIZE; | ||
| 171 | |||
| 169 | puts("Uncompressing Linux... "); | 172 | puts("Uncompressing Linux... "); |
| 170 | __decompress(input_data, input_len, NULL, NULL, output, 0, NULL, error); | 173 | __decompress(input_data, input_len, NULL, NULL, output, 0, NULL, error); |
| 171 | puts("Ok, booting the kernel.\n"); | 174 | puts("Ok, booting the kernel.\n"); |
diff --git a/arch/s390/include/asm/sections.h b/arch/s390/include/asm/sections.h index 5ce29fe100ba..fbd9116eb17b 100644 --- a/arch/s390/include/asm/sections.h +++ b/arch/s390/include/asm/sections.h | |||
| @@ -4,6 +4,5 @@ | |||
| 4 | #include <asm-generic/sections.h> | 4 | #include <asm-generic/sections.h> |
| 5 | 5 | ||
| 6 | extern char _eshared[], _ehead[]; | 6 | extern char _eshared[], _ehead[]; |
| 7 | extern char __start_ro_after_init[], __end_ro_after_init[]; | ||
| 8 | 7 | ||
| 9 | #endif | 8 | #endif |
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h index 136932ff4250..3ea1554d04b3 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h | |||
| @@ -147,7 +147,7 @@ unsigned long __must_check __copy_to_user(void __user *to, const void *from, | |||
| 147 | " jg 2b\n" \ | 147 | " jg 2b\n" \ |
| 148 | ".popsection\n" \ | 148 | ".popsection\n" \ |
| 149 | EX_TABLE(0b,3b) EX_TABLE(1b,3b) \ | 149 | EX_TABLE(0b,3b) EX_TABLE(1b,3b) \ |
| 150 | : "=d" (__rc), "=Q" (*(to)) \ | 150 | : "=d" (__rc), "+Q" (*(to)) \ |
| 151 | : "d" (size), "Q" (*(from)), \ | 151 | : "d" (size), "Q" (*(from)), \ |
| 152 | "d" (__reg0), "K" (-EFAULT) \ | 152 | "d" (__reg0), "K" (-EFAULT) \ |
| 153 | : "cc"); \ | 153 | : "cc"); \ |
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 47a973b5b4f1..5dab859b0d54 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
| @@ -909,13 +909,11 @@ void __init smp_prepare_boot_cpu(void) | |||
| 909 | { | 909 | { |
| 910 | struct pcpu *pcpu = pcpu_devices; | 910 | struct pcpu *pcpu = pcpu_devices; |
| 911 | 911 | ||
| 912 | WARN_ON(!cpu_present(0) || !cpu_online(0)); | ||
| 912 | pcpu->state = CPU_STATE_CONFIGURED; | 913 | pcpu->state = CPU_STATE_CONFIGURED; |
| 913 | pcpu->address = stap(); | ||
| 914 | pcpu->lowcore = (struct lowcore *)(unsigned long) store_prefix(); | 914 | pcpu->lowcore = (struct lowcore *)(unsigned long) store_prefix(); |
| 915 | S390_lowcore.percpu_offset = __per_cpu_offset[0]; | 915 | S390_lowcore.percpu_offset = __per_cpu_offset[0]; |
| 916 | smp_cpu_set_polarization(0, POLARIZATION_UNKNOWN); | 916 | smp_cpu_set_polarization(0, POLARIZATION_UNKNOWN); |
| 917 | set_cpu_present(0, true); | ||
| 918 | set_cpu_online(0, true); | ||
| 919 | } | 917 | } |
| 920 | 918 | ||
| 921 | void __init smp_cpus_done(unsigned int max_cpus) | 919 | void __init smp_cpus_done(unsigned int max_cpus) |
| @@ -924,6 +922,7 @@ void __init smp_cpus_done(unsigned int max_cpus) | |||
| 924 | 922 | ||
| 925 | void __init smp_setup_processor_id(void) | 923 | void __init smp_setup_processor_id(void) |
| 926 | { | 924 | { |
| 925 | pcpu_devices[0].address = stap(); | ||
| 927 | S390_lowcore.cpu_nr = 0; | 926 | S390_lowcore.cpu_nr = 0; |
| 928 | S390_lowcore.spinlock_lockval = arch_spin_lockval(0); | 927 | S390_lowcore.spinlock_lockval = arch_spin_lockval(0); |
| 929 | } | 928 | } |
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 5ccf95396251..72307f108c40 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
| @@ -63,11 +63,9 @@ SECTIONS | |||
| 63 | 63 | ||
| 64 | . = ALIGN(PAGE_SIZE); | 64 | . = ALIGN(PAGE_SIZE); |
| 65 | __start_ro_after_init = .; | 65 | __start_ro_after_init = .; |
| 66 | __start_data_ro_after_init = .; | ||
| 67 | .data..ro_after_init : { | 66 | .data..ro_after_init : { |
| 68 | *(.data..ro_after_init) | 67 | *(.data..ro_after_init) |
| 69 | } | 68 | } |
| 70 | __end_data_ro_after_init = .; | ||
| 71 | EXCEPTION_TABLE(16) | 69 | EXCEPTION_TABLE(16) |
| 72 | . = ALIGN(PAGE_SIZE); | 70 | . = ALIGN(PAGE_SIZE); |
| 73 | __end_ro_after_init = .; | 71 | __end_ro_after_init = .; |
diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c index d55c829a5944..ddbffb715b40 100644 --- a/arch/s390/kvm/gaccess.c +++ b/arch/s390/kvm/gaccess.c | |||
| @@ -168,8 +168,7 @@ union page_table_entry { | |||
| 168 | unsigned long z : 1; /* Zero Bit */ | 168 | unsigned long z : 1; /* Zero Bit */ |
| 169 | unsigned long i : 1; /* Page-Invalid Bit */ | 169 | unsigned long i : 1; /* Page-Invalid Bit */ |
| 170 | unsigned long p : 1; /* DAT-Protection Bit */ | 170 | unsigned long p : 1; /* DAT-Protection Bit */ |
| 171 | unsigned long co : 1; /* Change-Recording Override */ | 171 | unsigned long : 9; |
| 172 | unsigned long : 8; | ||
| 173 | }; | 172 | }; |
| 174 | }; | 173 | }; |
| 175 | 174 | ||
| @@ -745,8 +744,6 @@ static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, | |||
| 745 | return PGM_PAGE_TRANSLATION; | 744 | return PGM_PAGE_TRANSLATION; |
| 746 | if (pte.z) | 745 | if (pte.z) |
| 747 | return PGM_TRANSLATION_SPEC; | 746 | return PGM_TRANSLATION_SPEC; |
| 748 | if (pte.co && !edat1) | ||
| 749 | return PGM_TRANSLATION_SPEC; | ||
| 750 | dat_protection |= pte.p; | 747 | dat_protection |= pte.p; |
| 751 | raddr.pfra = pte.pfra; | 748 | raddr.pfra = pte.pfra; |
| 752 | real_address: | 749 | real_address: |
| @@ -1182,7 +1179,7 @@ int kvm_s390_shadow_fault(struct kvm_vcpu *vcpu, struct gmap *sg, | |||
| 1182 | rc = gmap_read_table(sg->parent, pgt + vaddr.px * 8, &pte.val); | 1179 | rc = gmap_read_table(sg->parent, pgt + vaddr.px * 8, &pte.val); |
| 1183 | if (!rc && pte.i) | 1180 | if (!rc && pte.i) |
| 1184 | rc = PGM_PAGE_TRANSLATION; | 1181 | rc = PGM_PAGE_TRANSLATION; |
| 1185 | if (!rc && (pte.z || (pte.co && sg->edat_level < 1))) | 1182 | if (!rc && pte.z) |
| 1186 | rc = PGM_TRANSLATION_SPEC; | 1183 | rc = PGM_TRANSLATION_SPEC; |
| 1187 | shadow_page: | 1184 | shadow_page: |
| 1188 | pte.p |= dat_protection; | 1185 | pte.p |= dat_protection; |
diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h index f294dd42fc7d..5961b2d8398a 100644 --- a/arch/sparc/include/asm/page_64.h +++ b/arch/sparc/include/asm/page_64.h | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #define HPAGE_SHIFT 23 | 18 | #define HPAGE_SHIFT 23 |
| 19 | #define REAL_HPAGE_SHIFT 22 | 19 | #define REAL_HPAGE_SHIFT 22 |
| 20 | #define HPAGE_2GB_SHIFT 31 | ||
| 20 | #define HPAGE_256MB_SHIFT 28 | 21 | #define HPAGE_256MB_SHIFT 28 |
| 21 | #define HPAGE_64K_SHIFT 16 | 22 | #define HPAGE_64K_SHIFT 16 |
| 22 | #define REAL_HPAGE_SIZE (_AC(1,UL) << REAL_HPAGE_SHIFT) | 23 | #define REAL_HPAGE_SIZE (_AC(1,UL) << REAL_HPAGE_SHIFT) |
| @@ -27,7 +28,7 @@ | |||
| 27 | #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) | 28 | #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) |
| 28 | #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA | 29 | #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA |
| 29 | #define REAL_HPAGE_PER_HPAGE (_AC(1,UL) << (HPAGE_SHIFT - REAL_HPAGE_SHIFT)) | 30 | #define REAL_HPAGE_PER_HPAGE (_AC(1,UL) << (HPAGE_SHIFT - REAL_HPAGE_SHIFT)) |
| 30 | #define HUGE_MAX_HSTATE 3 | 31 | #define HUGE_MAX_HSTATE 4 |
| 31 | #endif | 32 | #endif |
| 32 | 33 | ||
| 33 | #ifndef __ASSEMBLY__ | 34 | #ifndef __ASSEMBLY__ |
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 8a598528ec1f..6fbd931f0570 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h | |||
| @@ -679,26 +679,27 @@ static inline unsigned long pmd_pfn(pmd_t pmd) | |||
| 679 | return pte_pfn(pte); | 679 | return pte_pfn(pte); |
| 680 | } | 680 | } |
| 681 | 681 | ||
| 682 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 682 | #define __HAVE_ARCH_PMD_WRITE |
| 683 | static inline unsigned long pmd_dirty(pmd_t pmd) | 683 | static inline unsigned long pmd_write(pmd_t pmd) |
| 684 | { | 684 | { |
| 685 | pte_t pte = __pte(pmd_val(pmd)); | 685 | pte_t pte = __pte(pmd_val(pmd)); |
| 686 | 686 | ||
| 687 | return pte_dirty(pte); | 687 | return pte_write(pte); |
| 688 | } | 688 | } |
| 689 | 689 | ||
| 690 | static inline unsigned long pmd_young(pmd_t pmd) | 690 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
| 691 | static inline unsigned long pmd_dirty(pmd_t pmd) | ||
| 691 | { | 692 | { |
| 692 | pte_t pte = __pte(pmd_val(pmd)); | 693 | pte_t pte = __pte(pmd_val(pmd)); |
| 693 | 694 | ||
| 694 | return pte_young(pte); | 695 | return pte_dirty(pte); |
| 695 | } | 696 | } |
| 696 | 697 | ||
| 697 | static inline unsigned long pmd_write(pmd_t pmd) | 698 | static inline unsigned long pmd_young(pmd_t pmd) |
| 698 | { | 699 | { |
| 699 | pte_t pte = __pte(pmd_val(pmd)); | 700 | pte_t pte = __pte(pmd_val(pmd)); |
| 700 | 701 | ||
| 701 | return pte_write(pte); | 702 | return pte_young(pte); |
| 702 | } | 703 | } |
| 703 | 704 | ||
| 704 | static inline unsigned long pmd_trans_huge(pmd_t pmd) | 705 | static inline unsigned long pmd_trans_huge(pmd_t pmd) |
diff --git a/arch/sparc/include/asm/processor_32.h b/arch/sparc/include/asm/processor_32.h index 365d4cb267b4..dd27159819eb 100644 --- a/arch/sparc/include/asm/processor_32.h +++ b/arch/sparc/include/asm/processor_32.h | |||
| @@ -18,12 +18,6 @@ | |||
| 18 | #include <asm/signal.h> | 18 | #include <asm/signal.h> |
| 19 | #include <asm/page.h> | 19 | #include <asm/page.h> |
| 20 | 20 | ||
| 21 | /* | ||
| 22 | * The sparc has no problems with write protection | ||
| 23 | */ | ||
| 24 | #define wp_works_ok 1 | ||
| 25 | #define wp_works_ok__is_a_macro /* for versions in ksyms.c */ | ||
| 26 | |||
| 27 | /* Whee, this is STACK_TOP + PAGE_SIZE and the lowest kernel address too... | 21 | /* Whee, this is STACK_TOP + PAGE_SIZE and the lowest kernel address too... |
| 28 | * That one page is used to protect kernel from intruders, so that | 22 | * That one page is used to protect kernel from intruders, so that |
| 29 | * we can make our access_ok test faster | 23 | * we can make our access_ok test faster |
diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h index 6448cfc8292f..b58ee9018433 100644 --- a/arch/sparc/include/asm/processor_64.h +++ b/arch/sparc/include/asm/processor_64.h | |||
| @@ -18,10 +18,6 @@ | |||
| 18 | #include <asm/ptrace.h> | 18 | #include <asm/ptrace.h> |
| 19 | #include <asm/page.h> | 19 | #include <asm/page.h> |
| 20 | 20 | ||
| 21 | /* The sparc has no problems with write protection */ | ||
| 22 | #define wp_works_ok 1 | ||
| 23 | #define wp_works_ok__is_a_macro /* for versions in ksyms.c */ | ||
| 24 | |||
| 25 | /* | 21 | /* |
| 26 | * User lives in his very own context, and cannot reference us. Note | 22 | * User lives in his very own context, and cannot reference us. Note |
| 27 | * that TASK_SIZE is a misnomer, it really gives maximum user virtual | 23 | * that TASK_SIZE is a misnomer, it really gives maximum user virtual |
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S index 6aa3da152c20..44101196d02b 100644 --- a/arch/sparc/kernel/head_64.S +++ b/arch/sparc/kernel/head_64.S | |||
| @@ -96,6 +96,7 @@ sparc64_boot: | |||
| 96 | andn %g1, PSTATE_AM, %g1 | 96 | andn %g1, PSTATE_AM, %g1 |
| 97 | wrpr %g1, 0x0, %pstate | 97 | wrpr %g1, 0x0, %pstate |
| 98 | ba,a,pt %xcc, 1f | 98 | ba,a,pt %xcc, 1f |
| 99 | nop | ||
| 99 | 100 | ||
| 100 | .globl prom_finddev_name, prom_chosen_path, prom_root_node | 101 | .globl prom_finddev_name, prom_chosen_path, prom_root_node |
| 101 | .globl prom_getprop_name, prom_mmu_name, prom_peer_name | 102 | .globl prom_getprop_name, prom_mmu_name, prom_peer_name |
| @@ -613,6 +614,7 @@ niagara_tlb_fixup: | |||
| 613 | nop | 614 | nop |
| 614 | 615 | ||
| 615 | ba,a,pt %xcc, 80f | 616 | ba,a,pt %xcc, 80f |
| 617 | nop | ||
| 616 | niagara4_patch: | 618 | niagara4_patch: |
| 617 | call niagara4_patch_copyops | 619 | call niagara4_patch_copyops |
| 618 | nop | 620 | nop |
| @@ -622,6 +624,7 @@ niagara4_patch: | |||
| 622 | nop | 624 | nop |
| 623 | 625 | ||
| 624 | ba,a,pt %xcc, 80f | 626 | ba,a,pt %xcc, 80f |
| 627 | nop | ||
| 625 | 628 | ||
| 626 | niagara2_patch: | 629 | niagara2_patch: |
| 627 | call niagara2_patch_copyops | 630 | call niagara2_patch_copyops |
| @@ -632,6 +635,7 @@ niagara2_patch: | |||
| 632 | nop | 635 | nop |
| 633 | 636 | ||
| 634 | ba,a,pt %xcc, 80f | 637 | ba,a,pt %xcc, 80f |
| 638 | nop | ||
| 635 | 639 | ||
| 636 | niagara_patch: | 640 | niagara_patch: |
| 637 | call niagara_patch_copyops | 641 | call niagara_patch_copyops |
diff --git a/arch/sparc/kernel/misctrap.S b/arch/sparc/kernel/misctrap.S index 34b4933900bf..9276d2f0dd86 100644 --- a/arch/sparc/kernel/misctrap.S +++ b/arch/sparc/kernel/misctrap.S | |||
| @@ -82,6 +82,7 @@ do_stdfmna: | |||
| 82 | call handle_stdfmna | 82 | call handle_stdfmna |
| 83 | add %sp, PTREGS_OFF, %o0 | 83 | add %sp, PTREGS_OFF, %o0 |
| 84 | ba,a,pt %xcc, rtrap | 84 | ba,a,pt %xcc, rtrap |
| 85 | nop | ||
| 85 | .size do_stdfmna,.-do_stdfmna | 86 | .size do_stdfmna,.-do_stdfmna |
| 86 | 87 | ||
| 87 | .type breakpoint_trap,#function | 88 | .type breakpoint_trap,#function |
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c index df9e731a76f5..fc5124ccdb53 100644 --- a/arch/sparc/kernel/ptrace_64.c +++ b/arch/sparc/kernel/ptrace_64.c | |||
| @@ -351,7 +351,7 @@ static int genregs64_set(struct task_struct *target, | |||
| 351 | } | 351 | } |
| 352 | 352 | ||
| 353 | if (!ret) { | 353 | if (!ret) { |
| 354 | unsigned long y; | 354 | unsigned long y = regs->y; |
| 355 | 355 | ||
| 356 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 356 | ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
| 357 | &y, | 357 | &y, |
diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S index 216948ca4382..709a82ebd294 100644 --- a/arch/sparc/kernel/rtrap_64.S +++ b/arch/sparc/kernel/rtrap_64.S | |||
| @@ -237,6 +237,7 @@ rt_continue: ldx [%sp + PTREGS_OFF + PT_V9_G1], %g1 | |||
| 237 | bne,pt %xcc, user_rtt_fill_32bit | 237 | bne,pt %xcc, user_rtt_fill_32bit |
| 238 | wrpr %g1, %cwp | 238 | wrpr %g1, %cwp |
| 239 | ba,a,pt %xcc, user_rtt_fill_64bit | 239 | ba,a,pt %xcc, user_rtt_fill_64bit |
| 240 | nop | ||
| 240 | 241 | ||
| 241 | user_rtt_fill_fixup_dax: | 242 | user_rtt_fill_fixup_dax: |
| 242 | ba,pt %xcc, user_rtt_fill_fixup_common | 243 | ba,pt %xcc, user_rtt_fill_fixup_common |
diff --git a/arch/sparc/kernel/spiterrs.S b/arch/sparc/kernel/spiterrs.S index 4a73009f66a5..d7e540842809 100644 --- a/arch/sparc/kernel/spiterrs.S +++ b/arch/sparc/kernel/spiterrs.S | |||
| @@ -86,6 +86,7 @@ __spitfire_cee_trap_continue: | |||
| 86 | rd %pc, %g7 | 86 | rd %pc, %g7 |
| 87 | 87 | ||
| 88 | ba,a,pt %xcc, 2f | 88 | ba,a,pt %xcc, 2f |
| 89 | nop | ||
| 89 | 90 | ||
| 90 | 1: ba,pt %xcc, etrap_irq | 91 | 1: ba,pt %xcc, etrap_irq |
| 91 | rd %pc, %g7 | 92 | rd %pc, %g7 |
diff --git a/arch/sparc/kernel/sun4v_tlb_miss.S b/arch/sparc/kernel/sun4v_tlb_miss.S index 6179e19bc9b9..c19f352f46c7 100644 --- a/arch/sparc/kernel/sun4v_tlb_miss.S +++ b/arch/sparc/kernel/sun4v_tlb_miss.S | |||
| @@ -352,6 +352,7 @@ sun4v_mna: | |||
| 352 | call sun4v_do_mna | 352 | call sun4v_do_mna |
| 353 | add %sp, PTREGS_OFF, %o0 | 353 | add %sp, PTREGS_OFF, %o0 |
| 354 | ba,a,pt %xcc, rtrap | 354 | ba,a,pt %xcc, rtrap |
| 355 | nop | ||
| 355 | 356 | ||
| 356 | /* Privileged Action. */ | 357 | /* Privileged Action. */ |
| 357 | sun4v_privact: | 358 | sun4v_privact: |
diff --git a/arch/sparc/kernel/urtt_fill.S b/arch/sparc/kernel/urtt_fill.S index 5604a2b051d4..364af3250646 100644 --- a/arch/sparc/kernel/urtt_fill.S +++ b/arch/sparc/kernel/urtt_fill.S | |||
| @@ -92,6 +92,7 @@ user_rtt_fill_fixup_common: | |||
| 92 | call sun4v_data_access_exception | 92 | call sun4v_data_access_exception |
| 93 | nop | 93 | nop |
| 94 | ba,a,pt %xcc, rtrap | 94 | ba,a,pt %xcc, rtrap |
| 95 | nop | ||
| 95 | 96 | ||
| 96 | 1: call spitfire_data_access_exception | 97 | 1: call spitfire_data_access_exception |
| 97 | nop | 98 | nop |
diff --git a/arch/sparc/kernel/winfixup.S b/arch/sparc/kernel/winfixup.S index 855019a8590e..1ee173cc3c39 100644 --- a/arch/sparc/kernel/winfixup.S +++ b/arch/sparc/kernel/winfixup.S | |||
| @@ -152,6 +152,8 @@ fill_fixup_dax: | |||
| 152 | call sun4v_data_access_exception | 152 | call sun4v_data_access_exception |
| 153 | nop | 153 | nop |
| 154 | ba,a,pt %xcc, rtrap | 154 | ba,a,pt %xcc, rtrap |
| 155 | nop | ||
| 155 | 1: call spitfire_data_access_exception | 156 | 1: call spitfire_data_access_exception |
| 156 | nop | 157 | nop |
| 157 | ba,a,pt %xcc, rtrap | 158 | ba,a,pt %xcc, rtrap |
| 159 | nop | ||
diff --git a/arch/sparc/lib/NG2memcpy.S b/arch/sparc/lib/NG2memcpy.S index c629dbd121b6..64dcd6cdb606 100644 --- a/arch/sparc/lib/NG2memcpy.S +++ b/arch/sparc/lib/NG2memcpy.S | |||
| @@ -326,11 +326,13 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ | |||
| 326 | blu 170f | 326 | blu 170f |
| 327 | nop | 327 | nop |
| 328 | ba,a,pt %xcc, 180f | 328 | ba,a,pt %xcc, 180f |
| 329 | nop | ||
| 329 | 330 | ||
| 330 | 4: /* 32 <= low bits < 48 */ | 331 | 4: /* 32 <= low bits < 48 */ |
| 331 | blu 150f | 332 | blu 150f |
| 332 | nop | 333 | nop |
| 333 | ba,a,pt %xcc, 160f | 334 | ba,a,pt %xcc, 160f |
| 335 | nop | ||
| 334 | 5: /* 0 < low bits < 32 */ | 336 | 5: /* 0 < low bits < 32 */ |
| 335 | blu,a 6f | 337 | blu,a 6f |
| 336 | cmp %g2, 8 | 338 | cmp %g2, 8 |
| @@ -338,6 +340,7 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ | |||
| 338 | blu 130f | 340 | blu 130f |
| 339 | nop | 341 | nop |
| 340 | ba,a,pt %xcc, 140f | 342 | ba,a,pt %xcc, 140f |
| 343 | nop | ||
| 341 | 6: /* 0 < low bits < 16 */ | 344 | 6: /* 0 < low bits < 16 */ |
| 342 | bgeu 120f | 345 | bgeu 120f |
| 343 | nop | 346 | nop |
| @@ -475,6 +478,7 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ | |||
| 475 | brz,pt %o2, 85f | 478 | brz,pt %o2, 85f |
| 476 | sub %o0, %o1, GLOBAL_SPARE | 479 | sub %o0, %o1, GLOBAL_SPARE |
| 477 | ba,a,pt %XCC, 90f | 480 | ba,a,pt %XCC, 90f |
| 481 | nop | ||
| 478 | 482 | ||
| 479 | .align 64 | 483 | .align 64 |
| 480 | 75: /* 16 < len <= 64 */ | 484 | 75: /* 16 < len <= 64 */ |
diff --git a/arch/sparc/lib/NG4memcpy.S b/arch/sparc/lib/NG4memcpy.S index 75bb93b1437f..78ea962edcbe 100644 --- a/arch/sparc/lib/NG4memcpy.S +++ b/arch/sparc/lib/NG4memcpy.S | |||
| @@ -530,4 +530,5 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ | |||
| 530 | bne,pt %icc, 1b | 530 | bne,pt %icc, 1b |
| 531 | EX_ST(STORE(stb, %g1, %o0 - 0x01), NG4_retl_o2_plus_1) | 531 | EX_ST(STORE(stb, %g1, %o0 - 0x01), NG4_retl_o2_plus_1) |
| 532 | ba,a,pt %icc, .Lexit | 532 | ba,a,pt %icc, .Lexit |
| 533 | nop | ||
| 533 | .size FUNC_NAME, .-FUNC_NAME | 534 | .size FUNC_NAME, .-FUNC_NAME |
diff --git a/arch/sparc/lib/NG4memset.S b/arch/sparc/lib/NG4memset.S index 41da4bdd95cb..7c0c81f18837 100644 --- a/arch/sparc/lib/NG4memset.S +++ b/arch/sparc/lib/NG4memset.S | |||
| @@ -102,4 +102,5 @@ NG4bzero: | |||
| 102 | bne,pt %icc, 1b | 102 | bne,pt %icc, 1b |
| 103 | add %o0, 0x30, %o0 | 103 | add %o0, 0x30, %o0 |
| 104 | ba,a,pt %icc, .Lpostloop | 104 | ba,a,pt %icc, .Lpostloop |
| 105 | nop | ||
| 105 | .size NG4bzero,.-NG4bzero | 106 | .size NG4bzero,.-NG4bzero |
diff --git a/arch/sparc/lib/NGmemcpy.S b/arch/sparc/lib/NGmemcpy.S index d88c4ed50a00..cd654a719b27 100644 --- a/arch/sparc/lib/NGmemcpy.S +++ b/arch/sparc/lib/NGmemcpy.S | |||
| @@ -394,6 +394,7 @@ FUNC_NAME: /* %i0=dst, %i1=src, %i2=len */ | |||
| 394 | brz,pt %i2, 85f | 394 | brz,pt %i2, 85f |
| 395 | sub %o0, %i1, %i3 | 395 | sub %o0, %i1, %i3 |
| 396 | ba,a,pt %XCC, 90f | 396 | ba,a,pt %XCC, 90f |
| 397 | nop | ||
| 397 | 398 | ||
| 398 | .align 64 | 399 | .align 64 |
| 399 | 70: /* 16 < len <= 64 */ | 400 | 70: /* 16 < len <= 64 */ |
diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c index 323bc6b6e3ad..ee5273ad918d 100644 --- a/arch/sparc/mm/hugetlbpage.c +++ b/arch/sparc/mm/hugetlbpage.c | |||
| @@ -143,6 +143,10 @@ static pte_t sun4v_hugepage_shift_to_tte(pte_t entry, unsigned int shift) | |||
| 143 | pte_val(entry) = pte_val(entry) & ~_PAGE_SZALL_4V; | 143 | pte_val(entry) = pte_val(entry) & ~_PAGE_SZALL_4V; |
| 144 | 144 | ||
| 145 | switch (shift) { | 145 | switch (shift) { |
| 146 | case HPAGE_2GB_SHIFT: | ||
| 147 | hugepage_size = _PAGE_SZ2GB_4V; | ||
| 148 | pte_val(entry) |= _PAGE_PMD_HUGE; | ||
| 149 | break; | ||
| 146 | case HPAGE_256MB_SHIFT: | 150 | case HPAGE_256MB_SHIFT: |
| 147 | hugepage_size = _PAGE_SZ256MB_4V; | 151 | hugepage_size = _PAGE_SZ256MB_4V; |
| 148 | pte_val(entry) |= _PAGE_PMD_HUGE; | 152 | pte_val(entry) |= _PAGE_PMD_HUGE; |
| @@ -183,6 +187,9 @@ static unsigned int sun4v_huge_tte_to_shift(pte_t entry) | |||
| 183 | unsigned int shift; | 187 | unsigned int shift; |
| 184 | 188 | ||
| 185 | switch (tte_szbits) { | 189 | switch (tte_szbits) { |
| 190 | case _PAGE_SZ2GB_4V: | ||
| 191 | shift = HPAGE_2GB_SHIFT; | ||
| 192 | break; | ||
| 186 | case _PAGE_SZ256MB_4V: | 193 | case _PAGE_SZ256MB_4V: |
| 187 | shift = HPAGE_256MB_SHIFT; | 194 | shift = HPAGE_256MB_SHIFT; |
| 188 | break; | 195 | break; |
| @@ -261,7 +268,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, | |||
| 261 | if (!pmd) | 268 | if (!pmd) |
| 262 | return NULL; | 269 | return NULL; |
| 263 | 270 | ||
| 264 | if (sz == PMD_SHIFT) | 271 | if (sz >= PMD_SIZE) |
| 265 | pte = (pte_t *)pmd; | 272 | pte = (pte_t *)pmd; |
| 266 | else | 273 | else |
| 267 | pte = pte_alloc_map(mm, pmd, addr); | 274 | pte = pte_alloc_map(mm, pmd, addr); |
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index ccd455328989..0cda653ae007 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
| @@ -337,6 +337,10 @@ static int __init setup_hugepagesz(char *string) | |||
| 337 | hugepage_shift = ilog2(hugepage_size); | 337 | hugepage_shift = ilog2(hugepage_size); |
| 338 | 338 | ||
| 339 | switch (hugepage_shift) { | 339 | switch (hugepage_shift) { |
| 340 | case HPAGE_2GB_SHIFT: | ||
| 341 | hv_pgsz_mask = HV_PGSZ_MASK_2GB; | ||
| 342 | hv_pgsz_idx = HV_PGSZ_IDX_2GB; | ||
| 343 | break; | ||
| 340 | case HPAGE_256MB_SHIFT: | 344 | case HPAGE_256MB_SHIFT: |
| 341 | hv_pgsz_mask = HV_PGSZ_MASK_256MB; | 345 | hv_pgsz_mask = HV_PGSZ_MASK_256MB; |
| 342 | hv_pgsz_idx = HV_PGSZ_IDX_256MB; | 346 | hv_pgsz_idx = HV_PGSZ_IDX_256MB; |
| @@ -1563,7 +1567,7 @@ bool kern_addr_valid(unsigned long addr) | |||
| 1563 | if ((long)addr < 0L) { | 1567 | if ((long)addr < 0L) { |
| 1564 | unsigned long pa = __pa(addr); | 1568 | unsigned long pa = __pa(addr); |
| 1565 | 1569 | ||
| 1566 | if ((addr >> max_phys_bits) != 0UL) | 1570 | if ((pa >> max_phys_bits) != 0UL) |
| 1567 | return false; | 1571 | return false; |
| 1568 | 1572 | ||
| 1569 | return pfn_valid(pa >> PAGE_SHIFT); | 1573 | return pfn_valid(pa >> PAGE_SHIFT); |
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index def82f6d626f..8e76ebba2986 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | enum mbus_module srmmu_modtype; | 54 | enum mbus_module srmmu_modtype; |
| 55 | static unsigned int hwbug_bitmask; | 55 | static unsigned int hwbug_bitmask; |
| 56 | int vac_cache_size; | 56 | int vac_cache_size; |
| 57 | EXPORT_SYMBOL(vac_cache_size); | ||
| 57 | int vac_line_size; | 58 | int vac_line_size; |
| 58 | 59 | ||
| 59 | extern struct resource sparc_iomap; | 60 | extern struct resource sparc_iomap; |
diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c index afda3bbf7854..ee8066c3d96c 100644 --- a/arch/sparc/mm/tlb.c +++ b/arch/sparc/mm/tlb.c | |||
| @@ -154,7 +154,7 @@ static void tlb_batch_pmd_scan(struct mm_struct *mm, unsigned long vaddr, | |||
| 154 | if (pte_val(*pte) & _PAGE_VALID) { | 154 | if (pte_val(*pte) & _PAGE_VALID) { |
| 155 | bool exec = pte_exec(*pte); | 155 | bool exec = pte_exec(*pte); |
| 156 | 156 | ||
| 157 | tlb_batch_add_one(mm, vaddr, exec, false); | 157 | tlb_batch_add_one(mm, vaddr, exec, PAGE_SHIFT); |
| 158 | } | 158 | } |
| 159 | pte++; | 159 | pte++; |
| 160 | vaddr += PAGE_SIZE; | 160 | vaddr += PAGE_SIZE; |
| @@ -209,9 +209,9 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr, | |||
| 209 | pte_t orig_pte = __pte(pmd_val(orig)); | 209 | pte_t orig_pte = __pte(pmd_val(orig)); |
| 210 | bool exec = pte_exec(orig_pte); | 210 | bool exec = pte_exec(orig_pte); |
| 211 | 211 | ||
| 212 | tlb_batch_add_one(mm, addr, exec, true); | 212 | tlb_batch_add_one(mm, addr, exec, REAL_HPAGE_SHIFT); |
| 213 | tlb_batch_add_one(mm, addr + REAL_HPAGE_SIZE, exec, | 213 | tlb_batch_add_one(mm, addr + REAL_HPAGE_SIZE, exec, |
| 214 | true); | 214 | REAL_HPAGE_SHIFT); |
| 215 | } else { | 215 | } else { |
| 216 | tlb_batch_pmd_scan(mm, addr, orig); | 216 | tlb_batch_pmd_scan(mm, addr, orig); |
| 217 | } | 217 | } |
diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c index 0a04811f06b7..bedf08b22a47 100644 --- a/arch/sparc/mm/tsb.c +++ b/arch/sparc/mm/tsb.c | |||
| @@ -122,7 +122,7 @@ void flush_tsb_user(struct tlb_batch *tb) | |||
| 122 | 122 | ||
| 123 | spin_lock_irqsave(&mm->context.lock, flags); | 123 | spin_lock_irqsave(&mm->context.lock, flags); |
| 124 | 124 | ||
| 125 | if (tb->hugepage_shift < HPAGE_SHIFT) { | 125 | if (tb->hugepage_shift < REAL_HPAGE_SHIFT) { |
| 126 | base = (unsigned long) mm->context.tsb_block[MM_TSB_BASE].tsb; | 126 | base = (unsigned long) mm->context.tsb_block[MM_TSB_BASE].tsb; |
| 127 | nentries = mm->context.tsb_block[MM_TSB_BASE].tsb_nentries; | 127 | nentries = mm->context.tsb_block[MM_TSB_BASE].tsb_nentries; |
| 128 | if (tlb_type == cheetah_plus || tlb_type == hypervisor) | 128 | if (tlb_type == cheetah_plus || tlb_type == hypervisor) |
| @@ -155,7 +155,7 @@ void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr, | |||
| 155 | 155 | ||
| 156 | spin_lock_irqsave(&mm->context.lock, flags); | 156 | spin_lock_irqsave(&mm->context.lock, flags); |
| 157 | 157 | ||
| 158 | if (hugepage_shift < HPAGE_SHIFT) { | 158 | if (hugepage_shift < REAL_HPAGE_SHIFT) { |
| 159 | base = (unsigned long) mm->context.tsb_block[MM_TSB_BASE].tsb; | 159 | base = (unsigned long) mm->context.tsb_block[MM_TSB_BASE].tsb; |
| 160 | nentries = mm->context.tsb_block[MM_TSB_BASE].tsb_nentries; | 160 | nentries = mm->context.tsb_block[MM_TSB_BASE].tsb_nentries; |
| 161 | if (tlb_type == cheetah_plus || tlb_type == hypervisor) | 161 | if (tlb_type == cheetah_plus || tlb_type == hypervisor) |
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 2d449337a360..a94a4d10f2df 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
| @@ -120,10 +120,6 @@ else | |||
| 120 | # -funit-at-a-time shrinks the kernel .text considerably | 120 | # -funit-at-a-time shrinks the kernel .text considerably |
| 121 | # unfortunately it makes reading oopses harder. | 121 | # unfortunately it makes reading oopses harder. |
| 122 | KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) | 122 | KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) |
| 123 | |||
| 124 | # this works around some issues with generating unwind tables in older gccs | ||
| 125 | # newer gccs do it by default | ||
| 126 | KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args) | ||
| 127 | endif | 123 | endif |
| 128 | 124 | ||
| 129 | ifdef CONFIG_X86_X32 | 125 | ifdef CONFIG_X86_X32 |
| @@ -147,6 +143,37 @@ ifeq ($(CONFIG_KMEMCHECK),y) | |||
| 147 | KBUILD_CFLAGS += $(call cc-option,-fno-builtin-memcpy) | 143 | KBUILD_CFLAGS += $(call cc-option,-fno-builtin-memcpy) |
| 148 | endif | 144 | endif |
| 149 | 145 | ||
| 146 | # | ||
| 147 | # If the function graph tracer is used with mcount instead of fentry, | ||
| 148 | # '-maccumulate-outgoing-args' is needed to prevent a GCC bug | ||
| 149 | # (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42109) | ||
| 150 | # | ||
| 151 | ifdef CONFIG_FUNCTION_GRAPH_TRACER | ||
| 152 | ifndef CONFIG_HAVE_FENTRY | ||
| 153 | ACCUMULATE_OUTGOING_ARGS := 1 | ||
| 154 | else | ||
| 155 | ifeq ($(call cc-option-yn, -mfentry), n) | ||
| 156 | ACCUMULATE_OUTGOING_ARGS := 1 | ||
| 157 | endif | ||
| 158 | endif | ||
| 159 | endif | ||
| 160 | |||
| 161 | # | ||
| 162 | # Jump labels need '-maccumulate-outgoing-args' for gcc < 4.5.2 to prevent a | ||
| 163 | # GCC bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46226). There's no way | ||
| 164 | # to test for this bug at compile-time because the test case needs to execute, | ||
| 165 | # which is a no-go for cross compilers. So check the GCC version instead. | ||
| 166 | # | ||
| 167 | ifdef CONFIG_JUMP_LABEL | ||
| 168 | ifneq ($(ACCUMULATE_OUTGOING_ARGS), 1) | ||
| 169 | ACCUMULATE_OUTGOING_ARGS = $(call cc-if-fullversion, -lt, 040502, 1) | ||
| 170 | endif | ||
| 171 | endif | ||
| 172 | |||
| 173 | ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1) | ||
| 174 | KBUILD_CFLAGS += -maccumulate-outgoing-args | ||
| 175 | endif | ||
| 176 | |||
| 150 | # Stackpointer is addressed different for 32 bit and 64 bit x86 | 177 | # Stackpointer is addressed different for 32 bit and 64 bit x86 |
| 151 | sp-$(CONFIG_X86_32) := esp | 178 | sp-$(CONFIG_X86_32) := esp |
| 152 | sp-$(CONFIG_X86_64) := rsp | 179 | sp-$(CONFIG_X86_64) := rsp |
diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu index 6647ed49c66c..a45eb15b7cf2 100644 --- a/arch/x86/Makefile_32.cpu +++ b/arch/x86/Makefile_32.cpu | |||
| @@ -45,24 +45,6 @@ cflags-$(CONFIG_MGEODE_LX) += $(call cc-option,-march=geode,-march=pentium-mmx) | |||
| 45 | # cpu entries | 45 | # cpu entries |
| 46 | cflags-$(CONFIG_X86_GENERIC) += $(call tune,generic,$(call tune,i686)) | 46 | cflags-$(CONFIG_X86_GENERIC) += $(call tune,generic,$(call tune,i686)) |
| 47 | 47 | ||
| 48 | # Work around the pentium-mmx code generator madness of gcc4.4.x which | ||
| 49 | # does stack alignment by generating horrible code _before_ the mcount | ||
| 50 | # prologue (push %ebp, mov %esp, %ebp) which breaks the function graph | ||
| 51 | # tracer assumptions. For i686, generic, core2 this is set by the | ||
| 52 | # compiler anyway | ||
| 53 | ifeq ($(CONFIG_FUNCTION_GRAPH_TRACER), y) | ||
| 54 | ADD_ACCUMULATE_OUTGOING_ARGS := y | ||
| 55 | endif | ||
| 56 | |||
| 57 | # Work around to a bug with asm goto with first implementations of it | ||
| 58 | # in gcc causing gcc to mess up the push and pop of the stack in some | ||
| 59 | # uses of asm goto. | ||
| 60 | ifeq ($(CONFIG_JUMP_LABEL), y) | ||
| 61 | ADD_ACCUMULATE_OUTGOING_ARGS := y | ||
| 62 | endif | ||
| 63 | |||
| 64 | cflags-$(ADD_ACCUMULATE_OUTGOING_ARGS) += $(call cc-option,-maccumulate-outgoing-args) | ||
| 65 | |||
| 66 | # Bug fix for binutils: this option is required in order to keep | 48 | # Bug fix for binutils: this option is required in order to keep |
| 67 | # binutils from generating NOPL instructions against our will. | 49 | # binutils from generating NOPL instructions against our will. |
| 68 | ifneq ($(CONFIG_X86_P6_NOP),y) | 50 | ifneq ($(CONFIG_X86_P6_NOP),y) |
diff --git a/arch/x86/boot/compressed/error.c b/arch/x86/boot/compressed/error.c index 6248740b68b5..31922023de49 100644 --- a/arch/x86/boot/compressed/error.c +++ b/arch/x86/boot/compressed/error.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * memcpy() and memmove() are defined for the compressed boot environment. | 4 | * memcpy() and memmove() are defined for the compressed boot environment. |
| 5 | */ | 5 | */ |
| 6 | #include "misc.h" | 6 | #include "misc.h" |
| 7 | #include "error.h" | ||
| 7 | 8 | ||
| 8 | void warn(char *m) | 9 | void warn(char *m) |
| 9 | { | 10 | { |
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 2aa1ad194db2..580b60f5ac83 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c | |||
| @@ -2256,6 +2256,7 @@ void arch_perf_update_userpage(struct perf_event *event, | |||
| 2256 | struct perf_event_mmap_page *userpg, u64 now) | 2256 | struct perf_event_mmap_page *userpg, u64 now) |
| 2257 | { | 2257 | { |
| 2258 | struct cyc2ns_data *data; | 2258 | struct cyc2ns_data *data; |
| 2259 | u64 offset; | ||
| 2259 | 2260 | ||
| 2260 | userpg->cap_user_time = 0; | 2261 | userpg->cap_user_time = 0; |
| 2261 | userpg->cap_user_time_zero = 0; | 2262 | userpg->cap_user_time_zero = 0; |
| @@ -2263,11 +2264,13 @@ void arch_perf_update_userpage(struct perf_event *event, | |||
| 2263 | !!(event->hw.flags & PERF_X86_EVENT_RDPMC_ALLOWED); | 2264 | !!(event->hw.flags & PERF_X86_EVENT_RDPMC_ALLOWED); |
| 2264 | userpg->pmc_width = x86_pmu.cntval_bits; | 2265 | userpg->pmc_width = x86_pmu.cntval_bits; |
| 2265 | 2266 | ||
| 2266 | if (!sched_clock_stable()) | 2267 | if (!using_native_sched_clock() || !sched_clock_stable()) |
| 2267 | return; | 2268 | return; |
| 2268 | 2269 | ||
| 2269 | data = cyc2ns_read_begin(); | 2270 | data = cyc2ns_read_begin(); |
| 2270 | 2271 | ||
| 2272 | offset = data->cyc2ns_offset + __sched_clock_offset; | ||
| 2273 | |||
| 2271 | /* | 2274 | /* |
| 2272 | * Internal timekeeping for enabled/running/stopped times | 2275 | * Internal timekeeping for enabled/running/stopped times |
| 2273 | * is always in the local_clock domain. | 2276 | * is always in the local_clock domain. |
| @@ -2275,7 +2278,7 @@ void arch_perf_update_userpage(struct perf_event *event, | |||
| 2275 | userpg->cap_user_time = 1; | 2278 | userpg->cap_user_time = 1; |
| 2276 | userpg->time_mult = data->cyc2ns_mul; | 2279 | userpg->time_mult = data->cyc2ns_mul; |
| 2277 | userpg->time_shift = data->cyc2ns_shift; | 2280 | userpg->time_shift = data->cyc2ns_shift; |
| 2278 | userpg->time_offset = data->cyc2ns_offset - now; | 2281 | userpg->time_offset = offset - now; |
| 2279 | 2282 | ||
| 2280 | /* | 2283 | /* |
| 2281 | * cap_user_time_zero doesn't make sense when we're using a different | 2284 | * cap_user_time_zero doesn't make sense when we're using a different |
| @@ -2283,7 +2286,7 @@ void arch_perf_update_userpage(struct perf_event *event, | |||
| 2283 | */ | 2286 | */ |
| 2284 | if (!event->attr.use_clockid) { | 2287 | if (!event->attr.use_clockid) { |
| 2285 | userpg->cap_user_time_zero = 1; | 2288 | userpg->cap_user_time_zero = 1; |
| 2286 | userpg->time_zero = data->cyc2ns_offset; | 2289 | userpg->time_zero = offset; |
| 2287 | } | 2290 | } |
| 2288 | 2291 | ||
| 2289 | cyc2ns_read_end(data); | 2292 | cyc2ns_read_end(data); |
diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/kvm_page_track.h index d74747b031ec..c4eda791f877 100644 --- a/arch/x86/include/asm/kvm_page_track.h +++ b/arch/x86/include/asm/kvm_page_track.h | |||
| @@ -46,6 +46,7 @@ struct kvm_page_track_notifier_node { | |||
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | void kvm_page_track_init(struct kvm *kvm); | 48 | void kvm_page_track_init(struct kvm *kvm); |
| 49 | void kvm_page_track_cleanup(struct kvm *kvm); | ||
| 49 | 50 | ||
| 50 | void kvm_page_track_free_memslot(struct kvm_memory_slot *free, | 51 | void kvm_page_track_free_memslot(struct kvm_memory_slot *free, |
| 51 | struct kvm_memory_slot *dont); | 52 | struct kvm_memory_slot *dont); |
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h index a04eabd43d06..27e9f9d769b8 100644 --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h | |||
| @@ -12,6 +12,8 @@ extern int recalibrate_cpu_khz(void); | |||
| 12 | 12 | ||
| 13 | extern int no_timer_check; | 13 | extern int no_timer_check; |
| 14 | 14 | ||
| 15 | extern bool using_native_sched_clock(void); | ||
| 16 | |||
| 15 | /* | 17 | /* |
| 16 | * We use the full linear equation: f(x) = a + b*x, in order to allow | 18 | * We use the full linear equation: f(x) = a + b*x, in order to allow |
| 17 | * a continuous function in the face of dynamic freq changes. | 19 | * a continuous function in the face of dynamic freq changes. |
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h index 72e8300b1e8a..9cffb44a3cf5 100644 --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.h | |||
| @@ -485,15 +485,17 @@ static inline unsigned long uv_soc_phys_ram_to_gpa(unsigned long paddr) | |||
| 485 | 485 | ||
| 486 | if (paddr < uv_hub_info->lowmem_remap_top) | 486 | if (paddr < uv_hub_info->lowmem_remap_top) |
| 487 | paddr |= uv_hub_info->lowmem_remap_base; | 487 | paddr |= uv_hub_info->lowmem_remap_base; |
| 488 | paddr |= uv_hub_info->gnode_upper; | 488 | |
| 489 | if (m_val) | 489 | if (m_val) { |
| 490 | paddr |= uv_hub_info->gnode_upper; | ||
| 490 | paddr = ((paddr << uv_hub_info->m_shift) | 491 | paddr = ((paddr << uv_hub_info->m_shift) |
| 491 | >> uv_hub_info->m_shift) | | 492 | >> uv_hub_info->m_shift) | |
| 492 | ((paddr >> uv_hub_info->m_val) | 493 | ((paddr >> uv_hub_info->m_val) |
| 493 | << uv_hub_info->n_lshift); | 494 | << uv_hub_info->n_lshift); |
| 494 | else | 495 | } else { |
| 495 | paddr |= uv_soc_phys_ram_to_nasid(paddr) | 496 | paddr |= uv_soc_phys_ram_to_nasid(paddr) |
| 496 | << uv_hub_info->gpa_shift; | 497 | << uv_hub_info->gpa_shift; |
| 498 | } | ||
| 497 | return paddr; | 499 | return paddr; |
| 498 | } | 500 | } |
| 499 | 501 | ||
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index e9f8f8cdd570..86f20cc0a65e 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c | |||
| @@ -1105,7 +1105,8 @@ void __init uv_init_hub_info(struct uv_hub_info_s *hi) | |||
| 1105 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); | 1105 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); |
| 1106 | uv_cpuid.gnode_shift = max_t(unsigned int, uv_cpuid.gnode_shift, mn.n_val); | 1106 | uv_cpuid.gnode_shift = max_t(unsigned int, uv_cpuid.gnode_shift, mn.n_val); |
| 1107 | hi->gnode_extra = (node_id.s.node_id & ~((1 << uv_cpuid.gnode_shift) - 1)) >> 1; | 1107 | hi->gnode_extra = (node_id.s.node_id & ~((1 << uv_cpuid.gnode_shift) - 1)) >> 1; |
| 1108 | hi->gnode_upper = (unsigned long)hi->gnode_extra << mn.m_val; | 1108 | if (mn.m_val) |
| 1109 | hi->gnode_upper = (u64)hi->gnode_extra << mn.m_val; | ||
| 1109 | 1110 | ||
| 1110 | if (uv_gp_table) { | 1111 | if (uv_gp_table) { |
| 1111 | hi->global_mmr_base = uv_gp_table->mmr_base; | 1112 | hi->global_mmr_base = uv_gp_table->mmr_base; |
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 8e9725c607ea..5accfbdee3f0 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
| @@ -54,6 +54,8 @@ | |||
| 54 | 54 | ||
| 55 | static DEFINE_MUTEX(mce_chrdev_read_mutex); | 55 | static DEFINE_MUTEX(mce_chrdev_read_mutex); |
| 56 | 56 | ||
| 57 | static int mce_chrdev_open_count; /* #times opened */ | ||
| 58 | |||
| 57 | #define mce_log_get_idx_check(p) \ | 59 | #define mce_log_get_idx_check(p) \ |
| 58 | ({ \ | 60 | ({ \ |
| 59 | RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \ | 61 | RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \ |
| @@ -598,6 +600,10 @@ static int mce_default_notifier(struct notifier_block *nb, unsigned long val, | |||
| 598 | if (atomic_read(&num_notifiers) > 2) | 600 | if (atomic_read(&num_notifiers) > 2) |
| 599 | return NOTIFY_DONE; | 601 | return NOTIFY_DONE; |
| 600 | 602 | ||
| 603 | /* Don't print when mcelog is running */ | ||
| 604 | if (mce_chrdev_open_count > 0) | ||
| 605 | return NOTIFY_DONE; | ||
| 606 | |||
| 601 | __print_mce(m); | 607 | __print_mce(m); |
| 602 | 608 | ||
| 603 | return NOTIFY_DONE; | 609 | return NOTIFY_DONE; |
| @@ -1828,7 +1834,6 @@ void mcheck_cpu_clear(struct cpuinfo_x86 *c) | |||
| 1828 | */ | 1834 | */ |
| 1829 | 1835 | ||
| 1830 | static DEFINE_SPINLOCK(mce_chrdev_state_lock); | 1836 | static DEFINE_SPINLOCK(mce_chrdev_state_lock); |
| 1831 | static int mce_chrdev_open_count; /* #times opened */ | ||
| 1832 | static int mce_chrdev_open_exclu; /* already open exclusive? */ | 1837 | static int mce_chrdev_open_exclu; /* already open exclusive? */ |
| 1833 | 1838 | ||
| 1834 | static int mce_chrdev_open(struct inode *inode, struct file *file) | 1839 | static int mce_chrdev_open(struct inode *inode, struct file *file) |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 524cc5780a77..6e4a047e4b68 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c | |||
| @@ -60,7 +60,7 @@ static const char * const th_names[] = { | |||
| 60 | "load_store", | 60 | "load_store", |
| 61 | "insn_fetch", | 61 | "insn_fetch", |
| 62 | "combined_unit", | 62 | "combined_unit", |
| 63 | "", | 63 | "decode_unit", |
| 64 | "northbridge", | 64 | "northbridge", |
| 65 | "execution_unit", | 65 | "execution_unit", |
| 66 | }; | 66 | }; |
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 8f3d9cf26ff9..cbd73eb42170 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c | |||
| @@ -29,6 +29,12 @@ | |||
| 29 | #include <asm/ftrace.h> | 29 | #include <asm/ftrace.h> |
| 30 | #include <asm/nops.h> | 30 | #include <asm/nops.h> |
| 31 | 31 | ||
| 32 | #if defined(CONFIG_FUNCTION_GRAPH_TRACER) && \ | ||
| 33 | !defined(CC_USING_FENTRY) && \ | ||
| 34 | !defined(CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE) | ||
| 35 | # error The following combination is not supported: ((compiler missing -mfentry) || (CONFIG_X86_32 and !CONFIG_DYNAMIC_FTRACE)) && CONFIG_FUNCTION_GRAPH_TRACER && CONFIG_CC_OPTIMIZE_FOR_SIZE | ||
| 36 | #endif | ||
| 37 | |||
| 32 | #ifdef CONFIG_DYNAMIC_FTRACE | 38 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 33 | 39 | ||
| 34 | int ftrace_arch_code_modify_prepare(void) | 40 | int ftrace_arch_code_modify_prepare(void) |
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index c73a7f9e881a..714dfba6a1e7 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -328,7 +328,7 @@ unsigned long long sched_clock(void) | |||
| 328 | return paravirt_sched_clock(); | 328 | return paravirt_sched_clock(); |
| 329 | } | 329 | } |
| 330 | 330 | ||
| 331 | static inline bool using_native_sched_clock(void) | 331 | bool using_native_sched_clock(void) |
| 332 | { | 332 | { |
| 333 | return pv_time_ops.sched_clock == native_sched_clock; | 333 | return pv_time_ops.sched_clock == native_sched_clock; |
| 334 | } | 334 | } |
| @@ -336,7 +336,7 @@ static inline bool using_native_sched_clock(void) | |||
| 336 | unsigned long long | 336 | unsigned long long |
| 337 | sched_clock(void) __attribute__((alias("native_sched_clock"))); | 337 | sched_clock(void) __attribute__((alias("native_sched_clock"))); |
| 338 | 338 | ||
| 339 | static inline bool using_native_sched_clock(void) { return true; } | 339 | bool using_native_sched_clock(void) { return true; } |
| 340 | #endif | 340 | #endif |
| 341 | 341 | ||
| 342 | int check_tsc_unstable(void) | 342 | int check_tsc_unstable(void) |
diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c index 73ea24d4f119..047b17a26269 100644 --- a/arch/x86/kvm/i8259.c +++ b/arch/x86/kvm/i8259.c | |||
| @@ -657,6 +657,9 @@ void kvm_pic_destroy(struct kvm *kvm) | |||
| 657 | { | 657 | { |
| 658 | struct kvm_pic *vpic = kvm->arch.vpic; | 658 | struct kvm_pic *vpic = kvm->arch.vpic; |
| 659 | 659 | ||
| 660 | if (!vpic) | ||
| 661 | return; | ||
| 662 | |||
| 660 | kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_master); | 663 | kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_master); |
| 661 | kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_slave); | 664 | kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_slave); |
| 662 | kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_eclr); | 665 | kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_eclr); |
diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c index 6e219e5c07d2..289270a6aecb 100644 --- a/arch/x86/kvm/ioapic.c +++ b/arch/x86/kvm/ioapic.c | |||
| @@ -635,6 +635,9 @@ void kvm_ioapic_destroy(struct kvm *kvm) | |||
| 635 | { | 635 | { |
| 636 | struct kvm_ioapic *ioapic = kvm->arch.vioapic; | 636 | struct kvm_ioapic *ioapic = kvm->arch.vioapic; |
| 637 | 637 | ||
| 638 | if (!ioapic) | ||
| 639 | return; | ||
| 640 | |||
| 638 | cancel_delayed_work_sync(&ioapic->eoi_inject); | 641 | cancel_delayed_work_sync(&ioapic->eoi_inject); |
| 639 | kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev); | 642 | kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev); |
| 640 | kvm->arch.vioapic = NULL; | 643 | kvm->arch.vioapic = NULL; |
diff --git a/arch/x86/kvm/page_track.c b/arch/x86/kvm/page_track.c index 37942e419c32..60168cdd0546 100644 --- a/arch/x86/kvm/page_track.c +++ b/arch/x86/kvm/page_track.c | |||
| @@ -160,6 +160,14 @@ bool kvm_page_track_is_active(struct kvm_vcpu *vcpu, gfn_t gfn, | |||
| 160 | return !!ACCESS_ONCE(slot->arch.gfn_track[mode][index]); | 160 | return !!ACCESS_ONCE(slot->arch.gfn_track[mode][index]); |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | void kvm_page_track_cleanup(struct kvm *kvm) | ||
| 164 | { | ||
| 165 | struct kvm_page_track_notifier_head *head; | ||
| 166 | |||
| 167 | head = &kvm->arch.track_notifier_head; | ||
| 168 | cleanup_srcu_struct(&head->track_srcu); | ||
| 169 | } | ||
| 170 | |||
| 163 | void kvm_page_track_init(struct kvm *kvm) | 171 | void kvm_page_track_init(struct kvm *kvm) |
| 164 | { | 172 | { |
| 165 | struct kvm_page_track_notifier_head *head; | 173 | struct kvm_page_track_notifier_head *head; |
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index d1efe2c62b3f..5fba70646c32 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
| @@ -1379,6 +1379,9 @@ static void avic_vm_destroy(struct kvm *kvm) | |||
| 1379 | unsigned long flags; | 1379 | unsigned long flags; |
| 1380 | struct kvm_arch *vm_data = &kvm->arch; | 1380 | struct kvm_arch *vm_data = &kvm->arch; |
| 1381 | 1381 | ||
| 1382 | if (!avic) | ||
| 1383 | return; | ||
| 1384 | |||
| 1382 | avic_free_vm_id(vm_data->avic_vm_id); | 1385 | avic_free_vm_id(vm_data->avic_vm_id); |
| 1383 | 1386 | ||
| 1384 | if (vm_data->avic_logical_id_table_page) | 1387 | if (vm_data->avic_logical_id_table_page) |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 98e82ee1e699..259e9b28ccf8 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -1239,6 +1239,11 @@ static inline bool cpu_has_vmx_invvpid_global(void) | |||
| 1239 | return vmx_capability.vpid & VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT; | 1239 | return vmx_capability.vpid & VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT; |
| 1240 | } | 1240 | } |
| 1241 | 1241 | ||
| 1242 | static inline bool cpu_has_vmx_invvpid(void) | ||
| 1243 | { | ||
| 1244 | return vmx_capability.vpid & VMX_VPID_INVVPID_BIT; | ||
| 1245 | } | ||
| 1246 | |||
| 1242 | static inline bool cpu_has_vmx_ept(void) | 1247 | static inline bool cpu_has_vmx_ept(void) |
| 1243 | { | 1248 | { |
| 1244 | return vmcs_config.cpu_based_2nd_exec_ctrl & | 1249 | return vmcs_config.cpu_based_2nd_exec_ctrl & |
| @@ -2753,7 +2758,6 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx) | |||
| 2753 | SECONDARY_EXEC_RDTSCP | | 2758 | SECONDARY_EXEC_RDTSCP | |
| 2754 | SECONDARY_EXEC_DESC | | 2759 | SECONDARY_EXEC_DESC | |
| 2755 | SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE | | 2760 | SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE | |
| 2756 | SECONDARY_EXEC_ENABLE_VPID | | ||
| 2757 | SECONDARY_EXEC_APIC_REGISTER_VIRT | | 2761 | SECONDARY_EXEC_APIC_REGISTER_VIRT | |
| 2758 | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY | | 2762 | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY | |
| 2759 | SECONDARY_EXEC_WBINVD_EXITING | | 2763 | SECONDARY_EXEC_WBINVD_EXITING | |
| @@ -2781,10 +2785,12 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx) | |||
| 2781 | * though it is treated as global context. The alternative is | 2785 | * though it is treated as global context. The alternative is |
| 2782 | * not failing the single-context invvpid, and it is worse. | 2786 | * not failing the single-context invvpid, and it is worse. |
| 2783 | */ | 2787 | */ |
| 2784 | if (enable_vpid) | 2788 | if (enable_vpid) { |
| 2789 | vmx->nested.nested_vmx_secondary_ctls_high |= | ||
| 2790 | SECONDARY_EXEC_ENABLE_VPID; | ||
| 2785 | vmx->nested.nested_vmx_vpid_caps = VMX_VPID_INVVPID_BIT | | 2791 | vmx->nested.nested_vmx_vpid_caps = VMX_VPID_INVVPID_BIT | |
| 2786 | VMX_VPID_EXTENT_SUPPORTED_MASK; | 2792 | VMX_VPID_EXTENT_SUPPORTED_MASK; |
| 2787 | else | 2793 | } else |
| 2788 | vmx->nested.nested_vmx_vpid_caps = 0; | 2794 | vmx->nested.nested_vmx_vpid_caps = 0; |
| 2789 | 2795 | ||
| 2790 | if (enable_unrestricted_guest) | 2796 | if (enable_unrestricted_guest) |
| @@ -4024,6 +4030,12 @@ static void vmx_flush_tlb(struct kvm_vcpu *vcpu) | |||
| 4024 | __vmx_flush_tlb(vcpu, to_vmx(vcpu)->vpid); | 4030 | __vmx_flush_tlb(vcpu, to_vmx(vcpu)->vpid); |
| 4025 | } | 4031 | } |
| 4026 | 4032 | ||
| 4033 | static void vmx_flush_tlb_ept_only(struct kvm_vcpu *vcpu) | ||
| 4034 | { | ||
| 4035 | if (enable_ept) | ||
| 4036 | vmx_flush_tlb(vcpu); | ||
| 4037 | } | ||
| 4038 | |||
| 4027 | static void vmx_decache_cr0_guest_bits(struct kvm_vcpu *vcpu) | 4039 | static void vmx_decache_cr0_guest_bits(struct kvm_vcpu *vcpu) |
| 4028 | { | 4040 | { |
| 4029 | ulong cr0_guest_owned_bits = vcpu->arch.cr0_guest_owned_bits; | 4041 | ulong cr0_guest_owned_bits = vcpu->arch.cr0_guest_owned_bits; |
| @@ -6517,8 +6529,10 @@ static __init int hardware_setup(void) | |||
| 6517 | if (boot_cpu_has(X86_FEATURE_NX)) | 6529 | if (boot_cpu_has(X86_FEATURE_NX)) |
| 6518 | kvm_enable_efer_bits(EFER_NX); | 6530 | kvm_enable_efer_bits(EFER_NX); |
| 6519 | 6531 | ||
| 6520 | if (!cpu_has_vmx_vpid()) | 6532 | if (!cpu_has_vmx_vpid() || !cpu_has_vmx_invvpid() || |
| 6533 | !(cpu_has_vmx_invvpid_single() || cpu_has_vmx_invvpid_global())) | ||
| 6521 | enable_vpid = 0; | 6534 | enable_vpid = 0; |
| 6535 | |||
| 6522 | if (!cpu_has_vmx_shadow_vmcs()) | 6536 | if (!cpu_has_vmx_shadow_vmcs()) |
| 6523 | enable_shadow_vmcs = 0; | 6537 | enable_shadow_vmcs = 0; |
| 6524 | if (enable_shadow_vmcs) | 6538 | if (enable_shadow_vmcs) |
| @@ -8184,6 +8198,9 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu) | |||
| 8184 | return nested_cpu_has2(vmcs12, SECONDARY_EXEC_XSAVES); | 8198 | return nested_cpu_has2(vmcs12, SECONDARY_EXEC_XSAVES); |
| 8185 | case EXIT_REASON_PREEMPTION_TIMER: | 8199 | case EXIT_REASON_PREEMPTION_TIMER: |
| 8186 | return false; | 8200 | return false; |
| 8201 | case EXIT_REASON_PML_FULL: | ||
| 8202 | /* We don't expose PML support to L1. */ | ||
| 8203 | return false; | ||
| 8187 | default: | 8204 | default: |
| 8188 | return true; | 8205 | return true; |
| 8189 | } | 8206 | } |
| @@ -8501,7 +8518,8 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) | |||
| 8501 | && kvm_vmx_exit_handlers[exit_reason]) | 8518 | && kvm_vmx_exit_handlers[exit_reason]) |
| 8502 | return kvm_vmx_exit_handlers[exit_reason](vcpu); | 8519 | return kvm_vmx_exit_handlers[exit_reason](vcpu); |
| 8503 | else { | 8520 | else { |
| 8504 | WARN_ONCE(1, "vmx: unexpected exit reason 0x%x\n", exit_reason); | 8521 | vcpu_unimpl(vcpu, "vmx: unexpected exit reason 0x%x\n", |
| 8522 | exit_reason); | ||
| 8505 | kvm_queue_exception(vcpu, UD_VECTOR); | 8523 | kvm_queue_exception(vcpu, UD_VECTOR); |
| 8506 | return 1; | 8524 | return 1; |
| 8507 | } | 8525 | } |
| @@ -8547,6 +8565,7 @@ static void vmx_set_virtual_x2apic_mode(struct kvm_vcpu *vcpu, bool set) | |||
| 8547 | } else { | 8565 | } else { |
| 8548 | sec_exec_control &= ~SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE; | 8566 | sec_exec_control &= ~SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE; |
| 8549 | sec_exec_control |= SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; | 8567 | sec_exec_control |= SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; |
| 8568 | vmx_flush_tlb_ept_only(vcpu); | ||
| 8550 | } | 8569 | } |
| 8551 | vmcs_write32(SECONDARY_VM_EXEC_CONTROL, sec_exec_control); | 8570 | vmcs_write32(SECONDARY_VM_EXEC_CONTROL, sec_exec_control); |
| 8552 | 8571 | ||
| @@ -8572,8 +8591,10 @@ static void vmx_set_apic_access_page_addr(struct kvm_vcpu *vcpu, hpa_t hpa) | |||
| 8572 | */ | 8591 | */ |
| 8573 | if (!is_guest_mode(vcpu) || | 8592 | if (!is_guest_mode(vcpu) || |
| 8574 | !nested_cpu_has2(get_vmcs12(&vmx->vcpu), | 8593 | !nested_cpu_has2(get_vmcs12(&vmx->vcpu), |
| 8575 | SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)) | 8594 | SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)) { |
| 8576 | vmcs_write64(APIC_ACCESS_ADDR, hpa); | 8595 | vmcs_write64(APIC_ACCESS_ADDR, hpa); |
| 8596 | vmx_flush_tlb_ept_only(vcpu); | ||
| 8597 | } | ||
| 8577 | } | 8598 | } |
| 8578 | 8599 | ||
| 8579 | static void vmx_hwapic_isr_update(struct kvm_vcpu *vcpu, int max_isr) | 8600 | static void vmx_hwapic_isr_update(struct kvm_vcpu *vcpu, int max_isr) |
| @@ -9974,7 +9995,6 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, | |||
| 9974 | { | 9995 | { |
| 9975 | struct vcpu_vmx *vmx = to_vmx(vcpu); | 9996 | struct vcpu_vmx *vmx = to_vmx(vcpu); |
| 9976 | u32 exec_control; | 9997 | u32 exec_control; |
| 9977 | bool nested_ept_enabled = false; | ||
| 9978 | 9998 | ||
| 9979 | vmcs_write16(GUEST_ES_SELECTOR, vmcs12->guest_es_selector); | 9999 | vmcs_write16(GUEST_ES_SELECTOR, vmcs12->guest_es_selector); |
| 9980 | vmcs_write16(GUEST_CS_SELECTOR, vmcs12->guest_cs_selector); | 10000 | vmcs_write16(GUEST_CS_SELECTOR, vmcs12->guest_cs_selector); |
| @@ -10121,8 +10141,6 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, | |||
| 10121 | vmcs12->guest_intr_status); | 10141 | vmcs12->guest_intr_status); |
| 10122 | } | 10142 | } |
| 10123 | 10143 | ||
| 10124 | nested_ept_enabled = (exec_control & SECONDARY_EXEC_ENABLE_EPT) != 0; | ||
| 10125 | |||
| 10126 | /* | 10144 | /* |
| 10127 | * Write an illegal value to APIC_ACCESS_ADDR. Later, | 10145 | * Write an illegal value to APIC_ACCESS_ADDR. Later, |
| 10128 | * nested_get_vmcs12_pages will either fix it up or | 10146 | * nested_get_vmcs12_pages will either fix it up or |
| @@ -10252,9 +10270,24 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, | |||
| 10252 | 10270 | ||
| 10253 | } | 10271 | } |
| 10254 | 10272 | ||
| 10273 | if (enable_pml) { | ||
| 10274 | /* | ||
| 10275 | * Conceptually we want to copy the PML address and index from | ||
| 10276 | * vmcs01 here, and then back to vmcs01 on nested vmexit. But, | ||
| 10277 | * since we always flush the log on each vmexit, this happens | ||
| 10278 | * to be equivalent to simply resetting the fields in vmcs02. | ||
| 10279 | */ | ||
| 10280 | ASSERT(vmx->pml_pg); | ||
| 10281 | vmcs_write64(PML_ADDRESS, page_to_phys(vmx->pml_pg)); | ||
| 10282 | vmcs_write16(GUEST_PML_INDEX, PML_ENTITY_NUM - 1); | ||
| 10283 | } | ||
| 10284 | |||
| 10255 | if (nested_cpu_has_ept(vmcs12)) { | 10285 | if (nested_cpu_has_ept(vmcs12)) { |
| 10256 | kvm_mmu_unload(vcpu); | 10286 | kvm_mmu_unload(vcpu); |
| 10257 | nested_ept_init_mmu_context(vcpu); | 10287 | nested_ept_init_mmu_context(vcpu); |
| 10288 | } else if (nested_cpu_has2(vmcs12, | ||
| 10289 | SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)) { | ||
| 10290 | vmx_flush_tlb_ept_only(vcpu); | ||
| 10258 | } | 10291 | } |
| 10259 | 10292 | ||
| 10260 | /* | 10293 | /* |
| @@ -10282,12 +10315,10 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, | |||
| 10282 | vmx_set_efer(vcpu, vcpu->arch.efer); | 10315 | vmx_set_efer(vcpu, vcpu->arch.efer); |
| 10283 | 10316 | ||
| 10284 | /* Shadow page tables on either EPT or shadow page tables. */ | 10317 | /* Shadow page tables on either EPT or shadow page tables. */ |
| 10285 | if (nested_vmx_load_cr3(vcpu, vmcs12->guest_cr3, nested_ept_enabled, | 10318 | if (nested_vmx_load_cr3(vcpu, vmcs12->guest_cr3, nested_cpu_has_ept(vmcs12), |
| 10286 | entry_failure_code)) | 10319 | entry_failure_code)) |
| 10287 | return 1; | 10320 | return 1; |
| 10288 | 10321 | ||
| 10289 | kvm_mmu_reset_context(vcpu); | ||
| 10290 | |||
| 10291 | if (!enable_ept) | 10322 | if (!enable_ept) |
| 10292 | vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested; | 10323 | vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested; |
| 10293 | 10324 | ||
| @@ -11056,6 +11087,10 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, | |||
| 11056 | vmx->nested.change_vmcs01_virtual_x2apic_mode = false; | 11087 | vmx->nested.change_vmcs01_virtual_x2apic_mode = false; |
| 11057 | vmx_set_virtual_x2apic_mode(vcpu, | 11088 | vmx_set_virtual_x2apic_mode(vcpu, |
| 11058 | vcpu->arch.apic_base & X2APIC_ENABLE); | 11089 | vcpu->arch.apic_base & X2APIC_ENABLE); |
| 11090 | } else if (!nested_cpu_has_ept(vmcs12) && | ||
| 11091 | nested_cpu_has2(vmcs12, | ||
| 11092 | SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)) { | ||
| 11093 | vmx_flush_tlb_ept_only(vcpu); | ||
| 11059 | } | 11094 | } |
| 11060 | 11095 | ||
| 11061 | /* This is needed for same reason as it was needed in prepare_vmcs02 */ | 11096 | /* This is needed for same reason as it was needed in prepare_vmcs02 */ |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1faf620a6fdc..ccbd45ecd41a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -8153,11 +8153,12 @@ void kvm_arch_destroy_vm(struct kvm *kvm) | |||
| 8153 | if (kvm_x86_ops->vm_destroy) | 8153 | if (kvm_x86_ops->vm_destroy) |
| 8154 | kvm_x86_ops->vm_destroy(kvm); | 8154 | kvm_x86_ops->vm_destroy(kvm); |
| 8155 | kvm_iommu_unmap_guest(kvm); | 8155 | kvm_iommu_unmap_guest(kvm); |
| 8156 | kfree(kvm->arch.vpic); | 8156 | kvm_pic_destroy(kvm); |
| 8157 | kfree(kvm->arch.vioapic); | 8157 | kvm_ioapic_destroy(kvm); |
| 8158 | kvm_free_vcpus(kvm); | 8158 | kvm_free_vcpus(kvm); |
| 8159 | kvfree(rcu_dereference_check(kvm->arch.apic_map, 1)); | 8159 | kvfree(rcu_dereference_check(kvm->arch.apic_map, 1)); |
| 8160 | kvm_mmu_uninit_vm(kvm); | 8160 | kvm_mmu_uninit_vm(kvm); |
| 8161 | kvm_page_track_cleanup(kvm); | ||
| 8161 | } | 8162 | } |
| 8162 | 8163 | ||
| 8163 | void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free, | 8164 | void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free, |
| @@ -8566,11 +8567,11 @@ void kvm_arch_async_page_present(struct kvm_vcpu *vcpu, | |||
| 8566 | { | 8567 | { |
| 8567 | struct x86_exception fault; | 8568 | struct x86_exception fault; |
| 8568 | 8569 | ||
| 8569 | trace_kvm_async_pf_ready(work->arch.token, work->gva); | ||
| 8570 | if (work->wakeup_all) | 8570 | if (work->wakeup_all) |
| 8571 | work->arch.token = ~0; /* broadcast wakeup */ | 8571 | work->arch.token = ~0; /* broadcast wakeup */ |
| 8572 | else | 8572 | else |
| 8573 | kvm_del_async_pf_gfn(vcpu, work->arch.gfn); | 8573 | kvm_del_async_pf_gfn(vcpu, work->arch.gfn); |
| 8574 | trace_kvm_async_pf_ready(work->arch.token, work->gva); | ||
| 8574 | 8575 | ||
| 8575 | if ((vcpu->arch.apf.msr_val & KVM_ASYNC_PF_ENABLED) && | 8576 | if ((vcpu->arch.apf.msr_val & KVM_ASYNC_PF_ENABLED) && |
| 8576 | !apf_put_user(vcpu, KVM_PV_REASON_PAGE_READY)) { | 8577 | !apf_put_user(vcpu, KVM_PV_REASON_PAGE_READY)) { |
diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index 779782f58324..9a53a06e5a3e 100644 --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S | |||
| @@ -290,7 +290,7 @@ EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled) | |||
| 290 | _ASM_EXTABLE_FAULT(.L_copy_leading_bytes, .L_memcpy_mcsafe_fail) | 290 | _ASM_EXTABLE_FAULT(.L_copy_leading_bytes, .L_memcpy_mcsafe_fail) |
| 291 | _ASM_EXTABLE_FAULT(.L_cache_w0, .L_memcpy_mcsafe_fail) | 291 | _ASM_EXTABLE_FAULT(.L_cache_w0, .L_memcpy_mcsafe_fail) |
| 292 | _ASM_EXTABLE_FAULT(.L_cache_w1, .L_memcpy_mcsafe_fail) | 292 | _ASM_EXTABLE_FAULT(.L_cache_w1, .L_memcpy_mcsafe_fail) |
| 293 | _ASM_EXTABLE_FAULT(.L_cache_w3, .L_memcpy_mcsafe_fail) | 293 | _ASM_EXTABLE_FAULT(.L_cache_w2, .L_memcpy_mcsafe_fail) |
| 294 | _ASM_EXTABLE_FAULT(.L_cache_w3, .L_memcpy_mcsafe_fail) | 294 | _ASM_EXTABLE_FAULT(.L_cache_w3, .L_memcpy_mcsafe_fail) |
| 295 | _ASM_EXTABLE_FAULT(.L_cache_w4, .L_memcpy_mcsafe_fail) | 295 | _ASM_EXTABLE_FAULT(.L_cache_w4, .L_memcpy_mcsafe_fail) |
| 296 | _ASM_EXTABLE_FAULT(.L_cache_w5, .L_memcpy_mcsafe_fail) | 296 | _ASM_EXTABLE_FAULT(.L_cache_w5, .L_memcpy_mcsafe_fail) |
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c index 887e57182716..aed206475aa7 100644 --- a/arch/x86/mm/kaslr.c +++ b/arch/x86/mm/kaslr.c | |||
| @@ -48,7 +48,7 @@ static const unsigned long vaddr_start = __PAGE_OFFSET_BASE; | |||
| 48 | #if defined(CONFIG_X86_ESPFIX64) | 48 | #if defined(CONFIG_X86_ESPFIX64) |
| 49 | static const unsigned long vaddr_end = ESPFIX_BASE_ADDR; | 49 | static const unsigned long vaddr_end = ESPFIX_BASE_ADDR; |
| 50 | #elif defined(CONFIG_EFI) | 50 | #elif defined(CONFIG_EFI) |
| 51 | static const unsigned long vaddr_end = EFI_VA_START; | 51 | static const unsigned long vaddr_end = EFI_VA_END; |
| 52 | #else | 52 | #else |
| 53 | static const unsigned long vaddr_end = __START_KERNEL_map; | 53 | static const unsigned long vaddr_end = __START_KERNEL_map; |
| 54 | #endif | 54 | #endif |
| @@ -105,7 +105,7 @@ void __init kernel_randomize_memory(void) | |||
| 105 | */ | 105 | */ |
| 106 | BUILD_BUG_ON(vaddr_start >= vaddr_end); | 106 | BUILD_BUG_ON(vaddr_start >= vaddr_end); |
| 107 | BUILD_BUG_ON(IS_ENABLED(CONFIG_X86_ESPFIX64) && | 107 | BUILD_BUG_ON(IS_ENABLED(CONFIG_X86_ESPFIX64) && |
| 108 | vaddr_end >= EFI_VA_START); | 108 | vaddr_end >= EFI_VA_END); |
| 109 | BUILD_BUG_ON((IS_ENABLED(CONFIG_X86_ESPFIX64) || | 109 | BUILD_BUG_ON((IS_ENABLED(CONFIG_X86_ESPFIX64) || |
| 110 | IS_ENABLED(CONFIG_EFI)) && | 110 | IS_ENABLED(CONFIG_EFI)) && |
| 111 | vaddr_end >= __START_KERNEL_map); | 111 | vaddr_end >= __START_KERNEL_map); |
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 555b9fa0ad43..7dbdb780264d 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile | |||
| @@ -8,6 +8,7 @@ PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) | |||
| 8 | LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib | 8 | LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib |
| 9 | targets += purgatory.ro | 9 | targets += purgatory.ro |
| 10 | 10 | ||
| 11 | KASAN_SANITIZE := n | ||
| 11 | KCOV_INSTRUMENT := n | 12 | KCOV_INSTRUMENT := n |
| 12 | 13 | ||
| 13 | # Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That | 14 | # Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That |
diff --git a/arch/xtensa/include/asm/page.h b/arch/xtensa/include/asm/page.h index 976b1d70edbc..4ddbfd57a7c8 100644 --- a/arch/xtensa/include/asm/page.h +++ b/arch/xtensa/include/asm/page.h | |||
| @@ -164,8 +164,21 @@ void copy_user_highpage(struct page *to, struct page *from, | |||
| 164 | 164 | ||
| 165 | #define ARCH_PFN_OFFSET (PHYS_OFFSET >> PAGE_SHIFT) | 165 | #define ARCH_PFN_OFFSET (PHYS_OFFSET >> PAGE_SHIFT) |
| 166 | 166 | ||
| 167 | #ifdef CONFIG_MMU | ||
| 168 | static inline unsigned long ___pa(unsigned long va) | ||
| 169 | { | ||
| 170 | unsigned long off = va - PAGE_OFFSET; | ||
| 171 | |||
| 172 | if (off >= XCHAL_KSEG_SIZE) | ||
| 173 | off -= XCHAL_KSEG_SIZE; | ||
| 174 | |||
| 175 | return off + PHYS_OFFSET; | ||
| 176 | } | ||
| 177 | #define __pa(x) ___pa((unsigned long)(x)) | ||
| 178 | #else | ||
| 167 | #define __pa(x) \ | 179 | #define __pa(x) \ |
| 168 | ((unsigned long) (x) - PAGE_OFFSET + PHYS_OFFSET) | 180 | ((unsigned long) (x) - PAGE_OFFSET + PHYS_OFFSET) |
| 181 | #endif | ||
| 169 | #define __va(x) \ | 182 | #define __va(x) \ |
| 170 | ((void *)((unsigned long) (x) - PHYS_OFFSET + PAGE_OFFSET)) | 183 | ((void *)((unsigned long) (x) - PHYS_OFFSET + PAGE_OFFSET)) |
| 171 | #define pfn_valid(pfn) \ | 184 | #define pfn_valid(pfn) \ |
diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h index cd400af4a6b2..6be7eb27fd29 100644 --- a/arch/xtensa/include/uapi/asm/unistd.h +++ b/arch/xtensa/include/uapi/asm/unistd.h | |||
| @@ -774,7 +774,10 @@ __SYSCALL(349, sys_pkey_alloc, 2) | |||
| 774 | #define __NR_pkey_free 350 | 774 | #define __NR_pkey_free 350 |
| 775 | __SYSCALL(350, sys_pkey_free, 1) | 775 | __SYSCALL(350, sys_pkey_free, 1) |
| 776 | 776 | ||
| 777 | #define __NR_syscall_count 351 | 777 | #define __NR_statx 351 |
| 778 | __SYSCALL(351, sys_statx, 5) | ||
| 779 | |||
| 780 | #define __NR_syscall_count 352 | ||
| 778 | 781 | ||
| 779 | /* | 782 | /* |
| 780 | * sysxtensa syscall handler | 783 | * sysxtensa syscall handler |
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index c82c43bff296..bae697a06a98 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c | |||
| @@ -483,10 +483,8 @@ void show_regs(struct pt_regs * regs) | |||
| 483 | 483 | ||
| 484 | static int show_trace_cb(struct stackframe *frame, void *data) | 484 | static int show_trace_cb(struct stackframe *frame, void *data) |
| 485 | { | 485 | { |
| 486 | if (kernel_text_address(frame->pc)) { | 486 | if (kernel_text_address(frame->pc)) |
| 487 | pr_cont(" [<%08lx>]", frame->pc); | 487 | pr_cont(" [<%08lx>] %pB\n", frame->pc, (void *)frame->pc); |
| 488 | print_symbol(" %s\n", frame->pc); | ||
| 489 | } | ||
| 490 | return 0; | 488 | return 0; |
| 491 | } | 489 | } |
| 492 | 490 | ||
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 09af8ff18719..c974a1bbf4cb 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c | |||
| @@ -171,7 +171,8 @@ void blk_mq_sched_put_request(struct request *rq) | |||
| 171 | 171 | ||
| 172 | void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) | 172 | void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) |
| 173 | { | 173 | { |
| 174 | struct elevator_queue *e = hctx->queue->elevator; | 174 | struct request_queue *q = hctx->queue; |
| 175 | struct elevator_queue *e = q->elevator; | ||
| 175 | const bool has_sched_dispatch = e && e->type->ops.mq.dispatch_request; | 176 | const bool has_sched_dispatch = e && e->type->ops.mq.dispatch_request; |
| 176 | bool did_work = false; | 177 | bool did_work = false; |
| 177 | LIST_HEAD(rq_list); | 178 | LIST_HEAD(rq_list); |
| @@ -203,10 +204,10 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) | |||
| 203 | */ | 204 | */ |
| 204 | if (!list_empty(&rq_list)) { | 205 | if (!list_empty(&rq_list)) { |
| 205 | blk_mq_sched_mark_restart_hctx(hctx); | 206 | blk_mq_sched_mark_restart_hctx(hctx); |
| 206 | did_work = blk_mq_dispatch_rq_list(hctx, &rq_list); | 207 | did_work = blk_mq_dispatch_rq_list(q, &rq_list); |
| 207 | } else if (!has_sched_dispatch) { | 208 | } else if (!has_sched_dispatch) { |
| 208 | blk_mq_flush_busy_ctxs(hctx, &rq_list); | 209 | blk_mq_flush_busy_ctxs(hctx, &rq_list); |
| 209 | blk_mq_dispatch_rq_list(hctx, &rq_list); | 210 | blk_mq_dispatch_rq_list(q, &rq_list); |
| 210 | } | 211 | } |
| 211 | 212 | ||
| 212 | /* | 213 | /* |
| @@ -222,7 +223,7 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) | |||
| 222 | if (!rq) | 223 | if (!rq) |
| 223 | break; | 224 | break; |
| 224 | list_add(&rq->queuelist, &rq_list); | 225 | list_add(&rq->queuelist, &rq_list); |
| 225 | } while (blk_mq_dispatch_rq_list(hctx, &rq_list)); | 226 | } while (blk_mq_dispatch_rq_list(q, &rq_list)); |
| 226 | } | 227 | } |
| 227 | } | 228 | } |
| 228 | 229 | ||
| @@ -317,25 +318,68 @@ static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx, | |||
| 317 | return true; | 318 | return true; |
| 318 | } | 319 | } |
| 319 | 320 | ||
| 320 | static void blk_mq_sched_restart_hctx(struct blk_mq_hw_ctx *hctx) | 321 | static bool blk_mq_sched_restart_hctx(struct blk_mq_hw_ctx *hctx) |
| 321 | { | 322 | { |
| 322 | if (test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state)) { | 323 | if (test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state)) { |
| 323 | clear_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state); | 324 | clear_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state); |
| 324 | if (blk_mq_hctx_has_pending(hctx)) | 325 | if (blk_mq_hctx_has_pending(hctx)) { |
| 325 | blk_mq_run_hw_queue(hctx, true); | 326 | blk_mq_run_hw_queue(hctx, true); |
| 327 | return true; | ||
| 328 | } | ||
| 326 | } | 329 | } |
| 330 | return false; | ||
| 327 | } | 331 | } |
| 328 | 332 | ||
| 329 | void blk_mq_sched_restart_queues(struct blk_mq_hw_ctx *hctx) | 333 | /** |
| 330 | { | 334 | * list_for_each_entry_rcu_rr - iterate in a round-robin fashion over rcu list |
| 331 | struct request_queue *q = hctx->queue; | 335 | * @pos: loop cursor. |
| 332 | unsigned int i; | 336 | * @skip: the list element that will not be examined. Iteration starts at |
| 337 | * @skip->next. | ||
| 338 | * @head: head of the list to examine. This list must have at least one | ||
| 339 | * element, namely @skip. | ||
| 340 | * @member: name of the list_head structure within typeof(*pos). | ||
| 341 | */ | ||
| 342 | #define list_for_each_entry_rcu_rr(pos, skip, head, member) \ | ||
| 343 | for ((pos) = (skip); \ | ||
| 344 | (pos = (pos)->member.next != (head) ? list_entry_rcu( \ | ||
| 345 | (pos)->member.next, typeof(*pos), member) : \ | ||
| 346 | list_entry_rcu((pos)->member.next->next, typeof(*pos), member)), \ | ||
| 347 | (pos) != (skip); ) | ||
| 333 | 348 | ||
| 334 | if (test_bit(QUEUE_FLAG_RESTART, &q->queue_flags)) { | 349 | /* |
| 335 | if (test_and_clear_bit(QUEUE_FLAG_RESTART, &q->queue_flags)) { | 350 | * Called after a driver tag has been freed to check whether a hctx needs to |
| 336 | queue_for_each_hw_ctx(q, hctx, i) | 351 | * be restarted. Restarts @hctx if its tag set is not shared. Restarts hardware |
| 337 | blk_mq_sched_restart_hctx(hctx); | 352 | * queues in a round-robin fashion if the tag set of @hctx is shared with other |
| 353 | * hardware queues. | ||
| 354 | */ | ||
| 355 | void blk_mq_sched_restart(struct blk_mq_hw_ctx *const hctx) | ||
| 356 | { | ||
| 357 | struct blk_mq_tags *const tags = hctx->tags; | ||
| 358 | struct blk_mq_tag_set *const set = hctx->queue->tag_set; | ||
| 359 | struct request_queue *const queue = hctx->queue, *q; | ||
| 360 | struct blk_mq_hw_ctx *hctx2; | ||
| 361 | unsigned int i, j; | ||
| 362 | |||
| 363 | if (set->flags & BLK_MQ_F_TAG_SHARED) { | ||
| 364 | rcu_read_lock(); | ||
| 365 | list_for_each_entry_rcu_rr(q, queue, &set->tag_list, | ||
| 366 | tag_set_list) { | ||
| 367 | queue_for_each_hw_ctx(q, hctx2, i) | ||
| 368 | if (hctx2->tags == tags && | ||
| 369 | blk_mq_sched_restart_hctx(hctx2)) | ||
| 370 | goto done; | ||
| 371 | } | ||
| 372 | j = hctx->queue_num + 1; | ||
| 373 | for (i = 0; i < queue->nr_hw_queues; i++, j++) { | ||
| 374 | if (j == queue->nr_hw_queues) | ||
| 375 | j = 0; | ||
| 376 | hctx2 = queue->queue_hw_ctx[j]; | ||
| 377 | if (hctx2->tags == tags && | ||
| 378 | blk_mq_sched_restart_hctx(hctx2)) | ||
| 379 | break; | ||
| 338 | } | 380 | } |
| 381 | done: | ||
| 382 | rcu_read_unlock(); | ||
| 339 | } else { | 383 | } else { |
| 340 | blk_mq_sched_restart_hctx(hctx); | 384 | blk_mq_sched_restart_hctx(hctx); |
| 341 | } | 385 | } |
| @@ -431,11 +475,67 @@ static void blk_mq_sched_free_tags(struct blk_mq_tag_set *set, | |||
| 431 | } | 475 | } |
| 432 | } | 476 | } |
| 433 | 477 | ||
| 434 | int blk_mq_sched_setup(struct request_queue *q) | 478 | static int blk_mq_sched_alloc_tags(struct request_queue *q, |
| 479 | struct blk_mq_hw_ctx *hctx, | ||
| 480 | unsigned int hctx_idx) | ||
| 481 | { | ||
| 482 | struct blk_mq_tag_set *set = q->tag_set; | ||
| 483 | int ret; | ||
| 484 | |||
| 485 | hctx->sched_tags = blk_mq_alloc_rq_map(set, hctx_idx, q->nr_requests, | ||
| 486 | set->reserved_tags); | ||
| 487 | if (!hctx->sched_tags) | ||
| 488 | return -ENOMEM; | ||
| 489 | |||
| 490 | ret = blk_mq_alloc_rqs(set, hctx->sched_tags, hctx_idx, q->nr_requests); | ||
| 491 | if (ret) | ||
| 492 | blk_mq_sched_free_tags(set, hctx, hctx_idx); | ||
| 493 | |||
| 494 | return ret; | ||
| 495 | } | ||
| 496 | |||
| 497 | static void blk_mq_sched_tags_teardown(struct request_queue *q) | ||
| 435 | { | 498 | { |
| 436 | struct blk_mq_tag_set *set = q->tag_set; | 499 | struct blk_mq_tag_set *set = q->tag_set; |
| 437 | struct blk_mq_hw_ctx *hctx; | 500 | struct blk_mq_hw_ctx *hctx; |
| 438 | int ret, i; | 501 | int i; |
| 502 | |||
| 503 | queue_for_each_hw_ctx(q, hctx, i) | ||
| 504 | blk_mq_sched_free_tags(set, hctx, i); | ||
| 505 | } | ||
| 506 | |||
| 507 | int blk_mq_sched_init_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, | ||
| 508 | unsigned int hctx_idx) | ||
| 509 | { | ||
| 510 | struct elevator_queue *e = q->elevator; | ||
| 511 | |||
| 512 | if (!e) | ||
| 513 | return 0; | ||
| 514 | |||
| 515 | return blk_mq_sched_alloc_tags(q, hctx, hctx_idx); | ||
| 516 | } | ||
| 517 | |||
| 518 | void blk_mq_sched_exit_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, | ||
| 519 | unsigned int hctx_idx) | ||
| 520 | { | ||
| 521 | struct elevator_queue *e = q->elevator; | ||
| 522 | |||
| 523 | if (!e) | ||
| 524 | return; | ||
| 525 | |||
| 526 | blk_mq_sched_free_tags(q->tag_set, hctx, hctx_idx); | ||
| 527 | } | ||
| 528 | |||
| 529 | int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) | ||
| 530 | { | ||
| 531 | struct blk_mq_hw_ctx *hctx; | ||
| 532 | unsigned int i; | ||
| 533 | int ret; | ||
| 534 | |||
| 535 | if (!e) { | ||
| 536 | q->elevator = NULL; | ||
| 537 | return 0; | ||
| 538 | } | ||
| 439 | 539 | ||
| 440 | /* | 540 | /* |
| 441 | * Default to 256, since we don't split into sync/async like the | 541 | * Default to 256, since we don't split into sync/async like the |
| @@ -443,49 +543,30 @@ int blk_mq_sched_setup(struct request_queue *q) | |||
| 443 | */ | 543 | */ |
| 444 | q->nr_requests = 2 * BLKDEV_MAX_RQ; | 544 | q->nr_requests = 2 * BLKDEV_MAX_RQ; |
| 445 | 545 | ||
| 446 | /* | ||
| 447 | * We're switching to using an IO scheduler, so setup the hctx | ||
| 448 | * scheduler tags and switch the request map from the regular | ||
| 449 | * tags to scheduler tags. First allocate what we need, so we | ||
| 450 | * can safely fail and fallback, if needed. | ||
| 451 | */ | ||
| 452 | ret = 0; | ||
| 453 | queue_for_each_hw_ctx(q, hctx, i) { | 546 | queue_for_each_hw_ctx(q, hctx, i) { |
| 454 | hctx->sched_tags = blk_mq_alloc_rq_map(set, i, | 547 | ret = blk_mq_sched_alloc_tags(q, hctx, i); |
| 455 | q->nr_requests, set->reserved_tags); | ||
| 456 | if (!hctx->sched_tags) { | ||
| 457 | ret = -ENOMEM; | ||
| 458 | break; | ||
| 459 | } | ||
| 460 | ret = blk_mq_alloc_rqs(set, hctx->sched_tags, i, q->nr_requests); | ||
| 461 | if (ret) | 548 | if (ret) |
| 462 | break; | 549 | goto err; |
| 463 | } | 550 | } |
| 464 | 551 | ||
| 465 | /* | 552 | ret = e->ops.mq.init_sched(q, e); |
| 466 | * If we failed, free what we did allocate | 553 | if (ret) |
| 467 | */ | 554 | goto err; |
| 468 | if (ret) { | ||
| 469 | queue_for_each_hw_ctx(q, hctx, i) { | ||
| 470 | if (!hctx->sched_tags) | ||
| 471 | continue; | ||
| 472 | blk_mq_sched_free_tags(set, hctx, i); | ||
| 473 | } | ||
| 474 | |||
| 475 | return ret; | ||
| 476 | } | ||
| 477 | 555 | ||
| 478 | return 0; | 556 | return 0; |
| 557 | |||
| 558 | err: | ||
| 559 | blk_mq_sched_tags_teardown(q); | ||
| 560 | q->elevator = NULL; | ||
| 561 | return ret; | ||
| 479 | } | 562 | } |
| 480 | 563 | ||
| 481 | void blk_mq_sched_teardown(struct request_queue *q) | 564 | void blk_mq_exit_sched(struct request_queue *q, struct elevator_queue *e) |
| 482 | { | 565 | { |
| 483 | struct blk_mq_tag_set *set = q->tag_set; | 566 | if (e->type->ops.mq.exit_sched) |
| 484 | struct blk_mq_hw_ctx *hctx; | 567 | e->type->ops.mq.exit_sched(e); |
| 485 | int i; | 568 | blk_mq_sched_tags_teardown(q); |
| 486 | 569 | q->elevator = NULL; | |
| 487 | queue_for_each_hw_ctx(q, hctx, i) | ||
| 488 | blk_mq_sched_free_tags(set, hctx, i); | ||
| 489 | } | 570 | } |
| 490 | 571 | ||
| 491 | int blk_mq_sched_init(struct request_queue *q) | 572 | int blk_mq_sched_init(struct request_queue *q) |
diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h index a75b16b123f7..3a9e6e40558b 100644 --- a/block/blk-mq-sched.h +++ b/block/blk-mq-sched.h | |||
| @@ -19,7 +19,7 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, | |||
| 19 | struct request **merged_request); | 19 | struct request **merged_request); |
| 20 | bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio); | 20 | bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio); |
| 21 | bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq); | 21 | bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq); |
| 22 | void blk_mq_sched_restart_queues(struct blk_mq_hw_ctx *hctx); | 22 | void blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx); |
| 23 | 23 | ||
| 24 | void blk_mq_sched_insert_request(struct request *rq, bool at_head, | 24 | void blk_mq_sched_insert_request(struct request *rq, bool at_head, |
| 25 | bool run_queue, bool async, bool can_block); | 25 | bool run_queue, bool async, bool can_block); |
| @@ -32,8 +32,13 @@ void blk_mq_sched_move_to_dispatch(struct blk_mq_hw_ctx *hctx, | |||
| 32 | struct list_head *rq_list, | 32 | struct list_head *rq_list, |
| 33 | struct request *(*get_rq)(struct blk_mq_hw_ctx *)); | 33 | struct request *(*get_rq)(struct blk_mq_hw_ctx *)); |
| 34 | 34 | ||
| 35 | int blk_mq_sched_setup(struct request_queue *q); | 35 | int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e); |
| 36 | void blk_mq_sched_teardown(struct request_queue *q); | 36 | void blk_mq_exit_sched(struct request_queue *q, struct elevator_queue *e); |
| 37 | |||
| 38 | int blk_mq_sched_init_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, | ||
| 39 | unsigned int hctx_idx); | ||
| 40 | void blk_mq_sched_exit_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, | ||
| 41 | unsigned int hctx_idx); | ||
| 37 | 42 | ||
| 38 | int blk_mq_sched_init(struct request_queue *q); | 43 | int blk_mq_sched_init(struct request_queue *q); |
| 39 | 44 | ||
| @@ -131,20 +136,6 @@ static inline void blk_mq_sched_mark_restart_hctx(struct blk_mq_hw_ctx *hctx) | |||
| 131 | set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state); | 136 | set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state); |
| 132 | } | 137 | } |
| 133 | 138 | ||
| 134 | /* | ||
| 135 | * Mark a hardware queue and the request queue it belongs to as needing a | ||
| 136 | * restart. | ||
| 137 | */ | ||
| 138 | static inline void blk_mq_sched_mark_restart_queue(struct blk_mq_hw_ctx *hctx) | ||
| 139 | { | ||
| 140 | struct request_queue *q = hctx->queue; | ||
| 141 | |||
| 142 | if (!test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state)) | ||
| 143 | set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state); | ||
| 144 | if (!test_bit(QUEUE_FLAG_RESTART, &q->queue_flags)) | ||
| 145 | set_bit(QUEUE_FLAG_RESTART, &q->queue_flags); | ||
| 146 | } | ||
| 147 | |||
| 148 | static inline bool blk_mq_sched_needs_restart(struct blk_mq_hw_ctx *hctx) | 139 | static inline bool blk_mq_sched_needs_restart(struct blk_mq_hw_ctx *hctx) |
| 149 | { | 140 | { |
| 150 | return test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state); | 141 | return test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state); |
diff --git a/block/blk-mq.c b/block/blk-mq.c index 08a49c69738b..572966f49596 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c | |||
| @@ -321,7 +321,6 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw, | |||
| 321 | 321 | ||
| 322 | rq = blk_mq_sched_get_request(q, NULL, rw, &alloc_data); | 322 | rq = blk_mq_sched_get_request(q, NULL, rw, &alloc_data); |
| 323 | 323 | ||
| 324 | blk_mq_put_ctx(alloc_data.ctx); | ||
| 325 | blk_queue_exit(q); | 324 | blk_queue_exit(q); |
| 326 | 325 | ||
| 327 | if (!rq) | 326 | if (!rq) |
| @@ -349,7 +348,7 @@ void __blk_mq_finish_request(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, | |||
| 349 | blk_mq_put_tag(hctx, hctx->tags, ctx, rq->tag); | 348 | blk_mq_put_tag(hctx, hctx->tags, ctx, rq->tag); |
| 350 | if (sched_tag != -1) | 349 | if (sched_tag != -1) |
| 351 | blk_mq_sched_completed_request(hctx, rq); | 350 | blk_mq_sched_completed_request(hctx, rq); |
| 352 | blk_mq_sched_restart_queues(hctx); | 351 | blk_mq_sched_restart(hctx); |
| 353 | blk_queue_exit(q); | 352 | blk_queue_exit(q); |
| 354 | } | 353 | } |
| 355 | 354 | ||
| @@ -846,12 +845,8 @@ bool blk_mq_get_driver_tag(struct request *rq, struct blk_mq_hw_ctx **hctx, | |||
| 846 | .flags = wait ? 0 : BLK_MQ_REQ_NOWAIT, | 845 | .flags = wait ? 0 : BLK_MQ_REQ_NOWAIT, |
| 847 | }; | 846 | }; |
| 848 | 847 | ||
| 849 | if (rq->tag != -1) { | 848 | if (rq->tag != -1) |
| 850 | done: | 849 | goto done; |
| 851 | if (hctx) | ||
| 852 | *hctx = data.hctx; | ||
| 853 | return true; | ||
| 854 | } | ||
| 855 | 850 | ||
| 856 | if (blk_mq_tag_is_reserved(data.hctx->sched_tags, rq->internal_tag)) | 851 | if (blk_mq_tag_is_reserved(data.hctx->sched_tags, rq->internal_tag)) |
| 857 | data.flags |= BLK_MQ_REQ_RESERVED; | 852 | data.flags |= BLK_MQ_REQ_RESERVED; |
| @@ -863,10 +858,12 @@ done: | |||
| 863 | atomic_inc(&data.hctx->nr_active); | 858 | atomic_inc(&data.hctx->nr_active); |
| 864 | } | 859 | } |
| 865 | data.hctx->tags->rqs[rq->tag] = rq; | 860 | data.hctx->tags->rqs[rq->tag] = rq; |
| 866 | goto done; | ||
| 867 | } | 861 | } |
| 868 | 862 | ||
| 869 | return false; | 863 | done: |
| 864 | if (hctx) | ||
| 865 | *hctx = data.hctx; | ||
| 866 | return rq->tag != -1; | ||
| 870 | } | 867 | } |
| 871 | 868 | ||
| 872 | static void __blk_mq_put_driver_tag(struct blk_mq_hw_ctx *hctx, | 869 | static void __blk_mq_put_driver_tag(struct blk_mq_hw_ctx *hctx, |
| @@ -963,13 +960,16 @@ static bool blk_mq_dispatch_wait_add(struct blk_mq_hw_ctx *hctx) | |||
| 963 | return true; | 960 | return true; |
| 964 | } | 961 | } |
| 965 | 962 | ||
| 966 | bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list) | 963 | bool blk_mq_dispatch_rq_list(struct request_queue *q, struct list_head *list) |
| 967 | { | 964 | { |
| 968 | struct request_queue *q = hctx->queue; | 965 | struct blk_mq_hw_ctx *hctx; |
| 969 | struct request *rq; | 966 | struct request *rq; |
| 970 | LIST_HEAD(driver_list); | 967 | LIST_HEAD(driver_list); |
| 971 | struct list_head *dptr; | 968 | struct list_head *dptr; |
| 972 | int queued, ret = BLK_MQ_RQ_QUEUE_OK; | 969 | int errors, queued, ret = BLK_MQ_RQ_QUEUE_OK; |
| 970 | |||
| 971 | if (list_empty(list)) | ||
| 972 | return false; | ||
| 973 | 973 | ||
| 974 | /* | 974 | /* |
| 975 | * Start off with dptr being NULL, so we start the first request | 975 | * Start off with dptr being NULL, so we start the first request |
| @@ -980,8 +980,8 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list) | |||
| 980 | /* | 980 | /* |
| 981 | * Now process all the entries, sending them to the driver. | 981 | * Now process all the entries, sending them to the driver. |
| 982 | */ | 982 | */ |
| 983 | queued = 0; | 983 | errors = queued = 0; |
| 984 | while (!list_empty(list)) { | 984 | do { |
| 985 | struct blk_mq_queue_data bd; | 985 | struct blk_mq_queue_data bd; |
| 986 | 986 | ||
| 987 | rq = list_first_entry(list, struct request, queuelist); | 987 | rq = list_first_entry(list, struct request, queuelist); |
| @@ -1037,6 +1037,7 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list) | |||
| 1037 | default: | 1037 | default: |
| 1038 | pr_err("blk-mq: bad return on queue: %d\n", ret); | 1038 | pr_err("blk-mq: bad return on queue: %d\n", ret); |
| 1039 | case BLK_MQ_RQ_QUEUE_ERROR: | 1039 | case BLK_MQ_RQ_QUEUE_ERROR: |
| 1040 | errors++; | ||
| 1040 | rq->errors = -EIO; | 1041 | rq->errors = -EIO; |
| 1041 | blk_mq_end_request(rq, rq->errors); | 1042 | blk_mq_end_request(rq, rq->errors); |
| 1042 | break; | 1043 | break; |
| @@ -1051,7 +1052,7 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list) | |||
| 1051 | */ | 1052 | */ |
| 1052 | if (!dptr && list->next != list->prev) | 1053 | if (!dptr && list->next != list->prev) |
| 1053 | dptr = &driver_list; | 1054 | dptr = &driver_list; |
| 1054 | } | 1055 | } while (!list_empty(list)); |
| 1055 | 1056 | ||
| 1056 | hctx->dispatched[queued_to_index(queued)]++; | 1057 | hctx->dispatched[queued_to_index(queued)]++; |
| 1057 | 1058 | ||
| @@ -1088,7 +1089,7 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list) | |||
| 1088 | blk_mq_run_hw_queue(hctx, true); | 1089 | blk_mq_run_hw_queue(hctx, true); |
| 1089 | } | 1090 | } |
| 1090 | 1091 | ||
| 1091 | return queued != 0; | 1092 | return (queued + errors) != 0; |
| 1092 | } | 1093 | } |
| 1093 | 1094 | ||
| 1094 | static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx) | 1095 | static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx) |
| @@ -1134,7 +1135,8 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx) | |||
| 1134 | return hctx->next_cpu; | 1135 | return hctx->next_cpu; |
| 1135 | } | 1136 | } |
| 1136 | 1137 | ||
| 1137 | void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) | 1138 | static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async, |
| 1139 | unsigned long msecs) | ||
| 1138 | { | 1140 | { |
| 1139 | if (unlikely(blk_mq_hctx_stopped(hctx) || | 1141 | if (unlikely(blk_mq_hctx_stopped(hctx) || |
| 1140 | !blk_mq_hw_queue_mapped(hctx))) | 1142 | !blk_mq_hw_queue_mapped(hctx))) |
| @@ -1151,7 +1153,24 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) | |||
| 1151 | put_cpu(); | 1153 | put_cpu(); |
| 1152 | } | 1154 | } |
| 1153 | 1155 | ||
| 1154 | kblockd_schedule_work_on(blk_mq_hctx_next_cpu(hctx), &hctx->run_work); | 1156 | if (msecs == 0) |
| 1157 | kblockd_schedule_work_on(blk_mq_hctx_next_cpu(hctx), | ||
| 1158 | &hctx->run_work); | ||
| 1159 | else | ||
| 1160 | kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx), | ||
| 1161 | &hctx->delayed_run_work, | ||
| 1162 | msecs_to_jiffies(msecs)); | ||
| 1163 | } | ||
| 1164 | |||
| 1165 | void blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs) | ||
| 1166 | { | ||
| 1167 | __blk_mq_delay_run_hw_queue(hctx, true, msecs); | ||
| 1168 | } | ||
| 1169 | EXPORT_SYMBOL(blk_mq_delay_run_hw_queue); | ||
| 1170 | |||
| 1171 | void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) | ||
| 1172 | { | ||
| 1173 | __blk_mq_delay_run_hw_queue(hctx, async, 0); | ||
| 1155 | } | 1174 | } |
| 1156 | 1175 | ||
| 1157 | void blk_mq_run_hw_queues(struct request_queue *q, bool async) | 1176 | void blk_mq_run_hw_queues(struct request_queue *q, bool async) |
| @@ -1254,6 +1273,15 @@ static void blk_mq_run_work_fn(struct work_struct *work) | |||
| 1254 | __blk_mq_run_hw_queue(hctx); | 1273 | __blk_mq_run_hw_queue(hctx); |
| 1255 | } | 1274 | } |
| 1256 | 1275 | ||
| 1276 | static void blk_mq_delayed_run_work_fn(struct work_struct *work) | ||
| 1277 | { | ||
| 1278 | struct blk_mq_hw_ctx *hctx; | ||
| 1279 | |||
| 1280 | hctx = container_of(work, struct blk_mq_hw_ctx, delayed_run_work.work); | ||
| 1281 | |||
| 1282 | __blk_mq_run_hw_queue(hctx); | ||
| 1283 | } | ||
| 1284 | |||
| 1257 | static void blk_mq_delay_work_fn(struct work_struct *work) | 1285 | static void blk_mq_delay_work_fn(struct work_struct *work) |
| 1258 | { | 1286 | { |
| 1259 | struct blk_mq_hw_ctx *hctx; | 1287 | struct blk_mq_hw_ctx *hctx; |
| @@ -1923,6 +1951,8 @@ static void blk_mq_exit_hctx(struct request_queue *q, | |||
| 1923 | hctx->fq->flush_rq, hctx_idx, | 1951 | hctx->fq->flush_rq, hctx_idx, |
| 1924 | flush_start_tag + hctx_idx); | 1952 | flush_start_tag + hctx_idx); |
| 1925 | 1953 | ||
| 1954 | blk_mq_sched_exit_hctx(q, hctx, hctx_idx); | ||
| 1955 | |||
| 1926 | if (set->ops->exit_hctx) | 1956 | if (set->ops->exit_hctx) |
| 1927 | set->ops->exit_hctx(hctx, hctx_idx); | 1957 | set->ops->exit_hctx(hctx, hctx_idx); |
| 1928 | 1958 | ||
| @@ -1959,6 +1989,7 @@ static int blk_mq_init_hctx(struct request_queue *q, | |||
| 1959 | node = hctx->numa_node = set->numa_node; | 1989 | node = hctx->numa_node = set->numa_node; |
| 1960 | 1990 | ||
| 1961 | INIT_WORK(&hctx->run_work, blk_mq_run_work_fn); | 1991 | INIT_WORK(&hctx->run_work, blk_mq_run_work_fn); |
| 1992 | INIT_DELAYED_WORK(&hctx->delayed_run_work, blk_mq_delayed_run_work_fn); | ||
| 1962 | INIT_DELAYED_WORK(&hctx->delay_work, blk_mq_delay_work_fn); | 1993 | INIT_DELAYED_WORK(&hctx->delay_work, blk_mq_delay_work_fn); |
| 1963 | spin_lock_init(&hctx->lock); | 1994 | spin_lock_init(&hctx->lock); |
| 1964 | INIT_LIST_HEAD(&hctx->dispatch); | 1995 | INIT_LIST_HEAD(&hctx->dispatch); |
| @@ -1989,9 +2020,12 @@ static int blk_mq_init_hctx(struct request_queue *q, | |||
| 1989 | set->ops->init_hctx(hctx, set->driver_data, hctx_idx)) | 2020 | set->ops->init_hctx(hctx, set->driver_data, hctx_idx)) |
| 1990 | goto free_bitmap; | 2021 | goto free_bitmap; |
| 1991 | 2022 | ||
| 2023 | if (blk_mq_sched_init_hctx(q, hctx, hctx_idx)) | ||
| 2024 | goto exit_hctx; | ||
| 2025 | |||
| 1992 | hctx->fq = blk_alloc_flush_queue(q, hctx->numa_node, set->cmd_size); | 2026 | hctx->fq = blk_alloc_flush_queue(q, hctx->numa_node, set->cmd_size); |
| 1993 | if (!hctx->fq) | 2027 | if (!hctx->fq) |
| 1994 | goto exit_hctx; | 2028 | goto sched_exit_hctx; |
| 1995 | 2029 | ||
| 1996 | if (set->ops->init_request && | 2030 | if (set->ops->init_request && |
| 1997 | set->ops->init_request(set->driver_data, | 2031 | set->ops->init_request(set->driver_data, |
| @@ -2006,6 +2040,8 @@ static int blk_mq_init_hctx(struct request_queue *q, | |||
| 2006 | 2040 | ||
| 2007 | free_fq: | 2041 | free_fq: |
| 2008 | kfree(hctx->fq); | 2042 | kfree(hctx->fq); |
| 2043 | sched_exit_hctx: | ||
| 2044 | blk_mq_sched_exit_hctx(q, hctx, hctx_idx); | ||
| 2009 | exit_hctx: | 2045 | exit_hctx: |
| 2010 | if (set->ops->exit_hctx) | 2046 | if (set->ops->exit_hctx) |
| 2011 | set->ops->exit_hctx(hctx, hctx_idx); | 2047 | set->ops->exit_hctx(hctx, hctx_idx); |
| @@ -2232,8 +2268,6 @@ void blk_mq_release(struct request_queue *q) | |||
| 2232 | struct blk_mq_hw_ctx *hctx; | 2268 | struct blk_mq_hw_ctx *hctx; |
| 2233 | unsigned int i; | 2269 | unsigned int i; |
| 2234 | 2270 | ||
| 2235 | blk_mq_sched_teardown(q); | ||
| 2236 | |||
| 2237 | /* hctx kobj stays in hctx */ | 2271 | /* hctx kobj stays in hctx */ |
| 2238 | queue_for_each_hw_ctx(q, hctx, i) { | 2272 | queue_for_each_hw_ctx(q, hctx, i) { |
| 2239 | if (!hctx) | 2273 | if (!hctx) |
| @@ -2564,6 +2598,14 @@ static int blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set) | |||
| 2564 | return 0; | 2598 | return 0; |
| 2565 | } | 2599 | } |
| 2566 | 2600 | ||
| 2601 | static int blk_mq_update_queue_map(struct blk_mq_tag_set *set) | ||
| 2602 | { | ||
| 2603 | if (set->ops->map_queues) | ||
| 2604 | return set->ops->map_queues(set); | ||
| 2605 | else | ||
| 2606 | return blk_mq_map_queues(set); | ||
| 2607 | } | ||
| 2608 | |||
| 2567 | /* | 2609 | /* |
| 2568 | * Alloc a tag set to be associated with one or more request queues. | 2610 | * Alloc a tag set to be associated with one or more request queues. |
| 2569 | * May fail with EINVAL for various error conditions. May adjust the | 2611 | * May fail with EINVAL for various error conditions. May adjust the |
| @@ -2618,10 +2660,7 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) | |||
| 2618 | if (!set->mq_map) | 2660 | if (!set->mq_map) |
| 2619 | goto out_free_tags; | 2661 | goto out_free_tags; |
| 2620 | 2662 | ||
| 2621 | if (set->ops->map_queues) | 2663 | ret = blk_mq_update_queue_map(set); |
| 2622 | ret = set->ops->map_queues(set); | ||
| 2623 | else | ||
| 2624 | ret = blk_mq_map_queues(set); | ||
| 2625 | if (ret) | 2664 | if (ret) |
| 2626 | goto out_free_mq_map; | 2665 | goto out_free_mq_map; |
| 2627 | 2666 | ||
| @@ -2713,6 +2752,7 @@ void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues) | |||
| 2713 | blk_mq_freeze_queue(q); | 2752 | blk_mq_freeze_queue(q); |
| 2714 | 2753 | ||
| 2715 | set->nr_hw_queues = nr_hw_queues; | 2754 | set->nr_hw_queues = nr_hw_queues; |
| 2755 | blk_mq_update_queue_map(set); | ||
| 2716 | list_for_each_entry(q, &set->tag_list, tag_set_list) { | 2756 | list_for_each_entry(q, &set->tag_list, tag_set_list) { |
| 2717 | blk_mq_realloc_hw_ctxs(set, q); | 2757 | blk_mq_realloc_hw_ctxs(set, q); |
| 2718 | 2758 | ||
diff --git a/block/blk-mq.h b/block/blk-mq.h index b79f9a7d8cf6..660a17e1d033 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h | |||
| @@ -31,7 +31,7 @@ void blk_mq_freeze_queue(struct request_queue *q); | |||
| 31 | void blk_mq_free_queue(struct request_queue *q); | 31 | void blk_mq_free_queue(struct request_queue *q); |
| 32 | int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr); | 32 | int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr); |
| 33 | void blk_mq_wake_waiters(struct request_queue *q); | 33 | void blk_mq_wake_waiters(struct request_queue *q); |
| 34 | bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *, struct list_head *); | 34 | bool blk_mq_dispatch_rq_list(struct request_queue *, struct list_head *); |
| 35 | void blk_mq_flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list); | 35 | void blk_mq_flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list); |
| 36 | bool blk_mq_hctx_has_pending(struct blk_mq_hw_ctx *hctx); | 36 | bool blk_mq_hctx_has_pending(struct blk_mq_hw_ctx *hctx); |
| 37 | bool blk_mq_get_driver_tag(struct request *rq, struct blk_mq_hw_ctx **hctx, | 37 | bool blk_mq_get_driver_tag(struct request *rq, struct blk_mq_hw_ctx **hctx, |
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index c44b321335f3..37f0b3ad635e 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c | |||
| @@ -816,7 +816,7 @@ static void blk_release_queue(struct kobject *kobj) | |||
| 816 | 816 | ||
| 817 | if (q->elevator) { | 817 | if (q->elevator) { |
| 818 | ioc_clear_queue(q); | 818 | ioc_clear_queue(q); |
| 819 | elevator_exit(q->elevator); | 819 | elevator_exit(q, q->elevator); |
| 820 | } | 820 | } |
| 821 | 821 | ||
| 822 | blk_exit_rl(&q->root_rl); | 822 | blk_exit_rl(&q->root_rl); |
diff --git a/block/elevator.c b/block/elevator.c index 01139f549b5b..dbeecf7be719 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -242,26 +242,21 @@ int elevator_init(struct request_queue *q, char *name) | |||
| 242 | } | 242 | } |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | if (e->uses_mq) { | 245 | if (e->uses_mq) |
| 246 | err = blk_mq_sched_setup(q); | 246 | err = blk_mq_init_sched(q, e); |
| 247 | if (!err) | 247 | else |
| 248 | err = e->ops.mq.init_sched(q, e); | ||
| 249 | } else | ||
| 250 | err = e->ops.sq.elevator_init_fn(q, e); | 248 | err = e->ops.sq.elevator_init_fn(q, e); |
| 251 | if (err) { | 249 | if (err) |
| 252 | if (e->uses_mq) | ||
| 253 | blk_mq_sched_teardown(q); | ||
| 254 | elevator_put(e); | 250 | elevator_put(e); |
| 255 | } | ||
| 256 | return err; | 251 | return err; |
| 257 | } | 252 | } |
| 258 | EXPORT_SYMBOL(elevator_init); | 253 | EXPORT_SYMBOL(elevator_init); |
| 259 | 254 | ||
| 260 | void elevator_exit(struct elevator_queue *e) | 255 | void elevator_exit(struct request_queue *q, struct elevator_queue *e) |
| 261 | { | 256 | { |
| 262 | mutex_lock(&e->sysfs_lock); | 257 | mutex_lock(&e->sysfs_lock); |
| 263 | if (e->uses_mq && e->type->ops.mq.exit_sched) | 258 | if (e->uses_mq && e->type->ops.mq.exit_sched) |
| 264 | e->type->ops.mq.exit_sched(e); | 259 | blk_mq_exit_sched(q, e); |
| 265 | else if (!e->uses_mq && e->type->ops.sq.elevator_exit_fn) | 260 | else if (!e->uses_mq && e->type->ops.sq.elevator_exit_fn) |
| 266 | e->type->ops.sq.elevator_exit_fn(e); | 261 | e->type->ops.sq.elevator_exit_fn(e); |
| 267 | mutex_unlock(&e->sysfs_lock); | 262 | mutex_unlock(&e->sysfs_lock); |
| @@ -946,6 +941,45 @@ void elv_unregister(struct elevator_type *e) | |||
| 946 | } | 941 | } |
| 947 | EXPORT_SYMBOL_GPL(elv_unregister); | 942 | EXPORT_SYMBOL_GPL(elv_unregister); |
| 948 | 943 | ||
| 944 | static int elevator_switch_mq(struct request_queue *q, | ||
| 945 | struct elevator_type *new_e) | ||
| 946 | { | ||
| 947 | int ret; | ||
| 948 | |||
| 949 | blk_mq_freeze_queue(q); | ||
| 950 | blk_mq_quiesce_queue(q); | ||
| 951 | |||
| 952 | if (q->elevator) { | ||
| 953 | if (q->elevator->registered) | ||
| 954 | elv_unregister_queue(q); | ||
| 955 | ioc_clear_queue(q); | ||
| 956 | elevator_exit(q, q->elevator); | ||
| 957 | } | ||
| 958 | |||
| 959 | ret = blk_mq_init_sched(q, new_e); | ||
| 960 | if (ret) | ||
| 961 | goto out; | ||
| 962 | |||
| 963 | if (new_e) { | ||
| 964 | ret = elv_register_queue(q); | ||
| 965 | if (ret) { | ||
| 966 | elevator_exit(q, q->elevator); | ||
| 967 | goto out; | ||
| 968 | } | ||
| 969 | } | ||
| 970 | |||
| 971 | if (new_e) | ||
| 972 | blk_add_trace_msg(q, "elv switch: %s", new_e->elevator_name); | ||
| 973 | else | ||
| 974 | blk_add_trace_msg(q, "elv switch: none"); | ||
| 975 | |||
| 976 | out: | ||
| 977 | blk_mq_unfreeze_queue(q); | ||
| 978 | blk_mq_start_stopped_hw_queues(q, true); | ||
| 979 | return ret; | ||
| 980 | |||
| 981 | } | ||
| 982 | |||
| 949 | /* | 983 | /* |
| 950 | * switch to new_e io scheduler. be careful not to introduce deadlocks - | 984 | * switch to new_e io scheduler. be careful not to introduce deadlocks - |
| 951 | * we don't free the old io scheduler, before we have allocated what we | 985 | * we don't free the old io scheduler, before we have allocated what we |
| @@ -958,10 +992,8 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e) | |||
| 958 | bool old_registered = false; | 992 | bool old_registered = false; |
| 959 | int err; | 993 | int err; |
| 960 | 994 | ||
| 961 | if (q->mq_ops) { | 995 | if (q->mq_ops) |
| 962 | blk_mq_freeze_queue(q); | 996 | return elevator_switch_mq(q, new_e); |
| 963 | blk_mq_quiesce_queue(q); | ||
| 964 | } | ||
| 965 | 997 | ||
| 966 | /* | 998 | /* |
| 967 | * Turn on BYPASS and drain all requests w/ elevator private data. | 999 | * Turn on BYPASS and drain all requests w/ elevator private data. |
| @@ -973,11 +1005,7 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e) | |||
| 973 | if (old) { | 1005 | if (old) { |
| 974 | old_registered = old->registered; | 1006 | old_registered = old->registered; |
| 975 | 1007 | ||
| 976 | if (old->uses_mq) | 1008 | blk_queue_bypass_start(q); |
| 977 | blk_mq_sched_teardown(q); | ||
| 978 | |||
| 979 | if (!q->mq_ops) | ||
| 980 | blk_queue_bypass_start(q); | ||
| 981 | 1009 | ||
| 982 | /* unregister and clear all auxiliary data of the old elevator */ | 1010 | /* unregister and clear all auxiliary data of the old elevator */ |
| 983 | if (old_registered) | 1011 | if (old_registered) |
| @@ -987,56 +1015,32 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e) | |||
| 987 | } | 1015 | } |
| 988 | 1016 | ||
| 989 | /* allocate, init and register new elevator */ | 1017 | /* allocate, init and register new elevator */ |
| 990 | if (new_e) { | 1018 | err = new_e->ops.sq.elevator_init_fn(q, new_e); |
| 991 | if (new_e->uses_mq) { | 1019 | if (err) |
| 992 | err = blk_mq_sched_setup(q); | 1020 | goto fail_init; |
| 993 | if (!err) | ||
| 994 | err = new_e->ops.mq.init_sched(q, new_e); | ||
| 995 | } else | ||
| 996 | err = new_e->ops.sq.elevator_init_fn(q, new_e); | ||
| 997 | if (err) | ||
| 998 | goto fail_init; | ||
| 999 | 1021 | ||
| 1000 | err = elv_register_queue(q); | 1022 | err = elv_register_queue(q); |
| 1001 | if (err) | 1023 | if (err) |
| 1002 | goto fail_register; | 1024 | goto fail_register; |
| 1003 | } else | ||
| 1004 | q->elevator = NULL; | ||
| 1005 | 1025 | ||
| 1006 | /* done, kill the old one and finish */ | 1026 | /* done, kill the old one and finish */ |
| 1007 | if (old) { | 1027 | if (old) { |
| 1008 | elevator_exit(old); | 1028 | elevator_exit(q, old); |
| 1009 | if (!q->mq_ops) | 1029 | blk_queue_bypass_end(q); |
| 1010 | blk_queue_bypass_end(q); | ||
| 1011 | } | 1030 | } |
| 1012 | 1031 | ||
| 1013 | if (q->mq_ops) { | 1032 | blk_add_trace_msg(q, "elv switch: %s", new_e->elevator_name); |
| 1014 | blk_mq_unfreeze_queue(q); | ||
| 1015 | blk_mq_start_stopped_hw_queues(q, true); | ||
| 1016 | } | ||
| 1017 | |||
| 1018 | if (new_e) | ||
| 1019 | blk_add_trace_msg(q, "elv switch: %s", new_e->elevator_name); | ||
| 1020 | else | ||
| 1021 | blk_add_trace_msg(q, "elv switch: none"); | ||
| 1022 | 1033 | ||
| 1023 | return 0; | 1034 | return 0; |
| 1024 | 1035 | ||
| 1025 | fail_register: | 1036 | fail_register: |
| 1026 | if (q->mq_ops) | 1037 | elevator_exit(q, q->elevator); |
| 1027 | blk_mq_sched_teardown(q); | ||
| 1028 | elevator_exit(q->elevator); | ||
| 1029 | fail_init: | 1038 | fail_init: |
| 1030 | /* switch failed, restore and re-register old elevator */ | 1039 | /* switch failed, restore and re-register old elevator */ |
| 1031 | if (old) { | 1040 | if (old) { |
| 1032 | q->elevator = old; | 1041 | q->elevator = old; |
| 1033 | elv_register_queue(q); | 1042 | elv_register_queue(q); |
| 1034 | if (!q->mq_ops) | 1043 | blk_queue_bypass_end(q); |
| 1035 | blk_queue_bypass_end(q); | ||
| 1036 | } | ||
| 1037 | if (q->mq_ops) { | ||
| 1038 | blk_mq_unfreeze_queue(q); | ||
| 1039 | blk_mq_start_stopped_hw_queues(q, true); | ||
| 1040 | } | 1044 | } |
| 1041 | 1045 | ||
| 1042 | return err; | 1046 | return err; |
diff --git a/crypto/lrw.c b/crypto/lrw.c index ecd8474018e3..3ea095adafd9 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c | |||
| @@ -286,8 +286,11 @@ static int init_crypt(struct skcipher_request *req, crypto_completion_t done) | |||
| 286 | 286 | ||
| 287 | subreq->cryptlen = LRW_BUFFER_SIZE; | 287 | subreq->cryptlen = LRW_BUFFER_SIZE; |
| 288 | if (req->cryptlen > LRW_BUFFER_SIZE) { | 288 | if (req->cryptlen > LRW_BUFFER_SIZE) { |
| 289 | subreq->cryptlen = min(req->cryptlen, (unsigned)PAGE_SIZE); | 289 | unsigned int n = min(req->cryptlen, (unsigned int)PAGE_SIZE); |
| 290 | rctx->ext = kmalloc(subreq->cryptlen, gfp); | 290 | |
| 291 | rctx->ext = kmalloc(n, gfp); | ||
| 292 | if (rctx->ext) | ||
| 293 | subreq->cryptlen = n; | ||
| 291 | } | 294 | } |
| 292 | 295 | ||
| 293 | rctx->src = req->src; | 296 | rctx->src = req->src; |
diff --git a/crypto/xts.c b/crypto/xts.c index baeb34dd8582..c976bfac29da 100644 --- a/crypto/xts.c +++ b/crypto/xts.c | |||
| @@ -230,8 +230,11 @@ static int init_crypt(struct skcipher_request *req, crypto_completion_t done) | |||
| 230 | 230 | ||
| 231 | subreq->cryptlen = XTS_BUFFER_SIZE; | 231 | subreq->cryptlen = XTS_BUFFER_SIZE; |
| 232 | if (req->cryptlen > XTS_BUFFER_SIZE) { | 232 | if (req->cryptlen > XTS_BUFFER_SIZE) { |
| 233 | subreq->cryptlen = min(req->cryptlen, (unsigned)PAGE_SIZE); | 233 | unsigned int n = min(req->cryptlen, (unsigned int)PAGE_SIZE); |
| 234 | rctx->ext = kmalloc(subreq->cryptlen, gfp); | 234 | |
| 235 | rctx->ext = kmalloc(n, gfp); | ||
| 236 | if (rctx->ext) | ||
| 237 | subreq->cryptlen = n; | ||
| 235 | } | 238 | } |
| 236 | 239 | ||
| 237 | rctx->src = req->src; | 240 | rctx->src = req->src; |
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index a391bbc48105..d94f92f88ca1 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | # Makefile for the Linux ACPI interpreter | 2 | # Makefile for the Linux ACPI interpreter |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | ccflags-y := -Os | ||
| 6 | ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT | 5 | ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT |
| 7 | 6 | ||
| 8 | # | 7 | # |
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index b4c1a6a51da4..03250e1f1103 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c | |||
| @@ -25,9 +25,11 @@ | |||
| 25 | ACPI_MODULE_NAME("platform"); | 25 | ACPI_MODULE_NAME("platform"); |
| 26 | 26 | ||
| 27 | static const struct acpi_device_id forbidden_id_list[] = { | 27 | static const struct acpi_device_id forbidden_id_list[] = { |
| 28 | {"PNP0000", 0}, /* PIC */ | 28 | {"PNP0000", 0}, /* PIC */ |
| 29 | {"PNP0100", 0}, /* Timer */ | 29 | {"PNP0100", 0}, /* Timer */ |
| 30 | {"PNP0200", 0}, /* AT DMA Controller */ | 30 | {"PNP0200", 0}, /* AT DMA Controller */ |
| 31 | {"ACPI0009", 0}, /* IOxAPIC */ | ||
| 32 | {"ACPI000A", 0}, /* IOAPIC */ | ||
| 31 | {"", 0}, | 33 | {"", 0}, |
| 32 | }; | 34 | }; |
| 33 | 35 | ||
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index b192b42a8351..79b3c9c5a3bc 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c | |||
| @@ -1073,6 +1073,7 @@ static int ghes_remove(struct platform_device *ghes_dev) | |||
| 1073 | if (list_empty(&ghes_sci)) | 1073 | if (list_empty(&ghes_sci)) |
| 1074 | unregister_acpi_hed_notifier(&ghes_notifier_sci); | 1074 | unregister_acpi_hed_notifier(&ghes_notifier_sci); |
| 1075 | mutex_unlock(&ghes_list_mutex); | 1075 | mutex_unlock(&ghes_list_mutex); |
| 1076 | synchronize_rcu(); | ||
| 1076 | break; | 1077 | break; |
| 1077 | case ACPI_HEST_NOTIFY_NMI: | 1078 | case ACPI_HEST_NOTIFY_NMI: |
| 1078 | ghes_nmi_remove(ghes); | 1079 | ghes_nmi_remove(ghes); |
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index fb19e1cdb641..edc8663b5db3 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
| @@ -99,13 +99,13 @@ static int find_child_checks(struct acpi_device *adev, bool check_children) | |||
| 99 | return -ENODEV; | 99 | return -ENODEV; |
| 100 | 100 | ||
| 101 | /* | 101 | /* |
| 102 | * If the device has a _HID (or _CID) returning a valid ACPI/PNP | 102 | * If the device has a _HID returning a valid ACPI/PNP device ID, it is |
| 103 | * device ID, it is better to make it look less attractive here, so that | 103 | * better to make it look less attractive here, so that the other device |
| 104 | * the other device with the same _ADR value (that may not have a valid | 104 | * with the same _ADR value (that may not have a valid device ID) can be |
| 105 | * device ID) can be matched going forward. [This means a second spec | 105 | * matched going forward. [This means a second spec violation in a row, |
| 106 | * violation in a row, so whatever we do here is best effort anyway.] | 106 | * so whatever we do here is best effort anyway.] |
| 107 | */ | 107 | */ |
| 108 | return sta_present && list_empty(&adev->pnp.ids) ? | 108 | return sta_present && !adev->pnp.type.platform_id ? |
| 109 | FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE; | 109 | FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE; |
| 110 | } | 110 | } |
| 111 | 111 | ||
diff --git a/drivers/acpi/ioapic.c b/drivers/acpi/ioapic.c index 1120dfd625b8..7e4fbf9a53a3 100644 --- a/drivers/acpi/ioapic.c +++ b/drivers/acpi/ioapic.c | |||
| @@ -45,6 +45,12 @@ static acpi_status setup_res(struct acpi_resource *acpi_res, void *data) | |||
| 45 | struct resource *res = data; | 45 | struct resource *res = data; |
| 46 | struct resource_win win; | 46 | struct resource_win win; |
| 47 | 47 | ||
| 48 | /* | ||
| 49 | * We might assign this to 'res' later, make sure all pointers are | ||
| 50 | * cleared before the resource is added to the global list | ||
| 51 | */ | ||
| 52 | memset(&win, 0, sizeof(win)); | ||
| 53 | |||
| 48 | res->flags = 0; | 54 | res->flags = 0; |
| 49 | if (acpi_dev_filter_resource_type(acpi_res, IORESOURCE_MEM)) | 55 | if (acpi_dev_filter_resource_type(acpi_res, IORESOURCE_MEM)) |
| 50 | return AE_OK; | 56 | return AE_OK; |
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 7e4287bc19e5..d8a23561b4cb 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
| @@ -47,6 +47,8 @@ static DEFINE_MUTEX(nbd_index_mutex); | |||
| 47 | struct nbd_sock { | 47 | struct nbd_sock { |
| 48 | struct socket *sock; | 48 | struct socket *sock; |
| 49 | struct mutex tx_lock; | 49 | struct mutex tx_lock; |
| 50 | struct request *pending; | ||
| 51 | int sent; | ||
| 50 | }; | 52 | }; |
| 51 | 53 | ||
| 52 | #define NBD_TIMEDOUT 0 | 54 | #define NBD_TIMEDOUT 0 |
| @@ -124,7 +126,8 @@ static const char *nbdcmd_to_ascii(int cmd) | |||
| 124 | 126 | ||
| 125 | static int nbd_size_clear(struct nbd_device *nbd, struct block_device *bdev) | 127 | static int nbd_size_clear(struct nbd_device *nbd, struct block_device *bdev) |
| 126 | { | 128 | { |
| 127 | bd_set_size(bdev, 0); | 129 | if (bdev->bd_openers <= 1) |
| 130 | bd_set_size(bdev, 0); | ||
| 128 | set_capacity(nbd->disk, 0); | 131 | set_capacity(nbd->disk, 0); |
| 129 | kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE); | 132 | kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE); |
| 130 | 133 | ||
| @@ -190,7 +193,7 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, | |||
| 190 | 193 | ||
| 191 | dev_err(nbd_to_dev(nbd), "Connection timed out, shutting down connection\n"); | 194 | dev_err(nbd_to_dev(nbd), "Connection timed out, shutting down connection\n"); |
| 192 | set_bit(NBD_TIMEDOUT, &nbd->runtime_flags); | 195 | set_bit(NBD_TIMEDOUT, &nbd->runtime_flags); |
| 193 | req->errors++; | 196 | req->errors = -EIO; |
| 194 | 197 | ||
| 195 | mutex_lock(&nbd->config_lock); | 198 | mutex_lock(&nbd->config_lock); |
| 196 | sock_shutdown(nbd); | 199 | sock_shutdown(nbd); |
| @@ -202,7 +205,7 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, | |||
| 202 | * Send or receive packet. | 205 | * Send or receive packet. |
| 203 | */ | 206 | */ |
| 204 | static int sock_xmit(struct nbd_device *nbd, int index, int send, | 207 | static int sock_xmit(struct nbd_device *nbd, int index, int send, |
| 205 | struct iov_iter *iter, int msg_flags) | 208 | struct iov_iter *iter, int msg_flags, int *sent) |
| 206 | { | 209 | { |
| 207 | struct socket *sock = nbd->socks[index]->sock; | 210 | struct socket *sock = nbd->socks[index]->sock; |
| 208 | int result; | 211 | int result; |
| @@ -237,6 +240,8 @@ static int sock_xmit(struct nbd_device *nbd, int index, int send, | |||
| 237 | result = -EPIPE; /* short read */ | 240 | result = -EPIPE; /* short read */ |
| 238 | break; | 241 | break; |
| 239 | } | 242 | } |
| 243 | if (sent) | ||
| 244 | *sent += result; | ||
| 240 | } while (msg_data_left(&msg)); | 245 | } while (msg_data_left(&msg)); |
| 241 | 246 | ||
| 242 | tsk_restore_flags(current, pflags, PF_MEMALLOC); | 247 | tsk_restore_flags(current, pflags, PF_MEMALLOC); |
| @@ -248,6 +253,7 @@ static int sock_xmit(struct nbd_device *nbd, int index, int send, | |||
| 248 | static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) | 253 | static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) |
| 249 | { | 254 | { |
| 250 | struct request *req = blk_mq_rq_from_pdu(cmd); | 255 | struct request *req = blk_mq_rq_from_pdu(cmd); |
| 256 | struct nbd_sock *nsock = nbd->socks[index]; | ||
| 251 | int result; | 257 | int result; |
| 252 | struct nbd_request request = {.magic = htonl(NBD_REQUEST_MAGIC)}; | 258 | struct nbd_request request = {.magic = htonl(NBD_REQUEST_MAGIC)}; |
| 253 | struct kvec iov = {.iov_base = &request, .iov_len = sizeof(request)}; | 259 | struct kvec iov = {.iov_base = &request, .iov_len = sizeof(request)}; |
| @@ -256,6 +262,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) | |||
| 256 | struct bio *bio; | 262 | struct bio *bio; |
| 257 | u32 type; | 263 | u32 type; |
| 258 | u32 tag = blk_mq_unique_tag(req); | 264 | u32 tag = blk_mq_unique_tag(req); |
| 265 | int sent = nsock->sent, skip = 0; | ||
| 259 | 266 | ||
| 260 | iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request)); | 267 | iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request)); |
| 261 | 268 | ||
| @@ -283,6 +290,17 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) | |||
| 283 | return -EIO; | 290 | return -EIO; |
| 284 | } | 291 | } |
| 285 | 292 | ||
| 293 | /* We did a partial send previously, and we at least sent the whole | ||
| 294 | * request struct, so just go and send the rest of the pages in the | ||
| 295 | * request. | ||
| 296 | */ | ||
| 297 | if (sent) { | ||
| 298 | if (sent >= sizeof(request)) { | ||
| 299 | skip = sent - sizeof(request); | ||
| 300 | goto send_pages; | ||
| 301 | } | ||
| 302 | iov_iter_advance(&from, sent); | ||
| 303 | } | ||
| 286 | request.type = htonl(type); | 304 | request.type = htonl(type); |
| 287 | if (type != NBD_CMD_FLUSH) { | 305 | if (type != NBD_CMD_FLUSH) { |
| 288 | request.from = cpu_to_be64((u64)blk_rq_pos(req) << 9); | 306 | request.from = cpu_to_be64((u64)blk_rq_pos(req) << 9); |
| @@ -294,15 +312,27 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) | |||
| 294 | cmd, nbdcmd_to_ascii(type), | 312 | cmd, nbdcmd_to_ascii(type), |
| 295 | (unsigned long long)blk_rq_pos(req) << 9, blk_rq_bytes(req)); | 313 | (unsigned long long)blk_rq_pos(req) << 9, blk_rq_bytes(req)); |
| 296 | result = sock_xmit(nbd, index, 1, &from, | 314 | result = sock_xmit(nbd, index, 1, &from, |
| 297 | (type == NBD_CMD_WRITE) ? MSG_MORE : 0); | 315 | (type == NBD_CMD_WRITE) ? MSG_MORE : 0, &sent); |
| 298 | if (result <= 0) { | 316 | if (result <= 0) { |
| 317 | if (result == -ERESTARTSYS) { | ||
| 318 | /* If we havne't sent anything we can just return BUSY, | ||
| 319 | * however if we have sent something we need to make | ||
| 320 | * sure we only allow this req to be sent until we are | ||
| 321 | * completely done. | ||
| 322 | */ | ||
| 323 | if (sent) { | ||
| 324 | nsock->pending = req; | ||
| 325 | nsock->sent = sent; | ||
| 326 | } | ||
| 327 | return BLK_MQ_RQ_QUEUE_BUSY; | ||
| 328 | } | ||
| 299 | dev_err_ratelimited(disk_to_dev(nbd->disk), | 329 | dev_err_ratelimited(disk_to_dev(nbd->disk), |
| 300 | "Send control failed (result %d)\n", result); | 330 | "Send control failed (result %d)\n", result); |
| 301 | return -EIO; | 331 | return -EIO; |
| 302 | } | 332 | } |
| 303 | 333 | send_pages: | |
| 304 | if (type != NBD_CMD_WRITE) | 334 | if (type != NBD_CMD_WRITE) |
| 305 | return 0; | 335 | goto out; |
| 306 | 336 | ||
| 307 | bio = req->bio; | 337 | bio = req->bio; |
| 308 | while (bio) { | 338 | while (bio) { |
| @@ -318,8 +348,25 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) | |||
| 318 | cmd, bvec.bv_len); | 348 | cmd, bvec.bv_len); |
| 319 | iov_iter_bvec(&from, ITER_BVEC | WRITE, | 349 | iov_iter_bvec(&from, ITER_BVEC | WRITE, |
| 320 | &bvec, 1, bvec.bv_len); | 350 | &bvec, 1, bvec.bv_len); |
| 321 | result = sock_xmit(nbd, index, 1, &from, flags); | 351 | if (skip) { |
| 352 | if (skip >= iov_iter_count(&from)) { | ||
| 353 | skip -= iov_iter_count(&from); | ||
| 354 | continue; | ||
| 355 | } | ||
| 356 | iov_iter_advance(&from, skip); | ||
| 357 | skip = 0; | ||
| 358 | } | ||
| 359 | result = sock_xmit(nbd, index, 1, &from, flags, &sent); | ||
| 322 | if (result <= 0) { | 360 | if (result <= 0) { |
| 361 | if (result == -ERESTARTSYS) { | ||
| 362 | /* We've already sent the header, we | ||
| 363 | * have no choice but to set pending and | ||
| 364 | * return BUSY. | ||
| 365 | */ | ||
| 366 | nsock->pending = req; | ||
| 367 | nsock->sent = sent; | ||
| 368 | return BLK_MQ_RQ_QUEUE_BUSY; | ||
| 369 | } | ||
| 323 | dev_err(disk_to_dev(nbd->disk), | 370 | dev_err(disk_to_dev(nbd->disk), |
| 324 | "Send data failed (result %d)\n", | 371 | "Send data failed (result %d)\n", |
| 325 | result); | 372 | result); |
| @@ -336,6 +383,9 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) | |||
| 336 | } | 383 | } |
| 337 | bio = next; | 384 | bio = next; |
| 338 | } | 385 | } |
| 386 | out: | ||
| 387 | nsock->pending = NULL; | ||
| 388 | nsock->sent = 0; | ||
| 339 | return 0; | 389 | return 0; |
| 340 | } | 390 | } |
| 341 | 391 | ||
| @@ -353,7 +403,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) | |||
| 353 | 403 | ||
| 354 | reply.magic = 0; | 404 | reply.magic = 0; |
| 355 | iov_iter_kvec(&to, READ | ITER_KVEC, &iov, 1, sizeof(reply)); | 405 | iov_iter_kvec(&to, READ | ITER_KVEC, &iov, 1, sizeof(reply)); |
| 356 | result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL); | 406 | result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL, NULL); |
| 357 | if (result <= 0) { | 407 | if (result <= 0) { |
| 358 | if (!test_bit(NBD_DISCONNECTED, &nbd->runtime_flags) && | 408 | if (!test_bit(NBD_DISCONNECTED, &nbd->runtime_flags) && |
| 359 | !test_bit(NBD_DISCONNECT_REQUESTED, &nbd->runtime_flags)) | 409 | !test_bit(NBD_DISCONNECT_REQUESTED, &nbd->runtime_flags)) |
| @@ -383,7 +433,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) | |||
| 383 | if (ntohl(reply.error)) { | 433 | if (ntohl(reply.error)) { |
| 384 | dev_err(disk_to_dev(nbd->disk), "Other side returned error (%d)\n", | 434 | dev_err(disk_to_dev(nbd->disk), "Other side returned error (%d)\n", |
| 385 | ntohl(reply.error)); | 435 | ntohl(reply.error)); |
| 386 | req->errors++; | 436 | req->errors = -EIO; |
| 387 | return cmd; | 437 | return cmd; |
| 388 | } | 438 | } |
| 389 | 439 | ||
| @@ -395,11 +445,11 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) | |||
| 395 | rq_for_each_segment(bvec, req, iter) { | 445 | rq_for_each_segment(bvec, req, iter) { |
| 396 | iov_iter_bvec(&to, ITER_BVEC | READ, | 446 | iov_iter_bvec(&to, ITER_BVEC | READ, |
| 397 | &bvec, 1, bvec.bv_len); | 447 | &bvec, 1, bvec.bv_len); |
| 398 | result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL); | 448 | result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL, NULL); |
| 399 | if (result <= 0) { | 449 | if (result <= 0) { |
| 400 | dev_err(disk_to_dev(nbd->disk), "Receive data failed (result %d)\n", | 450 | dev_err(disk_to_dev(nbd->disk), "Receive data failed (result %d)\n", |
| 401 | result); | 451 | result); |
| 402 | req->errors++; | 452 | req->errors = -EIO; |
| 403 | return cmd; | 453 | return cmd; |
| 404 | } | 454 | } |
| 405 | dev_dbg(nbd_to_dev(nbd), "request %p: got %d bytes data\n", | 455 | dev_dbg(nbd_to_dev(nbd), "request %p: got %d bytes data\n", |
| @@ -469,7 +519,7 @@ static void nbd_clear_req(struct request *req, void *data, bool reserved) | |||
| 469 | if (!blk_mq_request_started(req)) | 519 | if (!blk_mq_request_started(req)) |
| 470 | return; | 520 | return; |
| 471 | cmd = blk_mq_rq_to_pdu(req); | 521 | cmd = blk_mq_rq_to_pdu(req); |
| 472 | req->errors++; | 522 | req->errors = -EIO; |
| 473 | nbd_end_request(cmd); | 523 | nbd_end_request(cmd); |
| 474 | } | 524 | } |
| 475 | 525 | ||
| @@ -482,22 +532,23 @@ static void nbd_clear_que(struct nbd_device *nbd) | |||
| 482 | } | 532 | } |
| 483 | 533 | ||
| 484 | 534 | ||
| 485 | static void nbd_handle_cmd(struct nbd_cmd *cmd, int index) | 535 | static int nbd_handle_cmd(struct nbd_cmd *cmd, int index) |
| 486 | { | 536 | { |
| 487 | struct request *req = blk_mq_rq_from_pdu(cmd); | 537 | struct request *req = blk_mq_rq_from_pdu(cmd); |
| 488 | struct nbd_device *nbd = cmd->nbd; | 538 | struct nbd_device *nbd = cmd->nbd; |
| 489 | struct nbd_sock *nsock; | 539 | struct nbd_sock *nsock; |
| 540 | int ret; | ||
| 490 | 541 | ||
| 491 | if (index >= nbd->num_connections) { | 542 | if (index >= nbd->num_connections) { |
| 492 | dev_err_ratelimited(disk_to_dev(nbd->disk), | 543 | dev_err_ratelimited(disk_to_dev(nbd->disk), |
| 493 | "Attempted send on invalid socket\n"); | 544 | "Attempted send on invalid socket\n"); |
| 494 | goto error_out; | 545 | return -EINVAL; |
| 495 | } | 546 | } |
| 496 | 547 | ||
| 497 | if (test_bit(NBD_DISCONNECTED, &nbd->runtime_flags)) { | 548 | if (test_bit(NBD_DISCONNECTED, &nbd->runtime_flags)) { |
| 498 | dev_err_ratelimited(disk_to_dev(nbd->disk), | 549 | dev_err_ratelimited(disk_to_dev(nbd->disk), |
| 499 | "Attempted send on closed socket\n"); | 550 | "Attempted send on closed socket\n"); |
| 500 | goto error_out; | 551 | return -EINVAL; |
| 501 | } | 552 | } |
| 502 | 553 | ||
| 503 | req->errors = 0; | 554 | req->errors = 0; |
| @@ -508,29 +559,30 @@ static void nbd_handle_cmd(struct nbd_cmd *cmd, int index) | |||
| 508 | mutex_unlock(&nsock->tx_lock); | 559 | mutex_unlock(&nsock->tx_lock); |
| 509 | dev_err_ratelimited(disk_to_dev(nbd->disk), | 560 | dev_err_ratelimited(disk_to_dev(nbd->disk), |
| 510 | "Attempted send on closed socket\n"); | 561 | "Attempted send on closed socket\n"); |
| 511 | goto error_out; | 562 | return -EINVAL; |
| 512 | } | 563 | } |
| 513 | 564 | ||
| 514 | if (nbd_send_cmd(nbd, cmd, index) != 0) { | 565 | /* Handle the case that we have a pending request that was partially |
| 515 | dev_err_ratelimited(disk_to_dev(nbd->disk), | 566 | * transmitted that _has_ to be serviced first. We need to call requeue |
| 516 | "Request send failed\n"); | 567 | * here so that it gets put _after_ the request that is already on the |
| 517 | req->errors++; | 568 | * dispatch list. |
| 518 | nbd_end_request(cmd); | 569 | */ |
| 570 | if (unlikely(nsock->pending && nsock->pending != req)) { | ||
| 571 | blk_mq_requeue_request(req, true); | ||
| 572 | ret = 0; | ||
| 573 | goto out; | ||
| 519 | } | 574 | } |
| 520 | 575 | ret = nbd_send_cmd(nbd, cmd, index); | |
| 576 | out: | ||
| 521 | mutex_unlock(&nsock->tx_lock); | 577 | mutex_unlock(&nsock->tx_lock); |
| 522 | 578 | return ret; | |
| 523 | return; | ||
| 524 | |||
| 525 | error_out: | ||
| 526 | req->errors++; | ||
| 527 | nbd_end_request(cmd); | ||
| 528 | } | 579 | } |
| 529 | 580 | ||
| 530 | static int nbd_queue_rq(struct blk_mq_hw_ctx *hctx, | 581 | static int nbd_queue_rq(struct blk_mq_hw_ctx *hctx, |
| 531 | const struct blk_mq_queue_data *bd) | 582 | const struct blk_mq_queue_data *bd) |
| 532 | { | 583 | { |
| 533 | struct nbd_cmd *cmd = blk_mq_rq_to_pdu(bd->rq); | 584 | struct nbd_cmd *cmd = blk_mq_rq_to_pdu(bd->rq); |
| 585 | int ret; | ||
| 534 | 586 | ||
| 535 | /* | 587 | /* |
| 536 | * Since we look at the bio's to send the request over the network we | 588 | * Since we look at the bio's to send the request over the network we |
| @@ -543,10 +595,20 @@ static int nbd_queue_rq(struct blk_mq_hw_ctx *hctx, | |||
| 543 | */ | 595 | */ |
| 544 | init_completion(&cmd->send_complete); | 596 | init_completion(&cmd->send_complete); |
| 545 | blk_mq_start_request(bd->rq); | 597 | blk_mq_start_request(bd->rq); |
| 546 | nbd_handle_cmd(cmd, hctx->queue_num); | 598 | |
| 599 | /* We can be called directly from the user space process, which means we | ||
| 600 | * could possibly have signals pending so our sendmsg will fail. In | ||
| 601 | * this case we need to return that we are busy, otherwise error out as | ||
| 602 | * appropriate. | ||
| 603 | */ | ||
| 604 | ret = nbd_handle_cmd(cmd, hctx->queue_num); | ||
| 605 | if (ret < 0) | ||
| 606 | ret = BLK_MQ_RQ_QUEUE_ERROR; | ||
| 607 | if (!ret) | ||
| 608 | ret = BLK_MQ_RQ_QUEUE_OK; | ||
| 547 | complete(&cmd->send_complete); | 609 | complete(&cmd->send_complete); |
| 548 | 610 | ||
| 549 | return BLK_MQ_RQ_QUEUE_OK; | 611 | return ret; |
| 550 | } | 612 | } |
| 551 | 613 | ||
| 552 | static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev, | 614 | static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev, |
| @@ -581,6 +643,8 @@ static int nbd_add_socket(struct nbd_device *nbd, struct block_device *bdev, | |||
| 581 | 643 | ||
| 582 | mutex_init(&nsock->tx_lock); | 644 | mutex_init(&nsock->tx_lock); |
| 583 | nsock->sock = sock; | 645 | nsock->sock = sock; |
| 646 | nsock->pending = NULL; | ||
| 647 | nsock->sent = 0; | ||
| 584 | socks[nbd->num_connections++] = nsock; | 648 | socks[nbd->num_connections++] = nsock; |
| 585 | 649 | ||
| 586 | if (max_part) | 650 | if (max_part) |
| @@ -602,6 +666,8 @@ static void nbd_reset(struct nbd_device *nbd) | |||
| 602 | 666 | ||
| 603 | static void nbd_bdev_reset(struct block_device *bdev) | 667 | static void nbd_bdev_reset(struct block_device *bdev) |
| 604 | { | 668 | { |
| 669 | if (bdev->bd_openers > 1) | ||
| 670 | return; | ||
| 605 | set_device_ro(bdev, false); | 671 | set_device_ro(bdev, false); |
| 606 | bdev->bd_inode->i_size = 0; | 672 | bdev->bd_inode->i_size = 0; |
| 607 | if (max_part > 0) { | 673 | if (max_part > 0) { |
| @@ -634,7 +700,7 @@ static void send_disconnects(struct nbd_device *nbd) | |||
| 634 | 700 | ||
| 635 | for (i = 0; i < nbd->num_connections; i++) { | 701 | for (i = 0; i < nbd->num_connections; i++) { |
| 636 | iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request)); | 702 | iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request)); |
| 637 | ret = sock_xmit(nbd, i, 1, &from, 0); | 703 | ret = sock_xmit(nbd, i, 1, &from, 0, NULL); |
| 638 | if (ret <= 0) | 704 | if (ret <= 0) |
| 639 | dev_err(disk_to_dev(nbd->disk), | 705 | dev_err(disk_to_dev(nbd->disk), |
| 640 | "Send disconnect failed %d\n", ret); | 706 | "Send disconnect failed %d\n", ret); |
| @@ -665,7 +731,8 @@ static int nbd_clear_sock(struct nbd_device *nbd, struct block_device *bdev) | |||
| 665 | { | 731 | { |
| 666 | sock_shutdown(nbd); | 732 | sock_shutdown(nbd); |
| 667 | nbd_clear_que(nbd); | 733 | nbd_clear_que(nbd); |
| 668 | kill_bdev(bdev); | 734 | |
| 735 | __invalidate_device(bdev, true); | ||
| 669 | nbd_bdev_reset(bdev); | 736 | nbd_bdev_reset(bdev); |
| 670 | /* | 737 | /* |
| 671 | * We want to give the run thread a chance to wait for everybody | 738 | * We want to give the run thread a chance to wait for everybody |
| @@ -781,7 +848,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, | |||
| 781 | nbd_size_set(nbd, bdev, nbd->blksize, arg); | 848 | nbd_size_set(nbd, bdev, nbd->blksize, arg); |
| 782 | return 0; | 849 | return 0; |
| 783 | case NBD_SET_TIMEOUT: | 850 | case NBD_SET_TIMEOUT: |
| 784 | nbd->tag_set.timeout = arg * HZ; | 851 | if (arg) { |
| 852 | nbd->tag_set.timeout = arg * HZ; | ||
| 853 | blk_queue_rq_timeout(nbd->disk->queue, arg * HZ); | ||
| 854 | } | ||
| 785 | return 0; | 855 | return 0; |
| 786 | 856 | ||
| 787 | case NBD_SET_FLAGS: | 857 | case NBD_SET_FLAGS: |
diff --git a/drivers/clocksource/clkevt-probe.c b/drivers/clocksource/clkevt-probe.c index 8c30fec86094..eb89b502acbd 100644 --- a/drivers/clocksource/clkevt-probe.c +++ b/drivers/clocksource/clkevt-probe.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
| 20 | #include <linux/clockchip.h> | 20 | #include <linux/clockchips.h> |
| 21 | 21 | ||
| 22 | extern struct of_device_id __clkevt_of_table[]; | 22 | extern struct of_device_id __clkevt_of_table[]; |
| 23 | 23 | ||
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 5dbdd261aa73..bc96d423781a 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -918,11 +918,19 @@ static struct kobj_type ktype_cpufreq = { | |||
| 918 | .release = cpufreq_sysfs_release, | 918 | .release = cpufreq_sysfs_release, |
| 919 | }; | 919 | }; |
| 920 | 920 | ||
| 921 | static int add_cpu_dev_symlink(struct cpufreq_policy *policy, | 921 | static void add_cpu_dev_symlink(struct cpufreq_policy *policy, unsigned int cpu) |
| 922 | struct device *dev) | ||
| 923 | { | 922 | { |
| 923 | struct device *dev = get_cpu_device(cpu); | ||
| 924 | |||
| 925 | if (!dev) | ||
| 926 | return; | ||
| 927 | |||
| 928 | if (cpumask_test_and_set_cpu(cpu, policy->real_cpus)) | ||
| 929 | return; | ||
| 930 | |||
| 924 | dev_dbg(dev, "%s: Adding symlink\n", __func__); | 931 | dev_dbg(dev, "%s: Adding symlink\n", __func__); |
| 925 | return sysfs_create_link(&dev->kobj, &policy->kobj, "cpufreq"); | 932 | if (sysfs_create_link(&dev->kobj, &policy->kobj, "cpufreq")) |
| 933 | dev_err(dev, "cpufreq symlink creation failed\n"); | ||
| 926 | } | 934 | } |
| 927 | 935 | ||
| 928 | static void remove_cpu_dev_symlink(struct cpufreq_policy *policy, | 936 | static void remove_cpu_dev_symlink(struct cpufreq_policy *policy, |
| @@ -1180,10 +1188,10 @@ static int cpufreq_online(unsigned int cpu) | |||
| 1180 | policy->user_policy.min = policy->min; | 1188 | policy->user_policy.min = policy->min; |
| 1181 | policy->user_policy.max = policy->max; | 1189 | policy->user_policy.max = policy->max; |
| 1182 | 1190 | ||
| 1183 | write_lock_irqsave(&cpufreq_driver_lock, flags); | 1191 | for_each_cpu(j, policy->related_cpus) { |
| 1184 | for_each_cpu(j, policy->related_cpus) | ||
| 1185 | per_cpu(cpufreq_cpu_data, j) = policy; | 1192 | per_cpu(cpufreq_cpu_data, j) = policy; |
| 1186 | write_unlock_irqrestore(&cpufreq_driver_lock, flags); | 1193 | add_cpu_dev_symlink(policy, j); |
| 1194 | } | ||
| 1187 | } else { | 1195 | } else { |
| 1188 | policy->min = policy->user_policy.min; | 1196 | policy->min = policy->user_policy.min; |
| 1189 | policy->max = policy->user_policy.max; | 1197 | policy->max = policy->user_policy.max; |
| @@ -1275,13 +1283,15 @@ out_exit_policy: | |||
| 1275 | 1283 | ||
| 1276 | if (cpufreq_driver->exit) | 1284 | if (cpufreq_driver->exit) |
| 1277 | cpufreq_driver->exit(policy); | 1285 | cpufreq_driver->exit(policy); |
| 1286 | |||
| 1287 | for_each_cpu(j, policy->real_cpus) | ||
| 1288 | remove_cpu_dev_symlink(policy, get_cpu_device(j)); | ||
| 1289 | |||
| 1278 | out_free_policy: | 1290 | out_free_policy: |
| 1279 | cpufreq_policy_free(policy); | 1291 | cpufreq_policy_free(policy); |
| 1280 | return ret; | 1292 | return ret; |
| 1281 | } | 1293 | } |
| 1282 | 1294 | ||
| 1283 | static int cpufreq_offline(unsigned int cpu); | ||
| 1284 | |||
| 1285 | /** | 1295 | /** |
| 1286 | * cpufreq_add_dev - the cpufreq interface for a CPU device. | 1296 | * cpufreq_add_dev - the cpufreq interface for a CPU device. |
| 1287 | * @dev: CPU device. | 1297 | * @dev: CPU device. |
| @@ -1303,16 +1313,10 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) | |||
| 1303 | 1313 | ||
| 1304 | /* Create sysfs link on CPU registration */ | 1314 | /* Create sysfs link on CPU registration */ |
| 1305 | policy = per_cpu(cpufreq_cpu_data, cpu); | 1315 | policy = per_cpu(cpufreq_cpu_data, cpu); |
| 1306 | if (!policy || cpumask_test_and_set_cpu(cpu, policy->real_cpus)) | 1316 | if (policy) |
| 1307 | return 0; | 1317 | add_cpu_dev_symlink(policy, cpu); |
| 1308 | 1318 | ||
| 1309 | ret = add_cpu_dev_symlink(policy, dev); | 1319 | return 0; |
| 1310 | if (ret) { | ||
| 1311 | cpumask_clear_cpu(cpu, policy->real_cpus); | ||
| 1312 | cpufreq_offline(cpu); | ||
| 1313 | } | ||
| 1314 | |||
| 1315 | return ret; | ||
| 1316 | } | 1320 | } |
| 1317 | 1321 | ||
| 1318 | static int cpufreq_offline(unsigned int cpu) | 1322 | static int cpufreq_offline(unsigned int cpu) |
diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c index 370593006f5f..cda8f62d555b 100644 --- a/drivers/cpuidle/cpuidle-powernv.c +++ b/drivers/cpuidle/cpuidle-powernv.c | |||
| @@ -175,6 +175,24 @@ static int powernv_cpuidle_driver_init(void) | |||
| 175 | drv->state_count += 1; | 175 | drv->state_count += 1; |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | /* | ||
| 179 | * On the PowerNV platform cpu_present may be less than cpu_possible in | ||
| 180 | * cases when firmware detects the CPU, but it is not available to the | ||
| 181 | * OS. If CONFIG_HOTPLUG_CPU=n, then such CPUs are not hotplugable at | ||
| 182 | * run time and hence cpu_devices are not created for those CPUs by the | ||
| 183 | * generic topology_init(). | ||
| 184 | * | ||
| 185 | * drv->cpumask defaults to cpu_possible_mask in | ||
| 186 | * __cpuidle_driver_init(). This breaks cpuidle on PowerNV where | ||
| 187 | * cpu_devices are not created for CPUs in cpu_possible_mask that | ||
| 188 | * cannot be hot-added later at run time. | ||
| 189 | * | ||
| 190 | * Trying cpuidle_register_device() on a CPU without a cpu_device is | ||
| 191 | * incorrect, so pass a correct CPU mask to the generic cpuidle driver. | ||
| 192 | */ | ||
| 193 | |||
| 194 | drv->cpumask = (struct cpumask *)cpu_present_mask; | ||
| 195 | |||
| 178 | return 0; | 196 | return 0; |
| 179 | } | 197 | } |
| 180 | 198 | ||
diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c index 41cc853f8569..fc08b4ed69d9 100644 --- a/drivers/crypto/ccp/ccp-dev-v5.c +++ b/drivers/crypto/ccp/ccp-dev-v5.c | |||
| @@ -1015,6 +1015,7 @@ const struct ccp_vdata ccpv5a = { | |||
| 1015 | 1015 | ||
| 1016 | const struct ccp_vdata ccpv5b = { | 1016 | const struct ccp_vdata ccpv5b = { |
| 1017 | .version = CCP_VERSION(5, 0), | 1017 | .version = CCP_VERSION(5, 0), |
| 1018 | .dma_chan_attr = DMA_PRIVATE, | ||
| 1018 | .setup = ccp5other_config, | 1019 | .setup = ccp5other_config, |
| 1019 | .perform = &ccp5_actions, | 1020 | .perform = &ccp5_actions, |
| 1020 | .bar = 2, | 1021 | .bar = 2, |
diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h index 2b5c01fade05..aa36f3f81860 100644 --- a/drivers/crypto/ccp/ccp-dev.h +++ b/drivers/crypto/ccp/ccp-dev.h | |||
| @@ -179,6 +179,10 @@ | |||
| 179 | 179 | ||
| 180 | /* ------------------------ General CCP Defines ------------------------ */ | 180 | /* ------------------------ General CCP Defines ------------------------ */ |
| 181 | 181 | ||
| 182 | #define CCP_DMA_DFLT 0x0 | ||
| 183 | #define CCP_DMA_PRIV 0x1 | ||
| 184 | #define CCP_DMA_PUB 0x2 | ||
| 185 | |||
| 182 | #define CCP_DMAPOOL_MAX_SIZE 64 | 186 | #define CCP_DMAPOOL_MAX_SIZE 64 |
| 183 | #define CCP_DMAPOOL_ALIGN BIT(5) | 187 | #define CCP_DMAPOOL_ALIGN BIT(5) |
| 184 | 188 | ||
| @@ -636,6 +640,7 @@ struct ccp_actions { | |||
| 636 | /* Structure to hold CCP version-specific values */ | 640 | /* Structure to hold CCP version-specific values */ |
| 637 | struct ccp_vdata { | 641 | struct ccp_vdata { |
| 638 | const unsigned int version; | 642 | const unsigned int version; |
| 643 | const unsigned int dma_chan_attr; | ||
| 639 | void (*setup)(struct ccp_device *); | 644 | void (*setup)(struct ccp_device *); |
| 640 | const struct ccp_actions *perform; | 645 | const struct ccp_actions *perform; |
| 641 | const unsigned int bar; | 646 | const unsigned int bar; |
diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c index 8d0eeb46d4a2..e00be01fbf5a 100644 --- a/drivers/crypto/ccp/ccp-dmaengine.c +++ b/drivers/crypto/ccp/ccp-dmaengine.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/module.h> | ||
| 13 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 14 | #include <linux/dmaengine.h> | 15 | #include <linux/dmaengine.h> |
| 15 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
| @@ -25,6 +26,37 @@ | |||
| 25 | (mask == 0) ? 64 : fls64(mask); \ | 26 | (mask == 0) ? 64 : fls64(mask); \ |
| 26 | }) | 27 | }) |
| 27 | 28 | ||
| 29 | /* The CCP as a DMA provider can be configured for public or private | ||
| 30 | * channels. Default is specified in the vdata for the device (PCI ID). | ||
| 31 | * This module parameter will override for all channels on all devices: | ||
| 32 | * dma_chan_attr = 0x2 to force all channels public | ||
| 33 | * = 0x1 to force all channels private | ||
| 34 | * = 0x0 to defer to the vdata setting | ||
| 35 | * = any other value: warning, revert to 0x0 | ||
| 36 | */ | ||
| 37 | static unsigned int dma_chan_attr = CCP_DMA_DFLT; | ||
| 38 | module_param(dma_chan_attr, uint, 0444); | ||
| 39 | MODULE_PARM_DESC(dma_chan_attr, "Set DMA channel visibility: 0 (default) = device defaults, 1 = make private, 2 = make public"); | ||
| 40 | |||
| 41 | unsigned int ccp_get_dma_chan_attr(struct ccp_device *ccp) | ||
| 42 | { | ||
| 43 | switch (dma_chan_attr) { | ||
| 44 | case CCP_DMA_DFLT: | ||
| 45 | return ccp->vdata->dma_chan_attr; | ||
| 46 | |||
| 47 | case CCP_DMA_PRIV: | ||
| 48 | return DMA_PRIVATE; | ||
| 49 | |||
| 50 | case CCP_DMA_PUB: | ||
| 51 | return 0; | ||
| 52 | |||
| 53 | default: | ||
| 54 | dev_info_once(ccp->dev, "Invalid value for dma_chan_attr: %d\n", | ||
| 55 | dma_chan_attr); | ||
| 56 | return ccp->vdata->dma_chan_attr; | ||
| 57 | } | ||
| 58 | } | ||
| 59 | |||
| 28 | static void ccp_free_cmd_resources(struct ccp_device *ccp, | 60 | static void ccp_free_cmd_resources(struct ccp_device *ccp, |
| 29 | struct list_head *list) | 61 | struct list_head *list) |
| 30 | { | 62 | { |
| @@ -675,6 +707,15 @@ int ccp_dmaengine_register(struct ccp_device *ccp) | |||
| 675 | dma_cap_set(DMA_SG, dma_dev->cap_mask); | 707 | dma_cap_set(DMA_SG, dma_dev->cap_mask); |
| 676 | dma_cap_set(DMA_INTERRUPT, dma_dev->cap_mask); | 708 | dma_cap_set(DMA_INTERRUPT, dma_dev->cap_mask); |
| 677 | 709 | ||
| 710 | /* The DMA channels for this device can be set to public or private, | ||
| 711 | * and overridden by the module parameter dma_chan_attr. | ||
| 712 | * Default: according to the value in vdata (dma_chan_attr=0) | ||
| 713 | * dma_chan_attr=0x1: all channels private (override vdata) | ||
| 714 | * dma_chan_attr=0x2: all channels public (override vdata) | ||
| 715 | */ | ||
| 716 | if (ccp_get_dma_chan_attr(ccp) == DMA_PRIVATE) | ||
| 717 | dma_cap_set(DMA_PRIVATE, dma_dev->cap_mask); | ||
| 718 | |||
| 678 | INIT_LIST_HEAD(&dma_dev->channels); | 719 | INIT_LIST_HEAD(&dma_dev->channels); |
| 679 | for (i = 0; i < ccp->cmd_q_count; i++) { | 720 | for (i = 0; i < ccp->cmd_q_count; i++) { |
| 680 | chan = ccp->ccp_dma_chan + i; | 721 | chan = ccp->ccp_dma_chan + i; |
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index e18dc596cf24..6204cc32d09c 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c | |||
| @@ -251,8 +251,11 @@ static void bcm2835_dma_create_cb_set_length( | |||
| 251 | */ | 251 | */ |
| 252 | 252 | ||
| 253 | /* have we filled in period_length yet? */ | 253 | /* have we filled in period_length yet? */ |
| 254 | if (*total_len + control_block->length < period_len) | 254 | if (*total_len + control_block->length < period_len) { |
| 255 | /* update number of bytes in this period so far */ | ||
| 256 | *total_len += control_block->length; | ||
| 255 | return; | 257 | return; |
| 258 | } | ||
| 256 | 259 | ||
| 257 | /* calculate the length that remains to reach period_length */ | 260 | /* calculate the length that remains to reach period_length */ |
| 258 | control_block->length = period_len - *total_len; | 261 | control_block->length = period_len - *total_len; |
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 24e0221fd66d..d9118ec23025 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
| @@ -1108,12 +1108,14 @@ static struct dmaengine_unmap_pool *__get_unmap_pool(int nr) | |||
| 1108 | switch (order) { | 1108 | switch (order) { |
| 1109 | case 0 ... 1: | 1109 | case 0 ... 1: |
| 1110 | return &unmap_pool[0]; | 1110 | return &unmap_pool[0]; |
| 1111 | #if IS_ENABLED(CONFIG_DMA_ENGINE_RAID) | ||
| 1111 | case 2 ... 4: | 1112 | case 2 ... 4: |
| 1112 | return &unmap_pool[1]; | 1113 | return &unmap_pool[1]; |
| 1113 | case 5 ... 7: | 1114 | case 5 ... 7: |
| 1114 | return &unmap_pool[2]; | 1115 | return &unmap_pool[2]; |
| 1115 | case 8: | 1116 | case 8: |
| 1116 | return &unmap_pool[3]; | 1117 | return &unmap_pool[3]; |
| 1118 | #endif | ||
| 1117 | default: | 1119 | default: |
| 1118 | BUG(); | 1120 | BUG(); |
| 1119 | return NULL; | 1121 | return NULL; |
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 82d85cce81f8..4773f2867234 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig | |||
| @@ -43,6 +43,7 @@ config EDAC_LEGACY_SYSFS | |||
| 43 | 43 | ||
| 44 | config EDAC_DEBUG | 44 | config EDAC_DEBUG |
| 45 | bool "Debugging" | 45 | bool "Debugging" |
| 46 | select DEBUG_FS | ||
| 46 | help | 47 | help |
| 47 | This turns on debugging information for the entire EDAC subsystem. | 48 | This turns on debugging information for the entire EDAC subsystem. |
| 48 | You do so by inserting edac_module with "edac_debug_level=x." Valid | 49 | You do so by inserting edac_module with "edac_debug_level=x." Valid |
| @@ -259,6 +260,15 @@ config EDAC_SKX | |||
| 259 | Support for error detection and correction the Intel | 260 | Support for error detection and correction the Intel |
| 260 | Skylake server Integrated Memory Controllers. | 261 | Skylake server Integrated Memory Controllers. |
| 261 | 262 | ||
| 263 | config EDAC_PND2 | ||
| 264 | tristate "Intel Pondicherry2" | ||
| 265 | depends on EDAC_MM_EDAC && PCI && X86_64 && X86_MCE_INTEL | ||
| 266 | help | ||
| 267 | Support for error detection and correction on the Intel | ||
| 268 | Pondicherry2 Integrated Memory Controller. This SoC IP is | ||
| 269 | first used on the Apollo Lake platform and Denverton | ||
| 270 | micro-server but may appear on others in the future. | ||
| 271 | |||
| 262 | config EDAC_MPC85XX | 272 | config EDAC_MPC85XX |
| 263 | tristate "Freescale MPC83xx / MPC85xx" | 273 | tristate "Freescale MPC83xx / MPC85xx" |
| 264 | depends on EDAC_MM_EDAC && FSL_SOC | 274 | depends on EDAC_MM_EDAC && FSL_SOC |
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile index 88e472e8b9a9..587107e90996 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile | |||
| @@ -32,6 +32,7 @@ obj-$(CONFIG_EDAC_I7300) += i7300_edac.o | |||
| 32 | obj-$(CONFIG_EDAC_I7CORE) += i7core_edac.o | 32 | obj-$(CONFIG_EDAC_I7CORE) += i7core_edac.o |
| 33 | obj-$(CONFIG_EDAC_SBRIDGE) += sb_edac.o | 33 | obj-$(CONFIG_EDAC_SBRIDGE) += sb_edac.o |
| 34 | obj-$(CONFIG_EDAC_SKX) += skx_edac.o | 34 | obj-$(CONFIG_EDAC_SKX) += skx_edac.o |
| 35 | obj-$(CONFIG_EDAC_PND2) += pnd2_edac.o | ||
| 35 | obj-$(CONFIG_EDAC_E7XXX) += e7xxx_edac.o | 36 | obj-$(CONFIG_EDAC_E7XXX) += e7xxx_edac.o |
| 36 | obj-$(CONFIG_EDAC_E752X) += e752x_edac.o | 37 | obj-$(CONFIG_EDAC_E752X) += e752x_edac.o |
| 37 | obj-$(CONFIG_EDAC_I82443BXGX) += i82443bxgx_edac.o | 38 | obj-$(CONFIG_EDAC_I82443BXGX) += i82443bxgx_edac.o |
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c index 1670d27bcac8..f683919981b0 100644 --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c | |||
| @@ -1293,7 +1293,7 @@ static int i5000_init_csrows(struct mem_ctl_info *mci) | |||
| 1293 | dimm->mtype = MEM_FB_DDR2; | 1293 | dimm->mtype = MEM_FB_DDR2; |
| 1294 | 1294 | ||
| 1295 | /* ask what device type on this row */ | 1295 | /* ask what device type on this row */ |
| 1296 | if (MTR_DRAM_WIDTH(mtr)) | 1296 | if (MTR_DRAM_WIDTH(mtr) == 8) |
| 1297 | dimm->dtype = DEV_X8; | 1297 | dimm->dtype = DEV_X8; |
| 1298 | else | 1298 | else |
| 1299 | dimm->dtype = DEV_X4; | 1299 | dimm->dtype = DEV_X4; |
diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c index abf6ef22e220..37a9ba71da44 100644 --- a/drivers/edac/i5400_edac.c +++ b/drivers/edac/i5400_edac.c | |||
| @@ -1207,13 +1207,14 @@ static int i5400_init_dimms(struct mem_ctl_info *mci) | |||
| 1207 | 1207 | ||
| 1208 | dimm->nr_pages = size_mb << 8; | 1208 | dimm->nr_pages = size_mb << 8; |
| 1209 | dimm->grain = 8; | 1209 | dimm->grain = 8; |
| 1210 | dimm->dtype = MTR_DRAM_WIDTH(mtr) ? DEV_X8 : DEV_X4; | 1210 | dimm->dtype = MTR_DRAM_WIDTH(mtr) == 8 ? |
| 1211 | DEV_X8 : DEV_X4; | ||
| 1211 | dimm->mtype = MEM_FB_DDR2; | 1212 | dimm->mtype = MEM_FB_DDR2; |
| 1212 | /* | 1213 | /* |
| 1213 | * The eccc mechanism is SDDC (aka SECC), with | 1214 | * The eccc mechanism is SDDC (aka SECC), with |
| 1214 | * is similar to Chipkill. | 1215 | * is similar to Chipkill. |
| 1215 | */ | 1216 | */ |
| 1216 | dimm->edac_mode = MTR_DRAM_WIDTH(mtr) ? | 1217 | dimm->edac_mode = MTR_DRAM_WIDTH(mtr) == 8 ? |
| 1217 | EDAC_S8ECD8ED : EDAC_S4ECD4ED; | 1218 | EDAC_S8ECD8ED : EDAC_S4ECD4ED; |
| 1218 | ndimms++; | 1219 | ndimms++; |
| 1219 | } | 1220 | } |
diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c new file mode 100644 index 000000000000..928e0dba41fc --- /dev/null +++ b/drivers/edac/pnd2_edac.c | |||
| @@ -0,0 +1,1546 @@ | |||
| 1 | /* | ||
| 2 | * Driver for Pondicherry2 memory controller. | ||
| 3 | * | ||
| 4 | * Copyright (c) 2016, Intel Corporation. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify it | ||
| 7 | * under the terms and conditions of the GNU General Public License, | ||
| 8 | * version 2, as published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 13 | * more details. | ||
| 14 | * | ||
| 15 | * [Derived from sb_edac.c] | ||
| 16 | * | ||
| 17 | * Translation of system physical addresses to DIMM addresses | ||
| 18 | * is a two stage process: | ||
| 19 | * | ||
| 20 | * First the Pondicherry 2 memory controller handles slice and channel interleaving | ||
| 21 | * in "sys2pmi()". This is (almost) completley common between platforms. | ||
| 22 | * | ||
| 23 | * Then a platform specific dunit (DIMM unit) completes the process to provide DIMM, | ||
| 24 | * rank, bank, row and column using the appropriate "dunit_ops" functions/parameters. | ||
| 25 | */ | ||
| 26 | |||
| 27 | #include <linux/module.h> | ||
| 28 | #include <linux/init.h> | ||
| 29 | #include <linux/pci.h> | ||
| 30 | #include <linux/pci_ids.h> | ||
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/delay.h> | ||
| 33 | #include <linux/edac.h> | ||
| 34 | #include <linux/mmzone.h> | ||
| 35 | #include <linux/smp.h> | ||
| 36 | #include <linux/bitmap.h> | ||
| 37 | #include <linux/math64.h> | ||
| 38 | #include <linux/mod_devicetable.h> | ||
| 39 | #include <asm/cpu_device_id.h> | ||
| 40 | #include <asm/intel-family.h> | ||
| 41 | #include <asm/processor.h> | ||
| 42 | #include <asm/mce.h> | ||
| 43 | |||
| 44 | #include "edac_mc.h" | ||
| 45 | #include "edac_module.h" | ||
| 46 | #include "pnd2_edac.h" | ||
| 47 | |||
| 48 | #define APL_NUM_CHANNELS 4 | ||
| 49 | #define DNV_NUM_CHANNELS 2 | ||
| 50 | #define DNV_MAX_DIMMS 2 /* Max DIMMs per channel */ | ||
| 51 | |||
| 52 | enum type { | ||
| 53 | APL, | ||
| 54 | DNV, /* All requests go to PMI CH0 on each slice (CH1 disabled) */ | ||
| 55 | }; | ||
| 56 | |||
| 57 | struct dram_addr { | ||
| 58 | int chan; | ||
| 59 | int dimm; | ||
| 60 | int rank; | ||
| 61 | int bank; | ||
| 62 | int row; | ||
| 63 | int col; | ||
| 64 | }; | ||
| 65 | |||
| 66 | struct pnd2_pvt { | ||
| 67 | int dimm_geom[APL_NUM_CHANNELS]; | ||
| 68 | u64 tolm, tohm; | ||
| 69 | }; | ||
| 70 | |||
| 71 | /* | ||
| 72 | * System address space is divided into multiple regions with | ||
| 73 | * different interleave rules in each. The as0/as1 regions | ||
| 74 | * have no interleaving at all. The as2 region is interleaved | ||
| 75 | * between two channels. The mot region is magic and may overlap | ||
| 76 | * other regions, with its interleave rules taking precedence. | ||
| 77 | * Addresses not in any of these regions are interleaved across | ||
| 78 | * all four channels. | ||
| 79 | */ | ||
| 80 | static struct region { | ||
| 81 | u64 base; | ||
| 82 | u64 limit; | ||
| 83 | u8 enabled; | ||
| 84 | } mot, as0, as1, as2; | ||
| 85 | |||
| 86 | static struct dunit_ops { | ||
| 87 | char *name; | ||
| 88 | enum type type; | ||
| 89 | int pmiaddr_shift; | ||
| 90 | int pmiidx_shift; | ||
| 91 | int channels; | ||
| 92 | int dimms_per_channel; | ||
| 93 | int (*rd_reg)(int port, int off, int op, void *data, size_t sz, char *name); | ||
| 94 | int (*get_registers)(void); | ||
| 95 | int (*check_ecc)(void); | ||
| 96 | void (*mk_region)(char *name, struct region *rp, void *asym); | ||
| 97 | void (*get_dimm_config)(struct mem_ctl_info *mci); | ||
| 98 | int (*pmi2mem)(struct mem_ctl_info *mci, u64 pmiaddr, u32 pmiidx, | ||
| 99 | struct dram_addr *daddr, char *msg); | ||
| 100 | } *ops; | ||
| 101 | |||
| 102 | static struct mem_ctl_info *pnd2_mci; | ||
| 103 | |||
| 104 | #define PND2_MSG_SIZE 256 | ||
| 105 | |||
| 106 | /* Debug macros */ | ||
| 107 | #define pnd2_printk(level, fmt, arg...) \ | ||
| 108 | edac_printk(level, "pnd2", fmt, ##arg) | ||
| 109 | |||
| 110 | #define pnd2_mc_printk(mci, level, fmt, arg...) \ | ||
| 111 | edac_mc_chipset_printk(mci, level, "pnd2", fmt, ##arg) | ||
| 112 | |||
| 113 | #define MOT_CHAN_INTLV_BIT_1SLC_2CH 12 | ||
| 114 | #define MOT_CHAN_INTLV_BIT_2SLC_2CH 13 | ||
| 115 | #define SELECTOR_DISABLED (-1) | ||
| 116 | #define _4GB (1ul << 32) | ||
| 117 | |||
| 118 | #define PMI_ADDRESS_WIDTH 31 | ||
| 119 | #define PND_MAX_PHYS_BIT 39 | ||
| 120 | |||
| 121 | #define APL_ASYMSHIFT 28 | ||
| 122 | #define DNV_ASYMSHIFT 31 | ||
| 123 | #define CH_HASH_MASK_LSB 6 | ||
| 124 | #define SLICE_HASH_MASK_LSB 6 | ||
| 125 | #define MOT_SLC_INTLV_BIT 12 | ||
| 126 | #define LOG2_PMI_ADDR_GRANULARITY 5 | ||
| 127 | #define MOT_SHIFT 24 | ||
| 128 | |||
| 129 | #define GET_BITFIELD(v, lo, hi) (((v) & GENMASK_ULL(hi, lo)) >> (lo)) | ||
| 130 | #define U64_LSHIFT(val, s) ((u64)(val) << (s)) | ||
| 131 | |||
| 132 | #ifdef CONFIG_X86_INTEL_SBI_APL | ||
| 133 | #include "linux/platform_data/sbi_apl.h" | ||
| 134 | int sbi_send(int port, int off, int op, u32 *data) | ||
| 135 | { | ||
| 136 | struct sbi_apl_message sbi_arg; | ||
| 137 | int ret, read = 0; | ||
| 138 | |||
| 139 | memset(&sbi_arg, 0, sizeof(sbi_arg)); | ||
| 140 | |||
| 141 | if (op == 0 || op == 4 || op == 6) | ||
| 142 | read = 1; | ||
| 143 | else | ||
| 144 | sbi_arg.data = *data; | ||
| 145 | |||
| 146 | sbi_arg.opcode = op; | ||
| 147 | sbi_arg.port_address = port; | ||
| 148 | sbi_arg.register_offset = off; | ||
| 149 | ret = sbi_apl_commit(&sbi_arg); | ||
| 150 | if (ret || sbi_arg.status) | ||
| 151 | edac_dbg(2, "sbi_send status=%d ret=%d data=%x\n", | ||
| 152 | sbi_arg.status, ret, sbi_arg.data); | ||
| 153 | |||
| 154 | if (ret == 0) | ||
| 155 | ret = sbi_arg.status; | ||
| 156 | |||
| 157 | if (ret == 0 && read) | ||
| 158 | *data = sbi_arg.data; | ||
| 159 | |||
| 160 | return ret; | ||
| 161 | } | ||
| 162 | #else | ||
| 163 | int sbi_send(int port, int off, int op, u32 *data) | ||
| 164 | { | ||
| 165 | return -EUNATCH; | ||
| 166 | } | ||
| 167 | #endif | ||
| 168 | |||
| 169 | static int apl_rd_reg(int port, int off, int op, void *data, size_t sz, char *name) | ||
| 170 | { | ||
| 171 | int ret = 0; | ||
| 172 | |||
| 173 | edac_dbg(2, "Read %s port=%x off=%x op=%x\n", name, port, off, op); | ||
| 174 | switch (sz) { | ||
| 175 | case 8: | ||
| 176 | ret = sbi_send(port, off + 4, op, (u32 *)(data + 4)); | ||
| 177 | case 4: | ||
| 178 | ret = sbi_send(port, off, op, (u32 *)data); | ||
| 179 | pnd2_printk(KERN_DEBUG, "%s=%x%08x ret=%d\n", name, | ||
| 180 | sz == 8 ? *((u32 *)(data + 4)) : 0, *((u32 *)data), ret); | ||
| 181 | break; | ||
| 182 | } | ||
| 183 | |||
| 184 | return ret; | ||
| 185 | } | ||
| 186 | |||
| 187 | static u64 get_mem_ctrl_hub_base_addr(void) | ||
| 188 | { | ||
| 189 | struct b_cr_mchbar_lo_pci lo; | ||
| 190 | struct b_cr_mchbar_hi_pci hi; | ||
| 191 | struct pci_dev *pdev; | ||
| 192 | |||
| 193 | pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x1980, NULL); | ||
| 194 | if (pdev) { | ||
| 195 | pci_read_config_dword(pdev, 0x48, (u32 *)&lo); | ||
| 196 | pci_read_config_dword(pdev, 0x4c, (u32 *)&hi); | ||
| 197 | pci_dev_put(pdev); | ||
| 198 | } else { | ||
| 199 | return 0; | ||
| 200 | } | ||
| 201 | |||
| 202 | if (!lo.enable) { | ||
| 203 | edac_dbg(2, "MMIO via memory controller hub base address is disabled!\n"); | ||
| 204 | return 0; | ||
| 205 | } | ||
| 206 | |||
| 207 | return U64_LSHIFT(hi.base, 32) | U64_LSHIFT(lo.base, 15); | ||
| 208 | } | ||
| 209 | |||
| 210 | static u64 get_sideband_reg_base_addr(void) | ||
| 211 | { | ||
| 212 | struct pci_dev *pdev; | ||
| 213 | u32 hi, lo; | ||
| 214 | |||
| 215 | pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x19dd, NULL); | ||
| 216 | if (pdev) { | ||
| 217 | pci_read_config_dword(pdev, 0x10, &lo); | ||
| 218 | pci_read_config_dword(pdev, 0x14, &hi); | ||
| 219 | pci_dev_put(pdev); | ||
| 220 | return (U64_LSHIFT(hi, 32) | U64_LSHIFT(lo, 0)); | ||
| 221 | } else { | ||
| 222 | return 0xfd000000; | ||
| 223 | } | ||
| 224 | } | ||
| 225 | |||
| 226 | static int dnv_rd_reg(int port, int off, int op, void *data, size_t sz, char *name) | ||
| 227 | { | ||
| 228 | struct pci_dev *pdev; | ||
| 229 | char *base; | ||
| 230 | u64 addr; | ||
| 231 | |||
| 232 | if (op == 4) { | ||
| 233 | pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x1980, NULL); | ||
| 234 | if (!pdev) | ||
| 235 | return -ENODEV; | ||
| 236 | |||
| 237 | pci_read_config_dword(pdev, off, data); | ||
| 238 | pci_dev_put(pdev); | ||
| 239 | } else { | ||
| 240 | /* MMIO via memory controller hub base address */ | ||
| 241 | if (op == 0 && port == 0x4c) { | ||
| 242 | addr = get_mem_ctrl_hub_base_addr(); | ||
| 243 | if (!addr) | ||
| 244 | return -ENODEV; | ||
| 245 | } else { | ||
| 246 | /* MMIO via sideband register base address */ | ||
| 247 | addr = get_sideband_reg_base_addr(); | ||
| 248 | if (!addr) | ||
| 249 | return -ENODEV; | ||
| 250 | addr += (port << 16); | ||
| 251 | } | ||
| 252 | |||
| 253 | base = ioremap((resource_size_t)addr, 0x10000); | ||
| 254 | if (!base) | ||
| 255 | return -ENODEV; | ||
| 256 | |||
| 257 | if (sz == 8) | ||
| 258 | *(u32 *)(data + 4) = *(u32 *)(base + off + 4); | ||
| 259 | *(u32 *)data = *(u32 *)(base + off); | ||
| 260 | |||
| 261 | iounmap(base); | ||
| 262 | } | ||
| 263 | |||
| 264 | edac_dbg(2, "Read %s=%.8x_%.8x\n", name, | ||
| 265 | (sz == 8) ? *(u32 *)(data + 4) : 0, *(u32 *)data); | ||
| 266 | |||
| 267 | return 0; | ||
| 268 | } | ||
| 269 | |||
| 270 | #define RD_REGP(regp, regname, port) \ | ||
| 271 | ops->rd_reg(port, \ | ||
| 272 | regname##_offset, \ | ||
| 273 | regname##_r_opcode, \ | ||
| 274 | regp, sizeof(struct regname), \ | ||
| 275 | #regname) | ||
| 276 | |||
| 277 | #define RD_REG(regp, regname) \ | ||
| 278 | ops->rd_reg(regname ## _port, \ | ||
| 279 | regname##_offset, \ | ||
| 280 | regname##_r_opcode, \ | ||
| 281 | regp, sizeof(struct regname), \ | ||
| 282 | #regname) | ||
| 283 | |||
| 284 | static u64 top_lm, top_hm; | ||
| 285 | static bool two_slices; | ||
| 286 | static bool two_channels; /* Both PMI channels in one slice enabled */ | ||
| 287 | |||
| 288 | static u8 sym_chan_mask; | ||
| 289 | static u8 asym_chan_mask; | ||
| 290 | static u8 chan_mask; | ||
| 291 | |||
| 292 | static int slice_selector = -1; | ||
| 293 | static int chan_selector = -1; | ||
| 294 | static u64 slice_hash_mask; | ||
| 295 | static u64 chan_hash_mask; | ||
| 296 | |||
| 297 | static void mk_region(char *name, struct region *rp, u64 base, u64 limit) | ||
| 298 | { | ||
| 299 | rp->enabled = 1; | ||
| 300 | rp->base = base; | ||
| 301 | rp->limit = limit; | ||
| 302 | edac_dbg(2, "Region:%s [%llx, %llx]\n", name, base, limit); | ||
| 303 | } | ||
| 304 | |||
| 305 | static void mk_region_mask(char *name, struct region *rp, u64 base, u64 mask) | ||
| 306 | { | ||
| 307 | if (mask == 0) { | ||
| 308 | pr_info(FW_BUG "MOT mask cannot be zero\n"); | ||
| 309 | return; | ||
| 310 | } | ||
| 311 | if (mask != GENMASK_ULL(PND_MAX_PHYS_BIT, __ffs(mask))) { | ||
| 312 | pr_info(FW_BUG "MOT mask not power of two\n"); | ||
| 313 | return; | ||
| 314 | } | ||
| 315 | if (base & ~mask) { | ||
| 316 | pr_info(FW_BUG "MOT region base/mask alignment error\n"); | ||
| 317 | return; | ||
| 318 | } | ||
| 319 | rp->base = base; | ||
| 320 | rp->limit = (base | ~mask) & GENMASK_ULL(PND_MAX_PHYS_BIT, 0); | ||
| 321 | rp->enabled = 1; | ||
| 322 | edac_dbg(2, "Region:%s [%llx, %llx]\n", name, base, rp->limit); | ||
| 323 | } | ||
| 324 | |||
| 325 | static bool in_region(struct region *rp, u64 addr) | ||
| 326 | { | ||
| 327 | if (!rp->enabled) | ||
| 328 | return false; | ||
| 329 | |||
| 330 | return rp->base <= addr && addr <= rp->limit; | ||
| 331 | } | ||
| 332 | |||
| 333 | static int gen_sym_mask(struct b_cr_slice_channel_hash *p) | ||
| 334 | { | ||
| 335 | int mask = 0; | ||
| 336 | |||
| 337 | if (!p->slice_0_mem_disabled) | ||
| 338 | mask |= p->sym_slice0_channel_enabled; | ||
| 339 | |||
| 340 | if (!p->slice_1_disabled) | ||
| 341 | mask |= p->sym_slice1_channel_enabled << 2; | ||
| 342 | |||
| 343 | if (p->ch_1_disabled || p->enable_pmi_dual_data_mode) | ||
| 344 | mask &= 0x5; | ||
| 345 | |||
| 346 | return mask; | ||
| 347 | } | ||
| 348 | |||
| 349 | static int gen_asym_mask(struct b_cr_slice_channel_hash *p, | ||
| 350 | struct b_cr_asym_mem_region0_mchbar *as0, | ||
| 351 | struct b_cr_asym_mem_region1_mchbar *as1, | ||
| 352 | struct b_cr_asym_2way_mem_region_mchbar *as2way) | ||
| 353 | { | ||
| 354 | const int intlv[] = { 0x5, 0xA, 0x3, 0xC }; | ||
| 355 | int mask = 0; | ||
| 356 | |||
| 357 | if (as2way->asym_2way_interleave_enable) | ||
| 358 | mask = intlv[as2way->asym_2way_intlv_mode]; | ||
| 359 | if (as0->slice0_asym_enable) | ||
| 360 | mask |= (1 << as0->slice0_asym_channel_select); | ||
| 361 | if (as1->slice1_asym_enable) | ||
| 362 | mask |= (4 << as1->slice1_asym_channel_select); | ||
| 363 | if (p->slice_0_mem_disabled) | ||
| 364 | mask &= 0xc; | ||
| 365 | if (p->slice_1_disabled) | ||
| 366 | mask &= 0x3; | ||
| 367 | if (p->ch_1_disabled || p->enable_pmi_dual_data_mode) | ||
| 368 | mask &= 0x5; | ||
| 369 | |||
| 370 | return mask; | ||
| 371 | } | ||
| 372 | |||
| 373 | static struct b_cr_tolud_pci tolud; | ||
| 374 | static struct b_cr_touud_lo_pci touud_lo; | ||
| 375 | static struct b_cr_touud_hi_pci touud_hi; | ||
| 376 | static struct b_cr_asym_mem_region0_mchbar asym0; | ||
| 377 | static struct b_cr_asym_mem_region1_mchbar asym1; | ||
| 378 | static struct b_cr_asym_2way_mem_region_mchbar asym_2way; | ||
| 379 | static struct b_cr_mot_out_base_mchbar mot_base; | ||
| 380 | static struct b_cr_mot_out_mask_mchbar mot_mask; | ||
| 381 | static struct b_cr_slice_channel_hash chash; | ||
| 382 | |||
| 383 | /* Apollo Lake dunit */ | ||
| 384 | /* | ||
| 385 | * Validated on board with just two DIMMs in the [0] and [2] positions | ||
| 386 | * in this array. Other port number matches documentation, but caution | ||
| 387 | * advised. | ||
| 388 | */ | ||
| 389 | static const int apl_dports[APL_NUM_CHANNELS] = { 0x18, 0x10, 0x11, 0x19 }; | ||
| 390 | static struct d_cr_drp0 drp0[APL_NUM_CHANNELS]; | ||
| 391 | |||
| 392 | /* Denverton dunit */ | ||
| 393 | static const int dnv_dports[DNV_NUM_CHANNELS] = { 0x10, 0x12 }; | ||
| 394 | static struct d_cr_dsch dsch; | ||
| 395 | static struct d_cr_ecc_ctrl ecc_ctrl[DNV_NUM_CHANNELS]; | ||
| 396 | static struct d_cr_drp drp[DNV_NUM_CHANNELS]; | ||
| 397 | static struct d_cr_dmap dmap[DNV_NUM_CHANNELS]; | ||
| 398 | static struct d_cr_dmap1 dmap1[DNV_NUM_CHANNELS]; | ||
| 399 | static struct d_cr_dmap2 dmap2[DNV_NUM_CHANNELS]; | ||
| 400 | static struct d_cr_dmap3 dmap3[DNV_NUM_CHANNELS]; | ||
| 401 | static struct d_cr_dmap4 dmap4[DNV_NUM_CHANNELS]; | ||
| 402 | static struct d_cr_dmap5 dmap5[DNV_NUM_CHANNELS]; | ||
| 403 | |||
| 404 | static void apl_mk_region(char *name, struct region *rp, void *asym) | ||
| 405 | { | ||
| 406 | struct b_cr_asym_mem_region0_mchbar *a = asym; | ||
| 407 | |||
| 408 | mk_region(name, rp, | ||
| 409 | U64_LSHIFT(a->slice0_asym_base, APL_ASYMSHIFT), | ||
| 410 | U64_LSHIFT(a->slice0_asym_limit, APL_ASYMSHIFT) + | ||
| 411 | GENMASK_ULL(APL_ASYMSHIFT - 1, 0)); | ||
| 412 | } | ||
| 413 | |||
| 414 | static void dnv_mk_region(char *name, struct region *rp, void *asym) | ||
| 415 | { | ||
| 416 | struct b_cr_asym_mem_region_denverton *a = asym; | ||
| 417 | |||
| 418 | mk_region(name, rp, | ||
| 419 | U64_LSHIFT(a->slice_asym_base, DNV_ASYMSHIFT), | ||
| 420 | U64_LSHIFT(a->slice_asym_limit, DNV_ASYMSHIFT) + | ||
| 421 | GENMASK_ULL(DNV_ASYMSHIFT - 1, 0)); | ||
| 422 | } | ||
| 423 | |||
| 424 | static int apl_get_registers(void) | ||
| 425 | { | ||
| 426 | int i; | ||
| 427 | |||
| 428 | if (RD_REG(&asym_2way, b_cr_asym_2way_mem_region_mchbar)) | ||
| 429 | return -ENODEV; | ||
| 430 | |||
| 431 | for (i = 0; i < APL_NUM_CHANNELS; i++) | ||
| 432 | if (RD_REGP(&drp0[i], d_cr_drp0, apl_dports[i])) | ||
| 433 | return -ENODEV; | ||
| 434 | |||
| 435 | return 0; | ||
| 436 | } | ||
| 437 | |||
| 438 | static int dnv_get_registers(void) | ||
| 439 | { | ||
| 440 | int i; | ||
| 441 | |||
| 442 | if (RD_REG(&dsch, d_cr_dsch)) | ||
| 443 | return -ENODEV; | ||
| 444 | |||
| 445 | for (i = 0; i < DNV_NUM_CHANNELS; i++) | ||
| 446 | if (RD_REGP(&ecc_ctrl[i], d_cr_ecc_ctrl, dnv_dports[i]) || | ||
| 447 | RD_REGP(&drp[i], d_cr_drp, dnv_dports[i]) || | ||
| 448 | RD_REGP(&dmap[i], d_cr_dmap, dnv_dports[i]) || | ||
| 449 | RD_REGP(&dmap1[i], d_cr_dmap1, dnv_dports[i]) || | ||
| 450 | RD_REGP(&dmap2[i], d_cr_dmap2, dnv_dports[i]) || | ||
| 451 | RD_REGP(&dmap3[i], d_cr_dmap3, dnv_dports[i]) || | ||
| 452 | RD_REGP(&dmap4[i], d_cr_dmap4, dnv_dports[i]) || | ||
| 453 | RD_REGP(&dmap5[i], d_cr_dmap5, dnv_dports[i])) | ||
| 454 | return -ENODEV; | ||
| 455 | |||
| 456 | return 0; | ||
| 457 | } | ||
| 458 | |||
| 459 | /* | ||
| 460 | * Read all the h/w config registers once here (they don't | ||
| 461 | * change at run time. Figure out which address ranges have | ||
| 462 | * which interleave characteristics. | ||
| 463 | */ | ||
| 464 | static int get_registers(void) | ||
| 465 | { | ||
| 466 | const int intlv[] = { 10, 11, 12, 12 }; | ||
| 467 | |||
| 468 | if (RD_REG(&tolud, b_cr_tolud_pci) || | ||
| 469 | RD_REG(&touud_lo, b_cr_touud_lo_pci) || | ||
| 470 | RD_REG(&touud_hi, b_cr_touud_hi_pci) || | ||
| 471 | RD_REG(&asym0, b_cr_asym_mem_region0_mchbar) || | ||
| 472 | RD_REG(&asym1, b_cr_asym_mem_region1_mchbar) || | ||
| 473 | RD_REG(&mot_base, b_cr_mot_out_base_mchbar) || | ||
| 474 | RD_REG(&mot_mask, b_cr_mot_out_mask_mchbar) || | ||
| 475 | RD_REG(&chash, b_cr_slice_channel_hash)) | ||
| 476 | return -ENODEV; | ||
| 477 | |||
| 478 | if (ops->get_registers()) | ||
| 479 | return -ENODEV; | ||
| 480 | |||
| 481 | if (ops->type == DNV) { | ||
| 482 | /* PMI channel idx (always 0) for asymmetric region */ | ||
| 483 | asym0.slice0_asym_channel_select = 0; | ||
| 484 | asym1.slice1_asym_channel_select = 0; | ||
| 485 | /* PMI channel bitmap (always 1) for symmetric region */ | ||
| 486 | chash.sym_slice0_channel_enabled = 0x1; | ||
| 487 | chash.sym_slice1_channel_enabled = 0x1; | ||
| 488 | } | ||
| 489 | |||
| 490 | if (asym0.slice0_asym_enable) | ||
| 491 | ops->mk_region("as0", &as0, &asym0); | ||
| 492 | |||
| 493 | if (asym1.slice1_asym_enable) | ||
| 494 | ops->mk_region("as1", &as1, &asym1); | ||
| 495 | |||
| 496 | if (asym_2way.asym_2way_interleave_enable) { | ||
| 497 | mk_region("as2way", &as2, | ||
| 498 | U64_LSHIFT(asym_2way.asym_2way_base, APL_ASYMSHIFT), | ||
| 499 | U64_LSHIFT(asym_2way.asym_2way_limit, APL_ASYMSHIFT) + | ||
| 500 | GENMASK_ULL(APL_ASYMSHIFT - 1, 0)); | ||
| 501 | } | ||
| 502 | |||
| 503 | if (mot_base.imr_en) { | ||
| 504 | mk_region_mask("mot", &mot, | ||
| 505 | U64_LSHIFT(mot_base.mot_out_base, MOT_SHIFT), | ||
| 506 | U64_LSHIFT(mot_mask.mot_out_mask, MOT_SHIFT)); | ||
| 507 | } | ||
| 508 | |||
| 509 | top_lm = U64_LSHIFT(tolud.tolud, 20); | ||
| 510 | top_hm = U64_LSHIFT(touud_hi.touud, 32) | U64_LSHIFT(touud_lo.touud, 20); | ||
| 511 | |||
| 512 | two_slices = !chash.slice_1_disabled && | ||
| 513 | !chash.slice_0_mem_disabled && | ||
| 514 | (chash.sym_slice0_channel_enabled != 0) && | ||
| 515 | (chash.sym_slice1_channel_enabled != 0); | ||
| 516 | two_channels = !chash.ch_1_disabled && | ||
| 517 | !chash.enable_pmi_dual_data_mode && | ||
| 518 | ((chash.sym_slice0_channel_enabled == 3) || | ||
| 519 | (chash.sym_slice1_channel_enabled == 3)); | ||
| 520 | |||
| 521 | sym_chan_mask = gen_sym_mask(&chash); | ||
| 522 | asym_chan_mask = gen_asym_mask(&chash, &asym0, &asym1, &asym_2way); | ||
| 523 | chan_mask = sym_chan_mask | asym_chan_mask; | ||
| 524 | |||
| 525 | if (two_slices && !two_channels) { | ||
| 526 | if (chash.hvm_mode) | ||
| 527 | slice_selector = 29; | ||
| 528 | else | ||
| 529 | slice_selector = intlv[chash.interleave_mode]; | ||
| 530 | } else if (!two_slices && two_channels) { | ||
| 531 | if (chash.hvm_mode) | ||
| 532 | chan_selector = 29; | ||
| 533 | else | ||
| 534 | chan_selector = intlv[chash.interleave_mode]; | ||
| 535 | } else if (two_slices && two_channels) { | ||
| 536 | if (chash.hvm_mode) { | ||
| 537 | slice_selector = 29; | ||
| 538 | chan_selector = 30; | ||
| 539 | } else { | ||
| 540 | slice_selector = intlv[chash.interleave_mode]; | ||
| 541 | chan_selector = intlv[chash.interleave_mode] + 1; | ||
| 542 | } | ||
| 543 | } | ||
| 544 | |||
| 545 | if (two_slices) { | ||
| 546 | if (!chash.hvm_mode) | ||
| 547 | slice_hash_mask = chash.slice_hash_mask << SLICE_HASH_MASK_LSB; | ||
| 548 | if (!two_channels) | ||
| 549 | slice_hash_mask |= BIT_ULL(slice_selector); | ||
| 550 | } | ||
| 551 | |||
| 552 | if (two_channels) { | ||
| 553 | if (!chash.hvm_mode) | ||
| 554 | chan_hash_mask = chash.ch_hash_mask << CH_HASH_MASK_LSB; | ||
| 555 | if (!two_slices) | ||
| 556 | chan_hash_mask |= BIT_ULL(chan_selector); | ||
| 557 | } | ||
| 558 | |||
| 559 | return 0; | ||
| 560 | } | ||
| 561 | |||
| 562 | /* Get a contiguous memory address (remove the MMIO gap) */ | ||
| 563 | static u64 remove_mmio_gap(u64 sys) | ||
| 564 | { | ||
| 565 | return (sys < _4GB) ? sys : sys - (_4GB - top_lm); | ||
| 566 | } | ||
| 567 | |||
| 568 | /* Squeeze out one address bit, shift upper part down to fill gap */ | ||
| 569 | static void remove_addr_bit(u64 *addr, int bitidx) | ||
| 570 | { | ||
| 571 | u64 mask; | ||
| 572 | |||
| 573 | if (bitidx == -1) | ||
| 574 | return; | ||
| 575 | |||
| 576 | mask = (1ull << bitidx) - 1; | ||
| 577 | *addr = ((*addr >> 1) & ~mask) | (*addr & mask); | ||
| 578 | } | ||
| 579 | |||
| 580 | /* XOR all the bits from addr specified in mask */ | ||
| 581 | static int hash_by_mask(u64 addr, u64 mask) | ||
| 582 | { | ||
| 583 | u64 result = addr & mask; | ||
| 584 | |||
| 585 | result = (result >> 32) ^ result; | ||
| 586 | result = (result >> 16) ^ result; | ||
| 587 | result = (result >> 8) ^ result; | ||
| 588 | result = (result >> 4) ^ result; | ||
| 589 | result = (result >> 2) ^ result; | ||
| 590 | result = (result >> 1) ^ result; | ||
| 591 | |||
| 592 | return (int)result & 1; | ||
| 593 | } | ||
| 594 | |||
| 595 | /* | ||
| 596 | * First stage decode. Take the system address and figure out which | ||
| 597 | * second stage will deal with it based on interleave modes. | ||
| 598 | */ | ||
| 599 | static int sys2pmi(const u64 addr, u32 *pmiidx, u64 *pmiaddr, char *msg) | ||
| 600 | { | ||
| 601 | u64 contig_addr, contig_base, contig_offset, contig_base_adj; | ||
| 602 | int mot_intlv_bit = two_slices ? MOT_CHAN_INTLV_BIT_2SLC_2CH : | ||
| 603 | MOT_CHAN_INTLV_BIT_1SLC_2CH; | ||
| 604 | int slice_intlv_bit_rm = SELECTOR_DISABLED; | ||
| 605 | int chan_intlv_bit_rm = SELECTOR_DISABLED; | ||
| 606 | /* Determine if address is in the MOT region. */ | ||
| 607 | bool mot_hit = in_region(&mot, addr); | ||
| 608 | /* Calculate the number of symmetric regions enabled. */ | ||
| 609 | int sym_channels = hweight8(sym_chan_mask); | ||
| 610 | |||
| 611 | /* | ||
| 612 | * The amount we need to shift the asym base can be determined by the | ||
| 613 | * number of enabled symmetric channels. | ||
| 614 | * NOTE: This can only work because symmetric memory is not supposed | ||
| 615 | * to do a 3-way interleave. | ||
| 616 | */ | ||
| 617 | int sym_chan_shift = sym_channels >> 1; | ||
| 618 | |||
| 619 | /* Give up if address is out of range, or in MMIO gap */ | ||
| 620 | if (addr >= (1ul << PND_MAX_PHYS_BIT) || | ||
| 621 | (addr >= top_lm && addr < _4GB) || addr >= top_hm) { | ||
| 622 | snprintf(msg, PND2_MSG_SIZE, "Error address 0x%llx is not DRAM", addr); | ||
| 623 | return -EINVAL; | ||
| 624 | } | ||
| 625 | |||
| 626 | /* Get a contiguous memory address (remove the MMIO gap) */ | ||
| 627 | contig_addr = remove_mmio_gap(addr); | ||
| 628 | |||
| 629 | if (in_region(&as0, addr)) { | ||
| 630 | *pmiidx = asym0.slice0_asym_channel_select; | ||
| 631 | |||
| 632 | contig_base = remove_mmio_gap(as0.base); | ||
| 633 | contig_offset = contig_addr - contig_base; | ||
| 634 | contig_base_adj = (contig_base >> sym_chan_shift) * | ||
| 635 | ((chash.sym_slice0_channel_enabled >> (*pmiidx & 1)) & 1); | ||
| 636 | contig_addr = contig_offset + ((sym_channels > 0) ? contig_base_adj : 0ull); | ||
| 637 | } else if (in_region(&as1, addr)) { | ||
| 638 | *pmiidx = 2u + asym1.slice1_asym_channel_select; | ||
| 639 | |||
| 640 | contig_base = remove_mmio_gap(as1.base); | ||
| 641 | contig_offset = contig_addr - contig_base; | ||
| 642 | contig_base_adj = (contig_base >> sym_chan_shift) * | ||
| 643 | ((chash.sym_slice1_channel_enabled >> (*pmiidx & 1)) & 1); | ||
| 644 | contig_addr = contig_offset + ((sym_channels > 0) ? contig_base_adj : 0ull); | ||
| 645 | } else if (in_region(&as2, addr) && (asym_2way.asym_2way_intlv_mode == 0x3ul)) { | ||
| 646 | bool channel1; | ||
| 647 | |||
| 648 | mot_intlv_bit = MOT_CHAN_INTLV_BIT_1SLC_2CH; | ||
| 649 | *pmiidx = (asym_2way.asym_2way_intlv_mode & 1) << 1; | ||
| 650 | channel1 = mot_hit ? ((bool)((addr >> mot_intlv_bit) & 1)) : | ||
| 651 | hash_by_mask(contig_addr, chan_hash_mask); | ||
| 652 | *pmiidx |= (u32)channel1; | ||
| 653 | |||
| 654 | contig_base = remove_mmio_gap(as2.base); | ||
| 655 | chan_intlv_bit_rm = mot_hit ? mot_intlv_bit : chan_selector; | ||
| 656 | contig_offset = contig_addr - contig_base; | ||
| 657 | remove_addr_bit(&contig_offset, chan_intlv_bit_rm); | ||
| 658 | contig_addr = (contig_base >> sym_chan_shift) + contig_offset; | ||
| 659 | } else { | ||
| 660 | /* Otherwise we're in normal, boring symmetric mode. */ | ||
| 661 | *pmiidx = 0u; | ||
| 662 | |||
| 663 | if (two_slices) { | ||
| 664 | bool slice1; | ||
| 665 | |||
| 666 | if (mot_hit) { | ||
| 667 | slice_intlv_bit_rm = MOT_SLC_INTLV_BIT; | ||
| 668 | slice1 = (addr >> MOT_SLC_INTLV_BIT) & 1; | ||
| 669 | } else { | ||
| 670 | slice_intlv_bit_rm = slice_selector; | ||
| 671 | slice1 = hash_by_mask(addr, slice_hash_mask); | ||
| 672 | } | ||
| 673 | |||
| 674 | *pmiidx = (u32)slice1 << 1; | ||
| 675 | } | ||
| 676 | |||
| 677 | if (two_channels) { | ||
| 678 | bool channel1; | ||
| 679 | |||
| 680 | mot_intlv_bit = two_slices ? MOT_CHAN_INTLV_BIT_2SLC_2CH : | ||
| 681 | MOT_CHAN_INTLV_BIT_1SLC_2CH; | ||
| 682 | |||
| 683 | if (mot_hit) { | ||
| 684 | chan_intlv_bit_rm = mot_intlv_bit; | ||
| 685 | channel1 = (addr >> mot_intlv_bit) & 1; | ||
| 686 | } else { | ||
| 687 | chan_intlv_bit_rm = chan_selector; | ||
| 688 | channel1 = hash_by_mask(contig_addr, chan_hash_mask); | ||
| 689 | } | ||
| 690 | |||
| 691 | *pmiidx |= (u32)channel1; | ||
| 692 | } | ||
| 693 | } | ||
| 694 | |||
| 695 | /* Remove the chan_selector bit first */ | ||
| 696 | remove_addr_bit(&contig_addr, chan_intlv_bit_rm); | ||
| 697 | /* Remove the slice bit (we remove it second because it must be lower */ | ||
| 698 | remove_addr_bit(&contig_addr, slice_intlv_bit_rm); | ||
| 699 | *pmiaddr = contig_addr; | ||
| 700 | |||
| 701 | return 0; | ||
| 702 | } | ||
| 703 | |||
| 704 | /* Translate PMI address to memory (rank, row, bank, column) */ | ||
| 705 | #define C(n) (0x10 | (n)) /* column */ | ||
| 706 | #define B(n) (0x20 | (n)) /* bank */ | ||
| 707 | #define R(n) (0x40 | (n)) /* row */ | ||
| 708 | #define RS (0x80) /* rank */ | ||
| 709 | |||
| 710 | /* addrdec values */ | ||
| 711 | #define AMAP_1KB 0 | ||
| 712 | #define AMAP_2KB 1 | ||
| 713 | #define AMAP_4KB 2 | ||
| 714 | #define AMAP_RSVD 3 | ||
| 715 | |||
| 716 | /* dden values */ | ||
| 717 | #define DEN_4Gb 0 | ||
| 718 | #define DEN_8Gb 2 | ||
| 719 | |||
| 720 | /* dwid values */ | ||
| 721 | #define X8 0 | ||
| 722 | #define X16 1 | ||
| 723 | |||
| 724 | static struct dimm_geometry { | ||
| 725 | u8 addrdec; | ||
| 726 | u8 dden; | ||
| 727 | u8 dwid; | ||
| 728 | u8 rowbits, colbits; | ||
| 729 | u16 bits[PMI_ADDRESS_WIDTH]; | ||
| 730 | } dimms[] = { | ||
| 731 | { | ||
| 732 | .addrdec = AMAP_1KB, .dden = DEN_4Gb, .dwid = X16, | ||
| 733 | .rowbits = 15, .colbits = 10, | ||
| 734 | .bits = { | ||
| 735 | C(2), C(3), C(4), C(5), C(6), B(0), B(1), B(2), R(0), | ||
| 736 | R(1), R(2), R(3), R(4), R(5), R(6), R(7), R(8), R(9), | ||
| 737 | R(10), C(7), C(8), C(9), R(11), RS, R(12), R(13), R(14), | ||
| 738 | 0, 0, 0, 0 | ||
| 739 | } | ||
| 740 | }, | ||
| 741 | { | ||
| 742 | .addrdec = AMAP_1KB, .dden = DEN_4Gb, .dwid = X8, | ||
| 743 | .rowbits = 16, .colbits = 10, | ||
| 744 | .bits = { | ||
| 745 | C(2), C(3), C(4), C(5), C(6), B(0), B(1), B(2), R(0), | ||
| 746 | R(1), R(2), R(3), R(4), R(5), R(6), R(7), R(8), R(9), | ||
| 747 | R(10), C(7), C(8), C(9), R(11), RS, R(12), R(13), R(14), | ||
| 748 | R(15), 0, 0, 0 | ||
| 749 | } | ||
| 750 | }, | ||
| 751 | { | ||
| 752 | .addrdec = AMAP_1KB, .dden = DEN_8Gb, .dwid = X16, | ||
| 753 | .rowbits = 16, .colbits = 10, | ||
| 754 | .bits = { | ||
| 755 | C(2), C(3), C(4), C(5), C(6), B(0), B(1), B(2), R(0), | ||
| 756 | R(1), R(2), R(3), R(4), R(5), R(6), R(7), R(8), R(9), | ||
| 757 | R(10), C(7), C(8), C(9), R(11), RS, R(12), R(13), R(14), | ||
| 758 | R(15), 0, 0, 0 | ||
| 759 | } | ||
| 760 | }, | ||
| 761 | { | ||
| 762 | .addrdec = AMAP_1KB, .dden = DEN_8Gb, .dwid = X8, | ||
| 763 | .rowbits = 16, .colbits = 11, | ||
| 764 | .bits = { | ||
| 765 | C(2), C(3), C(4), C(5), C(6), B(0), B(1), B(2), R(0), | ||
| 766 | R(1), R(2), R(3), R(4), R(5), R(6), R(7), R(8), R(9), | ||
| 767 | R(10), C(7), C(8), C(9), R(11), RS, C(11), R(12), R(13), | ||
| 768 | R(14), R(15), 0, 0 | ||
| 769 | } | ||
| 770 | }, | ||
| 771 | { | ||
| 772 | .addrdec = AMAP_2KB, .dden = DEN_4Gb, .dwid = X16, | ||
| 773 | .rowbits = 15, .colbits = 10, | ||
| 774 | .bits = { | ||
| 775 | C(2), C(3), C(4), C(5), C(6), C(7), B(0), B(1), B(2), | ||
| 776 | R(0), R(1), R(2), R(3), R(4), R(5), R(6), R(7), R(8), | ||
| 777 | R(9), R(10), C(8), C(9), R(11), RS, R(12), R(13), R(14), | ||
| 778 | 0, 0, 0, 0 | ||
| 779 | } | ||
| 780 | }, | ||
| 781 | { | ||
| 782 | .addrdec = AMAP_2KB, .dden = DEN_4Gb, .dwid = X8, | ||
| 783 | .rowbits = 16, .colbits = 10, | ||
| 784 | .bits = { | ||
| 785 | C(2), C(3), C(4), C(5), C(6), C(7), B(0), B(1), B(2), | ||
| 786 | R(0), R(1), R(2), R(3), R(4), R(5), R(6), R(7), R(8), | ||
| 787 | R(9), R(10), C(8), C(9), R(11), RS, R(12), R(13), R(14), | ||
| 788 | R(15), 0, 0, 0 | ||
| 789 | } | ||
| 790 | }, | ||
| 791 | { | ||
| 792 | .addrdec = AMAP_2KB, .dden = DEN_8Gb, .dwid = X16, | ||
| 793 | .rowbits = 16, .colbits = 10, | ||
| 794 | .bits = { | ||
| 795 | C(2), C(3), C(4), C(5), C(6), C(7), B(0), B(1), B(2), | ||
| 796 | R(0), R(1), R(2), R(3), R(4), R(5), R(6), R(7), R(8), | ||
| 797 | R(9), R(10), C(8), C(9), R(11), RS, R(12), R(13), R(14), | ||
| 798 | R(15), 0, 0, 0 | ||
| 799 | } | ||
| 800 | }, | ||
| 801 | { | ||
| 802 | .addrdec = AMAP_2KB, .dden = DEN_8Gb, .dwid = X8, | ||
| 803 | .rowbits = 16, .colbits = 11, | ||
| 804 | .bits = { | ||
| 805 | C(2), C(3), C(4), C(5), C(6), C(7), B(0), B(1), B(2), | ||
| 806 | R(0), R(1), R(2), R(3), R(4), R(5), R(6), R(7), R(8), | ||
| 807 | R(9), R(10), C(8), C(9), R(11), RS, C(11), R(12), R(13), | ||
| 808 | R(14), R(15), 0, 0 | ||
| 809 | } | ||
| 810 | }, | ||
| 811 | { | ||
| 812 | .addrdec = AMAP_4KB, .dden = DEN_4Gb, .dwid = X16, | ||
| 813 | .rowbits = 15, .colbits = 10, | ||
| 814 | .bits = { | ||
| 815 | C(2), C(3), C(4), C(5), C(6), C(7), C(8), B(0), B(1), | ||
| 816 | B(2), R(0), R(1), R(2), R(3), R(4), R(5), R(6), R(7), | ||
| 817 | R(8), R(9), R(10), C(9), R(11), RS, R(12), R(13), R(14), | ||
| 818 | 0, 0, 0, 0 | ||
| 819 | } | ||
| 820 | }, | ||
| 821 | { | ||
| 822 | .addrdec = AMAP_4KB, .dden = DEN_4Gb, .dwid = X8, | ||
| 823 | .rowbits = 16, .colbits = 10, | ||
| 824 | .bits = { | ||
| 825 | C(2), C(3), C(4), C(5), C(6), C(7), C(8), B(0), B(1), | ||
| 826 | B(2), R(0), R(1), R(2), R(3), R(4), R(5), R(6), R(7), | ||
| 827 | R(8), R(9), R(10), C(9), R(11), RS, R(12), R(13), R(14), | ||
| 828 | R(15), 0, 0, 0 | ||
| 829 | } | ||
| 830 | }, | ||
| 831 | { | ||
| 832 | .addrdec = AMAP_4KB, .dden = DEN_8Gb, .dwid = X16, | ||
| 833 | .rowbits = 16, .colbits = 10, | ||
| 834 | .bits = { | ||
| 835 | C(2), C(3), C(4), C(5), C(6), C(7), C(8), B(0), B(1), | ||
| 836 | B(2), R(0), R(1), R(2), R(3), R(4), R(5), R(6), R(7), | ||
| 837 | R(8), R(9), R(10), C(9), R(11), RS, R(12), R(13), R(14), | ||
| 838 | R(15), 0, 0, 0 | ||
| 839 | } | ||
| 840 | }, | ||
| 841 | { | ||
| 842 | .addrdec = AMAP_4KB, .dden = DEN_8Gb, .dwid = X8, | ||
| 843 | .rowbits = 16, .colbits = 11, | ||
| 844 | .bits = { | ||
| 845 | C(2), C(3), C(4), C(5), C(6), C(7), C(8), B(0), B(1), | ||
| 846 | B(2), R(0), R(1), R(2), R(3), R(4), R(5), R(6), R(7), | ||
| 847 | R(8), R(9), R(10), C(9), R(11), RS, C(11), R(12), R(13), | ||
| 848 | R(14), R(15), 0, 0 | ||
| 849 | } | ||
| 850 | } | ||
| 851 | }; | ||
| 852 | |||
| 853 | static int bank_hash(u64 pmiaddr, int idx, int shft) | ||
| 854 | { | ||
| 855 | int bhash = 0; | ||
| 856 | |||
| 857 | switch (idx) { | ||
| 858 | case 0: | ||
| 859 | bhash ^= ((pmiaddr >> (12 + shft)) ^ (pmiaddr >> (9 + shft))) & 1; | ||
| 860 | break; | ||
| 861 | case 1: | ||
| 862 | bhash ^= (((pmiaddr >> (10 + shft)) ^ (pmiaddr >> (8 + shft))) & 1) << 1; | ||
| 863 | bhash ^= ((pmiaddr >> 22) & 1) << 1; | ||
| 864 | break; | ||
| 865 | case 2: | ||
| 866 | bhash ^= (((pmiaddr >> (13 + shft)) ^ (pmiaddr >> (11 + shft))) & 1) << 2; | ||
| 867 | break; | ||
| 868 | } | ||
| 869 | |||
| 870 | return bhash; | ||
| 871 | } | ||
| 872 | |||
| 873 | static int rank_hash(u64 pmiaddr) | ||
| 874 | { | ||
| 875 | return ((pmiaddr >> 16) ^ (pmiaddr >> 10)) & 1; | ||
| 876 | } | ||
| 877 | |||
| 878 | /* Second stage decode. Compute rank, bank, row & column. */ | ||
| 879 | static int apl_pmi2mem(struct mem_ctl_info *mci, u64 pmiaddr, u32 pmiidx, | ||
| 880 | struct dram_addr *daddr, char *msg) | ||
| 881 | { | ||
| 882 | struct d_cr_drp0 *cr_drp0 = &drp0[pmiidx]; | ||
| 883 | struct pnd2_pvt *pvt = mci->pvt_info; | ||
| 884 | int g = pvt->dimm_geom[pmiidx]; | ||
| 885 | struct dimm_geometry *d = &dimms[g]; | ||
| 886 | int column = 0, bank = 0, row = 0, rank = 0; | ||
| 887 | int i, idx, type, skiprs = 0; | ||
| 888 | |||
| 889 | for (i = 0; i < PMI_ADDRESS_WIDTH; i++) { | ||
| 890 | int bit = (pmiaddr >> i) & 1; | ||
| 891 | |||
| 892 | if (i + skiprs >= PMI_ADDRESS_WIDTH) { | ||
| 893 | snprintf(msg, PND2_MSG_SIZE, "Bad dimm_geometry[] table\n"); | ||
| 894 | return -EINVAL; | ||
| 895 | } | ||
| 896 | |||
| 897 | type = d->bits[i + skiprs] & ~0xf; | ||
| 898 | idx = d->bits[i + skiprs] & 0xf; | ||
| 899 | |||
| 900 | /* | ||
| 901 | * On single rank DIMMs ignore the rank select bit | ||
| 902 | * and shift remainder of "bits[]" down one place. | ||
| 903 | */ | ||
| 904 | if (type == RS && (cr_drp0->rken0 + cr_drp0->rken1) == 1) { | ||
| 905 | skiprs = 1; | ||
| 906 | type = d->bits[i + skiprs] & ~0xf; | ||
| 907 | idx = d->bits[i + skiprs] & 0xf; | ||
| 908 | } | ||
| 909 | |||
| 910 | switch (type) { | ||
| 911 | case C(0): | ||
| 912 | column |= (bit << idx); | ||
| 913 | break; | ||
| 914 | case B(0): | ||
| 915 | bank |= (bit << idx); | ||
| 916 | if (cr_drp0->bahen) | ||
| 917 | bank ^= bank_hash(pmiaddr, idx, d->addrdec); | ||
| 918 | break; | ||
| 919 | case R(0): | ||
| 920 | row |= (bit << idx); | ||
| 921 | break; | ||
| 922 | case RS: | ||
| 923 | rank = bit; | ||
| 924 | if (cr_drp0->rsien) | ||
| 925 | rank ^= rank_hash(pmiaddr); | ||
| 926 | break; | ||
| 927 | default: | ||
| 928 | if (bit) { | ||
| 929 | snprintf(msg, PND2_MSG_SIZE, "Bad translation\n"); | ||
| 930 | return -EINVAL; | ||
| 931 | } | ||
| 932 | goto done; | ||
| 933 | } | ||
| 934 | } | ||
| 935 | |||
| 936 | done: | ||
| 937 | daddr->col = column; | ||
| 938 | daddr->bank = bank; | ||
| 939 | daddr->row = row; | ||
| 940 | daddr->rank = rank; | ||
| 941 | daddr->dimm = 0; | ||
| 942 | |||
| 943 | return 0; | ||
| 944 | } | ||
| 945 | |||
| 946 | /* Pluck bit "in" from pmiaddr and return value shifted to bit "out" */ | ||
| 947 | #define dnv_get_bit(pmi, in, out) ((int)(((pmi) >> (in)) & 1u) << (out)) | ||
| 948 | |||
| 949 | static int dnv_pmi2mem(struct mem_ctl_info *mci, u64 pmiaddr, u32 pmiidx, | ||
| 950 | struct dram_addr *daddr, char *msg) | ||
| 951 | { | ||
| 952 | /* Rank 0 or 1 */ | ||
| 953 | daddr->rank = dnv_get_bit(pmiaddr, dmap[pmiidx].rs0 + 13, 0); | ||
| 954 | /* Rank 2 or 3 */ | ||
| 955 | daddr->rank |= dnv_get_bit(pmiaddr, dmap[pmiidx].rs1 + 13, 1); | ||
| 956 | |||
| 957 | /* | ||
| 958 | * Normally ranks 0,1 are DIMM0, and 2,3 are DIMM1, but we | ||
| 959 | * flip them if DIMM1 is larger than DIMM0. | ||
| 960 | */ | ||
| 961 | daddr->dimm = (daddr->rank >= 2) ^ drp[pmiidx].dimmflip; | ||
| 962 | |||
| 963 | daddr->bank = dnv_get_bit(pmiaddr, dmap[pmiidx].ba0 + 6, 0); | ||
| 964 | daddr->bank |= dnv_get_bit(pmiaddr, dmap[pmiidx].ba1 + 6, 1); | ||
| 965 | daddr->bank |= dnv_get_bit(pmiaddr, dmap[pmiidx].bg0 + 6, 2); | ||
| 966 | if (dsch.ddr4en) | ||
| 967 | daddr->bank |= dnv_get_bit(pmiaddr, dmap[pmiidx].bg1 + 6, 3); | ||
| 968 | if (dmap1[pmiidx].bxor) { | ||
| 969 | if (dsch.ddr4en) { | ||
| 970 | daddr->bank ^= dnv_get_bit(pmiaddr, dmap3[pmiidx].row6 + 6, 0); | ||
| 971 | daddr->bank ^= dnv_get_bit(pmiaddr, dmap3[pmiidx].row7 + 6, 1); | ||
| 972 | if (dsch.chan_width == 0) | ||
| 973 | /* 64/72 bit dram channel width */ | ||
| 974 | daddr->bank ^= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca3 + 6, 2); | ||
| 975 | else | ||
| 976 | /* 32/40 bit dram channel width */ | ||
| 977 | daddr->bank ^= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca4 + 6, 2); | ||
| 978 | daddr->bank ^= dnv_get_bit(pmiaddr, dmap2[pmiidx].row2 + 6, 3); | ||
| 979 | } else { | ||
| 980 | daddr->bank ^= dnv_get_bit(pmiaddr, dmap2[pmiidx].row2 + 6, 0); | ||
| 981 | daddr->bank ^= dnv_get_bit(pmiaddr, dmap3[pmiidx].row6 + 6, 1); | ||
| 982 | if (dsch.chan_width == 0) | ||
| 983 | daddr->bank ^= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca3 + 6, 2); | ||
| 984 | else | ||
| 985 | daddr->bank ^= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca4 + 6, 2); | ||
| 986 | } | ||
| 987 | } | ||
| 988 | |||
| 989 | daddr->row = dnv_get_bit(pmiaddr, dmap2[pmiidx].row0 + 6, 0); | ||
| 990 | daddr->row |= dnv_get_bit(pmiaddr, dmap2[pmiidx].row1 + 6, 1); | ||
| 991 | daddr->row |= dnv_get_bit(pmiaddr, dmap2[pmiidx].row2 + 6, 2); | ||
| 992 | daddr->row |= dnv_get_bit(pmiaddr, dmap2[pmiidx].row3 + 6, 3); | ||
| 993 | daddr->row |= dnv_get_bit(pmiaddr, dmap2[pmiidx].row4 + 6, 4); | ||
| 994 | daddr->row |= dnv_get_bit(pmiaddr, dmap2[pmiidx].row5 + 6, 5); | ||
| 995 | daddr->row |= dnv_get_bit(pmiaddr, dmap3[pmiidx].row6 + 6, 6); | ||
| 996 | daddr->row |= dnv_get_bit(pmiaddr, dmap3[pmiidx].row7 + 6, 7); | ||
| 997 | daddr->row |= dnv_get_bit(pmiaddr, dmap3[pmiidx].row8 + 6, 8); | ||
| 998 | daddr->row |= dnv_get_bit(pmiaddr, dmap3[pmiidx].row9 + 6, 9); | ||
| 999 | daddr->row |= dnv_get_bit(pmiaddr, dmap3[pmiidx].row10 + 6, 10); | ||
| 1000 | daddr->row |= dnv_get_bit(pmiaddr, dmap3[pmiidx].row11 + 6, 11); | ||
| 1001 | daddr->row |= dnv_get_bit(pmiaddr, dmap4[pmiidx].row12 + 6, 12); | ||
| 1002 | daddr->row |= dnv_get_bit(pmiaddr, dmap4[pmiidx].row13 + 6, 13); | ||
| 1003 | if (dmap4[pmiidx].row14 != 31) | ||
| 1004 | daddr->row |= dnv_get_bit(pmiaddr, dmap4[pmiidx].row14 + 6, 14); | ||
| 1005 | if (dmap4[pmiidx].row15 != 31) | ||
| 1006 | daddr->row |= dnv_get_bit(pmiaddr, dmap4[pmiidx].row15 + 6, 15); | ||
| 1007 | if (dmap4[pmiidx].row16 != 31) | ||
| 1008 | daddr->row |= dnv_get_bit(pmiaddr, dmap4[pmiidx].row16 + 6, 16); | ||
| 1009 | if (dmap4[pmiidx].row17 != 31) | ||
| 1010 | daddr->row |= dnv_get_bit(pmiaddr, dmap4[pmiidx].row17 + 6, 17); | ||
| 1011 | |||
| 1012 | daddr->col = dnv_get_bit(pmiaddr, dmap5[pmiidx].ca3 + 6, 3); | ||
| 1013 | daddr->col |= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca4 + 6, 4); | ||
| 1014 | daddr->col |= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca5 + 6, 5); | ||
| 1015 | daddr->col |= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca6 + 6, 6); | ||
| 1016 | daddr->col |= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca7 + 6, 7); | ||
| 1017 | daddr->col |= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca8 + 6, 8); | ||
| 1018 | daddr->col |= dnv_get_bit(pmiaddr, dmap5[pmiidx].ca9 + 6, 9); | ||
| 1019 | if (!dsch.ddr4en && dmap1[pmiidx].ca11 != 0x3f) | ||
| 1020 | daddr->col |= dnv_get_bit(pmiaddr, dmap1[pmiidx].ca11 + 13, 11); | ||
| 1021 | |||
| 1022 | return 0; | ||
| 1023 | } | ||
| 1024 | |||
| 1025 | static int check_channel(int ch) | ||
| 1026 | { | ||
| 1027 | if (drp0[ch].dramtype != 0) { | ||
| 1028 | pnd2_printk(KERN_INFO, "Unsupported DIMM in channel %d\n", ch); | ||
| 1029 | return 1; | ||
| 1030 | } else if (drp0[ch].eccen == 0) { | ||
| 1031 | pnd2_printk(KERN_INFO, "ECC disabled on channel %d\n", ch); | ||
| 1032 | return 1; | ||
| 1033 | } | ||
| 1034 | return 0; | ||
| 1035 | } | ||
| 1036 | |||
| 1037 | static int apl_check_ecc_active(void) | ||
| 1038 | { | ||
| 1039 | int i, ret = 0; | ||
| 1040 | |||
| 1041 | /* Check dramtype and ECC mode for each present DIMM */ | ||
| 1042 | for (i = 0; i < APL_NUM_CHANNELS; i++) | ||
| 1043 | if (chan_mask & BIT(i)) | ||
| 1044 | ret += check_channel(i); | ||
| 1045 | return ret ? -EINVAL : 0; | ||
| 1046 | } | ||
| 1047 | |||
| 1048 | #define DIMMS_PRESENT(d) ((d)->rken0 + (d)->rken1 + (d)->rken2 + (d)->rken3) | ||
| 1049 | |||
| 1050 | static int check_unit(int ch) | ||
| 1051 | { | ||
| 1052 | struct d_cr_drp *d = &drp[ch]; | ||
| 1053 | |||
| 1054 | if (DIMMS_PRESENT(d) && !ecc_ctrl[ch].eccen) { | ||
| 1055 | pnd2_printk(KERN_INFO, "ECC disabled on channel %d\n", ch); | ||
| 1056 | return 1; | ||
| 1057 | } | ||
| 1058 | return 0; | ||
| 1059 | } | ||
| 1060 | |||
| 1061 | static int dnv_check_ecc_active(void) | ||
| 1062 | { | ||
| 1063 | int i, ret = 0; | ||
| 1064 | |||
| 1065 | for (i = 0; i < DNV_NUM_CHANNELS; i++) | ||
| 1066 | ret += check_unit(i); | ||
| 1067 | return ret ? -EINVAL : 0; | ||
| 1068 | } | ||
| 1069 | |||
| 1070 | static int get_memory_error_data(struct mem_ctl_info *mci, u64 addr, | ||
| 1071 | struct dram_addr *daddr, char *msg) | ||
| 1072 | { | ||
| 1073 | u64 pmiaddr; | ||
| 1074 | u32 pmiidx; | ||
| 1075 | int ret; | ||
| 1076 | |||
| 1077 | ret = sys2pmi(addr, &pmiidx, &pmiaddr, msg); | ||
| 1078 | if (ret) | ||
| 1079 | return ret; | ||
| 1080 | |||
| 1081 | pmiaddr >>= ops->pmiaddr_shift; | ||
| 1082 | /* pmi channel idx to dimm channel idx */ | ||
| 1083 | pmiidx >>= ops->pmiidx_shift; | ||
| 1084 | daddr->chan = pmiidx; | ||
| 1085 | |||
| 1086 | ret = ops->pmi2mem(mci, pmiaddr, pmiidx, daddr, msg); | ||
| 1087 | if (ret) | ||
| 1088 | return ret; | ||
| 1089 | |||
| 1090 | edac_dbg(0, "SysAddr=%llx PmiAddr=%llx Channel=%d DIMM=%d Rank=%d Bank=%d Row=%d Column=%d\n", | ||
| 1091 | addr, pmiaddr, daddr->chan, daddr->dimm, daddr->rank, daddr->bank, daddr->row, daddr->col); | ||
| 1092 | |||
| 1093 | return 0; | ||
| 1094 | } | ||
| 1095 | |||
| 1096 | static void pnd2_mce_output_error(struct mem_ctl_info *mci, const struct mce *m, | ||
| 1097 | struct dram_addr *daddr) | ||
| 1098 | { | ||
| 1099 | enum hw_event_mc_err_type tp_event; | ||
| 1100 | char *optype, msg[PND2_MSG_SIZE]; | ||
| 1101 | bool ripv = m->mcgstatus & MCG_STATUS_RIPV; | ||
| 1102 | bool overflow = m->status & MCI_STATUS_OVER; | ||
| 1103 | bool uc_err = m->status & MCI_STATUS_UC; | ||
| 1104 | bool recov = m->status & MCI_STATUS_S; | ||
| 1105 | u32 core_err_cnt = GET_BITFIELD(m->status, 38, 52); | ||
| 1106 | u32 mscod = GET_BITFIELD(m->status, 16, 31); | ||
| 1107 | u32 errcode = GET_BITFIELD(m->status, 0, 15); | ||
| 1108 | u32 optypenum = GET_BITFIELD(m->status, 4, 6); | ||
| 1109 | int rc; | ||
| 1110 | |||
| 1111 | tp_event = uc_err ? (ripv ? HW_EVENT_ERR_FATAL : HW_EVENT_ERR_UNCORRECTED) : | ||
| 1112 | HW_EVENT_ERR_CORRECTED; | ||
| 1113 | |||
| 1114 | /* | ||
| 1115 | * According with Table 15-9 of the Intel Architecture spec vol 3A, | ||
| 1116 | * memory errors should fit in this mask: | ||
| 1117 | * 000f 0000 1mmm cccc (binary) | ||
| 1118 | * where: | ||
| 1119 | * f = Correction Report Filtering Bit. If 1, subsequent errors | ||
| 1120 | * won't be shown | ||
| 1121 | * mmm = error type | ||
| 1122 | * cccc = channel | ||
| 1123 | * If the mask doesn't match, report an error to the parsing logic | ||
| 1124 | */ | ||
| 1125 | if (!((errcode & 0xef80) == 0x80)) { | ||
| 1126 | optype = "Can't parse: it is not a mem"; | ||
| 1127 | } else { | ||
| 1128 | switch (optypenum) { | ||
| 1129 | case 0: | ||
| 1130 | optype = "generic undef request error"; | ||
| 1131 | break; | ||
| 1132 | case 1: | ||
| 1133 | optype = "memory read error"; | ||
| 1134 | break; | ||
| 1135 | case 2: | ||
| 1136 | optype = "memory write error"; | ||
| 1137 | break; | ||
| 1138 | case 3: | ||
| 1139 | optype = "addr/cmd error"; | ||
| 1140 | break; | ||
| 1141 | case 4: | ||
| 1142 | optype = "memory scrubbing error"; | ||
| 1143 | break; | ||
| 1144 | default: | ||
| 1145 | optype = "reserved"; | ||
| 1146 | break; | ||
| 1147 | } | ||
| 1148 | } | ||
| 1149 | |||
| 1150 | /* Only decode errors with an valid address (ADDRV) */ | ||
| 1151 | if (!(m->status & MCI_STATUS_ADDRV)) | ||
| 1152 | return; | ||
| 1153 | |||
| 1154 | rc = get_memory_error_data(mci, m->addr, daddr, msg); | ||
| 1155 | if (rc) | ||
| 1156 | goto address_error; | ||
| 1157 | |||
| 1158 | snprintf(msg, sizeof(msg), | ||
| 1159 | "%s%s err_code:%04x:%04x channel:%d DIMM:%d rank:%d row:%d bank:%d col:%d", | ||
| 1160 | overflow ? " OVERFLOW" : "", (uc_err && recov) ? " recoverable" : "", mscod, | ||
| 1161 | errcode, daddr->chan, daddr->dimm, daddr->rank, daddr->row, daddr->bank, daddr->col); | ||
| 1162 | |||
| 1163 | edac_dbg(0, "%s\n", msg); | ||
| 1164 | |||
| 1165 | /* Call the helper to output message */ | ||
| 1166 | edac_mc_handle_error(tp_event, mci, core_err_cnt, m->addr >> PAGE_SHIFT, | ||
| 1167 | m->addr & ~PAGE_MASK, 0, daddr->chan, daddr->dimm, -1, optype, msg); | ||
| 1168 | |||
| 1169 | return; | ||
| 1170 | |||
| 1171 | address_error: | ||
| 1172 | edac_mc_handle_error(tp_event, mci, core_err_cnt, 0, 0, 0, -1, -1, -1, msg, ""); | ||
| 1173 | } | ||
| 1174 | |||
| 1175 | static void apl_get_dimm_config(struct mem_ctl_info *mci) | ||
| 1176 | { | ||
| 1177 | struct pnd2_pvt *pvt = mci->pvt_info; | ||
| 1178 | struct dimm_info *dimm; | ||
| 1179 | struct d_cr_drp0 *d; | ||
| 1180 | u64 capacity; | ||
| 1181 | int i, g; | ||
| 1182 | |||
| 1183 | for (i = 0; i < APL_NUM_CHANNELS; i++) { | ||
| 1184 | if (!(chan_mask & BIT(i))) | ||
| 1185 | continue; | ||
| 1186 | |||
| 1187 | dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms, mci->n_layers, i, 0, 0); | ||
| 1188 | if (!dimm) { | ||
| 1189 | edac_dbg(0, "No allocated DIMM for channel %d\n", i); | ||
| 1190 | continue; | ||
| 1191 | } | ||
| 1192 | |||
| 1193 | d = &drp0[i]; | ||
| 1194 | for (g = 0; g < ARRAY_SIZE(dimms); g++) | ||
| 1195 | if (dimms[g].addrdec == d->addrdec && | ||
| 1196 | dimms[g].dden == d->dden && | ||
| 1197 | dimms[g].dwid == d->dwid) | ||
| 1198 | break; | ||
| 1199 | |||
| 1200 | if (g == ARRAY_SIZE(dimms)) { | ||
| 1201 | edac_dbg(0, "Channel %d: unrecognized DIMM\n", i); | ||
| 1202 | continue; | ||
| 1203 | } | ||
| 1204 | |||
| 1205 | pvt->dimm_geom[i] = g; | ||
| 1206 | capacity = (d->rken0 + d->rken1) * 8 * (1ul << dimms[g].rowbits) * | ||
| 1207 | (1ul << dimms[g].colbits); | ||
| 1208 | edac_dbg(0, "Channel %d: %lld MByte DIMM\n", i, capacity >> (20 - 3)); | ||
| 1209 | dimm->nr_pages = MiB_TO_PAGES(capacity >> (20 - 3)); | ||
| 1210 | dimm->grain = 32; | ||
| 1211 | dimm->dtype = (d->dwid == 0) ? DEV_X8 : DEV_X16; | ||
| 1212 | dimm->mtype = MEM_DDR3; | ||
| 1213 | dimm->edac_mode = EDAC_SECDED; | ||
| 1214 | snprintf(dimm->label, sizeof(dimm->label), "Slice#%d_Chan#%d", i / 2, i % 2); | ||
| 1215 | } | ||
| 1216 | } | ||
| 1217 | |||
| 1218 | static const int dnv_dtypes[] = { | ||
| 1219 | DEV_X8, DEV_X4, DEV_X16, DEV_UNKNOWN | ||
| 1220 | }; | ||
| 1221 | |||
| 1222 | static void dnv_get_dimm_config(struct mem_ctl_info *mci) | ||
| 1223 | { | ||
| 1224 | int i, j, ranks_of_dimm[DNV_MAX_DIMMS], banks, rowbits, colbits, memtype; | ||
| 1225 | struct dimm_info *dimm; | ||
| 1226 | struct d_cr_drp *d; | ||
| 1227 | u64 capacity; | ||
| 1228 | |||
| 1229 | if (dsch.ddr4en) { | ||
| 1230 | memtype = MEM_DDR4; | ||
| 1231 | banks = 16; | ||
| 1232 | colbits = 10; | ||
| 1233 | } else { | ||
| 1234 | memtype = MEM_DDR3; | ||
| 1235 | banks = 8; | ||
| 1236 | } | ||
| 1237 | |||
| 1238 | for (i = 0; i < DNV_NUM_CHANNELS; i++) { | ||
| 1239 | if (dmap4[i].row14 == 31) | ||
| 1240 | rowbits = 14; | ||
| 1241 | else if (dmap4[i].row15 == 31) | ||
| 1242 | rowbits = 15; | ||
| 1243 | else if (dmap4[i].row16 == 31) | ||
| 1244 | rowbits = 16; | ||
| 1245 | else if (dmap4[i].row17 == 31) | ||
| 1246 | rowbits = 17; | ||
| 1247 | else | ||
| 1248 | rowbits = 18; | ||
| 1249 | |||
| 1250 | if (memtype == MEM_DDR3) { | ||
| 1251 | if (dmap1[i].ca11 != 0x3f) | ||
| 1252 | colbits = 12; | ||
| 1253 | else | ||
| 1254 | colbits = 10; | ||
| 1255 | } | ||
| 1256 | |||
| 1257 | d = &drp[i]; | ||
| 1258 | /* DIMM0 is present if rank0 and/or rank1 is enabled */ | ||
| 1259 | ranks_of_dimm[0] = d->rken0 + d->rken1; | ||
| 1260 | /* DIMM1 is present if rank2 and/or rank3 is enabled */ | ||
| 1261 | ranks_of_dimm[1] = d->rken2 + d->rken3; | ||
| 1262 | |||
| 1263 | for (j = 0; j < DNV_MAX_DIMMS; j++) { | ||
| 1264 | if (!ranks_of_dimm[j]) | ||
| 1265 | continue; | ||
| 1266 | |||
| 1267 | dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms, mci->n_layers, i, j, 0); | ||
| 1268 | if (!dimm) { | ||
| 1269 | edac_dbg(0, "No allocated DIMM for channel %d DIMM %d\n", i, j); | ||
| 1270 | continue; | ||
| 1271 | } | ||
| 1272 | |||
| 1273 | capacity = ranks_of_dimm[j] * banks * (1ul << rowbits) * (1ul << colbits); | ||
| 1274 | edac_dbg(0, "Channel %d DIMM %d: %lld MByte DIMM\n", i, j, capacity >> (20 - 3)); | ||
| 1275 | dimm->nr_pages = MiB_TO_PAGES(capacity >> (20 - 3)); | ||
| 1276 | dimm->grain = 32; | ||
| 1277 | dimm->dtype = dnv_dtypes[j ? d->dimmdwid0 : d->dimmdwid1]; | ||
| 1278 | dimm->mtype = memtype; | ||
| 1279 | dimm->edac_mode = EDAC_SECDED; | ||
| 1280 | snprintf(dimm->label, sizeof(dimm->label), "Chan#%d_DIMM#%d", i, j); | ||
| 1281 | } | ||
| 1282 | } | ||
| 1283 | } | ||
| 1284 | |||
| 1285 | static int pnd2_register_mci(struct mem_ctl_info **ppmci) | ||
| 1286 | { | ||
| 1287 | struct edac_mc_layer layers[2]; | ||
| 1288 | struct mem_ctl_info *mci; | ||
| 1289 | struct pnd2_pvt *pvt; | ||
| 1290 | int rc; | ||
| 1291 | |||
| 1292 | rc = ops->check_ecc(); | ||
| 1293 | if (rc < 0) | ||
| 1294 | return rc; | ||
| 1295 | |||
| 1296 | /* Allocate a new MC control structure */ | ||
| 1297 | layers[0].type = EDAC_MC_LAYER_CHANNEL; | ||
| 1298 | layers[0].size = ops->channels; | ||
| 1299 | layers[0].is_virt_csrow = false; | ||
| 1300 | layers[1].type = EDAC_MC_LAYER_SLOT; | ||
| 1301 | layers[1].size = ops->dimms_per_channel; | ||
| 1302 | layers[1].is_virt_csrow = true; | ||
| 1303 | mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt)); | ||
| 1304 | if (!mci) | ||
| 1305 | return -ENOMEM; | ||
| 1306 | |||
| 1307 | pvt = mci->pvt_info; | ||
| 1308 | memset(pvt, 0, sizeof(*pvt)); | ||
| 1309 | |||
| 1310 | mci->mod_name = "pnd2_edac.c"; | ||
| 1311 | mci->dev_name = ops->name; | ||
| 1312 | mci->ctl_name = "Pondicherry2"; | ||
| 1313 | |||
| 1314 | /* Get dimm basic config and the memory layout */ | ||
| 1315 | ops->get_dimm_config(mci); | ||
| 1316 | |||
| 1317 | if (edac_mc_add_mc(mci)) { | ||
| 1318 | edac_dbg(0, "MC: failed edac_mc_add_mc()\n"); | ||
| 1319 | edac_mc_free(mci); | ||
| 1320 | return -EINVAL; | ||
| 1321 | } | ||
| 1322 | |||
| 1323 | *ppmci = mci; | ||
| 1324 | |||
| 1325 | return 0; | ||
| 1326 | } | ||
| 1327 | |||
| 1328 | static void pnd2_unregister_mci(struct mem_ctl_info *mci) | ||
| 1329 | { | ||
| 1330 | if (unlikely(!mci || !mci->pvt_info)) { | ||
| 1331 | pnd2_printk(KERN_ERR, "Couldn't find mci handler\n"); | ||
| 1332 | return; | ||
| 1333 | } | ||
| 1334 | |||
| 1335 | /* Remove MC sysfs nodes */ | ||
| 1336 | edac_mc_del_mc(NULL); | ||
| 1337 | edac_dbg(1, "%s: free mci struct\n", mci->ctl_name); | ||
| 1338 | edac_mc_free(mci); | ||
| 1339 | } | ||
| 1340 | |||
| 1341 | /* | ||
| 1342 | * Callback function registered with core kernel mce code. | ||
| 1343 | * Called once for each logged error. | ||
| 1344 | */ | ||
| 1345 | static int pnd2_mce_check_error(struct notifier_block *nb, unsigned long val, void *data) | ||
| 1346 | { | ||
| 1347 | struct mce *mce = (struct mce *)data; | ||
| 1348 | struct mem_ctl_info *mci; | ||
| 1349 | struct dram_addr daddr; | ||
| 1350 | char *type; | ||
| 1351 | |||
| 1352 | if (get_edac_report_status() == EDAC_REPORTING_DISABLED) | ||
| 1353 | return NOTIFY_DONE; | ||
| 1354 | |||
| 1355 | mci = pnd2_mci; | ||
| 1356 | if (!mci) | ||
| 1357 | return NOTIFY_DONE; | ||
| 1358 | |||
| 1359 | /* | ||
| 1360 | * Just let mcelog handle it if the error is | ||
| 1361 | * outside the memory controller. A memory error | ||
| 1362 | * is indicated by bit 7 = 1 and bits = 8-11,13-15 = 0. | ||
| 1363 | * bit 12 has an special meaning. | ||
| 1364 | */ | ||
| 1365 | if ((mce->status & 0xefff) >> 7 != 1) | ||
| 1366 | return NOTIFY_DONE; | ||
| 1367 | |||
| 1368 | if (mce->mcgstatus & MCG_STATUS_MCIP) | ||
| 1369 | type = "Exception"; | ||
| 1370 | else | ||
| 1371 | type = "Event"; | ||
| 1372 | |||
| 1373 | pnd2_mc_printk(mci, KERN_INFO, "HANDLING MCE MEMORY ERROR\n"); | ||
| 1374 | pnd2_mc_printk(mci, KERN_INFO, "CPU %u: Machine Check %s: %llx Bank %u: %llx\n", | ||
| 1375 | mce->extcpu, type, mce->mcgstatus, mce->bank, mce->status); | ||
| 1376 | pnd2_mc_printk(mci, KERN_INFO, "TSC %llx ", mce->tsc); | ||
| 1377 | pnd2_mc_printk(mci, KERN_INFO, "ADDR %llx ", mce->addr); | ||
| 1378 | pnd2_mc_printk(mci, KERN_INFO, "MISC %llx ", mce->misc); | ||
| 1379 | pnd2_mc_printk(mci, KERN_INFO, "PROCESSOR %u:%x TIME %llu SOCKET %u APIC %x\n", | ||
| 1380 | mce->cpuvendor, mce->cpuid, mce->time, mce->socketid, mce->apicid); | ||
| 1381 | |||
| 1382 | pnd2_mce_output_error(mci, mce, &daddr); | ||
| 1383 | |||
| 1384 | /* Advice mcelog that the error were handled */ | ||
| 1385 | return NOTIFY_STOP; | ||
| 1386 | } | ||
| 1387 | |||
| 1388 | static struct notifier_block pnd2_mce_dec = { | ||
| 1389 | .notifier_call = pnd2_mce_check_error, | ||
| 1390 | }; | ||
| 1391 | |||
| 1392 | #ifdef CONFIG_EDAC_DEBUG | ||
| 1393 | /* | ||
| 1394 | * Write an address to this file to exercise the address decode | ||
| 1395 | * logic in this driver. | ||
| 1396 | */ | ||
| 1397 | static u64 pnd2_fake_addr; | ||
| 1398 | #define PND2_BLOB_SIZE 1024 | ||
| 1399 | static char pnd2_result[PND2_BLOB_SIZE]; | ||
| 1400 | static struct dentry *pnd2_test; | ||
| 1401 | static struct debugfs_blob_wrapper pnd2_blob = { | ||
| 1402 | .data = pnd2_result, | ||
| 1403 | .size = 0 | ||
| 1404 | }; | ||
| 1405 | |||
| 1406 | static int debugfs_u64_set(void *data, u64 val) | ||
| 1407 | { | ||
| 1408 | struct dram_addr daddr; | ||
| 1409 | struct mce m; | ||
| 1410 | |||
| 1411 | *(u64 *)data = val; | ||
| 1412 | m.mcgstatus = 0; | ||
| 1413 | /* ADDRV + MemRd + Unknown channel */ | ||
| 1414 | m.status = MCI_STATUS_ADDRV + 0x9f; | ||
| 1415 | m.addr = val; | ||
| 1416 | pnd2_mce_output_error(pnd2_mci, &m, &daddr); | ||
| 1417 | snprintf(pnd2_blob.data, PND2_BLOB_SIZE, | ||
| 1418 | "SysAddr=%llx Channel=%d DIMM=%d Rank=%d Bank=%d Row=%d Column=%d\n", | ||
| 1419 | m.addr, daddr.chan, daddr.dimm, daddr.rank, daddr.bank, daddr.row, daddr.col); | ||
| 1420 | pnd2_blob.size = strlen(pnd2_blob.data); | ||
| 1421 | |||
| 1422 | return 0; | ||
| 1423 | } | ||
| 1424 | DEFINE_DEBUGFS_ATTRIBUTE(fops_u64_wo, NULL, debugfs_u64_set, "%llu\n"); | ||
| 1425 | |||
| 1426 | static void setup_pnd2_debug(void) | ||
| 1427 | { | ||
| 1428 | pnd2_test = edac_debugfs_create_dir("pnd2_test"); | ||
| 1429 | edac_debugfs_create_file("pnd2_debug_addr", 0200, pnd2_test, | ||
| 1430 | &pnd2_fake_addr, &fops_u64_wo); | ||
| 1431 | debugfs_create_blob("pnd2_debug_results", 0400, pnd2_test, &pnd2_blob); | ||
| 1432 | } | ||
| 1433 | |||
| 1434 | static void teardown_pnd2_debug(void) | ||
| 1435 | { | ||
| 1436 | debugfs_remove_recursive(pnd2_test); | ||
| 1437 | } | ||
| 1438 | #else | ||
| 1439 | static void setup_pnd2_debug(void) {} | ||
| 1440 | static void teardown_pnd2_debug(void) {} | ||
| 1441 | #endif /* CONFIG_EDAC_DEBUG */ | ||
| 1442 | |||
| 1443 | |||
| 1444 | static int pnd2_probe(void) | ||
| 1445 | { | ||
| 1446 | int rc; | ||
| 1447 | |||
| 1448 | edac_dbg(2, "\n"); | ||
| 1449 | rc = get_registers(); | ||
| 1450 | if (rc) | ||
| 1451 | return rc; | ||
| 1452 | |||
| 1453 | return pnd2_register_mci(&pnd2_mci); | ||
| 1454 | } | ||
| 1455 | |||
| 1456 | static void pnd2_remove(void) | ||
| 1457 | { | ||
| 1458 | edac_dbg(0, "\n"); | ||
| 1459 | pnd2_unregister_mci(pnd2_mci); | ||
| 1460 | } | ||
| 1461 | |||
| 1462 | static struct dunit_ops apl_ops = { | ||
| 1463 | .name = "pnd2/apl", | ||
| 1464 | .type = APL, | ||
| 1465 | .pmiaddr_shift = LOG2_PMI_ADDR_GRANULARITY, | ||
| 1466 | .pmiidx_shift = 0, | ||
| 1467 | .channels = APL_NUM_CHANNELS, | ||
| 1468 | .dimms_per_channel = 1, | ||
| 1469 | .rd_reg = apl_rd_reg, | ||
| 1470 | .get_registers = apl_get_registers, | ||
| 1471 | .check_ecc = apl_check_ecc_active, | ||
| 1472 | .mk_region = apl_mk_region, | ||
| 1473 | .get_dimm_config = apl_get_dimm_config, | ||
| 1474 | .pmi2mem = apl_pmi2mem, | ||
| 1475 | }; | ||
| 1476 | |||
| 1477 | static struct dunit_ops dnv_ops = { | ||
| 1478 | .name = "pnd2/dnv", | ||
| 1479 | .type = DNV, | ||
| 1480 | .pmiaddr_shift = 0, | ||
| 1481 | .pmiidx_shift = 1, | ||
| 1482 | .channels = DNV_NUM_CHANNELS, | ||
| 1483 | .dimms_per_channel = 2, | ||
| 1484 | .rd_reg = dnv_rd_reg, | ||
| 1485 | .get_registers = dnv_get_registers, | ||
| 1486 | .check_ecc = dnv_check_ecc_active, | ||
| 1487 | .mk_region = dnv_mk_region, | ||
| 1488 | .get_dimm_config = dnv_get_dimm_config, | ||
| 1489 | .pmi2mem = dnv_pmi2mem, | ||
| 1490 | }; | ||
| 1491 | |||
| 1492 | static const struct x86_cpu_id pnd2_cpuids[] = { | ||
| 1493 | { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_GOLDMONT, 0, (kernel_ulong_t)&apl_ops }, | ||
| 1494 | { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_DENVERTON, 0, (kernel_ulong_t)&dnv_ops }, | ||
| 1495 | { } | ||
| 1496 | }; | ||
| 1497 | MODULE_DEVICE_TABLE(x86cpu, pnd2_cpuids); | ||
| 1498 | |||
| 1499 | static int __init pnd2_init(void) | ||
| 1500 | { | ||
| 1501 | const struct x86_cpu_id *id; | ||
| 1502 | int rc; | ||
| 1503 | |||
| 1504 | edac_dbg(2, "\n"); | ||
| 1505 | |||
| 1506 | id = x86_match_cpu(pnd2_cpuids); | ||
| 1507 | if (!id) | ||
| 1508 | return -ENODEV; | ||
| 1509 | |||
| 1510 | ops = (struct dunit_ops *)id->driver_data; | ||
| 1511 | |||
| 1512 | /* Ensure that the OPSTATE is set correctly for POLL or NMI */ | ||
| 1513 | opstate_init(); | ||
| 1514 | |||
| 1515 | rc = pnd2_probe(); | ||
| 1516 | if (rc < 0) { | ||
| 1517 | pnd2_printk(KERN_ERR, "Failed to register device with error %d.\n", rc); | ||
| 1518 | return rc; | ||
| 1519 | } | ||
| 1520 | |||
| 1521 | if (!pnd2_mci) | ||
| 1522 | return -ENODEV; | ||
| 1523 | |||
| 1524 | mce_register_decode_chain(&pnd2_mce_dec); | ||
| 1525 | setup_pnd2_debug(); | ||
| 1526 | |||
| 1527 | return 0; | ||
| 1528 | } | ||
| 1529 | |||
| 1530 | static void __exit pnd2_exit(void) | ||
| 1531 | { | ||
| 1532 | edac_dbg(2, "\n"); | ||
| 1533 | teardown_pnd2_debug(); | ||
| 1534 | mce_unregister_decode_chain(&pnd2_mce_dec); | ||
| 1535 | pnd2_remove(); | ||
| 1536 | } | ||
| 1537 | |||
| 1538 | module_init(pnd2_init); | ||
| 1539 | module_exit(pnd2_exit); | ||
| 1540 | |||
| 1541 | module_param(edac_op_state, int, 0444); | ||
| 1542 | MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI"); | ||
| 1543 | |||
| 1544 | MODULE_LICENSE("GPL v2"); | ||
| 1545 | MODULE_AUTHOR("Tony Luck"); | ||
| 1546 | MODULE_DESCRIPTION("MC Driver for Intel SoC using Pondicherry memory controller"); | ||
diff --git a/drivers/edac/pnd2_edac.h b/drivers/edac/pnd2_edac.h new file mode 100644 index 000000000000..61b6e79492bb --- /dev/null +++ b/drivers/edac/pnd2_edac.h | |||
| @@ -0,0 +1,301 @@ | |||
| 1 | /* | ||
| 2 | * Register bitfield descriptions for Pondicherry2 memory controller. | ||
| 3 | * | ||
| 4 | * Copyright (c) 2016, Intel Corporation. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify it | ||
| 7 | * under the terms and conditions of the GNU General Public License, | ||
| 8 | * version 2, as published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 13 | * more details. | ||
| 14 | */ | ||
| 15 | |||
| 16 | #ifndef _PND2_REGS_H | ||
| 17 | #define _PND2_REGS_H | ||
| 18 | |||
| 19 | struct b_cr_touud_lo_pci { | ||
| 20 | u32 lock : 1; | ||
| 21 | u32 reserved_1 : 19; | ||
| 22 | u32 touud : 12; | ||
| 23 | }; | ||
| 24 | |||
| 25 | #define b_cr_touud_lo_pci_port 0x4c | ||
| 26 | #define b_cr_touud_lo_pci_offset 0xa8 | ||
| 27 | #define b_cr_touud_lo_pci_r_opcode 0x04 | ||
| 28 | |||
| 29 | struct b_cr_touud_hi_pci { | ||
| 30 | u32 touud : 7; | ||
| 31 | u32 reserved_0 : 25; | ||
| 32 | }; | ||
| 33 | |||
| 34 | #define b_cr_touud_hi_pci_port 0x4c | ||
| 35 | #define b_cr_touud_hi_pci_offset 0xac | ||
| 36 | #define b_cr_touud_hi_pci_r_opcode 0x04 | ||
| 37 | |||
| 38 | struct b_cr_tolud_pci { | ||
| 39 | u32 lock : 1; | ||
| 40 | u32 reserved_0 : 19; | ||
| 41 | u32 tolud : 12; | ||
| 42 | }; | ||
| 43 | |||
| 44 | #define b_cr_tolud_pci_port 0x4c | ||
| 45 | #define b_cr_tolud_pci_offset 0xbc | ||
| 46 | #define b_cr_tolud_pci_r_opcode 0x04 | ||
| 47 | |||
| 48 | struct b_cr_mchbar_lo_pci { | ||
| 49 | u32 enable : 1; | ||
| 50 | u32 pad_3_1 : 3; | ||
| 51 | u32 pad_14_4: 11; | ||
| 52 | u32 base: 17; | ||
| 53 | }; | ||
| 54 | |||
| 55 | struct b_cr_mchbar_hi_pci { | ||
| 56 | u32 base : 7; | ||
| 57 | u32 pad_31_7 : 25; | ||
| 58 | }; | ||
| 59 | |||
| 60 | /* Symmetric region */ | ||
| 61 | struct b_cr_slice_channel_hash { | ||
| 62 | u64 slice_1_disabled : 1; | ||
| 63 | u64 hvm_mode : 1; | ||
| 64 | u64 interleave_mode : 2; | ||
| 65 | u64 slice_0_mem_disabled : 1; | ||
| 66 | u64 reserved_0 : 1; | ||
| 67 | u64 slice_hash_mask : 14; | ||
| 68 | u64 reserved_1 : 11; | ||
| 69 | u64 enable_pmi_dual_data_mode : 1; | ||
| 70 | u64 ch_1_disabled : 1; | ||
| 71 | u64 reserved_2 : 1; | ||
| 72 | u64 sym_slice0_channel_enabled : 2; | ||
| 73 | u64 sym_slice1_channel_enabled : 2; | ||
| 74 | u64 ch_hash_mask : 14; | ||
| 75 | u64 reserved_3 : 11; | ||
| 76 | u64 lock : 1; | ||
| 77 | }; | ||
| 78 | |||
| 79 | #define b_cr_slice_channel_hash_port 0x4c | ||
| 80 | #define b_cr_slice_channel_hash_offset 0x4c58 | ||
| 81 | #define b_cr_slice_channel_hash_r_opcode 0x06 | ||
| 82 | |||
| 83 | struct b_cr_mot_out_base_mchbar { | ||
| 84 | u32 reserved_0 : 14; | ||
| 85 | u32 mot_out_base : 15; | ||
| 86 | u32 reserved_1 : 1; | ||
| 87 | u32 tr_en : 1; | ||
| 88 | u32 imr_en : 1; | ||
| 89 | }; | ||
| 90 | |||
| 91 | #define b_cr_mot_out_base_mchbar_port 0x4c | ||
| 92 | #define b_cr_mot_out_base_mchbar_offset 0x6af0 | ||
| 93 | #define b_cr_mot_out_base_mchbar_r_opcode 0x00 | ||
| 94 | |||
| 95 | struct b_cr_mot_out_mask_mchbar { | ||
| 96 | u32 reserved_0 : 14; | ||
| 97 | u32 mot_out_mask : 15; | ||
| 98 | u32 reserved_1 : 1; | ||
| 99 | u32 ia_iwb_en : 1; | ||
| 100 | u32 gt_iwb_en : 1; | ||
| 101 | }; | ||
| 102 | |||
| 103 | #define b_cr_mot_out_mask_mchbar_port 0x4c | ||
| 104 | #define b_cr_mot_out_mask_mchbar_offset 0x6af4 | ||
| 105 | #define b_cr_mot_out_mask_mchbar_r_opcode 0x00 | ||
| 106 | |||
| 107 | struct b_cr_asym_mem_region0_mchbar { | ||
| 108 | u32 pad : 4; | ||
| 109 | u32 slice0_asym_base : 11; | ||
| 110 | u32 pad_18_15 : 4; | ||
| 111 | u32 slice0_asym_limit : 11; | ||
| 112 | u32 slice0_asym_channel_select : 1; | ||
| 113 | u32 slice0_asym_enable : 1; | ||
| 114 | }; | ||
| 115 | |||
| 116 | #define b_cr_asym_mem_region0_mchbar_port 0x4c | ||
| 117 | #define b_cr_asym_mem_region0_mchbar_offset 0x6e40 | ||
| 118 | #define b_cr_asym_mem_region0_mchbar_r_opcode 0x00 | ||
| 119 | |||
| 120 | struct b_cr_asym_mem_region1_mchbar { | ||
| 121 | u32 pad : 4; | ||
| 122 | u32 slice1_asym_base : 11; | ||
| 123 | u32 pad_18_15 : 4; | ||
| 124 | u32 slice1_asym_limit : 11; | ||
| 125 | u32 slice1_asym_channel_select : 1; | ||
| 126 | u32 slice1_asym_enable : 1; | ||
| 127 | }; | ||
| 128 | |||
| 129 | #define b_cr_asym_mem_region1_mchbar_port 0x4c | ||
| 130 | #define b_cr_asym_mem_region1_mchbar_offset 0x6e44 | ||
| 131 | #define b_cr_asym_mem_region1_mchbar_r_opcode 0x00 | ||
| 132 | |||
| 133 | /* Some bit fields moved in above two structs on Denverton */ | ||
| 134 | struct b_cr_asym_mem_region_denverton { | ||
| 135 | u32 pad : 4; | ||
| 136 | u32 slice_asym_base : 8; | ||
| 137 | u32 pad_19_12 : 8; | ||
| 138 | u32 slice_asym_limit : 8; | ||
| 139 | u32 pad_28_30 : 3; | ||
| 140 | u32 slice_asym_enable : 1; | ||
| 141 | }; | ||
| 142 | |||
| 143 | struct b_cr_asym_2way_mem_region_mchbar { | ||
| 144 | u32 pad : 2; | ||
| 145 | u32 asym_2way_intlv_mode : 2; | ||
| 146 | u32 asym_2way_base : 11; | ||
| 147 | u32 pad_16_15 : 2; | ||
| 148 | u32 asym_2way_limit : 11; | ||
| 149 | u32 pad_30_28 : 3; | ||
| 150 | u32 asym_2way_interleave_enable : 1; | ||
| 151 | }; | ||
| 152 | |||
| 153 | #define b_cr_asym_2way_mem_region_mchbar_port 0x4c | ||
| 154 | #define b_cr_asym_2way_mem_region_mchbar_offset 0x6e50 | ||
| 155 | #define b_cr_asym_2way_mem_region_mchbar_r_opcode 0x00 | ||
| 156 | |||
| 157 | /* Apollo Lake d-unit */ | ||
| 158 | |||
| 159 | struct d_cr_drp0 { | ||
| 160 | u32 rken0 : 1; | ||
| 161 | u32 rken1 : 1; | ||
| 162 | u32 ddmen : 1; | ||
| 163 | u32 rsvd3 : 1; | ||
| 164 | u32 dwid : 2; | ||
| 165 | u32 dden : 3; | ||
| 166 | u32 rsvd13_9 : 5; | ||
| 167 | u32 rsien : 1; | ||
| 168 | u32 bahen : 1; | ||
| 169 | u32 rsvd18_16 : 3; | ||
| 170 | u32 caswizzle : 2; | ||
| 171 | u32 eccen : 1; | ||
| 172 | u32 dramtype : 3; | ||
| 173 | u32 blmode : 3; | ||
| 174 | u32 addrdec : 2; | ||
| 175 | u32 dramdevice_pr : 2; | ||
| 176 | }; | ||
| 177 | |||
| 178 | #define d_cr_drp0_offset 0x1400 | ||
| 179 | #define d_cr_drp0_r_opcode 0x00 | ||
| 180 | |||
| 181 | /* Denverton d-unit */ | ||
| 182 | |||
| 183 | struct d_cr_dsch { | ||
| 184 | u32 ch0en : 1; | ||
| 185 | u32 ch1en : 1; | ||
| 186 | u32 ddr4en : 1; | ||
| 187 | u32 coldwake : 1; | ||
| 188 | u32 newbypdis : 1; | ||
| 189 | u32 chan_width : 1; | ||
| 190 | u32 rsvd6_6 : 1; | ||
| 191 | u32 ooodis : 1; | ||
| 192 | u32 rsvd18_8 : 11; | ||
| 193 | u32 ic : 1; | ||
| 194 | u32 rsvd31_20 : 12; | ||
| 195 | }; | ||
| 196 | |||
| 197 | #define d_cr_dsch_port 0x16 | ||
| 198 | #define d_cr_dsch_offset 0x0 | ||
| 199 | #define d_cr_dsch_r_opcode 0x0 | ||
| 200 | |||
| 201 | struct d_cr_ecc_ctrl { | ||
| 202 | u32 eccen : 1; | ||
| 203 | u32 rsvd31_1 : 31; | ||
| 204 | }; | ||
| 205 | |||
| 206 | #define d_cr_ecc_ctrl_offset 0x180 | ||
| 207 | #define d_cr_ecc_ctrl_r_opcode 0x0 | ||
| 208 | |||
| 209 | struct d_cr_drp { | ||
| 210 | u32 rken0 : 1; | ||
| 211 | u32 rken1 : 1; | ||
| 212 | u32 rken2 : 1; | ||
| 213 | u32 rken3 : 1; | ||
| 214 | u32 dimmdwid0 : 2; | ||
| 215 | u32 dimmdden0 : 2; | ||
| 216 | u32 dimmdwid1 : 2; | ||
| 217 | u32 dimmdden1 : 2; | ||
| 218 | u32 rsvd15_12 : 4; | ||
| 219 | u32 dimmflip : 1; | ||
| 220 | u32 rsvd31_17 : 15; | ||
| 221 | }; | ||
| 222 | |||
| 223 | #define d_cr_drp_offset 0x158 | ||
| 224 | #define d_cr_drp_r_opcode 0x0 | ||
| 225 | |||
| 226 | struct d_cr_dmap { | ||
| 227 | u32 ba0 : 5; | ||
| 228 | u32 ba1 : 5; | ||
| 229 | u32 bg0 : 5; /* if ddr3, ba2 = bg0 */ | ||
| 230 | u32 bg1 : 5; /* if ddr3, ba3 = bg1 */ | ||
| 231 | u32 rs0 : 5; | ||
| 232 | u32 rs1 : 5; | ||
| 233 | u32 rsvd : 2; | ||
| 234 | }; | ||
| 235 | |||
| 236 | #define d_cr_dmap_offset 0x174 | ||
| 237 | #define d_cr_dmap_r_opcode 0x0 | ||
| 238 | |||
| 239 | struct d_cr_dmap1 { | ||
| 240 | u32 ca11 : 6; | ||
| 241 | u32 bxor : 1; | ||
| 242 | u32 rsvd : 25; | ||
| 243 | }; | ||
| 244 | |||
| 245 | #define d_cr_dmap1_offset 0xb4 | ||
| 246 | #define d_cr_dmap1_r_opcode 0x0 | ||
| 247 | |||
| 248 | struct d_cr_dmap2 { | ||
| 249 | u32 row0 : 5; | ||
| 250 | u32 row1 : 5; | ||
| 251 | u32 row2 : 5; | ||
| 252 | u32 row3 : 5; | ||
| 253 | u32 row4 : 5; | ||
| 254 | u32 row5 : 5; | ||
| 255 | u32 rsvd : 2; | ||
| 256 | }; | ||
| 257 | |||
| 258 | #define d_cr_dmap2_offset 0x148 | ||
| 259 | #define d_cr_dmap2_r_opcode 0x0 | ||
| 260 | |||
| 261 | struct d_cr_dmap3 { | ||
| 262 | u32 row6 : 5; | ||
| 263 | u32 row7 : 5; | ||
| 264 | u32 row8 : 5; | ||
| 265 | u32 row9 : 5; | ||
| 266 | u32 row10 : 5; | ||
| 267 | u32 row11 : 5; | ||
| 268 | u32 rsvd : 2; | ||
| 269 | }; | ||
| 270 | |||
| 271 | #define d_cr_dmap3_offset 0x14c | ||
| 272 | #define d_cr_dmap3_r_opcode 0x0 | ||
| 273 | |||
| 274 | struct d_cr_dmap4 { | ||
| 275 | u32 row12 : 5; | ||
| 276 | u32 row13 : 5; | ||
| 277 | u32 row14 : 5; | ||
| 278 | u32 row15 : 5; | ||
| 279 | u32 row16 : 5; | ||
| 280 | u32 row17 : 5; | ||
| 281 | u32 rsvd : 2; | ||
| 282 | }; | ||
| 283 | |||
| 284 | #define d_cr_dmap4_offset 0x150 | ||
| 285 | #define d_cr_dmap4_r_opcode 0x0 | ||
| 286 | |||
| 287 | struct d_cr_dmap5 { | ||
| 288 | u32 ca3 : 4; | ||
| 289 | u32 ca4 : 4; | ||
| 290 | u32 ca5 : 4; | ||
| 291 | u32 ca6 : 4; | ||
| 292 | u32 ca7 : 4; | ||
| 293 | u32 ca8 : 4; | ||
| 294 | u32 ca9 : 4; | ||
| 295 | u32 rsvd : 4; | ||
| 296 | }; | ||
| 297 | |||
| 298 | #define d_cr_dmap5_offset 0x154 | ||
| 299 | #define d_cr_dmap5_r_opcode 0x0 | ||
| 300 | |||
| 301 | #endif /* _PND2_REGS_H */ | ||
diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c index 6c270d9d304a..669246056812 100644 --- a/drivers/edac/xgene_edac.c +++ b/drivers/edac/xgene_edac.c | |||
| @@ -1596,7 +1596,7 @@ static void xgene_edac_pa_report(struct edac_device_ctl_info *edac_dev) | |||
| 1596 | reg = readl(ctx->dev_csr + IOBPATRANSERRINTSTS); | 1596 | reg = readl(ctx->dev_csr + IOBPATRANSERRINTSTS); |
| 1597 | if (!reg) | 1597 | if (!reg) |
| 1598 | goto chk_iob_axi0; | 1598 | goto chk_iob_axi0; |
| 1599 | dev_err(edac_dev->dev, "IOB procesing agent (PA) transaction error\n"); | 1599 | dev_err(edac_dev->dev, "IOB processing agent (PA) transaction error\n"); |
| 1600 | if (reg & IOBPA_RDATA_CORRUPT_MASK) | 1600 | if (reg & IOBPA_RDATA_CORRUPT_MASK) |
| 1601 | dev_err(edac_dev->dev, "IOB PA read data RAM error\n"); | 1601 | dev_err(edac_dev->dev, "IOB PA read data RAM error\n"); |
| 1602 | if (reg & IOBPA_M_RDATA_CORRUPT_MASK) | 1602 | if (reg & IOBPA_M_RDATA_CORRUPT_MASK) |
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index e7d404059b73..b372aad3b449 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c | |||
| @@ -389,7 +389,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md) | |||
| 389 | return 0; | 389 | return 0; |
| 390 | } | 390 | } |
| 391 | } | 391 | } |
| 392 | pr_err_once("requested map not found.\n"); | ||
| 393 | return -ENOENT; | 392 | return -ENOENT; |
| 394 | } | 393 | } |
| 395 | 394 | ||
diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c index 08b026864d4e..8554d7aec31c 100644 --- a/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c | |||
| @@ -254,7 +254,7 @@ void __init efi_esrt_init(void) | |||
| 254 | 254 | ||
| 255 | rc = efi_mem_desc_lookup(efi.esrt, &md); | 255 | rc = efi_mem_desc_lookup(efi.esrt, &md); |
| 256 | if (rc < 0) { | 256 | if (rc < 0) { |
| 257 | pr_err("ESRT header is not in the memory map.\n"); | 257 | pr_warn("ESRT header is not in the memory map.\n"); |
| 258 | return; | 258 | return; |
| 259 | } | 259 | } |
| 260 | 260 | ||
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 9b37a3692b3f..2bd683e2be02 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c | |||
| @@ -266,6 +266,9 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares, | |||
| 266 | goto fail_free_event; | 266 | goto fail_free_event; |
| 267 | } | 267 | } |
| 268 | 268 | ||
| 269 | if (agpio->wake_capable == ACPI_WAKE_CAPABLE) | ||
| 270 | enable_irq_wake(irq); | ||
| 271 | |||
| 269 | list_add_tail(&event->node, &acpi_gpio->events); | 272 | list_add_tail(&event->node, &acpi_gpio->events); |
| 270 | return AE_OK; | 273 | return AE_OK; |
| 271 | 274 | ||
| @@ -339,6 +342,9 @@ void acpi_gpiochip_free_interrupts(struct gpio_chip *chip) | |||
| 339 | list_for_each_entry_safe_reverse(event, ep, &acpi_gpio->events, node) { | 342 | list_for_each_entry_safe_reverse(event, ep, &acpi_gpio->events, node) { |
| 340 | struct gpio_desc *desc; | 343 | struct gpio_desc *desc; |
| 341 | 344 | ||
| 345 | if (irqd_is_wakeup_set(irq_get_irq_data(event->irq))) | ||
| 346 | disable_irq_wake(event->irq); | ||
| 347 | |||
| 342 | free_irq(event->irq, event); | 348 | free_irq(event->irq, event); |
| 343 | desc = event->desc; | 349 | desc = event->desc; |
| 344 | if (WARN_ON(IS_ERR(desc))) | 350 | if (WARN_ON(IS_ERR(desc))) |
| @@ -571,8 +577,10 @@ struct gpio_desc *acpi_find_gpio(struct device *dev, | |||
| 571 | } | 577 | } |
| 572 | 578 | ||
| 573 | desc = acpi_get_gpiod_by_index(adev, propname, idx, &info); | 579 | desc = acpi_get_gpiod_by_index(adev, propname, idx, &info); |
| 574 | if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER)) | 580 | if (!IS_ERR(desc)) |
| 575 | break; | 581 | break; |
| 582 | if (PTR_ERR(desc) == -EPROBE_DEFER) | ||
| 583 | return ERR_CAST(desc); | ||
| 576 | } | 584 | } |
| 577 | 585 | ||
| 578 | /* Then from plain _CRS GPIOs */ | 586 | /* Then from plain _CRS GPIOs */ |
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index bafbcb463555..4f587058a3aa 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c | |||
| @@ -1327,6 +1327,8 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, | |||
| 1327 | goto out_pm_put; | 1327 | goto out_pm_put; |
| 1328 | } | 1328 | } |
| 1329 | 1329 | ||
| 1330 | mutex_lock(&gpu->lock); | ||
| 1331 | |||
| 1330 | fence = etnaviv_gpu_fence_alloc(gpu); | 1332 | fence = etnaviv_gpu_fence_alloc(gpu); |
| 1331 | if (!fence) { | 1333 | if (!fence) { |
| 1332 | event_free(gpu, event); | 1334 | event_free(gpu, event); |
| @@ -1334,8 +1336,6 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, | |||
| 1334 | goto out_pm_put; | 1336 | goto out_pm_put; |
| 1335 | } | 1337 | } |
| 1336 | 1338 | ||
| 1337 | mutex_lock(&gpu->lock); | ||
| 1338 | |||
| 1339 | gpu->event[event].fence = fence; | 1339 | gpu->event[event].fence = fence; |
| 1340 | submit->fence = dma_fence_get(fence); | 1340 | submit->fence = dma_fence_get(fence); |
| 1341 | gpu->active_fence = submit->fence->seqno; | 1341 | gpu->active_fence = submit->fence->seqno; |
diff --git a/drivers/gpu/drm/i915/gvt/edid.c b/drivers/gpu/drm/i915/gvt/edid.c index f1648fe5e5ea..42cd09ec63fa 100644 --- a/drivers/gpu/drm/i915/gvt/edid.c +++ b/drivers/gpu/drm/i915/gvt/edid.c | |||
| @@ -495,7 +495,8 @@ void intel_gvt_i2c_handle_aux_ch_write(struct intel_vgpu *vgpu, | |||
| 495 | unsigned char val = edid_get_byte(vgpu); | 495 | unsigned char val = edid_get_byte(vgpu); |
| 496 | 496 | ||
| 497 | aux_data_for_write = (val << 16); | 497 | aux_data_for_write = (val << 16); |
| 498 | } | 498 | } else |
| 499 | aux_data_for_write = (0xff << 16); | ||
| 499 | } | 500 | } |
| 500 | /* write the return value in AUX_CH_DATA reg which includes: | 501 | /* write the return value in AUX_CH_DATA reg which includes: |
| 501 | * ACK of I2C_WRITE | 502 | * ACK of I2C_WRITE |
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c index 69d3d8ddecc2..6da4e444e572 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c | |||
| @@ -1837,11 +1837,15 @@ static int emulate_gtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off, | |||
| 1837 | ret = gtt_entry_p2m(vgpu, &e, &m); | 1837 | ret = gtt_entry_p2m(vgpu, &e, &m); |
| 1838 | if (ret) { | 1838 | if (ret) { |
| 1839 | gvt_vgpu_err("fail to translate guest gtt entry\n"); | 1839 | gvt_vgpu_err("fail to translate guest gtt entry\n"); |
| 1840 | return ret; | 1840 | /* guest driver may read/write the entry when partial |
| 1841 | * update the entry in this situation p2m will fail | ||
| 1842 | * settting the shadow entry to point to a scratch page | ||
| 1843 | */ | ||
| 1844 | ops->set_pfn(&m, gvt->gtt.scratch_ggtt_mfn); | ||
| 1841 | } | 1845 | } |
| 1842 | } else { | 1846 | } else { |
| 1843 | m = e; | 1847 | m = e; |
| 1844 | m.val64 = 0; | 1848 | ops->set_pfn(&m, gvt->gtt.scratch_ggtt_mfn); |
| 1845 | } | 1849 | } |
| 1846 | 1850 | ||
| 1847 | ggtt_set_shadow_entry(ggtt_mm, &m, g_gtt_index); | 1851 | ggtt_set_shadow_entry(ggtt_mm, &m, g_gtt_index); |
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c index 68600a3c46e5..0ad1a508e2af 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c | |||
| @@ -974,6 +974,14 @@ static int dp_aux_ch_ctl_mmio_write(struct intel_vgpu *vgpu, | |||
| 974 | return 0; | 974 | return 0; |
| 975 | } | 975 | } |
| 976 | 976 | ||
| 977 | static int mbctl_write(struct intel_vgpu *vgpu, unsigned int offset, | ||
| 978 | void *p_data, unsigned int bytes) | ||
| 979 | { | ||
| 980 | *(u32 *)p_data &= (~GEN6_MBCTL_ENABLE_BOOT_FETCH); | ||
| 981 | write_vreg(vgpu, offset, p_data, bytes); | ||
| 982 | return 0; | ||
| 983 | } | ||
| 984 | |||
| 977 | static int vga_control_mmio_write(struct intel_vgpu *vgpu, unsigned int offset, | 985 | static int vga_control_mmio_write(struct intel_vgpu *vgpu, unsigned int offset, |
| 978 | void *p_data, unsigned int bytes) | 986 | void *p_data, unsigned int bytes) |
| 979 | { | 987 | { |
| @@ -2245,7 +2253,7 @@ static int init_generic_mmio_info(struct intel_gvt *gvt) | |||
| 2245 | MMIO_D(0x7180, D_ALL); | 2253 | MMIO_D(0x7180, D_ALL); |
| 2246 | MMIO_D(0x7408, D_ALL); | 2254 | MMIO_D(0x7408, D_ALL); |
| 2247 | MMIO_D(0x7c00, D_ALL); | 2255 | MMIO_D(0x7c00, D_ALL); |
| 2248 | MMIO_D(GEN6_MBCTL, D_ALL); | 2256 | MMIO_DH(GEN6_MBCTL, D_ALL, NULL, mbctl_write); |
| 2249 | MMIO_D(0x911c, D_ALL); | 2257 | MMIO_D(0x911c, D_ALL); |
| 2250 | MMIO_D(0x9120, D_ALL); | 2258 | MMIO_D(0x9120, D_ALL); |
| 2251 | MMIO_DFH(GEN7_UCGCTL4, D_ALL, F_CMD_ACCESS, NULL, NULL); | 2259 | MMIO_DFH(GEN7_UCGCTL4, D_ALL, F_CMD_ACCESS, NULL, NULL); |
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index 5f55d89a0959..42ff7ffb6066 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c | |||
| @@ -1360,6 +1360,7 @@ static int kvmgt_guest_init(struct mdev_device *mdev) | |||
| 1360 | vgpu->handle = (unsigned long)info; | 1360 | vgpu->handle = (unsigned long)info; |
| 1361 | info->vgpu = vgpu; | 1361 | info->vgpu = vgpu; |
| 1362 | info->kvm = kvm; | 1362 | info->kvm = kvm; |
| 1363 | kvm_get_kvm(info->kvm); | ||
| 1363 | 1364 | ||
| 1364 | kvmgt_protect_table_init(info); | 1365 | kvmgt_protect_table_init(info); |
| 1365 | gvt_cache_init(vgpu); | 1366 | gvt_cache_init(vgpu); |
| @@ -1374,6 +1375,7 @@ static int kvmgt_guest_init(struct mdev_device *mdev) | |||
| 1374 | static bool kvmgt_guest_exit(struct kvmgt_guest_info *info) | 1375 | static bool kvmgt_guest_exit(struct kvmgt_guest_info *info) |
| 1375 | { | 1376 | { |
| 1376 | kvm_page_track_unregister_notifier(info->kvm, &info->track_node); | 1377 | kvm_page_track_unregister_notifier(info->kvm, &info->track_node); |
| 1378 | kvm_put_kvm(info->kvm); | ||
| 1377 | kvmgt_protect_table_destroy(info); | 1379 | kvmgt_protect_table_destroy(info); |
| 1378 | gvt_cache_destroy(info->vgpu); | 1380 | gvt_cache_destroy(info->vgpu); |
| 1379 | vfree(info); | 1381 | vfree(info); |
diff --git a/drivers/gpu/drm/i915/gvt/render.c b/drivers/gpu/drm/i915/gvt/render.c index e24e57afc45e..a7b665e9bbad 100644 --- a/drivers/gpu/drm/i915/gvt/render.c +++ b/drivers/gpu/drm/i915/gvt/render.c | |||
| @@ -219,7 +219,7 @@ static void load_mocs(struct intel_vgpu *vgpu, int ring_id) | |||
| 219 | l3_offset.reg = 0xb020; | 219 | l3_offset.reg = 0xb020; |
| 220 | for (i = 0; i < 32; i++) { | 220 | for (i = 0; i < 32; i++) { |
| 221 | gen9_render_mocs_L3[i] = I915_READ(l3_offset); | 221 | gen9_render_mocs_L3[i] = I915_READ(l3_offset); |
| 222 | I915_WRITE(l3_offset, vgpu_vreg(vgpu, offset)); | 222 | I915_WRITE(l3_offset, vgpu_vreg(vgpu, l3_offset)); |
| 223 | POSTING_READ(l3_offset); | 223 | POSTING_READ(l3_offset); |
| 224 | l3_offset.reg += 4; | 224 | l3_offset.reg += 4; |
| 225 | } | 225 | } |
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index 375038252761..a77db2332e68 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c | |||
| @@ -127,6 +127,11 @@ static int populate_shadow_context(struct intel_vgpu_workload *workload) | |||
| 127 | return 0; | 127 | return 0; |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | static inline bool is_gvt_request(struct drm_i915_gem_request *req) | ||
| 131 | { | ||
| 132 | return i915_gem_context_force_single_submission(req->ctx); | ||
| 133 | } | ||
| 134 | |||
| 130 | static int shadow_context_status_change(struct notifier_block *nb, | 135 | static int shadow_context_status_change(struct notifier_block *nb, |
| 131 | unsigned long action, void *data) | 136 | unsigned long action, void *data) |
| 132 | { | 137 | { |
| @@ -137,7 +142,7 @@ static int shadow_context_status_change(struct notifier_block *nb, | |||
| 137 | struct intel_vgpu_workload *workload = | 142 | struct intel_vgpu_workload *workload = |
| 138 | scheduler->current_workload[req->engine->id]; | 143 | scheduler->current_workload[req->engine->id]; |
| 139 | 144 | ||
| 140 | if (unlikely(!workload)) | 145 | if (!is_gvt_request(req) || unlikely(!workload)) |
| 141 | return NOTIFY_OK; | 146 | return NOTIFY_OK; |
| 142 | 147 | ||
| 143 | switch (action) { | 148 | switch (action) { |
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index 4414cf73735d..36602ac7e248 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright (c) 2016 The Linux Foundation. All rights reserved. | 1 | /* Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. |
| 2 | * | 2 | * |
| 3 | * This program is free software; you can redistribute it and/or modify | 3 | * This program is free software; you can redistribute it and/or modify |
| 4 | * it under the terms of the GNU General Public License version 2 and | 4 | * it under the terms of the GNU General Public License version 2 and |
| @@ -534,7 +534,7 @@ static void a5xx_destroy(struct msm_gpu *gpu) | |||
| 534 | } | 534 | } |
| 535 | 535 | ||
| 536 | if (a5xx_gpu->gpmu_bo) { | 536 | if (a5xx_gpu->gpmu_bo) { |
| 537 | if (a5xx_gpu->gpmu_bo) | 537 | if (a5xx_gpu->gpmu_iova) |
| 538 | msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->id); | 538 | msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->id); |
| 539 | drm_gem_object_unreference_unlocked(a5xx_gpu->gpmu_bo); | 539 | drm_gem_object_unreference_unlocked(a5xx_gpu->gpmu_bo); |
| 540 | } | 540 | } |
| @@ -860,7 +860,9 @@ static const struct adreno_gpu_funcs funcs = { | |||
| 860 | .idle = a5xx_idle, | 860 | .idle = a5xx_idle, |
| 861 | .irq = a5xx_irq, | 861 | .irq = a5xx_irq, |
| 862 | .destroy = a5xx_destroy, | 862 | .destroy = a5xx_destroy, |
| 863 | #ifdef CONFIG_DEBUG_FS | ||
| 863 | .show = a5xx_show, | 864 | .show = a5xx_show, |
| 865 | #endif | ||
| 864 | }, | 866 | }, |
| 865 | .get_timestamp = a5xx_get_timestamp, | 867 | .get_timestamp = a5xx_get_timestamp, |
| 866 | }; | 868 | }; |
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index c9bd1e6225f4..5ae65426b4e5 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c | |||
| @@ -418,18 +418,27 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, | |||
| 418 | return 0; | 418 | return 0; |
| 419 | } | 419 | } |
| 420 | 420 | ||
| 421 | void adreno_gpu_cleanup(struct adreno_gpu *gpu) | 421 | void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu) |
| 422 | { | 422 | { |
| 423 | if (gpu->memptrs_bo) { | 423 | struct msm_gpu *gpu = &adreno_gpu->base; |
| 424 | if (gpu->memptrs) | 424 | |
| 425 | msm_gem_put_vaddr(gpu->memptrs_bo); | 425 | if (adreno_gpu->memptrs_bo) { |
| 426 | if (adreno_gpu->memptrs) | ||
| 427 | msm_gem_put_vaddr(adreno_gpu->memptrs_bo); | ||
| 428 | |||
| 429 | if (adreno_gpu->memptrs_iova) | ||
| 430 | msm_gem_put_iova(adreno_gpu->memptrs_bo, gpu->id); | ||
| 431 | |||
| 432 | drm_gem_object_unreference_unlocked(adreno_gpu->memptrs_bo); | ||
| 433 | } | ||
| 434 | release_firmware(adreno_gpu->pm4); | ||
| 435 | release_firmware(adreno_gpu->pfp); | ||
| 426 | 436 | ||
| 427 | if (gpu->memptrs_iova) | 437 | msm_gpu_cleanup(gpu); |
| 428 | msm_gem_put_iova(gpu->memptrs_bo, gpu->base.id); | ||
| 429 | 438 | ||
| 430 | drm_gem_object_unreference_unlocked(gpu->memptrs_bo); | 439 | if (gpu->aspace) { |
| 440 | gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu, | ||
| 441 | iommu_ports, ARRAY_SIZE(iommu_ports)); | ||
| 442 | msm_gem_address_space_destroy(gpu->aspace); | ||
| 431 | } | 443 | } |
| 432 | release_firmware(gpu->pm4); | ||
| 433 | release_firmware(gpu->pfp); | ||
| 434 | msm_gpu_cleanup(&gpu->base); | ||
| 435 | } | 444 | } |
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 921270ea6059..a879ffa534b4 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c | |||
| @@ -171,7 +171,7 @@ dsi_mgr_phy_enable(int id, | |||
| 171 | } | 171 | } |
| 172 | } | 172 | } |
| 173 | } else { | 173 | } else { |
| 174 | msm_dsi_host_reset_phy(mdsi->host); | 174 | msm_dsi_host_reset_phy(msm_dsi->host); |
| 175 | ret = enable_phy(msm_dsi, src_pll_id, &shared_timings[id]); | 175 | ret = enable_phy(msm_dsi, src_pll_id, &shared_timings[id]); |
| 176 | if (ret) | 176 | if (ret) |
| 177 | return ret; | 177 | return ret; |
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_audio.c b/drivers/gpu/drm/msm/hdmi/hdmi_audio.c index a54d3bb5baad..8177e8511afd 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_audio.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_audio.c | |||
| @@ -18,13 +18,6 @@ | |||
| 18 | #include <linux/hdmi.h> | 18 | #include <linux/hdmi.h> |
| 19 | #include "hdmi.h" | 19 | #include "hdmi.h" |
| 20 | 20 | ||
| 21 | |||
| 22 | /* Supported HDMI Audio channels */ | ||
| 23 | #define MSM_HDMI_AUDIO_CHANNEL_2 0 | ||
| 24 | #define MSM_HDMI_AUDIO_CHANNEL_4 1 | ||
| 25 | #define MSM_HDMI_AUDIO_CHANNEL_6 2 | ||
| 26 | #define MSM_HDMI_AUDIO_CHANNEL_8 3 | ||
| 27 | |||
| 28 | /* maps MSM_HDMI_AUDIO_CHANNEL_n consts used by audio driver to # of channels: */ | 21 | /* maps MSM_HDMI_AUDIO_CHANNEL_n consts used by audio driver to # of channels: */ |
| 29 | static int nchannels[] = { 2, 4, 6, 8 }; | 22 | static int nchannels[] = { 2, 4, 6, 8 }; |
| 30 | 23 | ||
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h index 611da7a660c9..238901987e00 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h | |||
| @@ -18,7 +18,8 @@ | |||
| 18 | #ifndef __MDP5_PIPE_H__ | 18 | #ifndef __MDP5_PIPE_H__ |
| 19 | #define __MDP5_PIPE_H__ | 19 | #define __MDP5_PIPE_H__ |
| 20 | 20 | ||
| 21 | #define SSPP_MAX (SSPP_RGB3 + 1) /* TODO: Add SSPP_MAX in mdp5.xml.h */ | 21 | /* TODO: Add SSPP_MAX in mdp5.xml.h */ |
| 22 | #define SSPP_MAX (SSPP_CURSOR1 + 1) | ||
| 22 | 23 | ||
| 23 | /* represents a hw pipe, which is dynamically assigned to a plane */ | 24 | /* represents a hw pipe, which is dynamically assigned to a plane */ |
| 24 | struct mdp5_hw_pipe { | 25 | struct mdp5_hw_pipe { |
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 59811f29607d..68e509b3b9e4 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c | |||
| @@ -812,6 +812,12 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev, | |||
| 812 | 812 | ||
| 813 | size = PAGE_ALIGN(size); | 813 | size = PAGE_ALIGN(size); |
| 814 | 814 | ||
| 815 | /* Disallow zero sized objects as they make the underlying | ||
| 816 | * infrastructure grumpy | ||
| 817 | */ | ||
| 818 | if (size == 0) | ||
| 819 | return ERR_PTR(-EINVAL); | ||
| 820 | |||
| 815 | ret = msm_gem_new_impl(dev, size, flags, NULL, &obj); | 821 | ret = msm_gem_new_impl(dev, size, flags, NULL, &obj); |
| 816 | if (ret) | 822 | if (ret) |
| 817 | goto fail; | 823 | goto fail; |
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 99e05aacbee1..af5b6ba4095b 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c | |||
| @@ -706,9 +706,6 @@ void msm_gpu_cleanup(struct msm_gpu *gpu) | |||
| 706 | msm_ringbuffer_destroy(gpu->rb); | 706 | msm_ringbuffer_destroy(gpu->rb); |
| 707 | } | 707 | } |
| 708 | 708 | ||
| 709 | if (gpu->aspace) | ||
| 710 | msm_gem_address_space_destroy(gpu->aspace); | ||
| 711 | |||
| 712 | if (gpu->fctx) | 709 | if (gpu->fctx) |
| 713 | msm_fence_context_free(gpu->fctx); | 710 | msm_fence_context_free(gpu->fctx); |
| 714 | } | 711 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index bfb06469db46..8b7623b5a624 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
| @@ -213,8 +213,8 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo, | |||
| 213 | rbo->placement.num_busy_placement = 0; | 213 | rbo->placement.num_busy_placement = 0; |
| 214 | for (i = 0; i < rbo->placement.num_placement; i++) { | 214 | for (i = 0; i < rbo->placement.num_placement; i++) { |
| 215 | if (rbo->placements[i].flags & TTM_PL_FLAG_VRAM) { | 215 | if (rbo->placements[i].flags & TTM_PL_FLAG_VRAM) { |
| 216 | if (rbo->placements[0].fpfn < fpfn) | 216 | if (rbo->placements[i].fpfn < fpfn) |
| 217 | rbo->placements[0].fpfn = fpfn; | 217 | rbo->placements[i].fpfn = fpfn; |
| 218 | } else { | 218 | } else { |
| 219 | rbo->placement.busy_placement = | 219 | rbo->placement.busy_placement = |
| 220 | &rbo->placements[i]; | 220 | &rbo->placements[i]; |
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c index fdb451e3ec01..26a7ad0f4789 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c | |||
| @@ -179,7 +179,7 @@ int ttm_base_object_init(struct ttm_object_file *tfile, | |||
| 179 | if (unlikely(ret != 0)) | 179 | if (unlikely(ret != 0)) |
| 180 | goto out_err0; | 180 | goto out_err0; |
| 181 | 181 | ||
| 182 | ret = ttm_ref_object_add(tfile, base, TTM_REF_USAGE, NULL); | 182 | ret = ttm_ref_object_add(tfile, base, TTM_REF_USAGE, NULL, false); |
| 183 | if (unlikely(ret != 0)) | 183 | if (unlikely(ret != 0)) |
| 184 | goto out_err1; | 184 | goto out_err1; |
| 185 | 185 | ||
| @@ -318,7 +318,8 @@ EXPORT_SYMBOL(ttm_ref_object_exists); | |||
| 318 | 318 | ||
| 319 | int ttm_ref_object_add(struct ttm_object_file *tfile, | 319 | int ttm_ref_object_add(struct ttm_object_file *tfile, |
| 320 | struct ttm_base_object *base, | 320 | struct ttm_base_object *base, |
| 321 | enum ttm_ref_type ref_type, bool *existed) | 321 | enum ttm_ref_type ref_type, bool *existed, |
| 322 | bool require_existed) | ||
| 322 | { | 323 | { |
| 323 | struct drm_open_hash *ht = &tfile->ref_hash[ref_type]; | 324 | struct drm_open_hash *ht = &tfile->ref_hash[ref_type]; |
| 324 | struct ttm_ref_object *ref; | 325 | struct ttm_ref_object *ref; |
| @@ -345,6 +346,9 @@ int ttm_ref_object_add(struct ttm_object_file *tfile, | |||
| 345 | } | 346 | } |
| 346 | 347 | ||
| 347 | rcu_read_unlock(); | 348 | rcu_read_unlock(); |
| 349 | if (require_existed) | ||
| 350 | return -EPERM; | ||
| 351 | |||
| 348 | ret = ttm_mem_global_alloc(mem_glob, sizeof(*ref), | 352 | ret = ttm_mem_global_alloc(mem_glob, sizeof(*ref), |
| 349 | false, false); | 353 | false, false); |
| 350 | if (unlikely(ret != 0)) | 354 | if (unlikely(ret != 0)) |
| @@ -449,10 +453,10 @@ void ttm_object_file_release(struct ttm_object_file **p_tfile) | |||
| 449 | ttm_ref_object_release(&ref->kref); | 453 | ttm_ref_object_release(&ref->kref); |
| 450 | } | 454 | } |
| 451 | 455 | ||
| 456 | spin_unlock(&tfile->lock); | ||
| 452 | for (i = 0; i < TTM_REF_NUM; ++i) | 457 | for (i = 0; i < TTM_REF_NUM; ++i) |
| 453 | drm_ht_remove(&tfile->ref_hash[i]); | 458 | drm_ht_remove(&tfile->ref_hash[i]); |
| 454 | 459 | ||
| 455 | spin_unlock(&tfile->lock); | ||
| 456 | ttm_object_file_unref(&tfile); | 460 | ttm_object_file_unref(&tfile); |
| 457 | } | 461 | } |
| 458 | EXPORT_SYMBOL(ttm_object_file_release); | 462 | EXPORT_SYMBOL(ttm_object_file_release); |
| @@ -529,9 +533,7 @@ void ttm_object_device_release(struct ttm_object_device **p_tdev) | |||
| 529 | 533 | ||
| 530 | *p_tdev = NULL; | 534 | *p_tdev = NULL; |
| 531 | 535 | ||
| 532 | spin_lock(&tdev->object_lock); | ||
| 533 | drm_ht_remove(&tdev->object_hash); | 536 | drm_ht_remove(&tdev->object_hash); |
| 534 | spin_unlock(&tdev->object_lock); | ||
| 535 | 537 | ||
| 536 | kfree(tdev); | 538 | kfree(tdev); |
| 537 | } | 539 | } |
| @@ -635,7 +637,7 @@ int ttm_prime_fd_to_handle(struct ttm_object_file *tfile, | |||
| 635 | prime = (struct ttm_prime_object *) dma_buf->priv; | 637 | prime = (struct ttm_prime_object *) dma_buf->priv; |
| 636 | base = &prime->base; | 638 | base = &prime->base; |
| 637 | *handle = base->hash.key; | 639 | *handle = base->hash.key; |
| 638 | ret = ttm_ref_object_add(tfile, base, TTM_REF_USAGE, NULL); | 640 | ret = ttm_ref_object_add(tfile, base, TTM_REF_USAGE, NULL, false); |
| 639 | 641 | ||
| 640 | dma_buf_put(dma_buf); | 642 | dma_buf_put(dma_buf); |
| 641 | 643 | ||
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 865e9f494bcc..e8f28c9145a0 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c | |||
| @@ -846,6 +846,17 @@ static void vc4_crtc_destroy_state(struct drm_crtc *crtc, | |||
| 846 | drm_atomic_helper_crtc_destroy_state(crtc, state); | 846 | drm_atomic_helper_crtc_destroy_state(crtc, state); |
| 847 | } | 847 | } |
| 848 | 848 | ||
| 849 | static void | ||
| 850 | vc4_crtc_reset(struct drm_crtc *crtc) | ||
| 851 | { | ||
| 852 | if (crtc->state) | ||
| 853 | __drm_atomic_helper_crtc_destroy_state(crtc->state); | ||
| 854 | |||
| 855 | crtc->state = kzalloc(sizeof(struct vc4_crtc_state), GFP_KERNEL); | ||
| 856 | if (crtc->state) | ||
| 857 | crtc->state->crtc = crtc; | ||
| 858 | } | ||
| 859 | |||
| 849 | static const struct drm_crtc_funcs vc4_crtc_funcs = { | 860 | static const struct drm_crtc_funcs vc4_crtc_funcs = { |
| 850 | .set_config = drm_atomic_helper_set_config, | 861 | .set_config = drm_atomic_helper_set_config, |
| 851 | .destroy = vc4_crtc_destroy, | 862 | .destroy = vc4_crtc_destroy, |
| @@ -853,7 +864,7 @@ static const struct drm_crtc_funcs vc4_crtc_funcs = { | |||
| 853 | .set_property = NULL, | 864 | .set_property = NULL, |
| 854 | .cursor_set = NULL, /* handled by drm_mode_cursor_universal */ | 865 | .cursor_set = NULL, /* handled by drm_mode_cursor_universal */ |
| 855 | .cursor_move = NULL, /* handled by drm_mode_cursor_universal */ | 866 | .cursor_move = NULL, /* handled by drm_mode_cursor_universal */ |
| 856 | .reset = drm_atomic_helper_crtc_reset, | 867 | .reset = vc4_crtc_reset, |
| 857 | .atomic_duplicate_state = vc4_crtc_duplicate_state, | 868 | .atomic_duplicate_state = vc4_crtc_duplicate_state, |
| 858 | .atomic_destroy_state = vc4_crtc_destroy_state, | 869 | .atomic_destroy_state = vc4_crtc_destroy_state, |
| 859 | .gamma_set = vc4_crtc_gamma_set, | 870 | .gamma_set = vc4_crtc_gamma_set, |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c index b399f03a988d..6b2708b4eafe 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | |||
| @@ -538,7 +538,7 @@ int vmw_fence_create(struct vmw_fence_manager *fman, | |||
| 538 | struct vmw_fence_obj **p_fence) | 538 | struct vmw_fence_obj **p_fence) |
| 539 | { | 539 | { |
| 540 | struct vmw_fence_obj *fence; | 540 | struct vmw_fence_obj *fence; |
| 541 | int ret; | 541 | int ret; |
| 542 | 542 | ||
| 543 | fence = kzalloc(sizeof(*fence), GFP_KERNEL); | 543 | fence = kzalloc(sizeof(*fence), GFP_KERNEL); |
| 544 | if (unlikely(fence == NULL)) | 544 | if (unlikely(fence == NULL)) |
| @@ -701,6 +701,41 @@ void vmw_fence_fifo_up(struct vmw_fence_manager *fman) | |||
| 701 | } | 701 | } |
| 702 | 702 | ||
| 703 | 703 | ||
| 704 | /** | ||
| 705 | * vmw_fence_obj_lookup - Look up a user-space fence object | ||
| 706 | * | ||
| 707 | * @tfile: A struct ttm_object_file identifying the caller. | ||
| 708 | * @handle: A handle identifying the fence object. | ||
| 709 | * @return: A struct vmw_user_fence base ttm object on success or | ||
| 710 | * an error pointer on failure. | ||
| 711 | * | ||
| 712 | * The fence object is looked up and type-checked. The caller needs | ||
| 713 | * to have opened the fence object first, but since that happens on | ||
| 714 | * creation and fence objects aren't shareable, that's not an | ||
| 715 | * issue currently. | ||
| 716 | */ | ||
| 717 | static struct ttm_base_object * | ||
| 718 | vmw_fence_obj_lookup(struct ttm_object_file *tfile, u32 handle) | ||
| 719 | { | ||
| 720 | struct ttm_base_object *base = ttm_base_object_lookup(tfile, handle); | ||
| 721 | |||
| 722 | if (!base) { | ||
| 723 | pr_err("Invalid fence object handle 0x%08lx.\n", | ||
| 724 | (unsigned long)handle); | ||
| 725 | return ERR_PTR(-EINVAL); | ||
| 726 | } | ||
| 727 | |||
| 728 | if (base->refcount_release != vmw_user_fence_base_release) { | ||
| 729 | pr_err("Invalid fence object handle 0x%08lx.\n", | ||
| 730 | (unsigned long)handle); | ||
| 731 | ttm_base_object_unref(&base); | ||
| 732 | return ERR_PTR(-EINVAL); | ||
| 733 | } | ||
| 734 | |||
| 735 | return base; | ||
| 736 | } | ||
| 737 | |||
| 738 | |||
| 704 | int vmw_fence_obj_wait_ioctl(struct drm_device *dev, void *data, | 739 | int vmw_fence_obj_wait_ioctl(struct drm_device *dev, void *data, |
| 705 | struct drm_file *file_priv) | 740 | struct drm_file *file_priv) |
| 706 | { | 741 | { |
| @@ -726,12 +761,9 @@ int vmw_fence_obj_wait_ioctl(struct drm_device *dev, void *data, | |||
| 726 | arg->kernel_cookie = jiffies + wait_timeout; | 761 | arg->kernel_cookie = jiffies + wait_timeout; |
| 727 | } | 762 | } |
| 728 | 763 | ||
| 729 | base = ttm_base_object_lookup(tfile, arg->handle); | 764 | base = vmw_fence_obj_lookup(tfile, arg->handle); |
| 730 | if (unlikely(base == NULL)) { | 765 | if (IS_ERR(base)) |
| 731 | pr_err("Wait invalid fence object handle 0x%08lx\n", | 766 | return PTR_ERR(base); |
| 732 | (unsigned long)arg->handle); | ||
| 733 | return -EINVAL; | ||
| 734 | } | ||
| 735 | 767 | ||
| 736 | fence = &(container_of(base, struct vmw_user_fence, base)->fence); | 768 | fence = &(container_of(base, struct vmw_user_fence, base)->fence); |
| 737 | 769 | ||
| @@ -770,12 +802,9 @@ int vmw_fence_obj_signaled_ioctl(struct drm_device *dev, void *data, | |||
| 770 | struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile; | 802 | struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile; |
| 771 | struct vmw_private *dev_priv = vmw_priv(dev); | 803 | struct vmw_private *dev_priv = vmw_priv(dev); |
| 772 | 804 | ||
| 773 | base = ttm_base_object_lookup(tfile, arg->handle); | 805 | base = vmw_fence_obj_lookup(tfile, arg->handle); |
| 774 | if (unlikely(base == NULL)) { | 806 | if (IS_ERR(base)) |
| 775 | pr_err("Fence signaled invalid fence object handle 0x%08lx\n", | 807 | return PTR_ERR(base); |
| 776 | (unsigned long)arg->handle); | ||
| 777 | return -EINVAL; | ||
| 778 | } | ||
| 779 | 808 | ||
| 780 | fence = &(container_of(base, struct vmw_user_fence, base)->fence); | 809 | fence = &(container_of(base, struct vmw_user_fence, base)->fence); |
| 781 | fman = fman_from_fence(fence); | 810 | fman = fman_from_fence(fence); |
| @@ -1022,6 +1051,7 @@ int vmw_fence_event_ioctl(struct drm_device *dev, void *data, | |||
| 1022 | (struct drm_vmw_fence_event_arg *) data; | 1051 | (struct drm_vmw_fence_event_arg *) data; |
| 1023 | struct vmw_fence_obj *fence = NULL; | 1052 | struct vmw_fence_obj *fence = NULL; |
| 1024 | struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv); | 1053 | struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv); |
| 1054 | struct ttm_object_file *tfile = vmw_fp->tfile; | ||
| 1025 | struct drm_vmw_fence_rep __user *user_fence_rep = | 1055 | struct drm_vmw_fence_rep __user *user_fence_rep = |
| 1026 | (struct drm_vmw_fence_rep __user *)(unsigned long) | 1056 | (struct drm_vmw_fence_rep __user *)(unsigned long) |
| 1027 | arg->fence_rep; | 1057 | arg->fence_rep; |
| @@ -1035,24 +1065,18 @@ int vmw_fence_event_ioctl(struct drm_device *dev, void *data, | |||
| 1035 | */ | 1065 | */ |
| 1036 | if (arg->handle) { | 1066 | if (arg->handle) { |
| 1037 | struct ttm_base_object *base = | 1067 | struct ttm_base_object *base = |
| 1038 | ttm_base_object_lookup_for_ref(dev_priv->tdev, | 1068 | vmw_fence_obj_lookup(tfile, arg->handle); |
| 1039 | arg->handle); | 1069 | |
| 1040 | 1070 | if (IS_ERR(base)) | |
| 1041 | if (unlikely(base == NULL)) { | 1071 | return PTR_ERR(base); |
| 1042 | DRM_ERROR("Fence event invalid fence object handle " | 1072 | |
| 1043 | "0x%08lx.\n", | ||
| 1044 | (unsigned long)arg->handle); | ||
| 1045 | return -EINVAL; | ||
| 1046 | } | ||
| 1047 | fence = &(container_of(base, struct vmw_user_fence, | 1073 | fence = &(container_of(base, struct vmw_user_fence, |
| 1048 | base)->fence); | 1074 | base)->fence); |
| 1049 | (void) vmw_fence_obj_reference(fence); | 1075 | (void) vmw_fence_obj_reference(fence); |
| 1050 | 1076 | ||
| 1051 | if (user_fence_rep != NULL) { | 1077 | if (user_fence_rep != NULL) { |
| 1052 | bool existed; | ||
| 1053 | |||
| 1054 | ret = ttm_ref_object_add(vmw_fp->tfile, base, | 1078 | ret = ttm_ref_object_add(vmw_fp->tfile, base, |
| 1055 | TTM_REF_USAGE, &existed); | 1079 | TTM_REF_USAGE, NULL, false); |
| 1056 | if (unlikely(ret != 0)) { | 1080 | if (unlikely(ret != 0)) { |
| 1057 | DRM_ERROR("Failed to reference a fence " | 1081 | DRM_ERROR("Failed to reference a fence " |
| 1058 | "object.\n"); | 1082 | "object.\n"); |
| @@ -1095,8 +1119,7 @@ int vmw_fence_event_ioctl(struct drm_device *dev, void *data, | |||
| 1095 | return 0; | 1119 | return 0; |
| 1096 | out_no_create: | 1120 | out_no_create: |
| 1097 | if (user_fence_rep != NULL) | 1121 | if (user_fence_rep != NULL) |
| 1098 | ttm_ref_object_base_unref(vmw_fpriv(file_priv)->tfile, | 1122 | ttm_ref_object_base_unref(tfile, handle, TTM_REF_USAGE); |
| 1099 | handle, TTM_REF_USAGE); | ||
| 1100 | out_no_ref_obj: | 1123 | out_no_ref_obj: |
| 1101 | vmw_fence_obj_unreference(&fence); | 1124 | vmw_fence_obj_unreference(&fence); |
| 1102 | return ret; | 1125 | return ret; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c index b8c6a03c8c54..5ec24fd801cd 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | |||
| @@ -114,8 +114,6 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, | |||
| 114 | param->value = dev_priv->has_dx; | 114 | param->value = dev_priv->has_dx; |
| 115 | break; | 115 | break; |
| 116 | default: | 116 | default: |
| 117 | DRM_ERROR("Illegal vmwgfx get param request: %d\n", | ||
| 118 | param->param); | ||
| 119 | return -EINVAL; | 117 | return -EINVAL; |
| 120 | } | 118 | } |
| 121 | 119 | ||
| @@ -186,7 +184,7 @@ int vmw_get_cap_3d_ioctl(struct drm_device *dev, void *data, | |||
| 186 | bool gb_objects = !!(dev_priv->capabilities & SVGA_CAP_GBOBJECTS); | 184 | bool gb_objects = !!(dev_priv->capabilities & SVGA_CAP_GBOBJECTS); |
| 187 | struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv); | 185 | struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv); |
| 188 | 186 | ||
| 189 | if (unlikely(arg->pad64 != 0)) { | 187 | if (unlikely(arg->pad64 != 0 || arg->max_size == 0)) { |
| 190 | DRM_ERROR("Illegal GET_3D_CAP argument.\n"); | 188 | DRM_ERROR("Illegal GET_3D_CAP argument.\n"); |
| 191 | return -EINVAL; | 189 | return -EINVAL; |
| 192 | } | 190 | } |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index fa1037ec8e5f..7d591f653dfa 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | |||
| @@ -546,7 +546,7 @@ static int vmw_user_dmabuf_synccpu_grab(struct vmw_user_dma_buffer *user_bo, | |||
| 546 | return ret; | 546 | return ret; |
| 547 | 547 | ||
| 548 | ret = ttm_ref_object_add(tfile, &user_bo->prime.base, | 548 | ret = ttm_ref_object_add(tfile, &user_bo->prime.base, |
| 549 | TTM_REF_SYNCCPU_WRITE, &existed); | 549 | TTM_REF_SYNCCPU_WRITE, &existed, false); |
| 550 | if (ret != 0 || existed) | 550 | if (ret != 0 || existed) |
| 551 | ttm_bo_synccpu_write_release(&user_bo->dma.base); | 551 | ttm_bo_synccpu_write_release(&user_bo->dma.base); |
| 552 | 552 | ||
| @@ -730,7 +730,7 @@ int vmw_user_dmabuf_reference(struct ttm_object_file *tfile, | |||
| 730 | 730 | ||
| 731 | *handle = user_bo->prime.base.hash.key; | 731 | *handle = user_bo->prime.base.hash.key; |
| 732 | return ttm_ref_object_add(tfile, &user_bo->prime.base, | 732 | return ttm_ref_object_add(tfile, &user_bo->prime.base, |
| 733 | TTM_REF_USAGE, NULL); | 733 | TTM_REF_USAGE, NULL, false); |
| 734 | } | 734 | } |
| 735 | 735 | ||
| 736 | /** | 736 | /** |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index 41b9d20d6ae7..7681341fe32b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | |||
| @@ -713,11 +713,14 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, | |||
| 713 | 128; | 713 | 128; |
| 714 | 714 | ||
| 715 | num_sizes = 0; | 715 | num_sizes = 0; |
| 716 | for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i) | 716 | for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i) { |
| 717 | if (req->mip_levels[i] > DRM_VMW_MAX_MIP_LEVELS) | ||
| 718 | return -EINVAL; | ||
| 717 | num_sizes += req->mip_levels[i]; | 719 | num_sizes += req->mip_levels[i]; |
| 720 | } | ||
| 718 | 721 | ||
| 719 | if (num_sizes > DRM_VMW_MAX_SURFACE_FACES * | 722 | if (num_sizes > DRM_VMW_MAX_SURFACE_FACES * DRM_VMW_MAX_MIP_LEVELS || |
| 720 | DRM_VMW_MAX_MIP_LEVELS) | 723 | num_sizes == 0) |
| 721 | return -EINVAL; | 724 | return -EINVAL; |
| 722 | 725 | ||
| 723 | size = vmw_user_surface_size + 128 + | 726 | size = vmw_user_surface_size + 128 + |
| @@ -890,17 +893,16 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv, | |||
| 890 | uint32_t handle; | 893 | uint32_t handle; |
| 891 | struct ttm_base_object *base; | 894 | struct ttm_base_object *base; |
| 892 | int ret; | 895 | int ret; |
| 896 | bool require_exist = false; | ||
| 893 | 897 | ||
| 894 | if (handle_type == DRM_VMW_HANDLE_PRIME) { | 898 | if (handle_type == DRM_VMW_HANDLE_PRIME) { |
| 895 | ret = ttm_prime_fd_to_handle(tfile, u_handle, &handle); | 899 | ret = ttm_prime_fd_to_handle(tfile, u_handle, &handle); |
| 896 | if (unlikely(ret != 0)) | 900 | if (unlikely(ret != 0)) |
| 897 | return ret; | 901 | return ret; |
| 898 | } else { | 902 | } else { |
| 899 | if (unlikely(drm_is_render_client(file_priv))) { | 903 | if (unlikely(drm_is_render_client(file_priv))) |
| 900 | DRM_ERROR("Render client refused legacy " | 904 | require_exist = true; |
| 901 | "surface reference.\n"); | 905 | |
| 902 | return -EACCES; | ||
| 903 | } | ||
| 904 | if (ACCESS_ONCE(vmw_fpriv(file_priv)->locked_master)) { | 906 | if (ACCESS_ONCE(vmw_fpriv(file_priv)->locked_master)) { |
| 905 | DRM_ERROR("Locked master refused legacy " | 907 | DRM_ERROR("Locked master refused legacy " |
| 906 | "surface reference.\n"); | 908 | "surface reference.\n"); |
| @@ -928,17 +930,14 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv, | |||
| 928 | 930 | ||
| 929 | /* | 931 | /* |
| 930 | * Make sure the surface creator has the same | 932 | * Make sure the surface creator has the same |
| 931 | * authenticating master. | 933 | * authenticating master, or is already registered with us. |
| 932 | */ | 934 | */ |
| 933 | if (drm_is_primary_client(file_priv) && | 935 | if (drm_is_primary_client(file_priv) && |
| 934 | user_srf->master != file_priv->master) { | 936 | user_srf->master != file_priv->master) |
| 935 | DRM_ERROR("Trying to reference surface outside of" | 937 | require_exist = true; |
| 936 | " master domain.\n"); | ||
| 937 | ret = -EACCES; | ||
| 938 | goto out_bad_resource; | ||
| 939 | } | ||
| 940 | 938 | ||
| 941 | ret = ttm_ref_object_add(tfile, base, TTM_REF_USAGE, NULL); | 939 | ret = ttm_ref_object_add(tfile, base, TTM_REF_USAGE, NULL, |
| 940 | require_exist); | ||
| 942 | if (unlikely(ret != 0)) { | 941 | if (unlikely(ret != 0)) { |
| 943 | DRM_ERROR("Could not add a reference to a surface.\n"); | 942 | DRM_ERROR("Could not add a reference to a surface.\n"); |
| 944 | goto out_bad_resource; | 943 | goto out_bad_resource; |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 3ceb4a2af381..63ec1993eaaa 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -2112,6 +2112,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 2112 | { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SIRIUS_BATTERY_FREE_TABLET) }, | 2112 | { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SIRIUS_BATTERY_FREE_TABLET) }, |
| 2113 | { HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) }, | 2113 | { HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) }, |
| 2114 | { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE) }, | 2114 | { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE) }, |
| 2115 | { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_THT_2P_ARCADE) }, | ||
| 2115 | { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) }, | 2116 | { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) }, |
| 2116 | { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) }, | 2117 | { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) }, |
| 2117 | { HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) }, | 2118 | { HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 0e2e7c571d22..4e2648c86c8c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -1082,6 +1082,7 @@ | |||
| 1082 | 1082 | ||
| 1083 | #define USB_VENDOR_ID_XIN_MO 0x16c0 | 1083 | #define USB_VENDOR_ID_XIN_MO 0x16c0 |
| 1084 | #define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE 0x05e1 | 1084 | #define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE 0x05e1 |
| 1085 | #define USB_DEVICE_ID_THT_2P_ARCADE 0x75e1 | ||
| 1085 | 1086 | ||
| 1086 | #define USB_VENDOR_ID_XIROKU 0x1477 | 1087 | #define USB_VENDOR_ID_XIROKU 0x1477 |
| 1087 | #define USB_DEVICE_ID_XIROKU_SPX 0x1006 | 1088 | #define USB_DEVICE_ID_XIROKU_SPX 0x1006 |
diff --git a/drivers/hid/hid-xinmo.c b/drivers/hid/hid-xinmo.c index 7df5227a7e61..9ad7731d2e10 100644 --- a/drivers/hid/hid-xinmo.c +++ b/drivers/hid/hid-xinmo.c | |||
| @@ -46,6 +46,7 @@ static int xinmo_event(struct hid_device *hdev, struct hid_field *field, | |||
| 46 | 46 | ||
| 47 | static const struct hid_device_id xinmo_devices[] = { | 47 | static const struct hid_device_id xinmo_devices[] = { |
| 48 | { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE) }, | 48 | { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE) }, |
| 49 | { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_THT_2P_ARCADE) }, | ||
| 49 | { } | 50 | { } |
| 50 | }; | 51 | }; |
| 51 | 52 | ||
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 994bddc55b82..e2666ef84dc1 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c | |||
| @@ -2165,6 +2165,14 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) | |||
| 2165 | 2165 | ||
| 2166 | wacom_update_name(wacom, wireless ? " (WL)" : ""); | 2166 | wacom_update_name(wacom, wireless ? " (WL)" : ""); |
| 2167 | 2167 | ||
| 2168 | /* pen only Bamboo neither support touch nor pad */ | ||
| 2169 | if ((features->type == BAMBOO_PEN) && | ||
| 2170 | ((features->device_type & WACOM_DEVICETYPE_TOUCH) || | ||
| 2171 | (features->device_type & WACOM_DEVICETYPE_PAD))) { | ||
| 2172 | error = -ENODEV; | ||
| 2173 | goto fail; | ||
| 2174 | } | ||
| 2175 | |||
| 2168 | error = wacom_add_shared_data(hdev); | 2176 | error = wacom_add_shared_data(hdev); |
| 2169 | if (error) | 2177 | if (error) |
| 2170 | goto fail; | 2178 | goto fail; |
| @@ -2208,14 +2216,8 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) | |||
| 2208 | /* touch only Bamboo doesn't support pen */ | 2216 | /* touch only Bamboo doesn't support pen */ |
| 2209 | if ((features->type == BAMBOO_TOUCH) && | 2217 | if ((features->type == BAMBOO_TOUCH) && |
| 2210 | (features->device_type & WACOM_DEVICETYPE_PEN)) { | 2218 | (features->device_type & WACOM_DEVICETYPE_PEN)) { |
| 2211 | error = -ENODEV; | 2219 | cancel_delayed_work_sync(&wacom->init_work); |
| 2212 | goto fail_quirks; | 2220 | _wacom_query_tablet_data(wacom); |
| 2213 | } | ||
| 2214 | |||
| 2215 | /* pen only Bamboo neither support touch nor pad */ | ||
| 2216 | if ((features->type == BAMBOO_PEN) && | ||
| 2217 | ((features->device_type & WACOM_DEVICETYPE_TOUCH) || | ||
| 2218 | (features->device_type & WACOM_DEVICETYPE_PAD))) { | ||
| 2219 | error = -ENODEV; | 2221 | error = -ENODEV; |
| 2220 | goto fail_quirks; | 2222 | goto fail_quirks; |
| 2221 | } | 2223 | } |
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index dfc1c0e37c40..ad31d21da316 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | * warranty of any kind, whether express or implied. | 35 | * warranty of any kind, whether express or implied. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/acpi.h> | ||
| 39 | #include <linux/device.h> | 38 | #include <linux/device.h> |
| 40 | #include <linux/gpio/consumer.h> | 39 | #include <linux/gpio/consumer.h> |
| 41 | #include <linux/i2c.h> | 40 | #include <linux/i2c.h> |
| @@ -117,6 +116,10 @@ static const struct chip_desc chips[] = { | |||
| 117 | .has_irq = 1, | 116 | .has_irq = 1, |
| 118 | .muxtype = pca954x_isswi, | 117 | .muxtype = pca954x_isswi, |
| 119 | }, | 118 | }, |
| 119 | [pca_9546] = { | ||
| 120 | .nchans = 4, | ||
| 121 | .muxtype = pca954x_isswi, | ||
| 122 | }, | ||
| 120 | [pca_9547] = { | 123 | [pca_9547] = { |
| 121 | .nchans = 8, | 124 | .nchans = 8, |
| 122 | .enable = 0x8, | 125 | .enable = 0x8, |
| @@ -134,28 +137,13 @@ static const struct i2c_device_id pca954x_id[] = { | |||
| 134 | { "pca9543", pca_9543 }, | 137 | { "pca9543", pca_9543 }, |
| 135 | { "pca9544", pca_9544 }, | 138 | { "pca9544", pca_9544 }, |
| 136 | { "pca9545", pca_9545 }, | 139 | { "pca9545", pca_9545 }, |
| 137 | { "pca9546", pca_9545 }, | 140 | { "pca9546", pca_9546 }, |
| 138 | { "pca9547", pca_9547 }, | 141 | { "pca9547", pca_9547 }, |
| 139 | { "pca9548", pca_9548 }, | 142 | { "pca9548", pca_9548 }, |
| 140 | { } | 143 | { } |
| 141 | }; | 144 | }; |
| 142 | MODULE_DEVICE_TABLE(i2c, pca954x_id); | 145 | MODULE_DEVICE_TABLE(i2c, pca954x_id); |
| 143 | 146 | ||
| 144 | #ifdef CONFIG_ACPI | ||
| 145 | static const struct acpi_device_id pca954x_acpi_ids[] = { | ||
| 146 | { .id = "PCA9540", .driver_data = pca_9540 }, | ||
| 147 | { .id = "PCA9542", .driver_data = pca_9542 }, | ||
| 148 | { .id = "PCA9543", .driver_data = pca_9543 }, | ||
| 149 | { .id = "PCA9544", .driver_data = pca_9544 }, | ||
| 150 | { .id = "PCA9545", .driver_data = pca_9545 }, | ||
| 151 | { .id = "PCA9546", .driver_data = pca_9545 }, | ||
| 152 | { .id = "PCA9547", .driver_data = pca_9547 }, | ||
| 153 | { .id = "PCA9548", .driver_data = pca_9548 }, | ||
| 154 | { } | ||
| 155 | }; | ||
| 156 | MODULE_DEVICE_TABLE(acpi, pca954x_acpi_ids); | ||
| 157 | #endif | ||
| 158 | |||
| 159 | #ifdef CONFIG_OF | 147 | #ifdef CONFIG_OF |
| 160 | static const struct of_device_id pca954x_of_match[] = { | 148 | static const struct of_device_id pca954x_of_match[] = { |
| 161 | { .compatible = "nxp,pca9540", .data = &chips[pca_9540] }, | 149 | { .compatible = "nxp,pca9540", .data = &chips[pca_9540] }, |
| @@ -393,17 +381,8 @@ static int pca954x_probe(struct i2c_client *client, | |||
| 393 | match = of_match_device(of_match_ptr(pca954x_of_match), &client->dev); | 381 | match = of_match_device(of_match_ptr(pca954x_of_match), &client->dev); |
| 394 | if (match) | 382 | if (match) |
| 395 | data->chip = of_device_get_match_data(&client->dev); | 383 | data->chip = of_device_get_match_data(&client->dev); |
| 396 | else if (id) | 384 | else |
| 397 | data->chip = &chips[id->driver_data]; | 385 | data->chip = &chips[id->driver_data]; |
| 398 | else { | ||
| 399 | const struct acpi_device_id *acpi_id; | ||
| 400 | |||
| 401 | acpi_id = acpi_match_device(ACPI_PTR(pca954x_acpi_ids), | ||
| 402 | &client->dev); | ||
| 403 | if (!acpi_id) | ||
| 404 | return -ENODEV; | ||
| 405 | data->chip = &chips[acpi_id->driver_data]; | ||
| 406 | } | ||
| 407 | 386 | ||
| 408 | data->last_chan = 0; /* force the first selection */ | 387 | data->last_chan = 0; /* force the first selection */ |
| 409 | 388 | ||
| @@ -492,7 +471,6 @@ static struct i2c_driver pca954x_driver = { | |||
| 492 | .name = "pca954x", | 471 | .name = "pca954x", |
| 493 | .pm = &pca954x_pm, | 472 | .pm = &pca954x_pm, |
| 494 | .of_match_table = of_match_ptr(pca954x_of_match), | 473 | .of_match_table = of_match_ptr(pca954x_of_match), |
| 495 | .acpi_match_table = ACPI_PTR(pca954x_acpi_ids), | ||
| 496 | }, | 474 | }, |
| 497 | .probe = pca954x_probe, | 475 | .probe = pca954x_probe, |
| 498 | .remove = pca954x_remove, | 476 | .remove = pca954x_remove, |
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c index ca5759c0c318..43a6cb078193 100644 --- a/drivers/iio/accel/hid-sensor-accel-3d.c +++ b/drivers/iio/accel/hid-sensor-accel-3d.c | |||
| @@ -370,10 +370,12 @@ static int hid_accel_3d_probe(struct platform_device *pdev) | |||
| 370 | name = "accel_3d"; | 370 | name = "accel_3d"; |
| 371 | channel_spec = accel_3d_channels; | 371 | channel_spec = accel_3d_channels; |
| 372 | channel_size = sizeof(accel_3d_channels); | 372 | channel_size = sizeof(accel_3d_channels); |
| 373 | indio_dev->num_channels = ARRAY_SIZE(accel_3d_channels); | ||
| 373 | } else { | 374 | } else { |
| 374 | name = "gravity"; | 375 | name = "gravity"; |
| 375 | channel_spec = gravity_channels; | 376 | channel_spec = gravity_channels; |
| 376 | channel_size = sizeof(gravity_channels); | 377 | channel_size = sizeof(gravity_channels); |
| 378 | indio_dev->num_channels = ARRAY_SIZE(gravity_channels); | ||
| 377 | } | 379 | } |
| 378 | ret = hid_sensor_parse_common_attributes(hsdev, hsdev->usage, | 380 | ret = hid_sensor_parse_common_attributes(hsdev, hsdev->usage, |
| 379 | &accel_state->common_attributes); | 381 | &accel_state->common_attributes); |
| @@ -395,7 +397,6 @@ static int hid_accel_3d_probe(struct platform_device *pdev) | |||
| 395 | goto error_free_dev_mem; | 397 | goto error_free_dev_mem; |
| 396 | } | 398 | } |
| 397 | 399 | ||
| 398 | indio_dev->num_channels = ARRAY_SIZE(accel_3d_channels); | ||
| 399 | indio_dev->dev.parent = &pdev->dev; | 400 | indio_dev->dev.parent = &pdev->dev; |
| 400 | indio_dev->info = &accel_3d_info; | 401 | indio_dev->info = &accel_3d_info; |
| 401 | indio_dev->name = name; | 402 | indio_dev->name = name; |
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c index d6c372bb433b..c17596f7ed2c 100644 --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | |||
| @@ -61,7 +61,7 @@ static int cros_ec_sensors_read(struct iio_dev *indio_dev, | |||
| 61 | ret = st->core.read_ec_sensors_data(indio_dev, 1 << idx, &data); | 61 | ret = st->core.read_ec_sensors_data(indio_dev, 1 << idx, &data); |
| 62 | if (ret < 0) | 62 | if (ret < 0) |
| 63 | break; | 63 | break; |
| 64 | 64 | ret = IIO_VAL_INT; | |
| 65 | *val = data; | 65 | *val = data; |
| 66 | break; | 66 | break; |
| 67 | case IIO_CHAN_INFO_CALIBBIAS: | 67 | case IIO_CHAN_INFO_CALIBBIAS: |
| @@ -76,7 +76,7 @@ static int cros_ec_sensors_read(struct iio_dev *indio_dev, | |||
| 76 | for (i = CROS_EC_SENSOR_X; i < CROS_EC_SENSOR_MAX_AXIS; i++) | 76 | for (i = CROS_EC_SENSOR_X; i < CROS_EC_SENSOR_MAX_AXIS; i++) |
| 77 | st->core.calib[i] = | 77 | st->core.calib[i] = |
| 78 | st->core.resp->sensor_offset.offset[i]; | 78 | st->core.resp->sensor_offset.offset[i]; |
| 79 | 79 | ret = IIO_VAL_INT; | |
| 80 | *val = st->core.calib[idx]; | 80 | *val = st->core.calib[idx]; |
| 81 | break; | 81 | break; |
| 82 | case IIO_CHAN_INFO_SCALE: | 82 | case IIO_CHAN_INFO_SCALE: |
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c index 7afdac42ed42..01e02b9926d4 100644 --- a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c +++ b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c | |||
| @@ -379,6 +379,8 @@ int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev, | |||
| 379 | { | 379 | { |
| 380 | 380 | ||
| 381 | struct hid_sensor_hub_attribute_info timestamp; | 381 | struct hid_sensor_hub_attribute_info timestamp; |
| 382 | s32 value; | ||
| 383 | int ret; | ||
| 382 | 384 | ||
| 383 | hid_sensor_get_reporting_interval(hsdev, usage_id, st); | 385 | hid_sensor_get_reporting_interval(hsdev, usage_id, st); |
| 384 | 386 | ||
| @@ -417,6 +419,14 @@ int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev, | |||
| 417 | st->sensitivity.index, st->sensitivity.report_id, | 419 | st->sensitivity.index, st->sensitivity.report_id, |
| 418 | timestamp.index, timestamp.report_id); | 420 | timestamp.index, timestamp.report_id); |
| 419 | 421 | ||
| 422 | ret = sensor_hub_get_feature(hsdev, | ||
| 423 | st->power_state.report_id, | ||
| 424 | st->power_state.index, sizeof(value), &value); | ||
| 425 | if (ret < 0) | ||
| 426 | return ret; | ||
| 427 | if (value < 0) | ||
| 428 | return -EINVAL; | ||
| 429 | |||
| 420 | return 0; | 430 | return 0; |
| 421 | } | 431 | } |
| 422 | EXPORT_SYMBOL(hid_sensor_parse_common_attributes); | 432 | EXPORT_SYMBOL(hid_sensor_parse_common_attributes); |
diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c index f7fcfa886f72..821919dd245b 100644 --- a/drivers/iio/gyro/bmg160_core.c +++ b/drivers/iio/gyro/bmg160_core.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/iio/trigger_consumer.h> | 27 | #include <linux/iio/trigger_consumer.h> |
| 28 | #include <linux/iio/triggered_buffer.h> | 28 | #include <linux/iio/triggered_buffer.h> |
| 29 | #include <linux/regmap.h> | 29 | #include <linux/regmap.h> |
| 30 | #include <linux/delay.h> | ||
| 30 | #include "bmg160.h" | 31 | #include "bmg160.h" |
| 31 | 32 | ||
| 32 | #define BMG160_IRQ_NAME "bmg160_event" | 33 | #define BMG160_IRQ_NAME "bmg160_event" |
| @@ -52,6 +53,9 @@ | |||
| 52 | #define BMG160_DEF_BW 100 | 53 | #define BMG160_DEF_BW 100 |
| 53 | #define BMG160_REG_PMU_BW_RES BIT(7) | 54 | #define BMG160_REG_PMU_BW_RES BIT(7) |
| 54 | 55 | ||
| 56 | #define BMG160_GYRO_REG_RESET 0x14 | ||
| 57 | #define BMG160_GYRO_RESET_VAL 0xb6 | ||
| 58 | |||
| 55 | #define BMG160_REG_INT_MAP_0 0x17 | 59 | #define BMG160_REG_INT_MAP_0 0x17 |
| 56 | #define BMG160_INT_MAP_0_BIT_ANY BIT(1) | 60 | #define BMG160_INT_MAP_0_BIT_ANY BIT(1) |
| 57 | 61 | ||
| @@ -236,6 +240,14 @@ static int bmg160_chip_init(struct bmg160_data *data) | |||
| 236 | int ret; | 240 | int ret; |
| 237 | unsigned int val; | 241 | unsigned int val; |
| 238 | 242 | ||
| 243 | /* | ||
| 244 | * Reset chip to get it in a known good state. A delay of 30ms after | ||
| 245 | * reset is required according to the datasheet. | ||
| 246 | */ | ||
| 247 | regmap_write(data->regmap, BMG160_GYRO_REG_RESET, | ||
| 248 | BMG160_GYRO_RESET_VAL); | ||
| 249 | usleep_range(30000, 30700); | ||
| 250 | |||
| 239 | ret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val); | 251 | ret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val); |
| 240 | if (ret < 0) { | 252 | if (ret < 0) { |
| 241 | dev_err(dev, "Error reading reg_chip_id\n"); | 253 | dev_err(dev, "Error reading reg_chip_id\n"); |
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index d18ded45bedd..3ff91e02fee3 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c | |||
| @@ -610,10 +610,9 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type, | |||
| 610 | tmp0 = (int)div_s64_rem(tmp, 1000000000, &tmp1); | 610 | tmp0 = (int)div_s64_rem(tmp, 1000000000, &tmp1); |
| 611 | return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1)); | 611 | return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1)); |
| 612 | case IIO_VAL_FRACTIONAL_LOG2: | 612 | case IIO_VAL_FRACTIONAL_LOG2: |
| 613 | tmp = (s64)vals[0] * 1000000000LL >> vals[1]; | 613 | tmp = shift_right((s64)vals[0] * 1000000000LL, vals[1]); |
| 614 | tmp1 = do_div(tmp, 1000000000LL); | 614 | tmp0 = (int)div_s64_rem(tmp, 1000000000LL, &tmp1); |
| 615 | tmp0 = tmp; | 615 | return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1)); |
| 616 | return snprintf(buf, len, "%d.%09u", tmp0, tmp1); | ||
| 617 | case IIO_VAL_INT_MULTIPLE: | 616 | case IIO_VAL_INT_MULTIPLE: |
| 618 | { | 617 | { |
| 619 | int i; | 618 | int i; |
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c index 5f2680855552..fd0edca0e656 100644 --- a/drivers/iio/pressure/st_pressure_core.c +++ b/drivers/iio/pressure/st_pressure_core.c | |||
| @@ -457,6 +457,7 @@ static const struct st_sensor_settings st_press_sensors_settings[] = { | |||
| 457 | .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, | 457 | .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR, |
| 458 | }, | 458 | }, |
| 459 | .multi_read_bit = true, | 459 | .multi_read_bit = true, |
| 460 | .bootime = 2, | ||
| 460 | }, | 461 | }, |
| 461 | }; | 462 | }; |
| 462 | 463 | ||
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 125528f39e92..8162121bb1bc 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig | |||
| @@ -262,6 +262,7 @@ config IRQ_MXS | |||
| 262 | 262 | ||
| 263 | config MVEBU_ODMI | 263 | config MVEBU_ODMI |
| 264 | bool | 264 | bool |
| 265 | select GENERIC_MSI_IRQ_DOMAIN | ||
| 265 | 266 | ||
| 266 | config MVEBU_PIC | 267 | config MVEBU_PIC |
| 267 | bool | 268 | bool |
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index 11d12bccc4e7..cd20df12d63d 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c | |||
| @@ -991,8 +991,12 @@ static void __init gic_map_single_int(struct device_node *node, | |||
| 991 | 991 | ||
| 992 | static void __init gic_map_interrupts(struct device_node *node) | 992 | static void __init gic_map_interrupts(struct device_node *node) |
| 993 | { | 993 | { |
| 994 | gic_map_single_int(node, GIC_LOCAL_INT_WD); | ||
| 995 | gic_map_single_int(node, GIC_LOCAL_INT_COMPARE); | ||
| 994 | gic_map_single_int(node, GIC_LOCAL_INT_TIMER); | 996 | gic_map_single_int(node, GIC_LOCAL_INT_TIMER); |
| 995 | gic_map_single_int(node, GIC_LOCAL_INT_PERFCTR); | 997 | gic_map_single_int(node, GIC_LOCAL_INT_PERFCTR); |
| 998 | gic_map_single_int(node, GIC_LOCAL_INT_SWINT0); | ||
| 999 | gic_map_single_int(node, GIC_LOCAL_INT_SWINT1); | ||
| 996 | gic_map_single_int(node, GIC_LOCAL_INT_FDC); | 1000 | gic_map_single_int(node, GIC_LOCAL_INT_FDC); |
| 997 | } | 1001 | } |
| 998 | 1002 | ||
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index 1dfd1085a04f..9ca691d6c13b 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c | |||
| @@ -1032,6 +1032,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data) | |||
| 1032 | sizeof(avmb1_carddef)))) | 1032 | sizeof(avmb1_carddef)))) |
| 1033 | return -EFAULT; | 1033 | return -EFAULT; |
| 1034 | cdef.cardtype = AVM_CARDTYPE_B1; | 1034 | cdef.cardtype = AVM_CARDTYPE_B1; |
| 1035 | cdef.cardnr = 0; | ||
| 1035 | } else { | 1036 | } else { |
| 1036 | if ((retval = copy_from_user(&cdef, data, | 1037 | if ((retval = copy_from_user(&cdef, data, |
| 1037 | sizeof(avmb1_extcarddef)))) | 1038 | sizeof(avmb1_extcarddef)))) |
diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c index e4c2c1a1e993..6735c8d6a445 100644 --- a/drivers/md/dm-cache-metadata.c +++ b/drivers/md/dm-cache-metadata.c | |||
| @@ -932,7 +932,7 @@ static int blocks_are_clean_separate_dirty(struct dm_cache_metadata *cmd, | |||
| 932 | *result = true; | 932 | *result = true; |
| 933 | 933 | ||
| 934 | r = dm_bitset_cursor_begin(&cmd->dirty_info, cmd->dirty_root, | 934 | r = dm_bitset_cursor_begin(&cmd->dirty_info, cmd->dirty_root, |
| 935 | from_cblock(begin), &cmd->dirty_cursor); | 935 | from_cblock(cmd->cache_blocks), &cmd->dirty_cursor); |
| 936 | if (r) { | 936 | if (r) { |
| 937 | DMERR("%s: dm_bitset_cursor_begin for dirty failed", __func__); | 937 | DMERR("%s: dm_bitset_cursor_begin for dirty failed", __func__); |
| 938 | return r; | 938 | return r; |
| @@ -959,14 +959,16 @@ static int blocks_are_clean_separate_dirty(struct dm_cache_metadata *cmd, | |||
| 959 | return 0; | 959 | return 0; |
| 960 | } | 960 | } |
| 961 | 961 | ||
| 962 | begin = to_cblock(from_cblock(begin) + 1); | ||
| 963 | if (begin == end) | ||
| 964 | break; | ||
| 965 | |||
| 962 | r = dm_bitset_cursor_next(&cmd->dirty_cursor); | 966 | r = dm_bitset_cursor_next(&cmd->dirty_cursor); |
| 963 | if (r) { | 967 | if (r) { |
| 964 | DMERR("%s: dm_bitset_cursor_next for dirty failed", __func__); | 968 | DMERR("%s: dm_bitset_cursor_next for dirty failed", __func__); |
| 965 | dm_bitset_cursor_end(&cmd->dirty_cursor); | 969 | dm_bitset_cursor_end(&cmd->dirty_cursor); |
| 966 | return r; | 970 | return r; |
| 967 | } | 971 | } |
| 968 | |||
| 969 | begin = to_cblock(from_cblock(begin) + 1); | ||
| 970 | } | 972 | } |
| 971 | 973 | ||
| 972 | dm_bitset_cursor_end(&cmd->dirty_cursor); | 974 | dm_bitset_cursor_end(&cmd->dirty_cursor); |
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index f8564d63982f..1e217ba84d09 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c | |||
| @@ -3726,7 +3726,7 @@ static int raid_preresume(struct dm_target *ti) | |||
| 3726 | return r; | 3726 | return r; |
| 3727 | 3727 | ||
| 3728 | /* Resize bitmap to adjust to changed region size (aka MD bitmap chunksize) */ | 3728 | /* Resize bitmap to adjust to changed region size (aka MD bitmap chunksize) */ |
| 3729 | if (test_bit(RT_FLAG_RS_BITMAP_LOADED, &rs->runtime_flags) && | 3729 | if (test_bit(RT_FLAG_RS_BITMAP_LOADED, &rs->runtime_flags) && mddev->bitmap && |
| 3730 | mddev->bitmap_info.chunksize != to_bytes(rs->requested_bitmap_chunk_sectors)) { | 3730 | mddev->bitmap_info.chunksize != to_bytes(rs->requested_bitmap_chunk_sectors)) { |
| 3731 | r = bitmap_resize(mddev->bitmap, mddev->dev_sectors, | 3731 | r = bitmap_resize(mddev->bitmap, mddev->dev_sectors, |
| 3732 | to_bytes(rs->requested_bitmap_chunk_sectors), 0); | 3732 | to_bytes(rs->requested_bitmap_chunk_sectors), 0); |
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index 28955b94d2b2..0b081d170087 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c | |||
| @@ -755,6 +755,7 @@ static int dm_mq_queue_rq(struct blk_mq_hw_ctx *hctx, | |||
| 755 | /* Undo dm_start_request() before requeuing */ | 755 | /* Undo dm_start_request() before requeuing */ |
| 756 | rq_end_stats(md, rq); | 756 | rq_end_stats(md, rq); |
| 757 | rq_completed(md, rq_data_dir(rq), false); | 757 | rq_completed(md, rq_data_dir(rq), false); |
| 758 | blk_mq_delay_run_hw_queue(hctx, 100/*ms*/); | ||
| 758 | return BLK_MQ_RQ_QUEUE_BUSY; | 759 | return BLK_MQ_RQ_QUEUE_BUSY; |
| 759 | } | 760 | } |
| 760 | 761 | ||
diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c index 0f0eb8a3d922..78f36012eaca 100644 --- a/drivers/md/dm-verity-fec.c +++ b/drivers/md/dm-verity-fec.c | |||
| @@ -146,8 +146,6 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio, | |||
| 146 | block = fec_buffer_rs_block(v, fio, n, i); | 146 | block = fec_buffer_rs_block(v, fio, n, i); |
| 147 | res = fec_decode_rs8(v, fio, block, &par[offset], neras); | 147 | res = fec_decode_rs8(v, fio, block, &par[offset], neras); |
| 148 | if (res < 0) { | 148 | if (res < 0) { |
| 149 | dm_bufio_release(buf); | ||
| 150 | |||
| 151 | r = res; | 149 | r = res; |
| 152 | goto error; | 150 | goto error; |
| 153 | } | 151 | } |
| @@ -172,6 +170,8 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio, | |||
| 172 | done: | 170 | done: |
| 173 | r = corrected; | 171 | r = corrected; |
| 174 | error: | 172 | error: |
| 173 | dm_bufio_release(buf); | ||
| 174 | |||
| 175 | if (r < 0 && neras) | 175 | if (r < 0 && neras) |
| 176 | DMERR_LIMIT("%s: FEC %llu: failed to correct: %d", | 176 | DMERR_LIMIT("%s: FEC %llu: failed to correct: %d", |
| 177 | v->data_dev->name, (unsigned long long)rsb, r); | 177 | v->data_dev->name, (unsigned long long)rsb, r); |
| @@ -269,7 +269,7 @@ static int fec_read_bufs(struct dm_verity *v, struct dm_verity_io *io, | |||
| 269 | &is_zero) == 0) { | 269 | &is_zero) == 0) { |
| 270 | /* skip known zero blocks entirely */ | 270 | /* skip known zero blocks entirely */ |
| 271 | if (is_zero) | 271 | if (is_zero) |
| 272 | continue; | 272 | goto done; |
| 273 | 273 | ||
| 274 | /* | 274 | /* |
| 275 | * skip if we have already found the theoretical | 275 | * skip if we have already found the theoretical |
| @@ -439,6 +439,13 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io, | |||
| 439 | if (!verity_fec_is_enabled(v)) | 439 | if (!verity_fec_is_enabled(v)) |
| 440 | return -EOPNOTSUPP; | 440 | return -EOPNOTSUPP; |
| 441 | 441 | ||
| 442 | if (fio->level >= DM_VERITY_FEC_MAX_RECURSION) { | ||
| 443 | DMWARN_LIMIT("%s: FEC: recursion too deep", v->data_dev->name); | ||
| 444 | return -EIO; | ||
| 445 | } | ||
| 446 | |||
| 447 | fio->level++; | ||
| 448 | |||
| 442 | if (type == DM_VERITY_BLOCK_TYPE_METADATA) | 449 | if (type == DM_VERITY_BLOCK_TYPE_METADATA) |
| 443 | block += v->data_blocks; | 450 | block += v->data_blocks; |
| 444 | 451 | ||
| @@ -470,7 +477,7 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io, | |||
| 470 | if (r < 0) { | 477 | if (r < 0) { |
| 471 | r = fec_decode_rsb(v, io, fio, rsb, offset, true); | 478 | r = fec_decode_rsb(v, io, fio, rsb, offset, true); |
| 472 | if (r < 0) | 479 | if (r < 0) |
| 473 | return r; | 480 | goto done; |
| 474 | } | 481 | } |
| 475 | 482 | ||
| 476 | if (dest) | 483 | if (dest) |
| @@ -480,6 +487,8 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io, | |||
| 480 | r = verity_for_bv_block(v, io, iter, fec_bv_copy); | 487 | r = verity_for_bv_block(v, io, iter, fec_bv_copy); |
| 481 | } | 488 | } |
| 482 | 489 | ||
| 490 | done: | ||
| 491 | fio->level--; | ||
| 483 | return r; | 492 | return r; |
| 484 | } | 493 | } |
| 485 | 494 | ||
| @@ -520,6 +529,7 @@ void verity_fec_init_io(struct dm_verity_io *io) | |||
| 520 | memset(fio->bufs, 0, sizeof(fio->bufs)); | 529 | memset(fio->bufs, 0, sizeof(fio->bufs)); |
| 521 | fio->nbufs = 0; | 530 | fio->nbufs = 0; |
| 522 | fio->output = NULL; | 531 | fio->output = NULL; |
| 532 | fio->level = 0; | ||
| 523 | } | 533 | } |
| 524 | 534 | ||
| 525 | /* | 535 | /* |
diff --git a/drivers/md/dm-verity-fec.h b/drivers/md/dm-verity-fec.h index 7fa0298b995e..bb31ce87a933 100644 --- a/drivers/md/dm-verity-fec.h +++ b/drivers/md/dm-verity-fec.h | |||
| @@ -27,6 +27,9 @@ | |||
| 27 | #define DM_VERITY_FEC_BUF_MAX \ | 27 | #define DM_VERITY_FEC_BUF_MAX \ |
| 28 | (1 << (PAGE_SHIFT - DM_VERITY_FEC_BUF_RS_BITS)) | 28 | (1 << (PAGE_SHIFT - DM_VERITY_FEC_BUF_RS_BITS)) |
| 29 | 29 | ||
| 30 | /* maximum recursion level for verity_fec_decode */ | ||
| 31 | #define DM_VERITY_FEC_MAX_RECURSION 4 | ||
| 32 | |||
| 30 | #define DM_VERITY_OPT_FEC_DEV "use_fec_from_device" | 33 | #define DM_VERITY_OPT_FEC_DEV "use_fec_from_device" |
| 31 | #define DM_VERITY_OPT_FEC_BLOCKS "fec_blocks" | 34 | #define DM_VERITY_OPT_FEC_BLOCKS "fec_blocks" |
| 32 | #define DM_VERITY_OPT_FEC_START "fec_start" | 35 | #define DM_VERITY_OPT_FEC_START "fec_start" |
| @@ -58,6 +61,7 @@ struct dm_verity_fec_io { | |||
| 58 | unsigned nbufs; /* number of buffers allocated */ | 61 | unsigned nbufs; /* number of buffers allocated */ |
| 59 | u8 *output; /* buffer for corrected output */ | 62 | u8 *output; /* buffer for corrected output */ |
| 60 | size_t output_pos; | 63 | size_t output_pos; |
| 64 | unsigned level; /* recursion level */ | ||
| 61 | }; | 65 | }; |
| 62 | 66 | ||
| 63 | #ifdef CONFIG_DM_VERITY_FEC | 67 | #ifdef CONFIG_DM_VERITY_FEC |
diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c index 7fd964256faa..d5430ed02a67 100644 --- a/drivers/mmc/host/sdhci-of-at91.c +++ b/drivers/mmc/host/sdhci-of-at91.c | |||
| @@ -29,6 +29,8 @@ | |||
| 29 | 29 | ||
| 30 | #include "sdhci-pltfm.h" | 30 | #include "sdhci-pltfm.h" |
| 31 | 31 | ||
| 32 | #define SDMMC_MC1R 0x204 | ||
| 33 | #define SDMMC_MC1R_DDR BIT(3) | ||
| 32 | #define SDMMC_CACR 0x230 | 34 | #define SDMMC_CACR 0x230 |
| 33 | #define SDMMC_CACR_CAPWREN BIT(0) | 35 | #define SDMMC_CACR_CAPWREN BIT(0) |
| 34 | #define SDMMC_CACR_KEY (0x46 << 8) | 36 | #define SDMMC_CACR_KEY (0x46 << 8) |
| @@ -103,11 +105,18 @@ static void sdhci_at91_set_power(struct sdhci_host *host, unsigned char mode, | |||
| 103 | sdhci_set_power_noreg(host, mode, vdd); | 105 | sdhci_set_power_noreg(host, mode, vdd); |
| 104 | } | 106 | } |
| 105 | 107 | ||
| 108 | void sdhci_at91_set_uhs_signaling(struct sdhci_host *host, unsigned int timing) | ||
| 109 | { | ||
| 110 | if (timing == MMC_TIMING_MMC_DDR52) | ||
| 111 | sdhci_writeb(host, SDMMC_MC1R_DDR, SDMMC_MC1R); | ||
| 112 | sdhci_set_uhs_signaling(host, timing); | ||
| 113 | } | ||
| 114 | |||
| 106 | static const struct sdhci_ops sdhci_at91_sama5d2_ops = { | 115 | static const struct sdhci_ops sdhci_at91_sama5d2_ops = { |
| 107 | .set_clock = sdhci_at91_set_clock, | 116 | .set_clock = sdhci_at91_set_clock, |
| 108 | .set_bus_width = sdhci_set_bus_width, | 117 | .set_bus_width = sdhci_set_bus_width, |
| 109 | .reset = sdhci_reset, | 118 | .reset = sdhci_reset, |
| 110 | .set_uhs_signaling = sdhci_set_uhs_signaling, | 119 | .set_uhs_signaling = sdhci_at91_set_uhs_signaling, |
| 111 | .set_power = sdhci_at91_set_power, | 120 | .set_power = sdhci_at91_set_power, |
| 112 | }; | 121 | }; |
| 113 | 122 | ||
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9c1a099afbbe..63bc33a54d0d 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
| @@ -1830,6 +1830,9 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable) | |||
| 1830 | struct sdhci_host *host = mmc_priv(mmc); | 1830 | struct sdhci_host *host = mmc_priv(mmc); |
| 1831 | unsigned long flags; | 1831 | unsigned long flags; |
| 1832 | 1832 | ||
| 1833 | if (enable) | ||
| 1834 | pm_runtime_get_noresume(host->mmc->parent); | ||
| 1835 | |||
| 1833 | spin_lock_irqsave(&host->lock, flags); | 1836 | spin_lock_irqsave(&host->lock, flags); |
| 1834 | if (enable) | 1837 | if (enable) |
| 1835 | host->flags |= SDHCI_SDIO_IRQ_ENABLED; | 1838 | host->flags |= SDHCI_SDIO_IRQ_ENABLED; |
| @@ -1838,6 +1841,9 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable) | |||
| 1838 | 1841 | ||
| 1839 | sdhci_enable_sdio_irq_nolock(host, enable); | 1842 | sdhci_enable_sdio_irq_nolock(host, enable); |
| 1840 | spin_unlock_irqrestore(&host->lock, flags); | 1843 | spin_unlock_irqrestore(&host->lock, flags); |
| 1844 | |||
| 1845 | if (!enable) | ||
| 1846 | pm_runtime_put_noidle(host->mmc->parent); | ||
| 1841 | } | 1847 | } |
| 1842 | 1848 | ||
| 1843 | static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, | 1849 | static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, |
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c index d05fbfdce5e5..5d6c40d86775 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c | |||
| @@ -100,11 +100,6 @@ static int aq_ndev_change_mtu(struct net_device *ndev, int new_mtu) | |||
| 100 | goto err_exit; | 100 | goto err_exit; |
| 101 | ndev->mtu = new_mtu; | 101 | ndev->mtu = new_mtu; |
| 102 | 102 | ||
| 103 | if (netif_running(ndev)) { | ||
| 104 | aq_ndev_close(ndev); | ||
| 105 | aq_ndev_open(ndev); | ||
| 106 | } | ||
| 107 | |||
| 108 | err_exit: | 103 | err_exit: |
| 109 | return err; | 104 | return err; |
| 110 | } | 105 | } |
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index ee78444bfb88..cdb02991f249 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c | |||
| @@ -487,6 +487,9 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, | |||
| 487 | dx_buff->mss = skb_shinfo(skb)->gso_size; | 487 | dx_buff->mss = skb_shinfo(skb)->gso_size; |
| 488 | dx_buff->is_txc = 1U; | 488 | dx_buff->is_txc = 1U; |
| 489 | 489 | ||
| 490 | dx_buff->is_ipv6 = | ||
| 491 | (ip_hdr(skb)->version == 6) ? 1U : 0U; | ||
| 492 | |||
| 490 | dx = aq_ring_next_dx(ring, dx); | 493 | dx = aq_ring_next_dx(ring, dx); |
| 491 | dx_buff = &ring->buff_ring[dx]; | 494 | dx_buff = &ring->buff_ring[dx]; |
| 492 | ++ret; | 495 | ++ret; |
| @@ -510,10 +513,22 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, | |||
| 510 | if (skb->ip_summed == CHECKSUM_PARTIAL) { | 513 | if (skb->ip_summed == CHECKSUM_PARTIAL) { |
| 511 | dx_buff->is_ip_cso = (htons(ETH_P_IP) == skb->protocol) ? | 514 | dx_buff->is_ip_cso = (htons(ETH_P_IP) == skb->protocol) ? |
| 512 | 1U : 0U; | 515 | 1U : 0U; |
| 513 | dx_buff->is_tcp_cso = | 516 | |
| 514 | (ip_hdr(skb)->protocol == IPPROTO_TCP) ? 1U : 0U; | 517 | if (ip_hdr(skb)->version == 4) { |
| 515 | dx_buff->is_udp_cso = | 518 | dx_buff->is_tcp_cso = |
| 516 | (ip_hdr(skb)->protocol == IPPROTO_UDP) ? 1U : 0U; | 519 | (ip_hdr(skb)->protocol == IPPROTO_TCP) ? |
| 520 | 1U : 0U; | ||
| 521 | dx_buff->is_udp_cso = | ||
| 522 | (ip_hdr(skb)->protocol == IPPROTO_UDP) ? | ||
| 523 | 1U : 0U; | ||
| 524 | } else if (ip_hdr(skb)->version == 6) { | ||
| 525 | dx_buff->is_tcp_cso = | ||
| 526 | (ipv6_hdr(skb)->nexthdr == NEXTHDR_TCP) ? | ||
| 527 | 1U : 0U; | ||
| 528 | dx_buff->is_udp_cso = | ||
| 529 | (ipv6_hdr(skb)->nexthdr == NEXTHDR_UDP) ? | ||
| 530 | 1U : 0U; | ||
| 531 | } | ||
| 517 | } | 532 | } |
| 518 | 533 | ||
| 519 | for (; nr_frags--; ++frag_count) { | 534 | for (; nr_frags--; ++frag_count) { |
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c index 0358e6072d45..3a8a4aa13687 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c | |||
| @@ -101,6 +101,7 @@ int aq_ring_init(struct aq_ring_s *self) | |||
| 101 | self->hw_head = 0; | 101 | self->hw_head = 0; |
| 102 | self->sw_head = 0; | 102 | self->sw_head = 0; |
| 103 | self->sw_tail = 0; | 103 | self->sw_tail = 0; |
| 104 | spin_lock_init(&self->header.lock); | ||
| 104 | return 0; | 105 | return 0; |
| 105 | } | 106 | } |
| 106 | 107 | ||
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h index 257254645068..eecd6d1c4d73 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h | |||
| @@ -58,7 +58,8 @@ struct __packed aq_ring_buff_s { | |||
| 58 | u8 len_l2; | 58 | u8 len_l2; |
| 59 | u8 len_l3; | 59 | u8 len_l3; |
| 60 | u8 len_l4; | 60 | u8 len_l4; |
| 61 | u8 rsvd2; | 61 | u8 is_ipv6:1; |
| 62 | u8 rsvd2:7; | ||
| 62 | u32 len_pkt; | 63 | u32 len_pkt; |
| 63 | }; | 64 | }; |
| 64 | }; | 65 | }; |
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c index a2b746a2dd50..4ee15ff06a44 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | |||
| @@ -433,6 +433,9 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self, | |||
| 433 | buff->len_l3 + | 433 | buff->len_l3 + |
| 434 | buff->len_l2); | 434 | buff->len_l2); |
| 435 | is_gso = true; | 435 | is_gso = true; |
| 436 | |||
| 437 | if (buff->is_ipv6) | ||
| 438 | txd->ctl |= HW_ATL_A0_TXD_CTL_CMD_IPV6; | ||
| 436 | } else { | 439 | } else { |
| 437 | buff_pa_len = buff->len; | 440 | buff_pa_len = buff->len; |
| 438 | 441 | ||
| @@ -458,6 +461,7 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self, | |||
| 458 | if (unlikely(buff->is_eop)) { | 461 | if (unlikely(buff->is_eop)) { |
| 459 | txd->ctl |= HW_ATL_A0_TXD_CTL_EOP; | 462 | txd->ctl |= HW_ATL_A0_TXD_CTL_EOP; |
| 460 | txd->ctl |= HW_ATL_A0_TXD_CTL_CMD_WB; | 463 | txd->ctl |= HW_ATL_A0_TXD_CTL_CMD_WB; |
| 464 | is_gso = false; | ||
| 461 | } | 465 | } |
| 462 | } | 466 | } |
| 463 | 467 | ||
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c index cab2931dab9a..42150708191d 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | |||
| @@ -471,6 +471,9 @@ static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, | |||
| 471 | buff->len_l3 + | 471 | buff->len_l3 + |
| 472 | buff->len_l2); | 472 | buff->len_l2); |
| 473 | is_gso = true; | 473 | is_gso = true; |
| 474 | |||
| 475 | if (buff->is_ipv6) | ||
| 476 | txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6; | ||
| 474 | } else { | 477 | } else { |
| 475 | buff_pa_len = buff->len; | 478 | buff_pa_len = buff->len; |
| 476 | 479 | ||
| @@ -496,6 +499,7 @@ static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, | |||
| 496 | if (unlikely(buff->is_eop)) { | 499 | if (unlikely(buff->is_eop)) { |
| 497 | txd->ctl |= HW_ATL_B0_TXD_CTL_EOP; | 500 | txd->ctl |= HW_ATL_B0_TXD_CTL_EOP; |
| 498 | txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_WB; | 501 | txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_WB; |
| 502 | is_gso = false; | ||
| 499 | } | 503 | } |
| 500 | } | 504 | } |
| 501 | 505 | ||
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index 0a23034bbe3f..352beff796ae 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | |||
| @@ -2277,7 +2277,7 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, | |||
| 2277 | GENERAL_ATTEN_OFFSET(LATCHED_ATTN_RBCP) | \ | 2277 | GENERAL_ATTEN_OFFSET(LATCHED_ATTN_RBCP) | \ |
| 2278 | GENERAL_ATTEN_OFFSET(LATCHED_ATTN_RSVD_GRC)) | 2278 | GENERAL_ATTEN_OFFSET(LATCHED_ATTN_RSVD_GRC)) |
| 2279 | 2279 | ||
| 2280 | #define HW_INTERRUT_ASSERT_SET_0 \ | 2280 | #define HW_INTERRUPT_ASSERT_SET_0 \ |
| 2281 | (AEU_INPUTS_ATTN_BITS_TSDM_HW_INTERRUPT | \ | 2281 | (AEU_INPUTS_ATTN_BITS_TSDM_HW_INTERRUPT | \ |
| 2282 | AEU_INPUTS_ATTN_BITS_TCM_HW_INTERRUPT | \ | 2282 | AEU_INPUTS_ATTN_BITS_TCM_HW_INTERRUPT | \ |
| 2283 | AEU_INPUTS_ATTN_BITS_TSEMI_HW_INTERRUPT | \ | 2283 | AEU_INPUTS_ATTN_BITS_TSEMI_HW_INTERRUPT | \ |
| @@ -2290,7 +2290,7 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, | |||
| 2290 | AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR |\ | 2290 | AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR |\ |
| 2291 | AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR |\ | 2291 | AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR |\ |
| 2292 | AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR) | 2292 | AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR) |
| 2293 | #define HW_INTERRUT_ASSERT_SET_1 \ | 2293 | #define HW_INTERRUPT_ASSERT_SET_1 \ |
| 2294 | (AEU_INPUTS_ATTN_BITS_QM_HW_INTERRUPT | \ | 2294 | (AEU_INPUTS_ATTN_BITS_QM_HW_INTERRUPT | \ |
| 2295 | AEU_INPUTS_ATTN_BITS_TIMERS_HW_INTERRUPT | \ | 2295 | AEU_INPUTS_ATTN_BITS_TIMERS_HW_INTERRUPT | \ |
| 2296 | AEU_INPUTS_ATTN_BITS_XSDM_HW_INTERRUPT | \ | 2296 | AEU_INPUTS_ATTN_BITS_XSDM_HW_INTERRUPT | \ |
| @@ -2318,7 +2318,7 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id, | |||
| 2318 | AEU_INPUTS_ATTN_BITS_UPB_PARITY_ERROR | \ | 2318 | AEU_INPUTS_ATTN_BITS_UPB_PARITY_ERROR | \ |
| 2319 | AEU_INPUTS_ATTN_BITS_CSDM_PARITY_ERROR |\ | 2319 | AEU_INPUTS_ATTN_BITS_CSDM_PARITY_ERROR |\ |
| 2320 | AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR) | 2320 | AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR) |
| 2321 | #define HW_INTERRUT_ASSERT_SET_2 \ | 2321 | #define HW_INTERRUPT_ASSERT_SET_2 \ |
| 2322 | (AEU_INPUTS_ATTN_BITS_CSEMI_HW_INTERRUPT | \ | 2322 | (AEU_INPUTS_ATTN_BITS_CSEMI_HW_INTERRUPT | \ |
| 2323 | AEU_INPUTS_ATTN_BITS_CDU_HW_INTERRUPT | \ | 2323 | AEU_INPUTS_ATTN_BITS_CDU_HW_INTERRUPT | \ |
| 2324 | AEU_INPUTS_ATTN_BITS_DMAE_HW_INTERRUPT | \ | 2324 | AEU_INPUTS_ATTN_BITS_DMAE_HW_INTERRUPT | \ |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index ac76fc251d26..a851f95c307a 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
| @@ -4166,14 +4166,14 @@ static void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn) | |||
| 4166 | bnx2x_release_phy_lock(bp); | 4166 | bnx2x_release_phy_lock(bp); |
| 4167 | } | 4167 | } |
| 4168 | 4168 | ||
| 4169 | if (attn & HW_INTERRUT_ASSERT_SET_0) { | 4169 | if (attn & HW_INTERRUPT_ASSERT_SET_0) { |
| 4170 | 4170 | ||
| 4171 | val = REG_RD(bp, reg_offset); | 4171 | val = REG_RD(bp, reg_offset); |
| 4172 | val &= ~(attn & HW_INTERRUT_ASSERT_SET_0); | 4172 | val &= ~(attn & HW_INTERRUPT_ASSERT_SET_0); |
| 4173 | REG_WR(bp, reg_offset, val); | 4173 | REG_WR(bp, reg_offset, val); |
| 4174 | 4174 | ||
| 4175 | BNX2X_ERR("FATAL HW block attention set0 0x%x\n", | 4175 | BNX2X_ERR("FATAL HW block attention set0 0x%x\n", |
| 4176 | (u32)(attn & HW_INTERRUT_ASSERT_SET_0)); | 4176 | (u32)(attn & HW_INTERRUPT_ASSERT_SET_0)); |
| 4177 | bnx2x_panic(); | 4177 | bnx2x_panic(); |
| 4178 | } | 4178 | } |
| 4179 | } | 4179 | } |
| @@ -4191,7 +4191,7 @@ static void bnx2x_attn_int_deasserted1(struct bnx2x *bp, u32 attn) | |||
| 4191 | BNX2X_ERR("FATAL error from DORQ\n"); | 4191 | BNX2X_ERR("FATAL error from DORQ\n"); |
| 4192 | } | 4192 | } |
| 4193 | 4193 | ||
| 4194 | if (attn & HW_INTERRUT_ASSERT_SET_1) { | 4194 | if (attn & HW_INTERRUPT_ASSERT_SET_1) { |
| 4195 | 4195 | ||
| 4196 | int port = BP_PORT(bp); | 4196 | int port = BP_PORT(bp); |
| 4197 | int reg_offset; | 4197 | int reg_offset; |
| @@ -4200,11 +4200,11 @@ static void bnx2x_attn_int_deasserted1(struct bnx2x *bp, u32 attn) | |||
| 4200 | MISC_REG_AEU_ENABLE1_FUNC_0_OUT_1); | 4200 | MISC_REG_AEU_ENABLE1_FUNC_0_OUT_1); |
| 4201 | 4201 | ||
| 4202 | val = REG_RD(bp, reg_offset); | 4202 | val = REG_RD(bp, reg_offset); |
| 4203 | val &= ~(attn & HW_INTERRUT_ASSERT_SET_1); | 4203 | val &= ~(attn & HW_INTERRUPT_ASSERT_SET_1); |
| 4204 | REG_WR(bp, reg_offset, val); | 4204 | REG_WR(bp, reg_offset, val); |
| 4205 | 4205 | ||
| 4206 | BNX2X_ERR("FATAL HW block attention set1 0x%x\n", | 4206 | BNX2X_ERR("FATAL HW block attention set1 0x%x\n", |
| 4207 | (u32)(attn & HW_INTERRUT_ASSERT_SET_1)); | 4207 | (u32)(attn & HW_INTERRUPT_ASSERT_SET_1)); |
| 4208 | bnx2x_panic(); | 4208 | bnx2x_panic(); |
| 4209 | } | 4209 | } |
| 4210 | } | 4210 | } |
| @@ -4235,7 +4235,7 @@ static void bnx2x_attn_int_deasserted2(struct bnx2x *bp, u32 attn) | |||
| 4235 | } | 4235 | } |
| 4236 | } | 4236 | } |
| 4237 | 4237 | ||
| 4238 | if (attn & HW_INTERRUT_ASSERT_SET_2) { | 4238 | if (attn & HW_INTERRUPT_ASSERT_SET_2) { |
| 4239 | 4239 | ||
| 4240 | int port = BP_PORT(bp); | 4240 | int port = BP_PORT(bp); |
| 4241 | int reg_offset; | 4241 | int reg_offset; |
| @@ -4244,11 +4244,11 @@ static void bnx2x_attn_int_deasserted2(struct bnx2x *bp, u32 attn) | |||
| 4244 | MISC_REG_AEU_ENABLE1_FUNC_0_OUT_2); | 4244 | MISC_REG_AEU_ENABLE1_FUNC_0_OUT_2); |
| 4245 | 4245 | ||
| 4246 | val = REG_RD(bp, reg_offset); | 4246 | val = REG_RD(bp, reg_offset); |
| 4247 | val &= ~(attn & HW_INTERRUT_ASSERT_SET_2); | 4247 | val &= ~(attn & HW_INTERRUPT_ASSERT_SET_2); |
| 4248 | REG_WR(bp, reg_offset, val); | 4248 | REG_WR(bp, reg_offset, val); |
| 4249 | 4249 | ||
| 4250 | BNX2X_ERR("FATAL HW block attention set2 0x%x\n", | 4250 | BNX2X_ERR("FATAL HW block attention set2 0x%x\n", |
| 4251 | (u32)(attn & HW_INTERRUT_ASSERT_SET_2)); | 4251 | (u32)(attn & HW_INTERRUPT_ASSERT_SET_2)); |
| 4252 | bnx2x_panic(); | 4252 | bnx2x_panic(); |
| 4253 | } | 4253 | } |
| 4254 | } | 4254 | } |
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 32de4589d16a..1f1e54ba0ecb 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c | |||
| @@ -1983,20 +1983,25 @@ static void bnxt_free_rx_skbs(struct bnxt *bp) | |||
| 1983 | 1983 | ||
| 1984 | for (j = 0; j < max_idx; j++) { | 1984 | for (j = 0; j < max_idx; j++) { |
| 1985 | struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[j]; | 1985 | struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[j]; |
| 1986 | dma_addr_t mapping = rx_buf->mapping; | ||
| 1986 | void *data = rx_buf->data; | 1987 | void *data = rx_buf->data; |
| 1987 | 1988 | ||
| 1988 | if (!data) | 1989 | if (!data) |
| 1989 | continue; | 1990 | continue; |
| 1990 | 1991 | ||
| 1991 | dma_unmap_single(&pdev->dev, rx_buf->mapping, | ||
| 1992 | bp->rx_buf_use_size, bp->rx_dir); | ||
| 1993 | |||
| 1994 | rx_buf->data = NULL; | 1992 | rx_buf->data = NULL; |
| 1995 | 1993 | ||
| 1996 | if (BNXT_RX_PAGE_MODE(bp)) | 1994 | if (BNXT_RX_PAGE_MODE(bp)) { |
| 1995 | mapping -= bp->rx_dma_offset; | ||
| 1996 | dma_unmap_page(&pdev->dev, mapping, | ||
| 1997 | PAGE_SIZE, bp->rx_dir); | ||
| 1997 | __free_page(data); | 1998 | __free_page(data); |
| 1998 | else | 1999 | } else { |
| 2000 | dma_unmap_single(&pdev->dev, mapping, | ||
| 2001 | bp->rx_buf_use_size, | ||
| 2002 | bp->rx_dir); | ||
| 1999 | kfree(data); | 2003 | kfree(data); |
| 2004 | } | ||
| 2000 | } | 2005 | } |
| 2001 | 2006 | ||
| 2002 | for (j = 0; j < max_agg_idx; j++) { | 2007 | for (j = 0; j < max_agg_idx; j++) { |
| @@ -2455,6 +2460,18 @@ static int bnxt_init_one_rx_ring(struct bnxt *bp, int ring_nr) | |||
| 2455 | return 0; | 2460 | return 0; |
| 2456 | } | 2461 | } |
| 2457 | 2462 | ||
| 2463 | static void bnxt_init_cp_rings(struct bnxt *bp) | ||
| 2464 | { | ||
| 2465 | int i; | ||
| 2466 | |||
| 2467 | for (i = 0; i < bp->cp_nr_rings; i++) { | ||
| 2468 | struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring; | ||
| 2469 | struct bnxt_ring_struct *ring = &cpr->cp_ring_struct; | ||
| 2470 | |||
| 2471 | ring->fw_ring_id = INVALID_HW_RING_ID; | ||
| 2472 | } | ||
| 2473 | } | ||
| 2474 | |||
| 2458 | static int bnxt_init_rx_rings(struct bnxt *bp) | 2475 | static int bnxt_init_rx_rings(struct bnxt *bp) |
| 2459 | { | 2476 | { |
| 2460 | int i, rc = 0; | 2477 | int i, rc = 0; |
| @@ -4732,7 +4749,7 @@ static int bnxt_set_tpa(struct bnxt *bp, bool set_tpa) | |||
| 4732 | rc = bnxt_hwrm_vnic_set_tpa(bp, i, tpa_flags); | 4749 | rc = bnxt_hwrm_vnic_set_tpa(bp, i, tpa_flags); |
| 4733 | if (rc) { | 4750 | if (rc) { |
| 4734 | netdev_err(bp->dev, "hwrm vnic set tpa failure rc for vnic %d: %x\n", | 4751 | netdev_err(bp->dev, "hwrm vnic set tpa failure rc for vnic %d: %x\n", |
| 4735 | rc, i); | 4752 | i, rc); |
| 4736 | return rc; | 4753 | return rc; |
| 4737 | } | 4754 | } |
| 4738 | } | 4755 | } |
| @@ -5006,6 +5023,7 @@ static int bnxt_shutdown_nic(struct bnxt *bp, bool irq_re_init) | |||
| 5006 | 5023 | ||
| 5007 | static int bnxt_init_nic(struct bnxt *bp, bool irq_re_init) | 5024 | static int bnxt_init_nic(struct bnxt *bp, bool irq_re_init) |
| 5008 | { | 5025 | { |
| 5026 | bnxt_init_cp_rings(bp); | ||
| 5009 | bnxt_init_rx_rings(bp); | 5027 | bnxt_init_rx_rings(bp); |
| 5010 | bnxt_init_tx_rings(bp); | 5028 | bnxt_init_tx_rings(bp); |
| 5011 | bnxt_init_ring_grps(bp, irq_re_init); | 5029 | bnxt_init_ring_grps(bp, irq_re_init); |
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c index 9e59663a6ead..0f6811860ad5 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c +++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c | |||
| @@ -1930,13 +1930,13 @@ static void | |||
| 1930 | bfa_ioc_send_enable(struct bfa_ioc *ioc) | 1930 | bfa_ioc_send_enable(struct bfa_ioc *ioc) |
| 1931 | { | 1931 | { |
| 1932 | struct bfi_ioc_ctrl_req enable_req; | 1932 | struct bfi_ioc_ctrl_req enable_req; |
| 1933 | struct timeval tv; | ||
| 1934 | 1933 | ||
| 1935 | bfi_h2i_set(enable_req.mh, BFI_MC_IOC, BFI_IOC_H2I_ENABLE_REQ, | 1934 | bfi_h2i_set(enable_req.mh, BFI_MC_IOC, BFI_IOC_H2I_ENABLE_REQ, |
| 1936 | bfa_ioc_portid(ioc)); | 1935 | bfa_ioc_portid(ioc)); |
| 1937 | enable_req.clscode = htons(ioc->clscode); | 1936 | enable_req.clscode = htons(ioc->clscode); |
| 1938 | do_gettimeofday(&tv); | 1937 | enable_req.rsvd = htons(0); |
| 1939 | enable_req.tv_sec = ntohl(tv.tv_sec); | 1938 | /* overflow in 2106 */ |
| 1939 | enable_req.tv_sec = ntohl(ktime_get_real_seconds()); | ||
| 1940 | bfa_ioc_mbox_send(ioc, &enable_req, sizeof(struct bfi_ioc_ctrl_req)); | 1940 | bfa_ioc_mbox_send(ioc, &enable_req, sizeof(struct bfi_ioc_ctrl_req)); |
| 1941 | } | 1941 | } |
| 1942 | 1942 | ||
| @@ -1947,6 +1947,10 @@ bfa_ioc_send_disable(struct bfa_ioc *ioc) | |||
| 1947 | 1947 | ||
| 1948 | bfi_h2i_set(disable_req.mh, BFI_MC_IOC, BFI_IOC_H2I_DISABLE_REQ, | 1948 | bfi_h2i_set(disable_req.mh, BFI_MC_IOC, BFI_IOC_H2I_DISABLE_REQ, |
| 1949 | bfa_ioc_portid(ioc)); | 1949 | bfa_ioc_portid(ioc)); |
| 1950 | disable_req.clscode = htons(ioc->clscode); | ||
| 1951 | disable_req.rsvd = htons(0); | ||
| 1952 | /* overflow in 2106 */ | ||
| 1953 | disable_req.tv_sec = ntohl(ktime_get_real_seconds()); | ||
| 1950 | bfa_ioc_mbox_send(ioc, &disable_req, sizeof(struct bfi_ioc_ctrl_req)); | 1954 | bfa_ioc_mbox_send(ioc, &disable_req, sizeof(struct bfi_ioc_ctrl_req)); |
| 1951 | } | 1955 | } |
| 1952 | 1956 | ||
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index 30e855004c57..02dd5246dfae 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c | |||
| @@ -4939,8 +4939,9 @@ static int | |||
| 4939 | __be_cmd_set_logical_link_config(struct be_adapter *adapter, | 4939 | __be_cmd_set_logical_link_config(struct be_adapter *adapter, |
| 4940 | int link_state, int version, u8 domain) | 4940 | int link_state, int version, u8 domain) |
| 4941 | { | 4941 | { |
| 4942 | struct be_mcc_wrb *wrb; | ||
| 4943 | struct be_cmd_req_set_ll_link *req; | 4942 | struct be_cmd_req_set_ll_link *req; |
| 4943 | struct be_mcc_wrb *wrb; | ||
| 4944 | u32 link_config = 0; | ||
| 4944 | int status; | 4945 | int status; |
| 4945 | 4946 | ||
| 4946 | mutex_lock(&adapter->mcc_lock); | 4947 | mutex_lock(&adapter->mcc_lock); |
| @@ -4962,10 +4963,12 @@ __be_cmd_set_logical_link_config(struct be_adapter *adapter, | |||
| 4962 | 4963 | ||
| 4963 | if (link_state == IFLA_VF_LINK_STATE_ENABLE || | 4964 | if (link_state == IFLA_VF_LINK_STATE_ENABLE || |
| 4964 | link_state == IFLA_VF_LINK_STATE_AUTO) | 4965 | link_state == IFLA_VF_LINK_STATE_AUTO) |
| 4965 | req->link_config |= PLINK_ENABLE; | 4966 | link_config |= PLINK_ENABLE; |
| 4966 | 4967 | ||
| 4967 | if (link_state == IFLA_VF_LINK_STATE_AUTO) | 4968 | if (link_state == IFLA_VF_LINK_STATE_AUTO) |
| 4968 | req->link_config |= PLINK_TRACK; | 4969 | link_config |= PLINK_TRACK; |
| 4970 | |||
| 4971 | req->link_config = cpu_to_le32(link_config); | ||
| 4969 | 4972 | ||
| 4970 | status = be_mcc_notify_wait(adapter); | 4973 | status = be_mcc_notify_wait(adapter); |
| 4971 | err: | 4974 | err: |
diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c index 992ebe973d25..f819843e2bae 100644 --- a/drivers/net/ethernet/ezchip/nps_enet.c +++ b/drivers/net/ethernet/ezchip/nps_enet.c | |||
| @@ -189,11 +189,9 @@ static int nps_enet_poll(struct napi_struct *napi, int budget) | |||
| 189 | 189 | ||
| 190 | nps_enet_tx_handler(ndev); | 190 | nps_enet_tx_handler(ndev); |
| 191 | work_done = nps_enet_rx_handler(ndev); | 191 | work_done = nps_enet_rx_handler(ndev); |
| 192 | if (work_done < budget) { | 192 | if ((work_done < budget) && napi_complete_done(napi, work_done)) { |
| 193 | u32 buf_int_enable_value = 0; | 193 | u32 buf_int_enable_value = 0; |
| 194 | 194 | ||
| 195 | napi_complete_done(napi, work_done); | ||
| 196 | |||
| 197 | /* set tx_done and rx_rdy bits */ | 195 | /* set tx_done and rx_rdy bits */ |
| 198 | buf_int_enable_value |= NPS_ENET_ENABLE << RX_RDY_SHIFT; | 196 | buf_int_enable_value |= NPS_ENET_ENABLE << RX_RDY_SHIFT; |
| 199 | buf_int_enable_value |= NPS_ENET_ENABLE << TX_DONE_SHIFT; | 197 | buf_int_enable_value |= NPS_ENET_ENABLE << TX_DONE_SHIFT; |
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 928b0df2b8e0..ade6b3e4ed13 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c | |||
| @@ -28,8 +28,10 @@ | |||
| 28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/netdevice.h> | 30 | #include <linux/netdevice.h> |
| 31 | #include <linux/of.h> | ||
| 31 | #include <linux/phy.h> | 32 | #include <linux/phy.h> |
| 32 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 34 | #include <linux/property.h> | ||
| 33 | #include <net/ip.h> | 35 | #include <net/ip.h> |
| 34 | #include <net/ncsi.h> | 36 | #include <net/ncsi.h> |
| 35 | 37 | ||
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c index 3239d27143b9..bdd8cdd732fb 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | |||
| @@ -82,9 +82,12 @@ void hns_mac_get_link_status(struct hns_mac_cb *mac_cb, u32 *link_status) | |||
| 82 | else | 82 | else |
| 83 | *link_status = 0; | 83 | *link_status = 0; |
| 84 | 84 | ||
| 85 | ret = mac_cb->dsaf_dev->misc_op->get_sfp_prsnt(mac_cb, &sfp_prsnt); | 85 | if (mac_cb->media_type == HNAE_MEDIA_TYPE_FIBER) { |
| 86 | if (!ret) | 86 | ret = mac_cb->dsaf_dev->misc_op->get_sfp_prsnt(mac_cb, |
| 87 | *link_status = *link_status && sfp_prsnt; | 87 | &sfp_prsnt); |
| 88 | if (!ret) | ||
| 89 | *link_status = *link_status && sfp_prsnt; | ||
| 90 | } | ||
| 88 | 91 | ||
| 89 | mac_cb->link = *link_status; | 92 | mac_cb->link = *link_status; |
| 90 | } | 93 | } |
| @@ -855,7 +858,7 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb) | |||
| 855 | of_node_put(np); | 858 | of_node_put(np); |
| 856 | 859 | ||
| 857 | np = of_parse_phandle(to_of_node(mac_cb->fw_port), | 860 | np = of_parse_phandle(to_of_node(mac_cb->fw_port), |
| 858 | "serdes-syscon", 0); | 861 | "serdes-syscon", 0); |
| 859 | syscon = syscon_node_to_regmap(np); | 862 | syscon = syscon_node_to_regmap(np); |
| 860 | of_node_put(np); | 863 | of_node_put(np); |
| 861 | if (IS_ERR_OR_NULL(syscon)) { | 864 | if (IS_ERR_OR_NULL(syscon)) { |
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c index 90dbda792614..403ea9db6dbd 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | |||
| @@ -1519,6 +1519,7 @@ static void hns_dsaf_set_mac_key( | |||
| 1519 | mac_key->high.bits.mac_3 = addr[3]; | 1519 | mac_key->high.bits.mac_3 = addr[3]; |
| 1520 | mac_key->low.bits.mac_4 = addr[4]; | 1520 | mac_key->low.bits.mac_4 = addr[4]; |
| 1521 | mac_key->low.bits.mac_5 = addr[5]; | 1521 | mac_key->low.bits.mac_5 = addr[5]; |
| 1522 | mac_key->low.bits.port_vlan = 0; | ||
| 1522 | dsaf_set_field(mac_key->low.bits.port_vlan, DSAF_TBL_TCAM_KEY_VLAN_M, | 1523 | dsaf_set_field(mac_key->low.bits.port_vlan, DSAF_TBL_TCAM_KEY_VLAN_M, |
| 1523 | DSAF_TBL_TCAM_KEY_VLAN_S, vlan_id); | 1524 | DSAF_TBL_TCAM_KEY_VLAN_S, vlan_id); |
| 1524 | dsaf_set_field(mac_key->low.bits.port_vlan, DSAF_TBL_TCAM_KEY_PORT_M, | 1525 | dsaf_set_field(mac_key->low.bits.port_vlan, DSAF_TBL_TCAM_KEY_PORT_M, |
| @@ -2924,10 +2925,11 @@ void hns_dsaf_set_promisc_tcam(struct dsaf_device *dsaf_dev, | |||
| 2924 | /* find the tcam entry index for promisc */ | 2925 | /* find the tcam entry index for promisc */ |
| 2925 | entry_index = dsaf_promisc_tcam_entry(port); | 2926 | entry_index = dsaf_promisc_tcam_entry(port); |
| 2926 | 2927 | ||
| 2928 | memset(&tbl_tcam_data, 0, sizeof(tbl_tcam_data)); | ||
| 2929 | memset(&tbl_tcam_mask, 0, sizeof(tbl_tcam_mask)); | ||
| 2930 | |||
| 2927 | /* config key mask */ | 2931 | /* config key mask */ |
| 2928 | if (enable) { | 2932 | if (enable) { |
| 2929 | memset(&tbl_tcam_data, 0, sizeof(tbl_tcam_data)); | ||
| 2930 | memset(&tbl_tcam_mask, 0, sizeof(tbl_tcam_mask)); | ||
| 2931 | dsaf_set_field(tbl_tcam_data.low.bits.port_vlan, | 2933 | dsaf_set_field(tbl_tcam_data.low.bits.port_vlan, |
| 2932 | DSAF_TBL_TCAM_KEY_PORT_M, | 2934 | DSAF_TBL_TCAM_KEY_PORT_M, |
| 2933 | DSAF_TBL_TCAM_KEY_PORT_S, port); | 2935 | DSAF_TBL_TCAM_KEY_PORT_S, port); |
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c index a2c22d084ce9..e13aa064a8e9 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | |||
| @@ -461,6 +461,32 @@ int hns_mac_get_sfp_prsnt(struct hns_mac_cb *mac_cb, int *sfp_prsnt) | |||
| 461 | return 0; | 461 | return 0; |
| 462 | } | 462 | } |
| 463 | 463 | ||
| 464 | int hns_mac_get_sfp_prsnt_acpi(struct hns_mac_cb *mac_cb, int *sfp_prsnt) | ||
| 465 | { | ||
| 466 | union acpi_object *obj; | ||
| 467 | union acpi_object obj_args, argv4; | ||
| 468 | |||
| 469 | obj_args.integer.type = ACPI_TYPE_INTEGER; | ||
| 470 | obj_args.integer.value = mac_cb->mac_id; | ||
| 471 | |||
| 472 | argv4.type = ACPI_TYPE_PACKAGE, | ||
| 473 | argv4.package.count = 1, | ||
| 474 | argv4.package.elements = &obj_args, | ||
| 475 | |||
| 476 | obj = acpi_evaluate_dsm(ACPI_HANDLE(mac_cb->dev), | ||
| 477 | hns_dsaf_acpi_dsm_uuid, 0, | ||
| 478 | HNS_OP_GET_SFP_STAT_FUNC, &argv4); | ||
| 479 | |||
| 480 | if (!obj || obj->type != ACPI_TYPE_INTEGER) | ||
| 481 | return -ENODEV; | ||
| 482 | |||
| 483 | *sfp_prsnt = obj->integer.value; | ||
| 484 | |||
| 485 | ACPI_FREE(obj); | ||
| 486 | |||
| 487 | return 0; | ||
| 488 | } | ||
| 489 | |||
| 464 | /** | 490 | /** |
| 465 | * hns_mac_config_sds_loopback - set loop back for serdes | 491 | * hns_mac_config_sds_loopback - set loop back for serdes |
| 466 | * @mac_cb: mac control block | 492 | * @mac_cb: mac control block |
| @@ -592,7 +618,7 @@ struct dsaf_misc_op *hns_misc_op_get(struct dsaf_device *dsaf_dev) | |||
| 592 | misc_op->hns_dsaf_roce_srst = hns_dsaf_roce_srst_acpi; | 618 | misc_op->hns_dsaf_roce_srst = hns_dsaf_roce_srst_acpi; |
| 593 | 619 | ||
| 594 | misc_op->get_phy_if = hns_mac_get_phy_if_acpi; | 620 | misc_op->get_phy_if = hns_mac_get_phy_if_acpi; |
| 595 | misc_op->get_sfp_prsnt = hns_mac_get_sfp_prsnt; | 621 | misc_op->get_sfp_prsnt = hns_mac_get_sfp_prsnt_acpi; |
| 596 | 622 | ||
| 597 | misc_op->cfg_serdes_loopback = hns_mac_config_sds_loopback_acpi; | 623 | misc_op->cfg_serdes_loopback = hns_mac_config_sds_loopback_acpi; |
| 598 | } else { | 624 | } else { |
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 2175cced402f..e9af89ad039c 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
| @@ -6274,8 +6274,8 @@ static int e1000e_pm_freeze(struct device *dev) | |||
| 6274 | /* Quiesce the device without resetting the hardware */ | 6274 | /* Quiesce the device without resetting the hardware */ |
| 6275 | e1000e_down(adapter, false); | 6275 | e1000e_down(adapter, false); |
| 6276 | e1000_free_irq(adapter); | 6276 | e1000_free_irq(adapter); |
| 6277 | e1000e_reset_interrupt_capability(adapter); | ||
| 6278 | } | 6277 | } |
| 6278 | e1000e_reset_interrupt_capability(adapter); | ||
| 6279 | 6279 | ||
| 6280 | /* Allow time for pending master requests to run */ | 6280 | /* Allow time for pending master requests to run */ |
| 6281 | e1000e_disable_pcie_master(&adapter->hw); | 6281 | e1000e_disable_pcie_master(&adapter->hw); |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index e8a8351c8ea9..82a95cc2c8ee 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
| @@ -4438,8 +4438,12 @@ static void i40e_napi_enable_all(struct i40e_vsi *vsi) | |||
| 4438 | if (!vsi->netdev) | 4438 | if (!vsi->netdev) |
| 4439 | return; | 4439 | return; |
| 4440 | 4440 | ||
| 4441 | for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) | 4441 | for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) { |
| 4442 | napi_enable(&vsi->q_vectors[q_idx]->napi); | 4442 | struct i40e_q_vector *q_vector = vsi->q_vectors[q_idx]; |
| 4443 | |||
| 4444 | if (q_vector->rx.ring || q_vector->tx.ring) | ||
| 4445 | napi_enable(&q_vector->napi); | ||
| 4446 | } | ||
| 4443 | } | 4447 | } |
| 4444 | 4448 | ||
| 4445 | /** | 4449 | /** |
| @@ -4453,8 +4457,12 @@ static void i40e_napi_disable_all(struct i40e_vsi *vsi) | |||
| 4453 | if (!vsi->netdev) | 4457 | if (!vsi->netdev) |
| 4454 | return; | 4458 | return; |
| 4455 | 4459 | ||
| 4456 | for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) | 4460 | for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) { |
| 4457 | napi_disable(&vsi->q_vectors[q_idx]->napi); | 4461 | struct i40e_q_vector *q_vector = vsi->q_vectors[q_idx]; |
| 4462 | |||
| 4463 | if (q_vector->rx.ring || q_vector->tx.ring) | ||
| 4464 | napi_disable(&q_vector->napi); | ||
| 4465 | } | ||
| 4458 | } | 4466 | } |
| 4459 | 4467 | ||
| 4460 | /** | 4468 | /** |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag.c index 55957246c0e8..b5d5519542e8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag.c | |||
| @@ -294,7 +294,7 @@ static int mlx5_handle_changeupper_event(struct mlx5_lag *ldev, | |||
| 294 | struct netdev_notifier_changeupper_info *info) | 294 | struct netdev_notifier_changeupper_info *info) |
| 295 | { | 295 | { |
| 296 | struct net_device *upper = info->upper_dev, *ndev_tmp; | 296 | struct net_device *upper = info->upper_dev, *ndev_tmp; |
| 297 | struct netdev_lag_upper_info *lag_upper_info; | 297 | struct netdev_lag_upper_info *lag_upper_info = NULL; |
| 298 | bool is_bonded; | 298 | bool is_bonded; |
| 299 | int bond_status = 0; | 299 | int bond_status = 0; |
| 300 | int num_slaves = 0; | 300 | int num_slaves = 0; |
| @@ -303,7 +303,8 @@ static int mlx5_handle_changeupper_event(struct mlx5_lag *ldev, | |||
| 303 | if (!netif_is_lag_master(upper)) | 303 | if (!netif_is_lag_master(upper)) |
| 304 | return 0; | 304 | return 0; |
| 305 | 305 | ||
| 306 | lag_upper_info = info->upper_info; | 306 | if (info->linking) |
| 307 | lag_upper_info = info->upper_info; | ||
| 307 | 308 | ||
| 308 | /* The event may still be of interest if the slave does not belong to | 309 | /* The event may still be of interest if the slave does not belong to |
| 309 | * us, but is enslaved to a master which has one or more of our netdevs | 310 | * us, but is enslaved to a master which has one or more of our netdevs |
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 06c9f4100cb9..6ad44be08b33 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
| 26 | #include <linux/crc32.h> | 26 | #include <linux/crc32.h> |
| 27 | #include <linux/crc32c.h> | 27 | #include <linux/crc32c.h> |
| 28 | #include <linux/circ_buf.h> | ||
| 28 | 29 | ||
| 29 | #include "moxart_ether.h" | 30 | #include "moxart_ether.h" |
| 30 | 31 | ||
| @@ -278,6 +279,13 @@ rx_next: | |||
| 278 | return rx; | 279 | return rx; |
| 279 | } | 280 | } |
| 280 | 281 | ||
| 282 | static int moxart_tx_queue_space(struct net_device *ndev) | ||
| 283 | { | ||
| 284 | struct moxart_mac_priv_t *priv = netdev_priv(ndev); | ||
| 285 | |||
| 286 | return CIRC_SPACE(priv->tx_head, priv->tx_tail, TX_DESC_NUM); | ||
| 287 | } | ||
| 288 | |||
| 281 | static void moxart_tx_finished(struct net_device *ndev) | 289 | static void moxart_tx_finished(struct net_device *ndev) |
| 282 | { | 290 | { |
| 283 | struct moxart_mac_priv_t *priv = netdev_priv(ndev); | 291 | struct moxart_mac_priv_t *priv = netdev_priv(ndev); |
| @@ -297,6 +305,9 @@ static void moxart_tx_finished(struct net_device *ndev) | |||
| 297 | tx_tail = TX_NEXT(tx_tail); | 305 | tx_tail = TX_NEXT(tx_tail); |
| 298 | } | 306 | } |
| 299 | priv->tx_tail = tx_tail; | 307 | priv->tx_tail = tx_tail; |
| 308 | if (netif_queue_stopped(ndev) && | ||
| 309 | moxart_tx_queue_space(ndev) >= TX_WAKE_THRESHOLD) | ||
| 310 | netif_wake_queue(ndev); | ||
| 300 | } | 311 | } |
| 301 | 312 | ||
| 302 | static irqreturn_t moxart_mac_interrupt(int irq, void *dev_id) | 313 | static irqreturn_t moxart_mac_interrupt(int irq, void *dev_id) |
| @@ -324,13 +335,18 @@ static int moxart_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
| 324 | struct moxart_mac_priv_t *priv = netdev_priv(ndev); | 335 | struct moxart_mac_priv_t *priv = netdev_priv(ndev); |
| 325 | void *desc; | 336 | void *desc; |
| 326 | unsigned int len; | 337 | unsigned int len; |
| 327 | unsigned int tx_head = priv->tx_head; | 338 | unsigned int tx_head; |
| 328 | u32 txdes1; | 339 | u32 txdes1; |
| 329 | int ret = NETDEV_TX_BUSY; | 340 | int ret = NETDEV_TX_BUSY; |
| 330 | 341 | ||
| 342 | spin_lock_irq(&priv->txlock); | ||
| 343 | |||
| 344 | tx_head = priv->tx_head; | ||
| 331 | desc = priv->tx_desc_base + (TX_REG_DESC_SIZE * tx_head); | 345 | desc = priv->tx_desc_base + (TX_REG_DESC_SIZE * tx_head); |
| 332 | 346 | ||
| 333 | spin_lock_irq(&priv->txlock); | 347 | if (moxart_tx_queue_space(ndev) == 1) |
| 348 | netif_stop_queue(ndev); | ||
| 349 | |||
| 334 | if (moxart_desc_read(desc + TX_REG_OFFSET_DESC0) & TX_DESC0_DMA_OWN) { | 350 | if (moxart_desc_read(desc + TX_REG_OFFSET_DESC0) & TX_DESC0_DMA_OWN) { |
| 335 | net_dbg_ratelimited("no TX space for packet\n"); | 351 | net_dbg_ratelimited("no TX space for packet\n"); |
| 336 | priv->stats.tx_dropped++; | 352 | priv->stats.tx_dropped++; |
diff --git a/drivers/net/ethernet/moxa/moxart_ether.h b/drivers/net/ethernet/moxa/moxart_ether.h index 93a9563ac7c6..afc32ec998c0 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.h +++ b/drivers/net/ethernet/moxa/moxart_ether.h | |||
| @@ -59,6 +59,7 @@ | |||
| 59 | #define TX_NEXT(N) (((N) + 1) & (TX_DESC_NUM_MASK)) | 59 | #define TX_NEXT(N) (((N) + 1) & (TX_DESC_NUM_MASK)) |
| 60 | #define TX_BUF_SIZE 1600 | 60 | #define TX_BUF_SIZE 1600 |
| 61 | #define TX_BUF_SIZE_MAX (TX_DESC1_BUF_SIZE_MASK+1) | 61 | #define TX_BUF_SIZE_MAX (TX_DESC1_BUF_SIZE_MASK+1) |
| 62 | #define TX_WAKE_THRESHOLD 16 | ||
| 62 | 63 | ||
| 63 | #define RX_DESC_NUM 64 | 64 | #define RX_DESC_NUM 64 |
| 64 | #define RX_DESC_NUM_MASK (RX_DESC_NUM-1) | 65 | #define RX_DESC_NUM_MASK (RX_DESC_NUM-1) |
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 9179a99563af..a41377e26c07 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c | |||
| @@ -3275,9 +3275,10 @@ void nfp_net_netdev_clean(struct net_device *netdev) | |||
| 3275 | { | 3275 | { |
| 3276 | struct nfp_net *nn = netdev_priv(netdev); | 3276 | struct nfp_net *nn = netdev_priv(netdev); |
| 3277 | 3277 | ||
| 3278 | unregister_netdev(nn->netdev); | ||
| 3279 | |||
| 3278 | if (nn->xdp_prog) | 3280 | if (nn->xdp_prog) |
| 3279 | bpf_prog_put(nn->xdp_prog); | 3281 | bpf_prog_put(nn->xdp_prog); |
| 3280 | if (nn->bpf_offload_xdp) | 3282 | if (nn->bpf_offload_xdp) |
| 3281 | nfp_net_xdp_offload(nn, NULL); | 3283 | nfp_net_xdp_offload(nn, NULL); |
| 3282 | unregister_netdev(nn->netdev); | ||
| 3283 | } | 3284 | } |
diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c index 7cd76b6b5cb9..2ae852454780 100644 --- a/drivers/net/ethernet/rocker/rocker_ofdpa.c +++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c | |||
| @@ -2216,18 +2216,15 @@ static int ofdpa_port_stp_update(struct ofdpa_port *ofdpa_port, | |||
| 2216 | { | 2216 | { |
| 2217 | bool want[OFDPA_CTRL_MAX] = { 0, }; | 2217 | bool want[OFDPA_CTRL_MAX] = { 0, }; |
| 2218 | bool prev_ctrls[OFDPA_CTRL_MAX]; | 2218 | bool prev_ctrls[OFDPA_CTRL_MAX]; |
| 2219 | u8 uninitialized_var(prev_state); | 2219 | u8 prev_state; |
| 2220 | int err; | 2220 | int err; |
| 2221 | int i; | 2221 | int i; |
| 2222 | 2222 | ||
| 2223 | if (switchdev_trans_ph_prepare(trans)) { | 2223 | prev_state = ofdpa_port->stp_state; |
| 2224 | memcpy(prev_ctrls, ofdpa_port->ctrls, sizeof(prev_ctrls)); | 2224 | if (prev_state == state) |
| 2225 | prev_state = ofdpa_port->stp_state; | ||
| 2226 | } | ||
| 2227 | |||
| 2228 | if (ofdpa_port->stp_state == state) | ||
| 2229 | return 0; | 2225 | return 0; |
| 2230 | 2226 | ||
| 2227 | memcpy(prev_ctrls, ofdpa_port->ctrls, sizeof(prev_ctrls)); | ||
| 2231 | ofdpa_port->stp_state = state; | 2228 | ofdpa_port->stp_state = state; |
| 2232 | 2229 | ||
| 2233 | switch (state) { | 2230 | switch (state) { |
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 9f3d9c67e3fe..fa674a8bda0c 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
| @@ -1267,6 +1267,7 @@ static void soft_reset_slave(struct cpsw_slave *slave) | |||
| 1267 | static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv) | 1267 | static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv) |
| 1268 | { | 1268 | { |
| 1269 | u32 slave_port; | 1269 | u32 slave_port; |
| 1270 | struct phy_device *phy; | ||
| 1270 | struct cpsw_common *cpsw = priv->cpsw; | 1271 | struct cpsw_common *cpsw = priv->cpsw; |
| 1271 | 1272 | ||
| 1272 | soft_reset_slave(slave); | 1273 | soft_reset_slave(slave); |
| @@ -1300,27 +1301,28 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv) | |||
| 1300 | 1 << slave_port, 0, 0, ALE_MCAST_FWD_2); | 1301 | 1 << slave_port, 0, 0, ALE_MCAST_FWD_2); |
| 1301 | 1302 | ||
| 1302 | if (slave->data->phy_node) { | 1303 | if (slave->data->phy_node) { |
| 1303 | slave->phy = of_phy_connect(priv->ndev, slave->data->phy_node, | 1304 | phy = of_phy_connect(priv->ndev, slave->data->phy_node, |
| 1304 | &cpsw_adjust_link, 0, slave->data->phy_if); | 1305 | &cpsw_adjust_link, 0, slave->data->phy_if); |
| 1305 | if (!slave->phy) { | 1306 | if (!phy) { |
| 1306 | dev_err(priv->dev, "phy \"%s\" not found on slave %d\n", | 1307 | dev_err(priv->dev, "phy \"%s\" not found on slave %d\n", |
| 1307 | slave->data->phy_node->full_name, | 1308 | slave->data->phy_node->full_name, |
| 1308 | slave->slave_num); | 1309 | slave->slave_num); |
| 1309 | return; | 1310 | return; |
| 1310 | } | 1311 | } |
| 1311 | } else { | 1312 | } else { |
| 1312 | slave->phy = phy_connect(priv->ndev, slave->data->phy_id, | 1313 | phy = phy_connect(priv->ndev, slave->data->phy_id, |
| 1313 | &cpsw_adjust_link, slave->data->phy_if); | 1314 | &cpsw_adjust_link, slave->data->phy_if); |
| 1314 | if (IS_ERR(slave->phy)) { | 1315 | if (IS_ERR(phy)) { |
| 1315 | dev_err(priv->dev, | 1316 | dev_err(priv->dev, |
| 1316 | "phy \"%s\" not found on slave %d, err %ld\n", | 1317 | "phy \"%s\" not found on slave %d, err %ld\n", |
| 1317 | slave->data->phy_id, slave->slave_num, | 1318 | slave->data->phy_id, slave->slave_num, |
| 1318 | PTR_ERR(slave->phy)); | 1319 | PTR_ERR(phy)); |
| 1319 | slave->phy = NULL; | ||
| 1320 | return; | 1320 | return; |
| 1321 | } | 1321 | } |
| 1322 | } | 1322 | } |
| 1323 | 1323 | ||
| 1324 | slave->phy = phy; | ||
| 1325 | |||
| 1324 | phy_attached_info(slave->phy); | 1326 | phy_attached_info(slave->phy); |
| 1325 | 1327 | ||
| 1326 | phy_start(slave->phy); | 1328 | phy_start(slave->phy); |
| @@ -1817,6 +1819,8 @@ static void cpsw_ndo_tx_timeout(struct net_device *ndev) | |||
| 1817 | } | 1819 | } |
| 1818 | 1820 | ||
| 1819 | cpsw_intr_enable(cpsw); | 1821 | cpsw_intr_enable(cpsw); |
| 1822 | netif_trans_update(ndev); | ||
| 1823 | netif_tx_wake_all_queues(ndev); | ||
| 1820 | } | 1824 | } |
| 1821 | 1825 | ||
| 1822 | static int cpsw_ndo_set_mac_address(struct net_device *ndev, void *p) | 1826 | static int cpsw_ndo_set_mac_address(struct net_device *ndev, void *p) |
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index ffedad2a360a..15b920086251 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
| @@ -418,8 +418,9 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr | |||
| 418 | memset(rd, 0, sizeof(*rd)); | 418 | memset(rd, 0, sizeof(*rd)); |
| 419 | rd->hw = hwmap + i; | 419 | rd->hw = hwmap + i; |
| 420 | rd->buf = kmalloc(len, GFP_KERNEL|GFP_DMA); | 420 | rd->buf = kmalloc(len, GFP_KERNEL|GFP_DMA); |
| 421 | if (rd->buf == NULL || | 421 | if (rd->buf) |
| 422 | !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) { | 422 | busaddr = pci_map_single(pdev, rd->buf, len, dir); |
| 423 | if (rd->buf == NULL || pci_dma_mapping_error(pdev, busaddr)) { | ||
| 423 | if (rd->buf) { | 424 | if (rd->buf) { |
| 424 | net_err_ratelimited("%s: failed to create PCI-MAP for %p\n", | 425 | net_err_ratelimited("%s: failed to create PCI-MAP for %p\n", |
| 425 | __func__, rd->buf); | 426 | __func__, rd->buf); |
| @@ -430,8 +431,7 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr | |||
| 430 | rd = r->rd + j; | 431 | rd = r->rd + j; |
| 431 | busaddr = rd_get_addr(rd); | 432 | busaddr = rd_get_addr(rd); |
| 432 | rd_set_addr_status(rd, 0, 0); | 433 | rd_set_addr_status(rd, 0, 0); |
| 433 | if (busaddr) | 434 | pci_unmap_single(pdev, busaddr, len, dir); |
| 434 | pci_unmap_single(pdev, busaddr, len, dir); | ||
| 435 | kfree(rd->buf); | 435 | kfree(rd->buf); |
| 436 | rd->buf = NULL; | 436 | rd->buf = NULL; |
| 437 | } | 437 | } |
diff --git a/drivers/net/phy/mdio-boardinfo.c b/drivers/net/phy/mdio-boardinfo.c index 6b988f77da08..61941e29daae 100644 --- a/drivers/net/phy/mdio-boardinfo.c +++ b/drivers/net/phy/mdio-boardinfo.c | |||
| @@ -84,3 +84,4 @@ int mdiobus_register_board_info(const struct mdio_board_info *info, | |||
| 84 | 84 | ||
| 85 | return 0; | 85 | return 0; |
| 86 | } | 86 | } |
| 87 | EXPORT_SYMBOL(mdiobus_register_board_info); | ||
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1be69d8bc909..a2bfc82e95d7 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c | |||
| @@ -681,7 +681,7 @@ void phy_stop_machine(struct phy_device *phydev) | |||
| 681 | cancel_delayed_work_sync(&phydev->state_queue); | 681 | cancel_delayed_work_sync(&phydev->state_queue); |
| 682 | 682 | ||
| 683 | mutex_lock(&phydev->lock); | 683 | mutex_lock(&phydev->lock); |
| 684 | if (phydev->state > PHY_UP) | 684 | if (phydev->state > PHY_UP && phydev->state != PHY_HALTED) |
| 685 | phydev->state = PHY_UP; | 685 | phydev->state = PHY_UP; |
| 686 | mutex_unlock(&phydev->lock); | 686 | mutex_unlock(&phydev->lock); |
| 687 | } | 687 | } |
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index f5552aaaa77a..f3ae88fdf332 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -532,6 +532,7 @@ static const struct driver_info wwan_info = { | |||
| 532 | #define LENOVO_VENDOR_ID 0x17ef | 532 | #define LENOVO_VENDOR_ID 0x17ef |
| 533 | #define NVIDIA_VENDOR_ID 0x0955 | 533 | #define NVIDIA_VENDOR_ID 0x0955 |
| 534 | #define HP_VENDOR_ID 0x03f0 | 534 | #define HP_VENDOR_ID 0x03f0 |
| 535 | #define MICROSOFT_VENDOR_ID 0x045e | ||
| 535 | 536 | ||
| 536 | static const struct usb_device_id products[] = { | 537 | static const struct usb_device_id products[] = { |
| 537 | /* BLACKLIST !! | 538 | /* BLACKLIST !! |
| @@ -761,6 +762,20 @@ static const struct usb_device_id products[] = { | |||
| 761 | .driver_info = 0, | 762 | .driver_info = 0, |
| 762 | }, | 763 | }, |
| 763 | 764 | ||
| 765 | /* Microsoft Surface 2 dock (based on Realtek RTL8152) */ | ||
| 766 | { | ||
| 767 | USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x07ab, USB_CLASS_COMM, | ||
| 768 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), | ||
| 769 | .driver_info = 0, | ||
| 770 | }, | ||
| 771 | |||
| 772 | /* Microsoft Surface 3 dock (based on Realtek RTL8153) */ | ||
| 773 | { | ||
| 774 | USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x07c6, USB_CLASS_COMM, | ||
| 775 | USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), | ||
| 776 | .driver_info = 0, | ||
| 777 | }, | ||
| 778 | |||
| 764 | /* WHITELIST!!! | 779 | /* WHITELIST!!! |
| 765 | * | 780 | * |
| 766 | * CDC Ether uses two interfaces, not necessarily consecutive. | 781 | * CDC Ether uses two interfaces, not necessarily consecutive. |
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 0b1b9188625d..07f788c49d57 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c | |||
| @@ -517,6 +517,7 @@ enum rtl8152_flags { | |||
| 517 | 517 | ||
| 518 | /* Define these values to match your device */ | 518 | /* Define these values to match your device */ |
| 519 | #define VENDOR_ID_REALTEK 0x0bda | 519 | #define VENDOR_ID_REALTEK 0x0bda |
| 520 | #define VENDOR_ID_MICROSOFT 0x045e | ||
| 520 | #define VENDOR_ID_SAMSUNG 0x04e8 | 521 | #define VENDOR_ID_SAMSUNG 0x04e8 |
| 521 | #define VENDOR_ID_LENOVO 0x17ef | 522 | #define VENDOR_ID_LENOVO 0x17ef |
| 522 | #define VENDOR_ID_NVIDIA 0x0955 | 523 | #define VENDOR_ID_NVIDIA 0x0955 |
| @@ -1294,6 +1295,7 @@ static void intr_callback(struct urb *urb) | |||
| 1294 | } | 1295 | } |
| 1295 | } else { | 1296 | } else { |
| 1296 | if (netif_carrier_ok(tp->netdev)) { | 1297 | if (netif_carrier_ok(tp->netdev)) { |
| 1298 | netif_stop_queue(tp->netdev); | ||
| 1297 | set_bit(RTL8152_LINK_CHG, &tp->flags); | 1299 | set_bit(RTL8152_LINK_CHG, &tp->flags); |
| 1298 | schedule_delayed_work(&tp->schedule, 0); | 1300 | schedule_delayed_work(&tp->schedule, 0); |
| 1299 | } | 1301 | } |
| @@ -3169,6 +3171,9 @@ static void set_carrier(struct r8152 *tp) | |||
| 3169 | napi_enable(&tp->napi); | 3171 | napi_enable(&tp->napi); |
| 3170 | netif_wake_queue(netdev); | 3172 | netif_wake_queue(netdev); |
| 3171 | netif_info(tp, link, netdev, "carrier on\n"); | 3173 | netif_info(tp, link, netdev, "carrier on\n"); |
| 3174 | } else if (netif_queue_stopped(netdev) && | ||
| 3175 | skb_queue_len(&tp->tx_queue) < tp->tx_qlen) { | ||
| 3176 | netif_wake_queue(netdev); | ||
| 3172 | } | 3177 | } |
| 3173 | } else { | 3178 | } else { |
| 3174 | if (netif_carrier_ok(netdev)) { | 3179 | if (netif_carrier_ok(netdev)) { |
| @@ -3702,8 +3707,18 @@ static int rtl8152_resume(struct usb_interface *intf) | |||
| 3702 | tp->rtl_ops.autosuspend_en(tp, false); | 3707 | tp->rtl_ops.autosuspend_en(tp, false); |
| 3703 | napi_disable(&tp->napi); | 3708 | napi_disable(&tp->napi); |
| 3704 | set_bit(WORK_ENABLE, &tp->flags); | 3709 | set_bit(WORK_ENABLE, &tp->flags); |
| 3705 | if (netif_carrier_ok(tp->netdev)) | 3710 | |
| 3706 | rtl_start_rx(tp); | 3711 | if (netif_carrier_ok(tp->netdev)) { |
| 3712 | if (rtl8152_get_speed(tp) & LINK_STATUS) { | ||
| 3713 | rtl_start_rx(tp); | ||
| 3714 | } else { | ||
| 3715 | netif_carrier_off(tp->netdev); | ||
| 3716 | tp->rtl_ops.disable(tp); | ||
| 3717 | netif_info(tp, link, tp->netdev, | ||
| 3718 | "linking down\n"); | ||
| 3719 | } | ||
| 3720 | } | ||
| 3721 | |||
| 3707 | napi_enable(&tp->napi); | 3722 | napi_enable(&tp->napi); |
| 3708 | clear_bit(SELECTIVE_SUSPEND, &tp->flags); | 3723 | clear_bit(SELECTIVE_SUSPEND, &tp->flags); |
| 3709 | smp_mb__after_atomic(); | 3724 | smp_mb__after_atomic(); |
| @@ -4507,6 +4522,8 @@ static void rtl8152_disconnect(struct usb_interface *intf) | |||
| 4507 | static struct usb_device_id rtl8152_table[] = { | 4522 | static struct usb_device_id rtl8152_table[] = { |
| 4508 | {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8152)}, | 4523 | {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8152)}, |
| 4509 | {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)}, | 4524 | {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)}, |
| 4525 | {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)}, | ||
| 4526 | {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)}, | ||
| 4510 | {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)}, | 4527 | {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)}, |
| 4511 | {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, | 4528 | {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, |
| 4512 | {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)}, | 4529 | {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)}, |
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c index de19c7c92bc6..85d949e03f79 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | |||
| @@ -2238,14 +2238,16 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) | |||
| 2238 | struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy); | 2238 | struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy); |
| 2239 | struct brcmf_p2p_info *p2p = &cfg->p2p; | 2239 | struct brcmf_p2p_info *p2p = &cfg->p2p; |
| 2240 | struct brcmf_cfg80211_vif *vif; | 2240 | struct brcmf_cfg80211_vif *vif; |
| 2241 | enum nl80211_iftype iftype; | ||
| 2241 | bool wait_for_disable = false; | 2242 | bool wait_for_disable = false; |
| 2242 | int err; | 2243 | int err; |
| 2243 | 2244 | ||
| 2244 | brcmf_dbg(TRACE, "delete P2P vif\n"); | 2245 | brcmf_dbg(TRACE, "delete P2P vif\n"); |
| 2245 | vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev); | 2246 | vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev); |
| 2246 | 2247 | ||
| 2248 | iftype = vif->wdev.iftype; | ||
| 2247 | brcmf_cfg80211_arm_vif_event(cfg, vif); | 2249 | brcmf_cfg80211_arm_vif_event(cfg, vif); |
| 2248 | switch (vif->wdev.iftype) { | 2250 | switch (iftype) { |
| 2249 | case NL80211_IFTYPE_P2P_CLIENT: | 2251 | case NL80211_IFTYPE_P2P_CLIENT: |
| 2250 | if (test_bit(BRCMF_VIF_STATUS_DISCONNECTING, &vif->sme_state)) | 2252 | if (test_bit(BRCMF_VIF_STATUS_DISCONNECTING, &vif->sme_state)) |
| 2251 | wait_for_disable = true; | 2253 | wait_for_disable = true; |
| @@ -2275,7 +2277,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) | |||
| 2275 | BRCMF_P2P_DISABLE_TIMEOUT); | 2277 | BRCMF_P2P_DISABLE_TIMEOUT); |
| 2276 | 2278 | ||
| 2277 | err = 0; | 2279 | err = 0; |
| 2278 | if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE) { | 2280 | if (iftype != NL80211_IFTYPE_P2P_DEVICE) { |
| 2279 | brcmf_vif_clear_mgmt_ies(vif); | 2281 | brcmf_vif_clear_mgmt_ies(vif); |
| 2280 | err = brcmf_p2p_release_p2p_if(vif); | 2282 | err = brcmf_p2p_release_p2p_if(vif); |
| 2281 | } | 2283 | } |
| @@ -2291,7 +2293,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) | |||
| 2291 | brcmf_remove_interface(vif->ifp, true); | 2293 | brcmf_remove_interface(vif->ifp, true); |
| 2292 | 2294 | ||
| 2293 | brcmf_cfg80211_arm_vif_event(cfg, NULL); | 2295 | brcmf_cfg80211_arm_vif_event(cfg, NULL); |
| 2294 | if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE) | 2296 | if (iftype != NL80211_IFTYPE_P2P_DEVICE) |
| 2295 | p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif = NULL; | 2297 | p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif = NULL; |
| 2296 | 2298 | ||
| 2297 | return err; | 2299 | return err; |
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c index a260cd503200..077bfd8f4c0c 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | |||
| @@ -1056,6 +1056,8 @@ static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_mvm *mvm, | |||
| 1056 | 1056 | ||
| 1057 | if (ret) | 1057 | if (ret) |
| 1058 | return ret; | 1058 | return ret; |
| 1059 | if (count == 0) | ||
| 1060 | return 0; | ||
| 1059 | 1061 | ||
| 1060 | iwl_mvm_fw_dbg_collect(mvm, FW_DBG_TRIGGER_USER, buf, | 1062 | iwl_mvm_fw_dbg_collect(mvm, FW_DBG_TRIGGER_USER, buf, |
| 1061 | (count - 1), NULL); | 1063 | (count - 1), NULL); |
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c index 99132ea16ede..c5734e1a02d2 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | |||
| @@ -216,7 +216,8 @@ u32 iwl_mvm_mac_get_queues_mask(struct ieee80211_vif *vif) | |||
| 216 | qmask |= BIT(vif->hw_queue[ac]); | 216 | qmask |= BIT(vif->hw_queue[ac]); |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | if (vif->type == NL80211_IFTYPE_AP) | 219 | if (vif->type == NL80211_IFTYPE_AP || |
| 220 | vif->type == NL80211_IFTYPE_ADHOC) | ||
| 220 | qmask |= BIT(vif->cab_queue); | 221 | qmask |= BIT(vif->cab_queue); |
| 221 | 222 | ||
| 222 | return qmask; | 223 | return qmask; |
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 6927caecd48e..486dcceed17a 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | |||
| @@ -2401,7 +2401,7 @@ void iwl_mvm_sta_pm_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb) | |||
| 2401 | return; | 2401 | return; |
| 2402 | 2402 | ||
| 2403 | rcu_read_lock(); | 2403 | rcu_read_lock(); |
| 2404 | sta = mvm->fw_id_to_mac_id[notif->sta_id]; | 2404 | sta = rcu_dereference(mvm->fw_id_to_mac_id[notif->sta_id]); |
| 2405 | if (WARN_ON(IS_ERR_OR_NULL(sta))) { | 2405 | if (WARN_ON(IS_ERR_OR_NULL(sta))) { |
| 2406 | rcu_read_unlock(); | 2406 | rcu_read_unlock(); |
| 2407 | return; | 2407 | return; |
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c index b51a2853cc80..9d28db7f56aa 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c | |||
| @@ -1806,7 +1806,8 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) | |||
| 1806 | iwl_mvm_get_wd_timeout(mvm, vif, false, false); | 1806 | iwl_mvm_get_wd_timeout(mvm, vif, false, false); |
| 1807 | int queue; | 1807 | int queue; |
| 1808 | 1808 | ||
| 1809 | if (vif->type == NL80211_IFTYPE_AP) | 1809 | if (vif->type == NL80211_IFTYPE_AP || |
| 1810 | vif->type == NL80211_IFTYPE_ADHOC) | ||
| 1810 | queue = IWL_MVM_DQA_AP_PROBE_RESP_QUEUE; | 1811 | queue = IWL_MVM_DQA_AP_PROBE_RESP_QUEUE; |
| 1811 | else if (vif->type == NL80211_IFTYPE_P2P_DEVICE) | 1812 | else if (vif->type == NL80211_IFTYPE_P2P_DEVICE) |
| 1812 | queue = IWL_MVM_DQA_P2P_DEVICE_QUEUE; | 1813 | queue = IWL_MVM_DQA_P2P_DEVICE_QUEUE; |
| @@ -1837,7 +1838,8 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) | |||
| 1837 | * enabled-cab_queue to the mask) | 1838 | * enabled-cab_queue to the mask) |
| 1838 | */ | 1839 | */ |
| 1839 | if (iwl_mvm_is_dqa_supported(mvm) && | 1840 | if (iwl_mvm_is_dqa_supported(mvm) && |
| 1840 | vif->type == NL80211_IFTYPE_AP) { | 1841 | (vif->type == NL80211_IFTYPE_AP || |
| 1842 | vif->type == NL80211_IFTYPE_ADHOC)) { | ||
| 1841 | struct iwl_trans_txq_scd_cfg cfg = { | 1843 | struct iwl_trans_txq_scd_cfg cfg = { |
| 1842 | .fifo = IWL_MVM_TX_FIFO_MCAST, | 1844 | .fifo = IWL_MVM_TX_FIFO_MCAST, |
| 1843 | .sta_id = mvmvif->bcast_sta.sta_id, | 1845 | .sta_id = mvmvif->bcast_sta.sta_id, |
| @@ -1862,7 +1864,8 @@ static void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm, | |||
| 1862 | 1864 | ||
| 1863 | lockdep_assert_held(&mvm->mutex); | 1865 | lockdep_assert_held(&mvm->mutex); |
| 1864 | 1866 | ||
| 1865 | if (vif->type == NL80211_IFTYPE_AP) | 1867 | if (vif->type == NL80211_IFTYPE_AP || |
| 1868 | vif->type == NL80211_IFTYPE_ADHOC) | ||
| 1866 | iwl_mvm_disable_txq(mvm, vif->cab_queue, vif->cab_queue, | 1869 | iwl_mvm_disable_txq(mvm, vif->cab_queue, vif->cab_queue, |
| 1867 | IWL_MAX_TID_COUNT, 0); | 1870 | IWL_MAX_TID_COUNT, 0); |
| 1868 | 1871 | ||
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c index 3f37075f4cde..1ba0a6f55503 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c | |||
| @@ -506,6 +506,7 @@ static int iwl_mvm_get_ctrl_vif_queue(struct iwl_mvm *mvm, | |||
| 506 | 506 | ||
| 507 | switch (info->control.vif->type) { | 507 | switch (info->control.vif->type) { |
| 508 | case NL80211_IFTYPE_AP: | 508 | case NL80211_IFTYPE_AP: |
| 509 | case NL80211_IFTYPE_ADHOC: | ||
| 509 | /* | 510 | /* |
| 510 | * Handle legacy hostapd as well, where station may be added | 511 | * Handle legacy hostapd as well, where station may be added |
| 511 | * only after assoc. Take care of the case where we send a | 512 | * only after assoc. Take care of the case where we send a |
| @@ -517,7 +518,8 @@ static int iwl_mvm_get_ctrl_vif_queue(struct iwl_mvm *mvm, | |||
| 517 | if (info->hw_queue == info->control.vif->cab_queue) | 518 | if (info->hw_queue == info->control.vif->cab_queue) |
| 518 | return info->hw_queue; | 519 | return info->hw_queue; |
| 519 | 520 | ||
| 520 | WARN_ONCE(1, "fc=0x%02x", le16_to_cpu(fc)); | 521 | WARN_ONCE(info->control.vif->type != NL80211_IFTYPE_ADHOC, |
| 522 | "fc=0x%02x", le16_to_cpu(fc)); | ||
| 521 | return IWL_MVM_DQA_AP_PROBE_RESP_QUEUE; | 523 | return IWL_MVM_DQA_AP_PROBE_RESP_QUEUE; |
| 522 | case NL80211_IFTYPE_P2P_DEVICE: | 524 | case NL80211_IFTYPE_P2P_DEVICE: |
| 523 | if (ieee80211_is_mgmt(fc)) | 525 | if (ieee80211_is_mgmt(fc)) |
| @@ -584,7 +586,8 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb) | |||
| 584 | iwl_mvm_vif_from_mac80211(info.control.vif); | 586 | iwl_mvm_vif_from_mac80211(info.control.vif); |
| 585 | 587 | ||
| 586 | if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE || | 588 | if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE || |
| 587 | info.control.vif->type == NL80211_IFTYPE_AP) { | 589 | info.control.vif->type == NL80211_IFTYPE_AP || |
| 590 | info.control.vif->type == NL80211_IFTYPE_ADHOC) { | ||
| 588 | sta_id = mvmvif->bcast_sta.sta_id; | 591 | sta_id = mvmvif->bcast_sta.sta_id; |
| 589 | queue = iwl_mvm_get_ctrl_vif_queue(mvm, &info, | 592 | queue = iwl_mvm_get_ctrl_vif_queue(mvm, &info, |
| 590 | hdr->frame_control); | 593 | hdr->frame_control); |
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index caea350f05aa..bdc379178e87 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c | |||
| @@ -1742,12 +1742,14 @@ void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, u8 tag, u8 len, u8 *val) | |||
| 1742 | unsigned long flags; | 1742 | unsigned long flags; |
| 1743 | struct rtl_c2hcmd *c2hcmd; | 1743 | struct rtl_c2hcmd *c2hcmd; |
| 1744 | 1744 | ||
| 1745 | c2hcmd = kmalloc(sizeof(*c2hcmd), GFP_KERNEL); | 1745 | c2hcmd = kmalloc(sizeof(*c2hcmd), |
| 1746 | in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); | ||
| 1746 | 1747 | ||
| 1747 | if (!c2hcmd) | 1748 | if (!c2hcmd) |
| 1748 | goto label_err; | 1749 | goto label_err; |
| 1749 | 1750 | ||
| 1750 | c2hcmd->val = kmalloc(len, GFP_KERNEL); | 1751 | c2hcmd->val = kmalloc(len, |
| 1752 | in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); | ||
| 1751 | 1753 | ||
| 1752 | if (!c2hcmd->val) | 1754 | if (!c2hcmd->val) |
| 1753 | goto label_err2; | 1755 | goto label_err2; |
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 9b3b57fef446..9583a5f58a1d 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c | |||
| @@ -270,7 +270,7 @@ static inline int nvme_setup_discard(struct nvme_ns *ns, struct request *req, | |||
| 270 | memset(cmnd, 0, sizeof(*cmnd)); | 270 | memset(cmnd, 0, sizeof(*cmnd)); |
| 271 | cmnd->dsm.opcode = nvme_cmd_dsm; | 271 | cmnd->dsm.opcode = nvme_cmd_dsm; |
| 272 | cmnd->dsm.nsid = cpu_to_le32(ns->ns_id); | 272 | cmnd->dsm.nsid = cpu_to_le32(ns->ns_id); |
| 273 | cmnd->dsm.nr = segments - 1; | 273 | cmnd->dsm.nr = cpu_to_le32(segments - 1); |
| 274 | cmnd->dsm.attributes = cpu_to_le32(NVME_DSMGMT_AD); | 274 | cmnd->dsm.attributes = cpu_to_le32(NVME_DSMGMT_AD); |
| 275 | 275 | ||
| 276 | req->special_vec.bv_page = virt_to_page(range); | 276 | req->special_vec.bv_page = virt_to_page(range); |
diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index a7bcff45f437..76450b0c55f1 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c | |||
| @@ -100,7 +100,7 @@ static u16 nvmet_get_smart_log(struct nvmet_req *req, | |||
| 100 | u16 status; | 100 | u16 status; |
| 101 | 101 | ||
| 102 | WARN_ON(req == NULL || slog == NULL); | 102 | WARN_ON(req == NULL || slog == NULL); |
| 103 | if (req->cmd->get_log_page.nsid == 0xFFFFFFFF) | 103 | if (req->cmd->get_log_page.nsid == cpu_to_le32(0xFFFFFFFF)) |
| 104 | status = nvmet_get_smart_log_all(req, slog); | 104 | status = nvmet_get_smart_log_all(req, slog); |
| 105 | else | 105 | else |
| 106 | status = nvmet_get_smart_log_nsid(req, slog); | 106 | status = nvmet_get_smart_log_nsid(req, slog); |
diff --git a/drivers/nvme/target/io-cmd.c b/drivers/nvme/target/io-cmd.c index 4195115c7e54..6b0baa9caab9 100644 --- a/drivers/nvme/target/io-cmd.c +++ b/drivers/nvme/target/io-cmd.c | |||
| @@ -180,7 +180,7 @@ static void nvmet_execute_write_zeroes(struct nvmet_req *req) | |||
| 180 | 180 | ||
| 181 | sector = le64_to_cpu(write_zeroes->slba) << | 181 | sector = le64_to_cpu(write_zeroes->slba) << |
| 182 | (req->ns->blksize_shift - 9); | 182 | (req->ns->blksize_shift - 9); |
| 183 | nr_sector = (((sector_t)le32_to_cpu(write_zeroes->length)) << | 183 | nr_sector = (((sector_t)le16_to_cpu(write_zeroes->length)) << |
| 184 | (req->ns->blksize_shift - 9)) + 1; | 184 | (req->ns->blksize_shift - 9)) + 1; |
| 185 | 185 | ||
| 186 | if (__blkdev_issue_zeroout(req->ns->bdev, sector, nr_sector, | 186 | if (__blkdev_issue_zeroout(req->ns->bdev, sector, nr_sector, |
| @@ -230,7 +230,7 @@ int nvmet_parse_io_cmd(struct nvmet_req *req) | |||
| 230 | return 0; | 230 | return 0; |
| 231 | case nvme_cmd_dsm: | 231 | case nvme_cmd_dsm: |
| 232 | req->execute = nvmet_execute_dsm; | 232 | req->execute = nvmet_execute_dsm; |
| 233 | req->data_len = le32_to_cpu(cmd->dsm.nr + 1) * | 233 | req->data_len = (le32_to_cpu(cmd->dsm.nr) + 1) * |
| 234 | sizeof(struct nvme_dsm_range); | 234 | sizeof(struct nvme_dsm_range); |
| 235 | return 0; | 235 | return 0; |
| 236 | case nvme_cmd_write_zeroes: | 236 | case nvme_cmd_write_zeroes: |
diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig index dfb8a69afc28..d2d2ba5b8a68 100644 --- a/drivers/pci/dwc/Kconfig +++ b/drivers/pci/dwc/Kconfig | |||
| @@ -89,6 +89,7 @@ config PCI_HISI | |||
| 89 | depends on PCI_MSI_IRQ_DOMAIN | 89 | depends on PCI_MSI_IRQ_DOMAIN |
| 90 | select PCIEPORTBUS | 90 | select PCIEPORTBUS |
| 91 | select PCIE_DW_HOST | 91 | select PCIE_DW_HOST |
| 92 | select PCI_HOST_COMMON | ||
| 92 | help | 93 | help |
| 93 | Say Y here if you want PCIe controller support on HiSilicon | 94 | Say Y here if you want PCIe controller support on HiSilicon |
| 94 | Hip05 and Hip06 SoCs | 95 | Hip05 and Hip06 SoCs |
diff --git a/drivers/pci/dwc/pcie-artpec6.c b/drivers/pci/dwc/pcie-artpec6.c index fcd3ef845883..6d23683c0892 100644 --- a/drivers/pci/dwc/pcie-artpec6.c +++ b/drivers/pci/dwc/pcie-artpec6.c | |||
| @@ -234,6 +234,9 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, | |||
| 234 | return 0; | 234 | return 0; |
| 235 | } | 235 | } |
| 236 | 236 | ||
| 237 | static const struct dw_pcie_ops dw_pcie_ops = { | ||
| 238 | }; | ||
| 239 | |||
| 237 | static int artpec6_pcie_probe(struct platform_device *pdev) | 240 | static int artpec6_pcie_probe(struct platform_device *pdev) |
| 238 | { | 241 | { |
| 239 | struct device *dev = &pdev->dev; | 242 | struct device *dev = &pdev->dev; |
| @@ -252,6 +255,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev) | |||
| 252 | return -ENOMEM; | 255 | return -ENOMEM; |
| 253 | 256 | ||
| 254 | pci->dev = dev; | 257 | pci->dev = dev; |
| 258 | pci->ops = &dw_pcie_ops; | ||
| 255 | 259 | ||
| 256 | artpec6_pcie->pci = pci; | 260 | artpec6_pcie->pci = pci; |
| 257 | 261 | ||
diff --git a/drivers/pci/dwc/pcie-designware-plat.c b/drivers/pci/dwc/pcie-designware-plat.c index b6c832ba39dd..f20d494922ab 100644 --- a/drivers/pci/dwc/pcie-designware-plat.c +++ b/drivers/pci/dwc/pcie-designware-plat.c | |||
| @@ -86,6 +86,9 @@ static int dw_plat_add_pcie_port(struct pcie_port *pp, | |||
| 86 | return 0; | 86 | return 0; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | static const struct dw_pcie_ops dw_pcie_ops = { | ||
| 90 | }; | ||
| 91 | |||
| 89 | static int dw_plat_pcie_probe(struct platform_device *pdev) | 92 | static int dw_plat_pcie_probe(struct platform_device *pdev) |
| 90 | { | 93 | { |
| 91 | struct device *dev = &pdev->dev; | 94 | struct device *dev = &pdev->dev; |
| @@ -103,6 +106,7 @@ static int dw_plat_pcie_probe(struct platform_device *pdev) | |||
| 103 | return -ENOMEM; | 106 | return -ENOMEM; |
| 104 | 107 | ||
| 105 | pci->dev = dev; | 108 | pci->dev = dev; |
| 109 | pci->ops = &dw_pcie_ops; | ||
| 106 | 110 | ||
| 107 | dw_plat_pcie->pci = pci; | 111 | dw_plat_pcie->pci = pci; |
| 108 | 112 | ||
diff --git a/drivers/pci/host/pci-thunder-pem.c b/drivers/pci/host/pci-thunder-pem.c index 52b5bdccf5f0..6e031b522529 100644 --- a/drivers/pci/host/pci-thunder-pem.c +++ b/drivers/pci/host/pci-thunder-pem.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | * Copyright (C) 2015 - 2016 Cavium, Inc. | 14 | * Copyright (C) 2015 - 2016 Cavium, Inc. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/bitfield.h> | ||
| 17 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 18 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 19 | #include <linux/of_address.h> | 20 | #include <linux/of_address.h> |
| @@ -334,6 +335,49 @@ static int thunder_pem_init(struct device *dev, struct pci_config_window *cfg, | |||
| 334 | 335 | ||
| 335 | #if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS) | 336 | #if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS) |
| 336 | 337 | ||
| 338 | #define PEM_RES_BASE 0x87e0c0000000UL | ||
| 339 | #define PEM_NODE_MASK GENMASK(45, 44) | ||
| 340 | #define PEM_INDX_MASK GENMASK(26, 24) | ||
| 341 | #define PEM_MIN_DOM_IN_NODE 4 | ||
| 342 | #define PEM_MAX_DOM_IN_NODE 10 | ||
| 343 | |||
| 344 | static void thunder_pem_reserve_range(struct device *dev, int seg, | ||
| 345 | struct resource *r) | ||
| 346 | { | ||
| 347 | resource_size_t start = r->start, end = r->end; | ||
| 348 | struct resource *res; | ||
| 349 | const char *regionid; | ||
| 350 | |||
| 351 | regionid = kasprintf(GFP_KERNEL, "PEM RC:%d", seg); | ||
| 352 | if (!regionid) | ||
| 353 | return; | ||
| 354 | |||
| 355 | res = request_mem_region(start, end - start + 1, regionid); | ||
| 356 | if (res) | ||
| 357 | res->flags &= ~IORESOURCE_BUSY; | ||
| 358 | else | ||
| 359 | kfree(regionid); | ||
| 360 | |||
| 361 | dev_info(dev, "%pR %s reserved\n", r, | ||
| 362 | res ? "has been" : "could not be"); | ||
| 363 | } | ||
| 364 | |||
| 365 | static void thunder_pem_legacy_fw(struct acpi_pci_root *root, | ||
| 366 | struct resource *res_pem) | ||
| 367 | { | ||
| 368 | int node = acpi_get_node(root->device->handle); | ||
| 369 | int index; | ||
| 370 | |||
| 371 | if (node == NUMA_NO_NODE) | ||
| 372 | node = 0; | ||
| 373 | |||
| 374 | index = root->segment - PEM_MIN_DOM_IN_NODE; | ||
| 375 | index -= node * PEM_MAX_DOM_IN_NODE; | ||
| 376 | res_pem->start = PEM_RES_BASE | FIELD_PREP(PEM_NODE_MASK, node) | | ||
| 377 | FIELD_PREP(PEM_INDX_MASK, index); | ||
| 378 | res_pem->flags = IORESOURCE_MEM; | ||
| 379 | } | ||
| 380 | |||
| 337 | static int thunder_pem_acpi_init(struct pci_config_window *cfg) | 381 | static int thunder_pem_acpi_init(struct pci_config_window *cfg) |
| 338 | { | 382 | { |
| 339 | struct device *dev = cfg->parent; | 383 | struct device *dev = cfg->parent; |
| @@ -346,10 +390,24 @@ static int thunder_pem_acpi_init(struct pci_config_window *cfg) | |||
| 346 | if (!res_pem) | 390 | if (!res_pem) |
| 347 | return -ENOMEM; | 391 | return -ENOMEM; |
| 348 | 392 | ||
| 349 | ret = acpi_get_rc_resources(dev, "THRX0002", root->segment, res_pem); | 393 | ret = acpi_get_rc_resources(dev, "CAVA02B", root->segment, res_pem); |
| 394 | |||
| 395 | /* | ||
| 396 | * If we fail to gather resources it means that we run with old | ||
| 397 | * FW where we need to calculate PEM-specific resources manually. | ||
| 398 | */ | ||
| 350 | if (ret) { | 399 | if (ret) { |
| 351 | dev_err(dev, "can't get rc base address\n"); | 400 | thunder_pem_legacy_fw(root, res_pem); |
| 352 | return ret; | 401 | /* |
| 402 | * Reserve 64K size PEM specific resources. The full 16M range | ||
| 403 | * size is required for thunder_pem_init() call. | ||
| 404 | */ | ||
| 405 | res_pem->end = res_pem->start + SZ_64K - 1; | ||
| 406 | thunder_pem_reserve_range(dev, root->segment, res_pem); | ||
| 407 | res_pem->end = res_pem->start + SZ_16M - 1; | ||
| 408 | |||
| 409 | /* Reserve PCI configuration space as well. */ | ||
| 410 | thunder_pem_reserve_range(dev, root->segment, &cfg->res); | ||
| 353 | } | 411 | } |
| 354 | 412 | ||
| 355 | return thunder_pem_init(dev, cfg, res_pem); | 413 | return thunder_pem_init(dev, cfg, res_pem); |
diff --git a/drivers/pci/host/pcie-iproc-bcma.c b/drivers/pci/host/pcie-iproc-bcma.c index bd4c9ec25edc..384c27e664fe 100644 --- a/drivers/pci/host/pcie-iproc-bcma.c +++ b/drivers/pci/host/pcie-iproc-bcma.c | |||
| @@ -44,8 +44,7 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) | |||
| 44 | { | 44 | { |
| 45 | struct device *dev = &bdev->dev; | 45 | struct device *dev = &bdev->dev; |
| 46 | struct iproc_pcie *pcie; | 46 | struct iproc_pcie *pcie; |
| 47 | LIST_HEAD(res); | 47 | LIST_HEAD(resources); |
| 48 | struct resource res_mem; | ||
| 49 | int ret; | 48 | int ret; |
| 50 | 49 | ||
| 51 | pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); | 50 | pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); |
| @@ -63,22 +62,23 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) | |||
| 63 | 62 | ||
| 64 | pcie->base_addr = bdev->addr; | 63 | pcie->base_addr = bdev->addr; |
| 65 | 64 | ||
| 66 | res_mem.start = bdev->addr_s[0]; | 65 | pcie->mem.start = bdev->addr_s[0]; |
| 67 | res_mem.end = bdev->addr_s[0] + SZ_128M - 1; | 66 | pcie->mem.end = bdev->addr_s[0] + SZ_128M - 1; |
| 68 | res_mem.name = "PCIe MEM space"; | 67 | pcie->mem.name = "PCIe MEM space"; |
| 69 | res_mem.flags = IORESOURCE_MEM; | 68 | pcie->mem.flags = IORESOURCE_MEM; |
| 70 | pci_add_resource(&res, &res_mem); | 69 | pci_add_resource(&resources, &pcie->mem); |
| 71 | 70 | ||
| 72 | pcie->map_irq = iproc_pcie_bcma_map_irq; | 71 | pcie->map_irq = iproc_pcie_bcma_map_irq; |
| 73 | 72 | ||
| 74 | ret = iproc_pcie_setup(pcie, &res); | 73 | ret = iproc_pcie_setup(pcie, &resources); |
| 75 | if (ret) | 74 | if (ret) { |
| 76 | dev_err(dev, "PCIe controller setup failed\n"); | 75 | dev_err(dev, "PCIe controller setup failed\n"); |
| 77 | 76 | pci_free_resource_list(&resources); | |
| 78 | pci_free_resource_list(&res); | 77 | return ret; |
| 78 | } | ||
| 79 | 79 | ||
| 80 | bcma_set_drvdata(bdev, pcie); | 80 | bcma_set_drvdata(bdev, pcie); |
| 81 | return ret; | 81 | return 0; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | static void iproc_pcie_bcma_remove(struct bcma_device *bdev) | 84 | static void iproc_pcie_bcma_remove(struct bcma_device *bdev) |
diff --git a/drivers/pci/host/pcie-iproc-platform.c b/drivers/pci/host/pcie-iproc-platform.c index f4909bb0b2ad..8c6a327ca6cd 100644 --- a/drivers/pci/host/pcie-iproc-platform.c +++ b/drivers/pci/host/pcie-iproc-platform.c | |||
| @@ -51,7 +51,7 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) | |||
| 51 | struct device_node *np = dev->of_node; | 51 | struct device_node *np = dev->of_node; |
| 52 | struct resource reg; | 52 | struct resource reg; |
| 53 | resource_size_t iobase = 0; | 53 | resource_size_t iobase = 0; |
| 54 | LIST_HEAD(res); | 54 | LIST_HEAD(resources); |
| 55 | int ret; | 55 | int ret; |
| 56 | 56 | ||
| 57 | pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); | 57 | pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); |
| @@ -96,10 +96,10 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) | |||
| 96 | pcie->phy = NULL; | 96 | pcie->phy = NULL; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | ret = of_pci_get_host_bridge_resources(np, 0, 0xff, &res, &iobase); | 99 | ret = of_pci_get_host_bridge_resources(np, 0, 0xff, &resources, |
| 100 | &iobase); | ||
| 100 | if (ret) { | 101 | if (ret) { |
| 101 | dev_err(dev, | 102 | dev_err(dev, "unable to get PCI host bridge resources\n"); |
| 102 | "unable to get PCI host bridge resources\n"); | ||
| 103 | return ret; | 103 | return ret; |
| 104 | } | 104 | } |
| 105 | 105 | ||
| @@ -112,14 +112,15 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) | |||
| 112 | pcie->map_irq = of_irq_parse_and_map_pci; | 112 | pcie->map_irq = of_irq_parse_and_map_pci; |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | ret = iproc_pcie_setup(pcie, &res); | 115 | ret = iproc_pcie_setup(pcie, &resources); |
| 116 | if (ret) | 116 | if (ret) { |
| 117 | dev_err(dev, "PCIe controller setup failed\n"); | 117 | dev_err(dev, "PCIe controller setup failed\n"); |
| 118 | 118 | pci_free_resource_list(&resources); | |
| 119 | pci_free_resource_list(&res); | 119 | return ret; |
| 120 | } | ||
| 120 | 121 | ||
| 121 | platform_set_drvdata(pdev, pcie); | 122 | platform_set_drvdata(pdev, pcie); |
| 122 | return ret; | 123 | return 0; |
| 123 | } | 124 | } |
| 124 | 125 | ||
| 125 | static int iproc_pcie_pltfm_remove(struct platform_device *pdev) | 126 | static int iproc_pcie_pltfm_remove(struct platform_device *pdev) |
diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h index 04fed8e907f1..0bbe2ea44f3e 100644 --- a/drivers/pci/host/pcie-iproc.h +++ b/drivers/pci/host/pcie-iproc.h | |||
| @@ -90,6 +90,7 @@ struct iproc_pcie { | |||
| 90 | #ifdef CONFIG_ARM | 90 | #ifdef CONFIG_ARM |
| 91 | struct pci_sys_data sysdata; | 91 | struct pci_sys_data sysdata; |
| 92 | #endif | 92 | #endif |
| 93 | struct resource mem; | ||
| 93 | struct pci_bus *root_bus; | 94 | struct pci_bus *root_bus; |
| 94 | struct phy *phy; | 95 | struct phy *phy; |
| 95 | int (*map_irq)(const struct pci_dev *, u8, u8); | 96 | int (*map_irq)(const struct pci_dev *, u8, u8); |
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index d69046537b75..32822b0d9cd0 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c | |||
| @@ -2010,29 +2010,57 @@ out_err: | |||
| 2010 | return ERR_PTR(ret); | 2010 | return ERR_PTR(ret); |
| 2011 | } | 2011 | } |
| 2012 | 2012 | ||
| 2013 | static int pinctrl_create_and_start(struct pinctrl_dev *pctldev) | 2013 | static int pinctrl_claim_hogs(struct pinctrl_dev *pctldev) |
| 2014 | { | 2014 | { |
| 2015 | pctldev->p = create_pinctrl(pctldev->dev, pctldev); | 2015 | pctldev->p = create_pinctrl(pctldev->dev, pctldev); |
| 2016 | if (!IS_ERR(pctldev->p)) { | 2016 | if (PTR_ERR(pctldev->p) == -ENODEV) { |
| 2017 | kref_get(&pctldev->p->users); | 2017 | dev_dbg(pctldev->dev, "no hogs found\n"); |
| 2018 | pctldev->hog_default = | ||
| 2019 | pinctrl_lookup_state(pctldev->p, PINCTRL_STATE_DEFAULT); | ||
| 2020 | if (IS_ERR(pctldev->hog_default)) { | ||
| 2021 | dev_dbg(pctldev->dev, | ||
| 2022 | "failed to lookup the default state\n"); | ||
| 2023 | } else { | ||
| 2024 | if (pinctrl_select_state(pctldev->p, | ||
| 2025 | pctldev->hog_default)) | ||
| 2026 | dev_err(pctldev->dev, | ||
| 2027 | "failed to select default state\n"); | ||
| 2028 | } | ||
| 2029 | 2018 | ||
| 2030 | pctldev->hog_sleep = | 2019 | return 0; |
| 2031 | pinctrl_lookup_state(pctldev->p, | 2020 | } |
| 2032 | PINCTRL_STATE_SLEEP); | 2021 | |
| 2033 | if (IS_ERR(pctldev->hog_sleep)) | 2022 | if (IS_ERR(pctldev->p)) { |
| 2034 | dev_dbg(pctldev->dev, | 2023 | dev_err(pctldev->dev, "error claiming hogs: %li\n", |
| 2035 | "failed to lookup the sleep state\n"); | 2024 | PTR_ERR(pctldev->p)); |
| 2025 | |||
| 2026 | return PTR_ERR(pctldev->p); | ||
| 2027 | } | ||
| 2028 | |||
| 2029 | kref_get(&pctldev->p->users); | ||
| 2030 | pctldev->hog_default = | ||
| 2031 | pinctrl_lookup_state(pctldev->p, PINCTRL_STATE_DEFAULT); | ||
| 2032 | if (IS_ERR(pctldev->hog_default)) { | ||
| 2033 | dev_dbg(pctldev->dev, | ||
| 2034 | "failed to lookup the default state\n"); | ||
| 2035 | } else { | ||
| 2036 | if (pinctrl_select_state(pctldev->p, | ||
| 2037 | pctldev->hog_default)) | ||
| 2038 | dev_err(pctldev->dev, | ||
| 2039 | "failed to select default state\n"); | ||
| 2040 | } | ||
| 2041 | |||
| 2042 | pctldev->hog_sleep = | ||
| 2043 | pinctrl_lookup_state(pctldev->p, | ||
| 2044 | PINCTRL_STATE_SLEEP); | ||
| 2045 | if (IS_ERR(pctldev->hog_sleep)) | ||
| 2046 | dev_dbg(pctldev->dev, | ||
| 2047 | "failed to lookup the sleep state\n"); | ||
| 2048 | |||
| 2049 | return 0; | ||
| 2050 | } | ||
| 2051 | |||
| 2052 | int pinctrl_enable(struct pinctrl_dev *pctldev) | ||
| 2053 | { | ||
| 2054 | int error; | ||
| 2055 | |||
| 2056 | error = pinctrl_claim_hogs(pctldev); | ||
| 2057 | if (error) { | ||
| 2058 | dev_err(pctldev->dev, "could not claim hogs: %i\n", | ||
| 2059 | error); | ||
| 2060 | mutex_destroy(&pctldev->mutex); | ||
| 2061 | kfree(pctldev); | ||
| 2062 | |||
| 2063 | return error; | ||
| 2036 | } | 2064 | } |
| 2037 | 2065 | ||
| 2038 | mutex_lock(&pinctrldev_list_mutex); | 2066 | mutex_lock(&pinctrldev_list_mutex); |
| @@ -2043,6 +2071,7 @@ static int pinctrl_create_and_start(struct pinctrl_dev *pctldev) | |||
| 2043 | 2071 | ||
| 2044 | return 0; | 2072 | return 0; |
| 2045 | } | 2073 | } |
| 2074 | EXPORT_SYMBOL_GPL(pinctrl_enable); | ||
| 2046 | 2075 | ||
| 2047 | /** | 2076 | /** |
| 2048 | * pinctrl_register() - register a pin controller device | 2077 | * pinctrl_register() - register a pin controller device |
| @@ -2065,25 +2094,30 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, | |||
| 2065 | if (IS_ERR(pctldev)) | 2094 | if (IS_ERR(pctldev)) |
| 2066 | return pctldev; | 2095 | return pctldev; |
| 2067 | 2096 | ||
| 2068 | error = pinctrl_create_and_start(pctldev); | 2097 | error = pinctrl_enable(pctldev); |
| 2069 | if (error) { | 2098 | if (error) |
| 2070 | mutex_destroy(&pctldev->mutex); | ||
| 2071 | kfree(pctldev); | ||
| 2072 | |||
| 2073 | return ERR_PTR(error); | 2099 | return ERR_PTR(error); |
| 2074 | } | ||
| 2075 | 2100 | ||
| 2076 | return pctldev; | 2101 | return pctldev; |
| 2077 | 2102 | ||
| 2078 | } | 2103 | } |
| 2079 | EXPORT_SYMBOL_GPL(pinctrl_register); | 2104 | EXPORT_SYMBOL_GPL(pinctrl_register); |
| 2080 | 2105 | ||
| 2106 | /** | ||
| 2107 | * pinctrl_register_and_init() - register and init pin controller device | ||
| 2108 | * @pctldesc: descriptor for this pin controller | ||
| 2109 | * @dev: parent device for this pin controller | ||
| 2110 | * @driver_data: private pin controller data for this pin controller | ||
| 2111 | * @pctldev: pin controller device | ||
| 2112 | * | ||
| 2113 | * Note that pinctrl_enable() still needs to be manually called after | ||
| 2114 | * this once the driver is ready. | ||
| 2115 | */ | ||
| 2081 | int pinctrl_register_and_init(struct pinctrl_desc *pctldesc, | 2116 | int pinctrl_register_and_init(struct pinctrl_desc *pctldesc, |
| 2082 | struct device *dev, void *driver_data, | 2117 | struct device *dev, void *driver_data, |
| 2083 | struct pinctrl_dev **pctldev) | 2118 | struct pinctrl_dev **pctldev) |
| 2084 | { | 2119 | { |
| 2085 | struct pinctrl_dev *p; | 2120 | struct pinctrl_dev *p; |
| 2086 | int error; | ||
| 2087 | 2121 | ||
| 2088 | p = pinctrl_init_controller(pctldesc, dev, driver_data); | 2122 | p = pinctrl_init_controller(pctldesc, dev, driver_data); |
| 2089 | if (IS_ERR(p)) | 2123 | if (IS_ERR(p)) |
| @@ -2097,15 +2131,6 @@ int pinctrl_register_and_init(struct pinctrl_desc *pctldesc, | |||
| 2097 | */ | 2131 | */ |
| 2098 | *pctldev = p; | 2132 | *pctldev = p; |
| 2099 | 2133 | ||
| 2100 | error = pinctrl_create_and_start(p); | ||
| 2101 | if (error) { | ||
| 2102 | mutex_destroy(&p->mutex); | ||
| 2103 | kfree(p); | ||
| 2104 | *pctldev = NULL; | ||
| 2105 | |||
| 2106 | return error; | ||
| 2107 | } | ||
| 2108 | |||
| 2109 | return 0; | 2134 | return 0; |
| 2110 | } | 2135 | } |
| 2111 | EXPORT_SYMBOL_GPL(pinctrl_register_and_init); | 2136 | EXPORT_SYMBOL_GPL(pinctrl_register_and_init); |
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index a7ace9e1ad81..74bd90dfd7b1 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c | |||
| @@ -790,7 +790,7 @@ int imx_pinctrl_probe(struct platform_device *pdev, | |||
| 790 | 790 | ||
| 791 | dev_info(&pdev->dev, "initialized IMX pinctrl driver\n"); | 791 | dev_info(&pdev->dev, "initialized IMX pinctrl driver\n"); |
| 792 | 792 | ||
| 793 | return 0; | 793 | return pinctrl_enable(ipctl->pctl); |
| 794 | 794 | ||
| 795 | free: | 795 | free: |
| 796 | imx_free_resources(ipctl); | 796 | imx_free_resources(ipctl); |
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 7671424d46cb..31a3a98d067c 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c | |||
| @@ -667,11 +667,11 @@ static const char * const uart_ao_b_groups[] = { | |||
| 667 | }; | 667 | }; |
| 668 | 668 | ||
| 669 | static const char * const i2c_ao_groups[] = { | 669 | static const char * const i2c_ao_groups[] = { |
| 670 | "i2c_sdk_ao", "i2c_sda_ao", | 670 | "i2c_sck_ao", "i2c_sda_ao", |
| 671 | }; | 671 | }; |
| 672 | 672 | ||
| 673 | static const char * const i2c_slave_ao_groups[] = { | 673 | static const char * const i2c_slave_ao_groups[] = { |
| 674 | "i2c_slave_sdk_ao", "i2c_slave_sda_ao", | 674 | "i2c_slave_sck_ao", "i2c_slave_sda_ao", |
| 675 | }; | 675 | }; |
| 676 | 676 | ||
| 677 | static const char * const remote_input_ao_groups[] = { | 677 | static const char * const remote_input_ao_groups[] = { |
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index 8b2d45e85bae..9c267dcda094 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c | |||
| @@ -1781,7 +1781,7 @@ static int pcs_probe(struct platform_device *pdev) | |||
| 1781 | dev_info(pcs->dev, "%i pins at pa %p size %u\n", | 1781 | dev_info(pcs->dev, "%i pins at pa %p size %u\n", |
| 1782 | pcs->desc.npins, pcs->base, pcs->size); | 1782 | pcs->desc.npins, pcs->base, pcs->size); |
| 1783 | 1783 | ||
| 1784 | return 0; | 1784 | return pinctrl_enable(pcs->pctl); |
| 1785 | 1785 | ||
| 1786 | free: | 1786 | free: |
| 1787 | pcs_free_resources(pcs); | 1787 | pcs_free_resources(pcs); |
diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c index 676efcc032d2..3ae8066bc127 100644 --- a/drivers/pinctrl/pinctrl-st.c +++ b/drivers/pinctrl/pinctrl-st.c | |||
| @@ -1285,6 +1285,22 @@ static void st_gpio_irq_unmask(struct irq_data *d) | |||
| 1285 | writel(BIT(d->hwirq), bank->base + REG_PIO_SET_PMASK); | 1285 | writel(BIT(d->hwirq), bank->base + REG_PIO_SET_PMASK); |
| 1286 | } | 1286 | } |
| 1287 | 1287 | ||
| 1288 | static int st_gpio_irq_request_resources(struct irq_data *d) | ||
| 1289 | { | ||
| 1290 | struct gpio_chip *gc = irq_data_get_irq_chip_data(d); | ||
| 1291 | |||
| 1292 | st_gpio_direction_input(gc, d->hwirq); | ||
| 1293 | |||
| 1294 | return gpiochip_lock_as_irq(gc, d->hwirq); | ||
| 1295 | } | ||
| 1296 | |||
| 1297 | static void st_gpio_irq_release_resources(struct irq_data *d) | ||
| 1298 | { | ||
| 1299 | struct gpio_chip *gc = irq_data_get_irq_chip_data(d); | ||
| 1300 | |||
| 1301 | gpiochip_unlock_as_irq(gc, d->hwirq); | ||
| 1302 | } | ||
| 1303 | |||
| 1288 | static int st_gpio_irq_set_type(struct irq_data *d, unsigned type) | 1304 | static int st_gpio_irq_set_type(struct irq_data *d, unsigned type) |
| 1289 | { | 1305 | { |
| 1290 | struct gpio_chip *gc = irq_data_get_irq_chip_data(d); | 1306 | struct gpio_chip *gc = irq_data_get_irq_chip_data(d); |
| @@ -1438,12 +1454,14 @@ static struct gpio_chip st_gpio_template = { | |||
| 1438 | }; | 1454 | }; |
| 1439 | 1455 | ||
| 1440 | static struct irq_chip st_gpio_irqchip = { | 1456 | static struct irq_chip st_gpio_irqchip = { |
| 1441 | .name = "GPIO", | 1457 | .name = "GPIO", |
| 1442 | .irq_disable = st_gpio_irq_mask, | 1458 | .irq_request_resources = st_gpio_irq_request_resources, |
| 1443 | .irq_mask = st_gpio_irq_mask, | 1459 | .irq_release_resources = st_gpio_irq_release_resources, |
| 1444 | .irq_unmask = st_gpio_irq_unmask, | 1460 | .irq_disable = st_gpio_irq_mask, |
| 1445 | .irq_set_type = st_gpio_irq_set_type, | 1461 | .irq_mask = st_gpio_irq_mask, |
| 1446 | .flags = IRQCHIP_SKIP_SET_WAKE, | 1462 | .irq_unmask = st_gpio_irq_unmask, |
| 1463 | .irq_set_type = st_gpio_irq_set_type, | ||
| 1464 | .flags = IRQCHIP_SKIP_SET_WAKE, | ||
| 1447 | }; | 1465 | }; |
| 1448 | 1466 | ||
| 1449 | static int st_gpiolib_register_bank(struct st_pinctrl *info, | 1467 | static int st_gpiolib_register_bank(struct st_pinctrl *info, |
diff --git a/drivers/pinctrl/qcom/pinctrl-ipq4019.c b/drivers/pinctrl/qcom/pinctrl-ipq4019.c index b68ae424cee2..743d1f458205 100644 --- a/drivers/pinctrl/qcom/pinctrl-ipq4019.c +++ b/drivers/pinctrl/qcom/pinctrl-ipq4019.c | |||
| @@ -405,6 +405,36 @@ static const struct msm_pingroup ipq4019_groups[] = { | |||
| 405 | PINGROUP(67, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | 405 | PINGROUP(67, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), |
| 406 | PINGROUP(68, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | 406 | PINGROUP(68, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), |
| 407 | PINGROUP(69, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | 407 | PINGROUP(69, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), |
| 408 | PINGROUP(70, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 409 | PINGROUP(71, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 410 | PINGROUP(72, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 411 | PINGROUP(73, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 412 | PINGROUP(74, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 413 | PINGROUP(75, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 414 | PINGROUP(76, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 415 | PINGROUP(77, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 416 | PINGROUP(78, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 417 | PINGROUP(79, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 418 | PINGROUP(80, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 419 | PINGROUP(81, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 420 | PINGROUP(82, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 421 | PINGROUP(83, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 422 | PINGROUP(84, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 423 | PINGROUP(85, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 424 | PINGROUP(86, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 425 | PINGROUP(87, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 426 | PINGROUP(88, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 427 | PINGROUP(89, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 428 | PINGROUP(90, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 429 | PINGROUP(91, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 430 | PINGROUP(92, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 431 | PINGROUP(93, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 432 | PINGROUP(94, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 433 | PINGROUP(95, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 434 | PINGROUP(96, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 435 | PINGROUP(97, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 436 | PINGROUP(98, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 437 | PINGROUP(99, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), | ||
| 408 | }; | 438 | }; |
| 409 | 439 | ||
| 410 | static const struct msm_pinctrl_soc_data ipq4019_pinctrl = { | 440 | static const struct msm_pinctrl_soc_data ipq4019_pinctrl = { |
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index c978be5eb9eb..273badd92561 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c | |||
| @@ -609,10 +609,6 @@ static void msm_gpio_irq_unmask(struct irq_data *d) | |||
| 609 | 609 | ||
| 610 | raw_spin_lock_irqsave(&pctrl->lock, flags); | 610 | raw_spin_lock_irqsave(&pctrl->lock, flags); |
| 611 | 611 | ||
| 612 | val = readl(pctrl->regs + g->intr_status_reg); | ||
| 613 | val &= ~BIT(g->intr_status_bit); | ||
| 614 | writel(val, pctrl->regs + g->intr_status_reg); | ||
| 615 | |||
| 616 | val = readl(pctrl->regs + g->intr_cfg_reg); | 612 | val = readl(pctrl->regs + g->intr_cfg_reg); |
| 617 | val |= BIT(g->intr_enable_bit); | 613 | val |= BIT(g->intr_enable_bit); |
| 618 | writel(val, pctrl->regs + g->intr_cfg_reg); | 614 | writel(val, pctrl->regs + g->intr_cfg_reg); |
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index f9ddba7decc1..d7aa22cff480 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c | |||
| @@ -988,9 +988,16 @@ samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, | |||
| 988 | 988 | ||
| 989 | for (i = 0; i < ctrl->nr_ext_resources + 1; i++) { | 989 | for (i = 0; i < ctrl->nr_ext_resources + 1; i++) { |
| 990 | res = platform_get_resource(pdev, IORESOURCE_MEM, i); | 990 | res = platform_get_resource(pdev, IORESOURCE_MEM, i); |
| 991 | virt_base[i] = devm_ioremap_resource(&pdev->dev, res); | 991 | if (!res) { |
| 992 | if (IS_ERR(virt_base[i])) | 992 | dev_err(&pdev->dev, "failed to get mem%d resource\n", i); |
| 993 | return ERR_CAST(virt_base[i]); | 993 | return ERR_PTR(-EINVAL); |
| 994 | } | ||
| 995 | virt_base[i] = devm_ioremap(&pdev->dev, res->start, | ||
| 996 | resource_size(res)); | ||
| 997 | if (!virt_base[i]) { | ||
| 998 | dev_err(&pdev->dev, "failed to ioremap %pR\n", res); | ||
| 999 | return ERR_PTR(-EIO); | ||
| 1000 | } | ||
| 994 | } | 1001 | } |
| 995 | 1002 | ||
| 996 | bank = d->pin_banks; | 1003 | bank = d->pin_banks; |
diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c index 08150a321be6..a70157f0acf4 100644 --- a/drivers/pinctrl/sh-pfc/pinctrl.c +++ b/drivers/pinctrl/sh-pfc/pinctrl.c | |||
| @@ -816,6 +816,13 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) | |||
| 816 | pmx->pctl_desc.pins = pmx->pins; | 816 | pmx->pctl_desc.pins = pmx->pins; |
| 817 | pmx->pctl_desc.npins = pfc->info->nr_pins; | 817 | pmx->pctl_desc.npins = pfc->info->nr_pins; |
| 818 | 818 | ||
| 819 | return devm_pinctrl_register_and_init(pfc->dev, &pmx->pctl_desc, pmx, | 819 | ret = devm_pinctrl_register_and_init(pfc->dev, &pmx->pctl_desc, pmx, |
| 820 | &pmx->pctl); | 820 | &pmx->pctl); |
| 821 | if (ret) { | ||
| 822 | dev_err(pfc->dev, "could not register: %i\n", ret); | ||
| 823 | |||
| 824 | return ret; | ||
| 825 | } | ||
| 826 | |||
| 827 | return pinctrl_enable(pmx->pctl); | ||
| 821 | } | 828 | } |
diff --git a/drivers/pinctrl/ti/Kconfig b/drivers/pinctrl/ti/Kconfig index 815a88673d38..542077069391 100644 --- a/drivers/pinctrl/ti/Kconfig +++ b/drivers/pinctrl/ti/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config PINCTRL_TI_IODELAY | 1 | config PINCTRL_TI_IODELAY |
| 2 | tristate "TI IODelay Module pinconf driver" | 2 | tristate "TI IODelay Module pinconf driver" |
| 3 | depends on OF | 3 | depends on OF && (SOC_DRA7XX || COMPILE_TEST) |
| 4 | select GENERIC_PINCTRL_GROUPS | 4 | select GENERIC_PINCTRL_GROUPS |
| 5 | select GENERIC_PINMUX_FUNCTIONS | 5 | select GENERIC_PINMUX_FUNCTIONS |
| 6 | select GENERIC_PINCONF | 6 | select GENERIC_PINCONF |
diff --git a/drivers/pinctrl/ti/pinctrl-ti-iodelay.c b/drivers/pinctrl/ti/pinctrl-ti-iodelay.c index 717e3404900c..362c50918c13 100644 --- a/drivers/pinctrl/ti/pinctrl-ti-iodelay.c +++ b/drivers/pinctrl/ti/pinctrl-ti-iodelay.c | |||
| @@ -893,6 +893,8 @@ static int ti_iodelay_probe(struct platform_device *pdev) | |||
| 893 | 893 | ||
| 894 | platform_set_drvdata(pdev, iod); | 894 | platform_set_drvdata(pdev, iod); |
| 895 | 895 | ||
| 896 | return pinctrl_enable(iod->pctl); | ||
| 897 | |||
| 896 | exit_out: | 898 | exit_out: |
| 897 | of_node_put(np); | 899 | of_node_put(np); |
| 898 | return ret; | 900 | return ret; |
diff --git a/drivers/ptp/ptp_kvm.c b/drivers/ptp/ptp_kvm.c index 09b4df74291e..bb865695d7a6 100644 --- a/drivers/ptp/ptp_kvm.c +++ b/drivers/ptp/ptp_kvm.c | |||
| @@ -193,10 +193,7 @@ static int __init ptp_kvm_init(void) | |||
| 193 | 193 | ||
| 194 | kvm_ptp_clock.ptp_clock = ptp_clock_register(&kvm_ptp_clock.caps, NULL); | 194 | kvm_ptp_clock.ptp_clock = ptp_clock_register(&kvm_ptp_clock.caps, NULL); |
| 195 | 195 | ||
| 196 | if (IS_ERR(kvm_ptp_clock.ptp_clock)) | 196 | return PTR_ERR_OR_ZERO(kvm_ptp_clock.ptp_clock); |
| 197 | return PTR_ERR(kvm_ptp_clock.ptp_clock); | ||
| 198 | |||
| 199 | return 0; | ||
| 200 | } | 197 | } |
| 201 | 198 | ||
| 202 | module_init(ptp_kvm_init); | 199 | module_init(ptp_kvm_init); |
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c index 9d19b9a62011..315a4be8dc1e 100644 --- a/drivers/rapidio/devices/tsi721.c +++ b/drivers/rapidio/devices/tsi721.c | |||
| @@ -37,8 +37,8 @@ | |||
| 37 | #include "tsi721.h" | 37 | #include "tsi721.h" |
| 38 | 38 | ||
| 39 | #ifdef DEBUG | 39 | #ifdef DEBUG |
| 40 | u32 dbg_level; | 40 | u32 tsi_dbg_level; |
| 41 | module_param(dbg_level, uint, S_IWUSR | S_IRUGO); | 41 | module_param_named(dbg_level, tsi_dbg_level, uint, S_IWUSR | S_IRUGO); |
| 42 | MODULE_PARM_DESC(dbg_level, "Debugging output level (default 0 = none)"); | 42 | MODULE_PARM_DESC(dbg_level, "Debugging output level (default 0 = none)"); |
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h index 5941437cbdd1..957eadc58150 100644 --- a/drivers/rapidio/devices/tsi721.h +++ b/drivers/rapidio/devices/tsi721.h | |||
| @@ -40,11 +40,11 @@ enum { | |||
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | #ifdef DEBUG | 42 | #ifdef DEBUG |
| 43 | extern u32 dbg_level; | 43 | extern u32 tsi_dbg_level; |
| 44 | 44 | ||
| 45 | #define tsi_debug(level, dev, fmt, arg...) \ | 45 | #define tsi_debug(level, dev, fmt, arg...) \ |
| 46 | do { \ | 46 | do { \ |
| 47 | if (DBG_##level & dbg_level) \ | 47 | if (DBG_##level & tsi_dbg_level) \ |
| 48 | dev_dbg(dev, "%s: " fmt "\n", __func__, ##arg); \ | 48 | dev_dbg(dev, "%s: " fmt "\n", __func__, ##arg); \ |
| 49 | } while (0) | 49 | } while (0) |
| 50 | #else | 50 | #else |
diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c index 40f1136f5568..058db724b5a2 100644 --- a/drivers/s390/crypto/pkey_api.c +++ b/drivers/s390/crypto/pkey_api.c | |||
| @@ -572,6 +572,12 @@ int pkey_sec2protkey(u16 cardnr, u16 domain, | |||
| 572 | rc = -EIO; | 572 | rc = -EIO; |
| 573 | goto out; | 573 | goto out; |
| 574 | } | 574 | } |
| 575 | if (prepcblk->ccp_rscode != 0) { | ||
| 576 | DEBUG_WARN( | ||
| 577 | "pkey_sec2protkey unwrap secure key warning, card response %d/%d\n", | ||
| 578 | (int) prepcblk->ccp_rtcode, | ||
| 579 | (int) prepcblk->ccp_rscode); | ||
| 580 | } | ||
| 575 | 581 | ||
| 576 | /* process response cprb param block */ | 582 | /* process response cprb param block */ |
| 577 | prepcblk->rpl_parmb = ((u8 *) prepcblk) + sizeof(struct CPRBX); | 583 | prepcblk->rpl_parmb = ((u8 *) prepcblk) + sizeof(struct CPRBX); |
| @@ -761,9 +767,10 @@ out: | |||
| 761 | } | 767 | } |
| 762 | 768 | ||
| 763 | /* | 769 | /* |
| 764 | * Fetch just the mkvp value via query_crypto_facility from adapter. | 770 | * Fetch the current and old mkvp values via |
| 771 | * query_crypto_facility from adapter. | ||
| 765 | */ | 772 | */ |
| 766 | static int fetch_mkvp(u16 cardnr, u16 domain, u64 *mkvp) | 773 | static int fetch_mkvp(u16 cardnr, u16 domain, u64 mkvp[2]) |
| 767 | { | 774 | { |
| 768 | int rc, found = 0; | 775 | int rc, found = 0; |
| 769 | size_t rlen, vlen; | 776 | size_t rlen, vlen; |
| @@ -779,9 +786,10 @@ static int fetch_mkvp(u16 cardnr, u16 domain, u64 *mkvp) | |||
| 779 | rc = query_crypto_facility(cardnr, domain, "STATICSA", | 786 | rc = query_crypto_facility(cardnr, domain, "STATICSA", |
| 780 | rarray, &rlen, varray, &vlen); | 787 | rarray, &rlen, varray, &vlen); |
| 781 | if (rc == 0 && rlen > 8*8 && vlen > 184+8) { | 788 | if (rc == 0 && rlen > 8*8 && vlen > 184+8) { |
| 782 | if (rarray[64] == '2') { | 789 | if (rarray[8*8] == '2') { |
| 783 | /* current master key state is valid */ | 790 | /* current master key state is valid */ |
| 784 | *mkvp = *((u64 *)(varray + 184)); | 791 | mkvp[0] = *((u64 *)(varray + 184)); |
| 792 | mkvp[1] = *((u64 *)(varray + 172)); | ||
| 785 | found = 1; | 793 | found = 1; |
| 786 | } | 794 | } |
| 787 | } | 795 | } |
| @@ -796,14 +804,14 @@ struct mkvp_info { | |||
| 796 | struct list_head list; | 804 | struct list_head list; |
| 797 | u16 cardnr; | 805 | u16 cardnr; |
| 798 | u16 domain; | 806 | u16 domain; |
| 799 | u64 mkvp; | 807 | u64 mkvp[2]; |
| 800 | }; | 808 | }; |
| 801 | 809 | ||
| 802 | /* a list with mkvp_info entries */ | 810 | /* a list with mkvp_info entries */ |
| 803 | static LIST_HEAD(mkvp_list); | 811 | static LIST_HEAD(mkvp_list); |
| 804 | static DEFINE_SPINLOCK(mkvp_list_lock); | 812 | static DEFINE_SPINLOCK(mkvp_list_lock); |
| 805 | 813 | ||
| 806 | static int mkvp_cache_fetch(u16 cardnr, u16 domain, u64 *mkvp) | 814 | static int mkvp_cache_fetch(u16 cardnr, u16 domain, u64 mkvp[2]) |
| 807 | { | 815 | { |
| 808 | int rc = -ENOENT; | 816 | int rc = -ENOENT; |
| 809 | struct mkvp_info *ptr; | 817 | struct mkvp_info *ptr; |
| @@ -812,7 +820,7 @@ static int mkvp_cache_fetch(u16 cardnr, u16 domain, u64 *mkvp) | |||
| 812 | list_for_each_entry(ptr, &mkvp_list, list) { | 820 | list_for_each_entry(ptr, &mkvp_list, list) { |
| 813 | if (ptr->cardnr == cardnr && | 821 | if (ptr->cardnr == cardnr && |
| 814 | ptr->domain == domain) { | 822 | ptr->domain == domain) { |
| 815 | *mkvp = ptr->mkvp; | 823 | memcpy(mkvp, ptr->mkvp, 2 * sizeof(u64)); |
| 816 | rc = 0; | 824 | rc = 0; |
| 817 | break; | 825 | break; |
| 818 | } | 826 | } |
| @@ -822,7 +830,7 @@ static int mkvp_cache_fetch(u16 cardnr, u16 domain, u64 *mkvp) | |||
| 822 | return rc; | 830 | return rc; |
| 823 | } | 831 | } |
| 824 | 832 | ||
| 825 | static void mkvp_cache_update(u16 cardnr, u16 domain, u64 mkvp) | 833 | static void mkvp_cache_update(u16 cardnr, u16 domain, u64 mkvp[2]) |
| 826 | { | 834 | { |
| 827 | int found = 0; | 835 | int found = 0; |
| 828 | struct mkvp_info *ptr; | 836 | struct mkvp_info *ptr; |
| @@ -831,7 +839,7 @@ static void mkvp_cache_update(u16 cardnr, u16 domain, u64 mkvp) | |||
| 831 | list_for_each_entry(ptr, &mkvp_list, list) { | 839 | list_for_each_entry(ptr, &mkvp_list, list) { |
| 832 | if (ptr->cardnr == cardnr && | 840 | if (ptr->cardnr == cardnr && |
| 833 | ptr->domain == domain) { | 841 | ptr->domain == domain) { |
| 834 | ptr->mkvp = mkvp; | 842 | memcpy(ptr->mkvp, mkvp, 2 * sizeof(u64)); |
| 835 | found = 1; | 843 | found = 1; |
| 836 | break; | 844 | break; |
| 837 | } | 845 | } |
| @@ -844,7 +852,7 @@ static void mkvp_cache_update(u16 cardnr, u16 domain, u64 mkvp) | |||
| 844 | } | 852 | } |
| 845 | ptr->cardnr = cardnr; | 853 | ptr->cardnr = cardnr; |
| 846 | ptr->domain = domain; | 854 | ptr->domain = domain; |
| 847 | ptr->mkvp = mkvp; | 855 | memcpy(ptr->mkvp, mkvp, 2 * sizeof(u64)); |
| 848 | list_add(&ptr->list, &mkvp_list); | 856 | list_add(&ptr->list, &mkvp_list); |
| 849 | } | 857 | } |
| 850 | spin_unlock_bh(&mkvp_list_lock); | 858 | spin_unlock_bh(&mkvp_list_lock); |
| @@ -888,8 +896,8 @@ int pkey_findcard(const struct pkey_seckey *seckey, | |||
| 888 | struct secaeskeytoken *t = (struct secaeskeytoken *) seckey; | 896 | struct secaeskeytoken *t = (struct secaeskeytoken *) seckey; |
| 889 | struct zcrypt_device_matrix *device_matrix; | 897 | struct zcrypt_device_matrix *device_matrix; |
| 890 | u16 card, dom; | 898 | u16 card, dom; |
| 891 | u64 mkvp; | 899 | u64 mkvp[2]; |
| 892 | int i, rc; | 900 | int i, rc, oi = -1; |
| 893 | 901 | ||
| 894 | /* mkvp must not be zero */ | 902 | /* mkvp must not be zero */ |
| 895 | if (t->mkvp == 0) | 903 | if (t->mkvp == 0) |
| @@ -910,14 +918,14 @@ int pkey_findcard(const struct pkey_seckey *seckey, | |||
| 910 | device_matrix->device[i].functions & 0x04) { | 918 | device_matrix->device[i].functions & 0x04) { |
| 911 | /* an enabled CCA Coprocessor card */ | 919 | /* an enabled CCA Coprocessor card */ |
| 912 | /* try cached mkvp */ | 920 | /* try cached mkvp */ |
| 913 | if (mkvp_cache_fetch(card, dom, &mkvp) == 0 && | 921 | if (mkvp_cache_fetch(card, dom, mkvp) == 0 && |
| 914 | t->mkvp == mkvp) { | 922 | t->mkvp == mkvp[0]) { |
| 915 | if (!verify) | 923 | if (!verify) |
| 916 | break; | 924 | break; |
| 917 | /* verify: fetch mkvp from adapter */ | 925 | /* verify: fetch mkvp from adapter */ |
| 918 | if (fetch_mkvp(card, dom, &mkvp) == 0) { | 926 | if (fetch_mkvp(card, dom, mkvp) == 0) { |
| 919 | mkvp_cache_update(card, dom, mkvp); | 927 | mkvp_cache_update(card, dom, mkvp); |
| 920 | if (t->mkvp == mkvp) | 928 | if (t->mkvp == mkvp[0]) |
| 921 | break; | 929 | break; |
| 922 | } | 930 | } |
| 923 | } | 931 | } |
| @@ -936,14 +944,21 @@ int pkey_findcard(const struct pkey_seckey *seckey, | |||
| 936 | card = AP_QID_CARD(device_matrix->device[i].qid); | 944 | card = AP_QID_CARD(device_matrix->device[i].qid); |
| 937 | dom = AP_QID_QUEUE(device_matrix->device[i].qid); | 945 | dom = AP_QID_QUEUE(device_matrix->device[i].qid); |
| 938 | /* fresh fetch mkvp from adapter */ | 946 | /* fresh fetch mkvp from adapter */ |
| 939 | if (fetch_mkvp(card, dom, &mkvp) == 0) { | 947 | if (fetch_mkvp(card, dom, mkvp) == 0) { |
| 940 | mkvp_cache_update(card, dom, mkvp); | 948 | mkvp_cache_update(card, dom, mkvp); |
| 941 | if (t->mkvp == mkvp) | 949 | if (t->mkvp == mkvp[0]) |
| 942 | break; | 950 | break; |
| 951 | if (t->mkvp == mkvp[1] && oi < 0) | ||
| 952 | oi = i; | ||
| 943 | } | 953 | } |
| 944 | } | 954 | } |
| 955 | if (i >= MAX_ZDEV_ENTRIES && oi >= 0) { | ||
| 956 | /* old mkvp matched, use this card then */ | ||
| 957 | card = AP_QID_CARD(device_matrix->device[oi].qid); | ||
| 958 | dom = AP_QID_QUEUE(device_matrix->device[oi].qid); | ||
| 959 | } | ||
| 945 | } | 960 | } |
| 946 | if (i < MAX_ZDEV_ENTRIES) { | 961 | if (i < MAX_ZDEV_ENTRIES || oi >= 0) { |
| 947 | if (pcardnr) | 962 | if (pcardnr) |
| 948 | *pcardnr = card; | 963 | *pcardnr = card; |
| 949 | if (pdomain) | 964 | if (pdomain) |
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h index e7addea8741b..d9561e39c3b2 100644 --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h | |||
| @@ -961,7 +961,8 @@ int qeth_bridgeport_query_ports(struct qeth_card *card, | |||
| 961 | int qeth_bridgeport_setrole(struct qeth_card *card, enum qeth_sbp_roles role); | 961 | int qeth_bridgeport_setrole(struct qeth_card *card, enum qeth_sbp_roles role); |
| 962 | int qeth_bridgeport_an_set(struct qeth_card *card, int enable); | 962 | int qeth_bridgeport_an_set(struct qeth_card *card, int enable); |
| 963 | int qeth_get_priority_queue(struct qeth_card *, struct sk_buff *, int, int); | 963 | int qeth_get_priority_queue(struct qeth_card *, struct sk_buff *, int, int); |
| 964 | int qeth_get_elements_no(struct qeth_card *, struct sk_buff *, int); | 964 | int qeth_get_elements_no(struct qeth_card *card, struct sk_buff *skb, |
| 965 | int extra_elems, int data_offset); | ||
| 965 | int qeth_get_elements_for_frags(struct sk_buff *); | 966 | int qeth_get_elements_for_frags(struct sk_buff *); |
| 966 | int qeth_do_send_packet_fast(struct qeth_card *, struct qeth_qdio_out_q *, | 967 | int qeth_do_send_packet_fast(struct qeth_card *, struct qeth_qdio_out_q *, |
| 967 | struct sk_buff *, struct qeth_hdr *, int, int, int); | 968 | struct sk_buff *, struct qeth_hdr *, int, int, int); |
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 315d8a2db7c0..9a5f99ccb122 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c | |||
| @@ -3837,6 +3837,7 @@ EXPORT_SYMBOL_GPL(qeth_get_elements_for_frags); | |||
| 3837 | * @card: qeth card structure, to check max. elems. | 3837 | * @card: qeth card structure, to check max. elems. |
| 3838 | * @skb: SKB address | 3838 | * @skb: SKB address |
| 3839 | * @extra_elems: extra elems needed, to check against max. | 3839 | * @extra_elems: extra elems needed, to check against max. |
| 3840 | * @data_offset: range starts at skb->data + data_offset | ||
| 3840 | * | 3841 | * |
| 3841 | * Returns the number of pages, and thus QDIO buffer elements, needed to cover | 3842 | * Returns the number of pages, and thus QDIO buffer elements, needed to cover |
| 3842 | * skb data, including linear part and fragments. Checks if the result plus | 3843 | * skb data, including linear part and fragments. Checks if the result plus |
| @@ -3844,10 +3845,10 @@ EXPORT_SYMBOL_GPL(qeth_get_elements_for_frags); | |||
| 3844 | * Note: extra_elems is not included in the returned result. | 3845 | * Note: extra_elems is not included in the returned result. |
| 3845 | */ | 3846 | */ |
| 3846 | int qeth_get_elements_no(struct qeth_card *card, | 3847 | int qeth_get_elements_no(struct qeth_card *card, |
| 3847 | struct sk_buff *skb, int extra_elems) | 3848 | struct sk_buff *skb, int extra_elems, int data_offset) |
| 3848 | { | 3849 | { |
| 3849 | int elements = qeth_get_elements_for_range( | 3850 | int elements = qeth_get_elements_for_range( |
| 3850 | (addr_t)skb->data, | 3851 | (addr_t)skb->data + data_offset, |
| 3851 | (addr_t)skb->data + skb_headlen(skb)) + | 3852 | (addr_t)skb->data + skb_headlen(skb)) + |
| 3852 | qeth_get_elements_for_frags(skb); | 3853 | qeth_get_elements_for_frags(skb); |
| 3853 | 3854 | ||
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index bea483307618..af4e6a639fec 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c | |||
| @@ -849,7 +849,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 849 | * chaining we can not send long frag lists | 849 | * chaining we can not send long frag lists |
| 850 | */ | 850 | */ |
| 851 | if ((card->info.type != QETH_CARD_TYPE_IQD) && | 851 | if ((card->info.type != QETH_CARD_TYPE_IQD) && |
| 852 | !qeth_get_elements_no(card, new_skb, 0)) { | 852 | !qeth_get_elements_no(card, new_skb, 0, 0)) { |
| 853 | int lin_rc = skb_linearize(new_skb); | 853 | int lin_rc = skb_linearize(new_skb); |
| 854 | 854 | ||
| 855 | if (card->options.performance_stats) { | 855 | if (card->options.performance_stats) { |
| @@ -894,7 +894,8 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 894 | } | 894 | } |
| 895 | } | 895 | } |
| 896 | 896 | ||
| 897 | elements = qeth_get_elements_no(card, new_skb, elements_needed); | 897 | elements = qeth_get_elements_no(card, new_skb, elements_needed, |
| 898 | (data_offset > 0) ? data_offset : 0); | ||
| 898 | if (!elements) { | 899 | if (!elements) { |
| 899 | if (data_offset >= 0) | 900 | if (data_offset >= 0) |
| 900 | kmem_cache_free(qeth_core_header_cache, hdr); | 901 | kmem_cache_free(qeth_core_header_cache, hdr); |
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 06d0addcc058..653f0fb76573 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c | |||
| @@ -2609,17 +2609,13 @@ static void qeth_l3_fill_af_iucv_hdr(struct qeth_card *card, | |||
| 2609 | char daddr[16]; | 2609 | char daddr[16]; |
| 2610 | struct af_iucv_trans_hdr *iucv_hdr; | 2610 | struct af_iucv_trans_hdr *iucv_hdr; |
| 2611 | 2611 | ||
| 2612 | skb_pull(skb, 14); | ||
| 2613 | card->dev->header_ops->create(skb, card->dev, 0, | ||
| 2614 | card->dev->dev_addr, card->dev->dev_addr, | ||
| 2615 | card->dev->addr_len); | ||
| 2616 | skb_pull(skb, 14); | ||
| 2617 | iucv_hdr = (struct af_iucv_trans_hdr *)skb->data; | ||
| 2618 | memset(hdr, 0, sizeof(struct qeth_hdr)); | 2612 | memset(hdr, 0, sizeof(struct qeth_hdr)); |
| 2619 | hdr->hdr.l3.id = QETH_HEADER_TYPE_LAYER3; | 2613 | hdr->hdr.l3.id = QETH_HEADER_TYPE_LAYER3; |
| 2620 | hdr->hdr.l3.ext_flags = 0; | 2614 | hdr->hdr.l3.ext_flags = 0; |
| 2621 | hdr->hdr.l3.length = skb->len; | 2615 | hdr->hdr.l3.length = skb->len - ETH_HLEN; |
| 2622 | hdr->hdr.l3.flags = QETH_HDR_IPV6 | QETH_CAST_UNICAST; | 2616 | hdr->hdr.l3.flags = QETH_HDR_IPV6 | QETH_CAST_UNICAST; |
| 2617 | |||
| 2618 | iucv_hdr = (struct af_iucv_trans_hdr *) (skb->data + ETH_HLEN); | ||
| 2623 | memset(daddr, 0, sizeof(daddr)); | 2619 | memset(daddr, 0, sizeof(daddr)); |
| 2624 | daddr[0] = 0xfe; | 2620 | daddr[0] = 0xfe; |
| 2625 | daddr[1] = 0x80; | 2621 | daddr[1] = 0x80; |
| @@ -2823,10 +2819,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 2823 | if ((card->info.type == QETH_CARD_TYPE_IQD) && | 2819 | if ((card->info.type == QETH_CARD_TYPE_IQD) && |
| 2824 | !skb_is_nonlinear(skb)) { | 2820 | !skb_is_nonlinear(skb)) { |
| 2825 | new_skb = skb; | 2821 | new_skb = skb; |
| 2826 | if (new_skb->protocol == ETH_P_AF_IUCV) | 2822 | data_offset = ETH_HLEN; |
| 2827 | data_offset = 0; | ||
| 2828 | else | ||
| 2829 | data_offset = ETH_HLEN; | ||
| 2830 | hdr = kmem_cache_alloc(qeth_core_header_cache, GFP_ATOMIC); | 2823 | hdr = kmem_cache_alloc(qeth_core_header_cache, GFP_ATOMIC); |
| 2831 | if (!hdr) | 2824 | if (!hdr) |
| 2832 | goto tx_drop; | 2825 | goto tx_drop; |
| @@ -2867,7 +2860,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 2867 | */ | 2860 | */ |
| 2868 | if ((card->info.type != QETH_CARD_TYPE_IQD) && | 2861 | if ((card->info.type != QETH_CARD_TYPE_IQD) && |
| 2869 | ((use_tso && !qeth_l3_get_elements_no_tso(card, new_skb, 1)) || | 2862 | ((use_tso && !qeth_l3_get_elements_no_tso(card, new_skb, 1)) || |
| 2870 | (!use_tso && !qeth_get_elements_no(card, new_skb, 0)))) { | 2863 | (!use_tso && !qeth_get_elements_no(card, new_skb, 0, 0)))) { |
| 2871 | int lin_rc = skb_linearize(new_skb); | 2864 | int lin_rc = skb_linearize(new_skb); |
| 2872 | 2865 | ||
| 2873 | if (card->options.performance_stats) { | 2866 | if (card->options.performance_stats) { |
| @@ -2909,7 +2902,8 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 2909 | 2902 | ||
| 2910 | elements = use_tso ? | 2903 | elements = use_tso ? |
| 2911 | qeth_l3_get_elements_no_tso(card, new_skb, hdr_elements) : | 2904 | qeth_l3_get_elements_no_tso(card, new_skb, hdr_elements) : |
| 2912 | qeth_get_elements_no(card, new_skb, hdr_elements); | 2905 | qeth_get_elements_no(card, new_skb, hdr_elements, |
| 2906 | (data_offset > 0) ? data_offset : 0); | ||
| 2913 | if (!elements) { | 2907 | if (!elements) { |
| 2914 | if (data_offset >= 0) | 2908 | if (data_offset >= 0) |
| 2915 | kmem_cache_free(qeth_core_header_cache, hdr); | 2909 | kmem_cache_free(qeth_core_header_cache, hdr); |
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index a3ad04293487..c8172f16cf33 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c | |||
| @@ -2056,7 +2056,6 @@ static int fillup_pools(struct aac_dev *dev, struct hw_fib **hw_fib_pool, | |||
| 2056 | { | 2056 | { |
| 2057 | struct hw_fib **hw_fib_p; | 2057 | struct hw_fib **hw_fib_p; |
| 2058 | struct fib **fib_p; | 2058 | struct fib **fib_p; |
| 2059 | int rcode = 1; | ||
| 2060 | 2059 | ||
| 2061 | hw_fib_p = hw_fib_pool; | 2060 | hw_fib_p = hw_fib_pool; |
| 2062 | fib_p = fib_pool; | 2061 | fib_p = fib_pool; |
| @@ -2074,11 +2073,11 @@ static int fillup_pools(struct aac_dev *dev, struct hw_fib **hw_fib_pool, | |||
| 2074 | } | 2073 | } |
| 2075 | } | 2074 | } |
| 2076 | 2075 | ||
| 2076 | /* | ||
| 2077 | * Get the actual number of allocated fibs | ||
| 2078 | */ | ||
| 2077 | num = hw_fib_p - hw_fib_pool; | 2079 | num = hw_fib_p - hw_fib_pool; |
| 2078 | if (!num) | 2080 | return num; |
| 2079 | rcode = 0; | ||
| 2080 | |||
| 2081 | return rcode; | ||
| 2082 | } | 2081 | } |
| 2083 | 2082 | ||
| 2084 | static void wakeup_fibctx_threads(struct aac_dev *dev, | 2083 | static void wakeup_fibctx_threads(struct aac_dev *dev, |
| @@ -2186,7 +2185,6 @@ static void aac_process_events(struct aac_dev *dev) | |||
| 2186 | struct fib *fib; | 2185 | struct fib *fib; |
| 2187 | unsigned long flags; | 2186 | unsigned long flags; |
| 2188 | spinlock_t *t_lock; | 2187 | spinlock_t *t_lock; |
| 2189 | unsigned int rcode; | ||
| 2190 | 2188 | ||
| 2191 | t_lock = dev->queues->queue[HostNormCmdQueue].lock; | 2189 | t_lock = dev->queues->queue[HostNormCmdQueue].lock; |
| 2192 | spin_lock_irqsave(t_lock, flags); | 2190 | spin_lock_irqsave(t_lock, flags); |
| @@ -2269,8 +2267,8 @@ static void aac_process_events(struct aac_dev *dev) | |||
| 2269 | * Fill up fib pointer pools with actual fibs | 2267 | * Fill up fib pointer pools with actual fibs |
| 2270 | * and hw_fibs | 2268 | * and hw_fibs |
| 2271 | */ | 2269 | */ |
| 2272 | rcode = fillup_pools(dev, hw_fib_pool, fib_pool, num); | 2270 | num = fillup_pools(dev, hw_fib_pool, fib_pool, num); |
| 2273 | if (!rcode) | 2271 | if (!num) |
| 2274 | goto free_mem; | 2272 | goto free_mem; |
| 2275 | 2273 | ||
| 2276 | /* | 2274 | /* |
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index 48e200102221..c01b47e5b55a 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c | |||
| @@ -113,7 +113,7 @@ struct alua_queue_data { | |||
| 113 | #define ALUA_POLICY_SWITCH_ALL 1 | 113 | #define ALUA_POLICY_SWITCH_ALL 1 |
| 114 | 114 | ||
| 115 | static void alua_rtpg_work(struct work_struct *work); | 115 | static void alua_rtpg_work(struct work_struct *work); |
| 116 | static void alua_rtpg_queue(struct alua_port_group *pg, | 116 | static bool alua_rtpg_queue(struct alua_port_group *pg, |
| 117 | struct scsi_device *sdev, | 117 | struct scsi_device *sdev, |
| 118 | struct alua_queue_data *qdata, bool force); | 118 | struct alua_queue_data *qdata, bool force); |
| 119 | static void alua_check(struct scsi_device *sdev, bool force); | 119 | static void alua_check(struct scsi_device *sdev, bool force); |
| @@ -862,7 +862,13 @@ static void alua_rtpg_work(struct work_struct *work) | |||
| 862 | kref_put(&pg->kref, release_port_group); | 862 | kref_put(&pg->kref, release_port_group); |
| 863 | } | 863 | } |
| 864 | 864 | ||
| 865 | static void alua_rtpg_queue(struct alua_port_group *pg, | 865 | /** |
| 866 | * alua_rtpg_queue() - cause RTPG to be submitted asynchronously | ||
| 867 | * | ||
| 868 | * Returns true if and only if alua_rtpg_work() will be called asynchronously. | ||
| 869 | * That function is responsible for calling @qdata->fn(). | ||
| 870 | */ | ||
| 871 | static bool alua_rtpg_queue(struct alua_port_group *pg, | ||
| 866 | struct scsi_device *sdev, | 872 | struct scsi_device *sdev, |
| 867 | struct alua_queue_data *qdata, bool force) | 873 | struct alua_queue_data *qdata, bool force) |
| 868 | { | 874 | { |
| @@ -870,8 +876,8 @@ static void alua_rtpg_queue(struct alua_port_group *pg, | |||
| 870 | unsigned long flags; | 876 | unsigned long flags; |
| 871 | struct workqueue_struct *alua_wq = kaluad_wq; | 877 | struct workqueue_struct *alua_wq = kaluad_wq; |
| 872 | 878 | ||
| 873 | if (!pg) | 879 | if (WARN_ON_ONCE(!pg) || scsi_device_get(sdev)) |
| 874 | return; | 880 | return false; |
| 875 | 881 | ||
| 876 | spin_lock_irqsave(&pg->lock, flags); | 882 | spin_lock_irqsave(&pg->lock, flags); |
| 877 | if (qdata) { | 883 | if (qdata) { |
| @@ -884,14 +890,12 @@ static void alua_rtpg_queue(struct alua_port_group *pg, | |||
| 884 | pg->flags |= ALUA_PG_RUN_RTPG; | 890 | pg->flags |= ALUA_PG_RUN_RTPG; |
| 885 | kref_get(&pg->kref); | 891 | kref_get(&pg->kref); |
| 886 | pg->rtpg_sdev = sdev; | 892 | pg->rtpg_sdev = sdev; |
| 887 | scsi_device_get(sdev); | ||
| 888 | start_queue = 1; | 893 | start_queue = 1; |
| 889 | } else if (!(pg->flags & ALUA_PG_RUN_RTPG) && force) { | 894 | } else if (!(pg->flags & ALUA_PG_RUN_RTPG) && force) { |
| 890 | pg->flags |= ALUA_PG_RUN_RTPG; | 895 | pg->flags |= ALUA_PG_RUN_RTPG; |
| 891 | /* Do not queue if the worker is already running */ | 896 | /* Do not queue if the worker is already running */ |
| 892 | if (!(pg->flags & ALUA_PG_RUNNING)) { | 897 | if (!(pg->flags & ALUA_PG_RUNNING)) { |
| 893 | kref_get(&pg->kref); | 898 | kref_get(&pg->kref); |
| 894 | sdev = NULL; | ||
| 895 | start_queue = 1; | 899 | start_queue = 1; |
| 896 | } | 900 | } |
| 897 | } | 901 | } |
| @@ -900,13 +904,17 @@ static void alua_rtpg_queue(struct alua_port_group *pg, | |||
| 900 | alua_wq = kaluad_sync_wq; | 904 | alua_wq = kaluad_sync_wq; |
| 901 | spin_unlock_irqrestore(&pg->lock, flags); | 905 | spin_unlock_irqrestore(&pg->lock, flags); |
| 902 | 906 | ||
| 903 | if (start_queue && | 907 | if (start_queue) { |
| 904 | !queue_delayed_work(alua_wq, &pg->rtpg_work, | 908 | if (queue_delayed_work(alua_wq, &pg->rtpg_work, |
| 905 | msecs_to_jiffies(ALUA_RTPG_DELAY_MSECS))) { | 909 | msecs_to_jiffies(ALUA_RTPG_DELAY_MSECS))) |
| 906 | if (sdev) | 910 | sdev = NULL; |
| 907 | scsi_device_put(sdev); | 911 | else |
| 908 | kref_put(&pg->kref, release_port_group); | 912 | kref_put(&pg->kref, release_port_group); |
| 909 | } | 913 | } |
| 914 | if (sdev) | ||
| 915 | scsi_device_put(sdev); | ||
| 916 | |||
| 917 | return true; | ||
| 910 | } | 918 | } |
| 911 | 919 | ||
| 912 | /* | 920 | /* |
| @@ -1007,11 +1015,13 @@ static int alua_activate(struct scsi_device *sdev, | |||
| 1007 | mutex_unlock(&h->init_mutex); | 1015 | mutex_unlock(&h->init_mutex); |
| 1008 | goto out; | 1016 | goto out; |
| 1009 | } | 1017 | } |
| 1010 | fn = NULL; | ||
| 1011 | rcu_read_unlock(); | 1018 | rcu_read_unlock(); |
| 1012 | mutex_unlock(&h->init_mutex); | 1019 | mutex_unlock(&h->init_mutex); |
| 1013 | 1020 | ||
| 1014 | alua_rtpg_queue(pg, sdev, qdata, true); | 1021 | if (alua_rtpg_queue(pg, sdev, qdata, true)) |
| 1022 | fn = NULL; | ||
| 1023 | else | ||
| 1024 | err = SCSI_DH_DEV_OFFLINED; | ||
| 1015 | kref_put(&pg->kref, release_port_group); | 1025 | kref_put(&pg->kref, release_port_group); |
| 1016 | out: | 1026 | out: |
| 1017 | if (fn) | 1027 | if (fn) |
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 0d0be7754a65..9d659aaace15 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c | |||
| @@ -3885,6 +3885,7 @@ static int hpsa_update_device_info(struct ctlr_info *h, | |||
| 3885 | if (h->fw_support & MISC_FW_RAID_OFFLOAD_BASIC) | 3885 | if (h->fw_support & MISC_FW_RAID_OFFLOAD_BASIC) |
| 3886 | hpsa_get_ioaccel_status(h, scsi3addr, this_device); | 3886 | hpsa_get_ioaccel_status(h, scsi3addr, this_device); |
| 3887 | volume_offline = hpsa_volume_offline(h, scsi3addr); | 3887 | volume_offline = hpsa_volume_offline(h, scsi3addr); |
| 3888 | this_device->volume_offline = volume_offline; | ||
| 3888 | if (volume_offline == HPSA_LV_FAILED) { | 3889 | if (volume_offline == HPSA_LV_FAILED) { |
| 3889 | rc = HPSA_LV_FAILED; | 3890 | rc = HPSA_LV_FAILED; |
| 3890 | dev_err(&h->pdev->dev, | 3891 | dev_err(&h->pdev->dev, |
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 763f012fdeca..87f5e694dbed 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c | |||
| @@ -221,7 +221,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) | |||
| 221 | task->num_scatter = qc->n_elem; | 221 | task->num_scatter = qc->n_elem; |
| 222 | } else { | 222 | } else { |
| 223 | for_each_sg(qc->sg, sg, qc->n_elem, si) | 223 | for_each_sg(qc->sg, sg, qc->n_elem, si) |
| 224 | xfer += sg->length; | 224 | xfer += sg_dma_len(sg); |
| 225 | 225 | ||
| 226 | task->total_xfer_len = xfer; | 226 | task->total_xfer_len = xfer; |
| 227 | task->num_scatter = si; | 227 | task->num_scatter = si; |
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.h b/drivers/scsi/lpfc/lpfc_debugfs.h index c05f56c3023f..7b7d314af0e0 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.h +++ b/drivers/scsi/lpfc/lpfc_debugfs.h | |||
| @@ -44,14 +44,6 @@ | |||
| 44 | /* hbqinfo output buffer size */ | 44 | /* hbqinfo output buffer size */ |
| 45 | #define LPFC_HBQINFO_SIZE 8192 | 45 | #define LPFC_HBQINFO_SIZE 8192 |
| 46 | 46 | ||
| 47 | enum { | ||
| 48 | DUMP_FCP, | ||
| 49 | DUMP_NVME, | ||
| 50 | DUMP_MBX, | ||
| 51 | DUMP_ELS, | ||
| 52 | DUMP_NVMELS, | ||
| 53 | }; | ||
| 54 | |||
| 55 | /* nvmestat output buffer size */ | 47 | /* nvmestat output buffer size */ |
| 56 | #define LPFC_NVMESTAT_SIZE 8192 | 48 | #define LPFC_NVMESTAT_SIZE 8192 |
| 57 | #define LPFC_NVMEKTIME_SIZE 8192 | 49 | #define LPFC_NVMEKTIME_SIZE 8192 |
| @@ -283,8 +275,22 @@ struct lpfc_idiag { | |||
| 283 | struct lpfc_idiag_offset offset; | 275 | struct lpfc_idiag_offset offset; |
| 284 | void *ptr_private; | 276 | void *ptr_private; |
| 285 | }; | 277 | }; |
| 278 | |||
| 279 | #else | ||
| 280 | |||
| 281 | #define lpfc_nvmeio_data(phba, fmt, arg...) \ | ||
| 282 | no_printk(fmt, ##arg) | ||
| 283 | |||
| 286 | #endif | 284 | #endif |
| 287 | 285 | ||
| 286 | enum { | ||
| 287 | DUMP_FCP, | ||
| 288 | DUMP_NVME, | ||
| 289 | DUMP_MBX, | ||
| 290 | DUMP_ELS, | ||
| 291 | DUMP_NVMELS, | ||
| 292 | }; | ||
| 293 | |||
| 288 | /* Mask for discovery_trace */ | 294 | /* Mask for discovery_trace */ |
| 289 | #define LPFC_DISC_TRC_ELS_CMD 0x1 /* Trace ELS commands */ | 295 | #define LPFC_DISC_TRC_ELS_CMD 0x1 /* Trace ELS commands */ |
| 290 | #define LPFC_DISC_TRC_ELS_RSP 0x2 /* Trace ELS response */ | 296 | #define LPFC_DISC_TRC_ELS_RSP 0x2 /* Trace ELS response */ |
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index d9c61d030034..a5ca37e45fb6 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c | |||
| @@ -7968,7 +7968,8 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
| 7968 | did, vport->port_state, ndlp->nlp_flag); | 7968 | did, vport->port_state, ndlp->nlp_flag); |
| 7969 | 7969 | ||
| 7970 | phba->fc_stat.elsRcvPRLI++; | 7970 | phba->fc_stat.elsRcvPRLI++; |
| 7971 | if (vport->port_state < LPFC_DISC_AUTH) { | 7971 | if ((vport->port_state < LPFC_DISC_AUTH) && |
| 7972 | (vport->fc_flag & FC_FABRIC)) { | ||
| 7972 | rjt_err = LSRJT_UNABLE_TPC; | 7973 | rjt_err = LSRJT_UNABLE_TPC; |
| 7973 | rjt_exp = LSEXP_NOTHING_MORE; | 7974 | rjt_exp = LSEXP_NOTHING_MORE; |
| 7974 | break; | 7975 | break; |
diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c index 7ca868f394da..acba1b67e505 100644 --- a/drivers/scsi/lpfc/lpfc_nvmet.c +++ b/drivers/scsi/lpfc/lpfc_nvmet.c | |||
| @@ -520,7 +520,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport, | |||
| 520 | struct lpfc_hba *phba = ctxp->phba; | 520 | struct lpfc_hba *phba = ctxp->phba; |
| 521 | struct lpfc_iocbq *nvmewqeq; | 521 | struct lpfc_iocbq *nvmewqeq; |
| 522 | unsigned long iflags; | 522 | unsigned long iflags; |
| 523 | int rc, id; | 523 | int rc; |
| 524 | 524 | ||
| 525 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS | 525 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
| 526 | if (phba->ktime_on) { | 526 | if (phba->ktime_on) { |
| @@ -530,7 +530,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport, | |||
| 530 | ctxp->ts_nvme_data = ktime_get_ns(); | 530 | ctxp->ts_nvme_data = ktime_get_ns(); |
| 531 | } | 531 | } |
| 532 | if (phba->cpucheck_on & LPFC_CHECK_NVMET_IO) { | 532 | if (phba->cpucheck_on & LPFC_CHECK_NVMET_IO) { |
| 533 | id = smp_processor_id(); | 533 | int id = smp_processor_id(); |
| 534 | ctxp->cpu = id; | 534 | ctxp->cpu = id; |
| 535 | if (id < LPFC_CHECK_CPU_CNT) | 535 | if (id < LPFC_CHECK_CPU_CNT) |
| 536 | phba->cpucheck_xmt_io[id]++; | 536 | phba->cpucheck_xmt_io[id]++; |
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c index 8e3d92807cb8..92775a8b74b1 100644 --- a/drivers/scsi/qedi/qedi_main.c +++ b/drivers/scsi/qedi/qedi_main.c | |||
| @@ -2007,6 +2007,7 @@ static void qedi_remove(struct pci_dev *pdev) | |||
| 2007 | 2007 | ||
| 2008 | static struct pci_device_id qedi_pci_tbl[] = { | 2008 | static struct pci_device_id qedi_pci_tbl[] = { |
| 2009 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, 0x165E) }, | 2009 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, 0x165E) }, |
| 2010 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, 0x8084) }, | ||
| 2010 | { 0 }, | 2011 | { 0 }, |
| 2011 | }; | 2012 | }; |
| 2012 | MODULE_DEVICE_TABLE(pci, qedi_pci_tbl); | 2013 | MODULE_DEVICE_TABLE(pci, qedi_pci_tbl); |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 41d5b09f7326..3e7011757c82 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -1651,7 +1651,8 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res) | |||
| 1651 | /* Don't abort commands in adapter during EEH | 1651 | /* Don't abort commands in adapter during EEH |
| 1652 | * recovery as it's not accessible/responding. | 1652 | * recovery as it's not accessible/responding. |
| 1653 | */ | 1653 | */ |
| 1654 | if (GET_CMD_SP(sp) && !ha->flags.eeh_busy) { | 1654 | if (GET_CMD_SP(sp) && !ha->flags.eeh_busy && |
| 1655 | (sp->type == SRB_SCSI_CMD)) { | ||
| 1655 | /* Get a reference to the sp and drop the lock. | 1656 | /* Get a reference to the sp and drop the lock. |
| 1656 | * The reference ensures this sp->done() call | 1657 | * The reference ensures this sp->done() call |
| 1657 | * - and not the call in qla2xxx_eh_abort() - | 1658 | * - and not the call in qla2xxx_eh_abort() - |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 19125d72f322..e5a2d590a104 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -496,7 +496,7 @@ static void scsi_run_queue(struct request_queue *q) | |||
| 496 | scsi_starved_list_run(sdev->host); | 496 | scsi_starved_list_run(sdev->host); |
| 497 | 497 | ||
| 498 | if (q->mq_ops) | 498 | if (q->mq_ops) |
| 499 | blk_mq_start_stopped_hw_queues(q, false); | 499 | blk_mq_run_hw_queues(q, false); |
| 500 | else | 500 | else |
| 501 | blk_run_queue(q); | 501 | blk_run_queue(q); |
| 502 | } | 502 | } |
| @@ -667,7 +667,7 @@ static bool scsi_end_request(struct request *req, int error, | |||
| 667 | !list_empty(&sdev->host->starved_list)) | 667 | !list_empty(&sdev->host->starved_list)) |
| 668 | kblockd_schedule_work(&sdev->requeue_work); | 668 | kblockd_schedule_work(&sdev->requeue_work); |
| 669 | else | 669 | else |
| 670 | blk_mq_start_stopped_hw_queues(q, true); | 670 | blk_mq_run_hw_queues(q, true); |
| 671 | } else { | 671 | } else { |
| 672 | unsigned long flags; | 672 | unsigned long flags; |
| 673 | 673 | ||
| @@ -1974,7 +1974,7 @@ out: | |||
| 1974 | case BLK_MQ_RQ_QUEUE_BUSY: | 1974 | case BLK_MQ_RQ_QUEUE_BUSY: |
| 1975 | if (atomic_read(&sdev->device_busy) == 0 && | 1975 | if (atomic_read(&sdev->device_busy) == 0 && |
| 1976 | !scsi_device_blocked(sdev)) | 1976 | !scsi_device_blocked(sdev)) |
| 1977 | blk_mq_delay_queue(hctx, SCSI_QUEUE_DELAY); | 1977 | blk_mq_delay_run_hw_queue(hctx, SCSI_QUEUE_DELAY); |
| 1978 | break; | 1978 | break; |
| 1979 | case BLK_MQ_RQ_QUEUE_ERROR: | 1979 | case BLK_MQ_RQ_QUEUE_ERROR: |
| 1980 | /* | 1980 | /* |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 29b86505f796..225abaad4d1c 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -996,6 +996,8 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg) | |||
| 996 | result = get_user(val, ip); | 996 | result = get_user(val, ip); |
| 997 | if (result) | 997 | if (result) |
| 998 | return result; | 998 | return result; |
| 999 | if (val > SG_MAX_CDB_SIZE) | ||
| 1000 | return -ENOMEM; | ||
| 999 | sfp->next_cmd_len = (val > 0) ? val : 0; | 1001 | sfp->next_cmd_len = (val > 0) ? val : 0; |
| 1000 | return 0; | 1002 | return 0; |
| 1001 | case SG_GET_VERSION_NUM: | 1003 | case SG_GET_VERSION_NUM: |
diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c index a72a4ba78125..8e5e6c04c035 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c | |||
| @@ -309,8 +309,8 @@ int ufshcd_pltfrm_init(struct platform_device *pdev, | |||
| 309 | 309 | ||
| 310 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 310 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 311 | mmio_base = devm_ioremap_resource(dev, mem_res); | 311 | mmio_base = devm_ioremap_resource(dev, mem_res); |
| 312 | if (IS_ERR(*(void **)&mmio_base)) { | 312 | if (IS_ERR(mmio_base)) { |
| 313 | err = PTR_ERR(*(void **)&mmio_base); | 313 | err = PTR_ERR(mmio_base); |
| 314 | goto out; | 314 | goto out; |
| 315 | } | 315 | } |
| 316 | 316 | ||
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e8c26e6e6237..096e95b911bd 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c | |||
| @@ -4662,8 +4662,6 @@ static void __ufshcd_transfer_req_compl(struct ufs_hba *hba, | |||
| 4662 | } | 4662 | } |
| 4663 | if (ufshcd_is_clkscaling_supported(hba)) | 4663 | if (ufshcd_is_clkscaling_supported(hba)) |
| 4664 | hba->clk_scaling.active_reqs--; | 4664 | hba->clk_scaling.active_reqs--; |
| 4665 | if (ufshcd_is_clkscaling_supported(hba)) | ||
| 4666 | hba->clk_scaling.active_reqs--; | ||
| 4667 | } | 4665 | } |
| 4668 | 4666 | ||
| 4669 | /* clear corresponding bits of completed commands */ | 4667 | /* clear corresponding bits of completed commands */ |
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 7cbad0d45b9c..6ba270e0494d 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c | |||
| @@ -409,6 +409,7 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) | |||
| 409 | ret = PTR_ERR(vmfile); | 409 | ret = PTR_ERR(vmfile); |
| 410 | goto out; | 410 | goto out; |
| 411 | } | 411 | } |
| 412 | vmfile->f_mode |= FMODE_LSEEK; | ||
| 412 | asma->file = vmfile; | 413 | asma->file = vmfile; |
| 413 | } | 414 | } |
| 414 | get_file(asma->file); | 415 | get_file(asma->file); |
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 91048eeca28b..69d0f430b2d1 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c | |||
| @@ -107,8 +107,6 @@ struct cpufreq_cooling_device { | |||
| 107 | }; | 107 | }; |
| 108 | static DEFINE_IDA(cpufreq_ida); | 108 | static DEFINE_IDA(cpufreq_ida); |
| 109 | 109 | ||
| 110 | static unsigned int cpufreq_dev_count; | ||
| 111 | |||
| 112 | static DEFINE_MUTEX(cooling_list_lock); | 110 | static DEFINE_MUTEX(cooling_list_lock); |
| 113 | static LIST_HEAD(cpufreq_dev_list); | 111 | static LIST_HEAD(cpufreq_dev_list); |
| 114 | 112 | ||
| @@ -395,13 +393,20 @@ static int get_static_power(struct cpufreq_cooling_device *cpufreq_device, | |||
| 395 | 393 | ||
| 396 | opp = dev_pm_opp_find_freq_exact(cpufreq_device->cpu_dev, freq_hz, | 394 | opp = dev_pm_opp_find_freq_exact(cpufreq_device->cpu_dev, freq_hz, |
| 397 | true); | 395 | true); |
| 396 | if (IS_ERR(opp)) { | ||
| 397 | dev_warn_ratelimited(cpufreq_device->cpu_dev, | ||
| 398 | "Failed to find OPP for frequency %lu: %ld\n", | ||
| 399 | freq_hz, PTR_ERR(opp)); | ||
| 400 | return -EINVAL; | ||
| 401 | } | ||
| 402 | |||
| 398 | voltage = dev_pm_opp_get_voltage(opp); | 403 | voltage = dev_pm_opp_get_voltage(opp); |
| 399 | dev_pm_opp_put(opp); | 404 | dev_pm_opp_put(opp); |
| 400 | 405 | ||
| 401 | if (voltage == 0) { | 406 | if (voltage == 0) { |
| 402 | dev_warn_ratelimited(cpufreq_device->cpu_dev, | 407 | dev_err_ratelimited(cpufreq_device->cpu_dev, |
| 403 | "Failed to get voltage for frequency %lu: %ld\n", | 408 | "Failed to get voltage for frequency %lu\n", |
| 404 | freq_hz, IS_ERR(opp) ? PTR_ERR(opp) : 0); | 409 | freq_hz); |
| 405 | return -EINVAL; | 410 | return -EINVAL; |
| 406 | } | 411 | } |
| 407 | 412 | ||
| @@ -693,9 +698,9 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev, | |||
| 693 | 698 | ||
| 694 | *state = cpufreq_cooling_get_level(cpu, target_freq); | 699 | *state = cpufreq_cooling_get_level(cpu, target_freq); |
| 695 | if (*state == THERMAL_CSTATE_INVALID) { | 700 | if (*state == THERMAL_CSTATE_INVALID) { |
| 696 | dev_warn_ratelimited(&cdev->device, | 701 | dev_err_ratelimited(&cdev->device, |
| 697 | "Failed to convert %dKHz for cpu %d into a cdev state\n", | 702 | "Failed to convert %dKHz for cpu %d into a cdev state\n", |
| 698 | target_freq, cpu); | 703 | target_freq, cpu); |
| 699 | return -EINVAL; | 704 | return -EINVAL; |
| 700 | } | 705 | } |
| 701 | 706 | ||
| @@ -771,6 +776,7 @@ __cpufreq_cooling_register(struct device_node *np, | |||
| 771 | unsigned int freq, i, num_cpus; | 776 | unsigned int freq, i, num_cpus; |
| 772 | int ret; | 777 | int ret; |
| 773 | struct thermal_cooling_device_ops *cooling_ops; | 778 | struct thermal_cooling_device_ops *cooling_ops; |
| 779 | bool first; | ||
| 774 | 780 | ||
| 775 | if (!alloc_cpumask_var(&temp_mask, GFP_KERNEL)) | 781 | if (!alloc_cpumask_var(&temp_mask, GFP_KERNEL)) |
| 776 | return ERR_PTR(-ENOMEM); | 782 | return ERR_PTR(-ENOMEM); |
| @@ -874,13 +880,14 @@ __cpufreq_cooling_register(struct device_node *np, | |||
| 874 | cpufreq_dev->cool_dev = cool_dev; | 880 | cpufreq_dev->cool_dev = cool_dev; |
| 875 | 881 | ||
| 876 | mutex_lock(&cooling_list_lock); | 882 | mutex_lock(&cooling_list_lock); |
| 883 | /* Register the notifier for first cpufreq cooling device */ | ||
| 884 | first = list_empty(&cpufreq_dev_list); | ||
| 877 | list_add(&cpufreq_dev->node, &cpufreq_dev_list); | 885 | list_add(&cpufreq_dev->node, &cpufreq_dev_list); |
| 886 | mutex_unlock(&cooling_list_lock); | ||
| 878 | 887 | ||
| 879 | /* Register the notifier for first cpufreq cooling device */ | 888 | if (first) |
| 880 | if (!cpufreq_dev_count++) | ||
| 881 | cpufreq_register_notifier(&thermal_cpufreq_notifier_block, | 889 | cpufreq_register_notifier(&thermal_cpufreq_notifier_block, |
| 882 | CPUFREQ_POLICY_NOTIFIER); | 890 | CPUFREQ_POLICY_NOTIFIER); |
| 883 | mutex_unlock(&cooling_list_lock); | ||
| 884 | 891 | ||
| 885 | goto put_policy; | 892 | goto put_policy; |
| 886 | 893 | ||
| @@ -1021,6 +1028,7 @@ EXPORT_SYMBOL(of_cpufreq_power_cooling_register); | |||
| 1021 | void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) | 1028 | void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) |
| 1022 | { | 1029 | { |
| 1023 | struct cpufreq_cooling_device *cpufreq_dev; | 1030 | struct cpufreq_cooling_device *cpufreq_dev; |
| 1031 | bool last; | ||
| 1024 | 1032 | ||
| 1025 | if (!cdev) | 1033 | if (!cdev) |
| 1026 | return; | 1034 | return; |
| @@ -1028,14 +1036,15 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) | |||
| 1028 | cpufreq_dev = cdev->devdata; | 1036 | cpufreq_dev = cdev->devdata; |
| 1029 | 1037 | ||
| 1030 | mutex_lock(&cooling_list_lock); | 1038 | mutex_lock(&cooling_list_lock); |
| 1039 | list_del(&cpufreq_dev->node); | ||
| 1031 | /* Unregister the notifier for the last cpufreq cooling device */ | 1040 | /* Unregister the notifier for the last cpufreq cooling device */ |
| 1032 | if (!--cpufreq_dev_count) | 1041 | last = list_empty(&cpufreq_dev_list); |
| 1042 | mutex_unlock(&cooling_list_lock); | ||
| 1043 | |||
| 1044 | if (last) | ||
| 1033 | cpufreq_unregister_notifier(&thermal_cpufreq_notifier_block, | 1045 | cpufreq_unregister_notifier(&thermal_cpufreq_notifier_block, |
| 1034 | CPUFREQ_POLICY_NOTIFIER); | 1046 | CPUFREQ_POLICY_NOTIFIER); |
| 1035 | 1047 | ||
| 1036 | list_del(&cpufreq_dev->node); | ||
| 1037 | mutex_unlock(&cooling_list_lock); | ||
| 1038 | |||
| 1039 | thermal_cooling_device_unregister(cpufreq_dev->cool_dev); | 1048 | thermal_cooling_device_unregister(cpufreq_dev->cool_dev); |
| 1040 | ida_simple_remove(&cpufreq_ida, cpufreq_dev->id); | 1049 | ida_simple_remove(&cpufreq_ida, cpufreq_dev->id); |
| 1041 | kfree(cpufreq_dev->dyn_power_table); | 1050 | kfree(cpufreq_dev->dyn_power_table); |
diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c index 7743a78d4723..4bf4ad58cffd 100644 --- a/drivers/thermal/devfreq_cooling.c +++ b/drivers/thermal/devfreq_cooling.c | |||
| @@ -186,16 +186,22 @@ get_static_power(struct devfreq_cooling_device *dfc, unsigned long freq) | |||
| 186 | return 0; | 186 | return 0; |
| 187 | 187 | ||
| 188 | opp = dev_pm_opp_find_freq_exact(dev, freq, true); | 188 | opp = dev_pm_opp_find_freq_exact(dev, freq, true); |
| 189 | if (IS_ERR(opp) && (PTR_ERR(opp) == -ERANGE)) | 189 | if (PTR_ERR(opp) == -ERANGE) |
| 190 | opp = dev_pm_opp_find_freq_exact(dev, freq, false); | 190 | opp = dev_pm_opp_find_freq_exact(dev, freq, false); |
| 191 | 191 | ||
| 192 | if (IS_ERR(opp)) { | ||
| 193 | dev_err_ratelimited(dev, "Failed to find OPP for frequency %lu: %ld\n", | ||
| 194 | freq, PTR_ERR(opp)); | ||
| 195 | return 0; | ||
| 196 | } | ||
| 197 | |||
| 192 | voltage = dev_pm_opp_get_voltage(opp) / 1000; /* mV */ | 198 | voltage = dev_pm_opp_get_voltage(opp) / 1000; /* mV */ |
| 193 | dev_pm_opp_put(opp); | 199 | dev_pm_opp_put(opp); |
| 194 | 200 | ||
| 195 | if (voltage == 0) { | 201 | if (voltage == 0) { |
| 196 | dev_warn_ratelimited(dev, | 202 | dev_err_ratelimited(dev, |
| 197 | "Failed to get voltage for frequency %lu: %ld\n", | 203 | "Failed to get voltage for frequency %lu\n", |
| 198 | freq, IS_ERR(opp) ? PTR_ERR(opp) : 0); | 204 | freq); |
| 199 | return 0; | 205 | return 0; |
| 200 | } | 206 | } |
| 201 | 207 | ||
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index a65fb8197aec..0e3f529d50e9 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig | |||
| @@ -128,9 +128,13 @@ config SERIAL_8250_PCI | |||
| 128 | by the parport_serial driver, enabled with CONFIG_PARPORT_SERIAL. | 128 | by the parport_serial driver, enabled with CONFIG_PARPORT_SERIAL. |
| 129 | 129 | ||
| 130 | config SERIAL_8250_EXAR | 130 | config SERIAL_8250_EXAR |
| 131 | tristate "8250/16550 PCI device support" | 131 | tristate "8250/16550 Exar/Commtech PCI/PCIe device support" |
| 132 | depends on SERIAL_8250_PCI | 132 | depends on SERIAL_8250_PCI |
| 133 | default SERIAL_8250 | 133 | default SERIAL_8250 |
| 134 | help | ||
| 135 | This builds support for XR17C1xx, XR17V3xx and some Commtech | ||
| 136 | 422x PCIe serial cards that are not covered by the more generic | ||
| 137 | SERIAL_8250_PCI option. | ||
| 134 | 138 | ||
| 135 | config SERIAL_8250_HP300 | 139 | config SERIAL_8250_HP300 |
| 136 | tristate | 140 | tristate |
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 56f92d7348bf..b0a377725d63 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c | |||
| @@ -2452,18 +2452,37 @@ static void pl011_early_write(struct console *con, const char *s, unsigned n) | |||
| 2452 | uart_console_write(&dev->port, s, n, pl011_putc); | 2452 | uart_console_write(&dev->port, s, n, pl011_putc); |
| 2453 | } | 2453 | } |
| 2454 | 2454 | ||
| 2455 | /* | ||
| 2456 | * On non-ACPI systems, earlycon is enabled by specifying | ||
| 2457 | * "earlycon=pl011,<address>" on the kernel command line. | ||
| 2458 | * | ||
| 2459 | * On ACPI ARM64 systems, an "early" console is enabled via the SPCR table, | ||
| 2460 | * by specifying only "earlycon" on the command line. Because it requires | ||
| 2461 | * SPCR, the console starts after ACPI is parsed, which is later than a | ||
| 2462 | * traditional early console. | ||
| 2463 | * | ||
| 2464 | * To get the traditional early console that starts before ACPI is parsed, | ||
| 2465 | * specify the full "earlycon=pl011,<address>" option. | ||
| 2466 | */ | ||
| 2455 | static int __init pl011_early_console_setup(struct earlycon_device *device, | 2467 | static int __init pl011_early_console_setup(struct earlycon_device *device, |
| 2456 | const char *opt) | 2468 | const char *opt) |
| 2457 | { | 2469 | { |
| 2458 | if (!device->port.membase) | 2470 | if (!device->port.membase) |
| 2459 | return -ENODEV; | 2471 | return -ENODEV; |
| 2460 | 2472 | ||
| 2461 | device->con->write = qdf2400_e44_present ? | 2473 | /* On QDF2400 SOCs affected by Erratum 44, the "qdf2400_e44" must |
| 2462 | qdf2400_e44_early_write : pl011_early_write; | 2474 | * also be specified, e.g. "earlycon=pl011,<address>,qdf2400_e44". |
| 2475 | */ | ||
| 2476 | if (!strcmp(device->options, "qdf2400_e44")) | ||
| 2477 | device->con->write = qdf2400_e44_early_write; | ||
| 2478 | else | ||
| 2479 | device->con->write = pl011_early_write; | ||
| 2480 | |||
| 2463 | return 0; | 2481 | return 0; |
| 2464 | } | 2482 | } |
| 2465 | OF_EARLYCON_DECLARE(pl011, "arm,pl011", pl011_early_console_setup); | 2483 | OF_EARLYCON_DECLARE(pl011, "arm,pl011", pl011_early_console_setup); |
| 2466 | OF_EARLYCON_DECLARE(pl011, "arm,sbsa-uart", pl011_early_console_setup); | 2484 | OF_EARLYCON_DECLARE(pl011, "arm,sbsa-uart", pl011_early_console_setup); |
| 2485 | EARLYCON_DECLARE(qdf2400_e44, pl011_early_console_setup); | ||
| 2467 | 2486 | ||
| 2468 | #else | 2487 | #else |
| 2469 | #define AMBA_CONSOLE NULL | 2488 | #define AMBA_CONSOLE NULL |
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index dcebb28ffbc4..1f50a83ef958 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c | |||
| @@ -1951,6 +1951,11 @@ static void atmel_flush_buffer(struct uart_port *port) | |||
| 1951 | atmel_uart_writel(port, ATMEL_PDC_TCR, 0); | 1951 | atmel_uart_writel(port, ATMEL_PDC_TCR, 0); |
| 1952 | atmel_port->pdc_tx.ofs = 0; | 1952 | atmel_port->pdc_tx.ofs = 0; |
| 1953 | } | 1953 | } |
| 1954 | /* | ||
| 1955 | * in uart_flush_buffer(), the xmit circular buffer has just | ||
| 1956 | * been cleared, so we have to reset tx_len accordingly. | ||
| 1957 | */ | ||
| 1958 | atmel_port->tx_len = 0; | ||
| 1954 | } | 1959 | } |
| 1955 | 1960 | ||
| 1956 | /* | 1961 | /* |
| @@ -2483,6 +2488,9 @@ static void atmel_console_write(struct console *co, const char *s, u_int count) | |||
| 2483 | pdc_tx = atmel_uart_readl(port, ATMEL_PDC_PTSR) & ATMEL_PDC_TXTEN; | 2488 | pdc_tx = atmel_uart_readl(port, ATMEL_PDC_PTSR) & ATMEL_PDC_TXTEN; |
| 2484 | atmel_uart_writel(port, ATMEL_PDC_PTCR, ATMEL_PDC_TXTDIS); | 2489 | atmel_uart_writel(port, ATMEL_PDC_PTCR, ATMEL_PDC_TXTDIS); |
| 2485 | 2490 | ||
| 2491 | /* Make sure that tx path is actually able to send characters */ | ||
| 2492 | atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN); | ||
| 2493 | |||
| 2486 | uart_console_write(port, s, count, atmel_console_putchar); | 2494 | uart_console_write(port, s, count, atmel_console_putchar); |
| 2487 | 2495 | ||
| 2488 | /* | 2496 | /* |
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 6989b227d134..be94246b6fcc 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c | |||
| @@ -1088,7 +1088,7 @@ static void mxs_auart_settermios(struct uart_port *u, | |||
| 1088 | AUART_LINECTRL_BAUD_DIV_MAX); | 1088 | AUART_LINECTRL_BAUD_DIV_MAX); |
| 1089 | baud_max = u->uartclk * 32 / AUART_LINECTRL_BAUD_DIV_MIN; | 1089 | baud_max = u->uartclk * 32 / AUART_LINECTRL_BAUD_DIV_MIN; |
| 1090 | baud = uart_get_baud_rate(u, termios, old, baud_min, baud_max); | 1090 | baud = uart_get_baud_rate(u, termios, old, baud_min, baud_max); |
| 1091 | div = u->uartclk * 32 / baud; | 1091 | div = DIV_ROUND_CLOSEST(u->uartclk * 32, baud); |
| 1092 | } | 1092 | } |
| 1093 | 1093 | ||
| 1094 | ctrl |= AUART_LINECTRL_BAUD_DIVFRAC(div & 0x3F); | 1094 | ctrl |= AUART_LINECTRL_BAUD_DIVFRAC(div & 0x3F); |
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index c5f0fc906136..8af8d9542663 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/sched/signal.h> | 29 | #include <linux/sched/signal.h> |
| 30 | #include <linux/sched/debug.h> | 30 | #include <linux/sched/debug.h> |
| 31 | #include <linux/sched/debug.h> | ||
| 32 | #include <linux/tty.h> | 31 | #include <linux/tty.h> |
| 33 | #include <linux/tty_flip.h> | 32 | #include <linux/tty_flip.h> |
| 34 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 612fab6e54fb..79bdca5cb9c7 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
| @@ -520,8 +520,10 @@ static int rh_call_control (struct usb_hcd *hcd, struct urb *urb) | |||
| 520 | */ | 520 | */ |
| 521 | tbuf_size = max_t(u16, sizeof(struct usb_hub_descriptor), wLength); | 521 | tbuf_size = max_t(u16, sizeof(struct usb_hub_descriptor), wLength); |
| 522 | tbuf = kzalloc(tbuf_size, GFP_KERNEL); | 522 | tbuf = kzalloc(tbuf_size, GFP_KERNEL); |
| 523 | if (!tbuf) | 523 | if (!tbuf) { |
| 524 | return -ENOMEM; | 524 | status = -ENOMEM; |
| 525 | goto err_alloc; | ||
| 526 | } | ||
| 525 | 527 | ||
| 526 | bufp = tbuf; | 528 | bufp = tbuf; |
| 527 | 529 | ||
| @@ -734,6 +736,7 @@ error: | |||
| 734 | } | 736 | } |
| 735 | 737 | ||
| 736 | kfree(tbuf); | 738 | kfree(tbuf); |
| 739 | err_alloc: | ||
| 737 | 740 | ||
| 738 | /* any errors get returned through the urb completion */ | 741 | /* any errors get returned through the urb completion */ |
| 739 | spin_lock_irq(&hcd_root_hub_lock); | 742 | spin_lock_irq(&hcd_root_hub_lock); |
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index bd02a6cd8e2c..6ed468fa7d5e 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c | |||
| @@ -344,6 +344,7 @@ MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match); | |||
| 344 | static struct platform_driver usb_xhci_driver = { | 344 | static struct platform_driver usb_xhci_driver = { |
| 345 | .probe = xhci_plat_probe, | 345 | .probe = xhci_plat_probe, |
| 346 | .remove = xhci_plat_remove, | 346 | .remove = xhci_plat_remove, |
| 347 | .shutdown = usb_hcd_platform_shutdown, | ||
| 347 | .driver = { | 348 | .driver = { |
| 348 | .name = "xhci-hcd", | 349 | .name = "xhci-hcd", |
| 349 | .pm = DEV_PM_OPS, | 350 | .pm = DEV_PM_OPS, |
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index d9936c771fa0..a3309aa02993 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
| @@ -1989,6 +1989,9 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td, | |||
| 1989 | case TRB_NORMAL: | 1989 | case TRB_NORMAL: |
| 1990 | td->urb->actual_length = requested - remaining; | 1990 | td->urb->actual_length = requested - remaining; |
| 1991 | goto finish_td; | 1991 | goto finish_td; |
| 1992 | case TRB_STATUS: | ||
| 1993 | td->urb->actual_length = requested; | ||
| 1994 | goto finish_td; | ||
| 1992 | default: | 1995 | default: |
| 1993 | xhci_warn(xhci, "WARN: unexpected TRB Type %d\n", | 1996 | xhci_warn(xhci, "WARN: unexpected TRB Type %d\n", |
| 1994 | trb_type); | 1997 | trb_type); |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 50aee8b7718b..953fd8f62df0 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
| @@ -1477,6 +1477,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) | |||
| 1477 | struct xhci_ring *ep_ring; | 1477 | struct xhci_ring *ep_ring; |
| 1478 | struct xhci_virt_ep *ep; | 1478 | struct xhci_virt_ep *ep; |
| 1479 | struct xhci_command *command; | 1479 | struct xhci_command *command; |
| 1480 | struct xhci_virt_device *vdev; | ||
| 1480 | 1481 | ||
| 1481 | xhci = hcd_to_xhci(hcd); | 1482 | xhci = hcd_to_xhci(hcd); |
| 1482 | spin_lock_irqsave(&xhci->lock, flags); | 1483 | spin_lock_irqsave(&xhci->lock, flags); |
| @@ -1485,15 +1486,27 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) | |||
| 1485 | 1486 | ||
| 1486 | /* Make sure the URB hasn't completed or been unlinked already */ | 1487 | /* Make sure the URB hasn't completed or been unlinked already */ |
| 1487 | ret = usb_hcd_check_unlink_urb(hcd, urb, status); | 1488 | ret = usb_hcd_check_unlink_urb(hcd, urb, status); |
| 1488 | if (ret || !urb->hcpriv) | 1489 | if (ret) |
| 1489 | goto done; | 1490 | goto done; |
| 1491 | |||
| 1492 | /* give back URB now if we can't queue it for cancel */ | ||
| 1493 | vdev = xhci->devs[urb->dev->slot_id]; | ||
| 1494 | urb_priv = urb->hcpriv; | ||
| 1495 | if (!vdev || !urb_priv) | ||
| 1496 | goto err_giveback; | ||
| 1497 | |||
| 1498 | ep_index = xhci_get_endpoint_index(&urb->ep->desc); | ||
| 1499 | ep = &vdev->eps[ep_index]; | ||
| 1500 | ep_ring = xhci_urb_to_transfer_ring(xhci, urb); | ||
| 1501 | if (!ep || !ep_ring) | ||
| 1502 | goto err_giveback; | ||
| 1503 | |||
| 1490 | temp = readl(&xhci->op_regs->status); | 1504 | temp = readl(&xhci->op_regs->status); |
| 1491 | if (temp == 0xffffffff || (xhci->xhc_state & XHCI_STATE_HALTED)) { | 1505 | if (temp == 0xffffffff || (xhci->xhc_state & XHCI_STATE_HALTED)) { |
| 1492 | xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, | 1506 | xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, |
| 1493 | "HW died, freeing TD."); | 1507 | "HW died, freeing TD."); |
| 1494 | urb_priv = urb->hcpriv; | ||
| 1495 | for (i = urb_priv->num_tds_done; | 1508 | for (i = urb_priv->num_tds_done; |
| 1496 | i < urb_priv->num_tds && xhci->devs[urb->dev->slot_id]; | 1509 | i < urb_priv->num_tds; |
| 1497 | i++) { | 1510 | i++) { |
| 1498 | td = &urb_priv->td[i]; | 1511 | td = &urb_priv->td[i]; |
| 1499 | if (!list_empty(&td->td_list)) | 1512 | if (!list_empty(&td->td_list)) |
| @@ -1501,23 +1514,9 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) | |||
| 1501 | if (!list_empty(&td->cancelled_td_list)) | 1514 | if (!list_empty(&td->cancelled_td_list)) |
| 1502 | list_del_init(&td->cancelled_td_list); | 1515 | list_del_init(&td->cancelled_td_list); |
| 1503 | } | 1516 | } |
| 1504 | 1517 | goto err_giveback; | |
| 1505 | usb_hcd_unlink_urb_from_ep(hcd, urb); | ||
| 1506 | spin_unlock_irqrestore(&xhci->lock, flags); | ||
| 1507 | usb_hcd_giveback_urb(hcd, urb, -ESHUTDOWN); | ||
| 1508 | xhci_urb_free_priv(urb_priv); | ||
| 1509 | return ret; | ||
| 1510 | } | 1518 | } |
| 1511 | 1519 | ||
| 1512 | ep_index = xhci_get_endpoint_index(&urb->ep->desc); | ||
| 1513 | ep = &xhci->devs[urb->dev->slot_id]->eps[ep_index]; | ||
| 1514 | ep_ring = xhci_urb_to_transfer_ring(xhci, urb); | ||
| 1515 | if (!ep_ring) { | ||
| 1516 | ret = -EINVAL; | ||
| 1517 | goto done; | ||
| 1518 | } | ||
| 1519 | |||
| 1520 | urb_priv = urb->hcpriv; | ||
| 1521 | i = urb_priv->num_tds_done; | 1520 | i = urb_priv->num_tds_done; |
| 1522 | if (i < urb_priv->num_tds) | 1521 | if (i < urb_priv->num_tds) |
| 1523 | xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, | 1522 | xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, |
| @@ -1554,6 +1553,14 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) | |||
| 1554 | done: | 1553 | done: |
| 1555 | spin_unlock_irqrestore(&xhci->lock, flags); | 1554 | spin_unlock_irqrestore(&xhci->lock, flags); |
| 1556 | return ret; | 1555 | return ret; |
| 1556 | |||
| 1557 | err_giveback: | ||
| 1558 | if (urb_priv) | ||
| 1559 | xhci_urb_free_priv(urb_priv); | ||
| 1560 | usb_hcd_unlink_urb_from_ep(hcd, urb); | ||
| 1561 | spin_unlock_irqrestore(&xhci->lock, flags); | ||
| 1562 | usb_hcd_giveback_urb(hcd, urb, -ESHUTDOWN); | ||
| 1563 | return ret; | ||
| 1557 | } | 1564 | } |
| 1558 | 1565 | ||
| 1559 | /* Drop an endpoint from a new bandwidth configuration for this device. | 1566 | /* Drop an endpoint from a new bandwidth configuration for this device. |
diff --git a/drivers/usb/phy/phy-isp1301.c b/drivers/usb/phy/phy-isp1301.c index b3b33cf7ddf6..f333024660b4 100644 --- a/drivers/usb/phy/phy-isp1301.c +++ b/drivers/usb/phy/phy-isp1301.c | |||
| @@ -136,7 +136,7 @@ static int isp1301_remove(struct i2c_client *client) | |||
| 136 | static struct i2c_driver isp1301_driver = { | 136 | static struct i2c_driver isp1301_driver = { |
| 137 | .driver = { | 137 | .driver = { |
| 138 | .name = DRV_NAME, | 138 | .name = DRV_NAME, |
| 139 | .of_match_table = of_match_ptr(isp1301_of_match), | 139 | .of_match_table = isp1301_of_match, |
| 140 | }, | 140 | }, |
| 141 | .probe = isp1301_probe, | 141 | .probe = isp1301_probe, |
| 142 | .remove = isp1301_remove, | 142 | .remove = isp1301_remove, |
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 4e1191508228..34adf9b9c053 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c | |||
| @@ -242,11 +242,11 @@ static inline void update_stat(struct virtio_balloon *vb, int idx, | |||
| 242 | 242 | ||
| 243 | #define pages_to_bytes(x) ((u64)(x) << PAGE_SHIFT) | 243 | #define pages_to_bytes(x) ((u64)(x) << PAGE_SHIFT) |
| 244 | 244 | ||
| 245 | static void update_balloon_stats(struct virtio_balloon *vb) | 245 | static unsigned int update_balloon_stats(struct virtio_balloon *vb) |
| 246 | { | 246 | { |
| 247 | unsigned long events[NR_VM_EVENT_ITEMS]; | 247 | unsigned long events[NR_VM_EVENT_ITEMS]; |
| 248 | struct sysinfo i; | 248 | struct sysinfo i; |
| 249 | int idx = 0; | 249 | unsigned int idx = 0; |
| 250 | long available; | 250 | long available; |
| 251 | 251 | ||
| 252 | all_vm_events(events); | 252 | all_vm_events(events); |
| @@ -254,18 +254,22 @@ static void update_balloon_stats(struct virtio_balloon *vb) | |||
| 254 | 254 | ||
| 255 | available = si_mem_available(); | 255 | available = si_mem_available(); |
| 256 | 256 | ||
| 257 | #ifdef CONFIG_VM_EVENT_COUNTERS | ||
| 257 | update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_IN, | 258 | update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_IN, |
| 258 | pages_to_bytes(events[PSWPIN])); | 259 | pages_to_bytes(events[PSWPIN])); |
| 259 | update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_OUT, | 260 | update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_OUT, |
| 260 | pages_to_bytes(events[PSWPOUT])); | 261 | pages_to_bytes(events[PSWPOUT])); |
| 261 | update_stat(vb, idx++, VIRTIO_BALLOON_S_MAJFLT, events[PGMAJFAULT]); | 262 | update_stat(vb, idx++, VIRTIO_BALLOON_S_MAJFLT, events[PGMAJFAULT]); |
| 262 | update_stat(vb, idx++, VIRTIO_BALLOON_S_MINFLT, events[PGFAULT]); | 263 | update_stat(vb, idx++, VIRTIO_BALLOON_S_MINFLT, events[PGFAULT]); |
| 264 | #endif | ||
| 263 | update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMFREE, | 265 | update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMFREE, |
| 264 | pages_to_bytes(i.freeram)); | 266 | pages_to_bytes(i.freeram)); |
| 265 | update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMTOT, | 267 | update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMTOT, |
| 266 | pages_to_bytes(i.totalram)); | 268 | pages_to_bytes(i.totalram)); |
| 267 | update_stat(vb, idx++, VIRTIO_BALLOON_S_AVAIL, | 269 | update_stat(vb, idx++, VIRTIO_BALLOON_S_AVAIL, |
| 268 | pages_to_bytes(available)); | 270 | pages_to_bytes(available)); |
| 271 | |||
| 272 | return idx; | ||
| 269 | } | 273 | } |
| 270 | 274 | ||
| 271 | /* | 275 | /* |
| @@ -291,14 +295,14 @@ static void stats_handle_request(struct virtio_balloon *vb) | |||
| 291 | { | 295 | { |
| 292 | struct virtqueue *vq; | 296 | struct virtqueue *vq; |
| 293 | struct scatterlist sg; | 297 | struct scatterlist sg; |
| 294 | unsigned int len; | 298 | unsigned int len, num_stats; |
| 295 | 299 | ||
| 296 | update_balloon_stats(vb); | 300 | num_stats = update_balloon_stats(vb); |
| 297 | 301 | ||
| 298 | vq = vb->stats_vq; | 302 | vq = vb->stats_vq; |
| 299 | if (!virtqueue_get_buf(vq, &len)) | 303 | if (!virtqueue_get_buf(vq, &len)) |
| 300 | return; | 304 | return; |
| 301 | sg_init_one(&sg, vb->stats, sizeof(vb->stats)); | 305 | sg_init_one(&sg, vb->stats, sizeof(vb->stats[0]) * num_stats); |
| 302 | virtqueue_add_outbuf(vq, &sg, 1, vb, GFP_KERNEL); | 306 | virtqueue_add_outbuf(vq, &sg, 1, vb, GFP_KERNEL); |
| 303 | virtqueue_kick(vq); | 307 | virtqueue_kick(vq); |
| 304 | } | 308 | } |
| @@ -423,13 +427,16 @@ static int init_vqs(struct virtio_balloon *vb) | |||
| 423 | vb->deflate_vq = vqs[1]; | 427 | vb->deflate_vq = vqs[1]; |
| 424 | if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_STATS_VQ)) { | 428 | if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_STATS_VQ)) { |
| 425 | struct scatterlist sg; | 429 | struct scatterlist sg; |
| 430 | unsigned int num_stats; | ||
| 426 | vb->stats_vq = vqs[2]; | 431 | vb->stats_vq = vqs[2]; |
| 427 | 432 | ||
| 428 | /* | 433 | /* |
| 429 | * Prime this virtqueue with one buffer so the hypervisor can | 434 | * Prime this virtqueue with one buffer so the hypervisor can |
| 430 | * use it to signal us later (it can't be broken yet!). | 435 | * use it to signal us later (it can't be broken yet!). |
| 431 | */ | 436 | */ |
| 432 | sg_init_one(&sg, vb->stats, sizeof vb->stats); | 437 | num_stats = update_balloon_stats(vb); |
| 438 | |||
| 439 | sg_init_one(&sg, vb->stats, sizeof(vb->stats[0]) * num_stats); | ||
| 433 | if (virtqueue_add_outbuf(vb->stats_vq, &sg, 1, vb, GFP_KERNEL) | 440 | if (virtqueue_add_outbuf(vb->stats_vq, &sg, 1, vb, GFP_KERNEL) |
| 434 | < 0) | 441 | < 0) |
| 435 | BUG(); | 442 | BUG(); |
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index df548a6fb844..590534910dc6 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c | |||
| @@ -147,7 +147,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, | |||
| 147 | { | 147 | { |
| 148 | struct virtio_pci_device *vp_dev = to_vp_device(vdev); | 148 | struct virtio_pci_device *vp_dev = to_vp_device(vdev); |
| 149 | const char *name = dev_name(&vp_dev->vdev.dev); | 149 | const char *name = dev_name(&vp_dev->vdev.dev); |
| 150 | int i, err = -ENOMEM, allocated_vectors, nvectors; | 150 | int i, j, err = -ENOMEM, allocated_vectors, nvectors; |
| 151 | unsigned flags = PCI_IRQ_MSIX; | 151 | unsigned flags = PCI_IRQ_MSIX; |
| 152 | bool shared = false; | 152 | bool shared = false; |
| 153 | u16 msix_vec; | 153 | u16 msix_vec; |
| @@ -212,7 +212,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, | |||
| 212 | if (!vp_dev->msix_vector_map) | 212 | if (!vp_dev->msix_vector_map) |
| 213 | goto out_disable_config_irq; | 213 | goto out_disable_config_irq; |
| 214 | 214 | ||
| 215 | allocated_vectors = 1; /* vector 0 is the config interrupt */ | 215 | allocated_vectors = j = 1; /* vector 0 is the config interrupt */ |
| 216 | for (i = 0; i < nvqs; ++i) { | 216 | for (i = 0; i < nvqs; ++i) { |
| 217 | if (!names[i]) { | 217 | if (!names[i]) { |
| 218 | vqs[i] = NULL; | 218 | vqs[i] = NULL; |
| @@ -236,18 +236,19 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, | |||
| 236 | continue; | 236 | continue; |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | snprintf(vp_dev->msix_names[i + 1], | 239 | snprintf(vp_dev->msix_names[j], |
| 240 | sizeof(*vp_dev->msix_names), "%s-%s", | 240 | sizeof(*vp_dev->msix_names), "%s-%s", |
| 241 | dev_name(&vp_dev->vdev.dev), names[i]); | 241 | dev_name(&vp_dev->vdev.dev), names[i]); |
| 242 | err = request_irq(pci_irq_vector(vp_dev->pci_dev, msix_vec), | 242 | err = request_irq(pci_irq_vector(vp_dev->pci_dev, msix_vec), |
| 243 | vring_interrupt, IRQF_SHARED, | 243 | vring_interrupt, IRQF_SHARED, |
| 244 | vp_dev->msix_names[i + 1], vqs[i]); | 244 | vp_dev->msix_names[j], vqs[i]); |
| 245 | if (err) { | 245 | if (err) { |
| 246 | /* don't free this irq on error */ | 246 | /* don't free this irq on error */ |
| 247 | vp_dev->msix_vector_map[i] = VIRTIO_MSI_NO_VECTOR; | 247 | vp_dev->msix_vector_map[i] = VIRTIO_MSI_NO_VECTOR; |
| 248 | goto out_remove_vqs; | 248 | goto out_remove_vqs; |
| 249 | } | 249 | } |
| 250 | vp_dev->msix_vector_map[i] = msix_vec; | 250 | vp_dev->msix_vector_map[i] = msix_vec; |
| 251 | j++; | ||
| 251 | 252 | ||
| 252 | /* | 253 | /* |
| 253 | * Use a different vector for each queue if they are available, | 254 | * Use a different vector for each queue if they are available, |
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c index 1f4733b80c87..f3b089b7c0b6 100644 --- a/drivers/xen/xenbus/xenbus_dev_frontend.c +++ b/drivers/xen/xenbus/xenbus_dev_frontend.c | |||
| @@ -442,8 +442,10 @@ static int xenbus_write_transaction(unsigned msg_type, | |||
| 442 | return xenbus_command_reply(u, XS_ERROR, "ENOENT"); | 442 | return xenbus_command_reply(u, XS_ERROR, "ENOENT"); |
| 443 | 443 | ||
| 444 | rc = xenbus_dev_request_and_reply(&u->u.msg, u); | 444 | rc = xenbus_dev_request_and_reply(&u->u.msg, u); |
| 445 | if (rc) | 445 | if (rc && trans) { |
| 446 | list_del(&trans->list); | ||
| 446 | kfree(trans); | 447 | kfree(trans); |
| 448 | } | ||
| 447 | 449 | ||
| 448 | out: | 450 | out: |
| 449 | return rc; | 451 | return rc; |
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 29b7fc28c607..c4115901d906 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
| @@ -1259,7 +1259,7 @@ struct btrfs_root { | |||
| 1259 | atomic_t will_be_snapshoted; | 1259 | atomic_t will_be_snapshoted; |
| 1260 | 1260 | ||
| 1261 | /* For qgroup metadata space reserve */ | 1261 | /* For qgroup metadata space reserve */ |
| 1262 | atomic_t qgroup_meta_rsv; | 1262 | atomic64_t qgroup_meta_rsv; |
| 1263 | }; | 1263 | }; |
| 1264 | static inline u32 btrfs_inode_sectorsize(const struct inode *inode) | 1264 | static inline u32 btrfs_inode_sectorsize(const struct inode *inode) |
| 1265 | { | 1265 | { |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 08b74daf35d0..eb1ee7b6f532 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -1342,7 +1342,7 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info, | |||
| 1342 | atomic_set(&root->orphan_inodes, 0); | 1342 | atomic_set(&root->orphan_inodes, 0); |
| 1343 | atomic_set(&root->refs, 1); | 1343 | atomic_set(&root->refs, 1); |
| 1344 | atomic_set(&root->will_be_snapshoted, 0); | 1344 | atomic_set(&root->will_be_snapshoted, 0); |
| 1345 | atomic_set(&root->qgroup_meta_rsv, 0); | 1345 | atomic64_set(&root->qgroup_meta_rsv, 0); |
| 1346 | root->log_transid = 0; | 1346 | root->log_transid = 0; |
| 1347 | root->log_transid_committed = -1; | 1347 | root->log_transid_committed = -1; |
| 1348 | root->last_log_commit = 0; | 1348 | root->last_log_commit = 0; |
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 8df797432740..27fdb250b446 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
| @@ -2584,26 +2584,36 @@ static void end_bio_extent_readpage(struct bio *bio) | |||
| 2584 | 2584 | ||
| 2585 | if (tree->ops) { | 2585 | if (tree->ops) { |
| 2586 | ret = tree->ops->readpage_io_failed_hook(page, mirror); | 2586 | ret = tree->ops->readpage_io_failed_hook(page, mirror); |
| 2587 | if (!ret && !bio->bi_error) | 2587 | if (ret == -EAGAIN) { |
| 2588 | uptodate = 1; | 2588 | /* |
| 2589 | } else { | 2589 | * Data inode's readpage_io_failed_hook() always |
| 2590 | * returns -EAGAIN. | ||
| 2591 | * | ||
| 2592 | * The generic bio_readpage_error handles errors | ||
| 2593 | * the following way: If possible, new read | ||
| 2594 | * requests are created and submitted and will | ||
| 2595 | * end up in end_bio_extent_readpage as well (if | ||
| 2596 | * we're lucky, not in the !uptodate case). In | ||
| 2597 | * that case it returns 0 and we just go on with | ||
| 2598 | * the next page in our bio. If it can't handle | ||
| 2599 | * the error it will return -EIO and we remain | ||
| 2600 | * responsible for that page. | ||
| 2601 | */ | ||
| 2602 | ret = bio_readpage_error(bio, offset, page, | ||
| 2603 | start, end, mirror); | ||
| 2604 | if (ret == 0) { | ||
| 2605 | uptodate = !bio->bi_error; | ||
| 2606 | offset += len; | ||
| 2607 | continue; | ||
| 2608 | } | ||
| 2609 | } | ||
| 2610 | |||
| 2590 | /* | 2611 | /* |
| 2591 | * The generic bio_readpage_error handles errors the | 2612 | * metadata's readpage_io_failed_hook() always returns |
| 2592 | * following way: If possible, new read requests are | 2613 | * -EIO and fixes nothing. -EIO is also returned if |
| 2593 | * created and submitted and will end up in | 2614 | * data inode error could not be fixed. |
| 2594 | * end_bio_extent_readpage as well (if we're lucky, not | ||
| 2595 | * in the !uptodate case). In that case it returns 0 and | ||
| 2596 | * we just go on with the next page in our bio. If it | ||
| 2597 | * can't handle the error it will return -EIO and we | ||
| 2598 | * remain responsible for that page. | ||
| 2599 | */ | 2615 | */ |
| 2600 | ret = bio_readpage_error(bio, offset, page, start, end, | 2616 | ASSERT(ret == -EIO); |
| 2601 | mirror); | ||
| 2602 | if (ret == 0) { | ||
| 2603 | uptodate = !bio->bi_error; | ||
| 2604 | offset += len; | ||
| 2605 | continue; | ||
| 2606 | } | ||
| 2607 | } | 2617 | } |
| 2608 | readpage_ok: | 2618 | readpage_ok: |
| 2609 | if (likely(uptodate)) { | 2619 | if (likely(uptodate)) { |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 231503935652..a18510be76c1 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
| @@ -10523,9 +10523,9 @@ out_inode: | |||
| 10523 | } | 10523 | } |
| 10524 | 10524 | ||
| 10525 | __attribute__((const)) | 10525 | __attribute__((const)) |
| 10526 | static int dummy_readpage_io_failed_hook(struct page *page, int failed_mirror) | 10526 | static int btrfs_readpage_io_failed_hook(struct page *page, int failed_mirror) |
| 10527 | { | 10527 | { |
| 10528 | return 0; | 10528 | return -EAGAIN; |
| 10529 | } | 10529 | } |
| 10530 | 10530 | ||
| 10531 | static const struct inode_operations btrfs_dir_inode_operations = { | 10531 | static const struct inode_operations btrfs_dir_inode_operations = { |
| @@ -10570,7 +10570,7 @@ static const struct extent_io_ops btrfs_extent_io_ops = { | |||
| 10570 | .submit_bio_hook = btrfs_submit_bio_hook, | 10570 | .submit_bio_hook = btrfs_submit_bio_hook, |
| 10571 | .readpage_end_io_hook = btrfs_readpage_end_io_hook, | 10571 | .readpage_end_io_hook = btrfs_readpage_end_io_hook, |
| 10572 | .merge_bio_hook = btrfs_merge_bio_hook, | 10572 | .merge_bio_hook = btrfs_merge_bio_hook, |
| 10573 | .readpage_io_failed_hook = dummy_readpage_io_failed_hook, | 10573 | .readpage_io_failed_hook = btrfs_readpage_io_failed_hook, |
| 10574 | 10574 | ||
| 10575 | /* optional callbacks */ | 10575 | /* optional callbacks */ |
| 10576 | .fill_delalloc = run_delalloc_range, | 10576 | .fill_delalloc = run_delalloc_range, |
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index a5da750c1087..a59801dc2a34 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
| @@ -2948,20 +2948,20 @@ int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes, | |||
| 2948 | ret = qgroup_reserve(root, num_bytes, enforce); | 2948 | ret = qgroup_reserve(root, num_bytes, enforce); |
| 2949 | if (ret < 0) | 2949 | if (ret < 0) |
| 2950 | return ret; | 2950 | return ret; |
| 2951 | atomic_add(num_bytes, &root->qgroup_meta_rsv); | 2951 | atomic64_add(num_bytes, &root->qgroup_meta_rsv); |
| 2952 | return ret; | 2952 | return ret; |
| 2953 | } | 2953 | } |
| 2954 | 2954 | ||
| 2955 | void btrfs_qgroup_free_meta_all(struct btrfs_root *root) | 2955 | void btrfs_qgroup_free_meta_all(struct btrfs_root *root) |
| 2956 | { | 2956 | { |
| 2957 | struct btrfs_fs_info *fs_info = root->fs_info; | 2957 | struct btrfs_fs_info *fs_info = root->fs_info; |
| 2958 | int reserved; | 2958 | u64 reserved; |
| 2959 | 2959 | ||
| 2960 | if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) || | 2960 | if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) || |
| 2961 | !is_fstree(root->objectid)) | 2961 | !is_fstree(root->objectid)) |
| 2962 | return; | 2962 | return; |
| 2963 | 2963 | ||
| 2964 | reserved = atomic_xchg(&root->qgroup_meta_rsv, 0); | 2964 | reserved = atomic64_xchg(&root->qgroup_meta_rsv, 0); |
| 2965 | if (reserved == 0) | 2965 | if (reserved == 0) |
| 2966 | return; | 2966 | return; |
| 2967 | btrfs_qgroup_free_refroot(fs_info, root->objectid, reserved); | 2967 | btrfs_qgroup_free_refroot(fs_info, root->objectid, reserved); |
| @@ -2976,8 +2976,8 @@ void btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes) | |||
| 2976 | return; | 2976 | return; |
| 2977 | 2977 | ||
| 2978 | BUG_ON(num_bytes != round_down(num_bytes, fs_info->nodesize)); | 2978 | BUG_ON(num_bytes != round_down(num_bytes, fs_info->nodesize)); |
| 2979 | WARN_ON(atomic_read(&root->qgroup_meta_rsv) < num_bytes); | 2979 | WARN_ON(atomic64_read(&root->qgroup_meta_rsv) < num_bytes); |
| 2980 | atomic_sub(num_bytes, &root->qgroup_meta_rsv); | 2980 | atomic64_sub(num_bytes, &root->qgroup_meta_rsv); |
| 2981 | btrfs_qgroup_free_refroot(fs_info, root->objectid, num_bytes); | 2981 | btrfs_qgroup_free_refroot(fs_info, root->objectid, num_bytes); |
| 2982 | } | 2982 | } |
| 2983 | 2983 | ||
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 456c8901489b..a60d5bfb8a49 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c | |||
| @@ -6305,8 +6305,13 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) | |||
| 6305 | goto out; | 6305 | goto out; |
| 6306 | } | 6306 | } |
| 6307 | 6307 | ||
| 6308 | /* | ||
| 6309 | * Check that we don't overflow at later allocations, we request | ||
| 6310 | * clone_sources_count + 1 items, and compare to unsigned long inside | ||
| 6311 | * access_ok. | ||
| 6312 | */ | ||
| 6308 | if (arg->clone_sources_count > | 6313 | if (arg->clone_sources_count > |
| 6309 | ULLONG_MAX / sizeof(*arg->clone_sources)) { | 6314 | ULONG_MAX / sizeof(struct clone_root) - 1) { |
| 6310 | ret = -EINVAL; | 6315 | ret = -EINVAL; |
| 6311 | goto out; | 6316 | goto out; |
| 6312 | } | 6317 | } |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 15e1db8738ae..dd3f5fabfdf6 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -972,6 +972,86 @@ out: | |||
| 972 | return rc; | 972 | return rc; |
| 973 | } | 973 | } |
| 974 | 974 | ||
| 975 | ssize_t cifs_file_copychunk_range(unsigned int xid, | ||
| 976 | struct file *src_file, loff_t off, | ||
| 977 | struct file *dst_file, loff_t destoff, | ||
| 978 | size_t len, unsigned int flags) | ||
| 979 | { | ||
| 980 | struct inode *src_inode = file_inode(src_file); | ||
| 981 | struct inode *target_inode = file_inode(dst_file); | ||
| 982 | struct cifsFileInfo *smb_file_src; | ||
| 983 | struct cifsFileInfo *smb_file_target; | ||
| 984 | struct cifs_tcon *src_tcon; | ||
| 985 | struct cifs_tcon *target_tcon; | ||
| 986 | ssize_t rc; | ||
| 987 | |||
| 988 | cifs_dbg(FYI, "copychunk range\n"); | ||
| 989 | |||
| 990 | if (src_inode == target_inode) { | ||
| 991 | rc = -EINVAL; | ||
| 992 | goto out; | ||
| 993 | } | ||
| 994 | |||
| 995 | if (!src_file->private_data || !dst_file->private_data) { | ||
| 996 | rc = -EBADF; | ||
| 997 | cifs_dbg(VFS, "missing cifsFileInfo on copy range src file\n"); | ||
| 998 | goto out; | ||
| 999 | } | ||
| 1000 | |||
| 1001 | rc = -EXDEV; | ||
| 1002 | smb_file_target = dst_file->private_data; | ||
| 1003 | smb_file_src = src_file->private_data; | ||
| 1004 | src_tcon = tlink_tcon(smb_file_src->tlink); | ||
| 1005 | target_tcon = tlink_tcon(smb_file_target->tlink); | ||
| 1006 | |||
| 1007 | if (src_tcon->ses != target_tcon->ses) { | ||
| 1008 | cifs_dbg(VFS, "source and target of copy not on same server\n"); | ||
| 1009 | goto out; | ||
| 1010 | } | ||
| 1011 | |||
| 1012 | /* | ||
| 1013 | * Note: cifs case is easier than btrfs since server responsible for | ||
| 1014 | * checks for proper open modes and file type and if it wants | ||
| 1015 | * server could even support copy of range where source = target | ||
| 1016 | */ | ||
| 1017 | lock_two_nondirectories(target_inode, src_inode); | ||
| 1018 | |||
| 1019 | cifs_dbg(FYI, "about to flush pages\n"); | ||
| 1020 | /* should we flush first and last page first */ | ||
| 1021 | truncate_inode_pages(&target_inode->i_data, 0); | ||
| 1022 | |||
| 1023 | if (target_tcon->ses->server->ops->copychunk_range) | ||
| 1024 | rc = target_tcon->ses->server->ops->copychunk_range(xid, | ||
| 1025 | smb_file_src, smb_file_target, off, len, destoff); | ||
| 1026 | else | ||
| 1027 | rc = -EOPNOTSUPP; | ||
| 1028 | |||
| 1029 | /* force revalidate of size and timestamps of target file now | ||
| 1030 | * that target is updated on the server | ||
| 1031 | */ | ||
| 1032 | CIFS_I(target_inode)->time = 0; | ||
| 1033 | /* although unlocking in the reverse order from locking is not | ||
| 1034 | * strictly necessary here it is a little cleaner to be consistent | ||
| 1035 | */ | ||
| 1036 | unlock_two_nondirectories(src_inode, target_inode); | ||
| 1037 | |||
| 1038 | out: | ||
| 1039 | return rc; | ||
| 1040 | } | ||
| 1041 | |||
| 1042 | static ssize_t cifs_copy_file_range(struct file *src_file, loff_t off, | ||
| 1043 | struct file *dst_file, loff_t destoff, | ||
| 1044 | size_t len, unsigned int flags) | ||
| 1045 | { | ||
| 1046 | unsigned int xid = get_xid(); | ||
| 1047 | ssize_t rc; | ||
| 1048 | |||
| 1049 | rc = cifs_file_copychunk_range(xid, src_file, off, dst_file, destoff, | ||
| 1050 | len, flags); | ||
| 1051 | free_xid(xid); | ||
| 1052 | return rc; | ||
| 1053 | } | ||
| 1054 | |||
| 975 | const struct file_operations cifs_file_ops = { | 1055 | const struct file_operations cifs_file_ops = { |
| 976 | .read_iter = cifs_loose_read_iter, | 1056 | .read_iter = cifs_loose_read_iter, |
| 977 | .write_iter = cifs_file_write_iter, | 1057 | .write_iter = cifs_file_write_iter, |
| @@ -984,6 +1064,7 @@ const struct file_operations cifs_file_ops = { | |||
| 984 | .splice_read = generic_file_splice_read, | 1064 | .splice_read = generic_file_splice_read, |
| 985 | .llseek = cifs_llseek, | 1065 | .llseek = cifs_llseek, |
| 986 | .unlocked_ioctl = cifs_ioctl, | 1066 | .unlocked_ioctl = cifs_ioctl, |
| 1067 | .copy_file_range = cifs_copy_file_range, | ||
| 987 | .clone_file_range = cifs_clone_file_range, | 1068 | .clone_file_range = cifs_clone_file_range, |
| 988 | .setlease = cifs_setlease, | 1069 | .setlease = cifs_setlease, |
| 989 | .fallocate = cifs_fallocate, | 1070 | .fallocate = cifs_fallocate, |
| @@ -1001,6 +1082,7 @@ const struct file_operations cifs_file_strict_ops = { | |||
| 1001 | .splice_read = generic_file_splice_read, | 1082 | .splice_read = generic_file_splice_read, |
| 1002 | .llseek = cifs_llseek, | 1083 | .llseek = cifs_llseek, |
| 1003 | .unlocked_ioctl = cifs_ioctl, | 1084 | .unlocked_ioctl = cifs_ioctl, |
| 1085 | .copy_file_range = cifs_copy_file_range, | ||
| 1004 | .clone_file_range = cifs_clone_file_range, | 1086 | .clone_file_range = cifs_clone_file_range, |
| 1005 | .setlease = cifs_setlease, | 1087 | .setlease = cifs_setlease, |
| 1006 | .fallocate = cifs_fallocate, | 1088 | .fallocate = cifs_fallocate, |
| @@ -1018,6 +1100,7 @@ const struct file_operations cifs_file_direct_ops = { | |||
| 1018 | .mmap = cifs_file_mmap, | 1100 | .mmap = cifs_file_mmap, |
| 1019 | .splice_read = generic_file_splice_read, | 1101 | .splice_read = generic_file_splice_read, |
| 1020 | .unlocked_ioctl = cifs_ioctl, | 1102 | .unlocked_ioctl = cifs_ioctl, |
| 1103 | .copy_file_range = cifs_copy_file_range, | ||
| 1021 | .clone_file_range = cifs_clone_file_range, | 1104 | .clone_file_range = cifs_clone_file_range, |
| 1022 | .llseek = cifs_llseek, | 1105 | .llseek = cifs_llseek, |
| 1023 | .setlease = cifs_setlease, | 1106 | .setlease = cifs_setlease, |
| @@ -1035,6 +1118,7 @@ const struct file_operations cifs_file_nobrl_ops = { | |||
| 1035 | .splice_read = generic_file_splice_read, | 1118 | .splice_read = generic_file_splice_read, |
| 1036 | .llseek = cifs_llseek, | 1119 | .llseek = cifs_llseek, |
| 1037 | .unlocked_ioctl = cifs_ioctl, | 1120 | .unlocked_ioctl = cifs_ioctl, |
| 1121 | .copy_file_range = cifs_copy_file_range, | ||
| 1038 | .clone_file_range = cifs_clone_file_range, | 1122 | .clone_file_range = cifs_clone_file_range, |
| 1039 | .setlease = cifs_setlease, | 1123 | .setlease = cifs_setlease, |
| 1040 | .fallocate = cifs_fallocate, | 1124 | .fallocate = cifs_fallocate, |
| @@ -1051,6 +1135,7 @@ const struct file_operations cifs_file_strict_nobrl_ops = { | |||
| 1051 | .splice_read = generic_file_splice_read, | 1135 | .splice_read = generic_file_splice_read, |
| 1052 | .llseek = cifs_llseek, | 1136 | .llseek = cifs_llseek, |
| 1053 | .unlocked_ioctl = cifs_ioctl, | 1137 | .unlocked_ioctl = cifs_ioctl, |
| 1138 | .copy_file_range = cifs_copy_file_range, | ||
| 1054 | .clone_file_range = cifs_clone_file_range, | 1139 | .clone_file_range = cifs_clone_file_range, |
| 1055 | .setlease = cifs_setlease, | 1140 | .setlease = cifs_setlease, |
| 1056 | .fallocate = cifs_fallocate, | 1141 | .fallocate = cifs_fallocate, |
| @@ -1067,6 +1152,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = { | |||
| 1067 | .mmap = cifs_file_mmap, | 1152 | .mmap = cifs_file_mmap, |
| 1068 | .splice_read = generic_file_splice_read, | 1153 | .splice_read = generic_file_splice_read, |
| 1069 | .unlocked_ioctl = cifs_ioctl, | 1154 | .unlocked_ioctl = cifs_ioctl, |
| 1155 | .copy_file_range = cifs_copy_file_range, | ||
| 1070 | .clone_file_range = cifs_clone_file_range, | 1156 | .clone_file_range = cifs_clone_file_range, |
| 1071 | .llseek = cifs_llseek, | 1157 | .llseek = cifs_llseek, |
| 1072 | .setlease = cifs_setlease, | 1158 | .setlease = cifs_setlease, |
| @@ -1078,6 +1164,7 @@ const struct file_operations cifs_dir_ops = { | |||
| 1078 | .release = cifs_closedir, | 1164 | .release = cifs_closedir, |
| 1079 | .read = generic_read_dir, | 1165 | .read = generic_read_dir, |
| 1080 | .unlocked_ioctl = cifs_ioctl, | 1166 | .unlocked_ioctl = cifs_ioctl, |
| 1167 | .copy_file_range = cifs_copy_file_range, | ||
| 1081 | .clone_file_range = cifs_clone_file_range, | 1168 | .clone_file_range = cifs_clone_file_range, |
| 1082 | .llseek = generic_file_llseek, | 1169 | .llseek = generic_file_llseek, |
| 1083 | }; | 1170 | }; |
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index da717fee3026..30bf89b1fd9a 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h | |||
| @@ -139,6 +139,11 @@ extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); | |||
| 139 | # define cifs_listxattr NULL | 139 | # define cifs_listxattr NULL |
| 140 | #endif | 140 | #endif |
| 141 | 141 | ||
| 142 | extern ssize_t cifs_file_copychunk_range(unsigned int xid, | ||
| 143 | struct file *src_file, loff_t off, | ||
| 144 | struct file *dst_file, loff_t destoff, | ||
| 145 | size_t len, unsigned int flags); | ||
| 146 | |||
| 142 | extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); | 147 | extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); |
| 143 | #ifdef CONFIG_CIFS_NFSD_EXPORT | 148 | #ifdef CONFIG_CIFS_NFSD_EXPORT |
| 144 | extern const struct export_operations cifs_export_ops; | 149 | extern const struct export_operations cifs_export_ops; |
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index d42dd3288647..d07f13a63369 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
| @@ -243,6 +243,7 @@ struct smb_version_operations { | |||
| 243 | /* verify the message */ | 243 | /* verify the message */ |
| 244 | int (*check_message)(char *, unsigned int, struct TCP_Server_Info *); | 244 | int (*check_message)(char *, unsigned int, struct TCP_Server_Info *); |
| 245 | bool (*is_oplock_break)(char *, struct TCP_Server_Info *); | 245 | bool (*is_oplock_break)(char *, struct TCP_Server_Info *); |
| 246 | int (*handle_cancelled_mid)(char *, struct TCP_Server_Info *); | ||
| 246 | void (*downgrade_oplock)(struct TCP_Server_Info *, | 247 | void (*downgrade_oplock)(struct TCP_Server_Info *, |
| 247 | struct cifsInodeInfo *, bool); | 248 | struct cifsInodeInfo *, bool); |
| 248 | /* process transaction2 response */ | 249 | /* process transaction2 response */ |
| @@ -407,9 +408,10 @@ struct smb_version_operations { | |||
| 407 | char * (*create_lease_buf)(u8 *, u8); | 408 | char * (*create_lease_buf)(u8 *, u8); |
| 408 | /* parse lease context buffer and return oplock/epoch info */ | 409 | /* parse lease context buffer and return oplock/epoch info */ |
| 409 | __u8 (*parse_lease_buf)(void *, unsigned int *); | 410 | __u8 (*parse_lease_buf)(void *, unsigned int *); |
| 410 | int (*clone_range)(const unsigned int, struct cifsFileInfo *src_file, | 411 | ssize_t (*copychunk_range)(const unsigned int, |
| 411 | struct cifsFileInfo *target_file, u64 src_off, u64 len, | 412 | struct cifsFileInfo *src_file, |
| 412 | u64 dest_off); | 413 | struct cifsFileInfo *target_file, |
| 414 | u64 src_off, u64 len, u64 dest_off); | ||
| 413 | int (*duplicate_extents)(const unsigned int, struct cifsFileInfo *src, | 415 | int (*duplicate_extents)(const unsigned int, struct cifsFileInfo *src, |
| 414 | struct cifsFileInfo *target_file, u64 src_off, u64 len, | 416 | struct cifsFileInfo *target_file, u64 src_off, u64 len, |
| 415 | u64 dest_off); | 417 | u64 dest_off); |
| @@ -1343,6 +1345,7 @@ struct mid_q_entry { | |||
| 1343 | void *callback_data; /* general purpose pointer for callback */ | 1345 | void *callback_data; /* general purpose pointer for callback */ |
| 1344 | void *resp_buf; /* pointer to received SMB header */ | 1346 | void *resp_buf; /* pointer to received SMB header */ |
| 1345 | int mid_state; /* wish this were enum but can not pass to wait_event */ | 1347 | int mid_state; /* wish this were enum but can not pass to wait_event */ |
| 1348 | unsigned int mid_flags; | ||
| 1346 | __le16 command; /* smb command code */ | 1349 | __le16 command; /* smb command code */ |
| 1347 | bool large_buf:1; /* if valid response, is pointer to large buf */ | 1350 | bool large_buf:1; /* if valid response, is pointer to large buf */ |
| 1348 | bool multiRsp:1; /* multiple trans2 responses for one request */ | 1351 | bool multiRsp:1; /* multiple trans2 responses for one request */ |
| @@ -1350,6 +1353,12 @@ struct mid_q_entry { | |||
| 1350 | bool decrypted:1; /* decrypted entry */ | 1353 | bool decrypted:1; /* decrypted entry */ |
| 1351 | }; | 1354 | }; |
| 1352 | 1355 | ||
| 1356 | struct close_cancelled_open { | ||
| 1357 | struct cifs_fid fid; | ||
| 1358 | struct cifs_tcon *tcon; | ||
| 1359 | struct work_struct work; | ||
| 1360 | }; | ||
| 1361 | |||
| 1353 | /* Make code in transport.c a little cleaner by moving | 1362 | /* Make code in transport.c a little cleaner by moving |
| 1354 | update of optional stats into function below */ | 1363 | update of optional stats into function below */ |
| 1355 | #ifdef CONFIG_CIFS_STATS2 | 1364 | #ifdef CONFIG_CIFS_STATS2 |
| @@ -1481,6 +1490,9 @@ static inline void free_dfs_info_array(struct dfs_info3_param *param, | |||
| 1481 | #define MID_RESPONSE_MALFORMED 0x10 | 1490 | #define MID_RESPONSE_MALFORMED 0x10 |
| 1482 | #define MID_SHUTDOWN 0x20 | 1491 | #define MID_SHUTDOWN 0x20 |
| 1483 | 1492 | ||
| 1493 | /* Flags */ | ||
| 1494 | #define MID_WAIT_CANCELLED 1 /* Cancelled while waiting for response */ | ||
| 1495 | |||
| 1484 | /* Types of response buffer returned from SendReceive2 */ | 1496 | /* Types of response buffer returned from SendReceive2 */ |
| 1485 | #define CIFS_NO_BUFFER 0 /* Response buffer not returned */ | 1497 | #define CIFS_NO_BUFFER 0 /* Response buffer not returned */ |
| 1486 | #define CIFS_SMALL_BUFFER 1 | 1498 | #define CIFS_SMALL_BUFFER 1 |
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 97e5d236d265..ec5e5e514fdd 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
| @@ -79,7 +79,8 @@ extern void cifs_delete_mid(struct mid_q_entry *mid); | |||
| 79 | extern void cifs_wake_up_task(struct mid_q_entry *mid); | 79 | extern void cifs_wake_up_task(struct mid_q_entry *mid); |
| 80 | extern int cifs_handle_standard(struct TCP_Server_Info *server, | 80 | extern int cifs_handle_standard(struct TCP_Server_Info *server, |
| 81 | struct mid_q_entry *mid); | 81 | struct mid_q_entry *mid); |
| 82 | extern int cifs_discard_remaining_data(struct TCP_Server_Info *server); | 82 | extern int cifs_discard_remaining_data(struct TCP_Server_Info *server, |
| 83 | char *buf); | ||
| 83 | extern int cifs_call_async(struct TCP_Server_Info *server, | 84 | extern int cifs_call_async(struct TCP_Server_Info *server, |
| 84 | struct smb_rqst *rqst, | 85 | struct smb_rqst *rqst, |
| 85 | mid_receive_t *receive, mid_callback_t *callback, | 86 | mid_receive_t *receive, mid_callback_t *callback, |
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 066950671929..967b92631807 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
| @@ -1400,9 +1400,9 @@ openRetry: | |||
| 1400 | * current bigbuf. | 1400 | * current bigbuf. |
| 1401 | */ | 1401 | */ |
| 1402 | int | 1402 | int |
| 1403 | cifs_discard_remaining_data(struct TCP_Server_Info *server) | 1403 | cifs_discard_remaining_data(struct TCP_Server_Info *server, char *buf) |
| 1404 | { | 1404 | { |
| 1405 | unsigned int rfclen = get_rfc1002_length(server->smallbuf); | 1405 | unsigned int rfclen = get_rfc1002_length(buf); |
| 1406 | int remaining = rfclen + 4 - server->total_read; | 1406 | int remaining = rfclen + 4 - server->total_read; |
| 1407 | 1407 | ||
| 1408 | while (remaining > 0) { | 1408 | while (remaining > 0) { |
| @@ -1426,7 +1426,7 @@ cifs_readv_discard(struct TCP_Server_Info *server, struct mid_q_entry *mid) | |||
| 1426 | int length; | 1426 | int length; |
| 1427 | struct cifs_readdata *rdata = mid->callback_data; | 1427 | struct cifs_readdata *rdata = mid->callback_data; |
| 1428 | 1428 | ||
| 1429 | length = cifs_discard_remaining_data(server); | 1429 | length = cifs_discard_remaining_data(server, mid->resp_buf); |
| 1430 | dequeue_mid(mid, rdata->result); | 1430 | dequeue_mid(mid, rdata->result); |
| 1431 | return length; | 1431 | return length; |
| 1432 | } | 1432 | } |
| @@ -1459,7 +1459,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) | |||
| 1459 | 1459 | ||
| 1460 | if (server->ops->is_status_pending && | 1460 | if (server->ops->is_status_pending && |
| 1461 | server->ops->is_status_pending(buf, server, 0)) { | 1461 | server->ops->is_status_pending(buf, server, 0)) { |
| 1462 | cifs_discard_remaining_data(server); | 1462 | cifs_discard_remaining_data(server, buf); |
| 1463 | return -1; | 1463 | return -1; |
| 1464 | } | 1464 | } |
| 1465 | 1465 | ||
| @@ -1519,6 +1519,9 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) | |||
| 1519 | cifs_dbg(FYI, "0: iov_base=%p iov_len=%u\n", | 1519 | cifs_dbg(FYI, "0: iov_base=%p iov_len=%u\n", |
| 1520 | rdata->iov[0].iov_base, server->total_read); | 1520 | rdata->iov[0].iov_base, server->total_read); |
| 1521 | 1521 | ||
| 1522 | mid->resp_buf = server->smallbuf; | ||
| 1523 | server->smallbuf = NULL; | ||
| 1524 | |||
| 1522 | /* how much data is in the response? */ | 1525 | /* how much data is in the response? */ |
| 1523 | data_len = server->ops->read_data_length(buf); | 1526 | data_len = server->ops->read_data_length(buf); |
| 1524 | if (data_offset + data_len > buflen) { | 1527 | if (data_offset + data_len > buflen) { |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 9ae695ae3ed7..0c7596cef4b8 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -904,10 +904,19 @@ cifs_demultiplex_thread(void *p) | |||
| 904 | 904 | ||
| 905 | server->lstrp = jiffies; | 905 | server->lstrp = jiffies; |
| 906 | if (mid_entry != NULL) { | 906 | if (mid_entry != NULL) { |
| 907 | if ((mid_entry->mid_flags & MID_WAIT_CANCELLED) && | ||
| 908 | mid_entry->mid_state == MID_RESPONSE_RECEIVED && | ||
| 909 | server->ops->handle_cancelled_mid) | ||
| 910 | server->ops->handle_cancelled_mid( | ||
| 911 | mid_entry->resp_buf, | ||
| 912 | server); | ||
| 913 | |||
| 907 | if (!mid_entry->multiRsp || mid_entry->multiEnd) | 914 | if (!mid_entry->multiRsp || mid_entry->multiEnd) |
| 908 | mid_entry->callback(mid_entry); | 915 | mid_entry->callback(mid_entry); |
| 909 | } else if (!server->ops->is_oplock_break || | 916 | } else if (server->ops->is_oplock_break && |
| 910 | !server->ops->is_oplock_break(buf, server)) { | 917 | server->ops->is_oplock_break(buf, server)) { |
| 918 | cifs_dbg(FYI, "Received oplock break\n"); | ||
| 919 | } else { | ||
| 911 | cifs_dbg(VFS, "No task to wake, unknown frame received! NumMids %d\n", | 920 | cifs_dbg(VFS, "No task to wake, unknown frame received! NumMids %d\n", |
| 912 | atomic_read(&midCount)); | 921 | atomic_read(&midCount)); |
| 913 | cifs_dump_mem("Received Data is: ", buf, | 922 | cifs_dump_mem("Received Data is: ", buf, |
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index 001528781b6b..265c45fe4ea5 100644 --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c | |||
| @@ -34,71 +34,14 @@ | |||
| 34 | #include "cifs_ioctl.h" | 34 | #include "cifs_ioctl.h" |
| 35 | #include <linux/btrfs.h> | 35 | #include <linux/btrfs.h> |
| 36 | 36 | ||
| 37 | static int cifs_file_clone_range(unsigned int xid, struct file *src_file, | 37 | static long cifs_ioctl_copychunk(unsigned int xid, struct file *dst_file, |
| 38 | struct file *dst_file) | ||
| 39 | { | ||
| 40 | struct inode *src_inode = file_inode(src_file); | ||
| 41 | struct inode *target_inode = file_inode(dst_file); | ||
| 42 | struct cifsFileInfo *smb_file_src; | ||
| 43 | struct cifsFileInfo *smb_file_target; | ||
| 44 | struct cifs_tcon *src_tcon; | ||
| 45 | struct cifs_tcon *target_tcon; | ||
| 46 | int rc; | ||
| 47 | |||
| 48 | cifs_dbg(FYI, "ioctl clone range\n"); | ||
| 49 | |||
| 50 | if (!src_file->private_data || !dst_file->private_data) { | ||
| 51 | rc = -EBADF; | ||
| 52 | cifs_dbg(VFS, "missing cifsFileInfo on copy range src file\n"); | ||
| 53 | goto out; | ||
| 54 | } | ||
| 55 | |||
| 56 | rc = -EXDEV; | ||
| 57 | smb_file_target = dst_file->private_data; | ||
| 58 | smb_file_src = src_file->private_data; | ||
| 59 | src_tcon = tlink_tcon(smb_file_src->tlink); | ||
| 60 | target_tcon = tlink_tcon(smb_file_target->tlink); | ||
| 61 | |||
| 62 | if (src_tcon->ses != target_tcon->ses) { | ||
| 63 | cifs_dbg(VFS, "source and target of copy not on same server\n"); | ||
| 64 | goto out; | ||
| 65 | } | ||
| 66 | |||
| 67 | /* | ||
| 68 | * Note: cifs case is easier than btrfs since server responsible for | ||
| 69 | * checks for proper open modes and file type and if it wants | ||
| 70 | * server could even support copy of range where source = target | ||
| 71 | */ | ||
| 72 | lock_two_nondirectories(target_inode, src_inode); | ||
| 73 | |||
| 74 | cifs_dbg(FYI, "about to flush pages\n"); | ||
| 75 | /* should we flush first and last page first */ | ||
| 76 | truncate_inode_pages(&target_inode->i_data, 0); | ||
| 77 | |||
| 78 | if (target_tcon->ses->server->ops->clone_range) | ||
| 79 | rc = target_tcon->ses->server->ops->clone_range(xid, | ||
| 80 | smb_file_src, smb_file_target, 0, src_inode->i_size, 0); | ||
| 81 | else | ||
| 82 | rc = -EOPNOTSUPP; | ||
| 83 | |||
| 84 | /* force revalidate of size and timestamps of target file now | ||
| 85 | that target is updated on the server */ | ||
| 86 | CIFS_I(target_inode)->time = 0; | ||
| 87 | /* although unlocking in the reverse order from locking is not | ||
| 88 | strictly necessary here it is a little cleaner to be consistent */ | ||
| 89 | unlock_two_nondirectories(src_inode, target_inode); | ||
| 90 | out: | ||
| 91 | return rc; | ||
| 92 | } | ||
| 93 | |||
| 94 | static long cifs_ioctl_clone(unsigned int xid, struct file *dst_file, | ||
| 95 | unsigned long srcfd) | 38 | unsigned long srcfd) |
| 96 | { | 39 | { |
| 97 | int rc; | 40 | int rc; |
| 98 | struct fd src_file; | 41 | struct fd src_file; |
| 99 | struct inode *src_inode; | 42 | struct inode *src_inode; |
| 100 | 43 | ||
| 101 | cifs_dbg(FYI, "ioctl clone range\n"); | 44 | cifs_dbg(FYI, "ioctl copychunk range\n"); |
| 102 | /* the destination must be opened for writing */ | 45 | /* the destination must be opened for writing */ |
| 103 | if (!(dst_file->f_mode & FMODE_WRITE)) { | 46 | if (!(dst_file->f_mode & FMODE_WRITE)) { |
| 104 | cifs_dbg(FYI, "file target not open for write\n"); | 47 | cifs_dbg(FYI, "file target not open for write\n"); |
| @@ -129,7 +72,8 @@ static long cifs_ioctl_clone(unsigned int xid, struct file *dst_file, | |||
| 129 | if (S_ISDIR(src_inode->i_mode)) | 72 | if (S_ISDIR(src_inode->i_mode)) |
| 130 | goto out_fput; | 73 | goto out_fput; |
| 131 | 74 | ||
| 132 | rc = cifs_file_clone_range(xid, src_file.file, dst_file); | 75 | rc = cifs_file_copychunk_range(xid, src_file.file, 0, dst_file, 0, |
| 76 | src_inode->i_size, 0); | ||
| 133 | 77 | ||
| 134 | out_fput: | 78 | out_fput: |
| 135 | fdput(src_file); | 79 | fdput(src_file); |
| @@ -251,7 +195,7 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) | |||
| 251 | } | 195 | } |
| 252 | break; | 196 | break; |
| 253 | case CIFS_IOC_COPYCHUNK_FILE: | 197 | case CIFS_IOC_COPYCHUNK_FILE: |
| 254 | rc = cifs_ioctl_clone(xid, filep, arg); | 198 | rc = cifs_ioctl_copychunk(xid, filep, arg); |
| 255 | break; | 199 | break; |
| 256 | case CIFS_IOC_SET_INTEGRITY: | 200 | case CIFS_IOC_SET_INTEGRITY: |
| 257 | if (pSMBFile == NULL) | 201 | if (pSMBFile == NULL) |
diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c index fd516ea8b8f8..1a04b3a5beb1 100644 --- a/fs/cifs/smb2misc.c +++ b/fs/cifs/smb2misc.c | |||
| @@ -659,3 +659,49 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server) | |||
| 659 | cifs_dbg(FYI, "Can not process oplock break for non-existent connection\n"); | 659 | cifs_dbg(FYI, "Can not process oplock break for non-existent connection\n"); |
| 660 | return false; | 660 | return false; |
| 661 | } | 661 | } |
| 662 | |||
| 663 | void | ||
| 664 | smb2_cancelled_close_fid(struct work_struct *work) | ||
| 665 | { | ||
| 666 | struct close_cancelled_open *cancelled = container_of(work, | ||
| 667 | struct close_cancelled_open, work); | ||
| 668 | |||
| 669 | cifs_dbg(VFS, "Close unmatched open\n"); | ||
| 670 | |||
| 671 | SMB2_close(0, cancelled->tcon, cancelled->fid.persistent_fid, | ||
| 672 | cancelled->fid.volatile_fid); | ||
| 673 | cifs_put_tcon(cancelled->tcon); | ||
| 674 | kfree(cancelled); | ||
| 675 | } | ||
| 676 | |||
| 677 | int | ||
| 678 | smb2_handle_cancelled_mid(char *buffer, struct TCP_Server_Info *server) | ||
| 679 | { | ||
| 680 | struct smb2_sync_hdr *sync_hdr = get_sync_hdr(buffer); | ||
| 681 | struct smb2_create_rsp *rsp = (struct smb2_create_rsp *)buffer; | ||
| 682 | struct cifs_tcon *tcon; | ||
| 683 | struct close_cancelled_open *cancelled; | ||
| 684 | |||
| 685 | if (sync_hdr->Command != SMB2_CREATE || | ||
| 686 | sync_hdr->Status != STATUS_SUCCESS) | ||
| 687 | return 0; | ||
| 688 | |||
| 689 | cancelled = kzalloc(sizeof(*cancelled), GFP_KERNEL); | ||
| 690 | if (!cancelled) | ||
| 691 | return -ENOMEM; | ||
| 692 | |||
| 693 | tcon = smb2_find_smb_tcon(server, sync_hdr->SessionId, | ||
| 694 | sync_hdr->TreeId); | ||
| 695 | if (!tcon) { | ||
| 696 | kfree(cancelled); | ||
| 697 | return -ENOENT; | ||
| 698 | } | ||
| 699 | |||
| 700 | cancelled->fid.persistent_fid = rsp->PersistentFileId; | ||
| 701 | cancelled->fid.volatile_fid = rsp->VolatileFileId; | ||
| 702 | cancelled->tcon = tcon; | ||
| 703 | INIT_WORK(&cancelled->work, smb2_cancelled_close_fid); | ||
| 704 | queue_work(cifsiod_wq, &cancelled->work); | ||
| 705 | |||
| 706 | return 0; | ||
| 707 | } | ||
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 0231108d9387..7b12a727947e 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/vfs.h> | 21 | #include <linux/vfs.h> |
| 22 | #include <linux/falloc.h> | 22 | #include <linux/falloc.h> |
| 23 | #include <linux/scatterlist.h> | 23 | #include <linux/scatterlist.h> |
| 24 | #include <linux/uuid.h> | ||
| 24 | #include <crypto/aead.h> | 25 | #include <crypto/aead.h> |
| 25 | #include "cifsglob.h" | 26 | #include "cifsglob.h" |
| 26 | #include "smb2pdu.h" | 27 | #include "smb2pdu.h" |
| @@ -592,8 +593,8 @@ req_res_key_exit: | |||
| 592 | return rc; | 593 | return rc; |
| 593 | } | 594 | } |
| 594 | 595 | ||
| 595 | static int | 596 | static ssize_t |
| 596 | smb2_clone_range(const unsigned int xid, | 597 | smb2_copychunk_range(const unsigned int xid, |
| 597 | struct cifsFileInfo *srcfile, | 598 | struct cifsFileInfo *srcfile, |
| 598 | struct cifsFileInfo *trgtfile, u64 src_off, | 599 | struct cifsFileInfo *trgtfile, u64 src_off, |
| 599 | u64 len, u64 dest_off) | 600 | u64 len, u64 dest_off) |
| @@ -605,13 +606,14 @@ smb2_clone_range(const unsigned int xid, | |||
| 605 | struct cifs_tcon *tcon; | 606 | struct cifs_tcon *tcon; |
| 606 | int chunks_copied = 0; | 607 | int chunks_copied = 0; |
| 607 | bool chunk_sizes_updated = false; | 608 | bool chunk_sizes_updated = false; |
| 609 | ssize_t bytes_written, total_bytes_written = 0; | ||
| 608 | 610 | ||
| 609 | pcchunk = kmalloc(sizeof(struct copychunk_ioctl), GFP_KERNEL); | 611 | pcchunk = kmalloc(sizeof(struct copychunk_ioctl), GFP_KERNEL); |
| 610 | 612 | ||
| 611 | if (pcchunk == NULL) | 613 | if (pcchunk == NULL) |
| 612 | return -ENOMEM; | 614 | return -ENOMEM; |
| 613 | 615 | ||
| 614 | cifs_dbg(FYI, "in smb2_clone_range - about to call request res key\n"); | 616 | cifs_dbg(FYI, "in smb2_copychunk_range - about to call request res key\n"); |
| 615 | /* Request a key from the server to identify the source of the copy */ | 617 | /* Request a key from the server to identify the source of the copy */ |
| 616 | rc = SMB2_request_res_key(xid, tlink_tcon(srcfile->tlink), | 618 | rc = SMB2_request_res_key(xid, tlink_tcon(srcfile->tlink), |
| 617 | srcfile->fid.persistent_fid, | 619 | srcfile->fid.persistent_fid, |
| @@ -669,14 +671,16 @@ smb2_clone_range(const unsigned int xid, | |||
| 669 | } | 671 | } |
| 670 | chunks_copied++; | 672 | chunks_copied++; |
| 671 | 673 | ||
| 672 | src_off += le32_to_cpu(retbuf->TotalBytesWritten); | 674 | bytes_written = le32_to_cpu(retbuf->TotalBytesWritten); |
| 673 | dest_off += le32_to_cpu(retbuf->TotalBytesWritten); | 675 | src_off += bytes_written; |
| 674 | len -= le32_to_cpu(retbuf->TotalBytesWritten); | 676 | dest_off += bytes_written; |
| 677 | len -= bytes_written; | ||
| 678 | total_bytes_written += bytes_written; | ||
| 675 | 679 | ||
| 676 | cifs_dbg(FYI, "Chunks %d PartialChunk %d Total %d\n", | 680 | cifs_dbg(FYI, "Chunks %d PartialChunk %d Total %zu\n", |
| 677 | le32_to_cpu(retbuf->ChunksWritten), | 681 | le32_to_cpu(retbuf->ChunksWritten), |
| 678 | le32_to_cpu(retbuf->ChunkBytesWritten), | 682 | le32_to_cpu(retbuf->ChunkBytesWritten), |
| 679 | le32_to_cpu(retbuf->TotalBytesWritten)); | 683 | bytes_written); |
| 680 | } else if (rc == -EINVAL) { | 684 | } else if (rc == -EINVAL) { |
| 681 | if (ret_data_len != sizeof(struct copychunk_ioctl_rsp)) | 685 | if (ret_data_len != sizeof(struct copychunk_ioctl_rsp)) |
| 682 | goto cchunk_out; | 686 | goto cchunk_out; |
| @@ -713,7 +717,10 @@ smb2_clone_range(const unsigned int xid, | |||
| 713 | cchunk_out: | 717 | cchunk_out: |
| 714 | kfree(pcchunk); | 718 | kfree(pcchunk); |
| 715 | kfree(retbuf); | 719 | kfree(retbuf); |
| 716 | return rc; | 720 | if (rc) |
| 721 | return rc; | ||
| 722 | else | ||
| 723 | return total_bytes_written; | ||
| 717 | } | 724 | } |
| 718 | 725 | ||
| 719 | static int | 726 | static int |
| @@ -2188,7 +2195,7 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid) | |||
| 2188 | if (rc) | 2195 | if (rc) |
| 2189 | goto free_pages; | 2196 | goto free_pages; |
| 2190 | 2197 | ||
| 2191 | rc = cifs_discard_remaining_data(server); | 2198 | rc = cifs_discard_remaining_data(server, buf); |
| 2192 | if (rc) | 2199 | if (rc) |
| 2193 | goto free_pages; | 2200 | goto free_pages; |
| 2194 | 2201 | ||
| @@ -2214,7 +2221,7 @@ free_pages: | |||
| 2214 | kfree(pages); | 2221 | kfree(pages); |
| 2215 | return rc; | 2222 | return rc; |
| 2216 | discard_data: | 2223 | discard_data: |
| 2217 | cifs_discard_remaining_data(server); | 2224 | cifs_discard_remaining_data(server, buf); |
| 2218 | goto free_pages; | 2225 | goto free_pages; |
| 2219 | } | 2226 | } |
| 2220 | 2227 | ||
| @@ -2322,6 +2329,7 @@ struct smb_version_operations smb20_operations = { | |||
| 2322 | .clear_stats = smb2_clear_stats, | 2329 | .clear_stats = smb2_clear_stats, |
| 2323 | .print_stats = smb2_print_stats, | 2330 | .print_stats = smb2_print_stats, |
| 2324 | .is_oplock_break = smb2_is_valid_oplock_break, | 2331 | .is_oplock_break = smb2_is_valid_oplock_break, |
| 2332 | .handle_cancelled_mid = smb2_handle_cancelled_mid, | ||
| 2325 | .downgrade_oplock = smb2_downgrade_oplock, | 2333 | .downgrade_oplock = smb2_downgrade_oplock, |
| 2326 | .need_neg = smb2_need_neg, | 2334 | .need_neg = smb2_need_neg, |
| 2327 | .negotiate = smb2_negotiate, | 2335 | .negotiate = smb2_negotiate, |
| @@ -2377,7 +2385,7 @@ struct smb_version_operations smb20_operations = { | |||
| 2377 | .set_oplock_level = smb2_set_oplock_level, | 2385 | .set_oplock_level = smb2_set_oplock_level, |
| 2378 | .create_lease_buf = smb2_create_lease_buf, | 2386 | .create_lease_buf = smb2_create_lease_buf, |
| 2379 | .parse_lease_buf = smb2_parse_lease_buf, | 2387 | .parse_lease_buf = smb2_parse_lease_buf, |
| 2380 | .clone_range = smb2_clone_range, | 2388 | .copychunk_range = smb2_copychunk_range, |
| 2381 | .wp_retry_size = smb2_wp_retry_size, | 2389 | .wp_retry_size = smb2_wp_retry_size, |
| 2382 | .dir_needs_close = smb2_dir_needs_close, | 2390 | .dir_needs_close = smb2_dir_needs_close, |
| 2383 | .get_dfs_refer = smb2_get_dfs_refer, | 2391 | .get_dfs_refer = smb2_get_dfs_refer, |
| @@ -2404,6 +2412,7 @@ struct smb_version_operations smb21_operations = { | |||
| 2404 | .clear_stats = smb2_clear_stats, | 2412 | .clear_stats = smb2_clear_stats, |
| 2405 | .print_stats = smb2_print_stats, | 2413 | .print_stats = smb2_print_stats, |
| 2406 | .is_oplock_break = smb2_is_valid_oplock_break, | 2414 | .is_oplock_break = smb2_is_valid_oplock_break, |
| 2415 | .handle_cancelled_mid = smb2_handle_cancelled_mid, | ||
| 2407 | .downgrade_oplock = smb2_downgrade_oplock, | 2416 | .downgrade_oplock = smb2_downgrade_oplock, |
| 2408 | .need_neg = smb2_need_neg, | 2417 | .need_neg = smb2_need_neg, |
| 2409 | .negotiate = smb2_negotiate, | 2418 | .negotiate = smb2_negotiate, |
| @@ -2459,7 +2468,7 @@ struct smb_version_operations smb21_operations = { | |||
| 2459 | .set_oplock_level = smb21_set_oplock_level, | 2468 | .set_oplock_level = smb21_set_oplock_level, |
| 2460 | .create_lease_buf = smb2_create_lease_buf, | 2469 | .create_lease_buf = smb2_create_lease_buf, |
| 2461 | .parse_lease_buf = smb2_parse_lease_buf, | 2470 | .parse_lease_buf = smb2_parse_lease_buf, |
| 2462 | .clone_range = smb2_clone_range, | 2471 | .copychunk_range = smb2_copychunk_range, |
| 2463 | .wp_retry_size = smb2_wp_retry_size, | 2472 | .wp_retry_size = smb2_wp_retry_size, |
| 2464 | .dir_needs_close = smb2_dir_needs_close, | 2473 | .dir_needs_close = smb2_dir_needs_close, |
| 2465 | .enum_snapshots = smb3_enum_snapshots, | 2474 | .enum_snapshots = smb3_enum_snapshots, |
| @@ -2488,6 +2497,7 @@ struct smb_version_operations smb30_operations = { | |||
| 2488 | .print_stats = smb2_print_stats, | 2497 | .print_stats = smb2_print_stats, |
| 2489 | .dump_share_caps = smb2_dump_share_caps, | 2498 | .dump_share_caps = smb2_dump_share_caps, |
| 2490 | .is_oplock_break = smb2_is_valid_oplock_break, | 2499 | .is_oplock_break = smb2_is_valid_oplock_break, |
| 2500 | .handle_cancelled_mid = smb2_handle_cancelled_mid, | ||
| 2491 | .downgrade_oplock = smb2_downgrade_oplock, | 2501 | .downgrade_oplock = smb2_downgrade_oplock, |
| 2492 | .need_neg = smb2_need_neg, | 2502 | .need_neg = smb2_need_neg, |
| 2493 | .negotiate = smb2_negotiate, | 2503 | .negotiate = smb2_negotiate, |
| @@ -2545,7 +2555,7 @@ struct smb_version_operations smb30_operations = { | |||
| 2545 | .set_oplock_level = smb3_set_oplock_level, | 2555 | .set_oplock_level = smb3_set_oplock_level, |
| 2546 | .create_lease_buf = smb3_create_lease_buf, | 2556 | .create_lease_buf = smb3_create_lease_buf, |
| 2547 | .parse_lease_buf = smb3_parse_lease_buf, | 2557 | .parse_lease_buf = smb3_parse_lease_buf, |
| 2548 | .clone_range = smb2_clone_range, | 2558 | .copychunk_range = smb2_copychunk_range, |
| 2549 | .duplicate_extents = smb2_duplicate_extents, | 2559 | .duplicate_extents = smb2_duplicate_extents, |
| 2550 | .validate_negotiate = smb3_validate_negotiate, | 2560 | .validate_negotiate = smb3_validate_negotiate, |
| 2551 | .wp_retry_size = smb2_wp_retry_size, | 2561 | .wp_retry_size = smb2_wp_retry_size, |
| @@ -2582,6 +2592,7 @@ struct smb_version_operations smb311_operations = { | |||
| 2582 | .print_stats = smb2_print_stats, | 2592 | .print_stats = smb2_print_stats, |
| 2583 | .dump_share_caps = smb2_dump_share_caps, | 2593 | .dump_share_caps = smb2_dump_share_caps, |
| 2584 | .is_oplock_break = smb2_is_valid_oplock_break, | 2594 | .is_oplock_break = smb2_is_valid_oplock_break, |
| 2595 | .handle_cancelled_mid = smb2_handle_cancelled_mid, | ||
| 2585 | .downgrade_oplock = smb2_downgrade_oplock, | 2596 | .downgrade_oplock = smb2_downgrade_oplock, |
| 2586 | .need_neg = smb2_need_neg, | 2597 | .need_neg = smb2_need_neg, |
| 2587 | .negotiate = smb2_negotiate, | 2598 | .negotiate = smb2_negotiate, |
| @@ -2639,7 +2650,7 @@ struct smb_version_operations smb311_operations = { | |||
| 2639 | .set_oplock_level = smb3_set_oplock_level, | 2650 | .set_oplock_level = smb3_set_oplock_level, |
| 2640 | .create_lease_buf = smb3_create_lease_buf, | 2651 | .create_lease_buf = smb3_create_lease_buf, |
| 2641 | .parse_lease_buf = smb3_parse_lease_buf, | 2652 | .parse_lease_buf = smb3_parse_lease_buf, |
| 2642 | .clone_range = smb2_clone_range, | 2653 | .copychunk_range = smb2_copychunk_range, |
| 2643 | .duplicate_extents = smb2_duplicate_extents, | 2654 | .duplicate_extents = smb2_duplicate_extents, |
| 2644 | /* .validate_negotiate = smb3_validate_negotiate, */ /* not used in 3.11 */ | 2655 | /* .validate_negotiate = smb3_validate_negotiate, */ /* not used in 3.11 */ |
| 2645 | .wp_retry_size = smb2_wp_retry_size, | 2656 | .wp_retry_size = smb2_wp_retry_size, |
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 7446496850a3..66fa1b941cdf 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c | |||
| @@ -1185,6 +1185,10 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, | |||
| 1185 | return -EINVAL; | 1185 | return -EINVAL; |
| 1186 | } | 1186 | } |
| 1187 | 1187 | ||
| 1188 | /* SMB2 TREE_CONNECT request must be called with TreeId == 0 */ | ||
| 1189 | if (tcon) | ||
| 1190 | tcon->tid = 0; | ||
| 1191 | |||
| 1188 | rc = small_smb2_init(SMB2_TREE_CONNECT, tcon, (void **) &req); | 1192 | rc = small_smb2_init(SMB2_TREE_CONNECT, tcon, (void **) &req); |
| 1189 | if (rc) { | 1193 | if (rc) { |
| 1190 | kfree(unc_path); | 1194 | kfree(unc_path); |
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h index 69e35873b1de..6853454fc871 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/cifs/smb2proto.h | |||
| @@ -48,6 +48,10 @@ extern struct mid_q_entry *smb2_setup_request(struct cifs_ses *ses, | |||
| 48 | struct smb_rqst *rqst); | 48 | struct smb_rqst *rqst); |
| 49 | extern struct mid_q_entry *smb2_setup_async_request( | 49 | extern struct mid_q_entry *smb2_setup_async_request( |
| 50 | struct TCP_Server_Info *server, struct smb_rqst *rqst); | 50 | struct TCP_Server_Info *server, struct smb_rqst *rqst); |
| 51 | extern struct cifs_ses *smb2_find_smb_ses(struct TCP_Server_Info *server, | ||
| 52 | __u64 ses_id); | ||
| 53 | extern struct cifs_tcon *smb2_find_smb_tcon(struct TCP_Server_Info *server, | ||
| 54 | __u64 ses_id, __u32 tid); | ||
| 51 | extern int smb2_calc_signature(struct smb_rqst *rqst, | 55 | extern int smb2_calc_signature(struct smb_rqst *rqst, |
| 52 | struct TCP_Server_Info *server); | 56 | struct TCP_Server_Info *server); |
| 53 | extern int smb3_calc_signature(struct smb_rqst *rqst, | 57 | extern int smb3_calc_signature(struct smb_rqst *rqst, |
| @@ -164,6 +168,9 @@ extern int SMB2_set_compression(const unsigned int xid, struct cifs_tcon *tcon, | |||
| 164 | extern int SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon, | 168 | extern int SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon, |
| 165 | const u64 persistent_fid, const u64 volatile_fid, | 169 | const u64 persistent_fid, const u64 volatile_fid, |
| 166 | const __u8 oplock_level); | 170 | const __u8 oplock_level); |
| 171 | extern int smb2_handle_cancelled_mid(char *buffer, | ||
| 172 | struct TCP_Server_Info *server); | ||
| 173 | void smb2_cancelled_close_fid(struct work_struct *work); | ||
| 167 | extern int SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon, | 174 | extern int SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon, |
| 168 | u64 persistent_file_id, u64 volatile_file_id, | 175 | u64 persistent_file_id, u64 volatile_file_id, |
| 169 | struct kstatfs *FSData); | 176 | struct kstatfs *FSData); |
diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c index 7c3bb1bd7eed..506b67fc93d9 100644 --- a/fs/cifs/smb2transport.c +++ b/fs/cifs/smb2transport.c | |||
| @@ -115,23 +115,70 @@ smb3_crypto_shash_allocate(struct TCP_Server_Info *server) | |||
| 115 | return 0; | 115 | return 0; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | struct cifs_ses * | 118 | static struct cifs_ses * |
| 119 | smb2_find_smb_ses(struct TCP_Server_Info *server, __u64 ses_id) | 119 | smb2_find_smb_ses_unlocked(struct TCP_Server_Info *server, __u64 ses_id) |
| 120 | { | 120 | { |
| 121 | struct cifs_ses *ses; | 121 | struct cifs_ses *ses; |
| 122 | 122 | ||
| 123 | spin_lock(&cifs_tcp_ses_lock); | ||
| 124 | list_for_each_entry(ses, &server->smb_ses_list, smb_ses_list) { | 123 | list_for_each_entry(ses, &server->smb_ses_list, smb_ses_list) { |
| 125 | if (ses->Suid != ses_id) | 124 | if (ses->Suid != ses_id) |
| 126 | continue; | 125 | continue; |
| 127 | spin_unlock(&cifs_tcp_ses_lock); | ||
| 128 | return ses; | 126 | return ses; |
| 129 | } | 127 | } |
| 128 | |||
| 129 | return NULL; | ||
| 130 | } | ||
| 131 | |||
| 132 | struct cifs_ses * | ||
| 133 | smb2_find_smb_ses(struct TCP_Server_Info *server, __u64 ses_id) | ||
| 134 | { | ||
| 135 | struct cifs_ses *ses; | ||
| 136 | |||
| 137 | spin_lock(&cifs_tcp_ses_lock); | ||
| 138 | ses = smb2_find_smb_ses_unlocked(server, ses_id); | ||
| 130 | spin_unlock(&cifs_tcp_ses_lock); | 139 | spin_unlock(&cifs_tcp_ses_lock); |
| 131 | 140 | ||
| 141 | return ses; | ||
| 142 | } | ||
| 143 | |||
| 144 | static struct cifs_tcon * | ||
| 145 | smb2_find_smb_sess_tcon_unlocked(struct cifs_ses *ses, __u32 tid) | ||
| 146 | { | ||
| 147 | struct cifs_tcon *tcon; | ||
| 148 | |||
| 149 | list_for_each_entry(tcon, &ses->tcon_list, tcon_list) { | ||
| 150 | if (tcon->tid != tid) | ||
| 151 | continue; | ||
| 152 | ++tcon->tc_count; | ||
| 153 | return tcon; | ||
| 154 | } | ||
| 155 | |||
| 132 | return NULL; | 156 | return NULL; |
| 133 | } | 157 | } |
| 134 | 158 | ||
| 159 | /* | ||
| 160 | * Obtain tcon corresponding to the tid in the given | ||
| 161 | * cifs_ses | ||
| 162 | */ | ||
| 163 | |||
| 164 | struct cifs_tcon * | ||
| 165 | smb2_find_smb_tcon(struct TCP_Server_Info *server, __u64 ses_id, __u32 tid) | ||
| 166 | { | ||
| 167 | struct cifs_ses *ses; | ||
| 168 | struct cifs_tcon *tcon; | ||
| 169 | |||
| 170 | spin_lock(&cifs_tcp_ses_lock); | ||
| 171 | ses = smb2_find_smb_ses_unlocked(server, ses_id); | ||
| 172 | if (!ses) { | ||
| 173 | spin_unlock(&cifs_tcp_ses_lock); | ||
| 174 | return NULL; | ||
| 175 | } | ||
| 176 | tcon = smb2_find_smb_sess_tcon_unlocked(ses, tid); | ||
| 177 | spin_unlock(&cifs_tcp_ses_lock); | ||
| 178 | |||
| 179 | return tcon; | ||
| 180 | } | ||
| 181 | |||
| 135 | int | 182 | int |
| 136 | smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) | 183 | smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) |
| 137 | { | 184 | { |
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 526f0533cb4e..f6e13a977fc8 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c | |||
| @@ -752,9 +752,11 @@ cifs_send_recv(const unsigned int xid, struct cifs_ses *ses, | |||
| 752 | 752 | ||
| 753 | rc = wait_for_response(ses->server, midQ); | 753 | rc = wait_for_response(ses->server, midQ); |
| 754 | if (rc != 0) { | 754 | if (rc != 0) { |
| 755 | cifs_dbg(FYI, "Cancelling wait for mid %llu\n", midQ->mid); | ||
| 755 | send_cancel(ses->server, rqst, midQ); | 756 | send_cancel(ses->server, rqst, midQ); |
| 756 | spin_lock(&GlobalMid_Lock); | 757 | spin_lock(&GlobalMid_Lock); |
| 757 | if (midQ->mid_state == MID_REQUEST_SUBMITTED) { | 758 | if (midQ->mid_state == MID_REQUEST_SUBMITTED) { |
| 759 | midQ->mid_flags |= MID_WAIT_CANCELLED; | ||
| 758 | midQ->callback = DeleteMidQEntry; | 760 | midQ->callback = DeleteMidQEntry; |
| 759 | spin_unlock(&GlobalMid_Lock); | 761 | spin_unlock(&GlobalMid_Lock); |
| 760 | add_credits(ses->server, 1, optype); | 762 | add_credits(ses->server, 1, optype); |
| @@ -373,6 +373,22 @@ restart: | |||
| 373 | } | 373 | } |
| 374 | spin_lock_irq(&mapping->tree_lock); | 374 | spin_lock_irq(&mapping->tree_lock); |
| 375 | 375 | ||
| 376 | if (!entry) { | ||
| 377 | /* | ||
| 378 | * We needed to drop the page_tree lock while calling | ||
| 379 | * radix_tree_preload() and we didn't have an entry to | ||
| 380 | * lock. See if another thread inserted an entry at | ||
| 381 | * our index during this time. | ||
| 382 | */ | ||
| 383 | entry = __radix_tree_lookup(&mapping->page_tree, index, | ||
| 384 | NULL, &slot); | ||
| 385 | if (entry) { | ||
| 386 | radix_tree_preload_end(); | ||
| 387 | spin_unlock_irq(&mapping->tree_lock); | ||
| 388 | goto restart; | ||
| 389 | } | ||
| 390 | } | ||
| 391 | |||
| 376 | if (pmd_downgrade) { | 392 | if (pmd_downgrade) { |
| 377 | radix_tree_delete(&mapping->page_tree, index); | 393 | radix_tree_delete(&mapping->page_tree, index); |
| 378 | mapping->nrexceptional--; | 394 | mapping->nrexceptional--; |
| @@ -388,19 +404,12 @@ restart: | |||
| 388 | if (err) { | 404 | if (err) { |
| 389 | spin_unlock_irq(&mapping->tree_lock); | 405 | spin_unlock_irq(&mapping->tree_lock); |
| 390 | /* | 406 | /* |
| 391 | * Someone already created the entry? This is a | 407 | * Our insertion of a DAX entry failed, most likely |
| 392 | * normal failure when inserting PMDs in a range | 408 | * because we were inserting a PMD entry and it |
| 393 | * that already contains PTEs. In that case we want | 409 | * collided with a PTE sized entry at a different |
| 394 | * to return -EEXIST immediately. | 410 | * index in the PMD range. We haven't inserted |
| 395 | */ | 411 | * anything into the radix tree and have no waiters to |
| 396 | if (err == -EEXIST && !(size_flag & RADIX_DAX_PMD)) | 412 | * wake. |
| 397 | goto restart; | ||
| 398 | /* | ||
| 399 | * Our insertion of a DAX PMD entry failed, most | ||
| 400 | * likely because it collided with a PTE sized entry | ||
| 401 | * at a different index in the PMD range. We haven't | ||
| 402 | * inserted anything into the radix tree and have no | ||
| 403 | * waiters to wake. | ||
| 404 | */ | 413 | */ |
| 405 | return ERR_PTR(err); | 414 | return ERR_PTR(err); |
| 406 | } | 415 | } |
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index f493af666591..fb69ee2388db 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
| @@ -2466,6 +2466,7 @@ extern int ext4_setattr(struct dentry *, struct iattr *); | |||
| 2466 | extern int ext4_getattr(const struct path *, struct kstat *, u32, unsigned int); | 2466 | extern int ext4_getattr(const struct path *, struct kstat *, u32, unsigned int); |
| 2467 | extern void ext4_evict_inode(struct inode *); | 2467 | extern void ext4_evict_inode(struct inode *); |
| 2468 | extern void ext4_clear_inode(struct inode *); | 2468 | extern void ext4_clear_inode(struct inode *); |
| 2469 | extern int ext4_file_getattr(const struct path *, struct kstat *, u32, unsigned int); | ||
| 2469 | extern int ext4_sync_inode(handle_t *, struct inode *); | 2470 | extern int ext4_sync_inode(handle_t *, struct inode *); |
| 2470 | extern void ext4_dirty_inode(struct inode *, int); | 2471 | extern void ext4_dirty_inode(struct inode *, int); |
| 2471 | extern int ext4_change_inode_journal_flag(struct inode *, int); | 2472 | extern int ext4_change_inode_journal_flag(struct inode *, int); |
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 8210c1f43556..cefa9835f275 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c | |||
| @@ -744,7 +744,7 @@ const struct file_operations ext4_file_operations = { | |||
| 744 | 744 | ||
| 745 | const struct inode_operations ext4_file_inode_operations = { | 745 | const struct inode_operations ext4_file_inode_operations = { |
| 746 | .setattr = ext4_setattr, | 746 | .setattr = ext4_setattr, |
| 747 | .getattr = ext4_getattr, | 747 | .getattr = ext4_file_getattr, |
| 748 | .listxattr = ext4_listxattr, | 748 | .listxattr = ext4_listxattr, |
| 749 | .get_acl = ext4_get_acl, | 749 | .get_acl = ext4_get_acl, |
| 750 | .set_acl = ext4_set_acl, | 750 | .set_acl = ext4_set_acl, |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 4247d8d25687..b9ffa9f4191f 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -5390,11 +5390,46 @@ err_out: | |||
| 5390 | int ext4_getattr(const struct path *path, struct kstat *stat, | 5390 | int ext4_getattr(const struct path *path, struct kstat *stat, |
| 5391 | u32 request_mask, unsigned int query_flags) | 5391 | u32 request_mask, unsigned int query_flags) |
| 5392 | { | 5392 | { |
| 5393 | struct inode *inode; | 5393 | struct inode *inode = d_inode(path->dentry); |
| 5394 | unsigned long long delalloc_blocks; | 5394 | struct ext4_inode *raw_inode; |
| 5395 | struct ext4_inode_info *ei = EXT4_I(inode); | ||
| 5396 | unsigned int flags; | ||
| 5397 | |||
| 5398 | if (EXT4_FITS_IN_INODE(raw_inode, ei, i_crtime)) { | ||
| 5399 | stat->result_mask |= STATX_BTIME; | ||
| 5400 | stat->btime.tv_sec = ei->i_crtime.tv_sec; | ||
| 5401 | stat->btime.tv_nsec = ei->i_crtime.tv_nsec; | ||
| 5402 | } | ||
| 5403 | |||
| 5404 | flags = ei->i_flags & EXT4_FL_USER_VISIBLE; | ||
| 5405 | if (flags & EXT4_APPEND_FL) | ||
| 5406 | stat->attributes |= STATX_ATTR_APPEND; | ||
| 5407 | if (flags & EXT4_COMPR_FL) | ||
| 5408 | stat->attributes |= STATX_ATTR_COMPRESSED; | ||
| 5409 | if (flags & EXT4_ENCRYPT_FL) | ||
| 5410 | stat->attributes |= STATX_ATTR_ENCRYPTED; | ||
| 5411 | if (flags & EXT4_IMMUTABLE_FL) | ||
| 5412 | stat->attributes |= STATX_ATTR_IMMUTABLE; | ||
| 5413 | if (flags & EXT4_NODUMP_FL) | ||
| 5414 | stat->attributes |= STATX_ATTR_NODUMP; | ||
| 5415 | |||
| 5416 | stat->attributes_mask |= (STATX_ATTR_APPEND | | ||
| 5417 | STATX_ATTR_COMPRESSED | | ||
| 5418 | STATX_ATTR_ENCRYPTED | | ||
| 5419 | STATX_ATTR_IMMUTABLE | | ||
| 5420 | STATX_ATTR_NODUMP); | ||
| 5395 | 5421 | ||
| 5396 | inode = d_inode(path->dentry); | ||
| 5397 | generic_fillattr(inode, stat); | 5422 | generic_fillattr(inode, stat); |
| 5423 | return 0; | ||
| 5424 | } | ||
| 5425 | |||
| 5426 | int ext4_file_getattr(const struct path *path, struct kstat *stat, | ||
| 5427 | u32 request_mask, unsigned int query_flags) | ||
| 5428 | { | ||
| 5429 | struct inode *inode = d_inode(path->dentry); | ||
| 5430 | u64 delalloc_blocks; | ||
| 5431 | |||
| 5432 | ext4_getattr(path, stat, request_mask, query_flags); | ||
| 5398 | 5433 | ||
| 5399 | /* | 5434 | /* |
| 5400 | * If there is inline data in the inode, the inode will normally not | 5435 | * If there is inline data in the inode, the inode will normally not |
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 6ad612c576fc..07e5e1405771 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
| @@ -3912,6 +3912,7 @@ const struct inode_operations ext4_dir_inode_operations = { | |||
| 3912 | .tmpfile = ext4_tmpfile, | 3912 | .tmpfile = ext4_tmpfile, |
| 3913 | .rename = ext4_rename2, | 3913 | .rename = ext4_rename2, |
| 3914 | .setattr = ext4_setattr, | 3914 | .setattr = ext4_setattr, |
| 3915 | .getattr = ext4_getattr, | ||
| 3915 | .listxattr = ext4_listxattr, | 3916 | .listxattr = ext4_listxattr, |
| 3916 | .get_acl = ext4_get_acl, | 3917 | .get_acl = ext4_get_acl, |
| 3917 | .set_acl = ext4_set_acl, | 3918 | .set_acl = ext4_set_acl, |
| @@ -3920,6 +3921,7 @@ const struct inode_operations ext4_dir_inode_operations = { | |||
| 3920 | 3921 | ||
| 3921 | const struct inode_operations ext4_special_inode_operations = { | 3922 | const struct inode_operations ext4_special_inode_operations = { |
| 3922 | .setattr = ext4_setattr, | 3923 | .setattr = ext4_setattr, |
| 3924 | .getattr = ext4_getattr, | ||
| 3923 | .listxattr = ext4_listxattr, | 3925 | .listxattr = ext4_listxattr, |
| 3924 | .get_acl = ext4_get_acl, | 3926 | .get_acl = ext4_get_acl, |
| 3925 | .set_acl = ext4_set_acl, | 3927 | .set_acl = ext4_set_acl, |
diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c index 73b184d161fc..5c8fc53cb0e5 100644 --- a/fs/ext4/symlink.c +++ b/fs/ext4/symlink.c | |||
| @@ -85,17 +85,20 @@ errout: | |||
| 85 | const struct inode_operations ext4_encrypted_symlink_inode_operations = { | 85 | const struct inode_operations ext4_encrypted_symlink_inode_operations = { |
| 86 | .get_link = ext4_encrypted_get_link, | 86 | .get_link = ext4_encrypted_get_link, |
| 87 | .setattr = ext4_setattr, | 87 | .setattr = ext4_setattr, |
| 88 | .getattr = ext4_getattr, | ||
| 88 | .listxattr = ext4_listxattr, | 89 | .listxattr = ext4_listxattr, |
| 89 | }; | 90 | }; |
| 90 | 91 | ||
| 91 | const struct inode_operations ext4_symlink_inode_operations = { | 92 | const struct inode_operations ext4_symlink_inode_operations = { |
| 92 | .get_link = page_get_link, | 93 | .get_link = page_get_link, |
| 93 | .setattr = ext4_setattr, | 94 | .setattr = ext4_setattr, |
| 95 | .getattr = ext4_getattr, | ||
| 94 | .listxattr = ext4_listxattr, | 96 | .listxattr = ext4_listxattr, |
| 95 | }; | 97 | }; |
| 96 | 98 | ||
| 97 | const struct inode_operations ext4_fast_symlink_inode_operations = { | 99 | const struct inode_operations ext4_fast_symlink_inode_operations = { |
| 98 | .get_link = simple_get_link, | 100 | .get_link = simple_get_link, |
| 99 | .setattr = ext4_setattr, | 101 | .setattr = ext4_setattr, |
| 102 | .getattr = ext4_getattr, | ||
| 100 | .listxattr = ext4_listxattr, | 103 | .listxattr = ext4_listxattr, |
| 101 | }; | 104 | }; |
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 8f96461236f6..7163fe014b57 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
| @@ -695,14 +695,11 @@ static struct inode *hugetlbfs_get_root(struct super_block *sb, | |||
| 695 | 695 | ||
| 696 | inode = new_inode(sb); | 696 | inode = new_inode(sb); |
| 697 | if (inode) { | 697 | if (inode) { |
| 698 | struct hugetlbfs_inode_info *info; | ||
| 699 | inode->i_ino = get_next_ino(); | 698 | inode->i_ino = get_next_ino(); |
| 700 | inode->i_mode = S_IFDIR | config->mode; | 699 | inode->i_mode = S_IFDIR | config->mode; |
| 701 | inode->i_uid = config->uid; | 700 | inode->i_uid = config->uid; |
| 702 | inode->i_gid = config->gid; | 701 | inode->i_gid = config->gid; |
| 703 | inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); | 702 | inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); |
| 704 | info = HUGETLBFS_I(inode); | ||
| 705 | mpol_shared_policy_init(&info->policy, NULL); | ||
| 706 | inode->i_op = &hugetlbfs_dir_inode_operations; | 703 | inode->i_op = &hugetlbfs_dir_inode_operations; |
| 707 | inode->i_fop = &simple_dir_operations; | 704 | inode->i_fop = &simple_dir_operations; |
| 708 | /* directory inodes start off with i_nlink == 2 (for "." entry) */ | 705 | /* directory inodes start off with i_nlink == 2 (for "." entry) */ |
| @@ -733,7 +730,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, | |||
| 733 | 730 | ||
| 734 | inode = new_inode(sb); | 731 | inode = new_inode(sb); |
| 735 | if (inode) { | 732 | if (inode) { |
| 736 | struct hugetlbfs_inode_info *info; | ||
| 737 | inode->i_ino = get_next_ino(); | 733 | inode->i_ino = get_next_ino(); |
| 738 | inode_init_owner(inode, dir, mode); | 734 | inode_init_owner(inode, dir, mode); |
| 739 | lockdep_set_class(&inode->i_mapping->i_mmap_rwsem, | 735 | lockdep_set_class(&inode->i_mapping->i_mmap_rwsem, |
| @@ -741,15 +737,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, | |||
| 741 | inode->i_mapping->a_ops = &hugetlbfs_aops; | 737 | inode->i_mapping->a_ops = &hugetlbfs_aops; |
| 742 | inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); | 738 | inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); |
| 743 | inode->i_mapping->private_data = resv_map; | 739 | inode->i_mapping->private_data = resv_map; |
| 744 | info = HUGETLBFS_I(inode); | ||
| 745 | /* | ||
| 746 | * The policy is initialized here even if we are creating a | ||
| 747 | * private inode because initialization simply creates an | ||
| 748 | * an empty rb tree and calls rwlock_init(), later when we | ||
| 749 | * call mpol_free_shared_policy() it will just return because | ||
| 750 | * the rb tree will still be empty. | ||
| 751 | */ | ||
| 752 | mpol_shared_policy_init(&info->policy, NULL); | ||
| 753 | switch (mode & S_IFMT) { | 740 | switch (mode & S_IFMT) { |
| 754 | default: | 741 | default: |
| 755 | init_special_inode(inode, mode, dev); | 742 | init_special_inode(inode, mode, dev); |
| @@ -937,6 +924,18 @@ static struct inode *hugetlbfs_alloc_inode(struct super_block *sb) | |||
| 937 | hugetlbfs_inc_free_inodes(sbinfo); | 924 | hugetlbfs_inc_free_inodes(sbinfo); |
| 938 | return NULL; | 925 | return NULL; |
| 939 | } | 926 | } |
| 927 | |||
| 928 | /* | ||
| 929 | * Any time after allocation, hugetlbfs_destroy_inode can be called | ||
| 930 | * for the inode. mpol_free_shared_policy is unconditionally called | ||
| 931 | * as part of hugetlbfs_destroy_inode. So, initialize policy here | ||
| 932 | * in case of a quick call to destroy. | ||
| 933 | * | ||
| 934 | * Note that the policy is initialized even if we are creating a | ||
| 935 | * private inode. This simplifies hugetlbfs_destroy_inode. | ||
| 936 | */ | ||
| 937 | mpol_shared_policy_init(&p->policy, NULL); | ||
| 938 | |||
| 940 | return &p->vfs_inode; | 939 | return &p->vfs_inode; |
| 941 | } | 940 | } |
| 942 | 941 | ||
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index fb499a3f21b5..f92ba8d6c556 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
| @@ -2055,7 +2055,7 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 2055 | { | 2055 | { |
| 2056 | struct inode *old_inode = d_inode(old_dentry); | 2056 | struct inode *old_inode = d_inode(old_dentry); |
| 2057 | struct inode *new_inode = d_inode(new_dentry); | 2057 | struct inode *new_inode = d_inode(new_dentry); |
| 2058 | struct dentry *dentry = NULL, *rehash = NULL; | 2058 | struct dentry *dentry = NULL; |
| 2059 | struct rpc_task *task; | 2059 | struct rpc_task *task; |
| 2060 | int error = -EBUSY; | 2060 | int error = -EBUSY; |
| 2061 | 2061 | ||
| @@ -2078,10 +2078,8 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 2078 | * To prevent any new references to the target during the | 2078 | * To prevent any new references to the target during the |
| 2079 | * rename, we unhash the dentry in advance. | 2079 | * rename, we unhash the dentry in advance. |
| 2080 | */ | 2080 | */ |
| 2081 | if (!d_unhashed(new_dentry)) { | 2081 | if (!d_unhashed(new_dentry)) |
| 2082 | d_drop(new_dentry); | 2082 | d_drop(new_dentry); |
| 2083 | rehash = new_dentry; | ||
| 2084 | } | ||
| 2085 | 2083 | ||
| 2086 | if (d_count(new_dentry) > 2) { | 2084 | if (d_count(new_dentry) > 2) { |
| 2087 | int err; | 2085 | int err; |
| @@ -2098,7 +2096,6 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 2098 | goto out; | 2096 | goto out; |
| 2099 | 2097 | ||
| 2100 | new_dentry = dentry; | 2098 | new_dentry = dentry; |
| 2101 | rehash = NULL; | ||
| 2102 | new_inode = NULL; | 2099 | new_inode = NULL; |
| 2103 | } | 2100 | } |
| 2104 | } | 2101 | } |
| @@ -2119,8 +2116,6 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
| 2119 | error = task->tk_status; | 2116 | error = task->tk_status; |
| 2120 | rpc_put_task(task); | 2117 | rpc_put_task(task); |
| 2121 | out: | 2118 | out: |
| 2122 | if (rehash) | ||
| 2123 | d_rehash(rehash); | ||
| 2124 | trace_nfs_rename_exit(old_dir, old_dentry, | 2119 | trace_nfs_rename_exit(old_dir, old_dentry, |
| 2125 | new_dir, new_dentry, error); | 2120 | new_dir, new_dentry, error); |
| 2126 | /* new dentry created? */ | 2121 | /* new dentry created? */ |
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index 44347f4bdc15..acd30baca461 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c | |||
| @@ -202,10 +202,10 @@ static int filelayout_async_handle_error(struct rpc_task *task, | |||
| 202 | task->tk_status); | 202 | task->tk_status); |
| 203 | nfs4_mark_deviceid_unavailable(devid); | 203 | nfs4_mark_deviceid_unavailable(devid); |
| 204 | pnfs_error_mark_layout_for_return(inode, lseg); | 204 | pnfs_error_mark_layout_for_return(inode, lseg); |
| 205 | pnfs_set_lo_fail(lseg); | ||
| 206 | rpc_wake_up(&tbl->slot_tbl_waitq); | 205 | rpc_wake_up(&tbl->slot_tbl_waitq); |
| 207 | /* fall through */ | 206 | /* fall through */ |
| 208 | default: | 207 | default: |
| 208 | pnfs_set_lo_fail(lseg); | ||
| 209 | reset: | 209 | reset: |
| 210 | dprintk("%s Retry through MDS. Error %d\n", __func__, | 210 | dprintk("%s Retry through MDS. Error %d\n", __func__, |
| 211 | task->tk_status); | 211 | task->tk_status); |
| @@ -560,6 +560,50 @@ filelayout_write_pagelist(struct nfs_pgio_header *hdr, int sync) | |||
| 560 | return PNFS_ATTEMPTED; | 560 | return PNFS_ATTEMPTED; |
| 561 | } | 561 | } |
| 562 | 562 | ||
| 563 | static int | ||
| 564 | filelayout_check_deviceid(struct pnfs_layout_hdr *lo, | ||
| 565 | struct nfs4_filelayout_segment *fl, | ||
| 566 | gfp_t gfp_flags) | ||
| 567 | { | ||
| 568 | struct nfs4_deviceid_node *d; | ||
| 569 | struct nfs4_file_layout_dsaddr *dsaddr; | ||
| 570 | int status = -EINVAL; | ||
| 571 | |||
| 572 | /* find and reference the deviceid */ | ||
| 573 | d = nfs4_find_get_deviceid(NFS_SERVER(lo->plh_inode), &fl->deviceid, | ||
| 574 | lo->plh_lc_cred, gfp_flags); | ||
| 575 | if (d == NULL) | ||
| 576 | goto out; | ||
| 577 | |||
| 578 | dsaddr = container_of(d, struct nfs4_file_layout_dsaddr, id_node); | ||
| 579 | /* Found deviceid is unavailable */ | ||
| 580 | if (filelayout_test_devid_unavailable(&dsaddr->id_node)) | ||
| 581 | goto out_put; | ||
| 582 | |||
| 583 | fl->dsaddr = dsaddr; | ||
| 584 | |||
| 585 | if (fl->first_stripe_index >= dsaddr->stripe_count) { | ||
| 586 | dprintk("%s Bad first_stripe_index %u\n", | ||
| 587 | __func__, fl->first_stripe_index); | ||
| 588 | goto out_put; | ||
| 589 | } | ||
| 590 | |||
| 591 | if ((fl->stripe_type == STRIPE_SPARSE && | ||
| 592 | fl->num_fh > 1 && fl->num_fh != dsaddr->ds_num) || | ||
| 593 | (fl->stripe_type == STRIPE_DENSE && | ||
| 594 | fl->num_fh != dsaddr->stripe_count)) { | ||
| 595 | dprintk("%s num_fh %u not valid for given packing\n", | ||
| 596 | __func__, fl->num_fh); | ||
| 597 | goto out_put; | ||
| 598 | } | ||
| 599 | status = 0; | ||
| 600 | out: | ||
| 601 | return status; | ||
| 602 | out_put: | ||
| 603 | nfs4_fl_put_deviceid(dsaddr); | ||
| 604 | goto out; | ||
| 605 | } | ||
| 606 | |||
| 563 | /* | 607 | /* |
| 564 | * filelayout_check_layout() | 608 | * filelayout_check_layout() |
| 565 | * | 609 | * |
| @@ -572,11 +616,8 @@ static int | |||
| 572 | filelayout_check_layout(struct pnfs_layout_hdr *lo, | 616 | filelayout_check_layout(struct pnfs_layout_hdr *lo, |
| 573 | struct nfs4_filelayout_segment *fl, | 617 | struct nfs4_filelayout_segment *fl, |
| 574 | struct nfs4_layoutget_res *lgr, | 618 | struct nfs4_layoutget_res *lgr, |
| 575 | struct nfs4_deviceid *id, | ||
| 576 | gfp_t gfp_flags) | 619 | gfp_t gfp_flags) |
| 577 | { | 620 | { |
| 578 | struct nfs4_deviceid_node *d; | ||
| 579 | struct nfs4_file_layout_dsaddr *dsaddr; | ||
| 580 | int status = -EINVAL; | 621 | int status = -EINVAL; |
| 581 | 622 | ||
| 582 | dprintk("--> %s\n", __func__); | 623 | dprintk("--> %s\n", __func__); |
| @@ -601,41 +642,10 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo, | |||
| 601 | goto out; | 642 | goto out; |
| 602 | } | 643 | } |
| 603 | 644 | ||
| 604 | /* find and reference the deviceid */ | ||
| 605 | d = nfs4_find_get_deviceid(NFS_SERVER(lo->plh_inode), id, | ||
| 606 | lo->plh_lc_cred, gfp_flags); | ||
| 607 | if (d == NULL) | ||
| 608 | goto out; | ||
| 609 | |||
| 610 | dsaddr = container_of(d, struct nfs4_file_layout_dsaddr, id_node); | ||
| 611 | /* Found deviceid is unavailable */ | ||
| 612 | if (filelayout_test_devid_unavailable(&dsaddr->id_node)) | ||
| 613 | goto out_put; | ||
| 614 | |||
| 615 | fl->dsaddr = dsaddr; | ||
| 616 | |||
| 617 | if (fl->first_stripe_index >= dsaddr->stripe_count) { | ||
| 618 | dprintk("%s Bad first_stripe_index %u\n", | ||
| 619 | __func__, fl->first_stripe_index); | ||
| 620 | goto out_put; | ||
| 621 | } | ||
| 622 | |||
| 623 | if ((fl->stripe_type == STRIPE_SPARSE && | ||
| 624 | fl->num_fh > 1 && fl->num_fh != dsaddr->ds_num) || | ||
| 625 | (fl->stripe_type == STRIPE_DENSE && | ||
| 626 | fl->num_fh != dsaddr->stripe_count)) { | ||
| 627 | dprintk("%s num_fh %u not valid for given packing\n", | ||
| 628 | __func__, fl->num_fh); | ||
| 629 | goto out_put; | ||
| 630 | } | ||
| 631 | |||
| 632 | status = 0; | 645 | status = 0; |
| 633 | out: | 646 | out: |
| 634 | dprintk("--> %s returns %d\n", __func__, status); | 647 | dprintk("--> %s returns %d\n", __func__, status); |
| 635 | return status; | 648 | return status; |
| 636 | out_put: | ||
| 637 | nfs4_fl_put_deviceid(dsaddr); | ||
| 638 | goto out; | ||
| 639 | } | 649 | } |
| 640 | 650 | ||
| 641 | static void _filelayout_free_lseg(struct nfs4_filelayout_segment *fl) | 651 | static void _filelayout_free_lseg(struct nfs4_filelayout_segment *fl) |
| @@ -657,7 +667,6 @@ static int | |||
| 657 | filelayout_decode_layout(struct pnfs_layout_hdr *flo, | 667 | filelayout_decode_layout(struct pnfs_layout_hdr *flo, |
| 658 | struct nfs4_filelayout_segment *fl, | 668 | struct nfs4_filelayout_segment *fl, |
| 659 | struct nfs4_layoutget_res *lgr, | 669 | struct nfs4_layoutget_res *lgr, |
| 660 | struct nfs4_deviceid *id, | ||
| 661 | gfp_t gfp_flags) | 670 | gfp_t gfp_flags) |
| 662 | { | 671 | { |
| 663 | struct xdr_stream stream; | 672 | struct xdr_stream stream; |
| @@ -682,9 +691,9 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, | |||
| 682 | if (unlikely(!p)) | 691 | if (unlikely(!p)) |
| 683 | goto out_err; | 692 | goto out_err; |
| 684 | 693 | ||
| 685 | memcpy(id, p, sizeof(*id)); | 694 | memcpy(&fl->deviceid, p, sizeof(fl->deviceid)); |
| 686 | p += XDR_QUADLEN(NFS4_DEVICEID4_SIZE); | 695 | p += XDR_QUADLEN(NFS4_DEVICEID4_SIZE); |
| 687 | nfs4_print_deviceid(id); | 696 | nfs4_print_deviceid(&fl->deviceid); |
| 688 | 697 | ||
| 689 | nfl_util = be32_to_cpup(p++); | 698 | nfl_util = be32_to_cpup(p++); |
| 690 | if (nfl_util & NFL4_UFLG_COMMIT_THRU_MDS) | 699 | if (nfl_util & NFL4_UFLG_COMMIT_THRU_MDS) |
| @@ -831,15 +840,14 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, | |||
| 831 | { | 840 | { |
| 832 | struct nfs4_filelayout_segment *fl; | 841 | struct nfs4_filelayout_segment *fl; |
| 833 | int rc; | 842 | int rc; |
| 834 | struct nfs4_deviceid id; | ||
| 835 | 843 | ||
| 836 | dprintk("--> %s\n", __func__); | 844 | dprintk("--> %s\n", __func__); |
| 837 | fl = kzalloc(sizeof(*fl), gfp_flags); | 845 | fl = kzalloc(sizeof(*fl), gfp_flags); |
| 838 | if (!fl) | 846 | if (!fl) |
| 839 | return NULL; | 847 | return NULL; |
| 840 | 848 | ||
| 841 | rc = filelayout_decode_layout(layoutid, fl, lgr, &id, gfp_flags); | 849 | rc = filelayout_decode_layout(layoutid, fl, lgr, gfp_flags); |
| 842 | if (rc != 0 || filelayout_check_layout(layoutid, fl, lgr, &id, gfp_flags)) { | 850 | if (rc != 0 || filelayout_check_layout(layoutid, fl, lgr, gfp_flags)) { |
| 843 | _filelayout_free_lseg(fl); | 851 | _filelayout_free_lseg(fl); |
| 844 | return NULL; | 852 | return NULL; |
| 845 | } | 853 | } |
| @@ -888,18 +896,51 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, | |||
| 888 | return min(stripe_unit - (unsigned int)stripe_offset, size); | 896 | return min(stripe_unit - (unsigned int)stripe_offset, size); |
| 889 | } | 897 | } |
| 890 | 898 | ||
| 899 | static struct pnfs_layout_segment * | ||
| 900 | fl_pnfs_update_layout(struct inode *ino, | ||
| 901 | struct nfs_open_context *ctx, | ||
| 902 | loff_t pos, | ||
| 903 | u64 count, | ||
| 904 | enum pnfs_iomode iomode, | ||
| 905 | bool strict_iomode, | ||
| 906 | gfp_t gfp_flags) | ||
| 907 | { | ||
| 908 | struct pnfs_layout_segment *lseg = NULL; | ||
| 909 | struct pnfs_layout_hdr *lo; | ||
| 910 | struct nfs4_filelayout_segment *fl; | ||
| 911 | int status; | ||
| 912 | |||
| 913 | lseg = pnfs_update_layout(ino, ctx, pos, count, iomode, strict_iomode, | ||
| 914 | gfp_flags); | ||
| 915 | if (!lseg) | ||
| 916 | lseg = ERR_PTR(-ENOMEM); | ||
| 917 | if (IS_ERR(lseg)) | ||
| 918 | goto out; | ||
| 919 | |||
| 920 | lo = NFS_I(ino)->layout; | ||
| 921 | fl = FILELAYOUT_LSEG(lseg); | ||
| 922 | |||
| 923 | status = filelayout_check_deviceid(lo, fl, gfp_flags); | ||
| 924 | if (status) | ||
| 925 | lseg = ERR_PTR(status); | ||
| 926 | out: | ||
| 927 | if (IS_ERR(lseg)) | ||
| 928 | pnfs_put_lseg(lseg); | ||
| 929 | return lseg; | ||
| 930 | } | ||
| 931 | |||
| 891 | static void | 932 | static void |
| 892 | filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio, | 933 | filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio, |
| 893 | struct nfs_page *req) | 934 | struct nfs_page *req) |
| 894 | { | 935 | { |
| 895 | if (!pgio->pg_lseg) { | 936 | if (!pgio->pg_lseg) { |
| 896 | pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, | 937 | pgio->pg_lseg = fl_pnfs_update_layout(pgio->pg_inode, |
| 897 | req->wb_context, | 938 | req->wb_context, |
| 898 | 0, | 939 | 0, |
| 899 | NFS4_MAX_UINT64, | 940 | NFS4_MAX_UINT64, |
| 900 | IOMODE_READ, | 941 | IOMODE_READ, |
| 901 | false, | 942 | false, |
| 902 | GFP_KERNEL); | 943 | GFP_KERNEL); |
| 903 | if (IS_ERR(pgio->pg_lseg)) { | 944 | if (IS_ERR(pgio->pg_lseg)) { |
| 904 | pgio->pg_error = PTR_ERR(pgio->pg_lseg); | 945 | pgio->pg_error = PTR_ERR(pgio->pg_lseg); |
| 905 | pgio->pg_lseg = NULL; | 946 | pgio->pg_lseg = NULL; |
| @@ -919,13 +960,13 @@ filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio, | |||
| 919 | int status; | 960 | int status; |
| 920 | 961 | ||
| 921 | if (!pgio->pg_lseg) { | 962 | if (!pgio->pg_lseg) { |
| 922 | pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, | 963 | pgio->pg_lseg = fl_pnfs_update_layout(pgio->pg_inode, |
| 923 | req->wb_context, | 964 | req->wb_context, |
| 924 | 0, | 965 | 0, |
| 925 | NFS4_MAX_UINT64, | 966 | NFS4_MAX_UINT64, |
| 926 | IOMODE_RW, | 967 | IOMODE_RW, |
| 927 | false, | 968 | false, |
| 928 | GFP_NOFS); | 969 | GFP_NOFS); |
| 929 | if (IS_ERR(pgio->pg_lseg)) { | 970 | if (IS_ERR(pgio->pg_lseg)) { |
| 930 | pgio->pg_error = PTR_ERR(pgio->pg_lseg); | 971 | pgio->pg_error = PTR_ERR(pgio->pg_lseg); |
| 931 | pgio->pg_lseg = NULL; | 972 | pgio->pg_lseg = NULL; |
diff --git a/fs/nfs/filelayout/filelayout.h b/fs/nfs/filelayout/filelayout.h index 2896cb833a11..79323b5dab0c 100644 --- a/fs/nfs/filelayout/filelayout.h +++ b/fs/nfs/filelayout/filelayout.h | |||
| @@ -55,15 +55,16 @@ struct nfs4_file_layout_dsaddr { | |||
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | struct nfs4_filelayout_segment { | 57 | struct nfs4_filelayout_segment { |
| 58 | struct pnfs_layout_segment generic_hdr; | 58 | struct pnfs_layout_segment generic_hdr; |
| 59 | u32 stripe_type; | 59 | u32 stripe_type; |
| 60 | u32 commit_through_mds; | 60 | u32 commit_through_mds; |
| 61 | u32 stripe_unit; | 61 | u32 stripe_unit; |
| 62 | u32 first_stripe_index; | 62 | u32 first_stripe_index; |
| 63 | u64 pattern_offset; | 63 | u64 pattern_offset; |
| 64 | struct nfs4_file_layout_dsaddr *dsaddr; /* Point to GETDEVINFO data */ | 64 | struct nfs4_deviceid deviceid; |
| 65 | unsigned int num_fh; | 65 | struct nfs4_file_layout_dsaddr *dsaddr; /* Point to GETDEVINFO data */ |
| 66 | struct nfs_fh **fh_array; | 66 | unsigned int num_fh; |
| 67 | struct nfs_fh **fh_array; | ||
| 67 | }; | 68 | }; |
| 68 | 69 | ||
| 69 | struct nfs4_filelayout { | 70 | struct nfs4_filelayout { |
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index 85fde93dff77..457cfeb1d5c1 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c | |||
| @@ -208,6 +208,10 @@ static bool ff_layout_mirror_valid(struct pnfs_layout_segment *lseg, | |||
| 208 | } else | 208 | } else |
| 209 | goto outerr; | 209 | goto outerr; |
| 210 | } | 210 | } |
| 211 | |||
| 212 | if (IS_ERR(mirror->mirror_ds)) | ||
| 213 | goto outerr; | ||
| 214 | |||
| 211 | if (mirror->mirror_ds->ds == NULL) { | 215 | if (mirror->mirror_ds->ds == NULL) { |
| 212 | struct nfs4_deviceid_node *devid; | 216 | struct nfs4_deviceid_node *devid; |
| 213 | devid = &mirror->mirror_ds->id_node; | 217 | devid = &mirror->mirror_ds->id_node; |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index c780d98035cc..201ca3f2c4ba 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -2442,17 +2442,14 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state) | |||
| 2442 | } | 2442 | } |
| 2443 | 2443 | ||
| 2444 | nfs4_stateid_copy(&stateid, &delegation->stateid); | 2444 | nfs4_stateid_copy(&stateid, &delegation->stateid); |
| 2445 | if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) { | 2445 | if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags) || |
| 2446 | !test_and_clear_bit(NFS_DELEGATION_TEST_EXPIRED, | ||
| 2447 | &delegation->flags)) { | ||
| 2446 | rcu_read_unlock(); | 2448 | rcu_read_unlock(); |
| 2447 | nfs_finish_clear_delegation_stateid(state, &stateid); | 2449 | nfs_finish_clear_delegation_stateid(state, &stateid); |
| 2448 | return; | 2450 | return; |
| 2449 | } | 2451 | } |
| 2450 | 2452 | ||
| 2451 | if (!test_and_clear_bit(NFS_DELEGATION_TEST_EXPIRED, &delegation->flags)) { | ||
| 2452 | rcu_read_unlock(); | ||
| 2453 | return; | ||
| 2454 | } | ||
| 2455 | |||
| 2456 | cred = get_rpccred(delegation->cred); | 2453 | cred = get_rpccred(delegation->cred); |
| 2457 | rcu_read_unlock(); | 2454 | rcu_read_unlock(); |
| 2458 | status = nfs41_test_and_free_expired_stateid(server, &stateid, cred); | 2455 | status = nfs41_test_and_free_expired_stateid(server, &stateid, cred); |
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 73e75ac90525..8bf8f667a8cf 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c | |||
| @@ -538,13 +538,21 @@ out_free: | |||
| 538 | 538 | ||
| 539 | static ssize_t | 539 | static ssize_t |
| 540 | nfsd_print_version_support(char *buf, int remaining, const char *sep, | 540 | nfsd_print_version_support(char *buf, int remaining, const char *sep, |
| 541 | unsigned vers, unsigned minor) | 541 | unsigned vers, int minor) |
| 542 | { | 542 | { |
| 543 | const char *format = (minor == 0) ? "%s%c%u" : "%s%c%u.%u"; | 543 | const char *format = minor < 0 ? "%s%c%u" : "%s%c%u.%u"; |
| 544 | bool supported = !!nfsd_vers(vers, NFSD_TEST); | 544 | bool supported = !!nfsd_vers(vers, NFSD_TEST); |
| 545 | 545 | ||
| 546 | if (vers == 4 && !nfsd_minorversion(minor, NFSD_TEST)) | 546 | if (vers == 4 && minor >= 0 && |
| 547 | !nfsd_minorversion(minor, NFSD_TEST)) | ||
| 547 | supported = false; | 548 | supported = false; |
| 549 | if (minor == 0 && supported) | ||
| 550 | /* | ||
| 551 | * special case for backward compatability. | ||
| 552 | * +4.0 is never reported, it is implied by | ||
| 553 | * +4, unless -4.0 is present. | ||
| 554 | */ | ||
| 555 | return 0; | ||
| 548 | return snprintf(buf, remaining, format, sep, | 556 | return snprintf(buf, remaining, format, sep, |
| 549 | supported ? '+' : '-', vers, minor); | 557 | supported ? '+' : '-', vers, minor); |
| 550 | } | 558 | } |
| @@ -554,7 +562,6 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) | |||
| 554 | char *mesg = buf; | 562 | char *mesg = buf; |
| 555 | char *vers, *minorp, sign; | 563 | char *vers, *minorp, sign; |
| 556 | int len, num, remaining; | 564 | int len, num, remaining; |
| 557 | unsigned minor; | ||
| 558 | ssize_t tlen = 0; | 565 | ssize_t tlen = 0; |
| 559 | char *sep; | 566 | char *sep; |
| 560 | struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id); | 567 | struct nfsd_net *nn = net_generic(netns(file), nfsd_net_id); |
| @@ -575,6 +582,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) | |||
| 575 | if (len <= 0) return -EINVAL; | 582 | if (len <= 0) return -EINVAL; |
| 576 | do { | 583 | do { |
| 577 | enum vers_op cmd; | 584 | enum vers_op cmd; |
| 585 | unsigned minor; | ||
| 578 | sign = *vers; | 586 | sign = *vers; |
| 579 | if (sign == '+' || sign == '-') | 587 | if (sign == '+' || sign == '-') |
| 580 | num = simple_strtol((vers+1), &minorp, 0); | 588 | num = simple_strtol((vers+1), &minorp, 0); |
| @@ -585,8 +593,8 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) | |||
| 585 | return -EINVAL; | 593 | return -EINVAL; |
| 586 | if (kstrtouint(minorp+1, 0, &minor) < 0) | 594 | if (kstrtouint(minorp+1, 0, &minor) < 0) |
| 587 | return -EINVAL; | 595 | return -EINVAL; |
| 588 | } else | 596 | } |
| 589 | minor = 0; | 597 | |
| 590 | cmd = sign == '-' ? NFSD_CLEAR : NFSD_SET; | 598 | cmd = sign == '-' ? NFSD_CLEAR : NFSD_SET; |
| 591 | switch(num) { | 599 | switch(num) { |
| 592 | case 2: | 600 | case 2: |
| @@ -594,8 +602,20 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) | |||
| 594 | nfsd_vers(num, cmd); | 602 | nfsd_vers(num, cmd); |
| 595 | break; | 603 | break; |
| 596 | case 4: | 604 | case 4: |
| 597 | if (nfsd_minorversion(minor, cmd) >= 0) | 605 | if (*minorp == '.') { |
| 598 | break; | 606 | if (nfsd_minorversion(minor, cmd) < 0) |
| 607 | return -EINVAL; | ||
| 608 | } else if ((cmd == NFSD_SET) != nfsd_vers(num, NFSD_TEST)) { | ||
| 609 | /* | ||
| 610 | * Either we have +4 and no minors are enabled, | ||
| 611 | * or we have -4 and at least one minor is enabled. | ||
| 612 | * In either case, propagate 'cmd' to all minors. | ||
| 613 | */ | ||
| 614 | minor = 0; | ||
| 615 | while (nfsd_minorversion(minor, cmd) >= 0) | ||
| 616 | minor++; | ||
| 617 | } | ||
| 618 | break; | ||
| 599 | default: | 619 | default: |
| 600 | return -EINVAL; | 620 | return -EINVAL; |
| 601 | } | 621 | } |
| @@ -612,9 +632,11 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) | |||
| 612 | sep = ""; | 632 | sep = ""; |
| 613 | remaining = SIMPLE_TRANSACTION_LIMIT; | 633 | remaining = SIMPLE_TRANSACTION_LIMIT; |
| 614 | for (num=2 ; num <= 4 ; num++) { | 634 | for (num=2 ; num <= 4 ; num++) { |
| 635 | int minor; | ||
| 615 | if (!nfsd_vers(num, NFSD_AVAIL)) | 636 | if (!nfsd_vers(num, NFSD_AVAIL)) |
| 616 | continue; | 637 | continue; |
| 617 | minor = 0; | 638 | |
| 639 | minor = -1; | ||
| 618 | do { | 640 | do { |
| 619 | len = nfsd_print_version_support(buf, remaining, | 641 | len = nfsd_print_version_support(buf, remaining, |
| 620 | sep, num, minor); | 642 | sep, num, minor); |
| @@ -624,7 +646,8 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) | |||
| 624 | buf += len; | 646 | buf += len; |
| 625 | tlen += len; | 647 | tlen += len; |
| 626 | minor++; | 648 | minor++; |
| 627 | sep = " "; | 649 | if (len) |
| 650 | sep = " "; | ||
| 628 | } while (num == 4 && minor <= NFSD_SUPPORTED_MINOR_VERSION); | 651 | } while (num == 4 && minor <= NFSD_SUPPORTED_MINOR_VERSION); |
| 629 | } | 652 | } |
| 630 | out: | 653 | out: |
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index fa82b7707e85..03a7e9da4da0 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c | |||
| @@ -786,6 +786,7 @@ nfserrno (int errno) | |||
| 786 | { nfserr_serverfault, -ESERVERFAULT }, | 786 | { nfserr_serverfault, -ESERVERFAULT }, |
| 787 | { nfserr_serverfault, -ENFILE }, | 787 | { nfserr_serverfault, -ENFILE }, |
| 788 | { nfserr_io, -EUCLEAN }, | 788 | { nfserr_io, -EUCLEAN }, |
| 789 | { nfserr_perm, -ENOKEY }, | ||
| 789 | }; | 790 | }; |
| 790 | int i; | 791 | int i; |
| 791 | 792 | ||
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 786a4a2cb2d7..31e1f9593457 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
| @@ -167,7 +167,8 @@ nfsd_adjust_nfsd_versions4(void) | |||
| 167 | 167 | ||
| 168 | int nfsd_minorversion(u32 minorversion, enum vers_op change) | 168 | int nfsd_minorversion(u32 minorversion, enum vers_op change) |
| 169 | { | 169 | { |
| 170 | if (minorversion > NFSD_SUPPORTED_MINOR_VERSION) | 170 | if (minorversion > NFSD_SUPPORTED_MINOR_VERSION && |
| 171 | change != NFSD_AVAIL) | ||
| 171 | return -1; | 172 | return -1; |
| 172 | switch(change) { | 173 | switch(change) { |
| 173 | case NFSD_SET: | 174 | case NFSD_SET: |
| @@ -415,23 +416,20 @@ static void nfsd_last_thread(struct svc_serv *serv, struct net *net) | |||
| 415 | 416 | ||
| 416 | void nfsd_reset_versions(void) | 417 | void nfsd_reset_versions(void) |
| 417 | { | 418 | { |
| 418 | int found_one = 0; | ||
| 419 | int i; | 419 | int i; |
| 420 | 420 | ||
| 421 | for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++) { | 421 | for (i = 0; i < NFSD_NRVERS; i++) |
| 422 | if (nfsd_program.pg_vers[i]) | 422 | if (nfsd_vers(i, NFSD_TEST)) |
| 423 | found_one = 1; | 423 | return; |
| 424 | } | ||
| 425 | 424 | ||
| 426 | if (!found_one) { | 425 | for (i = 0; i < NFSD_NRVERS; i++) |
| 427 | for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++) | 426 | if (i != 4) |
| 428 | nfsd_program.pg_vers[i] = nfsd_version[i]; | 427 | nfsd_vers(i, NFSD_SET); |
| 429 | #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) | 428 | else { |
| 430 | for (i = NFSD_ACL_MINVERS; i < NFSD_ACL_NRVERS; i++) | 429 | int minor = 0; |
| 431 | nfsd_acl_program.pg_vers[i] = | 430 | while (nfsd_minorversion(minor, NFSD_SET) >= 0) |
| 432 | nfsd_acl_version[i]; | 431 | minor++; |
| 433 | #endif | 432 | } |
| 434 | } | ||
| 435 | } | 433 | } |
| 436 | 434 | ||
| 437 | /* | 435 | /* |
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index 67c24351a67f..cd261c8de53a 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c | |||
| @@ -263,8 +263,13 @@ int orangefs_remount(struct orangefs_sb_info_s *orangefs_sb) | |||
| 263 | if (!new_op) | 263 | if (!new_op) |
| 264 | return -ENOMEM; | 264 | return -ENOMEM; |
| 265 | new_op->upcall.req.features.features = 0; | 265 | new_op->upcall.req.features.features = 0; |
| 266 | ret = service_operation(new_op, "orangefs_features", 0); | 266 | ret = service_operation(new_op, "orangefs_features", |
| 267 | orangefs_features = new_op->downcall.resp.features.features; | 267 | ORANGEFS_OP_PRIORITY | ORANGEFS_OP_NO_MUTEX); |
| 268 | if (!ret) | ||
| 269 | orangefs_features = | ||
| 270 | new_op->downcall.resp.features.features; | ||
| 271 | else | ||
| 272 | orangefs_features = 0; | ||
| 268 | op_release(new_op); | 273 | op_release(new_op); |
| 269 | } else { | 274 | } else { |
| 270 | orangefs_features = 0; | 275 | orangefs_features = 0; |
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 8f91ec66baa3..d04ea4349909 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c | |||
| @@ -1074,6 +1074,7 @@ static int sysctl_check_table(const char *path, struct ctl_table *table) | |||
| 1074 | 1074 | ||
| 1075 | if ((table->proc_handler == proc_dostring) || | 1075 | if ((table->proc_handler == proc_dostring) || |
| 1076 | (table->proc_handler == proc_dointvec) || | 1076 | (table->proc_handler == proc_dointvec) || |
| 1077 | (table->proc_handler == proc_douintvec) || | ||
| 1077 | (table->proc_handler == proc_dointvec_minmax) || | 1078 | (table->proc_handler == proc_dointvec_minmax) || |
| 1078 | (table->proc_handler == proc_dointvec_jiffies) || | 1079 | (table->proc_handler == proc_dointvec_jiffies) || |
| 1079 | (table->proc_handler == proc_dointvec_userhz_jiffies) || | 1080 | (table->proc_handler == proc_dointvec_userhz_jiffies) || |
| @@ -130,9 +130,13 @@ EXPORT_SYMBOL(vfs_getattr); | |||
| 130 | int vfs_statx_fd(unsigned int fd, struct kstat *stat, | 130 | int vfs_statx_fd(unsigned int fd, struct kstat *stat, |
| 131 | u32 request_mask, unsigned int query_flags) | 131 | u32 request_mask, unsigned int query_flags) |
| 132 | { | 132 | { |
| 133 | struct fd f = fdget_raw(fd); | 133 | struct fd f; |
| 134 | int error = -EBADF; | 134 | int error = -EBADF; |
| 135 | 135 | ||
| 136 | if (query_flags & ~KSTAT_QUERY_FLAGS) | ||
| 137 | return -EINVAL; | ||
| 138 | |||
| 139 | f = fdget_raw(fd); | ||
| 136 | if (f.file) { | 140 | if (f.file) { |
| 137 | error = vfs_getattr(&f.file->f_path, stat, | 141 | error = vfs_getattr(&f.file->f_path, stat, |
| 138 | request_mask, query_flags); | 142 | request_mask, query_flags); |
| @@ -155,9 +159,6 @@ EXPORT_SYMBOL(vfs_statx_fd); | |||
| 155 | * Additionally, the use of AT_SYMLINK_NOFOLLOW in flags will prevent a symlink | 159 | * Additionally, the use of AT_SYMLINK_NOFOLLOW in flags will prevent a symlink |
| 156 | * at the given name from being referenced. | 160 | * at the given name from being referenced. |
| 157 | * | 161 | * |
| 158 | * The caller must have preset stat->request_mask as for vfs_getattr(). The | ||
| 159 | * flags are also used to load up stat->query_flags. | ||
| 160 | * | ||
| 161 | * 0 will be returned on success, and a -ve error code if unsuccessful. | 162 | * 0 will be returned on success, and a -ve error code if unsuccessful. |
| 162 | */ | 163 | */ |
| 163 | int vfs_statx(int dfd, const char __user *filename, int flags, | 164 | int vfs_statx(int dfd, const char __user *filename, int flags, |
| @@ -509,46 +510,38 @@ SYSCALL_DEFINE4(fstatat64, int, dfd, const char __user *, filename, | |||
| 509 | } | 510 | } |
| 510 | #endif /* __ARCH_WANT_STAT64 || __ARCH_WANT_COMPAT_STAT64 */ | 511 | #endif /* __ARCH_WANT_STAT64 || __ARCH_WANT_COMPAT_STAT64 */ |
| 511 | 512 | ||
| 512 | static inline int __put_timestamp(struct timespec *kts, | 513 | static noinline_for_stack int |
| 513 | struct statx_timestamp __user *uts) | 514 | cp_statx(const struct kstat *stat, struct statx __user *buffer) |
| 514 | { | ||
| 515 | return (__put_user(kts->tv_sec, &uts->tv_sec ) || | ||
| 516 | __put_user(kts->tv_nsec, &uts->tv_nsec ) || | ||
| 517 | __put_user(0, &uts->__reserved )); | ||
| 518 | } | ||
| 519 | |||
| 520 | /* | ||
| 521 | * Set the statx results. | ||
| 522 | */ | ||
| 523 | static long statx_set_result(struct kstat *stat, struct statx __user *buffer) | ||
| 524 | { | 515 | { |
| 525 | uid_t uid = from_kuid_munged(current_user_ns(), stat->uid); | 516 | struct statx tmp; |
| 526 | gid_t gid = from_kgid_munged(current_user_ns(), stat->gid); | 517 | |
| 527 | 518 | memset(&tmp, 0, sizeof(tmp)); | |
| 528 | if (__put_user(stat->result_mask, &buffer->stx_mask ) || | 519 | |
| 529 | __put_user(stat->mode, &buffer->stx_mode ) || | 520 | tmp.stx_mask = stat->result_mask; |
| 530 | __clear_user(&buffer->__spare0, sizeof(buffer->__spare0)) || | 521 | tmp.stx_blksize = stat->blksize; |
| 531 | __put_user(stat->nlink, &buffer->stx_nlink ) || | 522 | tmp.stx_attributes = stat->attributes; |
| 532 | __put_user(uid, &buffer->stx_uid ) || | 523 | tmp.stx_nlink = stat->nlink; |
| 533 | __put_user(gid, &buffer->stx_gid ) || | 524 | tmp.stx_uid = from_kuid_munged(current_user_ns(), stat->uid); |
| 534 | __put_user(stat->attributes, &buffer->stx_attributes ) || | 525 | tmp.stx_gid = from_kgid_munged(current_user_ns(), stat->gid); |
| 535 | __put_user(stat->blksize, &buffer->stx_blksize ) || | 526 | tmp.stx_mode = stat->mode; |
| 536 | __put_user(MAJOR(stat->rdev), &buffer->stx_rdev_major ) || | 527 | tmp.stx_ino = stat->ino; |
| 537 | __put_user(MINOR(stat->rdev), &buffer->stx_rdev_minor ) || | 528 | tmp.stx_size = stat->size; |
| 538 | __put_user(MAJOR(stat->dev), &buffer->stx_dev_major ) || | 529 | tmp.stx_blocks = stat->blocks; |
| 539 | __put_user(MINOR(stat->dev), &buffer->stx_dev_minor ) || | 530 | tmp.stx_attributes_mask = stat->attributes_mask; |
| 540 | __put_timestamp(&stat->atime, &buffer->stx_atime ) || | 531 | tmp.stx_atime.tv_sec = stat->atime.tv_sec; |
| 541 | __put_timestamp(&stat->btime, &buffer->stx_btime ) || | 532 | tmp.stx_atime.tv_nsec = stat->atime.tv_nsec; |
| 542 | __put_timestamp(&stat->ctime, &buffer->stx_ctime ) || | 533 | tmp.stx_btime.tv_sec = stat->btime.tv_sec; |
| 543 | __put_timestamp(&stat->mtime, &buffer->stx_mtime ) || | 534 | tmp.stx_btime.tv_nsec = stat->btime.tv_nsec; |
| 544 | __put_user(stat->ino, &buffer->stx_ino ) || | 535 | tmp.stx_ctime.tv_sec = stat->ctime.tv_sec; |
| 545 | __put_user(stat->size, &buffer->stx_size ) || | 536 | tmp.stx_ctime.tv_nsec = stat->ctime.tv_nsec; |
| 546 | __put_user(stat->blocks, &buffer->stx_blocks ) || | 537 | tmp.stx_mtime.tv_sec = stat->mtime.tv_sec; |
| 547 | __clear_user(&buffer->__spare1, sizeof(buffer->__spare1)) || | 538 | tmp.stx_mtime.tv_nsec = stat->mtime.tv_nsec; |
| 548 | __clear_user(&buffer->__spare2, sizeof(buffer->__spare2))) | 539 | tmp.stx_rdev_major = MAJOR(stat->rdev); |
| 549 | return -EFAULT; | 540 | tmp.stx_rdev_minor = MINOR(stat->rdev); |
| 550 | 541 | tmp.stx_dev_major = MAJOR(stat->dev); | |
| 551 | return 0; | 542 | tmp.stx_dev_minor = MINOR(stat->dev); |
| 543 | |||
| 544 | return copy_to_user(buffer, &tmp, sizeof(tmp)) ? -EFAULT : 0; | ||
| 552 | } | 545 | } |
| 553 | 546 | ||
| 554 | /** | 547 | /** |
| @@ -570,10 +563,10 @@ SYSCALL_DEFINE5(statx, | |||
| 570 | struct kstat stat; | 563 | struct kstat stat; |
| 571 | int error; | 564 | int error; |
| 572 | 565 | ||
| 566 | if (mask & STATX__RESERVED) | ||
| 567 | return -EINVAL; | ||
| 573 | if ((flags & AT_STATX_SYNC_TYPE) == AT_STATX_SYNC_TYPE) | 568 | if ((flags & AT_STATX_SYNC_TYPE) == AT_STATX_SYNC_TYPE) |
| 574 | return -EINVAL; | 569 | return -EINVAL; |
| 575 | if (!access_ok(VERIFY_WRITE, buffer, sizeof(*buffer))) | ||
| 576 | return -EFAULT; | ||
| 577 | 570 | ||
| 578 | if (filename) | 571 | if (filename) |
| 579 | error = vfs_statx(dfd, filename, flags, &stat, mask); | 572 | error = vfs_statx(dfd, filename, flags, &stat, mask); |
| @@ -581,7 +574,8 @@ SYSCALL_DEFINE5(statx, | |||
| 581 | error = vfs_statx_fd(dfd, &stat, mask, flags); | 574 | error = vfs_statx_fd(dfd, &stat, mask, flags); |
| 582 | if (error) | 575 | if (error) |
| 583 | return error; | 576 | return error; |
| 584 | return statx_set_result(&stat, buffer); | 577 | |
| 578 | return cp_statx(&stat, buffer); | ||
| 585 | } | 579 | } |
| 586 | 580 | ||
| 587 | /* Caller is here responsible for sufficient locking (ie. inode->i_lock) */ | 581 | /* Caller is here responsible for sufficient locking (ie. inode->i_lock) */ |
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index b803213d1307..39c75a86c67f 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
| @@ -108,7 +108,7 @@ static ssize_t sysfs_kf_read(struct kernfs_open_file *of, char *buf, | |||
| 108 | { | 108 | { |
| 109 | const struct sysfs_ops *ops = sysfs_file_ops(of->kn); | 109 | const struct sysfs_ops *ops = sysfs_file_ops(of->kn); |
| 110 | struct kobject *kobj = of->kn->parent->priv; | 110 | struct kobject *kobj = of->kn->parent->priv; |
| 111 | size_t len; | 111 | ssize_t len; |
| 112 | 112 | ||
| 113 | /* | 113 | /* |
| 114 | * If buf != of->prealloc_buf, we don't know how | 114 | * If buf != of->prealloc_buf, we don't know how |
| @@ -117,13 +117,15 @@ static ssize_t sysfs_kf_read(struct kernfs_open_file *of, char *buf, | |||
| 117 | if (WARN_ON_ONCE(buf != of->prealloc_buf)) | 117 | if (WARN_ON_ONCE(buf != of->prealloc_buf)) |
| 118 | return 0; | 118 | return 0; |
| 119 | len = ops->show(kobj, of->kn->priv, buf); | 119 | len = ops->show(kobj, of->kn->priv, buf); |
| 120 | if (len < 0) | ||
| 121 | return len; | ||
| 120 | if (pos) { | 122 | if (pos) { |
| 121 | if (len <= pos) | 123 | if (len <= pos) |
| 122 | return 0; | 124 | return 0; |
| 123 | len -= pos; | 125 | len -= pos; |
| 124 | memmove(buf, buf + pos, len); | 126 | memmove(buf, buf + pos, len); |
| 125 | } | 127 | } |
| 126 | return min(count, len); | 128 | return min_t(ssize_t, count, len); |
| 127 | } | 129 | } |
| 128 | 130 | ||
| 129 | /* kernfs write callback for regular sysfs files */ | 131 | /* kernfs write callback for regular sysfs files */ |
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 1d227b0fcf49..f7555fc25877 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c | |||
| @@ -1756,7 +1756,7 @@ static void userfaultfd_show_fdinfo(struct seq_file *m, struct file *f) | |||
| 1756 | * protocols: aa:... bb:... | 1756 | * protocols: aa:... bb:... |
| 1757 | */ | 1757 | */ |
| 1758 | seq_printf(m, "pending:\t%lu\ntotal:\t%lu\nAPI:\t%Lx:%x:%Lx\n", | 1758 | seq_printf(m, "pending:\t%lu\ntotal:\t%lu\nAPI:\t%Lx:%x:%Lx\n", |
| 1759 | pending, total, UFFD_API, UFFD_API_FEATURES, | 1759 | pending, total, UFFD_API, ctx->features, |
| 1760 | UFFD_API_IOCTLS|UFFD_API_RANGE_IOCTLS); | 1760 | UFFD_API_IOCTLS|UFFD_API_RANGE_IOCTLS); |
| 1761 | } | 1761 | } |
| 1762 | #endif | 1762 | #endif |
diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h index eb00bc133bca..39f8604f764e 100644 --- a/fs/xfs/libxfs/xfs_dir2_priv.h +++ b/fs/xfs/libxfs/xfs_dir2_priv.h | |||
| @@ -125,8 +125,7 @@ extern int xfs_dir2_sf_create(struct xfs_da_args *args, xfs_ino_t pino); | |||
| 125 | extern int xfs_dir2_sf_lookup(struct xfs_da_args *args); | 125 | extern int xfs_dir2_sf_lookup(struct xfs_da_args *args); |
| 126 | extern int xfs_dir2_sf_removename(struct xfs_da_args *args); | 126 | extern int xfs_dir2_sf_removename(struct xfs_da_args *args); |
| 127 | extern int xfs_dir2_sf_replace(struct xfs_da_args *args); | 127 | extern int xfs_dir2_sf_replace(struct xfs_da_args *args); |
| 128 | extern int xfs_dir2_sf_verify(struct xfs_mount *mp, struct xfs_dir2_sf_hdr *sfp, | 128 | extern int xfs_dir2_sf_verify(struct xfs_inode *ip); |
| 129 | int size); | ||
| 130 | 129 | ||
| 131 | /* xfs_dir2_readdir.c */ | 130 | /* xfs_dir2_readdir.c */ |
| 132 | extern int xfs_readdir(struct xfs_inode *dp, struct dir_context *ctx, | 131 | extern int xfs_readdir(struct xfs_inode *dp, struct dir_context *ctx, |
diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c index 96b45cd6c63f..e84af093b2ab 100644 --- a/fs/xfs/libxfs/xfs_dir2_sf.c +++ b/fs/xfs/libxfs/xfs_dir2_sf.c | |||
| @@ -632,36 +632,49 @@ xfs_dir2_sf_check( | |||
| 632 | /* Verify the consistency of an inline directory. */ | 632 | /* Verify the consistency of an inline directory. */ |
| 633 | int | 633 | int |
| 634 | xfs_dir2_sf_verify( | 634 | xfs_dir2_sf_verify( |
| 635 | struct xfs_mount *mp, | 635 | struct xfs_inode *ip) |
| 636 | struct xfs_dir2_sf_hdr *sfp, | ||
| 637 | int size) | ||
| 638 | { | 636 | { |
| 637 | struct xfs_mount *mp = ip->i_mount; | ||
| 638 | struct xfs_dir2_sf_hdr *sfp; | ||
| 639 | struct xfs_dir2_sf_entry *sfep; | 639 | struct xfs_dir2_sf_entry *sfep; |
| 640 | struct xfs_dir2_sf_entry *next_sfep; | 640 | struct xfs_dir2_sf_entry *next_sfep; |
| 641 | char *endp; | 641 | char *endp; |
| 642 | const struct xfs_dir_ops *dops; | 642 | const struct xfs_dir_ops *dops; |
| 643 | struct xfs_ifork *ifp; | ||
| 643 | xfs_ino_t ino; | 644 | xfs_ino_t ino; |
| 644 | int i; | 645 | int i; |
| 645 | int i8count; | 646 | int i8count; |
| 646 | int offset; | 647 | int offset; |
| 648 | int size; | ||
| 649 | int error; | ||
| 647 | __uint8_t filetype; | 650 | __uint8_t filetype; |
| 648 | 651 | ||
| 652 | ASSERT(ip->i_d.di_format == XFS_DINODE_FMT_LOCAL); | ||
| 653 | /* | ||
| 654 | * xfs_iread calls us before xfs_setup_inode sets up ip->d_ops, | ||
| 655 | * so we can only trust the mountpoint to have the right pointer. | ||
| 656 | */ | ||
| 649 | dops = xfs_dir_get_ops(mp, NULL); | 657 | dops = xfs_dir_get_ops(mp, NULL); |
| 650 | 658 | ||
| 659 | ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK); | ||
| 660 | sfp = (struct xfs_dir2_sf_hdr *)ifp->if_u1.if_data; | ||
| 661 | size = ifp->if_bytes; | ||
| 662 | |||
| 651 | /* | 663 | /* |
| 652 | * Give up if the directory is way too short. | 664 | * Give up if the directory is way too short. |
| 653 | */ | 665 | */ |
| 654 | XFS_WANT_CORRUPTED_RETURN(mp, size > | 666 | if (size <= offsetof(struct xfs_dir2_sf_hdr, parent) || |
| 655 | offsetof(struct xfs_dir2_sf_hdr, parent)); | 667 | size < xfs_dir2_sf_hdr_size(sfp->i8count)) |
| 656 | XFS_WANT_CORRUPTED_RETURN(mp, size >= | 668 | return -EFSCORRUPTED; |
| 657 | xfs_dir2_sf_hdr_size(sfp->i8count)); | ||
| 658 | 669 | ||
| 659 | endp = (char *)sfp + size; | 670 | endp = (char *)sfp + size; |
| 660 | 671 | ||
| 661 | /* Check .. entry */ | 672 | /* Check .. entry */ |
| 662 | ino = dops->sf_get_parent_ino(sfp); | 673 | ino = dops->sf_get_parent_ino(sfp); |
| 663 | i8count = ino > XFS_DIR2_MAX_SHORT_INUM; | 674 | i8count = ino > XFS_DIR2_MAX_SHORT_INUM; |
| 664 | XFS_WANT_CORRUPTED_RETURN(mp, !xfs_dir_ino_validate(mp, ino)); | 675 | error = xfs_dir_ino_validate(mp, ino); |
| 676 | if (error) | ||
| 677 | return error; | ||
| 665 | offset = dops->data_first_offset; | 678 | offset = dops->data_first_offset; |
| 666 | 679 | ||
| 667 | /* Check all reported entries */ | 680 | /* Check all reported entries */ |
| @@ -672,12 +685,12 @@ xfs_dir2_sf_verify( | |||
| 672 | * Check the fixed-offset parts of the structure are | 685 | * Check the fixed-offset parts of the structure are |
| 673 | * within the data buffer. | 686 | * within the data buffer. |
| 674 | */ | 687 | */ |
| 675 | XFS_WANT_CORRUPTED_RETURN(mp, | 688 | if (((char *)sfep + sizeof(*sfep)) >= endp) |
| 676 | ((char *)sfep + sizeof(*sfep)) < endp); | 689 | return -EFSCORRUPTED; |
| 677 | 690 | ||
| 678 | /* Don't allow names with known bad length. */ | 691 | /* Don't allow names with known bad length. */ |
| 679 | XFS_WANT_CORRUPTED_RETURN(mp, sfep->namelen > 0); | 692 | if (sfep->namelen == 0) |
| 680 | XFS_WANT_CORRUPTED_RETURN(mp, sfep->namelen < MAXNAMELEN); | 693 | return -EFSCORRUPTED; |
| 681 | 694 | ||
| 682 | /* | 695 | /* |
| 683 | * Check that the variable-length part of the structure is | 696 | * Check that the variable-length part of the structure is |
| @@ -685,33 +698,39 @@ xfs_dir2_sf_verify( | |||
| 685 | * name component, so nextentry is an acceptable test. | 698 | * name component, so nextentry is an acceptable test. |
| 686 | */ | 699 | */ |
| 687 | next_sfep = dops->sf_nextentry(sfp, sfep); | 700 | next_sfep = dops->sf_nextentry(sfp, sfep); |
| 688 | XFS_WANT_CORRUPTED_RETURN(mp, endp >= (char *)next_sfep); | 701 | if (endp < (char *)next_sfep) |
| 702 | return -EFSCORRUPTED; | ||
| 689 | 703 | ||
| 690 | /* Check that the offsets always increase. */ | 704 | /* Check that the offsets always increase. */ |
| 691 | XFS_WANT_CORRUPTED_RETURN(mp, | 705 | if (xfs_dir2_sf_get_offset(sfep) < offset) |
| 692 | xfs_dir2_sf_get_offset(sfep) >= offset); | 706 | return -EFSCORRUPTED; |
| 693 | 707 | ||
| 694 | /* Check the inode number. */ | 708 | /* Check the inode number. */ |
| 695 | ino = dops->sf_get_ino(sfp, sfep); | 709 | ino = dops->sf_get_ino(sfp, sfep); |
| 696 | i8count += ino > XFS_DIR2_MAX_SHORT_INUM; | 710 | i8count += ino > XFS_DIR2_MAX_SHORT_INUM; |
| 697 | XFS_WANT_CORRUPTED_RETURN(mp, !xfs_dir_ino_validate(mp, ino)); | 711 | error = xfs_dir_ino_validate(mp, ino); |
| 712 | if (error) | ||
| 713 | return error; | ||
| 698 | 714 | ||
| 699 | /* Check the file type. */ | 715 | /* Check the file type. */ |
| 700 | filetype = dops->sf_get_ftype(sfep); | 716 | filetype = dops->sf_get_ftype(sfep); |
| 701 | XFS_WANT_CORRUPTED_RETURN(mp, filetype < XFS_DIR3_FT_MAX); | 717 | if (filetype >= XFS_DIR3_FT_MAX) |
| 718 | return -EFSCORRUPTED; | ||
| 702 | 719 | ||
| 703 | offset = xfs_dir2_sf_get_offset(sfep) + | 720 | offset = xfs_dir2_sf_get_offset(sfep) + |
| 704 | dops->data_entsize(sfep->namelen); | 721 | dops->data_entsize(sfep->namelen); |
| 705 | 722 | ||
| 706 | sfep = next_sfep; | 723 | sfep = next_sfep; |
| 707 | } | 724 | } |
| 708 | XFS_WANT_CORRUPTED_RETURN(mp, i8count == sfp->i8count); | 725 | if (i8count != sfp->i8count) |
| 709 | XFS_WANT_CORRUPTED_RETURN(mp, (void *)sfep == (void *)endp); | 726 | return -EFSCORRUPTED; |
| 727 | if ((void *)sfep != (void *)endp) | ||
| 728 | return -EFSCORRUPTED; | ||
| 710 | 729 | ||
| 711 | /* Make sure this whole thing ought to be in local format. */ | 730 | /* Make sure this whole thing ought to be in local format. */ |
| 712 | XFS_WANT_CORRUPTED_RETURN(mp, offset + | 731 | if (offset + (sfp->count + 2) * (uint)sizeof(xfs_dir2_leaf_entry_t) + |
| 713 | (sfp->count + 2) * (uint)sizeof(xfs_dir2_leaf_entry_t) + | 732 | (uint)sizeof(xfs_dir2_block_tail_t) > mp->m_dir_geo->blksize) |
| 714 | (uint)sizeof(xfs_dir2_block_tail_t) <= mp->m_dir_geo->blksize); | 733 | return -EFSCORRUPTED; |
| 715 | 734 | ||
| 716 | return 0; | 735 | return 0; |
| 717 | } | 736 | } |
diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c index 9653e964eda4..8a37efe04de3 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.c +++ b/fs/xfs/libxfs/xfs_inode_fork.c | |||
| @@ -212,6 +212,16 @@ xfs_iformat_fork( | |||
| 212 | if (error) | 212 | if (error) |
| 213 | return error; | 213 | return error; |
| 214 | 214 | ||
| 215 | /* Check inline dir contents. */ | ||
| 216 | if (S_ISDIR(VFS_I(ip)->i_mode) && | ||
| 217 | dip->di_format == XFS_DINODE_FMT_LOCAL) { | ||
| 218 | error = xfs_dir2_sf_verify(ip); | ||
| 219 | if (error) { | ||
| 220 | xfs_idestroy_fork(ip, XFS_DATA_FORK); | ||
| 221 | return error; | ||
| 222 | } | ||
| 223 | } | ||
| 224 | |||
| 215 | if (xfs_is_reflink_inode(ip)) { | 225 | if (xfs_is_reflink_inode(ip)) { |
| 216 | ASSERT(ip->i_cowfp == NULL); | 226 | ASSERT(ip->i_cowfp == NULL); |
| 217 | xfs_ifork_init_cow(ip); | 227 | xfs_ifork_init_cow(ip); |
| @@ -322,8 +332,6 @@ xfs_iformat_local( | |||
| 322 | int whichfork, | 332 | int whichfork, |
| 323 | int size) | 333 | int size) |
| 324 | { | 334 | { |
| 325 | int error; | ||
| 326 | |||
| 327 | /* | 335 | /* |
| 328 | * If the size is unreasonable, then something | 336 | * If the size is unreasonable, then something |
| 329 | * is wrong and we just bail out rather than crash in | 337 | * is wrong and we just bail out rather than crash in |
| @@ -339,14 +347,6 @@ xfs_iformat_local( | |||
| 339 | return -EFSCORRUPTED; | 347 | return -EFSCORRUPTED; |
| 340 | } | 348 | } |
| 341 | 349 | ||
| 342 | if (S_ISDIR(VFS_I(ip)->i_mode) && whichfork == XFS_DATA_FORK) { | ||
| 343 | error = xfs_dir2_sf_verify(ip->i_mount, | ||
| 344 | (struct xfs_dir2_sf_hdr *)XFS_DFORK_DPTR(dip), | ||
| 345 | size); | ||
| 346 | if (error) | ||
| 347 | return error; | ||
| 348 | } | ||
| 349 | |||
| 350 | xfs_init_local_fork(ip, whichfork, XFS_DFORK_PTR(dip, whichfork), size); | 350 | xfs_init_local_fork(ip, whichfork, XFS_DFORK_PTR(dip, whichfork), size); |
| 351 | return 0; | 351 | return 0; |
| 352 | } | 352 | } |
| @@ -867,7 +867,7 @@ xfs_iextents_copy( | |||
| 867 | * In these cases, the format always takes precedence, because the | 867 | * In these cases, the format always takes precedence, because the |
| 868 | * format indicates the current state of the fork. | 868 | * format indicates the current state of the fork. |
| 869 | */ | 869 | */ |
| 870 | int | 870 | void |
| 871 | xfs_iflush_fork( | 871 | xfs_iflush_fork( |
| 872 | xfs_inode_t *ip, | 872 | xfs_inode_t *ip, |
| 873 | xfs_dinode_t *dip, | 873 | xfs_dinode_t *dip, |
| @@ -877,7 +877,6 @@ xfs_iflush_fork( | |||
| 877 | char *cp; | 877 | char *cp; |
| 878 | xfs_ifork_t *ifp; | 878 | xfs_ifork_t *ifp; |
| 879 | xfs_mount_t *mp; | 879 | xfs_mount_t *mp; |
| 880 | int error; | ||
| 881 | static const short brootflag[2] = | 880 | static const short brootflag[2] = |
| 882 | { XFS_ILOG_DBROOT, XFS_ILOG_ABROOT }; | 881 | { XFS_ILOG_DBROOT, XFS_ILOG_ABROOT }; |
| 883 | static const short dataflag[2] = | 882 | static const short dataflag[2] = |
| @@ -886,7 +885,7 @@ xfs_iflush_fork( | |||
| 886 | { XFS_ILOG_DEXT, XFS_ILOG_AEXT }; | 885 | { XFS_ILOG_DEXT, XFS_ILOG_AEXT }; |
| 887 | 886 | ||
| 888 | if (!iip) | 887 | if (!iip) |
| 889 | return 0; | 888 | return; |
| 890 | ifp = XFS_IFORK_PTR(ip, whichfork); | 889 | ifp = XFS_IFORK_PTR(ip, whichfork); |
| 891 | /* | 890 | /* |
| 892 | * This can happen if we gave up in iformat in an error path, | 891 | * This can happen if we gave up in iformat in an error path, |
| @@ -894,19 +893,12 @@ xfs_iflush_fork( | |||
| 894 | */ | 893 | */ |
| 895 | if (!ifp) { | 894 | if (!ifp) { |
| 896 | ASSERT(whichfork == XFS_ATTR_FORK); | 895 | ASSERT(whichfork == XFS_ATTR_FORK); |
| 897 | return 0; | 896 | return; |
| 898 | } | 897 | } |
| 899 | cp = XFS_DFORK_PTR(dip, whichfork); | 898 | cp = XFS_DFORK_PTR(dip, whichfork); |
| 900 | mp = ip->i_mount; | 899 | mp = ip->i_mount; |
| 901 | switch (XFS_IFORK_FORMAT(ip, whichfork)) { | 900 | switch (XFS_IFORK_FORMAT(ip, whichfork)) { |
| 902 | case XFS_DINODE_FMT_LOCAL: | 901 | case XFS_DINODE_FMT_LOCAL: |
| 903 | if (S_ISDIR(VFS_I(ip)->i_mode) && whichfork == XFS_DATA_FORK) { | ||
| 904 | error = xfs_dir2_sf_verify(mp, | ||
| 905 | (struct xfs_dir2_sf_hdr *)ifp->if_u1.if_data, | ||
| 906 | ifp->if_bytes); | ||
| 907 | if (error) | ||
| 908 | return error; | ||
| 909 | } | ||
| 910 | if ((iip->ili_fields & dataflag[whichfork]) && | 902 | if ((iip->ili_fields & dataflag[whichfork]) && |
| 911 | (ifp->if_bytes > 0)) { | 903 | (ifp->if_bytes > 0)) { |
| 912 | ASSERT(ifp->if_u1.if_data != NULL); | 904 | ASSERT(ifp->if_u1.if_data != NULL); |
| @@ -959,7 +951,6 @@ xfs_iflush_fork( | |||
| 959 | ASSERT(0); | 951 | ASSERT(0); |
| 960 | break; | 952 | break; |
| 961 | } | 953 | } |
| 962 | return 0; | ||
| 963 | } | 954 | } |
| 964 | 955 | ||
| 965 | /* | 956 | /* |
diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h index 132dc59fdde6..7fb8365326d1 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.h +++ b/fs/xfs/libxfs/xfs_inode_fork.h | |||
| @@ -140,7 +140,7 @@ typedef struct xfs_ifork { | |||
| 140 | struct xfs_ifork *xfs_iext_state_to_fork(struct xfs_inode *ip, int state); | 140 | struct xfs_ifork *xfs_iext_state_to_fork(struct xfs_inode *ip, int state); |
| 141 | 141 | ||
| 142 | int xfs_iformat_fork(struct xfs_inode *, struct xfs_dinode *); | 142 | int xfs_iformat_fork(struct xfs_inode *, struct xfs_dinode *); |
| 143 | int xfs_iflush_fork(struct xfs_inode *, struct xfs_dinode *, | 143 | void xfs_iflush_fork(struct xfs_inode *, struct xfs_dinode *, |
| 144 | struct xfs_inode_log_item *, int); | 144 | struct xfs_inode_log_item *, int); |
| 145 | void xfs_idestroy_fork(struct xfs_inode *, int); | 145 | void xfs_idestroy_fork(struct xfs_inode *, int); |
| 146 | void xfs_idata_realloc(struct xfs_inode *, int, int); | 146 | void xfs_idata_realloc(struct xfs_inode *, int, int); |
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 8b75dcea5966..828532ce0adc 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c | |||
| @@ -1311,8 +1311,16 @@ xfs_free_file_space( | |||
| 1311 | /* | 1311 | /* |
| 1312 | * Now that we've unmap all full blocks we'll have to zero out any | 1312 | * Now that we've unmap all full blocks we'll have to zero out any |
| 1313 | * partial block at the beginning and/or end. xfs_zero_range is | 1313 | * partial block at the beginning and/or end. xfs_zero_range is |
| 1314 | * smart enough to skip any holes, including those we just created. | 1314 | * smart enough to skip any holes, including those we just created, |
| 1315 | * but we must take care not to zero beyond EOF and enlarge i_size. | ||
| 1315 | */ | 1316 | */ |
| 1317 | |||
| 1318 | if (offset >= XFS_ISIZE(ip)) | ||
| 1319 | return 0; | ||
| 1320 | |||
| 1321 | if (offset + len > XFS_ISIZE(ip)) | ||
| 1322 | len = XFS_ISIZE(ip) - offset; | ||
| 1323 | |||
| 1316 | return xfs_zero_range(ip, offset, len, NULL); | 1324 | return xfs_zero_range(ip, offset, len, NULL); |
| 1317 | } | 1325 | } |
| 1318 | 1326 | ||
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index c7fe2c2123ab..7605d8396596 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include "xfs_log.h" | 50 | #include "xfs_log.h" |
| 51 | #include "xfs_bmap_btree.h" | 51 | #include "xfs_bmap_btree.h" |
| 52 | #include "xfs_reflink.h" | 52 | #include "xfs_reflink.h" |
| 53 | #include "xfs_dir2_priv.h" | ||
| 53 | 54 | ||
| 54 | kmem_zone_t *xfs_inode_zone; | 55 | kmem_zone_t *xfs_inode_zone; |
| 55 | 56 | ||
| @@ -3475,7 +3476,6 @@ xfs_iflush_int( | |||
| 3475 | struct xfs_inode_log_item *iip = ip->i_itemp; | 3476 | struct xfs_inode_log_item *iip = ip->i_itemp; |
| 3476 | struct xfs_dinode *dip; | 3477 | struct xfs_dinode *dip; |
| 3477 | struct xfs_mount *mp = ip->i_mount; | 3478 | struct xfs_mount *mp = ip->i_mount; |
| 3478 | int error; | ||
| 3479 | 3479 | ||
| 3480 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); | 3480 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); |
| 3481 | ASSERT(xfs_isiflocked(ip)); | 3481 | ASSERT(xfs_isiflocked(ip)); |
| @@ -3547,6 +3547,12 @@ xfs_iflush_int( | |||
| 3547 | if (ip->i_d.di_version < 3) | 3547 | if (ip->i_d.di_version < 3) |
| 3548 | ip->i_d.di_flushiter++; | 3548 | ip->i_d.di_flushiter++; |
| 3549 | 3549 | ||
| 3550 | /* Check the inline directory data. */ | ||
| 3551 | if (S_ISDIR(VFS_I(ip)->i_mode) && | ||
| 3552 | ip->i_d.di_format == XFS_DINODE_FMT_LOCAL && | ||
| 3553 | xfs_dir2_sf_verify(ip)) | ||
| 3554 | goto corrupt_out; | ||
| 3555 | |||
| 3550 | /* | 3556 | /* |
| 3551 | * Copy the dirty parts of the inode into the on-disk inode. We always | 3557 | * Copy the dirty parts of the inode into the on-disk inode. We always |
| 3552 | * copy out the core of the inode, because if the inode is dirty at all | 3558 | * copy out the core of the inode, because if the inode is dirty at all |
| @@ -3558,14 +3564,9 @@ xfs_iflush_int( | |||
| 3558 | if (ip->i_d.di_flushiter == DI_MAX_FLUSH) | 3564 | if (ip->i_d.di_flushiter == DI_MAX_FLUSH) |
| 3559 | ip->i_d.di_flushiter = 0; | 3565 | ip->i_d.di_flushiter = 0; |
| 3560 | 3566 | ||
| 3561 | error = xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK); | 3567 | xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK); |
| 3562 | if (error) | 3568 | if (XFS_IFORK_Q(ip)) |
| 3563 | return error; | 3569 | xfs_iflush_fork(ip, dip, iip, XFS_ATTR_FORK); |
| 3564 | if (XFS_IFORK_Q(ip)) { | ||
| 3565 | error = xfs_iflush_fork(ip, dip, iip, XFS_ATTR_FORK); | ||
| 3566 | if (error) | ||
| 3567 | return error; | ||
| 3568 | } | ||
| 3569 | xfs_inobp_check(mp, bp); | 3570 | xfs_inobp_check(mp, bp); |
| 3570 | 3571 | ||
| 3571 | /* | 3572 | /* |
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 229cc6a6d8ef..ebfc13350f9a 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c | |||
| @@ -516,6 +516,20 @@ xfs_vn_getattr( | |||
| 516 | stat->blocks = | 516 | stat->blocks = |
| 517 | XFS_FSB_TO_BB(mp, ip->i_d.di_nblocks + ip->i_delayed_blks); | 517 | XFS_FSB_TO_BB(mp, ip->i_d.di_nblocks + ip->i_delayed_blks); |
| 518 | 518 | ||
| 519 | if (ip->i_d.di_version == 3) { | ||
| 520 | if (request_mask & STATX_BTIME) { | ||
| 521 | stat->result_mask |= STATX_BTIME; | ||
| 522 | stat->btime.tv_sec = ip->i_d.di_crtime.t_sec; | ||
| 523 | stat->btime.tv_nsec = ip->i_d.di_crtime.t_nsec; | ||
| 524 | } | ||
| 525 | } | ||
| 526 | |||
| 527 | if (ip->i_d.di_flags & XFS_DIFLAG_IMMUTABLE) | ||
| 528 | stat->attributes |= STATX_ATTR_IMMUTABLE; | ||
| 529 | if (ip->i_d.di_flags & XFS_DIFLAG_APPEND) | ||
| 530 | stat->attributes |= STATX_ATTR_APPEND; | ||
| 531 | if (ip->i_d.di_flags & XFS_DIFLAG_NODUMP) | ||
| 532 | stat->attributes |= STATX_ATTR_NODUMP; | ||
| 519 | 533 | ||
| 520 | switch (inode->i_mode & S_IFMT) { | 534 | switch (inode->i_mode & S_IFMT) { |
| 521 | case S_IFBLK: | 535 | case S_IFBLK: |
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index 2a6d9b1558e0..26d67ce3c18d 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c | |||
| @@ -583,7 +583,7 @@ xfs_inumbers( | |||
| 583 | return error; | 583 | return error; |
| 584 | 584 | ||
| 585 | bcount = MIN(left, (int)(PAGE_SIZE / sizeof(*buffer))); | 585 | bcount = MIN(left, (int)(PAGE_SIZE / sizeof(*buffer))); |
| 586 | buffer = kmem_alloc(bcount * sizeof(*buffer), KM_SLEEP); | 586 | buffer = kmem_zalloc(bcount * sizeof(*buffer), KM_SLEEP); |
| 587 | do { | 587 | do { |
| 588 | struct xfs_inobt_rec_incore r; | 588 | struct xfs_inobt_rec_incore r; |
| 589 | int stat; | 589 | int stat; |
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 4df64a1fc09e..532372c6cf15 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | * [_sdata, _edata]: contains .data.* sections, may also contain .rodata.* | 14 | * [_sdata, _edata]: contains .data.* sections, may also contain .rodata.* |
| 15 | * and/or .init.* sections. | 15 | * and/or .init.* sections. |
| 16 | * [__start_rodata, __end_rodata]: contains .rodata.* sections | 16 | * [__start_rodata, __end_rodata]: contains .rodata.* sections |
| 17 | * [__start_data_ro_after_init, __end_data_ro_after_init]: | 17 | * [__start_ro_after_init, __end_ro_after_init]: |
| 18 | * contains data.ro_after_init section | 18 | * contains .data..ro_after_init section |
| 19 | * [__init_begin, __init_end]: contains .init.* sections, but .init.text.* | 19 | * [__init_begin, __init_end]: contains .init.* sections, but .init.text.* |
| 20 | * may be out of this range on some architectures. | 20 | * may be out of this range on some architectures. |
| 21 | * [_sinittext, _einittext]: contains .init.text.* sections | 21 | * [_sinittext, _einittext]: contains .init.text.* sections |
| @@ -33,7 +33,7 @@ extern char _data[], _sdata[], _edata[]; | |||
| 33 | extern char __bss_start[], __bss_stop[]; | 33 | extern char __bss_start[], __bss_stop[]; |
| 34 | extern char __init_begin[], __init_end[]; | 34 | extern char __init_begin[], __init_end[]; |
| 35 | extern char _sinittext[], _einittext[]; | 35 | extern char _sinittext[], _einittext[]; |
| 36 | extern char __start_data_ro_after_init[], __end_data_ro_after_init[]; | 36 | extern char __start_ro_after_init[], __end_ro_after_init[]; |
| 37 | extern char _end[]; | 37 | extern char _end[]; |
| 38 | extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[]; | 38 | extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[]; |
| 39 | extern char __kprobes_text_start[], __kprobes_text_end[]; | 39 | extern char __kprobes_text_start[], __kprobes_text_end[]; |
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 0968d13b3885..143db9c523e2 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -173,6 +173,7 @@ | |||
| 173 | KEEP(*(__##name##_of_table_end)) | 173 | KEEP(*(__##name##_of_table_end)) |
| 174 | 174 | ||
| 175 | #define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) | 175 | #define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) |
| 176 | #define CLKEVT_OF_TABLES() OF_TABLE(CONFIG_CLKEVT_OF, clkevt) | ||
| 176 | #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) | 177 | #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) |
| 177 | #define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk) | 178 | #define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk) |
| 178 | #define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu) | 179 | #define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu) |
| @@ -260,9 +261,9 @@ | |||
| 260 | */ | 261 | */ |
| 261 | #ifndef RO_AFTER_INIT_DATA | 262 | #ifndef RO_AFTER_INIT_DATA |
| 262 | #define RO_AFTER_INIT_DATA \ | 263 | #define RO_AFTER_INIT_DATA \ |
| 263 | __start_data_ro_after_init = .; \ | 264 | VMLINUX_SYMBOL(__start_ro_after_init) = .; \ |
| 264 | *(.data..ro_after_init) \ | 265 | *(.data..ro_after_init) \ |
| 265 | __end_data_ro_after_init = .; | 266 | VMLINUX_SYMBOL(__end_ro_after_init) = .; |
| 266 | #endif | 267 | #endif |
| 267 | 268 | ||
| 268 | /* | 269 | /* |
| @@ -559,6 +560,7 @@ | |||
| 559 | CLK_OF_TABLES() \ | 560 | CLK_OF_TABLES() \ |
| 560 | RESERVEDMEM_OF_TABLES() \ | 561 | RESERVEDMEM_OF_TABLES() \ |
| 561 | CLKSRC_OF_TABLES() \ | 562 | CLKSRC_OF_TABLES() \ |
| 563 | CLKEVT_OF_TABLES() \ | ||
| 562 | IOMMU_OF_TABLES() \ | 564 | IOMMU_OF_TABLES() \ |
| 563 | CPU_METHOD_OF_TABLES() \ | 565 | CPU_METHOD_OF_TABLES() \ |
| 564 | CPUIDLE_METHOD_OF_TABLES() \ | 566 | CPUIDLE_METHOD_OF_TABLES() \ |
diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h index ed953f98f0e1..1487011fe057 100644 --- a/include/drm/ttm/ttm_object.h +++ b/include/drm/ttm/ttm_object.h | |||
| @@ -229,6 +229,8 @@ extern void ttm_base_object_unref(struct ttm_base_object **p_base); | |||
| 229 | * @ref_type: The type of reference. | 229 | * @ref_type: The type of reference. |
| 230 | * @existed: Upon completion, indicates that an identical reference object | 230 | * @existed: Upon completion, indicates that an identical reference object |
| 231 | * already existed, and the refcount was upped on that object instead. | 231 | * already existed, and the refcount was upped on that object instead. |
| 232 | * @require_existed: Fail with -EPERM if an identical ref object didn't | ||
| 233 | * already exist. | ||
| 232 | * | 234 | * |
| 233 | * Checks that the base object is shareable and adds a ref object to it. | 235 | * Checks that the base object is shareable and adds a ref object to it. |
| 234 | * | 236 | * |
| @@ -243,7 +245,8 @@ extern void ttm_base_object_unref(struct ttm_base_object **p_base); | |||
| 243 | */ | 245 | */ |
| 244 | extern int ttm_ref_object_add(struct ttm_object_file *tfile, | 246 | extern int ttm_ref_object_add(struct ttm_object_file *tfile, |
| 245 | struct ttm_base_object *base, | 247 | struct ttm_base_object *base, |
| 246 | enum ttm_ref_type ref_type, bool *existed); | 248 | enum ttm_ref_type ref_type, bool *existed, |
| 249 | bool require_existed); | ||
| 247 | 250 | ||
| 248 | extern bool ttm_ref_object_exists(struct ttm_object_file *tfile, | 251 | extern bool ttm_ref_object_exists(struct ttm_object_file *tfile, |
| 249 | struct ttm_base_object *base); | 252 | struct ttm_base_object *base); |
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index b72dd2ad5f44..c0b3d999c266 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h | |||
| @@ -295,6 +295,7 @@ void kvm_vgic_vcpu_early_init(struct kvm_vcpu *vcpu); | |||
| 295 | void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu); | 295 | void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu); |
| 296 | int kvm_vgic_map_resources(struct kvm *kvm); | 296 | int kvm_vgic_map_resources(struct kvm *kvm); |
| 297 | int kvm_vgic_hyp_init(void); | 297 | int kvm_vgic_hyp_init(void); |
| 298 | void kvm_vgic_init_cpu_hardware(void); | ||
| 298 | 299 | ||
| 299 | int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int intid, | 300 | int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int intid, |
| 300 | bool level); | 301 | bool level); |
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index b296a9006117..9382c5da7a2e 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h | |||
| @@ -51,6 +51,7 @@ struct blk_mq_hw_ctx { | |||
| 51 | 51 | ||
| 52 | atomic_t nr_active; | 52 | atomic_t nr_active; |
| 53 | 53 | ||
| 54 | struct delayed_work delayed_run_work; | ||
| 54 | struct delayed_work delay_work; | 55 | struct delayed_work delay_work; |
| 55 | 56 | ||
| 56 | struct hlist_node cpuhp_dead; | 57 | struct hlist_node cpuhp_dead; |
| @@ -238,6 +239,7 @@ void blk_mq_stop_hw_queues(struct request_queue *q); | |||
| 238 | void blk_mq_start_hw_queues(struct request_queue *q); | 239 | void blk_mq_start_hw_queues(struct request_queue *q); |
| 239 | void blk_mq_start_stopped_hw_queue(struct blk_mq_hw_ctx *hctx, bool async); | 240 | void blk_mq_start_stopped_hw_queue(struct blk_mq_hw_ctx *hctx, bool async); |
| 240 | void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async); | 241 | void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async); |
| 242 | void blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs); | ||
| 241 | void blk_mq_run_hw_queues(struct request_queue *q, bool async); | 243 | void blk_mq_run_hw_queues(struct request_queue *q, bool async); |
| 242 | void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs); | 244 | void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs); |
| 243 | void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, | 245 | void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 5a7da607ca04..7548f332121a 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -610,7 +610,6 @@ struct request_queue { | |||
| 610 | #define QUEUE_FLAG_FLUSH_NQ 25 /* flush not queueuable */ | 610 | #define QUEUE_FLAG_FLUSH_NQ 25 /* flush not queueuable */ |
| 611 | #define QUEUE_FLAG_DAX 26 /* device supports DAX */ | 611 | #define QUEUE_FLAG_DAX 26 /* device supports DAX */ |
| 612 | #define QUEUE_FLAG_STATS 27 /* track rq completion times */ | 612 | #define QUEUE_FLAG_STATS 27 /* track rq completion times */ |
| 613 | #define QUEUE_FLAG_RESTART 28 /* queue needs restart at completion */ | ||
| 614 | 613 | ||
| 615 | #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ | 614 | #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ |
| 616 | (1 << QUEUE_FLAG_STACKABLE) | \ | 615 | (1 << QUEUE_FLAG_STACKABLE) | \ |
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index 5d3053c34fb3..6d7edc3082f9 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h | |||
| @@ -229,7 +229,7 @@ static inline void tick_setup_hrtimer_broadcast(void) { } | |||
| 229 | 229 | ||
| 230 | #ifdef CONFIG_CLKEVT_PROBE | 230 | #ifdef CONFIG_CLKEVT_PROBE |
| 231 | extern int clockevent_probe(void); | 231 | extern int clockevent_probe(void); |
| 232 | #els | 232 | #else |
| 233 | static inline int clockevent_probe(void) { return 0; } | 233 | static inline int clockevent_probe(void) { return 0; } |
| 234 | #endif | 234 | #endif |
| 235 | 235 | ||
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index aebecc4ed088..22d39e8d4de1 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
| @@ -211,7 +211,7 @@ extern ssize_t elv_iosched_show(struct request_queue *, char *); | |||
| 211 | extern ssize_t elv_iosched_store(struct request_queue *, const char *, size_t); | 211 | extern ssize_t elv_iosched_store(struct request_queue *, const char *, size_t); |
| 212 | 212 | ||
| 213 | extern int elevator_init(struct request_queue *, char *); | 213 | extern int elevator_init(struct request_queue *, char *); |
| 214 | extern void elevator_exit(struct elevator_queue *); | 214 | extern void elevator_exit(struct request_queue *, struct elevator_queue *); |
| 215 | extern int elevator_change(struct request_queue *, const char *); | 215 | extern int elevator_change(struct request_queue *, const char *); |
| 216 | extern bool elv_bio_merge_ok(struct request *, struct bio *); | 216 | extern bool elv_bio_merge_ok(struct request *, struct bio *); |
| 217 | extern struct elevator_queue *elevator_alloc(struct request_queue *, | 217 | extern struct elevator_queue *elevator_alloc(struct request_queue *, |
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index eafc965b3eb8..dc30f3d057eb 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h | |||
| @@ -96,6 +96,9 @@ | |||
| 96 | #define GICH_MISR_EOI (1 << 0) | 96 | #define GICH_MISR_EOI (1 << 0) |
| 97 | #define GICH_MISR_U (1 << 1) | 97 | #define GICH_MISR_U (1 << 1) |
| 98 | 98 | ||
| 99 | #define GICV_PMR_PRIORITY_SHIFT 3 | ||
| 100 | #define GICV_PMR_PRIORITY_MASK (0x1f << GICV_PMR_PRIORITY_SHIFT) | ||
| 101 | |||
| 99 | #ifndef __ASSEMBLY__ | 102 | #ifndef __ASSEMBLY__ |
| 100 | 103 | ||
| 101 | #include <linux/irqdomain.h> | 104 | #include <linux/irqdomain.h> |
diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 5734480c9590..a5c7046f26b4 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h | |||
| @@ -76,6 +76,9 @@ size_t ksize(const void *); | |||
| 76 | static inline void kasan_unpoison_slab(const void *ptr) { ksize(ptr); } | 76 | static inline void kasan_unpoison_slab(const void *ptr) { ksize(ptr); } |
| 77 | size_t kasan_metadata_size(struct kmem_cache *cache); | 77 | size_t kasan_metadata_size(struct kmem_cache *cache); |
| 78 | 78 | ||
| 79 | bool kasan_save_enable_multi_shot(void); | ||
| 80 | void kasan_restore_multi_shot(bool enabled); | ||
| 81 | |||
| 79 | #else /* CONFIG_KASAN */ | 82 | #else /* CONFIG_KASAN */ |
| 80 | 83 | ||
| 81 | static inline void kasan_unpoison_shadow(const void *address, size_t size) {} | 84 | static inline void kasan_unpoison_shadow(const void *address, size_t size) {} |
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 2c14ad9809da..d0250744507a 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
| @@ -162,8 +162,8 @@ int kvm_io_bus_read(struct kvm_vcpu *vcpu, enum kvm_bus bus_idx, gpa_t addr, | |||
| 162 | int len, void *val); | 162 | int len, void *val); |
| 163 | int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, | 163 | int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, |
| 164 | int len, struct kvm_io_device *dev); | 164 | int len, struct kvm_io_device *dev); |
| 165 | int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, | 165 | void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, |
| 166 | struct kvm_io_device *dev); | 166 | struct kvm_io_device *dev); |
| 167 | struct kvm_io_device *kvm_io_bus_get_dev(struct kvm *kvm, enum kvm_bus bus_idx, | 167 | struct kvm_io_device *kvm_io_bus_get_dev(struct kvm *kvm, enum kvm_bus bus_idx, |
| 168 | gpa_t addr); | 168 | gpa_t addr); |
| 169 | 169 | ||
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 5af377303880..bb7250c45cb8 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
| @@ -740,6 +740,12 @@ static inline bool mem_cgroup_oom_synchronize(bool wait) | |||
| 740 | return false; | 740 | return false; |
| 741 | } | 741 | } |
| 742 | 742 | ||
| 743 | static inline void mem_cgroup_update_page_stat(struct page *page, | ||
| 744 | enum mem_cgroup_stat_index idx, | ||
| 745 | int nr) | ||
| 746 | { | ||
| 747 | } | ||
| 748 | |||
| 743 | static inline void mem_cgroup_inc_page_stat(struct page *page, | 749 | static inline void mem_cgroup_inc_page_stat(struct page *page, |
| 744 | enum mem_cgroup_stat_index idx) | 750 | enum mem_cgroup_stat_index idx) |
| 745 | { | 751 | { |
diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h index 7a01c94496f1..3eef9fb9968a 100644 --- a/include/linux/mfd/cros_ec.h +++ b/include/linux/mfd/cros_ec.h | |||
| @@ -35,10 +35,11 @@ | |||
| 35 | * Max bus-specific overhead incurred by request/responses. | 35 | * Max bus-specific overhead incurred by request/responses. |
| 36 | * I2C requires 1 additional byte for requests. | 36 | * I2C requires 1 additional byte for requests. |
| 37 | * I2C requires 2 additional bytes for responses. | 37 | * I2C requires 2 additional bytes for responses. |
| 38 | * SPI requires up to 32 additional bytes for responses. | ||
| 38 | * */ | 39 | * */ |
| 39 | #define EC_PROTO_VERSION_UNKNOWN 0 | 40 | #define EC_PROTO_VERSION_UNKNOWN 0 |
| 40 | #define EC_MAX_REQUEST_OVERHEAD 1 | 41 | #define EC_MAX_REQUEST_OVERHEAD 1 |
| 41 | #define EC_MAX_RESPONSE_OVERHEAD 2 | 42 | #define EC_MAX_RESPONSE_OVERHEAD 32 |
| 42 | 43 | ||
| 43 | /* | 44 | /* |
| 44 | * Command interface between EC and AP, for LPC, I2C and SPI interfaces. | 45 | * Command interface between EC and AP, for LPC, I2C and SPI interfaces. |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 5f01c88f0800..00a8fa7e366a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -32,6 +32,8 @@ struct user_struct; | |||
| 32 | struct writeback_control; | 32 | struct writeback_control; |
| 33 | struct bdi_writeback; | 33 | struct bdi_writeback; |
| 34 | 34 | ||
| 35 | void init_mm_internals(void); | ||
| 36 | |||
| 35 | #ifndef CONFIG_NEED_MULTIPLE_NODES /* Don't use mapnrs, do it properly */ | 37 | #ifndef CONFIG_NEED_MULTIPLE_NODES /* Don't use mapnrs, do it properly */ |
| 36 | extern unsigned long max_mapnr; | 38 | extern unsigned long max_mapnr; |
| 37 | 39 | ||
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index c43d435d4225..9061780b141f 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h | |||
| @@ -64,26 +64,26 @@ enum { | |||
| 64 | * RDMA_QPTYPE field | 64 | * RDMA_QPTYPE field |
| 65 | */ | 65 | */ |
| 66 | enum { | 66 | enum { |
| 67 | NVMF_RDMA_QPTYPE_CONNECTED = 0, /* Reliable Connected */ | 67 | NVMF_RDMA_QPTYPE_CONNECTED = 1, /* Reliable Connected */ |
| 68 | NVMF_RDMA_QPTYPE_DATAGRAM = 1, /* Reliable Datagram */ | 68 | NVMF_RDMA_QPTYPE_DATAGRAM = 2, /* Reliable Datagram */ |
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | /* RDMA QP Service Type codes for Discovery Log Page entry TSAS | 71 | /* RDMA QP Service Type codes for Discovery Log Page entry TSAS |
| 72 | * RDMA_QPTYPE field | 72 | * RDMA_QPTYPE field |
| 73 | */ | 73 | */ |
| 74 | enum { | 74 | enum { |
| 75 | NVMF_RDMA_PRTYPE_NOT_SPECIFIED = 0, /* No Provider Specified */ | 75 | NVMF_RDMA_PRTYPE_NOT_SPECIFIED = 1, /* No Provider Specified */ |
| 76 | NVMF_RDMA_PRTYPE_IB = 1, /* InfiniBand */ | 76 | NVMF_RDMA_PRTYPE_IB = 2, /* InfiniBand */ |
| 77 | NVMF_RDMA_PRTYPE_ROCE = 2, /* InfiniBand RoCE */ | 77 | NVMF_RDMA_PRTYPE_ROCE = 3, /* InfiniBand RoCE */ |
| 78 | NVMF_RDMA_PRTYPE_ROCEV2 = 3, /* InfiniBand RoCEV2 */ | 78 | NVMF_RDMA_PRTYPE_ROCEV2 = 4, /* InfiniBand RoCEV2 */ |
| 79 | NVMF_RDMA_PRTYPE_IWARP = 4, /* IWARP */ | 79 | NVMF_RDMA_PRTYPE_IWARP = 5, /* IWARP */ |
| 80 | }; | 80 | }; |
| 81 | 81 | ||
| 82 | /* RDMA Connection Management Service Type codes for Discovery Log Page | 82 | /* RDMA Connection Management Service Type codes for Discovery Log Page |
| 83 | * entry TSAS RDMA_CMS field | 83 | * entry TSAS RDMA_CMS field |
| 84 | */ | 84 | */ |
| 85 | enum { | 85 | enum { |
| 86 | NVMF_RDMA_CMS_RDMA_CM = 0, /* Sockets based enpoint addressing */ | 86 | NVMF_RDMA_CMS_RDMA_CM = 1, /* Sockets based endpoint addressing */ |
| 87 | }; | 87 | }; |
| 88 | 88 | ||
| 89 | #define NVMF_AQ_DEPTH 32 | 89 | #define NVMF_AQ_DEPTH 32 |
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h index 8ce2d87a238b..5e45385c5bdc 100644 --- a/include/linux/pinctrl/pinctrl.h +++ b/include/linux/pinctrl/pinctrl.h | |||
| @@ -145,8 +145,9 @@ struct pinctrl_desc { | |||
| 145 | extern int pinctrl_register_and_init(struct pinctrl_desc *pctldesc, | 145 | extern int pinctrl_register_and_init(struct pinctrl_desc *pctldesc, |
| 146 | struct device *dev, void *driver_data, | 146 | struct device *dev, void *driver_data, |
| 147 | struct pinctrl_dev **pctldev); | 147 | struct pinctrl_dev **pctldev); |
| 148 | extern int pinctrl_enable(struct pinctrl_dev *pctldev); | ||
| 148 | 149 | ||
| 149 | /* Please use pinctrl_register_and_init() instead */ | 150 | /* Please use pinctrl_register_and_init() and pinctrl_enable() instead */ |
| 150 | extern struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, | 151 | extern struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, |
| 151 | struct device *dev, void *driver_data); | 152 | struct device *dev, void *driver_data); |
| 152 | 153 | ||
diff --git a/include/linux/sched/clock.h b/include/linux/sched/clock.h index 4a68c6791207..34fe92ce1ebd 100644 --- a/include/linux/sched/clock.h +++ b/include/linux/sched/clock.h | |||
| @@ -54,15 +54,16 @@ static inline u64 local_clock(void) | |||
| 54 | } | 54 | } |
| 55 | #else | 55 | #else |
| 56 | extern void sched_clock_init_late(void); | 56 | extern void sched_clock_init_late(void); |
| 57 | /* | ||
| 58 | * Architectures can set this to 1 if they have specified | ||
| 59 | * CONFIG_HAVE_UNSTABLE_SCHED_CLOCK in their arch Kconfig, | ||
| 60 | * but then during bootup it turns out that sched_clock() | ||
| 61 | * is reliable after all: | ||
| 62 | */ | ||
| 63 | extern int sched_clock_stable(void); | 57 | extern int sched_clock_stable(void); |
| 64 | extern void clear_sched_clock_stable(void); | 58 | extern void clear_sched_clock_stable(void); |
| 65 | 59 | ||
| 60 | /* | ||
| 61 | * When sched_clock_stable(), __sched_clock_offset provides the offset | ||
| 62 | * between local_clock() and sched_clock(). | ||
| 63 | */ | ||
| 64 | extern u64 __sched_clock_offset; | ||
| 65 | |||
| 66 | |||
| 66 | extern void sched_clock_tick(void); | 67 | extern void sched_clock_tick(void); |
| 67 | extern void sched_clock_idle_sleep_event(void); | 68 | extern void sched_clock_idle_sleep_event(void); |
| 68 | extern void sched_clock_idle_wakeup_event(u64 delta_ns); | 69 | extern void sched_clock_idle_wakeup_event(u64 delta_ns); |
diff --git a/include/linux/stat.h b/include/linux/stat.h index c76e524fb34b..64b6b3aece21 100644 --- a/include/linux/stat.h +++ b/include/linux/stat.h | |||
| @@ -26,6 +26,7 @@ struct kstat { | |||
| 26 | unsigned int nlink; | 26 | unsigned int nlink; |
| 27 | uint32_t blksize; /* Preferred I/O size */ | 27 | uint32_t blksize; /* Preferred I/O size */ |
| 28 | u64 attributes; | 28 | u64 attributes; |
| 29 | u64 attributes_mask; | ||
| 29 | #define KSTAT_ATTR_FS_IOC_FLAGS \ | 30 | #define KSTAT_ATTR_FS_IOC_FLAGS \ |
| 30 | (STATX_ATTR_COMPRESSED | \ | 31 | (STATX_ATTR_COMPRESSED | \ |
| 31 | STATX_ATTR_IMMUTABLE | \ | 32 | STATX_ATTR_IMMUTABLE | \ |
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 1f71ee5ab518..069582ee5d7f 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -448,10 +448,9 @@ static inline int sctp_frag_point(const struct sctp_association *asoc, int pmtu) | |||
| 448 | return frag; | 448 | return frag; |
| 449 | } | 449 | } |
| 450 | 450 | ||
| 451 | static inline void sctp_assoc_pending_pmtu(struct sock *sk, struct sctp_association *asoc) | 451 | static inline void sctp_assoc_pending_pmtu(struct sctp_association *asoc) |
| 452 | { | 452 | { |
| 453 | 453 | sctp_assoc_sync_pmtu(asoc); | |
| 454 | sctp_assoc_sync_pmtu(sk, asoc); | ||
| 455 | asoc->pmtu_pending = 0; | 454 | asoc->pmtu_pending = 0; |
| 456 | } | 455 | } |
| 457 | 456 | ||
| @@ -596,12 +595,23 @@ static inline void sctp_v4_map_v6(union sctp_addr *addr) | |||
| 596 | */ | 595 | */ |
| 597 | static inline struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t) | 596 | static inline struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t) |
| 598 | { | 597 | { |
| 599 | if (t->dst && (!dst_check(t->dst, t->dst_cookie) || | 598 | if (t->dst && !dst_check(t->dst, t->dst_cookie)) |
| 600 | t->pathmtu != max_t(size_t, SCTP_TRUNC4(dst_mtu(t->dst)), | ||
| 601 | SCTP_DEFAULT_MINSEGMENT))) | ||
| 602 | sctp_transport_dst_release(t); | 599 | sctp_transport_dst_release(t); |
| 603 | 600 | ||
| 604 | return t->dst; | 601 | return t->dst; |
| 605 | } | 602 | } |
| 606 | 603 | ||
| 604 | static inline bool sctp_transport_pmtu_check(struct sctp_transport *t) | ||
| 605 | { | ||
| 606 | __u32 pmtu = max_t(size_t, SCTP_TRUNC4(dst_mtu(t->dst)), | ||
| 607 | SCTP_DEFAULT_MINSEGMENT); | ||
| 608 | |||
| 609 | if (t->pathmtu == pmtu) | ||
| 610 | return true; | ||
| 611 | |||
| 612 | t->pathmtu = pmtu; | ||
| 613 | |||
| 614 | return false; | ||
| 615 | } | ||
| 616 | |||
| 607 | #endif /* __net_sctp_h__ */ | 617 | #endif /* __net_sctp_h__ */ |
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 592decebac75..138f8615acf0 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
| @@ -377,7 +377,8 @@ typedef struct sctp_sender_hb_info { | |||
| 377 | __u64 hb_nonce; | 377 | __u64 hb_nonce; |
| 378 | } sctp_sender_hb_info_t; | 378 | } sctp_sender_hb_info_t; |
| 379 | 379 | ||
| 380 | struct sctp_stream *sctp_stream_new(__u16 incnt, __u16 outcnt, gfp_t gfp); | 380 | int sctp_stream_new(struct sctp_association *asoc, gfp_t gfp); |
| 381 | int sctp_stream_init(struct sctp_association *asoc, gfp_t gfp); | ||
| 381 | void sctp_stream_free(struct sctp_stream *stream); | 382 | void sctp_stream_free(struct sctp_stream *stream); |
| 382 | void sctp_stream_clear(struct sctp_stream *stream); | 383 | void sctp_stream_clear(struct sctp_stream *stream); |
| 383 | 384 | ||
| @@ -499,7 +500,6 @@ struct sctp_datamsg { | |||
| 499 | /* Did the messenge fail to send? */ | 500 | /* Did the messenge fail to send? */ |
| 500 | int send_error; | 501 | int send_error; |
| 501 | u8 send_failed:1, | 502 | u8 send_failed:1, |
| 502 | force_delay:1, | ||
| 503 | can_delay; /* should this message be Nagle delayed */ | 503 | can_delay; /* should this message be Nagle delayed */ |
| 504 | }; | 504 | }; |
| 505 | 505 | ||
| @@ -952,8 +952,8 @@ void sctp_transport_lower_cwnd(struct sctp_transport *, sctp_lower_cwnd_t); | |||
| 952 | void sctp_transport_burst_limited(struct sctp_transport *); | 952 | void sctp_transport_burst_limited(struct sctp_transport *); |
| 953 | void sctp_transport_burst_reset(struct sctp_transport *); | 953 | void sctp_transport_burst_reset(struct sctp_transport *); |
| 954 | unsigned long sctp_transport_timeout(struct sctp_transport *); | 954 | unsigned long sctp_transport_timeout(struct sctp_transport *); |
| 955 | void sctp_transport_reset(struct sctp_transport *); | 955 | void sctp_transport_reset(struct sctp_transport *t); |
| 956 | void sctp_transport_update_pmtu(struct sock *, struct sctp_transport *, u32); | 956 | void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu); |
| 957 | void sctp_transport_immediate_rtx(struct sctp_transport *); | 957 | void sctp_transport_immediate_rtx(struct sctp_transport *); |
| 958 | void sctp_transport_dst_release(struct sctp_transport *t); | 958 | void sctp_transport_dst_release(struct sctp_transport *t); |
| 959 | void sctp_transport_dst_confirm(struct sctp_transport *t); | 959 | void sctp_transport_dst_confirm(struct sctp_transport *t); |
| @@ -1878,6 +1878,7 @@ struct sctp_association { | |||
| 1878 | 1878 | ||
| 1879 | __u8 need_ecne:1, /* Need to send an ECNE Chunk? */ | 1879 | __u8 need_ecne:1, /* Need to send an ECNE Chunk? */ |
| 1880 | temp:1, /* Is it a temporary association? */ | 1880 | temp:1, /* Is it a temporary association? */ |
| 1881 | force_delay:1, | ||
| 1881 | prsctp_enable:1, | 1882 | prsctp_enable:1, |
| 1882 | reconf_enable:1; | 1883 | reconf_enable:1; |
| 1883 | 1884 | ||
| @@ -1953,7 +1954,7 @@ void sctp_assoc_update(struct sctp_association *old, | |||
| 1953 | 1954 | ||
| 1954 | __u32 sctp_association_get_next_tsn(struct sctp_association *); | 1955 | __u32 sctp_association_get_next_tsn(struct sctp_association *); |
| 1955 | 1956 | ||
| 1956 | void sctp_assoc_sync_pmtu(struct sock *, struct sctp_association *); | 1957 | void sctp_assoc_sync_pmtu(struct sctp_association *asoc); |
| 1957 | void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned int); | 1958 | void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned int); |
| 1958 | void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned int); | 1959 | void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned int); |
| 1959 | void sctp_assoc_set_primary(struct sctp_association *, | 1960 | void sctp_assoc_set_primary(struct sctp_association *, |
diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h index 51a6b86e3700..d538897b8e08 100644 --- a/include/uapi/linux/stat.h +++ b/include/uapi/linux/stat.h | |||
| @@ -114,7 +114,7 @@ struct statx { | |||
| 114 | __u64 stx_ino; /* Inode number */ | 114 | __u64 stx_ino; /* Inode number */ |
| 115 | __u64 stx_size; /* File size */ | 115 | __u64 stx_size; /* File size */ |
| 116 | __u64 stx_blocks; /* Number of 512-byte blocks allocated */ | 116 | __u64 stx_blocks; /* Number of 512-byte blocks allocated */ |
| 117 | __u64 __spare1[1]; | 117 | __u64 stx_attributes_mask; /* Mask to show what's supported in stx_attributes */ |
| 118 | /* 0x40 */ | 118 | /* 0x40 */ |
| 119 | struct statx_timestamp stx_atime; /* Last access time */ | 119 | struct statx_timestamp stx_atime; /* Last access time */ |
| 120 | struct statx_timestamp stx_btime; /* File creation time */ | 120 | struct statx_timestamp stx_btime; /* File creation time */ |
| @@ -152,9 +152,10 @@ struct statx { | |||
| 152 | #define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */ | 152 | #define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */ |
| 153 | #define STATX_BTIME 0x00000800U /* Want/got stx_btime */ | 153 | #define STATX_BTIME 0x00000800U /* Want/got stx_btime */ |
| 154 | #define STATX_ALL 0x00000fffU /* All currently supported flags */ | 154 | #define STATX_ALL 0x00000fffU /* All currently supported flags */ |
| 155 | #define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */ | ||
| 155 | 156 | ||
| 156 | /* | 157 | /* |
| 157 | * Attributes to be found in stx_attributes | 158 | * Attributes to be found in stx_attributes and masked in stx_attributes_mask. |
| 158 | * | 159 | * |
| 159 | * These give information about the features or the state of a file that might | 160 | * These give information about the features or the state of a file that might |
| 160 | * be of use to ordinary userspace programs such as GUIs or ls rather than | 161 | * be of use to ordinary userspace programs such as GUIs or ls rather than |
diff --git a/init/main.c b/init/main.c index f9c9d9948203..b0c11cbf5ddf 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -1022,6 +1022,8 @@ static noinline void __init kernel_init_freeable(void) | |||
| 1022 | 1022 | ||
| 1023 | workqueue_init(); | 1023 | workqueue_init(); |
| 1024 | 1024 | ||
| 1025 | init_mm_internals(); | ||
| 1026 | |||
| 1025 | do_pre_smp_initcalls(); | 1027 | do_pre_smp_initcalls(); |
| 1026 | lockup_detector_init(); | 1028 | lockup_detector_init(); |
| 1027 | 1029 | ||
diff --git a/kernel/audit.h b/kernel/audit.h index 0f1cf6d1878a..0d87f8ab8778 100644 --- a/kernel/audit.h +++ b/kernel/audit.h | |||
| @@ -333,13 +333,7 @@ extern u32 audit_sig_sid; | |||
| 333 | extern int audit_filter(int msgtype, unsigned int listtype); | 333 | extern int audit_filter(int msgtype, unsigned int listtype); |
| 334 | 334 | ||
| 335 | #ifdef CONFIG_AUDITSYSCALL | 335 | #ifdef CONFIG_AUDITSYSCALL |
| 336 | extern int __audit_signal_info(int sig, struct task_struct *t); | 336 | extern int audit_signal_info(int sig, struct task_struct *t); |
| 337 | static inline int audit_signal_info(int sig, struct task_struct *t) | ||
| 338 | { | ||
| 339 | if (auditd_test_task(t) || (audit_signals && !audit_dummy_context())) | ||
| 340 | return __audit_signal_info(sig, t); | ||
| 341 | return 0; | ||
| 342 | } | ||
| 343 | extern void audit_filter_inodes(struct task_struct *, struct audit_context *); | 337 | extern void audit_filter_inodes(struct task_struct *, struct audit_context *); |
| 344 | extern struct list_head *audit_killed_trees(void); | 338 | extern struct list_head *audit_killed_trees(void); |
| 345 | #else | 339 | #else |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index e59ffc7fc522..1c2333155893 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -2249,26 +2249,27 @@ void __audit_ptrace(struct task_struct *t) | |||
| 2249 | * If the audit subsystem is being terminated, record the task (pid) | 2249 | * If the audit subsystem is being terminated, record the task (pid) |
| 2250 | * and uid that is doing that. | 2250 | * and uid that is doing that. |
| 2251 | */ | 2251 | */ |
| 2252 | int __audit_signal_info(int sig, struct task_struct *t) | 2252 | int audit_signal_info(int sig, struct task_struct *t) |
| 2253 | { | 2253 | { |
| 2254 | struct audit_aux_data_pids *axp; | 2254 | struct audit_aux_data_pids *axp; |
| 2255 | struct task_struct *tsk = current; | 2255 | struct task_struct *tsk = current; |
| 2256 | struct audit_context *ctx = tsk->audit_context; | 2256 | struct audit_context *ctx = tsk->audit_context; |
| 2257 | kuid_t uid = current_uid(), t_uid = task_uid(t); | 2257 | kuid_t uid = current_uid(), t_uid = task_uid(t); |
| 2258 | 2258 | ||
| 2259 | if (auditd_test_task(t)) { | 2259 | if (auditd_test_task(t) && |
| 2260 | if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1 || sig == SIGUSR2) { | 2260 | (sig == SIGTERM || sig == SIGHUP || |
| 2261 | audit_sig_pid = task_tgid_nr(tsk); | 2261 | sig == SIGUSR1 || sig == SIGUSR2)) { |
| 2262 | if (uid_valid(tsk->loginuid)) | 2262 | audit_sig_pid = task_tgid_nr(tsk); |
| 2263 | audit_sig_uid = tsk->loginuid; | 2263 | if (uid_valid(tsk->loginuid)) |
| 2264 | else | 2264 | audit_sig_uid = tsk->loginuid; |
| 2265 | audit_sig_uid = uid; | 2265 | else |
| 2266 | security_task_getsecid(tsk, &audit_sig_sid); | 2266 | audit_sig_uid = uid; |
| 2267 | } | 2267 | security_task_getsecid(tsk, &audit_sig_sid); |
| 2268 | if (!audit_signals || audit_dummy_context()) | ||
| 2269 | return 0; | ||
| 2270 | } | 2268 | } |
| 2271 | 2269 | ||
| 2270 | if (!audit_signals || audit_dummy_context()) | ||
| 2271 | return 0; | ||
| 2272 | |||
| 2272 | /* optimize the common case by putting first signal recipient directly | 2273 | /* optimize the common case by putting first signal recipient directly |
| 2273 | * in audit_context */ | 2274 | * in audit_context */ |
| 2274 | if (!ctx->target_pid) { | 2275 | if (!ctx->target_pid) { |
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 796b68d00119..a834068a400e 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c | |||
| @@ -765,38 +765,56 @@ static bool is_pointer_value(struct bpf_verifier_env *env, int regno) | |||
| 765 | } | 765 | } |
| 766 | } | 766 | } |
| 767 | 767 | ||
| 768 | static int check_ptr_alignment(struct bpf_verifier_env *env, | 768 | static int check_pkt_ptr_alignment(const struct bpf_reg_state *reg, |
| 769 | struct bpf_reg_state *reg, int off, int size) | 769 | int off, int size) |
| 770 | { | 770 | { |
| 771 | if (reg->type != PTR_TO_PACKET && reg->type != PTR_TO_MAP_VALUE_ADJ) { | ||
| 772 | if (off % size != 0) { | ||
| 773 | verbose("misaligned access off %d size %d\n", | ||
| 774 | off, size); | ||
| 775 | return -EACCES; | ||
| 776 | } else { | ||
| 777 | return 0; | ||
| 778 | } | ||
| 779 | } | ||
| 780 | |||
| 781 | if (IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)) | ||
| 782 | /* misaligned access to packet is ok on x86,arm,arm64 */ | ||
| 783 | return 0; | ||
| 784 | |||
| 785 | if (reg->id && size != 1) { | 771 | if (reg->id && size != 1) { |
| 786 | verbose("Unknown packet alignment. Only byte-sized access allowed\n"); | 772 | verbose("Unknown alignment. Only byte-sized access allowed in packet access.\n"); |
| 787 | return -EACCES; | 773 | return -EACCES; |
| 788 | } | 774 | } |
| 789 | 775 | ||
| 790 | /* skb->data is NET_IP_ALIGN-ed */ | 776 | /* skb->data is NET_IP_ALIGN-ed */ |
| 791 | if (reg->type == PTR_TO_PACKET && | 777 | if ((NET_IP_ALIGN + reg->off + off) % size != 0) { |
| 792 | (NET_IP_ALIGN + reg->off + off) % size != 0) { | ||
| 793 | verbose("misaligned packet access off %d+%d+%d size %d\n", | 778 | verbose("misaligned packet access off %d+%d+%d size %d\n", |
| 794 | NET_IP_ALIGN, reg->off, off, size); | 779 | NET_IP_ALIGN, reg->off, off, size); |
| 795 | return -EACCES; | 780 | return -EACCES; |
| 796 | } | 781 | } |
| 782 | |||
| 797 | return 0; | 783 | return 0; |
| 798 | } | 784 | } |
| 799 | 785 | ||
| 786 | static int check_val_ptr_alignment(const struct bpf_reg_state *reg, | ||
| 787 | int size) | ||
| 788 | { | ||
| 789 | if (size != 1) { | ||
| 790 | verbose("Unknown alignment. Only byte-sized access allowed in value access.\n"); | ||
| 791 | return -EACCES; | ||
| 792 | } | ||
| 793 | |||
| 794 | return 0; | ||
| 795 | } | ||
| 796 | |||
| 797 | static int check_ptr_alignment(const struct bpf_reg_state *reg, | ||
| 798 | int off, int size) | ||
| 799 | { | ||
| 800 | switch (reg->type) { | ||
| 801 | case PTR_TO_PACKET: | ||
| 802 | return IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) ? 0 : | ||
| 803 | check_pkt_ptr_alignment(reg, off, size); | ||
| 804 | case PTR_TO_MAP_VALUE_ADJ: | ||
| 805 | return IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) ? 0 : | ||
| 806 | check_val_ptr_alignment(reg, size); | ||
| 807 | default: | ||
| 808 | if (off % size != 0) { | ||
| 809 | verbose("misaligned access off %d size %d\n", | ||
| 810 | off, size); | ||
| 811 | return -EACCES; | ||
| 812 | } | ||
| 813 | |||
| 814 | return 0; | ||
| 815 | } | ||
| 816 | } | ||
| 817 | |||
| 800 | /* check whether memory at (regno + off) is accessible for t = (read | write) | 818 | /* check whether memory at (regno + off) is accessible for t = (read | write) |
| 801 | * if t==write, value_regno is a register which value is stored into memory | 819 | * if t==write, value_regno is a register which value is stored into memory |
| 802 | * if t==read, value_regno is a register which will receive the value from memory | 820 | * if t==read, value_regno is a register which will receive the value from memory |
| @@ -818,7 +836,7 @@ static int check_mem_access(struct bpf_verifier_env *env, u32 regno, int off, | |||
| 818 | if (size < 0) | 836 | if (size < 0) |
| 819 | return size; | 837 | return size; |
| 820 | 838 | ||
| 821 | err = check_ptr_alignment(env, reg, off, size); | 839 | err = check_ptr_alignment(reg, off, size); |
| 822 | if (err) | 840 | if (err) |
| 823 | return err; | 841 | return err; |
| 824 | 842 | ||
| @@ -1925,6 +1943,7 @@ static int check_alu_op(struct bpf_verifier_env *env, struct bpf_insn *insn) | |||
| 1925 | * register as unknown. | 1943 | * register as unknown. |
| 1926 | */ | 1944 | */ |
| 1927 | if (env->allow_ptr_leaks && | 1945 | if (env->allow_ptr_leaks && |
| 1946 | BPF_CLASS(insn->code) == BPF_ALU64 && opcode == BPF_ADD && | ||
| 1928 | (dst_reg->type == PTR_TO_MAP_VALUE || | 1947 | (dst_reg->type == PTR_TO_MAP_VALUE || |
| 1929 | dst_reg->type == PTR_TO_MAP_VALUE_ADJ)) | 1948 | dst_reg->type == PTR_TO_MAP_VALUE_ADJ)) |
| 1930 | dst_reg->type = PTR_TO_MAP_VALUE_ADJ; | 1949 | dst_reg->type = PTR_TO_MAP_VALUE_ADJ; |
| @@ -1973,14 +1992,15 @@ static void find_good_pkt_pointers(struct bpf_verifier_state *state, | |||
| 1973 | 1992 | ||
| 1974 | for (i = 0; i < MAX_BPF_REG; i++) | 1993 | for (i = 0; i < MAX_BPF_REG; i++) |
| 1975 | if (regs[i].type == PTR_TO_PACKET && regs[i].id == dst_reg->id) | 1994 | if (regs[i].type == PTR_TO_PACKET && regs[i].id == dst_reg->id) |
| 1976 | regs[i].range = dst_reg->off; | 1995 | /* keep the maximum range already checked */ |
| 1996 | regs[i].range = max(regs[i].range, dst_reg->off); | ||
| 1977 | 1997 | ||
| 1978 | for (i = 0; i < MAX_BPF_STACK; i += BPF_REG_SIZE) { | 1998 | for (i = 0; i < MAX_BPF_STACK; i += BPF_REG_SIZE) { |
| 1979 | if (state->stack_slot_type[i] != STACK_SPILL) | 1999 | if (state->stack_slot_type[i] != STACK_SPILL) |
| 1980 | continue; | 2000 | continue; |
| 1981 | reg = &state->spilled_regs[i / BPF_REG_SIZE]; | 2001 | reg = &state->spilled_regs[i / BPF_REG_SIZE]; |
| 1982 | if (reg->type == PTR_TO_PACKET && reg->id == dst_reg->id) | 2002 | if (reg->type == PTR_TO_PACKET && reg->id == dst_reg->id) |
| 1983 | reg->range = dst_reg->off; | 2003 | reg->range = max(reg->range, dst_reg->off); |
| 1984 | } | 2004 | } |
| 1985 | } | 2005 | } |
| 1986 | 2006 | ||
diff --git a/kernel/padata.c b/kernel/padata.c index 05316c9f32da..3202aa17492c 100644 --- a/kernel/padata.c +++ b/kernel/padata.c | |||
| @@ -186,19 +186,20 @@ static struct padata_priv *padata_get_next(struct parallel_data *pd) | |||
| 186 | 186 | ||
| 187 | reorder = &next_queue->reorder; | 187 | reorder = &next_queue->reorder; |
| 188 | 188 | ||
| 189 | spin_lock(&reorder->lock); | ||
| 189 | if (!list_empty(&reorder->list)) { | 190 | if (!list_empty(&reorder->list)) { |
| 190 | padata = list_entry(reorder->list.next, | 191 | padata = list_entry(reorder->list.next, |
| 191 | struct padata_priv, list); | 192 | struct padata_priv, list); |
| 192 | 193 | ||
| 193 | spin_lock(&reorder->lock); | ||
| 194 | list_del_init(&padata->list); | 194 | list_del_init(&padata->list); |
| 195 | atomic_dec(&pd->reorder_objects); | 195 | atomic_dec(&pd->reorder_objects); |
| 196 | spin_unlock(&reorder->lock); | ||
| 197 | 196 | ||
| 198 | pd->processed++; | 197 | pd->processed++; |
| 199 | 198 | ||
| 199 | spin_unlock(&reorder->lock); | ||
| 200 | goto out; | 200 | goto out; |
| 201 | } | 201 | } |
| 202 | spin_unlock(&reorder->lock); | ||
| 202 | 203 | ||
| 203 | if (__this_cpu_read(pd->pqueue->cpu_index) == next_queue->cpu_index) { | 204 | if (__this_cpu_read(pd->pqueue->cpu_index) == next_queue->cpu_index) { |
| 204 | padata = ERR_PTR(-ENODATA); | 205 | padata = ERR_PTR(-ENODATA); |
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 0af928712174..266ddcc1d8bb 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
| @@ -184,11 +184,17 @@ static void ptrace_unfreeze_traced(struct task_struct *task) | |||
| 184 | 184 | ||
| 185 | WARN_ON(!task->ptrace || task->parent != current); | 185 | WARN_ON(!task->ptrace || task->parent != current); |
| 186 | 186 | ||
| 187 | /* | ||
| 188 | * PTRACE_LISTEN can allow ptrace_trap_notify to wake us up remotely. | ||
| 189 | * Recheck state under the lock to close this race. | ||
| 190 | */ | ||
| 187 | spin_lock_irq(&task->sighand->siglock); | 191 | spin_lock_irq(&task->sighand->siglock); |
| 188 | if (__fatal_signal_pending(task)) | 192 | if (task->state == __TASK_TRACED) { |
| 189 | wake_up_state(task, __TASK_TRACED); | 193 | if (__fatal_signal_pending(task)) |
| 190 | else | 194 | wake_up_state(task, __TASK_TRACED); |
| 191 | task->state = TASK_TRACED; | 195 | else |
| 196 | task->state = TASK_TRACED; | ||
| 197 | } | ||
| 192 | spin_unlock_irq(&task->sighand->siglock); | 198 | spin_unlock_irq(&task->sighand->siglock); |
| 193 | } | 199 | } |
| 194 | 200 | ||
diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c index a08795e21628..00a45c45beca 100644 --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c | |||
| @@ -96,10 +96,10 @@ static DEFINE_STATIC_KEY_FALSE(__sched_clock_stable); | |||
| 96 | static int __sched_clock_stable_early = 1; | 96 | static int __sched_clock_stable_early = 1; |
| 97 | 97 | ||
| 98 | /* | 98 | /* |
| 99 | * We want: ktime_get_ns() + gtod_offset == sched_clock() + raw_offset | 99 | * We want: ktime_get_ns() + __gtod_offset == sched_clock() + __sched_clock_offset |
| 100 | */ | 100 | */ |
| 101 | static __read_mostly u64 raw_offset; | 101 | __read_mostly u64 __sched_clock_offset; |
| 102 | static __read_mostly u64 gtod_offset; | 102 | static __read_mostly u64 __gtod_offset; |
| 103 | 103 | ||
| 104 | struct sched_clock_data { | 104 | struct sched_clock_data { |
| 105 | u64 tick_raw; | 105 | u64 tick_raw; |
| @@ -131,17 +131,24 @@ static void __set_sched_clock_stable(void) | |||
| 131 | /* | 131 | /* |
| 132 | * Attempt to make the (initial) unstable->stable transition continuous. | 132 | * Attempt to make the (initial) unstable->stable transition continuous. |
| 133 | */ | 133 | */ |
| 134 | raw_offset = (scd->tick_gtod + gtod_offset) - (scd->tick_raw); | 134 | __sched_clock_offset = (scd->tick_gtod + __gtod_offset) - (scd->tick_raw); |
| 135 | 135 | ||
| 136 | printk(KERN_INFO "sched_clock: Marking stable (%lld, %lld)->(%lld, %lld)\n", | 136 | printk(KERN_INFO "sched_clock: Marking stable (%lld, %lld)->(%lld, %lld)\n", |
| 137 | scd->tick_gtod, gtod_offset, | 137 | scd->tick_gtod, __gtod_offset, |
| 138 | scd->tick_raw, raw_offset); | 138 | scd->tick_raw, __sched_clock_offset); |
| 139 | 139 | ||
| 140 | static_branch_enable(&__sched_clock_stable); | 140 | static_branch_enable(&__sched_clock_stable); |
| 141 | tick_dep_clear(TICK_DEP_BIT_CLOCK_UNSTABLE); | 141 | tick_dep_clear(TICK_DEP_BIT_CLOCK_UNSTABLE); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | static void __clear_sched_clock_stable(struct work_struct *work) | 144 | static void __sched_clock_work(struct work_struct *work) |
| 145 | { | ||
| 146 | static_branch_disable(&__sched_clock_stable); | ||
| 147 | } | ||
| 148 | |||
| 149 | static DECLARE_WORK(sched_clock_work, __sched_clock_work); | ||
| 150 | |||
| 151 | static void __clear_sched_clock_stable(void) | ||
| 145 | { | 152 | { |
| 146 | struct sched_clock_data *scd = this_scd(); | 153 | struct sched_clock_data *scd = this_scd(); |
| 147 | 154 | ||
| @@ -154,17 +161,17 @@ static void __clear_sched_clock_stable(struct work_struct *work) | |||
| 154 | * | 161 | * |
| 155 | * Still do what we can. | 162 | * Still do what we can. |
| 156 | */ | 163 | */ |
| 157 | gtod_offset = (scd->tick_raw + raw_offset) - (scd->tick_gtod); | 164 | __gtod_offset = (scd->tick_raw + __sched_clock_offset) - (scd->tick_gtod); |
| 158 | 165 | ||
| 159 | printk(KERN_INFO "sched_clock: Marking unstable (%lld, %lld)<-(%lld, %lld)\n", | 166 | printk(KERN_INFO "sched_clock: Marking unstable (%lld, %lld)<-(%lld, %lld)\n", |
| 160 | scd->tick_gtod, gtod_offset, | 167 | scd->tick_gtod, __gtod_offset, |
| 161 | scd->tick_raw, raw_offset); | 168 | scd->tick_raw, __sched_clock_offset); |
| 162 | 169 | ||
| 163 | static_branch_disable(&__sched_clock_stable); | ||
| 164 | tick_dep_set(TICK_DEP_BIT_CLOCK_UNSTABLE); | 170 | tick_dep_set(TICK_DEP_BIT_CLOCK_UNSTABLE); |
| 165 | } | ||
| 166 | 171 | ||
| 167 | static DECLARE_WORK(sched_clock_work, __clear_sched_clock_stable); | 172 | if (sched_clock_stable()) |
| 173 | schedule_work(&sched_clock_work); | ||
| 174 | } | ||
| 168 | 175 | ||
| 169 | void clear_sched_clock_stable(void) | 176 | void clear_sched_clock_stable(void) |
| 170 | { | 177 | { |
| @@ -173,7 +180,7 @@ void clear_sched_clock_stable(void) | |||
| 173 | smp_mb(); /* matches sched_clock_init_late() */ | 180 | smp_mb(); /* matches sched_clock_init_late() */ |
| 174 | 181 | ||
| 175 | if (sched_clock_running == 2) | 182 | if (sched_clock_running == 2) |
| 176 | schedule_work(&sched_clock_work); | 183 | __clear_sched_clock_stable(); |
| 177 | } | 184 | } |
| 178 | 185 | ||
| 179 | void sched_clock_init_late(void) | 186 | void sched_clock_init_late(void) |
| @@ -214,7 +221,7 @@ static inline u64 wrap_max(u64 x, u64 y) | |||
| 214 | */ | 221 | */ |
| 215 | static u64 sched_clock_local(struct sched_clock_data *scd) | 222 | static u64 sched_clock_local(struct sched_clock_data *scd) |
| 216 | { | 223 | { |
| 217 | u64 now, clock, old_clock, min_clock, max_clock; | 224 | u64 now, clock, old_clock, min_clock, max_clock, gtod; |
| 218 | s64 delta; | 225 | s64 delta; |
| 219 | 226 | ||
| 220 | again: | 227 | again: |
| @@ -231,9 +238,10 @@ again: | |||
| 231 | * scd->tick_gtod + TICK_NSEC); | 238 | * scd->tick_gtod + TICK_NSEC); |
| 232 | */ | 239 | */ |
| 233 | 240 | ||
| 234 | clock = scd->tick_gtod + gtod_offset + delta; | 241 | gtod = scd->tick_gtod + __gtod_offset; |
| 235 | min_clock = wrap_max(scd->tick_gtod, old_clock); | 242 | clock = gtod + delta; |
| 236 | max_clock = wrap_max(old_clock, scd->tick_gtod + TICK_NSEC); | 243 | min_clock = wrap_max(gtod, old_clock); |
| 244 | max_clock = wrap_max(old_clock, gtod + TICK_NSEC); | ||
| 237 | 245 | ||
| 238 | clock = wrap_max(clock, min_clock); | 246 | clock = wrap_max(clock, min_clock); |
| 239 | clock = wrap_min(clock, max_clock); | 247 | clock = wrap_min(clock, max_clock); |
| @@ -317,7 +325,7 @@ u64 sched_clock_cpu(int cpu) | |||
| 317 | u64 clock; | 325 | u64 clock; |
| 318 | 326 | ||
| 319 | if (sched_clock_stable()) | 327 | if (sched_clock_stable()) |
| 320 | return sched_clock() + raw_offset; | 328 | return sched_clock() + __sched_clock_offset; |
| 321 | 329 | ||
| 322 | if (unlikely(!sched_clock_running)) | 330 | if (unlikely(!sched_clock_running)) |
| 323 | return 0ull; | 331 | return 0ull; |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index acf0a5a06da7..8c8714fcb53c 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -2133,9 +2133,12 @@ static int do_proc_douintvec_conv(bool *negp, unsigned long *lvalp, | |||
| 2133 | if (write) { | 2133 | if (write) { |
| 2134 | if (*negp) | 2134 | if (*negp) |
| 2135 | return -EINVAL; | 2135 | return -EINVAL; |
| 2136 | if (*lvalp > UINT_MAX) | ||
| 2137 | return -EINVAL; | ||
| 2136 | *valp = *lvalp; | 2138 | *valp = *lvalp; |
| 2137 | } else { | 2139 | } else { |
| 2138 | unsigned int val = *valp; | 2140 | unsigned int val = *valp; |
| 2141 | *negp = false; | ||
| 2139 | *lvalp = (unsigned long)val; | 2142 | *lvalp = (unsigned long)val; |
| 2140 | } | 2143 | } |
| 2141 | return 0; | 2144 | return 0; |
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 96fc3c043ad6..54e7a90db848 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -4826,9 +4826,9 @@ static __init int test_ringbuffer(void) | |||
| 4826 | rb_data[cpu].cnt = cpu; | 4826 | rb_data[cpu].cnt = cpu; |
| 4827 | rb_threads[cpu] = kthread_create(rb_test, &rb_data[cpu], | 4827 | rb_threads[cpu] = kthread_create(rb_test, &rb_data[cpu], |
| 4828 | "rbtester/%d", cpu); | 4828 | "rbtester/%d", cpu); |
| 4829 | if (WARN_ON(!rb_threads[cpu])) { | 4829 | if (WARN_ON(IS_ERR(rb_threads[cpu]))) { |
| 4830 | pr_cont("FAILED\n"); | 4830 | pr_cont("FAILED\n"); |
| 4831 | ret = -1; | 4831 | ret = PTR_ERR(rb_threads[cpu]); |
| 4832 | goto out_free; | 4832 | goto out_free; |
| 4833 | } | 4833 | } |
| 4834 | 4834 | ||
| @@ -4838,9 +4838,9 @@ static __init int test_ringbuffer(void) | |||
| 4838 | 4838 | ||
| 4839 | /* Now create the rb hammer! */ | 4839 | /* Now create the rb hammer! */ |
| 4840 | rb_hammer = kthread_run(rb_hammer_test, NULL, "rbhammer"); | 4840 | rb_hammer = kthread_run(rb_hammer_test, NULL, "rbhammer"); |
| 4841 | if (WARN_ON(!rb_hammer)) { | 4841 | if (WARN_ON(IS_ERR(rb_hammer))) { |
| 4842 | pr_cont("FAILED\n"); | 4842 | pr_cont("FAILED\n"); |
| 4843 | ret = -1; | 4843 | ret = PTR_ERR(rb_hammer); |
| 4844 | goto out_free; | 4844 | goto out_free; |
| 4845 | } | 4845 | } |
| 4846 | 4846 | ||
diff --git a/lib/syscall.c b/lib/syscall.c index 17d5ff5fa6a3..2c6cd1b5c3ea 100644 --- a/lib/syscall.c +++ b/lib/syscall.c | |||
| @@ -12,6 +12,7 @@ static int collect_syscall(struct task_struct *target, long *callno, | |||
| 12 | 12 | ||
| 13 | if (!try_get_task_stack(target)) { | 13 | if (!try_get_task_stack(target)) { |
| 14 | /* Task has no stack, so the task isn't in a syscall. */ | 14 | /* Task has no stack, so the task isn't in a syscall. */ |
| 15 | *sp = *pc = 0; | ||
| 15 | *callno = -1; | 16 | *callno = -1; |
| 16 | return 0; | 17 | return 0; |
| 17 | } | 18 | } |
diff --git a/lib/test_kasan.c b/lib/test_kasan.c index 0b1d3140fbb8..a25c9763fce1 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/uaccess.h> | 21 | #include <linux/uaccess.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/kasan.h> | ||
| 23 | 24 | ||
| 24 | /* | 25 | /* |
| 25 | * Note: test functions are marked noinline so that their names appear in | 26 | * Note: test functions are marked noinline so that their names appear in |
| @@ -474,6 +475,12 @@ static noinline void __init use_after_scope_test(void) | |||
| 474 | 475 | ||
| 475 | static int __init kmalloc_tests_init(void) | 476 | static int __init kmalloc_tests_init(void) |
| 476 | { | 477 | { |
| 478 | /* | ||
| 479 | * Temporarily enable multi-shot mode. Otherwise, we'd only get a | ||
| 480 | * report for the first case. | ||
| 481 | */ | ||
| 482 | bool multishot = kasan_save_enable_multi_shot(); | ||
| 483 | |||
| 477 | kmalloc_oob_right(); | 484 | kmalloc_oob_right(); |
| 478 | kmalloc_oob_left(); | 485 | kmalloc_oob_left(); |
| 479 | kmalloc_node_oob_right(); | 486 | kmalloc_node_oob_right(); |
| @@ -499,6 +506,9 @@ static int __init kmalloc_tests_init(void) | |||
| 499 | ksize_unpoisons_memory(); | 506 | ksize_unpoisons_memory(); |
| 500 | copy_user_test(); | 507 | copy_user_test(); |
| 501 | use_after_scope_test(); | 508 | use_after_scope_test(); |
| 509 | |||
| 510 | kasan_restore_multi_shot(multishot); | ||
| 511 | |||
| 502 | return -EAGAIN; | 512 | return -EAGAIN; |
| 503 | } | 513 | } |
| 504 | 514 | ||
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 1ebc93e179f3..fef4cf210cc7 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c | |||
| @@ -240,18 +240,18 @@ static ssize_t defrag_store(struct kobject *kobj, | |||
| 240 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG, &transparent_hugepage_flags); | 240 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG, &transparent_hugepage_flags); |
| 241 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG, &transparent_hugepage_flags); | 241 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG, &transparent_hugepage_flags); |
| 242 | set_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, &transparent_hugepage_flags); | 242 | set_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, &transparent_hugepage_flags); |
| 243 | } else if (!memcmp("defer", buf, | ||
| 244 | min(sizeof("defer")-1, count))) { | ||
| 245 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, &transparent_hugepage_flags); | ||
| 246 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG, &transparent_hugepage_flags); | ||
| 247 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG, &transparent_hugepage_flags); | ||
| 248 | set_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG, &transparent_hugepage_flags); | ||
| 249 | } else if (!memcmp("defer+madvise", buf, | 243 | } else if (!memcmp("defer+madvise", buf, |
| 250 | min(sizeof("defer+madvise")-1, count))) { | 244 | min(sizeof("defer+madvise")-1, count))) { |
| 251 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, &transparent_hugepage_flags); | 245 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, &transparent_hugepage_flags); |
| 252 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG, &transparent_hugepage_flags); | 246 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG, &transparent_hugepage_flags); |
| 253 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG, &transparent_hugepage_flags); | 247 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG, &transparent_hugepage_flags); |
| 254 | set_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG, &transparent_hugepage_flags); | 248 | set_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG, &transparent_hugepage_flags); |
| 249 | } else if (!memcmp("defer", buf, | ||
| 250 | min(sizeof("defer")-1, count))) { | ||
| 251 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, &transparent_hugepage_flags); | ||
| 252 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG, &transparent_hugepage_flags); | ||
| 253 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG, &transparent_hugepage_flags); | ||
| 254 | set_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG, &transparent_hugepage_flags); | ||
| 255 | } else if (!memcmp("madvise", buf, | 255 | } else if (!memcmp("madvise", buf, |
| 256 | min(sizeof("madvise")-1, count))) { | 256 | min(sizeof("madvise")-1, count))) { |
| 257 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, &transparent_hugepage_flags); | 257 | clear_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, &transparent_hugepage_flags); |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 3d0aab9ee80d..e5828875f7bb 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -4403,7 +4403,9 @@ int hugetlb_reserve_pages(struct inode *inode, | |||
| 4403 | return 0; | 4403 | return 0; |
| 4404 | out_err: | 4404 | out_err: |
| 4405 | if (!vma || vma->vm_flags & VM_MAYSHARE) | 4405 | if (!vma || vma->vm_flags & VM_MAYSHARE) |
| 4406 | region_abort(resv_map, from, to); | 4406 | /* Don't call region_abort if region_chg failed */ |
| 4407 | if (chg >= 0) | ||
| 4408 | region_abort(resv_map, from, to); | ||
| 4407 | if (vma && is_vma_resv_set(vma, HPAGE_RESV_OWNER)) | 4409 | if (vma && is_vma_resv_set(vma, HPAGE_RESV_OWNER)) |
| 4408 | kref_put(&resv_map->refs, resv_map_release); | 4410 | kref_put(&resv_map->refs, resv_map_release); |
| 4409 | return ret; | 4411 | return ret; |
| @@ -4651,6 +4653,7 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address, | |||
| 4651 | { | 4653 | { |
| 4652 | struct page *page = NULL; | 4654 | struct page *page = NULL; |
| 4653 | spinlock_t *ptl; | 4655 | spinlock_t *ptl; |
| 4656 | pte_t pte; | ||
| 4654 | retry: | 4657 | retry: |
| 4655 | ptl = pmd_lockptr(mm, pmd); | 4658 | ptl = pmd_lockptr(mm, pmd); |
| 4656 | spin_lock(ptl); | 4659 | spin_lock(ptl); |
| @@ -4660,12 +4663,13 @@ retry: | |||
| 4660 | */ | 4663 | */ |
| 4661 | if (!pmd_huge(*pmd)) | 4664 | if (!pmd_huge(*pmd)) |
| 4662 | goto out; | 4665 | goto out; |
| 4663 | if (pmd_present(*pmd)) { | 4666 | pte = huge_ptep_get((pte_t *)pmd); |
| 4667 | if (pte_present(pte)) { | ||
| 4664 | page = pmd_page(*pmd) + ((address & ~PMD_MASK) >> PAGE_SHIFT); | 4668 | page = pmd_page(*pmd) + ((address & ~PMD_MASK) >> PAGE_SHIFT); |
| 4665 | if (flags & FOLL_GET) | 4669 | if (flags & FOLL_GET) |
| 4666 | get_page(page); | 4670 | get_page(page); |
| 4667 | } else { | 4671 | } else { |
| 4668 | if (is_hugetlb_entry_migration(huge_ptep_get((pte_t *)pmd))) { | 4672 | if (is_hugetlb_entry_migration(pte)) { |
| 4669 | spin_unlock(ptl); | 4673 | spin_unlock(ptl); |
| 4670 | __migration_entry_wait(mm, (pte_t *)pmd, ptl); | 4674 | __migration_entry_wait(mm, (pte_t *)pmd, ptl); |
| 4671 | goto retry; | 4675 | goto retry; |
diff --git a/mm/internal.h b/mm/internal.h index ccfc2a2969f4..266efaeaa370 100644 --- a/mm/internal.h +++ b/mm/internal.h | |||
| @@ -481,6 +481,13 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone, | |||
| 481 | enum ttu_flags; | 481 | enum ttu_flags; |
| 482 | struct tlbflush_unmap_batch; | 482 | struct tlbflush_unmap_batch; |
| 483 | 483 | ||
| 484 | |||
| 485 | /* | ||
| 486 | * only for MM internal work items which do not depend on | ||
| 487 | * any allocations or locks which might depend on allocations | ||
| 488 | */ | ||
| 489 | extern struct workqueue_struct *mm_percpu_wq; | ||
| 490 | |||
| 484 | #ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH | 491 | #ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH |
| 485 | void try_to_unmap_flush(void); | 492 | void try_to_unmap_flush(void); |
| 486 | void try_to_unmap_flush_dirty(void); | 493 | void try_to_unmap_flush_dirty(void); |
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 1c260e6b3b3c..dd2dea8eb077 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h | |||
| @@ -96,11 +96,6 @@ static inline const void *kasan_shadow_to_mem(const void *shadow_addr) | |||
| 96 | << KASAN_SHADOW_SCALE_SHIFT); | 96 | << KASAN_SHADOW_SCALE_SHIFT); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | static inline bool kasan_report_enabled(void) | ||
| 100 | { | ||
| 101 | return !current->kasan_depth; | ||
| 102 | } | ||
| 103 | |||
| 104 | void kasan_report(unsigned long addr, size_t size, | 99 | void kasan_report(unsigned long addr, size_t size, |
| 105 | bool is_write, unsigned long ip); | 100 | bool is_write, unsigned long ip); |
| 106 | void kasan_report_double_free(struct kmem_cache *cache, void *object, | 101 | void kasan_report_double_free(struct kmem_cache *cache, void *object, |
diff --git a/mm/kasan/report.c b/mm/kasan/report.c index f479365530b6..ab42a0803f16 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c | |||
| @@ -13,7 +13,9 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/bitops.h> | ||
| 16 | #include <linux/ftrace.h> | 17 | #include <linux/ftrace.h> |
| 18 | #include <linux/init.h> | ||
| 17 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 18 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 19 | #include <linux/printk.h> | 21 | #include <linux/printk.h> |
| @@ -293,6 +295,40 @@ static void kasan_report_error(struct kasan_access_info *info) | |||
| 293 | kasan_end_report(&flags); | 295 | kasan_end_report(&flags); |
| 294 | } | 296 | } |
| 295 | 297 | ||
| 298 | static unsigned long kasan_flags; | ||
| 299 | |||
| 300 | #define KASAN_BIT_REPORTED 0 | ||
| 301 | #define KASAN_BIT_MULTI_SHOT 1 | ||
| 302 | |||
| 303 | bool kasan_save_enable_multi_shot(void) | ||
| 304 | { | ||
| 305 | return test_and_set_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags); | ||
| 306 | } | ||
| 307 | EXPORT_SYMBOL_GPL(kasan_save_enable_multi_shot); | ||
| 308 | |||
| 309 | void kasan_restore_multi_shot(bool enabled) | ||
| 310 | { | ||
| 311 | if (!enabled) | ||
| 312 | clear_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags); | ||
| 313 | } | ||
| 314 | EXPORT_SYMBOL_GPL(kasan_restore_multi_shot); | ||
| 315 | |||
| 316 | static int __init kasan_set_multi_shot(char *str) | ||
| 317 | { | ||
| 318 | set_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags); | ||
| 319 | return 1; | ||
| 320 | } | ||
| 321 | __setup("kasan_multi_shot", kasan_set_multi_shot); | ||
| 322 | |||
| 323 | static inline bool kasan_report_enabled(void) | ||
| 324 | { | ||
| 325 | if (current->kasan_depth) | ||
| 326 | return false; | ||
| 327 | if (test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) | ||
| 328 | return true; | ||
| 329 | return !test_and_set_bit(KASAN_BIT_REPORTED, &kasan_flags); | ||
| 330 | } | ||
| 331 | |||
| 296 | void kasan_report(unsigned long addr, size_t size, | 332 | void kasan_report(unsigned long addr, size_t size, |
| 297 | bool is_write, unsigned long ip) | 333 | bool is_write, unsigned long ip) |
| 298 | { | 334 | { |
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 26c874e90b12..20036d4f9f13 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c | |||
| @@ -1416,7 +1416,7 @@ static void kmemleak_scan(void) | |||
| 1416 | /* data/bss scanning */ | 1416 | /* data/bss scanning */ |
| 1417 | scan_large_block(_sdata, _edata); | 1417 | scan_large_block(_sdata, _edata); |
| 1418 | scan_large_block(__bss_start, __bss_stop); | 1418 | scan_large_block(__bss_start, __bss_stop); |
| 1419 | scan_large_block(__start_data_ro_after_init, __end_data_ro_after_init); | 1419 | scan_large_block(__start_ro_after_init, __end_ro_after_init); |
| 1420 | 1420 | ||
| 1421 | #ifdef CONFIG_SMP | 1421 | #ifdef CONFIG_SMP |
| 1422 | /* per-cpu sections scanning */ | 1422 | /* per-cpu sections scanning */ |
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 75b2745bac41..37d0b334bfe9 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
| @@ -1529,7 +1529,6 @@ COMPAT_SYSCALL_DEFINE5(get_mempolicy, int __user *, policy, | |||
| 1529 | COMPAT_SYSCALL_DEFINE3(set_mempolicy, int, mode, compat_ulong_t __user *, nmask, | 1529 | COMPAT_SYSCALL_DEFINE3(set_mempolicy, int, mode, compat_ulong_t __user *, nmask, |
| 1530 | compat_ulong_t, maxnode) | 1530 | compat_ulong_t, maxnode) |
| 1531 | { | 1531 | { |
| 1532 | long err = 0; | ||
| 1533 | unsigned long __user *nm = NULL; | 1532 | unsigned long __user *nm = NULL; |
| 1534 | unsigned long nr_bits, alloc_size; | 1533 | unsigned long nr_bits, alloc_size; |
| 1535 | DECLARE_BITMAP(bm, MAX_NUMNODES); | 1534 | DECLARE_BITMAP(bm, MAX_NUMNODES); |
| @@ -1538,14 +1537,13 @@ COMPAT_SYSCALL_DEFINE3(set_mempolicy, int, mode, compat_ulong_t __user *, nmask, | |||
| 1538 | alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8; | 1537 | alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8; |
| 1539 | 1538 | ||
| 1540 | if (nmask) { | 1539 | if (nmask) { |
| 1541 | err = compat_get_bitmap(bm, nmask, nr_bits); | 1540 | if (compat_get_bitmap(bm, nmask, nr_bits)) |
| 1541 | return -EFAULT; | ||
| 1542 | nm = compat_alloc_user_space(alloc_size); | 1542 | nm = compat_alloc_user_space(alloc_size); |
| 1543 | err |= copy_to_user(nm, bm, alloc_size); | 1543 | if (copy_to_user(nm, bm, alloc_size)) |
| 1544 | return -EFAULT; | ||
| 1544 | } | 1545 | } |
| 1545 | 1546 | ||
| 1546 | if (err) | ||
| 1547 | return -EFAULT; | ||
| 1548 | |||
| 1549 | return sys_set_mempolicy(mode, nm, nr_bits+1); | 1547 | return sys_set_mempolicy(mode, nm, nr_bits+1); |
| 1550 | } | 1548 | } |
| 1551 | 1549 | ||
| @@ -1553,7 +1551,6 @@ COMPAT_SYSCALL_DEFINE6(mbind, compat_ulong_t, start, compat_ulong_t, len, | |||
| 1553 | compat_ulong_t, mode, compat_ulong_t __user *, nmask, | 1551 | compat_ulong_t, mode, compat_ulong_t __user *, nmask, |
| 1554 | compat_ulong_t, maxnode, compat_ulong_t, flags) | 1552 | compat_ulong_t, maxnode, compat_ulong_t, flags) |
| 1555 | { | 1553 | { |
| 1556 | long err = 0; | ||
| 1557 | unsigned long __user *nm = NULL; | 1554 | unsigned long __user *nm = NULL; |
| 1558 | unsigned long nr_bits, alloc_size; | 1555 | unsigned long nr_bits, alloc_size; |
| 1559 | nodemask_t bm; | 1556 | nodemask_t bm; |
| @@ -1562,14 +1559,13 @@ COMPAT_SYSCALL_DEFINE6(mbind, compat_ulong_t, start, compat_ulong_t, len, | |||
| 1562 | alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8; | 1559 | alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8; |
| 1563 | 1560 | ||
| 1564 | if (nmask) { | 1561 | if (nmask) { |
| 1565 | err = compat_get_bitmap(nodes_addr(bm), nmask, nr_bits); | 1562 | if (compat_get_bitmap(nodes_addr(bm), nmask, nr_bits)) |
| 1563 | return -EFAULT; | ||
| 1566 | nm = compat_alloc_user_space(alloc_size); | 1564 | nm = compat_alloc_user_space(alloc_size); |
| 1567 | err |= copy_to_user(nm, nodes_addr(bm), alloc_size); | 1565 | if (copy_to_user(nm, nodes_addr(bm), alloc_size)) |
| 1566 | return -EFAULT; | ||
| 1568 | } | 1567 | } |
| 1569 | 1568 | ||
| 1570 | if (err) | ||
| 1571 | return -EFAULT; | ||
| 1572 | |||
| 1573 | return sys_mbind(start, len, mode, nm, nr_bits+1, flags); | 1569 | return sys_mbind(start, len, mode, nm, nr_bits+1, flags); |
| 1574 | } | 1570 | } |
| 1575 | 1571 | ||
diff --git a/mm/migrate.c b/mm/migrate.c index 9a0897a14d37..ed97c2c14fa8 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -209,8 +209,11 @@ static int remove_migration_pte(struct page *page, struct vm_area_struct *vma, | |||
| 209 | 209 | ||
| 210 | VM_BUG_ON_PAGE(PageTail(page), page); | 210 | VM_BUG_ON_PAGE(PageTail(page), page); |
| 211 | while (page_vma_mapped_walk(&pvmw)) { | 211 | while (page_vma_mapped_walk(&pvmw)) { |
| 212 | new = page - pvmw.page->index + | 212 | if (PageKsm(page)) |
| 213 | linear_page_index(vma, pvmw.address); | 213 | new = page; |
| 214 | else | ||
| 215 | new = page - pvmw.page->index + | ||
| 216 | linear_page_index(vma, pvmw.address); | ||
| 214 | 217 | ||
| 215 | get_page(new); | 218 | get_page(new); |
| 216 | pte = pte_mkold(mk_pte(new, READ_ONCE(vma->vm_page_prot))); | 219 | pte = pte_mkold(mk_pte(new, READ_ONCE(vma->vm_page_prot))); |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6cbde310abed..f3d603cef2c0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -2373,6 +2373,13 @@ void drain_all_pages(struct zone *zone) | |||
| 2373 | */ | 2373 | */ |
| 2374 | static cpumask_t cpus_with_pcps; | 2374 | static cpumask_t cpus_with_pcps; |
| 2375 | 2375 | ||
| 2376 | /* | ||
| 2377 | * Make sure nobody triggers this path before mm_percpu_wq is fully | ||
| 2378 | * initialized. | ||
| 2379 | */ | ||
| 2380 | if (WARN_ON_ONCE(!mm_percpu_wq)) | ||
| 2381 | return; | ||
| 2382 | |||
| 2376 | /* Workqueues cannot recurse */ | 2383 | /* Workqueues cannot recurse */ |
| 2377 | if (current->flags & PF_WQ_WORKER) | 2384 | if (current->flags & PF_WQ_WORKER) |
| 2378 | return; | 2385 | return; |
| @@ -2422,7 +2429,7 @@ void drain_all_pages(struct zone *zone) | |||
| 2422 | for_each_cpu(cpu, &cpus_with_pcps) { | 2429 | for_each_cpu(cpu, &cpus_with_pcps) { |
| 2423 | struct work_struct *work = per_cpu_ptr(&pcpu_drain, cpu); | 2430 | struct work_struct *work = per_cpu_ptr(&pcpu_drain, cpu); |
| 2424 | INIT_WORK(work, drain_local_pages_wq); | 2431 | INIT_WORK(work, drain_local_pages_wq); |
| 2425 | schedule_work_on(cpu, work); | 2432 | queue_work_on(cpu, mm_percpu_wq, work); |
| 2426 | } | 2433 | } |
| 2427 | for_each_cpu(cpu, &cpus_with_pcps) | 2434 | for_each_cpu(cpu, &cpus_with_pcps) |
| 2428 | flush_work(per_cpu_ptr(&pcpu_drain, cpu)); | 2435 | flush_work(per_cpu_ptr(&pcpu_drain, cpu)); |
| @@ -4519,13 +4526,13 @@ void show_free_areas(unsigned int filter, nodemask_t *nodemask) | |||
| 4519 | K(node_page_state(pgdat, NR_FILE_MAPPED)), | 4526 | K(node_page_state(pgdat, NR_FILE_MAPPED)), |
| 4520 | K(node_page_state(pgdat, NR_FILE_DIRTY)), | 4527 | K(node_page_state(pgdat, NR_FILE_DIRTY)), |
| 4521 | K(node_page_state(pgdat, NR_WRITEBACK)), | 4528 | K(node_page_state(pgdat, NR_WRITEBACK)), |
| 4529 | K(node_page_state(pgdat, NR_SHMEM)), | ||
| 4522 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 4530 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
| 4523 | K(node_page_state(pgdat, NR_SHMEM_THPS) * HPAGE_PMD_NR), | 4531 | K(node_page_state(pgdat, NR_SHMEM_THPS) * HPAGE_PMD_NR), |
| 4524 | K(node_page_state(pgdat, NR_SHMEM_PMDMAPPED) | 4532 | K(node_page_state(pgdat, NR_SHMEM_PMDMAPPED) |
| 4525 | * HPAGE_PMD_NR), | 4533 | * HPAGE_PMD_NR), |
| 4526 | K(node_page_state(pgdat, NR_ANON_THPS) * HPAGE_PMD_NR), | 4534 | K(node_page_state(pgdat, NR_ANON_THPS) * HPAGE_PMD_NR), |
| 4527 | #endif | 4535 | #endif |
| 4528 | K(node_page_state(pgdat, NR_SHMEM)), | ||
| 4529 | K(node_page_state(pgdat, NR_WRITEBACK_TEMP)), | 4536 | K(node_page_state(pgdat, NR_WRITEBACK_TEMP)), |
| 4530 | K(node_page_state(pgdat, NR_UNSTABLE_NFS)), | 4537 | K(node_page_state(pgdat, NR_UNSTABLE_NFS)), |
| 4531 | node_page_state(pgdat, NR_PAGES_SCANNED), | 4538 | node_page_state(pgdat, NR_PAGES_SCANNED), |
diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index c4c9def8ffea..de9c40d7304a 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c | |||
| @@ -111,12 +111,8 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) | |||
| 111 | if (pvmw->pmd && !pvmw->pte) | 111 | if (pvmw->pmd && !pvmw->pte) |
| 112 | return not_found(pvmw); | 112 | return not_found(pvmw); |
| 113 | 113 | ||
| 114 | /* Only for THP, seek to next pte entry makes sense */ | 114 | if (pvmw->pte) |
| 115 | if (pvmw->pte) { | ||
| 116 | if (!PageTransHuge(pvmw->page) || PageHuge(pvmw->page)) | ||
| 117 | return not_found(pvmw); | ||
| 118 | goto next_pte; | 115 | goto next_pte; |
| 119 | } | ||
| 120 | 116 | ||
| 121 | if (unlikely(PageHuge(pvmw->page))) { | 117 | if (unlikely(PageHuge(pvmw->page))) { |
| 122 | /* when pud is not present, pte will be NULL */ | 118 | /* when pud is not present, pte will be NULL */ |
| @@ -165,9 +161,14 @@ restart: | |||
| 165 | while (1) { | 161 | while (1) { |
| 166 | if (check_pte(pvmw)) | 162 | if (check_pte(pvmw)) |
| 167 | return true; | 163 | return true; |
| 168 | next_pte: do { | 164 | next_pte: |
| 165 | /* Seek to next pte only makes sense for THP */ | ||
| 166 | if (!PageTransHuge(pvmw->page) || PageHuge(pvmw->page)) | ||
| 167 | return not_found(pvmw); | ||
| 168 | do { | ||
| 169 | pvmw->address += PAGE_SIZE; | 169 | pvmw->address += PAGE_SIZE; |
| 170 | if (pvmw->address >= | 170 | if (pvmw->address >= pvmw->vma->vm_end || |
| 171 | pvmw->address >= | ||
| 171 | __vma_address(pvmw->page, pvmw->vma) + | 172 | __vma_address(pvmw->page, pvmw->vma) + |
| 172 | hpage_nr_pages(pvmw->page) * PAGE_SIZE) | 173 | hpage_nr_pages(pvmw->page) * PAGE_SIZE) |
| 173 | return not_found(pvmw); | 174 | return not_found(pvmw); |
| @@ -1159,7 +1159,7 @@ void page_add_file_rmap(struct page *page, bool compound) | |||
| 1159 | goto out; | 1159 | goto out; |
| 1160 | } | 1160 | } |
| 1161 | __mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, nr); | 1161 | __mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, nr); |
| 1162 | mem_cgroup_inc_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED); | 1162 | mem_cgroup_update_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED, nr); |
| 1163 | out: | 1163 | out: |
| 1164 | unlock_page_memcg(page); | 1164 | unlock_page_memcg(page); |
| 1165 | } | 1165 | } |
| @@ -1199,7 +1199,7 @@ static void page_remove_file_rmap(struct page *page, bool compound) | |||
| 1199 | * pte lock(a spinlock) is held, which implies preemption disabled. | 1199 | * pte lock(a spinlock) is held, which implies preemption disabled. |
| 1200 | */ | 1200 | */ |
| 1201 | __mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, -nr); | 1201 | __mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, -nr); |
| 1202 | mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED); | 1202 | mem_cgroup_update_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED, -nr); |
| 1203 | 1203 | ||
| 1204 | if (unlikely(PageMlocked(page))) | 1204 | if (unlikely(PageMlocked(page))) |
| 1205 | clear_page_mlock(page); | 1205 | clear_page_mlock(page); |
| @@ -670,30 +670,19 @@ static void lru_add_drain_per_cpu(struct work_struct *dummy) | |||
| 670 | 670 | ||
| 671 | static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work); | 671 | static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work); |
| 672 | 672 | ||
| 673 | /* | ||
| 674 | * lru_add_drain_wq is used to do lru_add_drain_all() from a WQ_MEM_RECLAIM | ||
| 675 | * workqueue, aiding in getting memory freed. | ||
| 676 | */ | ||
| 677 | static struct workqueue_struct *lru_add_drain_wq; | ||
| 678 | |||
| 679 | static int __init lru_init(void) | ||
| 680 | { | ||
| 681 | lru_add_drain_wq = alloc_workqueue("lru-add-drain", WQ_MEM_RECLAIM, 0); | ||
| 682 | |||
| 683 | if (WARN(!lru_add_drain_wq, | ||
| 684 | "Failed to create workqueue lru_add_drain_wq")) | ||
| 685 | return -ENOMEM; | ||
| 686 | |||
| 687 | return 0; | ||
| 688 | } | ||
| 689 | early_initcall(lru_init); | ||
| 690 | |||
| 691 | void lru_add_drain_all(void) | 673 | void lru_add_drain_all(void) |
| 692 | { | 674 | { |
| 693 | static DEFINE_MUTEX(lock); | 675 | static DEFINE_MUTEX(lock); |
| 694 | static struct cpumask has_work; | 676 | static struct cpumask has_work; |
| 695 | int cpu; | 677 | int cpu; |
| 696 | 678 | ||
| 679 | /* | ||
| 680 | * Make sure nobody triggers this path before mm_percpu_wq is fully | ||
| 681 | * initialized. | ||
| 682 | */ | ||
| 683 | if (WARN_ON(!mm_percpu_wq)) | ||
| 684 | return; | ||
| 685 | |||
| 697 | mutex_lock(&lock); | 686 | mutex_lock(&lock); |
| 698 | get_online_cpus(); | 687 | get_online_cpus(); |
| 699 | cpumask_clear(&has_work); | 688 | cpumask_clear(&has_work); |
| @@ -707,7 +696,7 @@ void lru_add_drain_all(void) | |||
| 707 | pagevec_count(&per_cpu(lru_deactivate_pvecs, cpu)) || | 696 | pagevec_count(&per_cpu(lru_deactivate_pvecs, cpu)) || |
| 708 | need_activate_page_drain(cpu)) { | 697 | need_activate_page_drain(cpu)) { |
| 709 | INIT_WORK(work, lru_add_drain_per_cpu); | 698 | INIT_WORK(work, lru_add_drain_per_cpu); |
| 710 | queue_work_on(cpu, lru_add_drain_wq, work); | 699 | queue_work_on(cpu, mm_percpu_wq, work); |
| 711 | cpumask_set_cpu(cpu, &has_work); | 700 | cpumask_set_cpu(cpu, &has_work); |
| 712 | } | 701 | } |
| 713 | } | 702 | } |
diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c index 310ac0b8f974..ac6318a064d3 100644 --- a/mm/swap_cgroup.c +++ b/mm/swap_cgroup.c | |||
| @@ -201,6 +201,8 @@ void swap_cgroup_swapoff(int type) | |||
| 201 | struct page *page = map[i]; | 201 | struct page *page = map[i]; |
| 202 | if (page) | 202 | if (page) |
| 203 | __free_page(page); | 203 | __free_page(page); |
| 204 | if (!(i % SWAP_CLUSTER_MAX)) | ||
| 205 | cond_resched(); | ||
| 204 | } | 206 | } |
| 205 | vfree(map); | 207 | vfree(map); |
| 206 | } | 208 | } |
diff --git a/mm/vmstat.c b/mm/vmstat.c index b1947f0cbee2..809025ed97ea 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
| @@ -1552,7 +1552,6 @@ static const struct file_operations proc_vmstat_file_operations = { | |||
| 1552 | #endif /* CONFIG_PROC_FS */ | 1552 | #endif /* CONFIG_PROC_FS */ |
| 1553 | 1553 | ||
| 1554 | #ifdef CONFIG_SMP | 1554 | #ifdef CONFIG_SMP |
| 1555 | static struct workqueue_struct *vmstat_wq; | ||
| 1556 | static DEFINE_PER_CPU(struct delayed_work, vmstat_work); | 1555 | static DEFINE_PER_CPU(struct delayed_work, vmstat_work); |
| 1557 | int sysctl_stat_interval __read_mostly = HZ; | 1556 | int sysctl_stat_interval __read_mostly = HZ; |
| 1558 | 1557 | ||
| @@ -1623,7 +1622,7 @@ static void vmstat_update(struct work_struct *w) | |||
| 1623 | * to occur in the future. Keep on running the | 1622 | * to occur in the future. Keep on running the |
| 1624 | * update worker thread. | 1623 | * update worker thread. |
| 1625 | */ | 1624 | */ |
| 1626 | queue_delayed_work_on(smp_processor_id(), vmstat_wq, | 1625 | queue_delayed_work_on(smp_processor_id(), mm_percpu_wq, |
| 1627 | this_cpu_ptr(&vmstat_work), | 1626 | this_cpu_ptr(&vmstat_work), |
| 1628 | round_jiffies_relative(sysctl_stat_interval)); | 1627 | round_jiffies_relative(sysctl_stat_interval)); |
| 1629 | } | 1628 | } |
| @@ -1702,7 +1701,7 @@ static void vmstat_shepherd(struct work_struct *w) | |||
| 1702 | struct delayed_work *dw = &per_cpu(vmstat_work, cpu); | 1701 | struct delayed_work *dw = &per_cpu(vmstat_work, cpu); |
| 1703 | 1702 | ||
| 1704 | if (!delayed_work_pending(dw) && need_update(cpu)) | 1703 | if (!delayed_work_pending(dw) && need_update(cpu)) |
| 1705 | queue_delayed_work_on(cpu, vmstat_wq, dw, 0); | 1704 | queue_delayed_work_on(cpu, mm_percpu_wq, dw, 0); |
| 1706 | } | 1705 | } |
| 1707 | put_online_cpus(); | 1706 | put_online_cpus(); |
| 1708 | 1707 | ||
| @@ -1718,7 +1717,6 @@ static void __init start_shepherd_timer(void) | |||
| 1718 | INIT_DEFERRABLE_WORK(per_cpu_ptr(&vmstat_work, cpu), | 1717 | INIT_DEFERRABLE_WORK(per_cpu_ptr(&vmstat_work, cpu), |
| 1719 | vmstat_update); | 1718 | vmstat_update); |
| 1720 | 1719 | ||
| 1721 | vmstat_wq = alloc_workqueue("vmstat", WQ_FREEZABLE|WQ_MEM_RECLAIM, 0); | ||
| 1722 | schedule_delayed_work(&shepherd, | 1720 | schedule_delayed_work(&shepherd, |
| 1723 | round_jiffies_relative(sysctl_stat_interval)); | 1721 | round_jiffies_relative(sysctl_stat_interval)); |
| 1724 | } | 1722 | } |
| @@ -1764,11 +1762,16 @@ static int vmstat_cpu_dead(unsigned int cpu) | |||
| 1764 | 1762 | ||
| 1765 | #endif | 1763 | #endif |
| 1766 | 1764 | ||
| 1767 | static int __init setup_vmstat(void) | 1765 | struct workqueue_struct *mm_percpu_wq; |
| 1766 | |||
| 1767 | void __init init_mm_internals(void) | ||
| 1768 | { | 1768 | { |
| 1769 | #ifdef CONFIG_SMP | 1769 | int ret __maybe_unused; |
| 1770 | int ret; | 1770 | |
| 1771 | mm_percpu_wq = alloc_workqueue("mm_percpu_wq", | ||
| 1772 | WQ_FREEZABLE|WQ_MEM_RECLAIM, 0); | ||
| 1771 | 1773 | ||
| 1774 | #ifdef CONFIG_SMP | ||
| 1772 | ret = cpuhp_setup_state_nocalls(CPUHP_MM_VMSTAT_DEAD, "mm/vmstat:dead", | 1775 | ret = cpuhp_setup_state_nocalls(CPUHP_MM_VMSTAT_DEAD, "mm/vmstat:dead", |
| 1773 | NULL, vmstat_cpu_dead); | 1776 | NULL, vmstat_cpu_dead); |
| 1774 | if (ret < 0) | 1777 | if (ret < 0) |
| @@ -1792,9 +1795,7 @@ static int __init setup_vmstat(void) | |||
| 1792 | proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations); | 1795 | proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations); |
| 1793 | proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations); | 1796 | proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations); |
| 1794 | #endif | 1797 | #endif |
| 1795 | return 0; | ||
| 1796 | } | 1798 | } |
| 1797 | module_init(setup_vmstat) | ||
| 1798 | 1799 | ||
| 1799 | #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_COMPACTION) | 1800 | #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_COMPACTION) |
| 1800 | 1801 | ||
diff --git a/mm/workingset.c b/mm/workingset.c index ac839fca0e76..eda05c71fa49 100644 --- a/mm/workingset.c +++ b/mm/workingset.c | |||
| @@ -532,7 +532,7 @@ static int __init workingset_init(void) | |||
| 532 | pr_info("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n", | 532 | pr_info("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n", |
| 533 | timestamp_bits, max_order, bucket_order); | 533 | timestamp_bits, max_order, bucket_order); |
| 534 | 534 | ||
| 535 | ret = list_lru_init_key(&shadow_nodes, &shadow_nodes_key); | 535 | ret = __list_lru_init(&shadow_nodes, true, &shadow_nodes_key); |
| 536 | if (ret) | 536 | if (ret) |
| 537 | goto err; | 537 | goto err; |
| 538 | ret = register_shrinker(&workingset_shadow_shrinker); | 538 | ret = register_shrinker(&workingset_shadow_shrinker); |
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index c35aae13c8d2..d98d4998213d 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c | |||
| @@ -390,7 +390,7 @@ mpls: | |||
| 390 | unsigned char ar_tip[4]; | 390 | unsigned char ar_tip[4]; |
| 391 | } *arp_eth, _arp_eth; | 391 | } *arp_eth, _arp_eth; |
| 392 | const struct arphdr *arp; | 392 | const struct arphdr *arp; |
| 393 | struct arphdr *_arp; | 393 | struct arphdr _arp; |
| 394 | 394 | ||
| 395 | arp = __skb_header_pointer(skb, nhoff, sizeof(_arp), data, | 395 | arp = __skb_header_pointer(skb, nhoff, sizeof(_arp), data, |
| 396 | hlen, &_arp); | 396 | hlen, &_arp); |
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index e7c12caa20c8..4526cbd7e28a 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
| @@ -860,7 +860,8 @@ static void neigh_probe(struct neighbour *neigh) | |||
| 860 | if (skb) | 860 | if (skb) |
| 861 | skb = skb_clone(skb, GFP_ATOMIC); | 861 | skb = skb_clone(skb, GFP_ATOMIC); |
| 862 | write_unlock(&neigh->lock); | 862 | write_unlock(&neigh->lock); |
| 863 | neigh->ops->solicit(neigh, skb); | 863 | if (neigh->ops->solicit) |
| 864 | neigh->ops->solicit(neigh, skb); | ||
| 864 | atomic_inc(&neigh->probes); | 865 | atomic_inc(&neigh->probes); |
| 865 | kfree_skb(skb); | 866 | kfree_skb(skb); |
| 866 | } | 867 | } |
diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c index 758f140b6bed..d28da7d363f1 100644 --- a/net/core/secure_seq.c +++ b/net/core/secure_seq.c | |||
| @@ -20,9 +20,11 @@ | |||
| 20 | #include <net/tcp.h> | 20 | #include <net/tcp.h> |
| 21 | 21 | ||
| 22 | static siphash_key_t net_secret __read_mostly; | 22 | static siphash_key_t net_secret __read_mostly; |
| 23 | static siphash_key_t ts_secret __read_mostly; | ||
| 23 | 24 | ||
| 24 | static __always_inline void net_secret_init(void) | 25 | static __always_inline void net_secret_init(void) |
| 25 | { | 26 | { |
| 27 | net_get_random_once(&ts_secret, sizeof(ts_secret)); | ||
| 26 | net_get_random_once(&net_secret, sizeof(net_secret)); | 28 | net_get_random_once(&net_secret, sizeof(net_secret)); |
| 27 | } | 29 | } |
| 28 | #endif | 30 | #endif |
| @@ -45,6 +47,23 @@ static u32 seq_scale(u32 seq) | |||
| 45 | #endif | 47 | #endif |
| 46 | 48 | ||
| 47 | #if IS_ENABLED(CONFIG_IPV6) | 49 | #if IS_ENABLED(CONFIG_IPV6) |
| 50 | static u32 secure_tcpv6_ts_off(const __be32 *saddr, const __be32 *daddr) | ||
| 51 | { | ||
| 52 | const struct { | ||
| 53 | struct in6_addr saddr; | ||
| 54 | struct in6_addr daddr; | ||
| 55 | } __aligned(SIPHASH_ALIGNMENT) combined = { | ||
| 56 | .saddr = *(struct in6_addr *)saddr, | ||
| 57 | .daddr = *(struct in6_addr *)daddr, | ||
| 58 | }; | ||
| 59 | |||
| 60 | if (sysctl_tcp_timestamps != 1) | ||
| 61 | return 0; | ||
| 62 | |||
| 63 | return siphash(&combined, offsetofend(typeof(combined), daddr), | ||
| 64 | &ts_secret); | ||
| 65 | } | ||
| 66 | |||
| 48 | u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, | 67 | u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, |
| 49 | __be16 sport, __be16 dport, u32 *tsoff) | 68 | __be16 sport, __be16 dport, u32 *tsoff) |
| 50 | { | 69 | { |
| @@ -63,7 +82,7 @@ u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, | |||
| 63 | net_secret_init(); | 82 | net_secret_init(); |
| 64 | hash = siphash(&combined, offsetofend(typeof(combined), dport), | 83 | hash = siphash(&combined, offsetofend(typeof(combined), dport), |
| 65 | &net_secret); | 84 | &net_secret); |
| 66 | *tsoff = sysctl_tcp_timestamps == 1 ? (hash >> 32) : 0; | 85 | *tsoff = secure_tcpv6_ts_off(saddr, daddr); |
| 67 | return seq_scale(hash); | 86 | return seq_scale(hash); |
| 68 | } | 87 | } |
| 69 | EXPORT_SYMBOL(secure_tcpv6_sequence_number); | 88 | EXPORT_SYMBOL(secure_tcpv6_sequence_number); |
| @@ -88,6 +107,14 @@ EXPORT_SYMBOL(secure_ipv6_port_ephemeral); | |||
| 88 | #endif | 107 | #endif |
| 89 | 108 | ||
| 90 | #ifdef CONFIG_INET | 109 | #ifdef CONFIG_INET |
| 110 | static u32 secure_tcp_ts_off(__be32 saddr, __be32 daddr) | ||
| 111 | { | ||
| 112 | if (sysctl_tcp_timestamps != 1) | ||
| 113 | return 0; | ||
| 114 | |||
| 115 | return siphash_2u32((__force u32)saddr, (__force u32)daddr, | ||
| 116 | &ts_secret); | ||
| 117 | } | ||
| 91 | 118 | ||
| 92 | /* secure_tcp_sequence_number(a, b, 0, d) == secure_ipv4_port_ephemeral(a, b, d), | 119 | /* secure_tcp_sequence_number(a, b, 0, d) == secure_ipv4_port_ephemeral(a, b, d), |
| 93 | * but fortunately, `sport' cannot be 0 in any circumstances. If this changes, | 120 | * but fortunately, `sport' cannot be 0 in any circumstances. If this changes, |
| @@ -103,7 +130,7 @@ u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr, | |||
| 103 | hash = siphash_3u32((__force u32)saddr, (__force u32)daddr, | 130 | hash = siphash_3u32((__force u32)saddr, (__force u32)daddr, |
| 104 | (__force u32)sport << 16 | (__force u32)dport, | 131 | (__force u32)sport << 16 | (__force u32)dport, |
| 105 | &net_secret); | 132 | &net_secret); |
| 106 | *tsoff = sysctl_tcp_timestamps == 1 ? (hash >> 32) : 0; | 133 | *tsoff = secure_tcp_ts_off(saddr, daddr); |
| 107 | return seq_scale(hash); | 134 | return seq_scale(hash); |
| 108 | } | 135 | } |
| 109 | 136 | ||
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 4ead336e14ea..7f9cc400eca0 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c | |||
| @@ -408,14 +408,16 @@ static struct ctl_table net_core_table[] = { | |||
| 408 | .data = &sysctl_net_busy_poll, | 408 | .data = &sysctl_net_busy_poll, |
| 409 | .maxlen = sizeof(unsigned int), | 409 | .maxlen = sizeof(unsigned int), |
| 410 | .mode = 0644, | 410 | .mode = 0644, |
| 411 | .proc_handler = proc_dointvec | 411 | .proc_handler = proc_dointvec_minmax, |
| 412 | .extra1 = &zero, | ||
| 412 | }, | 413 | }, |
| 413 | { | 414 | { |
| 414 | .procname = "busy_read", | 415 | .procname = "busy_read", |
| 415 | .data = &sysctl_net_busy_read, | 416 | .data = &sysctl_net_busy_read, |
| 416 | .maxlen = sizeof(unsigned int), | 417 | .maxlen = sizeof(unsigned int), |
| 417 | .mode = 0644, | 418 | .mode = 0644, |
| 418 | .proc_handler = proc_dointvec | 419 | .proc_handler = proc_dointvec_minmax, |
| 420 | .extra1 = &zero, | ||
| 419 | }, | 421 | }, |
| 420 | #endif | 422 | #endif |
| 421 | #ifdef CONFIG_NET_SCHED | 423 | #ifdef CONFIG_NET_SCHED |
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index fd9f34bbd740..dfb2ab2dd3c8 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
| @@ -306,7 +306,7 @@ static void __init ic_close_devs(void) | |||
| 306 | while ((d = next)) { | 306 | while ((d = next)) { |
| 307 | next = d->next; | 307 | next = d->next; |
| 308 | dev = d->dev; | 308 | dev = d->dev; |
| 309 | if ((!ic_dev || dev != ic_dev->dev) && !netdev_uses_dsa(dev)) { | 309 | if (d != ic_dev && !netdev_uses_dsa(dev)) { |
| 310 | pr_debug("IP-Config: Downing %s\n", dev->name); | 310 | pr_debug("IP-Config: Downing %s\n", dev->name); |
| 311 | dev_change_flags(dev, d->flags); | 311 | dev_change_flags(dev, d->flags); |
| 312 | } | 312 | } |
diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c index c9b52c361da2..53e49f5011d3 100644 --- a/net/ipv4/netfilter/nf_nat_snmp_basic.c +++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c | |||
| @@ -1260,16 +1260,6 @@ static const struct nf_conntrack_expect_policy snmp_exp_policy = { | |||
| 1260 | .timeout = 180, | 1260 | .timeout = 180, |
| 1261 | }; | 1261 | }; |
| 1262 | 1262 | ||
| 1263 | static struct nf_conntrack_helper snmp_helper __read_mostly = { | ||
| 1264 | .me = THIS_MODULE, | ||
| 1265 | .help = help, | ||
| 1266 | .expect_policy = &snmp_exp_policy, | ||
| 1267 | .name = "snmp", | ||
| 1268 | .tuple.src.l3num = AF_INET, | ||
| 1269 | .tuple.src.u.udp.port = cpu_to_be16(SNMP_PORT), | ||
| 1270 | .tuple.dst.protonum = IPPROTO_UDP, | ||
| 1271 | }; | ||
| 1272 | |||
| 1273 | static struct nf_conntrack_helper snmp_trap_helper __read_mostly = { | 1263 | static struct nf_conntrack_helper snmp_trap_helper __read_mostly = { |
| 1274 | .me = THIS_MODULE, | 1264 | .me = THIS_MODULE, |
| 1275 | .help = help, | 1265 | .help = help, |
| @@ -1288,22 +1278,16 @@ static struct nf_conntrack_helper snmp_trap_helper __read_mostly = { | |||
| 1288 | 1278 | ||
| 1289 | static int __init nf_nat_snmp_basic_init(void) | 1279 | static int __init nf_nat_snmp_basic_init(void) |
| 1290 | { | 1280 | { |
| 1291 | int ret = 0; | ||
| 1292 | |||
| 1293 | BUG_ON(nf_nat_snmp_hook != NULL); | 1281 | BUG_ON(nf_nat_snmp_hook != NULL); |
| 1294 | RCU_INIT_POINTER(nf_nat_snmp_hook, help); | 1282 | RCU_INIT_POINTER(nf_nat_snmp_hook, help); |
| 1295 | 1283 | ||
| 1296 | ret = nf_conntrack_helper_register(&snmp_trap_helper); | 1284 | return nf_conntrack_helper_register(&snmp_trap_helper); |
| 1297 | if (ret < 0) { | ||
| 1298 | nf_conntrack_helper_unregister(&snmp_helper); | ||
| 1299 | return ret; | ||
| 1300 | } | ||
| 1301 | return ret; | ||
| 1302 | } | 1285 | } |
| 1303 | 1286 | ||
| 1304 | static void __exit nf_nat_snmp_basic_fini(void) | 1287 | static void __exit nf_nat_snmp_basic_fini(void) |
| 1305 | { | 1288 | { |
| 1306 | RCU_INIT_POINTER(nf_nat_snmp_hook, NULL); | 1289 | RCU_INIT_POINTER(nf_nat_snmp_hook, NULL); |
| 1290 | synchronize_rcu(); | ||
| 1307 | nf_conntrack_helper_unregister(&snmp_trap_helper); | 1291 | nf_conntrack_helper_unregister(&snmp_trap_helper); |
| 1308 | } | 1292 | } |
| 1309 | 1293 | ||
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 2af6244b83e2..ccfbce13a633 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c | |||
| @@ -156,17 +156,18 @@ int ping_hash(struct sock *sk) | |||
| 156 | void ping_unhash(struct sock *sk) | 156 | void ping_unhash(struct sock *sk) |
| 157 | { | 157 | { |
| 158 | struct inet_sock *isk = inet_sk(sk); | 158 | struct inet_sock *isk = inet_sk(sk); |
| 159 | |||
| 159 | pr_debug("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num); | 160 | pr_debug("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num); |
| 161 | write_lock_bh(&ping_table.lock); | ||
| 160 | if (sk_hashed(sk)) { | 162 | if (sk_hashed(sk)) { |
| 161 | write_lock_bh(&ping_table.lock); | ||
| 162 | hlist_nulls_del(&sk->sk_nulls_node); | 163 | hlist_nulls_del(&sk->sk_nulls_node); |
| 163 | sk_nulls_node_init(&sk->sk_nulls_node); | 164 | sk_nulls_node_init(&sk->sk_nulls_node); |
| 164 | sock_put(sk); | 165 | sock_put(sk); |
| 165 | isk->inet_num = 0; | 166 | isk->inet_num = 0; |
| 166 | isk->inet_sport = 0; | 167 | isk->inet_sport = 0; |
| 167 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); | 168 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); |
| 168 | write_unlock_bh(&ping_table.lock); | ||
| 169 | } | 169 | } |
| 170 | write_unlock_bh(&ping_table.lock); | ||
| 170 | } | 171 | } |
| 171 | EXPORT_SYMBOL_GPL(ping_unhash); | 172 | EXPORT_SYMBOL_GPL(ping_unhash); |
| 172 | 173 | ||
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index c43119726a62..2c1f59386a7b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -126,7 +126,8 @@ int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2; | |||
| 126 | #define REXMIT_LOST 1 /* retransmit packets marked lost */ | 126 | #define REXMIT_LOST 1 /* retransmit packets marked lost */ |
| 127 | #define REXMIT_NEW 2 /* FRTO-style transmit of unsent/new packets */ | 127 | #define REXMIT_NEW 2 /* FRTO-style transmit of unsent/new packets */ |
| 128 | 128 | ||
| 129 | static void tcp_gro_dev_warn(struct sock *sk, const struct sk_buff *skb) | 129 | static void tcp_gro_dev_warn(struct sock *sk, const struct sk_buff *skb, |
| 130 | unsigned int len) | ||
| 130 | { | 131 | { |
| 131 | static bool __once __read_mostly; | 132 | static bool __once __read_mostly; |
| 132 | 133 | ||
| @@ -137,8 +138,9 @@ static void tcp_gro_dev_warn(struct sock *sk, const struct sk_buff *skb) | |||
| 137 | 138 | ||
| 138 | rcu_read_lock(); | 139 | rcu_read_lock(); |
| 139 | dev = dev_get_by_index_rcu(sock_net(sk), skb->skb_iif); | 140 | dev = dev_get_by_index_rcu(sock_net(sk), skb->skb_iif); |
| 140 | pr_warn("%s: Driver has suspect GRO implementation, TCP performance may be compromised.\n", | 141 | if (!dev || len >= dev->mtu) |
| 141 | dev ? dev->name : "Unknown driver"); | 142 | pr_warn("%s: Driver has suspect GRO implementation, TCP performance may be compromised.\n", |
| 143 | dev ? dev->name : "Unknown driver"); | ||
| 142 | rcu_read_unlock(); | 144 | rcu_read_unlock(); |
| 143 | } | 145 | } |
| 144 | } | 146 | } |
| @@ -161,8 +163,10 @@ static void tcp_measure_rcv_mss(struct sock *sk, const struct sk_buff *skb) | |||
| 161 | if (len >= icsk->icsk_ack.rcv_mss) { | 163 | if (len >= icsk->icsk_ack.rcv_mss) { |
| 162 | icsk->icsk_ack.rcv_mss = min_t(unsigned int, len, | 164 | icsk->icsk_ack.rcv_mss = min_t(unsigned int, len, |
| 163 | tcp_sk(sk)->advmss); | 165 | tcp_sk(sk)->advmss); |
| 164 | if (unlikely(icsk->icsk_ack.rcv_mss != len)) | 166 | /* Account for possibly-removed options */ |
| 165 | tcp_gro_dev_warn(sk, skb); | 167 | if (unlikely(len > icsk->icsk_ack.rcv_mss + |
| 168 | MAX_TCP_OPTION_SPACE)) | ||
| 169 | tcp_gro_dev_warn(sk, skb, len); | ||
| 166 | } else { | 170 | } else { |
| 167 | /* Otherwise, we make more careful check taking into account, | 171 | /* Otherwise, we make more careful check taking into account, |
| 168 | * that SACKs block is variable. | 172 | * that SACKs block is variable. |
| @@ -874,22 +878,11 @@ static void tcp_update_reordering(struct sock *sk, const int metric, | |||
| 874 | const int ts) | 878 | const int ts) |
| 875 | { | 879 | { |
| 876 | struct tcp_sock *tp = tcp_sk(sk); | 880 | struct tcp_sock *tp = tcp_sk(sk); |
| 877 | if (metric > tp->reordering) { | 881 | int mib_idx; |
| 878 | int mib_idx; | ||
| 879 | 882 | ||
| 883 | if (metric > tp->reordering) { | ||
| 880 | tp->reordering = min(sysctl_tcp_max_reordering, metric); | 884 | tp->reordering = min(sysctl_tcp_max_reordering, metric); |
| 881 | 885 | ||
| 882 | /* This exciting event is worth to be remembered. 8) */ | ||
| 883 | if (ts) | ||
| 884 | mib_idx = LINUX_MIB_TCPTSREORDER; | ||
| 885 | else if (tcp_is_reno(tp)) | ||
| 886 | mib_idx = LINUX_MIB_TCPRENOREORDER; | ||
| 887 | else if (tcp_is_fack(tp)) | ||
| 888 | mib_idx = LINUX_MIB_TCPFACKREORDER; | ||
| 889 | else | ||
| 890 | mib_idx = LINUX_MIB_TCPSACKREORDER; | ||
| 891 | |||
| 892 | NET_INC_STATS(sock_net(sk), mib_idx); | ||
| 893 | #if FASTRETRANS_DEBUG > 1 | 886 | #if FASTRETRANS_DEBUG > 1 |
| 894 | pr_debug("Disorder%d %d %u f%u s%u rr%d\n", | 887 | pr_debug("Disorder%d %d %u f%u s%u rr%d\n", |
| 895 | tp->rx_opt.sack_ok, inet_csk(sk)->icsk_ca_state, | 888 | tp->rx_opt.sack_ok, inet_csk(sk)->icsk_ca_state, |
| @@ -902,6 +895,18 @@ static void tcp_update_reordering(struct sock *sk, const int metric, | |||
| 902 | } | 895 | } |
| 903 | 896 | ||
| 904 | tp->rack.reord = 1; | 897 | tp->rack.reord = 1; |
| 898 | |||
| 899 | /* This exciting event is worth to be remembered. 8) */ | ||
| 900 | if (ts) | ||
| 901 | mib_idx = LINUX_MIB_TCPTSREORDER; | ||
| 902 | else if (tcp_is_reno(tp)) | ||
| 903 | mib_idx = LINUX_MIB_TCPRENOREORDER; | ||
| 904 | else if (tcp_is_fack(tp)) | ||
| 905 | mib_idx = LINUX_MIB_TCPFACKREORDER; | ||
| 906 | else | ||
| 907 | mib_idx = LINUX_MIB_TCPSACKREORDER; | ||
| 908 | |||
| 909 | NET_INC_STATS(sock_net(sk), mib_idx); | ||
| 905 | } | 910 | } |
| 906 | 911 | ||
| 907 | /* This must be called before lost_out is incremented */ | 912 | /* This must be called before lost_out is incremented */ |
diff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c index 4ecb38ae8504..d8acbd9f477a 100644 --- a/net/ipv4/tcp_recovery.c +++ b/net/ipv4/tcp_recovery.c | |||
| @@ -12,7 +12,8 @@ static void tcp_rack_mark_skb_lost(struct sock *sk, struct sk_buff *skb) | |||
| 12 | /* Account for retransmits that are lost again */ | 12 | /* Account for retransmits that are lost again */ |
| 13 | TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS; | 13 | TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS; |
| 14 | tp->retrans_out -= tcp_skb_pcount(skb); | 14 | tp->retrans_out -= tcp_skb_pcount(skb); |
| 15 | NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPLOSTRETRANSMIT); | 15 | NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPLOSTRETRANSMIT, |
| 16 | tcp_skb_pcount(skb)); | ||
| 16 | } | 17 | } |
| 17 | } | 18 | } |
| 18 | 19 | ||
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 309062f3debe..31762f76cdb5 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c | |||
| @@ -1687,7 +1687,7 @@ static int kcm_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
| 1687 | struct kcm_attach info; | 1687 | struct kcm_attach info; |
| 1688 | 1688 | ||
| 1689 | if (copy_from_user(&info, (void __user *)arg, sizeof(info))) | 1689 | if (copy_from_user(&info, (void __user *)arg, sizeof(info))) |
| 1690 | err = -EFAULT; | 1690 | return -EFAULT; |
| 1691 | 1691 | ||
| 1692 | err = kcm_attach_ioctl(sock, &info); | 1692 | err = kcm_attach_ioctl(sock, &info); |
| 1693 | 1693 | ||
| @@ -1697,7 +1697,7 @@ static int kcm_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
| 1697 | struct kcm_unattach info; | 1697 | struct kcm_unattach info; |
| 1698 | 1698 | ||
| 1699 | if (copy_from_user(&info, (void __user *)arg, sizeof(info))) | 1699 | if (copy_from_user(&info, (void __user *)arg, sizeof(info))) |
| 1700 | err = -EFAULT; | 1700 | return -EFAULT; |
| 1701 | 1701 | ||
| 1702 | err = kcm_unattach_ioctl(sock, &info); | 1702 | err = kcm_unattach_ioctl(sock, &info); |
| 1703 | 1703 | ||
| @@ -1708,7 +1708,7 @@ static int kcm_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
| 1708 | struct socket *newsock = NULL; | 1708 | struct socket *newsock = NULL; |
| 1709 | 1709 | ||
| 1710 | if (copy_from_user(&info, (void __user *)arg, sizeof(info))) | 1710 | if (copy_from_user(&info, (void __user *)arg, sizeof(info))) |
| 1711 | err = -EFAULT; | 1711 | return -EFAULT; |
| 1712 | 1712 | ||
| 1713 | err = kcm_clone(sock, &info, &newsock); | 1713 | err = kcm_clone(sock, &info, &newsock); |
| 1714 | 1714 | ||
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 8adab6335ced..e37d9554da7b 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c | |||
| @@ -278,7 +278,57 @@ struct l2tp_session *l2tp_session_find(struct net *net, struct l2tp_tunnel *tunn | |||
| 278 | } | 278 | } |
| 279 | EXPORT_SYMBOL_GPL(l2tp_session_find); | 279 | EXPORT_SYMBOL_GPL(l2tp_session_find); |
| 280 | 280 | ||
| 281 | struct l2tp_session *l2tp_session_find_nth(struct l2tp_tunnel *tunnel, int nth) | 281 | /* Like l2tp_session_find() but takes a reference on the returned session. |
| 282 | * Optionally calls session->ref() too if do_ref is true. | ||
| 283 | */ | ||
| 284 | struct l2tp_session *l2tp_session_get(struct net *net, | ||
| 285 | struct l2tp_tunnel *tunnel, | ||
| 286 | u32 session_id, bool do_ref) | ||
| 287 | { | ||
| 288 | struct hlist_head *session_list; | ||
| 289 | struct l2tp_session *session; | ||
| 290 | |||
| 291 | if (!tunnel) { | ||
| 292 | struct l2tp_net *pn = l2tp_pernet(net); | ||
| 293 | |||
| 294 | session_list = l2tp_session_id_hash_2(pn, session_id); | ||
| 295 | |||
| 296 | rcu_read_lock_bh(); | ||
| 297 | hlist_for_each_entry_rcu(session, session_list, global_hlist) { | ||
| 298 | if (session->session_id == session_id) { | ||
| 299 | l2tp_session_inc_refcount(session); | ||
| 300 | if (do_ref && session->ref) | ||
| 301 | session->ref(session); | ||
| 302 | rcu_read_unlock_bh(); | ||
| 303 | |||
| 304 | return session; | ||
| 305 | } | ||
| 306 | } | ||
| 307 | rcu_read_unlock_bh(); | ||
| 308 | |||
| 309 | return NULL; | ||
| 310 | } | ||
| 311 | |||
| 312 | session_list = l2tp_session_id_hash(tunnel, session_id); | ||
| 313 | read_lock_bh(&tunnel->hlist_lock); | ||
| 314 | hlist_for_each_entry(session, session_list, hlist) { | ||
| 315 | if (session->session_id == session_id) { | ||
| 316 | l2tp_session_inc_refcount(session); | ||
| 317 | if (do_ref && session->ref) | ||
| 318 | session->ref(session); | ||
| 319 | read_unlock_bh(&tunnel->hlist_lock); | ||
| 320 | |||
| 321 | return session; | ||
| 322 | } | ||
| 323 | } | ||
| 324 | read_unlock_bh(&tunnel->hlist_lock); | ||
| 325 | |||
| 326 | return NULL; | ||
| 327 | } | ||
| 328 | EXPORT_SYMBOL_GPL(l2tp_session_get); | ||
| 329 | |||
| 330 | struct l2tp_session *l2tp_session_get_nth(struct l2tp_tunnel *tunnel, int nth, | ||
| 331 | bool do_ref) | ||
| 282 | { | 332 | { |
| 283 | int hash; | 333 | int hash; |
| 284 | struct l2tp_session *session; | 334 | struct l2tp_session *session; |
| @@ -288,6 +338,9 @@ struct l2tp_session *l2tp_session_find_nth(struct l2tp_tunnel *tunnel, int nth) | |||
| 288 | for (hash = 0; hash < L2TP_HASH_SIZE; hash++) { | 338 | for (hash = 0; hash < L2TP_HASH_SIZE; hash++) { |
| 289 | hlist_for_each_entry(session, &tunnel->session_hlist[hash], hlist) { | 339 | hlist_for_each_entry(session, &tunnel->session_hlist[hash], hlist) { |
| 290 | if (++count > nth) { | 340 | if (++count > nth) { |
| 341 | l2tp_session_inc_refcount(session); | ||
| 342 | if (do_ref && session->ref) | ||
| 343 | session->ref(session); | ||
| 291 | read_unlock_bh(&tunnel->hlist_lock); | 344 | read_unlock_bh(&tunnel->hlist_lock); |
| 292 | return session; | 345 | return session; |
| 293 | } | 346 | } |
| @@ -298,12 +351,13 @@ struct l2tp_session *l2tp_session_find_nth(struct l2tp_tunnel *tunnel, int nth) | |||
| 298 | 351 | ||
| 299 | return NULL; | 352 | return NULL; |
| 300 | } | 353 | } |
| 301 | EXPORT_SYMBOL_GPL(l2tp_session_find_nth); | 354 | EXPORT_SYMBOL_GPL(l2tp_session_get_nth); |
| 302 | 355 | ||
| 303 | /* Lookup a session by interface name. | 356 | /* Lookup a session by interface name. |
| 304 | * This is very inefficient but is only used by management interfaces. | 357 | * This is very inefficient but is only used by management interfaces. |
| 305 | */ | 358 | */ |
| 306 | struct l2tp_session *l2tp_session_find_by_ifname(struct net *net, char *ifname) | 359 | struct l2tp_session *l2tp_session_get_by_ifname(struct net *net, char *ifname, |
| 360 | bool do_ref) | ||
| 307 | { | 361 | { |
| 308 | struct l2tp_net *pn = l2tp_pernet(net); | 362 | struct l2tp_net *pn = l2tp_pernet(net); |
| 309 | int hash; | 363 | int hash; |
| @@ -313,7 +367,11 @@ struct l2tp_session *l2tp_session_find_by_ifname(struct net *net, char *ifname) | |||
| 313 | for (hash = 0; hash < L2TP_HASH_SIZE_2; hash++) { | 367 | for (hash = 0; hash < L2TP_HASH_SIZE_2; hash++) { |
| 314 | hlist_for_each_entry_rcu(session, &pn->l2tp_session_hlist[hash], global_hlist) { | 368 | hlist_for_each_entry_rcu(session, &pn->l2tp_session_hlist[hash], global_hlist) { |
| 315 | if (!strcmp(session->ifname, ifname)) { | 369 | if (!strcmp(session->ifname, ifname)) { |
| 370 | l2tp_session_inc_refcount(session); | ||
| 371 | if (do_ref && session->ref) | ||
| 372 | session->ref(session); | ||
| 316 | rcu_read_unlock_bh(); | 373 | rcu_read_unlock_bh(); |
| 374 | |||
| 317 | return session; | 375 | return session; |
| 318 | } | 376 | } |
| 319 | } | 377 | } |
| @@ -323,7 +381,49 @@ struct l2tp_session *l2tp_session_find_by_ifname(struct net *net, char *ifname) | |||
| 323 | 381 | ||
| 324 | return NULL; | 382 | return NULL; |
| 325 | } | 383 | } |
| 326 | EXPORT_SYMBOL_GPL(l2tp_session_find_by_ifname); | 384 | EXPORT_SYMBOL_GPL(l2tp_session_get_by_ifname); |
| 385 | |||
| 386 | static int l2tp_session_add_to_tunnel(struct l2tp_tunnel *tunnel, | ||
| 387 | struct l2tp_session *session) | ||
| 388 | { | ||
| 389 | struct l2tp_session *session_walk; | ||
| 390 | struct hlist_head *g_head; | ||
| 391 | struct hlist_head *head; | ||
| 392 | struct l2tp_net *pn; | ||
| 393 | |||
| 394 | head = l2tp_session_id_hash(tunnel, session->session_id); | ||
| 395 | |||
| 396 | write_lock_bh(&tunnel->hlist_lock); | ||
| 397 | hlist_for_each_entry(session_walk, head, hlist) | ||
| 398 | if (session_walk->session_id == session->session_id) | ||
| 399 | goto exist; | ||
| 400 | |||
| 401 | if (tunnel->version == L2TP_HDR_VER_3) { | ||
| 402 | pn = l2tp_pernet(tunnel->l2tp_net); | ||
| 403 | g_head = l2tp_session_id_hash_2(l2tp_pernet(tunnel->l2tp_net), | ||
| 404 | session->session_id); | ||
| 405 | |||
| 406 | spin_lock_bh(&pn->l2tp_session_hlist_lock); | ||
| 407 | hlist_for_each_entry(session_walk, g_head, global_hlist) | ||
| 408 | if (session_walk->session_id == session->session_id) | ||
| 409 | goto exist_glob; | ||
| 410 | |||
| 411 | hlist_add_head_rcu(&session->global_hlist, g_head); | ||
| 412 | spin_unlock_bh(&pn->l2tp_session_hlist_lock); | ||
| 413 | } | ||
| 414 | |||
| 415 | hlist_add_head(&session->hlist, head); | ||
| 416 | write_unlock_bh(&tunnel->hlist_lock); | ||
| 417 | |||
| 418 | return 0; | ||
| 419 | |||
| 420 | exist_glob: | ||
| 421 | spin_unlock_bh(&pn->l2tp_session_hlist_lock); | ||
| 422 | exist: | ||
| 423 | write_unlock_bh(&tunnel->hlist_lock); | ||
| 424 | |||
| 425 | return -EEXIST; | ||
| 426 | } | ||
| 327 | 427 | ||
| 328 | /* Lookup a tunnel by id | 428 | /* Lookup a tunnel by id |
| 329 | */ | 429 | */ |
| @@ -633,6 +733,9 @@ discard: | |||
| 633 | * a data (not control) frame before coming here. Fields up to the | 733 | * a data (not control) frame before coming here. Fields up to the |
| 634 | * session-id have already been parsed and ptr points to the data | 734 | * session-id have already been parsed and ptr points to the data |
| 635 | * after the session-id. | 735 | * after the session-id. |
| 736 | * | ||
| 737 | * session->ref() must have been called prior to l2tp_recv_common(). | ||
| 738 | * session->deref() will be called automatically after skb is processed. | ||
| 636 | */ | 739 | */ |
| 637 | void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb, | 740 | void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb, |
| 638 | unsigned char *ptr, unsigned char *optr, u16 hdrflags, | 741 | unsigned char *ptr, unsigned char *optr, u16 hdrflags, |
| @@ -642,14 +745,6 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb, | |||
| 642 | int offset; | 745 | int offset; |
| 643 | u32 ns, nr; | 746 | u32 ns, nr; |
| 644 | 747 | ||
| 645 | /* The ref count is increased since we now hold a pointer to | ||
| 646 | * the session. Take care to decrement the refcnt when exiting | ||
| 647 | * this function from now on... | ||
| 648 | */ | ||
| 649 | l2tp_session_inc_refcount(session); | ||
| 650 | if (session->ref) | ||
| 651 | (*session->ref)(session); | ||
| 652 | |||
| 653 | /* Parse and check optional cookie */ | 748 | /* Parse and check optional cookie */ |
| 654 | if (session->peer_cookie_len > 0) { | 749 | if (session->peer_cookie_len > 0) { |
| 655 | if (memcmp(ptr, &session->peer_cookie[0], session->peer_cookie_len)) { | 750 | if (memcmp(ptr, &session->peer_cookie[0], session->peer_cookie_len)) { |
| @@ -802,8 +897,6 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb, | |||
| 802 | /* Try to dequeue as many skbs from reorder_q as we can. */ | 897 | /* Try to dequeue as many skbs from reorder_q as we can. */ |
| 803 | l2tp_recv_dequeue(session); | 898 | l2tp_recv_dequeue(session); |
| 804 | 899 | ||
| 805 | l2tp_session_dec_refcount(session); | ||
| 806 | |||
| 807 | return; | 900 | return; |
| 808 | 901 | ||
| 809 | discard: | 902 | discard: |
| @@ -812,8 +905,6 @@ discard: | |||
| 812 | 905 | ||
| 813 | if (session->deref) | 906 | if (session->deref) |
| 814 | (*session->deref)(session); | 907 | (*session->deref)(session); |
| 815 | |||
| 816 | l2tp_session_dec_refcount(session); | ||
| 817 | } | 908 | } |
| 818 | EXPORT_SYMBOL(l2tp_recv_common); | 909 | EXPORT_SYMBOL(l2tp_recv_common); |
| 819 | 910 | ||
| @@ -920,8 +1011,14 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb, | |||
| 920 | } | 1011 | } |
| 921 | 1012 | ||
| 922 | /* Find the session context */ | 1013 | /* Find the session context */ |
| 923 | session = l2tp_session_find(tunnel->l2tp_net, tunnel, session_id); | 1014 | session = l2tp_session_get(tunnel->l2tp_net, tunnel, session_id, true); |
| 924 | if (!session || !session->recv_skb) { | 1015 | if (!session || !session->recv_skb) { |
| 1016 | if (session) { | ||
| 1017 | if (session->deref) | ||
| 1018 | session->deref(session); | ||
| 1019 | l2tp_session_dec_refcount(session); | ||
| 1020 | } | ||
| 1021 | |||
| 925 | /* Not found? Pass to userspace to deal with */ | 1022 | /* Not found? Pass to userspace to deal with */ |
| 926 | l2tp_info(tunnel, L2TP_MSG_DATA, | 1023 | l2tp_info(tunnel, L2TP_MSG_DATA, |
| 927 | "%s: no session found (%u/%u). Passing up.\n", | 1024 | "%s: no session found (%u/%u). Passing up.\n", |
| @@ -930,6 +1027,7 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb, | |||
| 930 | } | 1027 | } |
| 931 | 1028 | ||
| 932 | l2tp_recv_common(session, skb, ptr, optr, hdrflags, length, payload_hook); | 1029 | l2tp_recv_common(session, skb, ptr, optr, hdrflags, length, payload_hook); |
| 1030 | l2tp_session_dec_refcount(session); | ||
| 933 | 1031 | ||
| 934 | return 0; | 1032 | return 0; |
| 935 | 1033 | ||
| @@ -1738,6 +1836,7 @@ EXPORT_SYMBOL_GPL(l2tp_session_set_header_len); | |||
| 1738 | struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunnel, u32 session_id, u32 peer_session_id, struct l2tp_session_cfg *cfg) | 1836 | struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunnel, u32 session_id, u32 peer_session_id, struct l2tp_session_cfg *cfg) |
| 1739 | { | 1837 | { |
| 1740 | struct l2tp_session *session; | 1838 | struct l2tp_session *session; |
| 1839 | int err; | ||
| 1741 | 1840 | ||
| 1742 | session = kzalloc(sizeof(struct l2tp_session) + priv_size, GFP_KERNEL); | 1841 | session = kzalloc(sizeof(struct l2tp_session) + priv_size, GFP_KERNEL); |
| 1743 | if (session != NULL) { | 1842 | if (session != NULL) { |
| @@ -1793,6 +1892,13 @@ struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunn | |||
| 1793 | 1892 | ||
| 1794 | l2tp_session_set_header_len(session, tunnel->version); | 1893 | l2tp_session_set_header_len(session, tunnel->version); |
| 1795 | 1894 | ||
| 1895 | err = l2tp_session_add_to_tunnel(tunnel, session); | ||
| 1896 | if (err) { | ||
| 1897 | kfree(session); | ||
| 1898 | |||
| 1899 | return ERR_PTR(err); | ||
| 1900 | } | ||
| 1901 | |||
| 1796 | /* Bump the reference count. The session context is deleted | 1902 | /* Bump the reference count. The session context is deleted |
| 1797 | * only when this drops to zero. | 1903 | * only when this drops to zero. |
| 1798 | */ | 1904 | */ |
| @@ -1802,28 +1908,14 @@ struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunn | |||
| 1802 | /* Ensure tunnel socket isn't deleted */ | 1908 | /* Ensure tunnel socket isn't deleted */ |
| 1803 | sock_hold(tunnel->sock); | 1909 | sock_hold(tunnel->sock); |
| 1804 | 1910 | ||
| 1805 | /* Add session to the tunnel's hash list */ | ||
| 1806 | write_lock_bh(&tunnel->hlist_lock); | ||
| 1807 | hlist_add_head(&session->hlist, | ||
| 1808 | l2tp_session_id_hash(tunnel, session_id)); | ||
| 1809 | write_unlock_bh(&tunnel->hlist_lock); | ||
| 1810 | |||
| 1811 | /* And to the global session list if L2TPv3 */ | ||
| 1812 | if (tunnel->version != L2TP_HDR_VER_2) { | ||
| 1813 | struct l2tp_net *pn = l2tp_pernet(tunnel->l2tp_net); | ||
| 1814 | |||
| 1815 | spin_lock_bh(&pn->l2tp_session_hlist_lock); | ||
| 1816 | hlist_add_head_rcu(&session->global_hlist, | ||
| 1817 | l2tp_session_id_hash_2(pn, session_id)); | ||
| 1818 | spin_unlock_bh(&pn->l2tp_session_hlist_lock); | ||
| 1819 | } | ||
| 1820 | |||
| 1821 | /* Ignore management session in session count value */ | 1911 | /* Ignore management session in session count value */ |
| 1822 | if (session->session_id != 0) | 1912 | if (session->session_id != 0) |
| 1823 | atomic_inc(&l2tp_session_count); | 1913 | atomic_inc(&l2tp_session_count); |
| 1914 | |||
| 1915 | return session; | ||
| 1824 | } | 1916 | } |
| 1825 | 1917 | ||
| 1826 | return session; | 1918 | return ERR_PTR(-ENOMEM); |
| 1827 | } | 1919 | } |
| 1828 | EXPORT_SYMBOL_GPL(l2tp_session_create); | 1920 | EXPORT_SYMBOL_GPL(l2tp_session_create); |
| 1829 | 1921 | ||
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h index aebf281d09ee..8ce7818c7a9d 100644 --- a/net/l2tp/l2tp_core.h +++ b/net/l2tp/l2tp_core.h | |||
| @@ -230,11 +230,16 @@ out: | |||
| 230 | return tunnel; | 230 | return tunnel; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | struct l2tp_session *l2tp_session_get(struct net *net, | ||
| 234 | struct l2tp_tunnel *tunnel, | ||
| 235 | u32 session_id, bool do_ref); | ||
| 233 | struct l2tp_session *l2tp_session_find(struct net *net, | 236 | struct l2tp_session *l2tp_session_find(struct net *net, |
| 234 | struct l2tp_tunnel *tunnel, | 237 | struct l2tp_tunnel *tunnel, |
| 235 | u32 session_id); | 238 | u32 session_id); |
| 236 | struct l2tp_session *l2tp_session_find_nth(struct l2tp_tunnel *tunnel, int nth); | 239 | struct l2tp_session *l2tp_session_get_nth(struct l2tp_tunnel *tunnel, int nth, |
| 237 | struct l2tp_session *l2tp_session_find_by_ifname(struct net *net, char *ifname); | 240 | bool do_ref); |
| 241 | struct l2tp_session *l2tp_session_get_by_ifname(struct net *net, char *ifname, | ||
| 242 | bool do_ref); | ||
| 238 | struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id); | 243 | struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id); |
| 239 | struct l2tp_tunnel *l2tp_tunnel_find_nth(struct net *net, int nth); | 244 | struct l2tp_tunnel *l2tp_tunnel_find_nth(struct net *net, int nth); |
| 240 | 245 | ||
diff --git a/net/l2tp/l2tp_debugfs.c b/net/l2tp/l2tp_debugfs.c index 2d6760a2ae34..d100aed3d06f 100644 --- a/net/l2tp/l2tp_debugfs.c +++ b/net/l2tp/l2tp_debugfs.c | |||
| @@ -53,7 +53,7 @@ static void l2tp_dfs_next_tunnel(struct l2tp_dfs_seq_data *pd) | |||
| 53 | 53 | ||
| 54 | static void l2tp_dfs_next_session(struct l2tp_dfs_seq_data *pd) | 54 | static void l2tp_dfs_next_session(struct l2tp_dfs_seq_data *pd) |
| 55 | { | 55 | { |
| 56 | pd->session = l2tp_session_find_nth(pd->tunnel, pd->session_idx); | 56 | pd->session = l2tp_session_get_nth(pd->tunnel, pd->session_idx, true); |
| 57 | pd->session_idx++; | 57 | pd->session_idx++; |
| 58 | 58 | ||
| 59 | if (pd->session == NULL) { | 59 | if (pd->session == NULL) { |
| @@ -238,10 +238,14 @@ static int l2tp_dfs_seq_show(struct seq_file *m, void *v) | |||
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | /* Show the tunnel or session context */ | 240 | /* Show the tunnel or session context */ |
| 241 | if (pd->session == NULL) | 241 | if (!pd->session) { |
| 242 | l2tp_dfs_seq_tunnel_show(m, pd->tunnel); | 242 | l2tp_dfs_seq_tunnel_show(m, pd->tunnel); |
| 243 | else | 243 | } else { |
| 244 | l2tp_dfs_seq_session_show(m, pd->session); | 244 | l2tp_dfs_seq_session_show(m, pd->session); |
| 245 | if (pd->session->deref) | ||
| 246 | pd->session->deref(pd->session); | ||
| 247 | l2tp_session_dec_refcount(pd->session); | ||
| 248 | } | ||
| 245 | 249 | ||
| 246 | out: | 250 | out: |
| 247 | return 0; | 251 | return 0; |
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index 8bf18a5f66e0..6fd41d7afe1e 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c | |||
| @@ -221,12 +221,6 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p | |||
| 221 | goto out; | 221 | goto out; |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | session = l2tp_session_find(net, tunnel, session_id); | ||
| 225 | if (session) { | ||
| 226 | rc = -EEXIST; | ||
| 227 | goto out; | ||
| 228 | } | ||
| 229 | |||
| 230 | if (cfg->ifname) { | 224 | if (cfg->ifname) { |
| 231 | dev = dev_get_by_name(net, cfg->ifname); | 225 | dev = dev_get_by_name(net, cfg->ifname); |
| 232 | if (dev) { | 226 | if (dev) { |
| @@ -240,8 +234,8 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p | |||
| 240 | 234 | ||
| 241 | session = l2tp_session_create(sizeof(*spriv), tunnel, session_id, | 235 | session = l2tp_session_create(sizeof(*spriv), tunnel, session_id, |
| 242 | peer_session_id, cfg); | 236 | peer_session_id, cfg); |
| 243 | if (!session) { | 237 | if (IS_ERR(session)) { |
| 244 | rc = -ENOMEM; | 238 | rc = PTR_ERR(session); |
| 245 | goto out; | 239 | goto out; |
| 246 | } | 240 | } |
| 247 | 241 | ||
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index d25038cfd64e..4d322c1b7233 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c | |||
| @@ -143,19 +143,19 @@ static int l2tp_ip_recv(struct sk_buff *skb) | |||
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | /* Ok, this is a data packet. Lookup the session. */ | 145 | /* Ok, this is a data packet. Lookup the session. */ |
| 146 | session = l2tp_session_find(net, NULL, session_id); | 146 | session = l2tp_session_get(net, NULL, session_id, true); |
| 147 | if (session == NULL) | 147 | if (!session) |
| 148 | goto discard; | 148 | goto discard; |
| 149 | 149 | ||
| 150 | tunnel = session->tunnel; | 150 | tunnel = session->tunnel; |
| 151 | if (tunnel == NULL) | 151 | if (!tunnel) |
| 152 | goto discard; | 152 | goto discard_sess; |
| 153 | 153 | ||
| 154 | /* Trace packet contents, if enabled */ | 154 | /* Trace packet contents, if enabled */ |
| 155 | if (tunnel->debug & L2TP_MSG_DATA) { | 155 | if (tunnel->debug & L2TP_MSG_DATA) { |
| 156 | length = min(32u, skb->len); | 156 | length = min(32u, skb->len); |
| 157 | if (!pskb_may_pull(skb, length)) | 157 | if (!pskb_may_pull(skb, length)) |
| 158 | goto discard; | 158 | goto discard_sess; |
| 159 | 159 | ||
| 160 | /* Point to L2TP header */ | 160 | /* Point to L2TP header */ |
| 161 | optr = ptr = skb->data; | 161 | optr = ptr = skb->data; |
| @@ -165,6 +165,7 @@ static int l2tp_ip_recv(struct sk_buff *skb) | |||
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | l2tp_recv_common(session, skb, ptr, optr, 0, skb->len, tunnel->recv_payload_hook); | 167 | l2tp_recv_common(session, skb, ptr, optr, 0, skb->len, tunnel->recv_payload_hook); |
| 168 | l2tp_session_dec_refcount(session); | ||
| 168 | 169 | ||
| 169 | return 0; | 170 | return 0; |
| 170 | 171 | ||
| @@ -178,9 +179,10 @@ pass_up: | |||
| 178 | 179 | ||
| 179 | tunnel_id = ntohl(*(__be32 *) &skb->data[4]); | 180 | tunnel_id = ntohl(*(__be32 *) &skb->data[4]); |
| 180 | tunnel = l2tp_tunnel_find(net, tunnel_id); | 181 | tunnel = l2tp_tunnel_find(net, tunnel_id); |
| 181 | if (tunnel != NULL) | 182 | if (tunnel) { |
| 182 | sk = tunnel->sock; | 183 | sk = tunnel->sock; |
| 183 | else { | 184 | sock_hold(sk); |
| 185 | } else { | ||
| 184 | struct iphdr *iph = (struct iphdr *) skb_network_header(skb); | 186 | struct iphdr *iph = (struct iphdr *) skb_network_header(skb); |
| 185 | 187 | ||
| 186 | read_lock_bh(&l2tp_ip_lock); | 188 | read_lock_bh(&l2tp_ip_lock); |
| @@ -202,6 +204,12 @@ pass_up: | |||
| 202 | 204 | ||
| 203 | return sk_receive_skb(sk, skb, 1); | 205 | return sk_receive_skb(sk, skb, 1); |
| 204 | 206 | ||
| 207 | discard_sess: | ||
| 208 | if (session->deref) | ||
| 209 | session->deref(session); | ||
| 210 | l2tp_session_dec_refcount(session); | ||
| 211 | goto discard; | ||
| 212 | |||
| 205 | discard_put: | 213 | discard_put: |
| 206 | sock_put(sk); | 214 | sock_put(sk); |
| 207 | 215 | ||
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index a4abcbc4c09a..88b397c30d86 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c | |||
| @@ -156,19 +156,19 @@ static int l2tp_ip6_recv(struct sk_buff *skb) | |||
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | /* Ok, this is a data packet. Lookup the session. */ | 158 | /* Ok, this is a data packet. Lookup the session. */ |
| 159 | session = l2tp_session_find(net, NULL, session_id); | 159 | session = l2tp_session_get(net, NULL, session_id, true); |
| 160 | if (session == NULL) | 160 | if (!session) |
| 161 | goto discard; | 161 | goto discard; |
| 162 | 162 | ||
| 163 | tunnel = session->tunnel; | 163 | tunnel = session->tunnel; |
| 164 | if (tunnel == NULL) | 164 | if (!tunnel) |
| 165 | goto discard; | 165 | goto discard_sess; |
| 166 | 166 | ||
| 167 | /* Trace packet contents, if enabled */ | 167 | /* Trace packet contents, if enabled */ |
| 168 | if (tunnel->debug & L2TP_MSG_DATA) { | 168 | if (tunnel->debug & L2TP_MSG_DATA) { |
| 169 | length = min(32u, skb->len); | 169 | length = min(32u, skb->len); |
| 170 | if (!pskb_may_pull(skb, length)) | 170 | if (!pskb_may_pull(skb, length)) |
| 171 | goto discard; | 171 | goto discard_sess; |
| 172 | 172 | ||
| 173 | /* Point to L2TP header */ | 173 | /* Point to L2TP header */ |
| 174 | optr = ptr = skb->data; | 174 | optr = ptr = skb->data; |
| @@ -179,6 +179,8 @@ static int l2tp_ip6_recv(struct sk_buff *skb) | |||
| 179 | 179 | ||
| 180 | l2tp_recv_common(session, skb, ptr, optr, 0, skb->len, | 180 | l2tp_recv_common(session, skb, ptr, optr, 0, skb->len, |
| 181 | tunnel->recv_payload_hook); | 181 | tunnel->recv_payload_hook); |
| 182 | l2tp_session_dec_refcount(session); | ||
| 183 | |||
| 182 | return 0; | 184 | return 0; |
| 183 | 185 | ||
| 184 | pass_up: | 186 | pass_up: |
| @@ -191,9 +193,10 @@ pass_up: | |||
| 191 | 193 | ||
| 192 | tunnel_id = ntohl(*(__be32 *) &skb->data[4]); | 194 | tunnel_id = ntohl(*(__be32 *) &skb->data[4]); |
| 193 | tunnel = l2tp_tunnel_find(net, tunnel_id); | 195 | tunnel = l2tp_tunnel_find(net, tunnel_id); |
| 194 | if (tunnel != NULL) | 196 | if (tunnel) { |
| 195 | sk = tunnel->sock; | 197 | sk = tunnel->sock; |
| 196 | else { | 198 | sock_hold(sk); |
| 199 | } else { | ||
| 197 | struct ipv6hdr *iph = ipv6_hdr(skb); | 200 | struct ipv6hdr *iph = ipv6_hdr(skb); |
| 198 | 201 | ||
| 199 | read_lock_bh(&l2tp_ip6_lock); | 202 | read_lock_bh(&l2tp_ip6_lock); |
| @@ -215,6 +218,12 @@ pass_up: | |||
| 215 | 218 | ||
| 216 | return sk_receive_skb(sk, skb, 1); | 219 | return sk_receive_skb(sk, skb, 1); |
| 217 | 220 | ||
| 221 | discard_sess: | ||
| 222 | if (session->deref) | ||
| 223 | session->deref(session); | ||
| 224 | l2tp_session_dec_refcount(session); | ||
| 225 | goto discard; | ||
| 226 | |||
| 218 | discard_put: | 227 | discard_put: |
| 219 | sock_put(sk); | 228 | sock_put(sk); |
| 220 | 229 | ||
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 3620fba31786..7e3e669baac4 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c | |||
| @@ -48,7 +48,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, | |||
| 48 | /* Accessed under genl lock */ | 48 | /* Accessed under genl lock */ |
| 49 | static const struct l2tp_nl_cmd_ops *l2tp_nl_cmd_ops[__L2TP_PWTYPE_MAX]; | 49 | static const struct l2tp_nl_cmd_ops *l2tp_nl_cmd_ops[__L2TP_PWTYPE_MAX]; |
| 50 | 50 | ||
| 51 | static struct l2tp_session *l2tp_nl_session_find(struct genl_info *info) | 51 | static struct l2tp_session *l2tp_nl_session_get(struct genl_info *info, |
| 52 | bool do_ref) | ||
| 52 | { | 53 | { |
| 53 | u32 tunnel_id; | 54 | u32 tunnel_id; |
| 54 | u32 session_id; | 55 | u32 session_id; |
| @@ -59,14 +60,15 @@ static struct l2tp_session *l2tp_nl_session_find(struct genl_info *info) | |||
| 59 | 60 | ||
| 60 | if (info->attrs[L2TP_ATTR_IFNAME]) { | 61 | if (info->attrs[L2TP_ATTR_IFNAME]) { |
| 61 | ifname = nla_data(info->attrs[L2TP_ATTR_IFNAME]); | 62 | ifname = nla_data(info->attrs[L2TP_ATTR_IFNAME]); |
| 62 | session = l2tp_session_find_by_ifname(net, ifname); | 63 | session = l2tp_session_get_by_ifname(net, ifname, do_ref); |
| 63 | } else if ((info->attrs[L2TP_ATTR_SESSION_ID]) && | 64 | } else if ((info->attrs[L2TP_ATTR_SESSION_ID]) && |
| 64 | (info->attrs[L2TP_ATTR_CONN_ID])) { | 65 | (info->attrs[L2TP_ATTR_CONN_ID])) { |
| 65 | tunnel_id = nla_get_u32(info->attrs[L2TP_ATTR_CONN_ID]); | 66 | tunnel_id = nla_get_u32(info->attrs[L2TP_ATTR_CONN_ID]); |
| 66 | session_id = nla_get_u32(info->attrs[L2TP_ATTR_SESSION_ID]); | 67 | session_id = nla_get_u32(info->attrs[L2TP_ATTR_SESSION_ID]); |
| 67 | tunnel = l2tp_tunnel_find(net, tunnel_id); | 68 | tunnel = l2tp_tunnel_find(net, tunnel_id); |
| 68 | if (tunnel) | 69 | if (tunnel) |
| 69 | session = l2tp_session_find(net, tunnel, session_id); | 70 | session = l2tp_session_get(net, tunnel, session_id, |
| 71 | do_ref); | ||
| 70 | } | 72 | } |
| 71 | 73 | ||
| 72 | return session; | 74 | return session; |
| @@ -642,10 +644,12 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf | |||
| 642 | session_id, peer_session_id, &cfg); | 644 | session_id, peer_session_id, &cfg); |
| 643 | 645 | ||
| 644 | if (ret >= 0) { | 646 | if (ret >= 0) { |
| 645 | session = l2tp_session_find(net, tunnel, session_id); | 647 | session = l2tp_session_get(net, tunnel, session_id, false); |
| 646 | if (session) | 648 | if (session) { |
| 647 | ret = l2tp_session_notify(&l2tp_nl_family, info, session, | 649 | ret = l2tp_session_notify(&l2tp_nl_family, info, session, |
| 648 | L2TP_CMD_SESSION_CREATE); | 650 | L2TP_CMD_SESSION_CREATE); |
| 651 | l2tp_session_dec_refcount(session); | ||
| 652 | } | ||
| 649 | } | 653 | } |
| 650 | 654 | ||
| 651 | out: | 655 | out: |
| @@ -658,7 +662,7 @@ static int l2tp_nl_cmd_session_delete(struct sk_buff *skb, struct genl_info *inf | |||
| 658 | struct l2tp_session *session; | 662 | struct l2tp_session *session; |
| 659 | u16 pw_type; | 663 | u16 pw_type; |
| 660 | 664 | ||
| 661 | session = l2tp_nl_session_find(info); | 665 | session = l2tp_nl_session_get(info, true); |
| 662 | if (session == NULL) { | 666 | if (session == NULL) { |
| 663 | ret = -ENODEV; | 667 | ret = -ENODEV; |
| 664 | goto out; | 668 | goto out; |
| @@ -672,6 +676,10 @@ static int l2tp_nl_cmd_session_delete(struct sk_buff *skb, struct genl_info *inf | |||
| 672 | if (l2tp_nl_cmd_ops[pw_type] && l2tp_nl_cmd_ops[pw_type]->session_delete) | 676 | if (l2tp_nl_cmd_ops[pw_type] && l2tp_nl_cmd_ops[pw_type]->session_delete) |
| 673 | ret = (*l2tp_nl_cmd_ops[pw_type]->session_delete)(session); | 677 | ret = (*l2tp_nl_cmd_ops[pw_type]->session_delete)(session); |
| 674 | 678 | ||
| 679 | if (session->deref) | ||
| 680 | session->deref(session); | ||
| 681 | l2tp_session_dec_refcount(session); | ||
| 682 | |||
| 675 | out: | 683 | out: |
| 676 | return ret; | 684 | return ret; |
| 677 | } | 685 | } |
| @@ -681,7 +689,7 @@ static int l2tp_nl_cmd_session_modify(struct sk_buff *skb, struct genl_info *inf | |||
| 681 | int ret = 0; | 689 | int ret = 0; |
| 682 | struct l2tp_session *session; | 690 | struct l2tp_session *session; |
| 683 | 691 | ||
| 684 | session = l2tp_nl_session_find(info); | 692 | session = l2tp_nl_session_get(info, false); |
| 685 | if (session == NULL) { | 693 | if (session == NULL) { |
| 686 | ret = -ENODEV; | 694 | ret = -ENODEV; |
| 687 | goto out; | 695 | goto out; |
| @@ -716,6 +724,8 @@ static int l2tp_nl_cmd_session_modify(struct sk_buff *skb, struct genl_info *inf | |||
| 716 | ret = l2tp_session_notify(&l2tp_nl_family, info, | 724 | ret = l2tp_session_notify(&l2tp_nl_family, info, |
| 717 | session, L2TP_CMD_SESSION_MODIFY); | 725 | session, L2TP_CMD_SESSION_MODIFY); |
| 718 | 726 | ||
| 727 | l2tp_session_dec_refcount(session); | ||
| 728 | |||
| 719 | out: | 729 | out: |
| 720 | return ret; | 730 | return ret; |
| 721 | } | 731 | } |
| @@ -811,29 +821,34 @@ static int l2tp_nl_cmd_session_get(struct sk_buff *skb, struct genl_info *info) | |||
| 811 | struct sk_buff *msg; | 821 | struct sk_buff *msg; |
| 812 | int ret; | 822 | int ret; |
| 813 | 823 | ||
| 814 | session = l2tp_nl_session_find(info); | 824 | session = l2tp_nl_session_get(info, false); |
| 815 | if (session == NULL) { | 825 | if (session == NULL) { |
| 816 | ret = -ENODEV; | 826 | ret = -ENODEV; |
| 817 | goto out; | 827 | goto err; |
| 818 | } | 828 | } |
| 819 | 829 | ||
| 820 | msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); | 830 | msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); |
| 821 | if (!msg) { | 831 | if (!msg) { |
| 822 | ret = -ENOMEM; | 832 | ret = -ENOMEM; |
| 823 | goto out; | 833 | goto err_ref; |
| 824 | } | 834 | } |
| 825 | 835 | ||
| 826 | ret = l2tp_nl_session_send(msg, info->snd_portid, info->snd_seq, | 836 | ret = l2tp_nl_session_send(msg, info->snd_portid, info->snd_seq, |
| 827 | 0, session, L2TP_CMD_SESSION_GET); | 837 | 0, session, L2TP_CMD_SESSION_GET); |
| 828 | if (ret < 0) | 838 | if (ret < 0) |
| 829 | goto err_out; | 839 | goto err_ref_msg; |
| 830 | 840 | ||
| 831 | return genlmsg_unicast(genl_info_net(info), msg, info->snd_portid); | 841 | ret = genlmsg_unicast(genl_info_net(info), msg, info->snd_portid); |
| 832 | 842 | ||
| 833 | err_out: | 843 | l2tp_session_dec_refcount(session); |
| 834 | nlmsg_free(msg); | ||
| 835 | 844 | ||
| 836 | out: | 845 | return ret; |
| 846 | |||
| 847 | err_ref_msg: | ||
| 848 | nlmsg_free(msg); | ||
| 849 | err_ref: | ||
| 850 | l2tp_session_dec_refcount(session); | ||
| 851 | err: | ||
| 837 | return ret; | 852 | return ret; |
| 838 | } | 853 | } |
| 839 | 854 | ||
| @@ -852,7 +867,7 @@ static int l2tp_nl_cmd_session_dump(struct sk_buff *skb, struct netlink_callback | |||
| 852 | goto out; | 867 | goto out; |
| 853 | } | 868 | } |
| 854 | 869 | ||
| 855 | session = l2tp_session_find_nth(tunnel, si); | 870 | session = l2tp_session_get_nth(tunnel, si, false); |
| 856 | if (session == NULL) { | 871 | if (session == NULL) { |
| 857 | ti++; | 872 | ti++; |
| 858 | tunnel = NULL; | 873 | tunnel = NULL; |
| @@ -862,8 +877,11 @@ static int l2tp_nl_cmd_session_dump(struct sk_buff *skb, struct netlink_callback | |||
| 862 | 877 | ||
| 863 | if (l2tp_nl_session_send(skb, NETLINK_CB(cb->skb).portid, | 878 | if (l2tp_nl_session_send(skb, NETLINK_CB(cb->skb).portid, |
| 864 | cb->nlh->nlmsg_seq, NLM_F_MULTI, | 879 | cb->nlh->nlmsg_seq, NLM_F_MULTI, |
| 865 | session, L2TP_CMD_SESSION_GET) < 0) | 880 | session, L2TP_CMD_SESSION_GET) < 0) { |
| 881 | l2tp_session_dec_refcount(session); | ||
| 866 | break; | 882 | break; |
| 883 | } | ||
| 884 | l2tp_session_dec_refcount(session); | ||
| 867 | 885 | ||
| 868 | si++; | 886 | si++; |
| 869 | } | 887 | } |
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 36cc56fd0418..861b255a2d51 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c | |||
| @@ -450,6 +450,10 @@ static void pppol2tp_session_close(struct l2tp_session *session) | |||
| 450 | static void pppol2tp_session_destruct(struct sock *sk) | 450 | static void pppol2tp_session_destruct(struct sock *sk) |
| 451 | { | 451 | { |
| 452 | struct l2tp_session *session = sk->sk_user_data; | 452 | struct l2tp_session *session = sk->sk_user_data; |
| 453 | |||
| 454 | skb_queue_purge(&sk->sk_receive_queue); | ||
| 455 | skb_queue_purge(&sk->sk_write_queue); | ||
| 456 | |||
| 453 | if (session) { | 457 | if (session) { |
| 454 | sk->sk_user_data = NULL; | 458 | sk->sk_user_data = NULL; |
| 455 | BUG_ON(session->magic != L2TP_SESSION_MAGIC); | 459 | BUG_ON(session->magic != L2TP_SESSION_MAGIC); |
| @@ -488,9 +492,6 @@ static int pppol2tp_release(struct socket *sock) | |||
| 488 | l2tp_session_queue_purge(session); | 492 | l2tp_session_queue_purge(session); |
| 489 | sock_put(sk); | 493 | sock_put(sk); |
| 490 | } | 494 | } |
| 491 | skb_queue_purge(&sk->sk_receive_queue); | ||
| 492 | skb_queue_purge(&sk->sk_write_queue); | ||
| 493 | |||
| 494 | release_sock(sk); | 495 | release_sock(sk); |
| 495 | 496 | ||
| 496 | /* This will delete the session context via | 497 | /* This will delete the session context via |
| @@ -582,6 +583,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr, | |||
| 582 | int error = 0; | 583 | int error = 0; |
| 583 | u32 tunnel_id, peer_tunnel_id; | 584 | u32 tunnel_id, peer_tunnel_id; |
| 584 | u32 session_id, peer_session_id; | 585 | u32 session_id, peer_session_id; |
| 586 | bool drop_refcnt = false; | ||
| 585 | int ver = 2; | 587 | int ver = 2; |
| 586 | int fd; | 588 | int fd; |
| 587 | 589 | ||
| @@ -683,36 +685,36 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr, | |||
| 683 | if (tunnel->peer_tunnel_id == 0) | 685 | if (tunnel->peer_tunnel_id == 0) |
| 684 | tunnel->peer_tunnel_id = peer_tunnel_id; | 686 | tunnel->peer_tunnel_id = peer_tunnel_id; |
| 685 | 687 | ||
| 686 | /* Create session if it doesn't already exist. We handle the | 688 | session = l2tp_session_get(sock_net(sk), tunnel, session_id, false); |
| 687 | * case where a session was previously created by the netlink | 689 | if (session) { |
| 688 | * interface by checking that the session doesn't already have | 690 | drop_refcnt = true; |
| 689 | * a socket and its tunnel socket are what we expect. If any | 691 | ps = l2tp_session_priv(session); |
| 690 | * of those checks fail, return EEXIST to the caller. | 692 | |
| 691 | */ | 693 | /* Using a pre-existing session is fine as long as it hasn't |
| 692 | session = l2tp_session_find(sock_net(sk), tunnel, session_id); | 694 | * been connected yet. |
| 693 | if (session == NULL) { | ||
| 694 | /* Default MTU must allow space for UDP/L2TP/PPP | ||
| 695 | * headers. | ||
| 696 | */ | 695 | */ |
| 697 | cfg.mtu = cfg.mru = 1500 - PPPOL2TP_HEADER_OVERHEAD; | 696 | if (ps->sock) { |
| 697 | error = -EEXIST; | ||
| 698 | goto end; | ||
| 699 | } | ||
| 698 | 700 | ||
| 699 | /* Allocate and initialize a new session context. */ | 701 | /* consistency checks */ |
| 700 | session = l2tp_session_create(sizeof(struct pppol2tp_session), | 702 | if (ps->tunnel_sock != tunnel->sock) { |
| 701 | tunnel, session_id, | 703 | error = -EEXIST; |
| 702 | peer_session_id, &cfg); | ||
| 703 | if (session == NULL) { | ||
| 704 | error = -ENOMEM; | ||
| 705 | goto end; | 704 | goto end; |
| 706 | } | 705 | } |
| 707 | } else { | 706 | } else { |
| 708 | ps = l2tp_session_priv(session); | 707 | /* Default MTU must allow space for UDP/L2TP/PPP headers */ |
| 709 | error = -EEXIST; | 708 | cfg.mtu = 1500 - PPPOL2TP_HEADER_OVERHEAD; |
| 710 | if (ps->sock != NULL) | 709 | cfg.mru = cfg.mtu; |
| 711 | goto end; | ||
| 712 | 710 | ||
| 713 | /* consistency checks */ | 711 | session = l2tp_session_create(sizeof(struct pppol2tp_session), |
| 714 | if (ps->tunnel_sock != tunnel->sock) | 712 | tunnel, session_id, |
| 713 | peer_session_id, &cfg); | ||
| 714 | if (IS_ERR(session)) { | ||
| 715 | error = PTR_ERR(session); | ||
| 715 | goto end; | 716 | goto end; |
| 717 | } | ||
| 716 | } | 718 | } |
| 717 | 719 | ||
| 718 | /* Associate session with its PPPoL2TP socket */ | 720 | /* Associate session with its PPPoL2TP socket */ |
| @@ -777,6 +779,8 @@ out_no_ppp: | |||
| 777 | session->name); | 779 | session->name); |
| 778 | 780 | ||
| 779 | end: | 781 | end: |
| 782 | if (drop_refcnt) | ||
| 783 | l2tp_session_dec_refcount(session); | ||
| 780 | release_sock(sk); | 784 | release_sock(sk); |
| 781 | 785 | ||
| 782 | return error; | 786 | return error; |
| @@ -804,12 +808,6 @@ static int pppol2tp_session_create(struct net *net, u32 tunnel_id, u32 session_i | |||
| 804 | if (tunnel->sock == NULL) | 808 | if (tunnel->sock == NULL) |
| 805 | goto out; | 809 | goto out; |
| 806 | 810 | ||
| 807 | /* Check that this session doesn't already exist */ | ||
| 808 | error = -EEXIST; | ||
| 809 | session = l2tp_session_find(net, tunnel, session_id); | ||
| 810 | if (session != NULL) | ||
| 811 | goto out; | ||
| 812 | |||
| 813 | /* Default MTU values. */ | 811 | /* Default MTU values. */ |
| 814 | if (cfg->mtu == 0) | 812 | if (cfg->mtu == 0) |
| 815 | cfg->mtu = 1500 - PPPOL2TP_HEADER_OVERHEAD; | 813 | cfg->mtu = 1500 - PPPOL2TP_HEADER_OVERHEAD; |
| @@ -817,12 +815,13 @@ static int pppol2tp_session_create(struct net *net, u32 tunnel_id, u32 session_i | |||
| 817 | cfg->mru = cfg->mtu; | 815 | cfg->mru = cfg->mtu; |
| 818 | 816 | ||
| 819 | /* Allocate and initialize a new session context. */ | 817 | /* Allocate and initialize a new session context. */ |
| 820 | error = -ENOMEM; | ||
| 821 | session = l2tp_session_create(sizeof(struct pppol2tp_session), | 818 | session = l2tp_session_create(sizeof(struct pppol2tp_session), |
| 822 | tunnel, session_id, | 819 | tunnel, session_id, |
| 823 | peer_session_id, cfg); | 820 | peer_session_id, cfg); |
| 824 | if (session == NULL) | 821 | if (IS_ERR(session)) { |
| 822 | error = PTR_ERR(session); | ||
| 825 | goto out; | 823 | goto out; |
| 824 | } | ||
| 826 | 825 | ||
| 827 | ps = l2tp_session_priv(session); | 826 | ps = l2tp_session_priv(session); |
| 828 | ps->tunnel_sock = tunnel->sock; | 827 | ps->tunnel_sock = tunnel->sock; |
| @@ -1140,11 +1139,18 @@ static int pppol2tp_tunnel_ioctl(struct l2tp_tunnel *tunnel, | |||
| 1140 | if (stats.session_id != 0) { | 1139 | if (stats.session_id != 0) { |
| 1141 | /* resend to session ioctl handler */ | 1140 | /* resend to session ioctl handler */ |
| 1142 | struct l2tp_session *session = | 1141 | struct l2tp_session *session = |
| 1143 | l2tp_session_find(sock_net(sk), tunnel, stats.session_id); | 1142 | l2tp_session_get(sock_net(sk), tunnel, |
| 1144 | if (session != NULL) | 1143 | stats.session_id, true); |
| 1145 | err = pppol2tp_session_ioctl(session, cmd, arg); | 1144 | |
| 1146 | else | 1145 | if (session) { |
| 1146 | err = pppol2tp_session_ioctl(session, cmd, | ||
| 1147 | arg); | ||
| 1148 | if (session->deref) | ||
| 1149 | session->deref(session); | ||
| 1150 | l2tp_session_dec_refcount(session); | ||
| 1151 | } else { | ||
| 1147 | err = -EBADR; | 1152 | err = -EBADR; |
| 1153 | } | ||
| 1148 | break; | 1154 | break; |
| 1149 | } | 1155 | } |
| 1150 | #ifdef CONFIG_XFRM | 1156 | #ifdef CONFIG_XFRM |
| @@ -1554,7 +1560,7 @@ static void pppol2tp_next_tunnel(struct net *net, struct pppol2tp_seq_data *pd) | |||
| 1554 | 1560 | ||
| 1555 | static void pppol2tp_next_session(struct net *net, struct pppol2tp_seq_data *pd) | 1561 | static void pppol2tp_next_session(struct net *net, struct pppol2tp_seq_data *pd) |
| 1556 | { | 1562 | { |
| 1557 | pd->session = l2tp_session_find_nth(pd->tunnel, pd->session_idx); | 1563 | pd->session = l2tp_session_get_nth(pd->tunnel, pd->session_idx, true); |
| 1558 | pd->session_idx++; | 1564 | pd->session_idx++; |
| 1559 | 1565 | ||
| 1560 | if (pd->session == NULL) { | 1566 | if (pd->session == NULL) { |
| @@ -1681,10 +1687,14 @@ static int pppol2tp_seq_show(struct seq_file *m, void *v) | |||
| 1681 | 1687 | ||
| 1682 | /* Show the tunnel or session context. | 1688 | /* Show the tunnel or session context. |
| 1683 | */ | 1689 | */ |
| 1684 | if (pd->session == NULL) | 1690 | if (!pd->session) { |
| 1685 | pppol2tp_seq_tunnel_show(m, pd->tunnel); | 1691 | pppol2tp_seq_tunnel_show(m, pd->tunnel); |
| 1686 | else | 1692 | } else { |
| 1687 | pppol2tp_seq_session_show(m, pd->session); | 1693 | pppol2tp_seq_session_show(m, pd->session); |
| 1694 | if (pd->session->deref) | ||
| 1695 | pd->session->deref(pd->session); | ||
| 1696 | l2tp_session_dec_refcount(pd->session); | ||
| 1697 | } | ||
| 1688 | 1698 | ||
| 1689 | out: | 1699 | out: |
| 1690 | return 0; | 1700 | return 0; |
| @@ -1843,4 +1853,4 @@ MODULE_DESCRIPTION("PPP over L2TP over UDP"); | |||
| 1843 | MODULE_LICENSE("GPL"); | 1853 | MODULE_LICENSE("GPL"); |
| 1844 | MODULE_VERSION(PPPOL2TP_DRV_VERSION); | 1854 | MODULE_VERSION(PPPOL2TP_DRV_VERSION); |
| 1845 | MODULE_ALIAS_NET_PF_PROTO(PF_PPPOX, PX_PROTO_OL2TP); | 1855 | MODULE_ALIAS_NET_PF_PROTO(PF_PPPOX, PX_PROTO_OL2TP); |
| 1846 | MODULE_ALIAS_L2TP_PWTYPE(11); | 1856 | MODULE_ALIAS_L2TP_PWTYPE(7); |
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 40813dd3301c..5bb0c5012819 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
| @@ -718,7 +718,8 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) | |||
| 718 | ieee80211_recalc_ps(local); | 718 | ieee80211_recalc_ps(local); |
| 719 | 719 | ||
| 720 | if (sdata->vif.type == NL80211_IFTYPE_MONITOR || | 720 | if (sdata->vif.type == NL80211_IFTYPE_MONITOR || |
| 721 | sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { | 721 | sdata->vif.type == NL80211_IFTYPE_AP_VLAN || |
| 722 | local->ops->wake_tx_queue) { | ||
| 722 | /* XXX: for AP_VLAN, actually track AP queues */ | 723 | /* XXX: for AP_VLAN, actually track AP queues */ |
| 723 | netif_tx_start_all_queues(dev); | 724 | netif_tx_start_all_queues(dev); |
| 724 | } else if (dev) { | 725 | } else if (dev) { |
diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c index da9df2d56e66..22fc32143e9c 100644 --- a/net/netfilter/nf_conntrack_ecache.c +++ b/net/netfilter/nf_conntrack_ecache.c | |||
| @@ -290,6 +290,7 @@ void nf_conntrack_unregister_notifier(struct net *net, | |||
| 290 | BUG_ON(notify != new); | 290 | BUG_ON(notify != new); |
| 291 | RCU_INIT_POINTER(net->ct.nf_conntrack_event_cb, NULL); | 291 | RCU_INIT_POINTER(net->ct.nf_conntrack_event_cb, NULL); |
| 292 | mutex_unlock(&nf_ct_ecache_mutex); | 292 | mutex_unlock(&nf_ct_ecache_mutex); |
| 293 | /* synchronize_rcu() is called from ctnetlink_exit. */ | ||
| 293 | } | 294 | } |
| 294 | EXPORT_SYMBOL_GPL(nf_conntrack_unregister_notifier); | 295 | EXPORT_SYMBOL_GPL(nf_conntrack_unregister_notifier); |
| 295 | 296 | ||
| @@ -326,6 +327,7 @@ void nf_ct_expect_unregister_notifier(struct net *net, | |||
| 326 | BUG_ON(notify != new); | 327 | BUG_ON(notify != new); |
| 327 | RCU_INIT_POINTER(net->ct.nf_expect_event_cb, NULL); | 328 | RCU_INIT_POINTER(net->ct.nf_expect_event_cb, NULL); |
| 328 | mutex_unlock(&nf_ct_ecache_mutex); | 329 | mutex_unlock(&nf_ct_ecache_mutex); |
| 330 | /* synchronize_rcu() is called from ctnetlink_exit. */ | ||
| 329 | } | 331 | } |
| 330 | EXPORT_SYMBOL_GPL(nf_ct_expect_unregister_notifier); | 332 | EXPORT_SYMBOL_GPL(nf_ct_expect_unregister_notifier); |
| 331 | 333 | ||
diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c index 02bcf00c2492..008299b7f78f 100644 --- a/net/netfilter/nf_conntrack_extend.c +++ b/net/netfilter/nf_conntrack_extend.c | |||
| @@ -53,7 +53,11 @@ nf_ct_ext_create(struct nf_ct_ext **ext, enum nf_ct_ext_id id, | |||
| 53 | 53 | ||
| 54 | rcu_read_lock(); | 54 | rcu_read_lock(); |
| 55 | t = rcu_dereference(nf_ct_ext_types[id]); | 55 | t = rcu_dereference(nf_ct_ext_types[id]); |
| 56 | BUG_ON(t == NULL); | 56 | if (!t) { |
| 57 | rcu_read_unlock(); | ||
| 58 | return NULL; | ||
| 59 | } | ||
| 60 | |||
| 57 | off = ALIGN(sizeof(struct nf_ct_ext), t->align); | 61 | off = ALIGN(sizeof(struct nf_ct_ext), t->align); |
| 58 | len = off + t->len + var_alloc_len; | 62 | len = off + t->len + var_alloc_len; |
| 59 | alloc_size = t->alloc_size + var_alloc_len; | 63 | alloc_size = t->alloc_size + var_alloc_len; |
| @@ -88,7 +92,10 @@ void *__nf_ct_ext_add_length(struct nf_conn *ct, enum nf_ct_ext_id id, | |||
| 88 | 92 | ||
| 89 | rcu_read_lock(); | 93 | rcu_read_lock(); |
| 90 | t = rcu_dereference(nf_ct_ext_types[id]); | 94 | t = rcu_dereference(nf_ct_ext_types[id]); |
| 91 | BUG_ON(t == NULL); | 95 | if (!t) { |
| 96 | rcu_read_unlock(); | ||
| 97 | return NULL; | ||
| 98 | } | ||
| 92 | 99 | ||
| 93 | newoff = ALIGN(old->len, t->align); | 100 | newoff = ALIGN(old->len, t->align); |
| 94 | newlen = newoff + t->len + var_alloc_len; | 101 | newlen = newoff + t->len + var_alloc_len; |
| @@ -175,6 +182,6 @@ void nf_ct_extend_unregister(struct nf_ct_ext_type *type) | |||
| 175 | RCU_INIT_POINTER(nf_ct_ext_types[type->id], NULL); | 182 | RCU_INIT_POINTER(nf_ct_ext_types[type->id], NULL); |
| 176 | update_alloc_size(type); | 183 | update_alloc_size(type); |
| 177 | mutex_unlock(&nf_ct_ext_type_mutex); | 184 | mutex_unlock(&nf_ct_ext_type_mutex); |
| 178 | rcu_barrier(); /* Wait for completion of call_rcu()'s */ | 185 | synchronize_rcu(); |
| 179 | } | 186 | } |
| 180 | EXPORT_SYMBOL_GPL(nf_ct_extend_unregister); | 187 | EXPORT_SYMBOL_GPL(nf_ct_extend_unregister); |
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 6806b5e73567..908d858034e4 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
| @@ -3442,6 +3442,7 @@ static void __exit ctnetlink_exit(void) | |||
| 3442 | #ifdef CONFIG_NETFILTER_NETLINK_GLUE_CT | 3442 | #ifdef CONFIG_NETFILTER_NETLINK_GLUE_CT |
| 3443 | RCU_INIT_POINTER(nfnl_ct_hook, NULL); | 3443 | RCU_INIT_POINTER(nfnl_ct_hook, NULL); |
| 3444 | #endif | 3444 | #endif |
| 3445 | synchronize_rcu(); | ||
| 3445 | } | 3446 | } |
| 3446 | 3447 | ||
| 3447 | module_init(ctnetlink_init); | 3448 | module_init(ctnetlink_init); |
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index 94b14c5a8b17..82802e4a6640 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c | |||
| @@ -903,6 +903,8 @@ static void __exit nf_nat_cleanup(void) | |||
| 903 | #ifdef CONFIG_XFRM | 903 | #ifdef CONFIG_XFRM |
| 904 | RCU_INIT_POINTER(nf_nat_decode_session_hook, NULL); | 904 | RCU_INIT_POINTER(nf_nat_decode_session_hook, NULL); |
| 905 | #endif | 905 | #endif |
| 906 | synchronize_rcu(); | ||
| 907 | |||
| 906 | for (i = 0; i < NFPROTO_NUMPROTO; i++) | 908 | for (i = 0; i < NFPROTO_NUMPROTO; i++) |
| 907 | kfree(nf_nat_l4protos[i]); | 909 | kfree(nf_nat_l4protos[i]); |
| 908 | 910 | ||
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c index de8782345c86..d45558178da5 100644 --- a/net/netfilter/nfnetlink_cthelper.c +++ b/net/netfilter/nfnetlink_cthelper.c | |||
| @@ -32,6 +32,13 @@ MODULE_LICENSE("GPL"); | |||
| 32 | MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>"); | 32 | MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>"); |
| 33 | MODULE_DESCRIPTION("nfnl_cthelper: User-space connection tracking helpers"); | 33 | MODULE_DESCRIPTION("nfnl_cthelper: User-space connection tracking helpers"); |
| 34 | 34 | ||
| 35 | struct nfnl_cthelper { | ||
| 36 | struct list_head list; | ||
| 37 | struct nf_conntrack_helper helper; | ||
| 38 | }; | ||
| 39 | |||
| 40 | static LIST_HEAD(nfnl_cthelper_list); | ||
| 41 | |||
| 35 | static int | 42 | static int |
| 36 | nfnl_userspace_cthelper(struct sk_buff *skb, unsigned int protoff, | 43 | nfnl_userspace_cthelper(struct sk_buff *skb, unsigned int protoff, |
| 37 | struct nf_conn *ct, enum ip_conntrack_info ctinfo) | 44 | struct nf_conn *ct, enum ip_conntrack_info ctinfo) |
| @@ -161,6 +168,7 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper, | |||
| 161 | int i, ret; | 168 | int i, ret; |
| 162 | struct nf_conntrack_expect_policy *expect_policy; | 169 | struct nf_conntrack_expect_policy *expect_policy; |
| 163 | struct nlattr *tb[NFCTH_POLICY_SET_MAX+1]; | 170 | struct nlattr *tb[NFCTH_POLICY_SET_MAX+1]; |
| 171 | unsigned int class_max; | ||
| 164 | 172 | ||
| 165 | ret = nla_parse_nested(tb, NFCTH_POLICY_SET_MAX, attr, | 173 | ret = nla_parse_nested(tb, NFCTH_POLICY_SET_MAX, attr, |
| 166 | nfnl_cthelper_expect_policy_set); | 174 | nfnl_cthelper_expect_policy_set); |
| @@ -170,19 +178,18 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper, | |||
| 170 | if (!tb[NFCTH_POLICY_SET_NUM]) | 178 | if (!tb[NFCTH_POLICY_SET_NUM]) |
| 171 | return -EINVAL; | 179 | return -EINVAL; |
| 172 | 180 | ||
| 173 | helper->expect_class_max = | 181 | class_max = ntohl(nla_get_be32(tb[NFCTH_POLICY_SET_NUM])); |
| 174 | ntohl(nla_get_be32(tb[NFCTH_POLICY_SET_NUM])); | 182 | if (class_max == 0) |
| 175 | 183 | return -EINVAL; | |
| 176 | if (helper->expect_class_max != 0 && | 184 | if (class_max > NF_CT_MAX_EXPECT_CLASSES) |
| 177 | helper->expect_class_max > NF_CT_MAX_EXPECT_CLASSES) | ||
| 178 | return -EOVERFLOW; | 185 | return -EOVERFLOW; |
| 179 | 186 | ||
| 180 | expect_policy = kzalloc(sizeof(struct nf_conntrack_expect_policy) * | 187 | expect_policy = kzalloc(sizeof(struct nf_conntrack_expect_policy) * |
| 181 | helper->expect_class_max, GFP_KERNEL); | 188 | class_max, GFP_KERNEL); |
| 182 | if (expect_policy == NULL) | 189 | if (expect_policy == NULL) |
| 183 | return -ENOMEM; | 190 | return -ENOMEM; |
| 184 | 191 | ||
| 185 | for (i=0; i<helper->expect_class_max; i++) { | 192 | for (i = 0; i < class_max; i++) { |
| 186 | if (!tb[NFCTH_POLICY_SET+i]) | 193 | if (!tb[NFCTH_POLICY_SET+i]) |
| 187 | goto err; | 194 | goto err; |
| 188 | 195 | ||
| @@ -191,6 +198,8 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper, | |||
| 191 | if (ret < 0) | 198 | if (ret < 0) |
| 192 | goto err; | 199 | goto err; |
| 193 | } | 200 | } |
| 201 | |||
| 202 | helper->expect_class_max = class_max - 1; | ||
| 194 | helper->expect_policy = expect_policy; | 203 | helper->expect_policy = expect_policy; |
| 195 | return 0; | 204 | return 0; |
| 196 | err: | 205 | err: |
| @@ -203,18 +212,20 @@ nfnl_cthelper_create(const struct nlattr * const tb[], | |||
| 203 | struct nf_conntrack_tuple *tuple) | 212 | struct nf_conntrack_tuple *tuple) |
| 204 | { | 213 | { |
| 205 | struct nf_conntrack_helper *helper; | 214 | struct nf_conntrack_helper *helper; |
| 215 | struct nfnl_cthelper *nfcth; | ||
| 206 | int ret; | 216 | int ret; |
| 207 | 217 | ||
| 208 | if (!tb[NFCTH_TUPLE] || !tb[NFCTH_POLICY] || !tb[NFCTH_PRIV_DATA_LEN]) | 218 | if (!tb[NFCTH_TUPLE] || !tb[NFCTH_POLICY] || !tb[NFCTH_PRIV_DATA_LEN]) |
| 209 | return -EINVAL; | 219 | return -EINVAL; |
| 210 | 220 | ||
| 211 | helper = kzalloc(sizeof(struct nf_conntrack_helper), GFP_KERNEL); | 221 | nfcth = kzalloc(sizeof(*nfcth), GFP_KERNEL); |
| 212 | if (helper == NULL) | 222 | if (nfcth == NULL) |
| 213 | return -ENOMEM; | 223 | return -ENOMEM; |
| 224 | helper = &nfcth->helper; | ||
| 214 | 225 | ||
| 215 | ret = nfnl_cthelper_parse_expect_policy(helper, tb[NFCTH_POLICY]); | 226 | ret = nfnl_cthelper_parse_expect_policy(helper, tb[NFCTH_POLICY]); |
| 216 | if (ret < 0) | 227 | if (ret < 0) |
| 217 | goto err; | 228 | goto err1; |
| 218 | 229 | ||
| 219 | strncpy(helper->name, nla_data(tb[NFCTH_NAME]), NF_CT_HELPER_NAME_LEN); | 230 | strncpy(helper->name, nla_data(tb[NFCTH_NAME]), NF_CT_HELPER_NAME_LEN); |
| 220 | helper->data_len = ntohl(nla_get_be32(tb[NFCTH_PRIV_DATA_LEN])); | 231 | helper->data_len = ntohl(nla_get_be32(tb[NFCTH_PRIV_DATA_LEN])); |
| @@ -245,15 +256,101 @@ nfnl_cthelper_create(const struct nlattr * const tb[], | |||
| 245 | 256 | ||
| 246 | ret = nf_conntrack_helper_register(helper); | 257 | ret = nf_conntrack_helper_register(helper); |
| 247 | if (ret < 0) | 258 | if (ret < 0) |
| 248 | goto err; | 259 | goto err2; |
| 249 | 260 | ||
| 261 | list_add_tail(&nfcth->list, &nfnl_cthelper_list); | ||
| 250 | return 0; | 262 | return 0; |
| 251 | err: | 263 | err2: |
| 252 | kfree(helper); | 264 | kfree(helper->expect_policy); |
| 265 | err1: | ||
| 266 | kfree(nfcth); | ||
| 253 | return ret; | 267 | return ret; |
| 254 | } | 268 | } |
| 255 | 269 | ||
| 256 | static int | 270 | static int |
| 271 | nfnl_cthelper_update_policy_one(const struct nf_conntrack_expect_policy *policy, | ||
| 272 | struct nf_conntrack_expect_policy *new_policy, | ||
| 273 | const struct nlattr *attr) | ||
| 274 | { | ||
| 275 | struct nlattr *tb[NFCTH_POLICY_MAX + 1]; | ||
| 276 | int err; | ||
| 277 | |||
| 278 | err = nla_parse_nested(tb, NFCTH_POLICY_MAX, attr, | ||
| 279 | nfnl_cthelper_expect_pol); | ||
| 280 | if (err < 0) | ||
| 281 | return err; | ||
| 282 | |||
| 283 | if (!tb[NFCTH_POLICY_NAME] || | ||
| 284 | !tb[NFCTH_POLICY_EXPECT_MAX] || | ||
| 285 | !tb[NFCTH_POLICY_EXPECT_TIMEOUT]) | ||
| 286 | return -EINVAL; | ||
| 287 | |||
| 288 | if (nla_strcmp(tb[NFCTH_POLICY_NAME], policy->name)) | ||
| 289 | return -EBUSY; | ||
| 290 | |||
| 291 | new_policy->max_expected = | ||
| 292 | ntohl(nla_get_be32(tb[NFCTH_POLICY_EXPECT_MAX])); | ||
| 293 | new_policy->timeout = | ||
| 294 | ntohl(nla_get_be32(tb[NFCTH_POLICY_EXPECT_TIMEOUT])); | ||
| 295 | |||
| 296 | return 0; | ||
| 297 | } | ||
| 298 | |||
| 299 | static int nfnl_cthelper_update_policy_all(struct nlattr *tb[], | ||
| 300 | struct nf_conntrack_helper *helper) | ||
| 301 | { | ||
| 302 | struct nf_conntrack_expect_policy new_policy[helper->expect_class_max + 1]; | ||
| 303 | struct nf_conntrack_expect_policy *policy; | ||
| 304 | int i, err; | ||
| 305 | |||
| 306 | /* Check first that all policy attributes are well-formed, so we don't | ||
| 307 | * leave things in inconsistent state on errors. | ||
| 308 | */ | ||
| 309 | for (i = 0; i < helper->expect_class_max + 1; i++) { | ||
| 310 | |||
| 311 | if (!tb[NFCTH_POLICY_SET + i]) | ||
| 312 | return -EINVAL; | ||
| 313 | |||
| 314 | err = nfnl_cthelper_update_policy_one(&helper->expect_policy[i], | ||
| 315 | &new_policy[i], | ||
| 316 | tb[NFCTH_POLICY_SET + i]); | ||
| 317 | if (err < 0) | ||
| 318 | return err; | ||
| 319 | } | ||
| 320 | /* Now we can safely update them. */ | ||
| 321 | for (i = 0; i < helper->expect_class_max + 1; i++) { | ||
| 322 | policy = (struct nf_conntrack_expect_policy *) | ||
| 323 | &helper->expect_policy[i]; | ||
| 324 | policy->max_expected = new_policy->max_expected; | ||
| 325 | policy->timeout = new_policy->timeout; | ||
| 326 | } | ||
| 327 | |||
| 328 | return 0; | ||
| 329 | } | ||
| 330 | |||
| 331 | static int nfnl_cthelper_update_policy(struct nf_conntrack_helper *helper, | ||
| 332 | const struct nlattr *attr) | ||
| 333 | { | ||
| 334 | struct nlattr *tb[NFCTH_POLICY_SET_MAX + 1]; | ||
| 335 | unsigned int class_max; | ||
| 336 | int err; | ||
| 337 | |||
| 338 | err = nla_parse_nested(tb, NFCTH_POLICY_SET_MAX, attr, | ||
| 339 | nfnl_cthelper_expect_policy_set); | ||
| 340 | if (err < 0) | ||
| 341 | return err; | ||
| 342 | |||
| 343 | if (!tb[NFCTH_POLICY_SET_NUM]) | ||
| 344 | return -EINVAL; | ||
| 345 | |||
| 346 | class_max = ntohl(nla_get_be32(tb[NFCTH_POLICY_SET_NUM])); | ||
| 347 | if (helper->expect_class_max + 1 != class_max) | ||
| 348 | return -EBUSY; | ||
| 349 | |||
| 350 | return nfnl_cthelper_update_policy_all(tb, helper); | ||
| 351 | } | ||
| 352 | |||
| 353 | static int | ||
| 257 | nfnl_cthelper_update(const struct nlattr * const tb[], | 354 | nfnl_cthelper_update(const struct nlattr * const tb[], |
| 258 | struct nf_conntrack_helper *helper) | 355 | struct nf_conntrack_helper *helper) |
| 259 | { | 356 | { |
| @@ -263,8 +360,7 @@ nfnl_cthelper_update(const struct nlattr * const tb[], | |||
| 263 | return -EBUSY; | 360 | return -EBUSY; |
| 264 | 361 | ||
| 265 | if (tb[NFCTH_POLICY]) { | 362 | if (tb[NFCTH_POLICY]) { |
| 266 | ret = nfnl_cthelper_parse_expect_policy(helper, | 363 | ret = nfnl_cthelper_update_policy(helper, tb[NFCTH_POLICY]); |
| 267 | tb[NFCTH_POLICY]); | ||
| 268 | if (ret < 0) | 364 | if (ret < 0) |
| 269 | return ret; | 365 | return ret; |
| 270 | } | 366 | } |
| @@ -293,7 +389,8 @@ static int nfnl_cthelper_new(struct net *net, struct sock *nfnl, | |||
| 293 | const char *helper_name; | 389 | const char *helper_name; |
| 294 | struct nf_conntrack_helper *cur, *helper = NULL; | 390 | struct nf_conntrack_helper *cur, *helper = NULL; |
| 295 | struct nf_conntrack_tuple tuple; | 391 | struct nf_conntrack_tuple tuple; |
| 296 | int ret = 0, i; | 392 | struct nfnl_cthelper *nlcth; |
| 393 | int ret = 0; | ||
| 297 | 394 | ||
| 298 | if (!tb[NFCTH_NAME] || !tb[NFCTH_TUPLE]) | 395 | if (!tb[NFCTH_NAME] || !tb[NFCTH_TUPLE]) |
| 299 | return -EINVAL; | 396 | return -EINVAL; |
| @@ -304,31 +401,22 @@ static int nfnl_cthelper_new(struct net *net, struct sock *nfnl, | |||
| 304 | if (ret < 0) | 401 | if (ret < 0) |
| 305 | return ret; | 402 | return ret; |
| 306 | 403 | ||
| 307 | rcu_read_lock(); | 404 | list_for_each_entry(nlcth, &nfnl_cthelper_list, list) { |
| 308 | for (i = 0; i < nf_ct_helper_hsize && !helper; i++) { | 405 | cur = &nlcth->helper; |
| 309 | hlist_for_each_entry_rcu(cur, &nf_ct_helper_hash[i], hnode) { | ||
| 310 | 406 | ||
| 311 | /* skip non-userspace conntrack helpers. */ | 407 | if (strncmp(cur->name, helper_name, NF_CT_HELPER_NAME_LEN)) |
| 312 | if (!(cur->flags & NF_CT_HELPER_F_USERSPACE)) | 408 | continue; |
| 313 | continue; | ||
| 314 | 409 | ||
| 315 | if (strncmp(cur->name, helper_name, | 410 | if ((tuple.src.l3num != cur->tuple.src.l3num || |
| 316 | NF_CT_HELPER_NAME_LEN) != 0) | 411 | tuple.dst.protonum != cur->tuple.dst.protonum)) |
| 317 | continue; | 412 | continue; |
| 318 | 413 | ||
| 319 | if ((tuple.src.l3num != cur->tuple.src.l3num || | 414 | if (nlh->nlmsg_flags & NLM_F_EXCL) |
| 320 | tuple.dst.protonum != cur->tuple.dst.protonum)) | 415 | return -EEXIST; |
| 321 | continue; | ||
| 322 | 416 | ||
| 323 | if (nlh->nlmsg_flags & NLM_F_EXCL) { | 417 | helper = cur; |
| 324 | ret = -EEXIST; | 418 | break; |
| 325 | goto err; | ||
| 326 | } | ||
| 327 | helper = cur; | ||
| 328 | break; | ||
| 329 | } | ||
| 330 | } | 419 | } |
| 331 | rcu_read_unlock(); | ||
| 332 | 420 | ||
| 333 | if (helper == NULL) | 421 | if (helper == NULL) |
| 334 | ret = nfnl_cthelper_create(tb, &tuple); | 422 | ret = nfnl_cthelper_create(tb, &tuple); |
| @@ -336,9 +424,6 @@ static int nfnl_cthelper_new(struct net *net, struct sock *nfnl, | |||
| 336 | ret = nfnl_cthelper_update(tb, helper); | 424 | ret = nfnl_cthelper_update(tb, helper); |
| 337 | 425 | ||
| 338 | return ret; | 426 | return ret; |
| 339 | err: | ||
| 340 | rcu_read_unlock(); | ||
| 341 | return ret; | ||
| 342 | } | 427 | } |
| 343 | 428 | ||
| 344 | static int | 429 | static int |
| @@ -377,10 +462,10 @@ nfnl_cthelper_dump_policy(struct sk_buff *skb, | |||
| 377 | goto nla_put_failure; | 462 | goto nla_put_failure; |
| 378 | 463 | ||
| 379 | if (nla_put_be32(skb, NFCTH_POLICY_SET_NUM, | 464 | if (nla_put_be32(skb, NFCTH_POLICY_SET_NUM, |
| 380 | htonl(helper->expect_class_max))) | 465 | htonl(helper->expect_class_max + 1))) |
| 381 | goto nla_put_failure; | 466 | goto nla_put_failure; |
| 382 | 467 | ||
| 383 | for (i=0; i<helper->expect_class_max; i++) { | 468 | for (i = 0; i < helper->expect_class_max + 1; i++) { |
| 384 | nest_parms2 = nla_nest_start(skb, | 469 | nest_parms2 = nla_nest_start(skb, |
| 385 | (NFCTH_POLICY_SET+i) | NLA_F_NESTED); | 470 | (NFCTH_POLICY_SET+i) | NLA_F_NESTED); |
| 386 | if (nest_parms2 == NULL) | 471 | if (nest_parms2 == NULL) |
| @@ -502,11 +587,12 @@ static int nfnl_cthelper_get(struct net *net, struct sock *nfnl, | |||
| 502 | struct sk_buff *skb, const struct nlmsghdr *nlh, | 587 | struct sk_buff *skb, const struct nlmsghdr *nlh, |
| 503 | const struct nlattr * const tb[]) | 588 | const struct nlattr * const tb[]) |
| 504 | { | 589 | { |
| 505 | int ret = -ENOENT, i; | 590 | int ret = -ENOENT; |
| 506 | struct nf_conntrack_helper *cur; | 591 | struct nf_conntrack_helper *cur; |
| 507 | struct sk_buff *skb2; | 592 | struct sk_buff *skb2; |
| 508 | char *helper_name = NULL; | 593 | char *helper_name = NULL; |
| 509 | struct nf_conntrack_tuple tuple; | 594 | struct nf_conntrack_tuple tuple; |
| 595 | struct nfnl_cthelper *nlcth; | ||
| 510 | bool tuple_set = false; | 596 | bool tuple_set = false; |
| 511 | 597 | ||
| 512 | if (nlh->nlmsg_flags & NLM_F_DUMP) { | 598 | if (nlh->nlmsg_flags & NLM_F_DUMP) { |
| @@ -527,45 +613,39 @@ static int nfnl_cthelper_get(struct net *net, struct sock *nfnl, | |||
| 527 | tuple_set = true; | 613 | tuple_set = true; |
| 528 | } | 614 | } |
| 529 | 615 | ||
| 530 | for (i = 0; i < nf_ct_helper_hsize; i++) { | 616 | list_for_each_entry(nlcth, &nfnl_cthelper_list, list) { |
| 531 | hlist_for_each_entry_rcu(cur, &nf_ct_helper_hash[i], hnode) { | 617 | cur = &nlcth->helper; |
| 618 | if (helper_name && | ||
| 619 | strncmp(cur->name, helper_name, NF_CT_HELPER_NAME_LEN)) | ||
| 620 | continue; | ||
| 532 | 621 | ||
| 533 | /* skip non-userspace conntrack helpers. */ | 622 | if (tuple_set && |
| 534 | if (!(cur->flags & NF_CT_HELPER_F_USERSPACE)) | 623 | (tuple.src.l3num != cur->tuple.src.l3num || |
| 535 | continue; | 624 | tuple.dst.protonum != cur->tuple.dst.protonum)) |
| 625 | continue; | ||
| 536 | 626 | ||
| 537 | if (helper_name && strncmp(cur->name, helper_name, | 627 | skb2 = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); |
| 538 | NF_CT_HELPER_NAME_LEN) != 0) { | 628 | if (skb2 == NULL) { |
| 539 | continue; | 629 | ret = -ENOMEM; |
| 540 | } | 630 | break; |
| 541 | if (tuple_set && | 631 | } |
| 542 | (tuple.src.l3num != cur->tuple.src.l3num || | ||
| 543 | tuple.dst.protonum != cur->tuple.dst.protonum)) | ||
| 544 | continue; | ||
| 545 | |||
| 546 | skb2 = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); | ||
| 547 | if (skb2 == NULL) { | ||
| 548 | ret = -ENOMEM; | ||
| 549 | break; | ||
| 550 | } | ||
| 551 | 632 | ||
| 552 | ret = nfnl_cthelper_fill_info(skb2, NETLINK_CB(skb).portid, | 633 | ret = nfnl_cthelper_fill_info(skb2, NETLINK_CB(skb).portid, |
| 553 | nlh->nlmsg_seq, | 634 | nlh->nlmsg_seq, |
| 554 | NFNL_MSG_TYPE(nlh->nlmsg_type), | 635 | NFNL_MSG_TYPE(nlh->nlmsg_type), |
| 555 | NFNL_MSG_CTHELPER_NEW, cur); | 636 | NFNL_MSG_CTHELPER_NEW, cur); |
| 556 | if (ret <= 0) { | 637 | if (ret <= 0) { |
| 557 | kfree_skb(skb2); | 638 | kfree_skb(skb2); |
| 558 | break; | 639 | break; |
| 559 | } | 640 | } |
| 560 | 641 | ||
| 561 | ret = netlink_unicast(nfnl, skb2, NETLINK_CB(skb).portid, | 642 | ret = netlink_unicast(nfnl, skb2, NETLINK_CB(skb).portid, |
| 562 | MSG_DONTWAIT); | 643 | MSG_DONTWAIT); |
| 563 | if (ret > 0) | 644 | if (ret > 0) |
| 564 | ret = 0; | 645 | ret = 0; |
| 565 | 646 | ||
| 566 | /* this avoids a loop in nfnetlink. */ | 647 | /* this avoids a loop in nfnetlink. */ |
| 567 | return ret == -EAGAIN ? -ENOBUFS : ret; | 648 | return ret == -EAGAIN ? -ENOBUFS : ret; |
| 568 | } | ||
| 569 | } | 649 | } |
| 570 | return ret; | 650 | return ret; |
| 571 | } | 651 | } |
| @@ -576,10 +656,10 @@ static int nfnl_cthelper_del(struct net *net, struct sock *nfnl, | |||
| 576 | { | 656 | { |
| 577 | char *helper_name = NULL; | 657 | char *helper_name = NULL; |
| 578 | struct nf_conntrack_helper *cur; | 658 | struct nf_conntrack_helper *cur; |
| 579 | struct hlist_node *tmp; | ||
| 580 | struct nf_conntrack_tuple tuple; | 659 | struct nf_conntrack_tuple tuple; |
| 581 | bool tuple_set = false, found = false; | 660 | bool tuple_set = false, found = false; |
| 582 | int i, j = 0, ret; | 661 | struct nfnl_cthelper *nlcth, *n; |
| 662 | int j = 0, ret; | ||
| 583 | 663 | ||
| 584 | if (tb[NFCTH_NAME]) | 664 | if (tb[NFCTH_NAME]) |
| 585 | helper_name = nla_data(tb[NFCTH_NAME]); | 665 | helper_name = nla_data(tb[NFCTH_NAME]); |
| @@ -592,28 +672,27 @@ static int nfnl_cthelper_del(struct net *net, struct sock *nfnl, | |||
| 592 | tuple_set = true; | 672 | tuple_set = true; |
| 593 | } | 673 | } |
| 594 | 674 | ||
| 595 | for (i = 0; i < nf_ct_helper_hsize; i++) { | 675 | list_for_each_entry_safe(nlcth, n, &nfnl_cthelper_list, list) { |
| 596 | hlist_for_each_entry_safe(cur, tmp, &nf_ct_helper_hash[i], | 676 | cur = &nlcth->helper; |
| 597 | hnode) { | 677 | j++; |
| 598 | /* skip non-userspace conntrack helpers. */ | ||
| 599 | if (!(cur->flags & NF_CT_HELPER_F_USERSPACE)) | ||
| 600 | continue; | ||
| 601 | 678 | ||
| 602 | j++; | 679 | if (helper_name && |
| 680 | strncmp(cur->name, helper_name, NF_CT_HELPER_NAME_LEN)) | ||
| 681 | continue; | ||
| 603 | 682 | ||
| 604 | if (helper_name && strncmp(cur->name, helper_name, | 683 | if (tuple_set && |
| 605 | NF_CT_HELPER_NAME_LEN) != 0) { | 684 | (tuple.src.l3num != cur->tuple.src.l3num || |
| 606 | continue; | 685 | tuple.dst.protonum != cur->tuple.dst.protonum)) |
| 607 | } | 686 | continue; |
| 608 | if (tuple_set && | ||
| 609 | (tuple.src.l3num != cur->tuple.src.l3num || | ||
| 610 | tuple.dst.protonum != cur->tuple.dst.protonum)) | ||
| 611 | continue; | ||
| 612 | 687 | ||
| 613 | found = true; | 688 | found = true; |
| 614 | nf_conntrack_helper_unregister(cur); | 689 | nf_conntrack_helper_unregister(cur); |
| 615 | } | 690 | kfree(cur->expect_policy); |
| 691 | |||
| 692 | list_del(&nlcth->list); | ||
| 693 | kfree(nlcth); | ||
| 616 | } | 694 | } |
| 695 | |||
| 617 | /* Make sure we return success if we flush and there is no helpers */ | 696 | /* Make sure we return success if we flush and there is no helpers */ |
| 618 | return (found || j == 0) ? 0 : -ENOENT; | 697 | return (found || j == 0) ? 0 : -ENOENT; |
| 619 | } | 698 | } |
| @@ -662,20 +741,16 @@ err_out: | |||
| 662 | static void __exit nfnl_cthelper_exit(void) | 741 | static void __exit nfnl_cthelper_exit(void) |
| 663 | { | 742 | { |
| 664 | struct nf_conntrack_helper *cur; | 743 | struct nf_conntrack_helper *cur; |
| 665 | struct hlist_node *tmp; | 744 | struct nfnl_cthelper *nlcth, *n; |
| 666 | int i; | ||
| 667 | 745 | ||
| 668 | nfnetlink_subsys_unregister(&nfnl_cthelper_subsys); | 746 | nfnetlink_subsys_unregister(&nfnl_cthelper_subsys); |
| 669 | 747 | ||
| 670 | for (i=0; i<nf_ct_helper_hsize; i++) { | 748 | list_for_each_entry_safe(nlcth, n, &nfnl_cthelper_list, list) { |
| 671 | hlist_for_each_entry_safe(cur, tmp, &nf_ct_helper_hash[i], | 749 | cur = &nlcth->helper; |
| 672 | hnode) { | ||
| 673 | /* skip non-userspace conntrack helpers. */ | ||
| 674 | if (!(cur->flags & NF_CT_HELPER_F_USERSPACE)) | ||
| 675 | continue; | ||
| 676 | 750 | ||
| 677 | nf_conntrack_helper_unregister(cur); | 751 | nf_conntrack_helper_unregister(cur); |
| 678 | } | 752 | kfree(cur->expect_policy); |
| 753 | kfree(nlcth); | ||
| 679 | } | 754 | } |
| 680 | } | 755 | } |
| 681 | 756 | ||
diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c index 139e0867e56e..47d6656c9119 100644 --- a/net/netfilter/nfnetlink_cttimeout.c +++ b/net/netfilter/nfnetlink_cttimeout.c | |||
| @@ -646,8 +646,8 @@ static void __exit cttimeout_exit(void) | |||
| 646 | #ifdef CONFIG_NF_CONNTRACK_TIMEOUT | 646 | #ifdef CONFIG_NF_CONNTRACK_TIMEOUT |
| 647 | RCU_INIT_POINTER(nf_ct_timeout_find_get_hook, NULL); | 647 | RCU_INIT_POINTER(nf_ct_timeout_find_get_hook, NULL); |
| 648 | RCU_INIT_POINTER(nf_ct_timeout_put_hook, NULL); | 648 | RCU_INIT_POINTER(nf_ct_timeout_put_hook, NULL); |
| 649 | synchronize_rcu(); | ||
| 649 | #endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ | 650 | #endif /* CONFIG_NF_CONNTRACK_TIMEOUT */ |
| 650 | rcu_barrier(); | ||
| 651 | } | 651 | } |
| 652 | 652 | ||
| 653 | module_init(cttimeout_init); | 653 | module_init(cttimeout_init); |
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 3ee0b8a000a4..933509ebf3d3 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c | |||
| @@ -443,7 +443,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, | |||
| 443 | skb = alloc_skb(size, GFP_ATOMIC); | 443 | skb = alloc_skb(size, GFP_ATOMIC); |
| 444 | if (!skb) { | 444 | if (!skb) { |
| 445 | skb_tx_error(entskb); | 445 | skb_tx_error(entskb); |
| 446 | return NULL; | 446 | goto nlmsg_failure; |
| 447 | } | 447 | } |
| 448 | 448 | ||
| 449 | nlh = nlmsg_put(skb, 0, 0, | 449 | nlh = nlmsg_put(skb, 0, 0, |
| @@ -452,7 +452,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, | |||
| 452 | if (!nlh) { | 452 | if (!nlh) { |
| 453 | skb_tx_error(entskb); | 453 | skb_tx_error(entskb); |
| 454 | kfree_skb(skb); | 454 | kfree_skb(skb); |
| 455 | return NULL; | 455 | goto nlmsg_failure; |
| 456 | } | 456 | } |
| 457 | nfmsg = nlmsg_data(nlh); | 457 | nfmsg = nlmsg_data(nlh); |
| 458 | nfmsg->nfgen_family = entry->state.pf; | 458 | nfmsg->nfgen_family = entry->state.pf; |
| @@ -598,12 +598,17 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, | |||
| 598 | } | 598 | } |
| 599 | 599 | ||
| 600 | nlh->nlmsg_len = skb->len; | 600 | nlh->nlmsg_len = skb->len; |
| 601 | if (seclen) | ||
| 602 | security_release_secctx(secdata, seclen); | ||
| 601 | return skb; | 603 | return skb; |
| 602 | 604 | ||
| 603 | nla_put_failure: | 605 | nla_put_failure: |
| 604 | skb_tx_error(entskb); | 606 | skb_tx_error(entskb); |
| 605 | kfree_skb(skb); | 607 | kfree_skb(skb); |
| 606 | net_err_ratelimited("nf_queue: error creating packet message\n"); | 608 | net_err_ratelimited("nf_queue: error creating packet message\n"); |
| 609 | nlmsg_failure: | ||
| 610 | if (seclen) | ||
| 611 | security_release_secctx(secdata, seclen); | ||
| 607 | return NULL; | 612 | return NULL; |
| 608 | } | 613 | } |
| 609 | 614 | ||
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index e0a87776a010..7b2c2fce408a 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c | |||
| @@ -643,8 +643,8 @@ static bool skb_nfct_cached(struct net *net, | |||
| 643 | */ | 643 | */ |
| 644 | if (nf_ct_is_confirmed(ct)) | 644 | if (nf_ct_is_confirmed(ct)) |
| 645 | nf_ct_delete(ct, 0, 0); | 645 | nf_ct_delete(ct, 0, 0); |
| 646 | else | 646 | |
| 647 | nf_conntrack_put(&ct->ct_general); | 647 | nf_conntrack_put(&ct->ct_general); |
| 648 | nf_ct_set(skb, NULL, 0); | 648 | nf_ct_set(skb, NULL, 0); |
| 649 | return false; | 649 | return false; |
| 650 | } | 650 | } |
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 9d4bb8eb63f2..3f76cb765e5b 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c | |||
| @@ -527,7 +527,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) | |||
| 527 | 527 | ||
| 528 | /* Link layer. */ | 528 | /* Link layer. */ |
| 529 | clear_vlan(key); | 529 | clear_vlan(key); |
| 530 | if (key->mac_proto == MAC_PROTO_NONE) { | 530 | if (ovs_key_mac_proto(key) == MAC_PROTO_NONE) { |
| 531 | if (unlikely(eth_type_vlan(skb->protocol))) | 531 | if (unlikely(eth_type_vlan(skb->protocol))) |
| 532 | return -EINVAL; | 532 | return -EINVAL; |
| 533 | 533 | ||
| @@ -745,7 +745,13 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) | |||
| 745 | 745 | ||
| 746 | int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key) | 746 | int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key) |
| 747 | { | 747 | { |
| 748 | return key_extract(skb, key); | 748 | int res; |
| 749 | |||
| 750 | res = key_extract(skb, key); | ||
| 751 | if (!res) | ||
| 752 | key->mac_proto &= ~SW_FLOW_KEY_INVALID; | ||
| 753 | |||
| 754 | return res; | ||
| 749 | } | 755 | } |
| 750 | 756 | ||
| 751 | static int key_extract_mac_proto(struct sk_buff *skb) | 757 | static int key_extract_mac_proto(struct sk_buff *skb) |
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index a0dbe7ca8f72..8489beff5c25 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
| @@ -3665,6 +3665,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv | |||
| 3665 | return -EBUSY; | 3665 | return -EBUSY; |
| 3666 | if (copy_from_user(&val, optval, sizeof(val))) | 3666 | if (copy_from_user(&val, optval, sizeof(val))) |
| 3667 | return -EFAULT; | 3667 | return -EFAULT; |
| 3668 | if (val > INT_MAX) | ||
| 3669 | return -EINVAL; | ||
| 3668 | po->tp_reserve = val; | 3670 | po->tp_reserve = val; |
| 3669 | return 0; | 3671 | return 0; |
| 3670 | } | 3672 | } |
| @@ -4193,8 +4195,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, | |||
| 4193 | if (unlikely(!PAGE_ALIGNED(req->tp_block_size))) | 4195 | if (unlikely(!PAGE_ALIGNED(req->tp_block_size))) |
| 4194 | goto out; | 4196 | goto out; |
| 4195 | if (po->tp_version >= TPACKET_V3 && | 4197 | if (po->tp_version >= TPACKET_V3 && |
| 4196 | (int)(req->tp_block_size - | 4198 | req->tp_block_size <= |
| 4197 | BLK_PLUS_PRIV(req_u->req3.tp_sizeof_priv)) <= 0) | 4199 | BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv)) |
| 4198 | goto out; | 4200 | goto out; |
| 4199 | if (unlikely(req->tp_frame_size < po->tp_hdrlen + | 4201 | if (unlikely(req->tp_frame_size < po->tp_hdrlen + |
| 4200 | po->tp_reserve)) | 4202 | po->tp_reserve)) |
| @@ -4205,6 +4207,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, | |||
| 4205 | rb->frames_per_block = req->tp_block_size / req->tp_frame_size; | 4207 | rb->frames_per_block = req->tp_block_size / req->tp_frame_size; |
| 4206 | if (unlikely(rb->frames_per_block == 0)) | 4208 | if (unlikely(rb->frames_per_block == 0)) |
| 4207 | goto out; | 4209 | goto out; |
| 4210 | if (unlikely(req->tp_block_size > UINT_MAX / req->tp_block_nr)) | ||
| 4211 | goto out; | ||
| 4208 | if (unlikely((rb->frames_per_block * req->tp_block_nr) != | 4212 | if (unlikely((rb->frames_per_block * req->tp_block_nr) != |
| 4209 | req->tp_frame_nr)) | 4213 | req->tp_frame_nr)) |
| 4210 | goto out; | 4214 | goto out; |
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 0439a1a68367..a9708da28eb5 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
| @@ -246,6 +246,9 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a | |||
| 246 | if (!sctp_ulpq_init(&asoc->ulpq, asoc)) | 246 | if (!sctp_ulpq_init(&asoc->ulpq, asoc)) |
| 247 | goto fail_init; | 247 | goto fail_init; |
| 248 | 248 | ||
| 249 | if (sctp_stream_new(asoc, gfp)) | ||
| 250 | goto fail_init; | ||
| 251 | |||
| 249 | /* Assume that peer would support both address types unless we are | 252 | /* Assume that peer would support both address types unless we are |
| 250 | * told otherwise. | 253 | * told otherwise. |
| 251 | */ | 254 | */ |
| @@ -264,7 +267,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a | |||
| 264 | /* AUTH related initializations */ | 267 | /* AUTH related initializations */ |
| 265 | INIT_LIST_HEAD(&asoc->endpoint_shared_keys); | 268 | INIT_LIST_HEAD(&asoc->endpoint_shared_keys); |
| 266 | if (sctp_auth_asoc_copy_shkeys(ep, asoc, gfp)) | 269 | if (sctp_auth_asoc_copy_shkeys(ep, asoc, gfp)) |
| 267 | goto fail_init; | 270 | goto stream_free; |
| 268 | 271 | ||
| 269 | asoc->active_key_id = ep->active_key_id; | 272 | asoc->active_key_id = ep->active_key_id; |
| 270 | asoc->prsctp_enable = ep->prsctp_enable; | 273 | asoc->prsctp_enable = ep->prsctp_enable; |
| @@ -287,6 +290,8 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a | |||
| 287 | 290 | ||
| 288 | return asoc; | 291 | return asoc; |
| 289 | 292 | ||
| 293 | stream_free: | ||
| 294 | sctp_stream_free(asoc->stream); | ||
| 290 | fail_init: | 295 | fail_init: |
| 291 | sock_put(asoc->base.sk); | 296 | sock_put(asoc->base.sk); |
| 292 | sctp_endpoint_put(asoc->ep); | 297 | sctp_endpoint_put(asoc->ep); |
| @@ -1407,7 +1412,7 @@ sctp_assoc_choose_alter_transport(struct sctp_association *asoc, | |||
| 1407 | /* Update the association's pmtu and frag_point by going through all the | 1412 | /* Update the association's pmtu and frag_point by going through all the |
| 1408 | * transports. This routine is called when a transport's PMTU has changed. | 1413 | * transports. This routine is called when a transport's PMTU has changed. |
| 1409 | */ | 1414 | */ |
| 1410 | void sctp_assoc_sync_pmtu(struct sock *sk, struct sctp_association *asoc) | 1415 | void sctp_assoc_sync_pmtu(struct sctp_association *asoc) |
| 1411 | { | 1416 | { |
| 1412 | struct sctp_transport *t; | 1417 | struct sctp_transport *t; |
| 1413 | __u32 pmtu = 0; | 1418 | __u32 pmtu = 0; |
| @@ -1419,8 +1424,8 @@ void sctp_assoc_sync_pmtu(struct sock *sk, struct sctp_association *asoc) | |||
| 1419 | list_for_each_entry(t, &asoc->peer.transport_addr_list, | 1424 | list_for_each_entry(t, &asoc->peer.transport_addr_list, |
| 1420 | transports) { | 1425 | transports) { |
| 1421 | if (t->pmtu_pending && t->dst) { | 1426 | if (t->pmtu_pending && t->dst) { |
| 1422 | sctp_transport_update_pmtu(sk, t, | 1427 | sctp_transport_update_pmtu( |
| 1423 | SCTP_TRUNC4(dst_mtu(t->dst))); | 1428 | t, SCTP_TRUNC4(dst_mtu(t->dst))); |
| 1424 | t->pmtu_pending = 0; | 1429 | t->pmtu_pending = 0; |
| 1425 | } | 1430 | } |
| 1426 | if (!pmtu || (t->pathmtu < pmtu)) | 1431 | if (!pmtu || (t->pathmtu < pmtu)) |
diff --git a/net/sctp/input.c b/net/sctp/input.c index 2a28ab20487f..0e06a278d2a9 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c | |||
| @@ -401,10 +401,10 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc, | |||
| 401 | 401 | ||
| 402 | if (t->param_flags & SPP_PMTUD_ENABLE) { | 402 | if (t->param_flags & SPP_PMTUD_ENABLE) { |
| 403 | /* Update transports view of the MTU */ | 403 | /* Update transports view of the MTU */ |
| 404 | sctp_transport_update_pmtu(sk, t, pmtu); | 404 | sctp_transport_update_pmtu(t, pmtu); |
| 405 | 405 | ||
| 406 | /* Update association pmtu. */ | 406 | /* Update association pmtu. */ |
| 407 | sctp_assoc_sync_pmtu(sk, asoc); | 407 | sctp_assoc_sync_pmtu(asoc); |
| 408 | } | 408 | } |
| 409 | 409 | ||
| 410 | /* Retransmit with the new pmtu setting. | 410 | /* Retransmit with the new pmtu setting. |
diff --git a/net/sctp/output.c b/net/sctp/output.c index 1224421036b3..1409a875ad8e 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c | |||
| @@ -86,43 +86,53 @@ void sctp_packet_config(struct sctp_packet *packet, __u32 vtag, | |||
| 86 | { | 86 | { |
| 87 | struct sctp_transport *tp = packet->transport; | 87 | struct sctp_transport *tp = packet->transport; |
| 88 | struct sctp_association *asoc = tp->asoc; | 88 | struct sctp_association *asoc = tp->asoc; |
| 89 | struct sock *sk; | ||
| 89 | 90 | ||
| 90 | pr_debug("%s: packet:%p vtag:0x%x\n", __func__, packet, vtag); | 91 | pr_debug("%s: packet:%p vtag:0x%x\n", __func__, packet, vtag); |
| 91 | |||
| 92 | packet->vtag = vtag; | 92 | packet->vtag = vtag; |
| 93 | 93 | ||
| 94 | if (asoc && tp->dst) { | 94 | /* do the following jobs only once for a flush schedule */ |
| 95 | struct sock *sk = asoc->base.sk; | 95 | if (!sctp_packet_empty(packet)) |
| 96 | 96 | return; | |
| 97 | rcu_read_lock(); | ||
| 98 | if (__sk_dst_get(sk) != tp->dst) { | ||
| 99 | dst_hold(tp->dst); | ||
| 100 | sk_setup_caps(sk, tp->dst); | ||
| 101 | } | ||
| 102 | |||
| 103 | if (sk_can_gso(sk)) { | ||
| 104 | struct net_device *dev = tp->dst->dev; | ||
| 105 | 97 | ||
| 106 | packet->max_size = dev->gso_max_size; | 98 | /* set packet max_size with pathmtu */ |
| 107 | } else { | 99 | packet->max_size = tp->pathmtu; |
| 108 | packet->max_size = asoc->pathmtu; | 100 | if (!asoc) |
| 109 | } | 101 | return; |
| 110 | rcu_read_unlock(); | ||
| 111 | 102 | ||
| 112 | } else { | 103 | /* update dst or transport pathmtu if in need */ |
| 113 | packet->max_size = tp->pathmtu; | 104 | sk = asoc->base.sk; |
| 105 | if (!sctp_transport_dst_check(tp)) { | ||
| 106 | sctp_transport_route(tp, NULL, sctp_sk(sk)); | ||
| 107 | if (asoc->param_flags & SPP_PMTUD_ENABLE) | ||
| 108 | sctp_assoc_sync_pmtu(asoc); | ||
| 109 | } else if (!sctp_transport_pmtu_check(tp)) { | ||
| 110 | if (asoc->param_flags & SPP_PMTUD_ENABLE) | ||
| 111 | sctp_assoc_sync_pmtu(asoc); | ||
| 114 | } | 112 | } |
| 115 | 113 | ||
| 116 | if (ecn_capable && sctp_packet_empty(packet)) { | 114 | /* If there a is a prepend chunk stick it on the list before |
| 117 | struct sctp_chunk *chunk; | 115 | * any other chunks get appended. |
| 116 | */ | ||
| 117 | if (ecn_capable) { | ||
| 118 | struct sctp_chunk *chunk = sctp_get_ecne_prepend(asoc); | ||
| 118 | 119 | ||
| 119 | /* If there a is a prepend chunk stick it on the list before | ||
| 120 | * any other chunks get appended. | ||
| 121 | */ | ||
| 122 | chunk = sctp_get_ecne_prepend(asoc); | ||
| 123 | if (chunk) | 120 | if (chunk) |
| 124 | sctp_packet_append_chunk(packet, chunk); | 121 | sctp_packet_append_chunk(packet, chunk); |
| 125 | } | 122 | } |
| 123 | |||
| 124 | if (!tp->dst) | ||
| 125 | return; | ||
| 126 | |||
| 127 | /* set packet max_size with gso_max_size if gso is enabled*/ | ||
| 128 | rcu_read_lock(); | ||
| 129 | if (__sk_dst_get(sk) != tp->dst) { | ||
| 130 | dst_hold(tp->dst); | ||
| 131 | sk_setup_caps(sk, tp->dst); | ||
| 132 | } | ||
| 133 | packet->max_size = sk_can_gso(sk) ? tp->dst->dev->gso_max_size | ||
| 134 | : asoc->pathmtu; | ||
| 135 | rcu_read_unlock(); | ||
| 126 | } | 136 | } |
| 127 | 137 | ||
| 128 | /* Initialize the packet structure. */ | 138 | /* Initialize the packet structure. */ |
| @@ -582,12 +592,7 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp) | |||
| 582 | sh->vtag = htonl(packet->vtag); | 592 | sh->vtag = htonl(packet->vtag); |
| 583 | sh->checksum = 0; | 593 | sh->checksum = 0; |
| 584 | 594 | ||
| 585 | /* update dst if in need */ | 595 | /* drop packet if no dst */ |
| 586 | if (!sctp_transport_dst_check(tp)) { | ||
| 587 | sctp_transport_route(tp, NULL, sctp_sk(sk)); | ||
| 588 | if (asoc && asoc->param_flags & SPP_PMTUD_ENABLE) | ||
| 589 | sctp_assoc_sync_pmtu(sk, asoc); | ||
| 590 | } | ||
| 591 | dst = dst_clone(tp->dst); | 596 | dst = dst_clone(tp->dst); |
| 592 | if (!dst) { | 597 | if (!dst) { |
| 593 | IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES); | 598 | IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES); |
| @@ -704,7 +709,7 @@ static sctp_xmit_t sctp_packet_can_append_data(struct sctp_packet *packet, | |||
| 704 | */ | 709 | */ |
| 705 | 710 | ||
| 706 | if ((sctp_sk(asoc->base.sk)->nodelay || inflight == 0) && | 711 | if ((sctp_sk(asoc->base.sk)->nodelay || inflight == 0) && |
| 707 | !chunk->msg->force_delay) | 712 | !asoc->force_delay) |
| 708 | /* Nothing unacked */ | 713 | /* Nothing unacked */ |
| 709 | return SCTP_XMIT_OK; | 714 | return SCTP_XMIT_OK; |
| 710 | 715 | ||
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 025ccff67072..8081476ed313 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
| @@ -1026,8 +1026,7 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) | |||
| 1026 | /* RFC 2960 6.5 Every DATA chunk MUST carry a valid | 1026 | /* RFC 2960 6.5 Every DATA chunk MUST carry a valid |
| 1027 | * stream identifier. | 1027 | * stream identifier. |
| 1028 | */ | 1028 | */ |
| 1029 | if (chunk->sinfo.sinfo_stream >= | 1029 | if (chunk->sinfo.sinfo_stream >= asoc->stream->outcnt) { |
| 1030 | asoc->c.sinit_num_ostreams) { | ||
| 1031 | 1030 | ||
| 1032 | /* Mark as failed send. */ | 1031 | /* Mark as failed send. */ |
| 1033 | sctp_chunk_fail(chunk, SCTP_ERROR_INV_STRM); | 1032 | sctp_chunk_fail(chunk, SCTP_ERROR_INV_STRM); |
diff --git a/net/sctp/proc.c b/net/sctp/proc.c index 206377fe91ec..a0b29d43627f 100644 --- a/net/sctp/proc.c +++ b/net/sctp/proc.c | |||
| @@ -361,8 +361,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) | |||
| 361 | sctp_seq_dump_remote_addrs(seq, assoc); | 361 | sctp_seq_dump_remote_addrs(seq, assoc); |
| 362 | seq_printf(seq, "\t%8lu %5d %5d %4d %4d %4d %8d " | 362 | seq_printf(seq, "\t%8lu %5d %5d %4d %4d %4d %8d " |
| 363 | "%8d %8d %8d %8d", | 363 | "%8d %8d %8d %8d", |
| 364 | assoc->hbinterval, assoc->c.sinit_max_instreams, | 364 | assoc->hbinterval, assoc->stream->incnt, |
| 365 | assoc->c.sinit_num_ostreams, assoc->max_retrans, | 365 | assoc->stream->outcnt, assoc->max_retrans, |
| 366 | assoc->init_retries, assoc->shutdown_retries, | 366 | assoc->init_retries, assoc->shutdown_retries, |
| 367 | assoc->rtx_data_chunks, | 367 | assoc->rtx_data_chunks, |
| 368 | atomic_read(&sk->sk_wmem_alloc), | 368 | atomic_read(&sk->sk_wmem_alloc), |
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 969a30c7bb54..118faff6a332 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
| @@ -2460,15 +2460,10 @@ int sctp_process_init(struct sctp_association *asoc, struct sctp_chunk *chunk, | |||
| 2460 | * association. | 2460 | * association. |
| 2461 | */ | 2461 | */ |
| 2462 | if (!asoc->temp) { | 2462 | if (!asoc->temp) { |
| 2463 | int error; | 2463 | if (sctp_stream_init(asoc, gfp)) |
| 2464 | |||
| 2465 | asoc->stream = sctp_stream_new(asoc->c.sinit_max_instreams, | ||
| 2466 | asoc->c.sinit_num_ostreams, gfp); | ||
| 2467 | if (!asoc->stream) | ||
| 2468 | goto clean_up; | 2464 | goto clean_up; |
| 2469 | 2465 | ||
| 2470 | error = sctp_assoc_set_id(asoc, gfp); | 2466 | if (sctp_assoc_set_id(asoc, gfp)) |
| 2471 | if (error) | ||
| 2472 | goto clean_up; | 2467 | goto clean_up; |
| 2473 | } | 2468 | } |
| 2474 | 2469 | ||
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index e03bb1aab4d0..24c6ccce7539 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
| @@ -3946,7 +3946,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(struct net *net, | |||
| 3946 | 3946 | ||
| 3947 | /* Silently discard the chunk if stream-id is not valid */ | 3947 | /* Silently discard the chunk if stream-id is not valid */ |
| 3948 | sctp_walk_fwdtsn(skip, chunk) { | 3948 | sctp_walk_fwdtsn(skip, chunk) { |
| 3949 | if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams) | 3949 | if (ntohs(skip->stream) >= asoc->stream->incnt) |
| 3950 | goto discard_noforce; | 3950 | goto discard_noforce; |
| 3951 | } | 3951 | } |
| 3952 | 3952 | ||
| @@ -4017,7 +4017,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast( | |||
| 4017 | 4017 | ||
| 4018 | /* Silently discard the chunk if stream-id is not valid */ | 4018 | /* Silently discard the chunk if stream-id is not valid */ |
| 4019 | sctp_walk_fwdtsn(skip, chunk) { | 4019 | sctp_walk_fwdtsn(skip, chunk) { |
| 4020 | if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams) | 4020 | if (ntohs(skip->stream) >= asoc->stream->incnt) |
| 4021 | goto gen_shutdown; | 4021 | goto gen_shutdown; |
| 4022 | } | 4022 | } |
| 4023 | 4023 | ||
| @@ -6353,7 +6353,7 @@ static int sctp_eat_data(const struct sctp_association *asoc, | |||
| 6353 | * and discard the DATA chunk. | 6353 | * and discard the DATA chunk. |
| 6354 | */ | 6354 | */ |
| 6355 | sid = ntohs(data_hdr->stream); | 6355 | sid = ntohs(data_hdr->stream); |
| 6356 | if (sid >= asoc->c.sinit_max_instreams) { | 6356 | if (sid >= asoc->stream->incnt) { |
| 6357 | /* Mark tsn as received even though we drop it */ | 6357 | /* Mark tsn as received even though we drop it */ |
| 6358 | sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_TSN, SCTP_U32(tsn)); | 6358 | sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_TSN, SCTP_U32(tsn)); |
| 6359 | 6359 | ||
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 0f378ea2ae38..c1401f43d40f 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -1907,7 +1907,7 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) | |||
| 1907 | } | 1907 | } |
| 1908 | 1908 | ||
| 1909 | if (asoc->pmtu_pending) | 1909 | if (asoc->pmtu_pending) |
| 1910 | sctp_assoc_pending_pmtu(sk, asoc); | 1910 | sctp_assoc_pending_pmtu(asoc); |
| 1911 | 1911 | ||
| 1912 | /* If fragmentation is disabled and the message length exceeds the | 1912 | /* If fragmentation is disabled and the message length exceeds the |
| 1913 | * association fragmentation point, return EMSGSIZE. The I-D | 1913 | * association fragmentation point, return EMSGSIZE. The I-D |
| @@ -1920,7 +1920,7 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) | |||
| 1920 | } | 1920 | } |
| 1921 | 1921 | ||
| 1922 | /* Check for invalid stream. */ | 1922 | /* Check for invalid stream. */ |
| 1923 | if (sinfo->sinfo_stream >= asoc->c.sinit_num_ostreams) { | 1923 | if (sinfo->sinfo_stream >= asoc->stream->outcnt) { |
| 1924 | err = -EINVAL; | 1924 | err = -EINVAL; |
| 1925 | goto out_free; | 1925 | goto out_free; |
| 1926 | } | 1926 | } |
| @@ -1965,7 +1965,7 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) | |||
| 1965 | err = PTR_ERR(datamsg); | 1965 | err = PTR_ERR(datamsg); |
| 1966 | goto out_free; | 1966 | goto out_free; |
| 1967 | } | 1967 | } |
| 1968 | datamsg->force_delay = !!(msg->msg_flags & MSG_MORE); | 1968 | asoc->force_delay = !!(msg->msg_flags & MSG_MORE); |
| 1969 | 1969 | ||
| 1970 | /* Now send the (possibly) fragmented message. */ | 1970 | /* Now send the (possibly) fragmented message. */ |
| 1971 | list_for_each_entry(chunk, &datamsg->chunks, frag_list) { | 1971 | list_for_each_entry(chunk, &datamsg->chunks, frag_list) { |
| @@ -2435,7 +2435,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params, | |||
| 2435 | if ((params->spp_flags & SPP_PMTUD_DISABLE) && params->spp_pathmtu) { | 2435 | if ((params->spp_flags & SPP_PMTUD_DISABLE) && params->spp_pathmtu) { |
| 2436 | if (trans) { | 2436 | if (trans) { |
| 2437 | trans->pathmtu = params->spp_pathmtu; | 2437 | trans->pathmtu = params->spp_pathmtu; |
| 2438 | sctp_assoc_sync_pmtu(sctp_opt2sk(sp), asoc); | 2438 | sctp_assoc_sync_pmtu(asoc); |
| 2439 | } else if (asoc) { | 2439 | } else if (asoc) { |
| 2440 | asoc->pathmtu = params->spp_pathmtu; | 2440 | asoc->pathmtu = params->spp_pathmtu; |
| 2441 | } else { | 2441 | } else { |
| @@ -2451,7 +2451,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params, | |||
| 2451 | (trans->param_flags & ~SPP_PMTUD) | pmtud_change; | 2451 | (trans->param_flags & ~SPP_PMTUD) | pmtud_change; |
| 2452 | if (update) { | 2452 | if (update) { |
| 2453 | sctp_transport_pmtu(trans, sctp_opt2sk(sp)); | 2453 | sctp_transport_pmtu(trans, sctp_opt2sk(sp)); |
| 2454 | sctp_assoc_sync_pmtu(sctp_opt2sk(sp), asoc); | 2454 | sctp_assoc_sync_pmtu(asoc); |
| 2455 | } | 2455 | } |
| 2456 | } else if (asoc) { | 2456 | } else if (asoc) { |
| 2457 | asoc->param_flags = | 2457 | asoc->param_flags = |
| @@ -4461,8 +4461,8 @@ int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc, | |||
| 4461 | info->sctpi_rwnd = asoc->a_rwnd; | 4461 | info->sctpi_rwnd = asoc->a_rwnd; |
| 4462 | info->sctpi_unackdata = asoc->unack_data; | 4462 | info->sctpi_unackdata = asoc->unack_data; |
| 4463 | info->sctpi_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map); | 4463 | info->sctpi_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map); |
| 4464 | info->sctpi_instrms = asoc->c.sinit_max_instreams; | 4464 | info->sctpi_instrms = asoc->stream->incnt; |
| 4465 | info->sctpi_outstrms = asoc->c.sinit_num_ostreams; | 4465 | info->sctpi_outstrms = asoc->stream->outcnt; |
| 4466 | list_for_each(pos, &asoc->base.inqueue.in_chunk_list) | 4466 | list_for_each(pos, &asoc->base.inqueue.in_chunk_list) |
| 4467 | info->sctpi_inqueue++; | 4467 | info->sctpi_inqueue++; |
| 4468 | list_for_each(pos, &asoc->outqueue.out_chunk_list) | 4468 | list_for_each(pos, &asoc->outqueue.out_chunk_list) |
| @@ -4691,8 +4691,8 @@ static int sctp_getsockopt_sctp_status(struct sock *sk, int len, | |||
| 4691 | status.sstat_unackdata = asoc->unack_data; | 4691 | status.sstat_unackdata = asoc->unack_data; |
| 4692 | 4692 | ||
| 4693 | status.sstat_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map); | 4693 | status.sstat_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map); |
| 4694 | status.sstat_instrms = asoc->c.sinit_max_instreams; | 4694 | status.sstat_instrms = asoc->stream->incnt; |
| 4695 | status.sstat_outstrms = asoc->c.sinit_num_ostreams; | 4695 | status.sstat_outstrms = asoc->stream->outcnt; |
| 4696 | status.sstat_fragmentation_point = asoc->frag_point; | 4696 | status.sstat_fragmentation_point = asoc->frag_point; |
| 4697 | status.sstat_primary.spinfo_assoc_id = sctp_assoc2id(transport->asoc); | 4697 | status.sstat_primary.spinfo_assoc_id = sctp_assoc2id(transport->asoc); |
| 4698 | memcpy(&status.sstat_primary.spinfo_address, &transport->ipaddr, | 4698 | memcpy(&status.sstat_primary.spinfo_address, &transport->ipaddr, |
diff --git a/net/sctp/stream.c b/net/sctp/stream.c index 1c6cc04fa3a4..bbed997e1c5f 100644 --- a/net/sctp/stream.c +++ b/net/sctp/stream.c | |||
| @@ -35,33 +35,60 @@ | |||
| 35 | #include <net/sctp/sctp.h> | 35 | #include <net/sctp/sctp.h> |
| 36 | #include <net/sctp/sm.h> | 36 | #include <net/sctp/sm.h> |
| 37 | 37 | ||
| 38 | struct sctp_stream *sctp_stream_new(__u16 incnt, __u16 outcnt, gfp_t gfp) | 38 | int sctp_stream_new(struct sctp_association *asoc, gfp_t gfp) |
| 39 | { | 39 | { |
| 40 | struct sctp_stream *stream; | 40 | struct sctp_stream *stream; |
| 41 | int i; | 41 | int i; |
| 42 | 42 | ||
| 43 | stream = kzalloc(sizeof(*stream), gfp); | 43 | stream = kzalloc(sizeof(*stream), gfp); |
| 44 | if (!stream) | 44 | if (!stream) |
| 45 | return NULL; | 45 | return -ENOMEM; |
| 46 | 46 | ||
| 47 | stream->outcnt = outcnt; | 47 | stream->outcnt = asoc->c.sinit_num_ostreams; |
| 48 | stream->out = kcalloc(stream->outcnt, sizeof(*stream->out), gfp); | 48 | stream->out = kcalloc(stream->outcnt, sizeof(*stream->out), gfp); |
| 49 | if (!stream->out) { | 49 | if (!stream->out) { |
| 50 | kfree(stream); | 50 | kfree(stream); |
| 51 | return NULL; | 51 | return -ENOMEM; |
| 52 | } | 52 | } |
| 53 | for (i = 0; i < stream->outcnt; i++) | 53 | for (i = 0; i < stream->outcnt; i++) |
| 54 | stream->out[i].state = SCTP_STREAM_OPEN; | 54 | stream->out[i].state = SCTP_STREAM_OPEN; |
| 55 | 55 | ||
| 56 | stream->incnt = incnt; | 56 | asoc->stream = stream; |
| 57 | |||
| 58 | return 0; | ||
| 59 | } | ||
| 60 | |||
| 61 | int sctp_stream_init(struct sctp_association *asoc, gfp_t gfp) | ||
| 62 | { | ||
| 63 | struct sctp_stream *stream = asoc->stream; | ||
| 64 | int i; | ||
| 65 | |||
| 66 | /* Initial stream->out size may be very big, so free it and alloc | ||
| 67 | * a new one with new outcnt to save memory. | ||
| 68 | */ | ||
| 69 | kfree(stream->out); | ||
| 70 | stream->outcnt = asoc->c.sinit_num_ostreams; | ||
| 71 | stream->out = kcalloc(stream->outcnt, sizeof(*stream->out), gfp); | ||
| 72 | if (!stream->out) | ||
| 73 | goto nomem; | ||
| 74 | |||
| 75 | for (i = 0; i < stream->outcnt; i++) | ||
| 76 | stream->out[i].state = SCTP_STREAM_OPEN; | ||
| 77 | |||
| 78 | stream->incnt = asoc->c.sinit_max_instreams; | ||
| 57 | stream->in = kcalloc(stream->incnt, sizeof(*stream->in), gfp); | 79 | stream->in = kcalloc(stream->incnt, sizeof(*stream->in), gfp); |
| 58 | if (!stream->in) { | 80 | if (!stream->in) { |
| 59 | kfree(stream->out); | 81 | kfree(stream->out); |
| 60 | kfree(stream); | 82 | goto nomem; |
| 61 | return NULL; | ||
| 62 | } | 83 | } |
| 63 | 84 | ||
| 64 | return stream; | 85 | return 0; |
| 86 | |||
| 87 | nomem: | ||
| 88 | asoc->stream = NULL; | ||
| 89 | kfree(stream); | ||
| 90 | |||
| 91 | return -ENOMEM; | ||
| 65 | } | 92 | } |
| 66 | 93 | ||
| 67 | void sctp_stream_free(struct sctp_stream *stream) | 94 | void sctp_stream_free(struct sctp_stream *stream) |
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index 3379668af368..721eeebfcd8a 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c | |||
| @@ -251,14 +251,13 @@ void sctp_transport_pmtu(struct sctp_transport *transport, struct sock *sk) | |||
| 251 | transport->pathmtu = SCTP_DEFAULT_MAXSEGMENT; | 251 | transport->pathmtu = SCTP_DEFAULT_MAXSEGMENT; |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | void sctp_transport_update_pmtu(struct sock *sk, struct sctp_transport *t, u32 pmtu) | 254 | void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu) |
| 255 | { | 255 | { |
| 256 | struct dst_entry *dst; | 256 | struct dst_entry *dst = sctp_transport_dst_check(t); |
| 257 | 257 | ||
| 258 | if (unlikely(pmtu < SCTP_DEFAULT_MINSEGMENT)) { | 258 | if (unlikely(pmtu < SCTP_DEFAULT_MINSEGMENT)) { |
| 259 | pr_warn("%s: Reported pmtu %d too low, using default minimum of %d\n", | 259 | pr_warn("%s: Reported pmtu %d too low, using default minimum of %d\n", |
| 260 | __func__, pmtu, | 260 | __func__, pmtu, SCTP_DEFAULT_MINSEGMENT); |
| 261 | SCTP_DEFAULT_MINSEGMENT); | ||
| 262 | /* Use default minimum segment size and disable | 261 | /* Use default minimum segment size and disable |
| 263 | * pmtu discovery on this transport. | 262 | * pmtu discovery on this transport. |
| 264 | */ | 263 | */ |
| @@ -267,17 +266,13 @@ void sctp_transport_update_pmtu(struct sock *sk, struct sctp_transport *t, u32 p | |||
| 267 | t->pathmtu = pmtu; | 266 | t->pathmtu = pmtu; |
| 268 | } | 267 | } |
| 269 | 268 | ||
| 270 | dst = sctp_transport_dst_check(t); | ||
| 271 | if (!dst) | ||
| 272 | t->af_specific->get_dst(t, &t->saddr, &t->fl, sk); | ||
| 273 | |||
| 274 | if (dst) { | 269 | if (dst) { |
| 275 | dst->ops->update_pmtu(dst, sk, NULL, pmtu); | 270 | dst->ops->update_pmtu(dst, t->asoc->base.sk, NULL, pmtu); |
| 276 | |||
| 277 | dst = sctp_transport_dst_check(t); | 271 | dst = sctp_transport_dst_check(t); |
| 278 | if (!dst) | ||
| 279 | t->af_specific->get_dst(t, &t->saddr, &t->fl, sk); | ||
| 280 | } | 272 | } |
| 273 | |||
| 274 | if (!dst) | ||
| 275 | t->af_specific->get_dst(t, &t->saddr, &t->fl, t->asoc->base.sk); | ||
| 281 | } | 276 | } |
| 282 | 277 | ||
| 283 | /* Caches the dst entry and source address for a transport's destination | 278 | /* Caches the dst entry and source address for a transport's destination |
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 8931e33b6541..2b720fa35c4f 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
| @@ -1635,6 +1635,7 @@ static struct svc_xprt *svc_bc_create_socket(struct svc_serv *serv, | |||
| 1635 | 1635 | ||
| 1636 | xprt = &svsk->sk_xprt; | 1636 | xprt = &svsk->sk_xprt; |
| 1637 | svc_xprt_init(net, &svc_tcp_bc_class, xprt, serv); | 1637 | svc_xprt_init(net, &svc_tcp_bc_class, xprt, serv); |
| 1638 | set_bit(XPT_CONG_CTRL, &svsk->sk_xprt.xpt_flags); | ||
| 1638 | 1639 | ||
| 1639 | serv->sv_bc_xprt = xprt; | 1640 | serv->sv_bc_xprt = xprt; |
| 1640 | 1641 | ||
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index c13a5c35ce14..fc8f14c7bfec 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
| @@ -127,6 +127,7 @@ static struct svc_xprt *svc_rdma_bc_create(struct svc_serv *serv, | |||
| 127 | xprt = &cma_xprt->sc_xprt; | 127 | xprt = &cma_xprt->sc_xprt; |
| 128 | 128 | ||
| 129 | svc_xprt_init(net, &svc_rdma_bc_class, xprt, serv); | 129 | svc_xprt_init(net, &svc_rdma_bc_class, xprt, serv); |
| 130 | set_bit(XPT_CONG_CTRL, &xprt->xpt_flags); | ||
| 130 | serv->sv_bc_xprt = xprt; | 131 | serv->sv_bc_xprt = xprt; |
| 131 | 132 | ||
| 132 | dprintk("svcrdma: %s(%p)\n", __func__, xprt); | 133 | dprintk("svcrdma: %s(%p)\n", __func__, xprt); |
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c index 16b6b5988be9..570a2b67ca10 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c | |||
| @@ -132,12 +132,10 @@ static int wiphy_resume(struct device *dev) | |||
| 132 | /* Age scan results with time spent in suspend */ | 132 | /* Age scan results with time spent in suspend */ |
| 133 | cfg80211_bss_age(rdev, get_seconds() - rdev->suspend_at); | 133 | cfg80211_bss_age(rdev, get_seconds() - rdev->suspend_at); |
| 134 | 134 | ||
| 135 | if (rdev->ops->resume) { | 135 | rtnl_lock(); |
| 136 | rtnl_lock(); | 136 | if (rdev->wiphy.registered && rdev->ops->resume) |
| 137 | if (rdev->wiphy.registered) | 137 | ret = rdev_resume(rdev); |
| 138 | ret = rdev_resume(rdev); | 138 | rtnl_unlock(); |
| 139 | rtnl_unlock(); | ||
| 140 | } | ||
| 141 | 139 | ||
| 142 | return ret; | 140 | return ret; |
| 143 | } | 141 | } |
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 9705c279494b..40a8aa39220d 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
| @@ -412,7 +412,14 @@ static inline int xfrm_replay_verify_len(struct xfrm_replay_state_esn *replay_es | |||
| 412 | up = nla_data(rp); | 412 | up = nla_data(rp); |
| 413 | ulen = xfrm_replay_state_esn_len(up); | 413 | ulen = xfrm_replay_state_esn_len(up); |
| 414 | 414 | ||
| 415 | if (nla_len(rp) < ulen || xfrm_replay_state_esn_len(replay_esn) != ulen) | 415 | /* Check the overall length and the internal bitmap length to avoid |
| 416 | * potential overflow. */ | ||
| 417 | if (nla_len(rp) < ulen || | ||
| 418 | xfrm_replay_state_esn_len(replay_esn) != ulen || | ||
| 419 | replay_esn->bmp_len != up->bmp_len) | ||
| 420 | return -EINVAL; | ||
| 421 | |||
| 422 | if (up->replay_window > up->bmp_len * sizeof(__u32) * 8) | ||
| 416 | return -EINVAL; | 423 | return -EINVAL; |
| 417 | 424 | ||
| 418 | return 0; | 425 | return 0; |
diff --git a/samples/statx/test-statx.c b/samples/statx/test-statx.c index 8571d766331d..d4d77b09412c 100644 --- a/samples/statx/test-statx.c +++ b/samples/statx/test-statx.c | |||
| @@ -141,8 +141,8 @@ static void dump_statx(struct statx *stx) | |||
| 141 | if (stx->stx_mask & STATX_BTIME) | 141 | if (stx->stx_mask & STATX_BTIME) |
| 142 | print_time(" Birth: ", &stx->stx_btime); | 142 | print_time(" Birth: ", &stx->stx_btime); |
| 143 | 143 | ||
| 144 | if (stx->stx_attributes) { | 144 | if (stx->stx_attributes_mask) { |
| 145 | unsigned char bits; | 145 | unsigned char bits, mbits; |
| 146 | int loop, byte; | 146 | int loop, byte; |
| 147 | 147 | ||
| 148 | static char attr_representation[64 + 1] = | 148 | static char attr_representation[64 + 1] = |
| @@ -160,14 +160,18 @@ static void dump_statx(struct statx *stx) | |||
| 160 | printf("Attributes: %016llx (", stx->stx_attributes); | 160 | printf("Attributes: %016llx (", stx->stx_attributes); |
| 161 | for (byte = 64 - 8; byte >= 0; byte -= 8) { | 161 | for (byte = 64 - 8; byte >= 0; byte -= 8) { |
| 162 | bits = stx->stx_attributes >> byte; | 162 | bits = stx->stx_attributes >> byte; |
| 163 | mbits = stx->stx_attributes_mask >> byte; | ||
| 163 | for (loop = 7; loop >= 0; loop--) { | 164 | for (loop = 7; loop >= 0; loop--) { |
| 164 | int bit = byte + loop; | 165 | int bit = byte + loop; |
| 165 | 166 | ||
| 166 | if (bits & 0x80) | 167 | if (!(mbits & 0x80)) |
| 168 | putchar('.'); /* Not supported */ | ||
| 169 | else if (bits & 0x80) | ||
| 167 | putchar(attr_representation[63 - bit]); | 170 | putchar(attr_representation[63 - bit]); |
| 168 | else | 171 | else |
| 169 | putchar('-'); | 172 | putchar('-'); /* Not set */ |
| 170 | bits <<= 1; | 173 | bits <<= 1; |
| 174 | mbits <<= 1; | ||
| 171 | } | 175 | } |
| 172 | if (byte) | 176 | if (byte) |
| 173 | putchar(' '); | 177 | putchar(' '); |
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index d6ca649cb0e9..afe3fd3af1e4 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
| @@ -148,6 +148,10 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \ | |||
| 148 | # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) | 148 | # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) |
| 149 | cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4)) | 149 | cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4)) |
| 150 | 150 | ||
| 151 | # cc-if-fullversion | ||
| 152 | # Usage: EXTRA_CFLAGS += $(call cc-if-fullversion, -lt, 040502, -O1) | ||
| 153 | cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || echo $(4)) | ||
| 154 | |||
| 151 | # cc-ldoption | 155 | # cc-ldoption |
| 152 | # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both) | 156 | # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both) |
| 153 | cc-ldoption = $(call try-run,\ | 157 | cc-ldoption = $(call try-run,\ |
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 0a07f9014944..7234e61e7ce3 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
| @@ -155,7 +155,7 @@ else | |||
| 155 | # $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files | 155 | # $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files |
| 156 | # and locates generated .h files | 156 | # and locates generated .h files |
| 157 | # FIXME: Replace both with specific CFLAGS* statements in the makefiles | 157 | # FIXME: Replace both with specific CFLAGS* statements in the makefiles |
| 158 | __c_flags = $(if $(obj),-I$(srctree)/$(src) -I$(obj)) \ | 158 | __c_flags = $(if $(obj),$(call addtree,-I$(src)) -I$(obj)) \ |
| 159 | $(call flags,_c_flags) | 159 | $(call flags,_c_flags) |
| 160 | __a_flags = $(call flags,_a_flags) | 160 | __a_flags = $(call flags,_a_flags) |
| 161 | __cpp_flags = $(call flags,_cpp_flags) | 161 | __cpp_flags = $(call flags,_cpp_flags) |
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 26d208b435a0..cfddddb9c9d7 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
| @@ -914,7 +914,7 @@ on_treeview2_button_press_event(GtkWidget * widget, | |||
| 914 | current = menu; | 914 | current = menu; |
| 915 | display_tree_part(); | 915 | display_tree_part(); |
| 916 | gtk_widget_set_sensitive(back_btn, TRUE); | 916 | gtk_widget_set_sensitive(back_btn, TRUE); |
| 917 | } else if ((col == COL_OPTION)) { | 917 | } else if (col == COL_OPTION) { |
| 918 | toggle_sym_value(menu); | 918 | toggle_sym_value(menu); |
| 919 | gtk_tree_view_expand_row(view, path, TRUE); | 919 | gtk_tree_view_expand_row(view, path, TRUE); |
| 920 | } | 920 | } |
diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c index 33980d1c8037..01c4cfe30c9f 100644 --- a/sound/core/seq/seq_fifo.c +++ b/sound/core/seq/seq_fifo.c | |||
| @@ -267,6 +267,10 @@ int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize) | |||
| 267 | /* NOTE: overflow flag is not cleared */ | 267 | /* NOTE: overflow flag is not cleared */ |
| 268 | spin_unlock_irqrestore(&f->lock, flags); | 268 | spin_unlock_irqrestore(&f->lock, flags); |
| 269 | 269 | ||
| 270 | /* close the old pool and wait until all users are gone */ | ||
| 271 | snd_seq_pool_mark_closing(oldpool); | ||
| 272 | snd_use_lock_sync(&f->use_lock); | ||
| 273 | |||
| 270 | /* release cells in old pool */ | 274 | /* release cells in old pool */ |
| 271 | for (cell = oldhead; cell; cell = next) { | 275 | for (cell = oldhead; cell; cell = next) { |
| 272 | next = cell->next; | 276 | next = cell->next; |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7f989898cbd9..299835d1fbaa 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -4858,6 +4858,7 @@ enum { | |||
| 4858 | ALC292_FIXUP_DISABLE_AAMIX, | 4858 | ALC292_FIXUP_DISABLE_AAMIX, |
| 4859 | ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK, | 4859 | ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK, |
| 4860 | ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, | 4860 | ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, |
| 4861 | ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE, | ||
| 4861 | ALC275_FIXUP_DELL_XPS, | 4862 | ALC275_FIXUP_DELL_XPS, |
| 4862 | ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE, | 4863 | ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE, |
| 4863 | ALC293_FIXUP_LENOVO_SPK_NOISE, | 4864 | ALC293_FIXUP_LENOVO_SPK_NOISE, |
| @@ -5470,6 +5471,15 @@ static const struct hda_fixup alc269_fixups[] = { | |||
| 5470 | .chained = true, | 5471 | .chained = true, |
| 5471 | .chain_id = ALC269_FIXUP_HEADSET_MODE | 5472 | .chain_id = ALC269_FIXUP_HEADSET_MODE |
| 5472 | }, | 5473 | }, |
| 5474 | [ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE] = { | ||
| 5475 | .type = HDA_FIXUP_PINS, | ||
| 5476 | .v.pins = (const struct hda_pintbl[]) { | ||
| 5477 | { 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */ | ||
| 5478 | { } | ||
| 5479 | }, | ||
| 5480 | .chained = true, | ||
| 5481 | .chain_id = ALC269_FIXUP_HEADSET_MODE | ||
| 5482 | }, | ||
| 5473 | [ALC275_FIXUP_DELL_XPS] = { | 5483 | [ALC275_FIXUP_DELL_XPS] = { |
| 5474 | .type = HDA_FIXUP_VERBS, | 5484 | .type = HDA_FIXUP_VERBS, |
| 5475 | .v.verbs = (const struct hda_verb[]) { | 5485 | .v.verbs = (const struct hda_verb[]) { |
| @@ -5542,7 +5552,7 @@ static const struct hda_fixup alc269_fixups[] = { | |||
| 5542 | .type = HDA_FIXUP_FUNC, | 5552 | .type = HDA_FIXUP_FUNC, |
| 5543 | .v.func = alc298_fixup_speaker_volume, | 5553 | .v.func = alc298_fixup_speaker_volume, |
| 5544 | .chained = true, | 5554 | .chained = true, |
| 5545 | .chain_id = ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, | 5555 | .chain_id = ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE, |
| 5546 | }, | 5556 | }, |
| 5547 | [ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = { | 5557 | [ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = { |
| 5548 | .type = HDA_FIXUP_PINS, | 5558 | .type = HDA_FIXUP_PINS, |
diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c index 89ac5f5a93eb..7ae46c2647d4 100644 --- a/sound/soc/atmel/atmel-classd.c +++ b/sound/soc/atmel/atmel-classd.c | |||
| @@ -349,7 +349,7 @@ static int atmel_classd_codec_dai_digital_mute(struct snd_soc_dai *codec_dai, | |||
| 349 | } | 349 | } |
| 350 | 350 | ||
| 351 | #define CLASSD_ACLK_RATE_11M2896_MPY_8 (112896 * 100 * 8) | 351 | #define CLASSD_ACLK_RATE_11M2896_MPY_8 (112896 * 100 * 8) |
| 352 | #define CLASSD_ACLK_RATE_12M288_MPY_8 (12228 * 1000 * 8) | 352 | #define CLASSD_ACLK_RATE_12M288_MPY_8 (12288 * 1000 * 8) |
| 353 | 353 | ||
| 354 | static struct { | 354 | static struct { |
| 355 | int rate; | 355 | int rate; |
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 78fca8acd3ec..fd272a40485b 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c | |||
| @@ -1534,21 +1534,20 @@ static void hdac_hdmi_eld_notify_cb(void *aptr, int port, int pipe) | |||
| 1534 | pin->mst_capable = false; | 1534 | pin->mst_capable = false; |
| 1535 | /* if not MST, default is port[0] */ | 1535 | /* if not MST, default is port[0] */ |
| 1536 | hport = &pin->ports[0]; | 1536 | hport = &pin->ports[0]; |
| 1537 | goto out; | ||
| 1538 | } else { | 1537 | } else { |
| 1539 | for (i = 0; i < pin->num_ports; i++) { | 1538 | for (i = 0; i < pin->num_ports; i++) { |
| 1540 | pin->mst_capable = true; | 1539 | pin->mst_capable = true; |
| 1541 | if (pin->ports[i].id == pipe) { | 1540 | if (pin->ports[i].id == pipe) { |
| 1542 | hport = &pin->ports[i]; | 1541 | hport = &pin->ports[i]; |
| 1543 | goto out; | 1542 | break; |
| 1544 | } | 1543 | } |
| 1545 | } | 1544 | } |
| 1546 | } | 1545 | } |
| 1546 | |||
| 1547 | if (hport) | ||
| 1548 | hdac_hdmi_present_sense(pin, hport); | ||
| 1547 | } | 1549 | } |
| 1548 | 1550 | ||
| 1549 | out: | ||
| 1550 | if (pin && hport) | ||
| 1551 | hdac_hdmi_present_sense(pin, hport); | ||
| 1552 | } | 1551 | } |
| 1553 | 1552 | ||
| 1554 | static struct i915_audio_component_audio_ops aops = { | 1553 | static struct i915_audio_component_audio_ops aops = { |
| @@ -1998,7 +1997,7 @@ static int hdac_hdmi_dev_remove(struct hdac_ext_device *edev) | |||
| 1998 | struct hdac_hdmi_pin *pin, *pin_next; | 1997 | struct hdac_hdmi_pin *pin, *pin_next; |
| 1999 | struct hdac_hdmi_cvt *cvt, *cvt_next; | 1998 | struct hdac_hdmi_cvt *cvt, *cvt_next; |
| 2000 | struct hdac_hdmi_pcm *pcm, *pcm_next; | 1999 | struct hdac_hdmi_pcm *pcm, *pcm_next; |
| 2001 | struct hdac_hdmi_port *port; | 2000 | struct hdac_hdmi_port *port, *port_next; |
| 2002 | int i; | 2001 | int i; |
| 2003 | 2002 | ||
| 2004 | snd_soc_unregister_codec(&edev->hdac.dev); | 2003 | snd_soc_unregister_codec(&edev->hdac.dev); |
| @@ -2008,8 +2007,9 @@ static int hdac_hdmi_dev_remove(struct hdac_ext_device *edev) | |||
| 2008 | if (list_empty(&pcm->port_list)) | 2007 | if (list_empty(&pcm->port_list)) |
| 2009 | continue; | 2008 | continue; |
| 2010 | 2009 | ||
| 2011 | list_for_each_entry(port, &pcm->port_list, head) | 2010 | list_for_each_entry_safe(port, port_next, |
| 2012 | port = NULL; | 2011 | &pcm->port_list, head) |
| 2012 | list_del(&port->head); | ||
| 2013 | 2013 | ||
| 2014 | list_del(&pcm->head); | 2014 | list_del(&pcm->head); |
| 2015 | kfree(pcm); | 2015 | kfree(pcm); |
diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index 324461e985b3..476135ec5726 100644 --- a/sound/soc/codecs/rt5665.c +++ b/sound/soc/codecs/rt5665.c | |||
| @@ -1241,7 +1241,7 @@ static irqreturn_t rt5665_irq(int irq, void *data) | |||
| 1241 | static void rt5665_jd_check_handler(struct work_struct *work) | 1241 | static void rt5665_jd_check_handler(struct work_struct *work) |
| 1242 | { | 1242 | { |
| 1243 | struct rt5665_priv *rt5665 = container_of(work, struct rt5665_priv, | 1243 | struct rt5665_priv *rt5665 = container_of(work, struct rt5665_priv, |
| 1244 | calibrate_work.work); | 1244 | jd_check_work.work); |
| 1245 | 1245 | ||
| 1246 | if (snd_soc_read(rt5665->codec, RT5665_AJD1_CTRL) & 0x0010) { | 1246 | if (snd_soc_read(rt5665->codec, RT5665_AJD1_CTRL) & 0x0010) { |
| 1247 | /* jack out */ | 1247 | /* jack out */ |
| @@ -2252,7 +2252,7 @@ static const char * const rt5665_if2_1_adc_in_src[] = { | |||
| 2252 | 2252 | ||
| 2253 | static const SOC_ENUM_SINGLE_DECL( | 2253 | static const SOC_ENUM_SINGLE_DECL( |
| 2254 | rt5665_if2_1_adc_in_enum, RT5665_DIG_INF2_DATA, | 2254 | rt5665_if2_1_adc_in_enum, RT5665_DIG_INF2_DATA, |
| 2255 | RT5665_IF3_ADC_IN_SFT, rt5665_if2_1_adc_in_src); | 2255 | RT5665_IF2_1_ADC_IN_SFT, rt5665_if2_1_adc_in_src); |
| 2256 | 2256 | ||
| 2257 | static const struct snd_kcontrol_new rt5665_if2_1_adc_in_mux = | 2257 | static const struct snd_kcontrol_new rt5665_if2_1_adc_in_mux = |
| 2258 | SOC_DAPM_ENUM("IF2_1 ADC IN Source", rt5665_if2_1_adc_in_enum); | 2258 | SOC_DAPM_ENUM("IF2_1 ADC IN Source", rt5665_if2_1_adc_in_enum); |
| @@ -3178,6 +3178,9 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { | |||
| 3178 | {"DAC Mono Right Filter", NULL, "DAC Mono R ASRC", is_using_asrc}, | 3178 | {"DAC Mono Right Filter", NULL, "DAC Mono R ASRC", is_using_asrc}, |
| 3179 | {"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc}, | 3179 | {"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc}, |
| 3180 | {"DAC Stereo2 Filter", NULL, "DAC STO2 ASRC", is_using_asrc}, | 3180 | {"DAC Stereo2 Filter", NULL, "DAC STO2 ASRC", is_using_asrc}, |
| 3181 | {"I2S1 ASRC", NULL, "CLKDET"}, | ||
| 3182 | {"I2S2 ASRC", NULL, "CLKDET"}, | ||
| 3183 | {"I2S3 ASRC", NULL, "CLKDET"}, | ||
| 3181 | 3184 | ||
| 3182 | /*Vref*/ | 3185 | /*Vref*/ |
| 3183 | {"Mic Det Power", NULL, "Vref2"}, | 3186 | {"Mic Det Power", NULL, "Vref2"}, |
| @@ -3912,6 +3915,7 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { | |||
| 3912 | {"Mono MIX", "MONOVOL Switch", "MONOVOL"}, | 3915 | {"Mono MIX", "MONOVOL Switch", "MONOVOL"}, |
| 3913 | {"Mono Amp", NULL, "Mono MIX"}, | 3916 | {"Mono Amp", NULL, "Mono MIX"}, |
| 3914 | {"Mono Amp", NULL, "Vref2"}, | 3917 | {"Mono Amp", NULL, "Vref2"}, |
| 3918 | {"Mono Amp", NULL, "Vref3"}, | ||
| 3915 | {"Mono Amp", NULL, "CLKDET SYS"}, | 3919 | {"Mono Amp", NULL, "CLKDET SYS"}, |
| 3916 | {"Mono Amp", NULL, "CLKDET MONO"}, | 3920 | {"Mono Amp", NULL, "CLKDET MONO"}, |
| 3917 | {"Mono Playback", "Switch", "Mono Amp"}, | 3921 | {"Mono Playback", "Switch", "Mono Amp"}, |
| @@ -4798,7 +4802,7 @@ static int rt5665_i2c_probe(struct i2c_client *i2c, | |||
| 4798 | /* Enhance performance*/ | 4802 | /* Enhance performance*/ |
| 4799 | regmap_update_bits(rt5665->regmap, RT5665_PWR_ANLG_1, | 4803 | regmap_update_bits(rt5665->regmap, RT5665_PWR_ANLG_1, |
| 4800 | RT5665_HP_DRIVER_MASK | RT5665_LDO1_DVO_MASK, | 4804 | RT5665_HP_DRIVER_MASK | RT5665_LDO1_DVO_MASK, |
| 4801 | RT5665_HP_DRIVER_5X | RT5665_LDO1_DVO_09); | 4805 | RT5665_HP_DRIVER_5X | RT5665_LDO1_DVO_12); |
| 4802 | 4806 | ||
| 4803 | INIT_DELAYED_WORK(&rt5665->jack_detect_work, | 4807 | INIT_DELAYED_WORK(&rt5665->jack_detect_work, |
| 4804 | rt5665_jack_detect_handler); | 4808 | rt5665_jack_detect_handler); |
diff --git a/sound/soc/codecs/rt5665.h b/sound/soc/codecs/rt5665.h index 12f7080a0d3c..a30f5e6d0628 100644 --- a/sound/soc/codecs/rt5665.h +++ b/sound/soc/codecs/rt5665.h | |||
| @@ -1106,7 +1106,7 @@ | |||
| 1106 | #define RT5665_HP_DRIVER_MASK (0x3 << 2) | 1106 | #define RT5665_HP_DRIVER_MASK (0x3 << 2) |
| 1107 | #define RT5665_HP_DRIVER_1X (0x0 << 2) | 1107 | #define RT5665_HP_DRIVER_1X (0x0 << 2) |
| 1108 | #define RT5665_HP_DRIVER_3X (0x1 << 2) | 1108 | #define RT5665_HP_DRIVER_3X (0x1 << 2) |
| 1109 | #define RT5665_HP_DRIVER_5X (0x2 << 2) | 1109 | #define RT5665_HP_DRIVER_5X (0x3 << 2) |
| 1110 | #define RT5665_LDO1_DVO_MASK (0x3) | 1110 | #define RT5665_LDO1_DVO_MASK (0x3) |
| 1111 | #define RT5665_LDO1_DVO_09 (0x0) | 1111 | #define RT5665_LDO1_DVO_09 (0x0) |
| 1112 | #define RT5665_LDO1_DVO_10 (0x1) | 1112 | #define RT5665_LDO1_DVO_10 (0x1) |
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index d151224ffcca..bbdb72f73df1 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c | |||
| @@ -899,7 +899,10 @@ static int wm_coeff_put(struct snd_kcontrol *kctl, | |||
| 899 | 899 | ||
| 900 | mutex_lock(&ctl->dsp->pwr_lock); | 900 | mutex_lock(&ctl->dsp->pwr_lock); |
| 901 | 901 | ||
| 902 | memcpy(ctl->cache, p, ctl->len); | 902 | if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) |
| 903 | ret = -EPERM; | ||
| 904 | else | ||
| 905 | memcpy(ctl->cache, p, ctl->len); | ||
| 903 | 906 | ||
| 904 | ctl->set = 1; | 907 | ctl->set = 1; |
| 905 | if (ctl->enabled && ctl->dsp->running) | 908 | if (ctl->enabled && ctl->dsp->running) |
| @@ -926,6 +929,8 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl, | |||
| 926 | ctl->set = 1; | 929 | ctl->set = 1; |
| 927 | if (ctl->enabled && ctl->dsp->running) | 930 | if (ctl->enabled && ctl->dsp->running) |
| 928 | ret = wm_coeff_write_control(ctl, ctl->cache, size); | 931 | ret = wm_coeff_write_control(ctl, ctl->cache, size); |
| 932 | else if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) | ||
| 933 | ret = -EPERM; | ||
| 929 | } | 934 | } |
| 930 | 935 | ||
| 931 | mutex_unlock(&ctl->dsp->pwr_lock); | 936 | mutex_unlock(&ctl->dsp->pwr_lock); |
| @@ -947,7 +952,7 @@ static int wm_coeff_put_acked(struct snd_kcontrol *kctl, | |||
| 947 | 952 | ||
| 948 | mutex_lock(&ctl->dsp->pwr_lock); | 953 | mutex_lock(&ctl->dsp->pwr_lock); |
| 949 | 954 | ||
| 950 | if (ctl->enabled) | 955 | if (ctl->enabled && ctl->dsp->running) |
| 951 | ret = wm_coeff_write_acked_control(ctl, val); | 956 | ret = wm_coeff_write_acked_control(ctl, val); |
| 952 | else | 957 | else |
| 953 | ret = -EPERM; | 958 | ret = -EPERM; |
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 4924575d2e95..343b291fc372 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c | |||
| @@ -115,6 +115,7 @@ int asoc_simple_card_parse_clk(struct device *dev, | |||
| 115 | clk = devm_get_clk_from_child(dev, node, NULL); | 115 | clk = devm_get_clk_from_child(dev, node, NULL); |
| 116 | if (!IS_ERR(clk)) { | 116 | if (!IS_ERR(clk)) { |
| 117 | simple_dai->sysclk = clk_get_rate(clk); | 117 | simple_dai->sysclk = clk_get_rate(clk); |
| 118 | simple_dai->clk = clk; | ||
| 118 | } else if (!of_property_read_u32(node, "system-clock-frequency", &val)) { | 119 | } else if (!of_property_read_u32(node, "system-clock-frequency", &val)) { |
| 119 | simple_dai->sysclk = val; | 120 | simple_dai->sysclk = val; |
| 120 | } else { | 121 | } else { |
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index ed58b5b3555a..2dbfb1b24ef4 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c | |||
| @@ -512,7 +512,7 @@ static int skl_tplg_set_module_init_data(struct snd_soc_dapm_widget *w) | |||
| 512 | if (bc->set_params != SKL_PARAM_INIT) | 512 | if (bc->set_params != SKL_PARAM_INIT) |
| 513 | continue; | 513 | continue; |
| 514 | 514 | ||
| 515 | mconfig->formats_config.caps = (u32 *)&bc->params; | 515 | mconfig->formats_config.caps = (u32 *)bc->params; |
| 516 | mconfig->formats_config.caps_size = bc->size; | 516 | mconfig->formats_config.caps_size = bc->size; |
| 517 | 517 | ||
| 518 | break; | 518 | break; |
diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 05cf809cf9e1..d7013bde6f45 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig | |||
| @@ -13,7 +13,7 @@ config SND_SOC_MT2701 | |||
| 13 | 13 | ||
| 14 | config SND_SOC_MT2701_CS42448 | 14 | config SND_SOC_MT2701_CS42448 |
| 15 | tristate "ASoc Audio driver for MT2701 with CS42448 codec" | 15 | tristate "ASoc Audio driver for MT2701 with CS42448 codec" |
| 16 | depends on SND_SOC_MT2701 | 16 | depends on SND_SOC_MT2701 && I2C |
| 17 | select SND_SOC_CS42XX8_I2C | 17 | select SND_SOC_CS42XX8_I2C |
| 18 | select SND_SOC_BT_SCO | 18 | select SND_SOC_BT_SCO |
| 19 | help | 19 | help |
diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c index abb5eaac854a..7d92a24b7cfa 100644 --- a/sound/soc/sh/rcar/cmd.c +++ b/sound/soc/sh/rcar/cmd.c | |||
| @@ -31,23 +31,24 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, | |||
| 31 | struct rsnd_mod *mix = rsnd_io_to_mod_mix(io); | 31 | struct rsnd_mod *mix = rsnd_io_to_mod_mix(io); |
| 32 | struct device *dev = rsnd_priv_to_dev(priv); | 32 | struct device *dev = rsnd_priv_to_dev(priv); |
| 33 | u32 data; | 33 | u32 data; |
| 34 | u32 path[] = { | ||
| 35 | [1] = 1 << 0, | ||
| 36 | [5] = 1 << 8, | ||
| 37 | [6] = 1 << 12, | ||
| 38 | [9] = 1 << 15, | ||
| 39 | }; | ||
| 34 | 40 | ||
| 35 | if (!mix && !dvc) | 41 | if (!mix && !dvc) |
| 36 | return 0; | 42 | return 0; |
| 37 | 43 | ||
| 44 | if (ARRAY_SIZE(path) < rsnd_mod_id(mod) + 1) | ||
| 45 | return -ENXIO; | ||
| 46 | |||
| 38 | if (mix) { | 47 | if (mix) { |
| 39 | struct rsnd_dai *rdai; | 48 | struct rsnd_dai *rdai; |
| 40 | struct rsnd_mod *src; | 49 | struct rsnd_mod *src; |
| 41 | struct rsnd_dai_stream *tio; | 50 | struct rsnd_dai_stream *tio; |
| 42 | int i; | 51 | int i; |
| 43 | u32 path[] = { | ||
| 44 | [0] = 0, | ||
| 45 | [1] = 1 << 0, | ||
| 46 | [2] = 0, | ||
| 47 | [3] = 0, | ||
| 48 | [4] = 0, | ||
| 49 | [5] = 1 << 8 | ||
| 50 | }; | ||
| 51 | 52 | ||
| 52 | /* | 53 | /* |
| 53 | * it is assuming that integrater is well understanding about | 54 | * it is assuming that integrater is well understanding about |
| @@ -70,16 +71,19 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, | |||
| 70 | } else { | 71 | } else { |
| 71 | struct rsnd_mod *src = rsnd_io_to_mod_src(io); | 72 | struct rsnd_mod *src = rsnd_io_to_mod_src(io); |
| 72 | 73 | ||
| 73 | u32 path[] = { | 74 | u8 cmd_case[] = { |
| 74 | [0] = 0x30000, | 75 | [0] = 0x3, |
| 75 | [1] = 0x30001, | 76 | [1] = 0x3, |
| 76 | [2] = 0x40000, | 77 | [2] = 0x4, |
| 77 | [3] = 0x10000, | 78 | [3] = 0x1, |
| 78 | [4] = 0x20000, | 79 | [4] = 0x2, |
| 79 | [5] = 0x40100 | 80 | [5] = 0x4, |
| 81 | [6] = 0x1, | ||
| 82 | [9] = 0x2, | ||
| 80 | }; | 83 | }; |
| 81 | 84 | ||
| 82 | data = path[rsnd_mod_id(src)]; | 85 | data = path[rsnd_mod_id(src)] | |
| 86 | cmd_case[rsnd_mod_id(src)] << 16; | ||
| 83 | } | 87 | } |
| 84 | 88 | ||
| 85 | dev_dbg(dev, "ctu/mix path = 0x%08x", data); | 89 | dev_dbg(dev, "ctu/mix path = 0x%08x", data); |
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 1f405c833867..241cb3b08a07 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c | |||
| @@ -454,6 +454,20 @@ static u32 rsnd_dmapp_read(struct rsnd_dma *dma, u32 reg) | |||
| 454 | return ioread32(rsnd_dmapp_addr(dmac, dma, reg)); | 454 | return ioread32(rsnd_dmapp_addr(dmac, dma, reg)); |
| 455 | } | 455 | } |
| 456 | 456 | ||
| 457 | static void rsnd_dmapp_bset(struct rsnd_dma *dma, u32 data, u32 mask, u32 reg) | ||
| 458 | { | ||
| 459 | struct rsnd_mod *mod = rsnd_mod_get(dma); | ||
| 460 | struct rsnd_priv *priv = rsnd_mod_to_priv(mod); | ||
| 461 | struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); | ||
| 462 | void __iomem *addr = rsnd_dmapp_addr(dmac, dma, reg); | ||
| 463 | u32 val = ioread32(addr); | ||
| 464 | |||
| 465 | val &= ~mask; | ||
| 466 | val |= (data & mask); | ||
| 467 | |||
| 468 | iowrite32(val, addr); | ||
| 469 | } | ||
| 470 | |||
| 457 | static int rsnd_dmapp_stop(struct rsnd_mod *mod, | 471 | static int rsnd_dmapp_stop(struct rsnd_mod *mod, |
| 458 | struct rsnd_dai_stream *io, | 472 | struct rsnd_dai_stream *io, |
| 459 | struct rsnd_priv *priv) | 473 | struct rsnd_priv *priv) |
| @@ -461,10 +475,10 @@ static int rsnd_dmapp_stop(struct rsnd_mod *mod, | |||
| 461 | struct rsnd_dma *dma = rsnd_mod_to_dma(mod); | 475 | struct rsnd_dma *dma = rsnd_mod_to_dma(mod); |
| 462 | int i; | 476 | int i; |
| 463 | 477 | ||
| 464 | rsnd_dmapp_write(dma, 0, PDMACHCR); | 478 | rsnd_dmapp_bset(dma, 0, PDMACHCR_DE, PDMACHCR); |
| 465 | 479 | ||
| 466 | for (i = 0; i < 1024; i++) { | 480 | for (i = 0; i < 1024; i++) { |
| 467 | if (0 == rsnd_dmapp_read(dma, PDMACHCR)) | 481 | if (0 == (rsnd_dmapp_read(dma, PDMACHCR) & PDMACHCR_DE)) |
| 468 | return 0; | 482 | return 0; |
| 469 | udelay(1); | 483 | udelay(1); |
| 470 | } | 484 | } |
diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 4e817c8a18c0..14fafdaf1395 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c | |||
| @@ -64,7 +64,11 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, | |||
| 64 | mask1 = (1 << 4) | (1 << 20); /* mask sync bit */ | 64 | mask1 = (1 << 4) | (1 << 20); /* mask sync bit */ |
| 65 | mask2 = (1 << 4); /* mask sync bit */ | 65 | mask2 = (1 << 4); /* mask sync bit */ |
| 66 | val1 = val2 = 0; | 66 | val1 = val2 = 0; |
| 67 | if (rsnd_ssi_is_pin_sharing(io)) { | 67 | if (id == 8) { |
| 68 | /* | ||
| 69 | * SSI8 pin is sharing with SSI7, nothing to do. | ||
| 70 | */ | ||
| 71 | } else if (rsnd_ssi_is_pin_sharing(io)) { | ||
| 68 | int shift = -1; | 72 | int shift = -1; |
| 69 | 73 | ||
| 70 | switch (id) { | 74 | switch (id) { |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6dca408faae3..2722bb0c5573 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -3326,7 +3326,10 @@ static int snd_soc_platform_drv_pcm_new(struct snd_soc_pcm_runtime *rtd) | |||
| 3326 | { | 3326 | { |
| 3327 | struct snd_soc_platform *platform = rtd->platform; | 3327 | struct snd_soc_platform *platform = rtd->platform; |
| 3328 | 3328 | ||
| 3329 | return platform->driver->pcm_new(rtd); | 3329 | if (platform->driver->pcm_new) |
| 3330 | return platform->driver->pcm_new(rtd); | ||
| 3331 | else | ||
| 3332 | return 0; | ||
| 3330 | } | 3333 | } |
| 3331 | 3334 | ||
| 3332 | static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm) | 3335 | static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm) |
| @@ -3334,7 +3337,8 @@ static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm) | |||
| 3334 | struct snd_soc_pcm_runtime *rtd = pcm->private_data; | 3337 | struct snd_soc_pcm_runtime *rtd = pcm->private_data; |
| 3335 | struct snd_soc_platform *platform = rtd->platform; | 3338 | struct snd_soc_platform *platform = rtd->platform; |
| 3336 | 3339 | ||
| 3337 | platform->driver->pcm_free(pcm); | 3340 | if (platform->driver->pcm_free) |
| 3341 | platform->driver->pcm_free(pcm); | ||
| 3338 | } | 3342 | } |
| 3339 | 3343 | ||
| 3340 | /** | 3344 | /** |
diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reader.c index 5992c6ab3833..93a8df6ed880 100644 --- a/sound/soc/sti/uniperif_reader.c +++ b/sound/soc/sti/uniperif_reader.c | |||
| @@ -349,6 +349,8 @@ static int uni_reader_startup(struct snd_pcm_substream *substream, | |||
| 349 | struct uniperif *reader = priv->dai_data.uni; | 349 | struct uniperif *reader = priv->dai_data.uni; |
| 350 | int ret; | 350 | int ret; |
| 351 | 351 | ||
| 352 | reader->substream = substream; | ||
| 353 | |||
| 352 | if (!UNIPERIF_TYPE_IS_TDM(reader)) | 354 | if (!UNIPERIF_TYPE_IS_TDM(reader)) |
| 353 | return 0; | 355 | return 0; |
| 354 | 356 | ||
| @@ -378,6 +380,7 @@ static void uni_reader_shutdown(struct snd_pcm_substream *substream, | |||
| 378 | /* Stop the reader */ | 380 | /* Stop the reader */ |
| 379 | uni_reader_stop(reader); | 381 | uni_reader_stop(reader); |
| 380 | } | 382 | } |
| 383 | reader->substream = NULL; | ||
| 381 | } | 384 | } |
| 382 | 385 | ||
| 383 | static const struct snd_soc_dai_ops uni_reader_dai_ops = { | 386 | static const struct snd_soc_dai_ops uni_reader_dai_ops = { |
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index b92bdc8361af..7527ba29a5a0 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c | |||
| @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, | |||
| 259 | return 0; | 259 | return 0; |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { | 262 | static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { |
| 263 | SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, | 263 | SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", |
| 264 | SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), | 264 | SUN8I_DAC_MXR_SRC, |
| 265 | SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, | 265 | SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, |
| 266 | SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), | ||
| 267 | SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, | ||
| 268 | SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), | ||
| 269 | SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, | ||
| 270 | SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), | ||
| 271 | }; | ||
| 272 | |||
| 273 | static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { | ||
| 274 | SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, | ||
| 275 | SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), | 266 | SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), |
| 276 | SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, | 267 | SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", |
| 268 | SUN8I_DAC_MXR_SRC, | ||
| 269 | SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, | ||
| 277 | SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), | 270 | SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), |
| 278 | SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, | 271 | SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, |
| 272 | SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, | ||
| 279 | SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), | 273 | SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), |
| 280 | SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, | 274 | SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, |
| 275 | SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, | ||
| 281 | SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), | 276 | SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), |
| 282 | }; | 277 | }; |
| 283 | 278 | ||
| @@ -286,19 +281,21 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { | |||
| 286 | SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, | 281 | SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, |
| 287 | 0, NULL, 0), | 282 | 0, NULL, 0), |
| 288 | 283 | ||
| 289 | /* Analog DAC */ | 284 | /* Analog DAC AIF */ |
| 290 | SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, | 285 | SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0, |
| 291 | SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), | 286 | SUN8I_AIF1_DACDAT_CTRL, |
| 292 | SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, | 287 | SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), |
| 293 | SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), | 288 | SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0, |
| 289 | SUN8I_AIF1_DACDAT_CTRL, | ||
| 290 | SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), | ||
| 294 | 291 | ||
| 295 | /* DAC Mixers */ | 292 | /* DAC Mixers */ |
| 296 | SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, | 293 | SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, |
| 297 | sun8i_output_left_mixer_controls, | 294 | sun8i_dac_mixer_controls, |
| 298 | ARRAY_SIZE(sun8i_output_left_mixer_controls)), | 295 | ARRAY_SIZE(sun8i_dac_mixer_controls)), |
| 299 | SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, | 296 | SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, |
| 300 | sun8i_output_right_mixer_controls, | 297 | sun8i_dac_mixer_controls, |
| 301 | ARRAY_SIZE(sun8i_output_right_mixer_controls)), | 298 | ARRAY_SIZE(sun8i_dac_mixer_controls)), |
| 302 | 299 | ||
| 303 | /* Clocks */ | 300 | /* Clocks */ |
| 304 | SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, | 301 | SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, |
| @@ -321,8 +318,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { | |||
| 321 | SUN8I_MOD_RST_CTL_AIF1, 0, NULL, 0), | 318 | SUN8I_MOD_RST_CTL_AIF1, 0, NULL, 0), |
| 322 | SND_SOC_DAPM_SUPPLY("RST DAC", SUN8I_MOD_RST_CTL, | 319 | SND_SOC_DAPM_SUPPLY("RST DAC", SUN8I_MOD_RST_CTL, |
| 323 | SUN8I_MOD_RST_CTL_DAC, 0, NULL, 0), | 320 | SUN8I_MOD_RST_CTL_DAC, 0, NULL, 0), |
| 324 | |||
| 325 | SND_SOC_DAPM_OUTPUT("HP"), | ||
| 326 | }; | 321 | }; |
| 327 | 322 | ||
| 328 | static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { | 323 | static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { |
| @@ -338,16 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { | |||
| 338 | { "DAC", NULL, "MODCLK DAC" }, | 333 | { "DAC", NULL, "MODCLK DAC" }, |
| 339 | 334 | ||
| 340 | /* DAC Routes */ | 335 | /* DAC Routes */ |
| 341 | { "Digital Left DAC", NULL, "DAC" }, | 336 | { "AIF1 Slot 0 Right", NULL, "DAC" }, |
| 342 | { "Digital Right DAC", NULL, "DAC" }, | 337 | { "AIF1 Slot 0 Left", NULL, "DAC" }, |
| 343 | 338 | ||
| 344 | /* DAC Mixer Routes */ | 339 | /* DAC Mixer Routes */ |
| 345 | { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, | 340 | { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", |
| 346 | { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, | 341 | "AIF1 Slot 0 Left"}, |
| 347 | 342 | { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", | |
| 348 | /* End of route : HP out */ | 343 | "AIF1 Slot 0 Right"}, |
| 349 | { "HP", NULL, "Left DAC Mixer" }, | ||
| 350 | { "HP", NULL, "Right DAC Mixer" }, | ||
| 351 | }; | 344 | }; |
| 352 | 345 | ||
| 353 | static struct snd_soc_dai_ops sun8i_codec_dai_ops = { | 346 | static struct snd_soc_dai_ops sun8i_codec_dai_ops = { |
diff --git a/tools/include/linux/filter.h b/tools/include/linux/filter.h index 122153b16ea4..390d7c9685fd 100644 --- a/tools/include/linux/filter.h +++ b/tools/include/linux/filter.h | |||
| @@ -168,6 +168,16 @@ | |||
| 168 | .off = OFF, \ | 168 | .off = OFF, \ |
| 169 | .imm = 0 }) | 169 | .imm = 0 }) |
| 170 | 170 | ||
| 171 | /* Atomic memory add, *(uint *)(dst_reg + off16) += src_reg */ | ||
| 172 | |||
| 173 | #define BPF_STX_XADD(SIZE, DST, SRC, OFF) \ | ||
| 174 | ((struct bpf_insn) { \ | ||
| 175 | .code = BPF_STX | BPF_SIZE(SIZE) | BPF_XADD, \ | ||
| 176 | .dst_reg = DST, \ | ||
| 177 | .src_reg = SRC, \ | ||
| 178 | .off = OFF, \ | ||
| 179 | .imm = 0 }) | ||
| 180 | |||
| 171 | /* Memory store, *(uint *) (dst_reg + off16) = imm32 */ | 181 | /* Memory store, *(uint *) (dst_reg + off16) = imm32 */ |
| 172 | 182 | ||
| 173 | #define BPF_ST_MEM(SIZE, DST, OFF, IMM) \ | 183 | #define BPF_ST_MEM(SIZE, DST, OFF, IMM) \ |
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 6a1ad58cb66f..9af09e8099c0 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile | |||
| @@ -1,7 +1,14 @@ | |||
| 1 | LIBDIR := ../../../lib | 1 | LIBDIR := ../../../lib |
| 2 | BPFDIR := $(LIBDIR)/bpf | 2 | BPFDIR := $(LIBDIR)/bpf |
| 3 | APIDIR := ../../../include/uapi | ||
| 4 | GENDIR := ../../../../include/generated | ||
| 5 | GENHDR := $(GENDIR)/autoconf.h | ||
| 3 | 6 | ||
| 4 | CFLAGS += -Wall -O2 -I../../../include/uapi -I$(LIBDIR) | 7 | ifneq ($(wildcard $(GENHDR)),) |
| 8 | GENFLAGS := -DHAVE_GENHDR | ||
| 9 | endif | ||
| 10 | |||
| 11 | CFLAGS += -Wall -O2 -I$(APIDIR) -I$(LIBDIR) -I$(GENDIR) $(GENFLAGS) | ||
| 5 | LDLIBS += -lcap | 12 | LDLIBS += -lcap |
| 6 | 13 | ||
| 7 | TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map | 14 | TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map |
diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index d1555e4240c0..c848e90b6421 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c | |||
| @@ -30,6 +30,14 @@ | |||
| 30 | 30 | ||
| 31 | #include <bpf/bpf.h> | 31 | #include <bpf/bpf.h> |
| 32 | 32 | ||
| 33 | #ifdef HAVE_GENHDR | ||
| 34 | # include "autoconf.h" | ||
| 35 | #else | ||
| 36 | # if defined(__i386) || defined(__x86_64) || defined(__s390x__) || defined(__aarch64__) | ||
| 37 | # define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 1 | ||
| 38 | # endif | ||
| 39 | #endif | ||
| 40 | |||
| 33 | #include "../../../include/linux/filter.h" | 41 | #include "../../../include/linux/filter.h" |
| 34 | 42 | ||
| 35 | #ifndef ARRAY_SIZE | 43 | #ifndef ARRAY_SIZE |
| @@ -39,6 +47,8 @@ | |||
| 39 | #define MAX_INSNS 512 | 47 | #define MAX_INSNS 512 |
| 40 | #define MAX_FIXUPS 8 | 48 | #define MAX_FIXUPS 8 |
| 41 | 49 | ||
| 50 | #define F_NEEDS_EFFICIENT_UNALIGNED_ACCESS (1 << 0) | ||
| 51 | |||
| 42 | struct bpf_test { | 52 | struct bpf_test { |
| 43 | const char *descr; | 53 | const char *descr; |
| 44 | struct bpf_insn insns[MAX_INSNS]; | 54 | struct bpf_insn insns[MAX_INSNS]; |
| @@ -53,6 +63,7 @@ struct bpf_test { | |||
| 53 | REJECT | 63 | REJECT |
| 54 | } result, result_unpriv; | 64 | } result, result_unpriv; |
| 55 | enum bpf_prog_type prog_type; | 65 | enum bpf_prog_type prog_type; |
| 66 | uint8_t flags; | ||
| 56 | }; | 67 | }; |
| 57 | 68 | ||
| 58 | /* Note we want this to be 64 bit aligned so that the end of our array is | 69 | /* Note we want this to be 64 bit aligned so that the end of our array is |
| @@ -2432,6 +2443,30 @@ static struct bpf_test tests[] = { | |||
| 2432 | .prog_type = BPF_PROG_TYPE_SCHED_CLS, | 2443 | .prog_type = BPF_PROG_TYPE_SCHED_CLS, |
| 2433 | }, | 2444 | }, |
| 2434 | { | 2445 | { |
| 2446 | "direct packet access: test15 (spill with xadd)", | ||
| 2447 | .insns = { | ||
| 2448 | BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, | ||
| 2449 | offsetof(struct __sk_buff, data)), | ||
| 2450 | BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1, | ||
| 2451 | offsetof(struct __sk_buff, data_end)), | ||
| 2452 | BPF_MOV64_REG(BPF_REG_0, BPF_REG_2), | ||
| 2453 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 8), | ||
| 2454 | BPF_JMP_REG(BPF_JGT, BPF_REG_0, BPF_REG_3, 8), | ||
| 2455 | BPF_MOV64_IMM(BPF_REG_5, 4096), | ||
| 2456 | BPF_MOV64_REG(BPF_REG_4, BPF_REG_10), | ||
| 2457 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_4, -8), | ||
| 2458 | BPF_STX_MEM(BPF_DW, BPF_REG_4, BPF_REG_2, 0), | ||
| 2459 | BPF_STX_XADD(BPF_DW, BPF_REG_4, BPF_REG_5, 0), | ||
| 2460 | BPF_LDX_MEM(BPF_DW, BPF_REG_2, BPF_REG_4, 0), | ||
| 2461 | BPF_STX_MEM(BPF_W, BPF_REG_2, BPF_REG_5, 0), | ||
| 2462 | BPF_MOV64_IMM(BPF_REG_0, 0), | ||
| 2463 | BPF_EXIT_INSN(), | ||
| 2464 | }, | ||
| 2465 | .errstr = "R2 invalid mem access 'inv'", | ||
| 2466 | .result = REJECT, | ||
| 2467 | .prog_type = BPF_PROG_TYPE_SCHED_CLS, | ||
| 2468 | }, | ||
| 2469 | { | ||
| 2435 | "helper access to packet: test1, valid packet_ptr range", | 2470 | "helper access to packet: test1, valid packet_ptr range", |
| 2436 | .insns = { | 2471 | .insns = { |
| 2437 | BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, | 2472 | BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, |
| @@ -2934,6 +2969,7 @@ static struct bpf_test tests[] = { | |||
| 2934 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | 2969 | .errstr_unpriv = "R0 pointer arithmetic prohibited", |
| 2935 | .result_unpriv = REJECT, | 2970 | .result_unpriv = REJECT, |
| 2936 | .result = ACCEPT, | 2971 | .result = ACCEPT, |
| 2972 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 2937 | }, | 2973 | }, |
| 2938 | { | 2974 | { |
| 2939 | "valid map access into an array with a variable", | 2975 | "valid map access into an array with a variable", |
| @@ -2957,6 +2993,7 @@ static struct bpf_test tests[] = { | |||
| 2957 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | 2993 | .errstr_unpriv = "R0 pointer arithmetic prohibited", |
| 2958 | .result_unpriv = REJECT, | 2994 | .result_unpriv = REJECT, |
| 2959 | .result = ACCEPT, | 2995 | .result = ACCEPT, |
| 2996 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 2960 | }, | 2997 | }, |
| 2961 | { | 2998 | { |
| 2962 | "valid map access into an array with a signed variable", | 2999 | "valid map access into an array with a signed variable", |
| @@ -2984,6 +3021,7 @@ static struct bpf_test tests[] = { | |||
| 2984 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | 3021 | .errstr_unpriv = "R0 pointer arithmetic prohibited", |
| 2985 | .result_unpriv = REJECT, | 3022 | .result_unpriv = REJECT, |
| 2986 | .result = ACCEPT, | 3023 | .result = ACCEPT, |
| 3024 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 2987 | }, | 3025 | }, |
| 2988 | { | 3026 | { |
| 2989 | "invalid map access into an array with a constant", | 3027 | "invalid map access into an array with a constant", |
| @@ -3025,6 +3063,7 @@ static struct bpf_test tests[] = { | |||
| 3025 | .errstr = "R0 min value is outside of the array range", | 3063 | .errstr = "R0 min value is outside of the array range", |
| 3026 | .result_unpriv = REJECT, | 3064 | .result_unpriv = REJECT, |
| 3027 | .result = REJECT, | 3065 | .result = REJECT, |
| 3066 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 3028 | }, | 3067 | }, |
| 3029 | { | 3068 | { |
| 3030 | "invalid map access into an array with a variable", | 3069 | "invalid map access into an array with a variable", |
| @@ -3048,6 +3087,7 @@ static struct bpf_test tests[] = { | |||
| 3048 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", | 3087 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", |
| 3049 | .result_unpriv = REJECT, | 3088 | .result_unpriv = REJECT, |
| 3050 | .result = REJECT, | 3089 | .result = REJECT, |
| 3090 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 3051 | }, | 3091 | }, |
| 3052 | { | 3092 | { |
| 3053 | "invalid map access into an array with no floor check", | 3093 | "invalid map access into an array with no floor check", |
| @@ -3074,6 +3114,7 @@ static struct bpf_test tests[] = { | |||
| 3074 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", | 3114 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", |
| 3075 | .result_unpriv = REJECT, | 3115 | .result_unpriv = REJECT, |
| 3076 | .result = REJECT, | 3116 | .result = REJECT, |
| 3117 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 3077 | }, | 3118 | }, |
| 3078 | { | 3119 | { |
| 3079 | "invalid map access into an array with a invalid max check", | 3120 | "invalid map access into an array with a invalid max check", |
| @@ -3100,6 +3141,7 @@ static struct bpf_test tests[] = { | |||
| 3100 | .errstr = "invalid access to map value, value_size=48 off=44 size=8", | 3141 | .errstr = "invalid access to map value, value_size=48 off=44 size=8", |
| 3101 | .result_unpriv = REJECT, | 3142 | .result_unpriv = REJECT, |
| 3102 | .result = REJECT, | 3143 | .result = REJECT, |
| 3144 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 3103 | }, | 3145 | }, |
| 3104 | { | 3146 | { |
| 3105 | "invalid map access into an array with a invalid max check", | 3147 | "invalid map access into an array with a invalid max check", |
| @@ -3129,6 +3171,7 @@ static struct bpf_test tests[] = { | |||
| 3129 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", | 3171 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", |
| 3130 | .result_unpriv = REJECT, | 3172 | .result_unpriv = REJECT, |
| 3131 | .result = REJECT, | 3173 | .result = REJECT, |
| 3174 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 3132 | }, | 3175 | }, |
| 3133 | { | 3176 | { |
| 3134 | "multiple registers share map_lookup_elem result", | 3177 | "multiple registers share map_lookup_elem result", |
| @@ -3252,6 +3295,7 @@ static struct bpf_test tests[] = { | |||
| 3252 | .result = REJECT, | 3295 | .result = REJECT, |
| 3253 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | 3296 | .errstr_unpriv = "R0 pointer arithmetic prohibited", |
| 3254 | .result_unpriv = REJECT, | 3297 | .result_unpriv = REJECT, |
| 3298 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 3255 | }, | 3299 | }, |
| 3256 | { | 3300 | { |
| 3257 | "constant register |= constant should keep constant type", | 3301 | "constant register |= constant should keep constant type", |
| @@ -3418,6 +3462,26 @@ static struct bpf_test tests[] = { | |||
| 3418 | .prog_type = BPF_PROG_TYPE_LWT_XMIT, | 3462 | .prog_type = BPF_PROG_TYPE_LWT_XMIT, |
| 3419 | }, | 3463 | }, |
| 3420 | { | 3464 | { |
| 3465 | "overlapping checks for direct packet access", | ||
| 3466 | .insns = { | ||
| 3467 | BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, | ||
| 3468 | offsetof(struct __sk_buff, data)), | ||
| 3469 | BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1, | ||
| 3470 | offsetof(struct __sk_buff, data_end)), | ||
| 3471 | BPF_MOV64_REG(BPF_REG_0, BPF_REG_2), | ||
| 3472 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 8), | ||
| 3473 | BPF_JMP_REG(BPF_JGT, BPF_REG_0, BPF_REG_3, 4), | ||
| 3474 | BPF_MOV64_REG(BPF_REG_1, BPF_REG_2), | ||
| 3475 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 6), | ||
| 3476 | BPF_JMP_REG(BPF_JGT, BPF_REG_1, BPF_REG_3, 1), | ||
| 3477 | BPF_LDX_MEM(BPF_H, BPF_REG_0, BPF_REG_2, 6), | ||
| 3478 | BPF_MOV64_IMM(BPF_REG_0, 0), | ||
| 3479 | BPF_EXIT_INSN(), | ||
| 3480 | }, | ||
| 3481 | .result = ACCEPT, | ||
| 3482 | .prog_type = BPF_PROG_TYPE_LWT_XMIT, | ||
| 3483 | }, | ||
| 3484 | { | ||
| 3421 | "invalid access of tc_classid for LWT_IN", | 3485 | "invalid access of tc_classid for LWT_IN", |
| 3422 | .insns = { | 3486 | .insns = { |
| 3423 | BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, | 3487 | BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, |
| @@ -3961,7 +4025,208 @@ static struct bpf_test tests[] = { | |||
| 3961 | .result_unpriv = REJECT, | 4025 | .result_unpriv = REJECT, |
| 3962 | }, | 4026 | }, |
| 3963 | { | 4027 | { |
| 3964 | "map element value (adjusted) is preserved across register spilling", | 4028 | "map element value or null is marked on register spilling", |
| 4029 | .insns = { | ||
| 4030 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4031 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4032 | BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0), | ||
| 4033 | BPF_LD_MAP_FD(BPF_REG_1, 0), | ||
| 4034 | BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem), | ||
| 4035 | BPF_MOV64_REG(BPF_REG_1, BPF_REG_10), | ||
| 4036 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -152), | ||
| 4037 | BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, 0), | ||
| 4038 | BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2), | ||
| 4039 | BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_1, 0), | ||
| 4040 | BPF_ST_MEM(BPF_DW, BPF_REG_3, 0, 42), | ||
| 4041 | BPF_EXIT_INSN(), | ||
| 4042 | }, | ||
| 4043 | .fixup_map2 = { 3 }, | ||
| 4044 | .errstr_unpriv = "R0 leaks addr", | ||
| 4045 | .result = ACCEPT, | ||
| 4046 | .result_unpriv = REJECT, | ||
| 4047 | }, | ||
| 4048 | { | ||
| 4049 | "map element value store of cleared call register", | ||
| 4050 | .insns = { | ||
| 4051 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4052 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4053 | BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0), | ||
| 4054 | BPF_LD_MAP_FD(BPF_REG_1, 0), | ||
| 4055 | BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem), | ||
| 4056 | BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 1), | ||
| 4057 | BPF_STX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, 0), | ||
| 4058 | BPF_EXIT_INSN(), | ||
| 4059 | }, | ||
| 4060 | .fixup_map2 = { 3 }, | ||
| 4061 | .errstr_unpriv = "R1 !read_ok", | ||
| 4062 | .errstr = "R1 !read_ok", | ||
| 4063 | .result = REJECT, | ||
| 4064 | .result_unpriv = REJECT, | ||
| 4065 | }, | ||
| 4066 | { | ||
| 4067 | "map element value with unaligned store", | ||
| 4068 | .insns = { | ||
| 4069 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4070 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4071 | BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0), | ||
| 4072 | BPF_LD_MAP_FD(BPF_REG_1, 0), | ||
| 4073 | BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem), | ||
| 4074 | BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 17), | ||
| 4075 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 3), | ||
| 4076 | BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 42), | ||
| 4077 | BPF_ST_MEM(BPF_DW, BPF_REG_0, 2, 43), | ||
| 4078 | BPF_ST_MEM(BPF_DW, BPF_REG_0, -2, 44), | ||
| 4079 | BPF_MOV64_REG(BPF_REG_8, BPF_REG_0), | ||
| 4080 | BPF_ST_MEM(BPF_DW, BPF_REG_8, 0, 32), | ||
| 4081 | BPF_ST_MEM(BPF_DW, BPF_REG_8, 2, 33), | ||
| 4082 | BPF_ST_MEM(BPF_DW, BPF_REG_8, -2, 34), | ||
| 4083 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_8, 5), | ||
| 4084 | BPF_ST_MEM(BPF_DW, BPF_REG_8, 0, 22), | ||
| 4085 | BPF_ST_MEM(BPF_DW, BPF_REG_8, 4, 23), | ||
| 4086 | BPF_ST_MEM(BPF_DW, BPF_REG_8, -7, 24), | ||
| 4087 | BPF_MOV64_REG(BPF_REG_7, BPF_REG_8), | ||
| 4088 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, 3), | ||
| 4089 | BPF_ST_MEM(BPF_DW, BPF_REG_7, 0, 22), | ||
| 4090 | BPF_ST_MEM(BPF_DW, BPF_REG_7, 4, 23), | ||
| 4091 | BPF_ST_MEM(BPF_DW, BPF_REG_7, -4, 24), | ||
| 4092 | BPF_EXIT_INSN(), | ||
| 4093 | }, | ||
| 4094 | .fixup_map2 = { 3 }, | ||
| 4095 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | ||
| 4096 | .result = ACCEPT, | ||
| 4097 | .result_unpriv = REJECT, | ||
| 4098 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 4099 | }, | ||
| 4100 | { | ||
| 4101 | "map element value with unaligned load", | ||
| 4102 | .insns = { | ||
| 4103 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4104 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4105 | BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0), | ||
| 4106 | BPF_LD_MAP_FD(BPF_REG_1, 0), | ||
| 4107 | BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem), | ||
| 4108 | BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 11), | ||
| 4109 | BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0), | ||
| 4110 | BPF_JMP_IMM(BPF_JGE, BPF_REG_1, MAX_ENTRIES, 9), | ||
| 4111 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 3), | ||
| 4112 | BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0), | ||
| 4113 | BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 2), | ||
| 4114 | BPF_MOV64_REG(BPF_REG_8, BPF_REG_0), | ||
| 4115 | BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_8, 0), | ||
| 4116 | BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_8, 2), | ||
| 4117 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 5), | ||
| 4118 | BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0), | ||
| 4119 | BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 4), | ||
| 4120 | BPF_EXIT_INSN(), | ||
| 4121 | }, | ||
| 4122 | .fixup_map2 = { 3 }, | ||
| 4123 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | ||
| 4124 | .result = ACCEPT, | ||
| 4125 | .result_unpriv = REJECT, | ||
| 4126 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 4127 | }, | ||
| 4128 | { | ||
| 4129 | "map element value illegal alu op, 1", | ||
| 4130 | .insns = { | ||
| 4131 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4132 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4133 | BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0), | ||
| 4134 | BPF_LD_MAP_FD(BPF_REG_1, 0), | ||
| 4135 | BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem), | ||
| 4136 | BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2), | ||
| 4137 | BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 8), | ||
| 4138 | BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22), | ||
| 4139 | BPF_EXIT_INSN(), | ||
| 4140 | }, | ||
| 4141 | .fixup_map2 = { 3 }, | ||
| 4142 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | ||
| 4143 | .errstr = "invalid mem access 'inv'", | ||
| 4144 | .result = REJECT, | ||
| 4145 | .result_unpriv = REJECT, | ||
| 4146 | }, | ||
| 4147 | { | ||
| 4148 | "map element value illegal alu op, 2", | ||
| 4149 | .insns = { | ||
| 4150 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4151 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4152 | BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0), | ||
| 4153 | BPF_LD_MAP_FD(BPF_REG_1, 0), | ||
| 4154 | BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem), | ||
| 4155 | BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2), | ||
| 4156 | BPF_ALU32_IMM(BPF_ADD, BPF_REG_0, 0), | ||
| 4157 | BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22), | ||
| 4158 | BPF_EXIT_INSN(), | ||
| 4159 | }, | ||
| 4160 | .fixup_map2 = { 3 }, | ||
| 4161 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | ||
| 4162 | .errstr = "invalid mem access 'inv'", | ||
| 4163 | .result = REJECT, | ||
| 4164 | .result_unpriv = REJECT, | ||
| 4165 | }, | ||
| 4166 | { | ||
| 4167 | "map element value illegal alu op, 3", | ||
| 4168 | .insns = { | ||
| 4169 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4170 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4171 | BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0), | ||
| 4172 | BPF_LD_MAP_FD(BPF_REG_1, 0), | ||
| 4173 | BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem), | ||
| 4174 | BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2), | ||
| 4175 | BPF_ALU64_IMM(BPF_DIV, BPF_REG_0, 42), | ||
| 4176 | BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22), | ||
| 4177 | BPF_EXIT_INSN(), | ||
| 4178 | }, | ||
| 4179 | .fixup_map2 = { 3 }, | ||
| 4180 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | ||
| 4181 | .errstr = "invalid mem access 'inv'", | ||
| 4182 | .result = REJECT, | ||
| 4183 | .result_unpriv = REJECT, | ||
| 4184 | }, | ||
| 4185 | { | ||
| 4186 | "map element value illegal alu op, 4", | ||
| 4187 | .insns = { | ||
| 4188 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4189 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4190 | BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0), | ||
| 4191 | BPF_LD_MAP_FD(BPF_REG_1, 0), | ||
| 4192 | BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem), | ||
| 4193 | BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2), | ||
| 4194 | BPF_ENDIAN(BPF_FROM_BE, BPF_REG_0, 64), | ||
| 4195 | BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22), | ||
| 4196 | BPF_EXIT_INSN(), | ||
| 4197 | }, | ||
| 4198 | .fixup_map2 = { 3 }, | ||
| 4199 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | ||
| 4200 | .errstr = "invalid mem access 'inv'", | ||
| 4201 | .result = REJECT, | ||
| 4202 | .result_unpriv = REJECT, | ||
| 4203 | }, | ||
| 4204 | { | ||
| 4205 | "map element value illegal alu op, 5", | ||
| 4206 | .insns = { | ||
| 4207 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4208 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4209 | BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0), | ||
| 4210 | BPF_LD_MAP_FD(BPF_REG_1, 0), | ||
| 4211 | BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem), | ||
| 4212 | BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 7), | ||
| 4213 | BPF_MOV64_IMM(BPF_REG_3, 4096), | ||
| 4214 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | ||
| 4215 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | ||
| 4216 | BPF_STX_MEM(BPF_DW, BPF_REG_2, BPF_REG_0, 0), | ||
| 4217 | BPF_STX_XADD(BPF_DW, BPF_REG_2, BPF_REG_3, 0), | ||
| 4218 | BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_2, 0), | ||
| 4219 | BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22), | ||
| 4220 | BPF_EXIT_INSN(), | ||
| 4221 | }, | ||
| 4222 | .fixup_map2 = { 3 }, | ||
| 4223 | .errstr_unpriv = "R0 invalid mem access 'inv'", | ||
| 4224 | .errstr = "R0 invalid mem access 'inv'", | ||
| 4225 | .result = REJECT, | ||
| 4226 | .result_unpriv = REJECT, | ||
| 4227 | }, | ||
| 4228 | { | ||
| 4229 | "map element value is preserved across register spilling", | ||
| 3965 | .insns = { | 4230 | .insns = { |
| 3966 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), | 4231 | BPF_MOV64_REG(BPF_REG_2, BPF_REG_10), |
| 3967 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), | 4232 | BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8), |
| @@ -3983,6 +4248,7 @@ static struct bpf_test tests[] = { | |||
| 3983 | .errstr_unpriv = "R0 pointer arithmetic prohibited", | 4248 | .errstr_unpriv = "R0 pointer arithmetic prohibited", |
| 3984 | .result = ACCEPT, | 4249 | .result = ACCEPT, |
| 3985 | .result_unpriv = REJECT, | 4250 | .result_unpriv = REJECT, |
| 4251 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 3986 | }, | 4252 | }, |
| 3987 | { | 4253 | { |
| 3988 | "helper access to variable memory: stack, bitwise AND + JMP, correct bounds", | 4254 | "helper access to variable memory: stack, bitwise AND + JMP, correct bounds", |
| @@ -4421,6 +4687,7 @@ static struct bpf_test tests[] = { | |||
| 4421 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", | 4687 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", |
| 4422 | .result = REJECT, | 4688 | .result = REJECT, |
| 4423 | .result_unpriv = REJECT, | 4689 | .result_unpriv = REJECT, |
| 4690 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 4424 | }, | 4691 | }, |
| 4425 | { | 4692 | { |
| 4426 | "invalid range check", | 4693 | "invalid range check", |
| @@ -4452,6 +4719,7 @@ static struct bpf_test tests[] = { | |||
| 4452 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", | 4719 | .errstr = "R0 min value is negative, either use unsigned index or do a if (index >=0) check.", |
| 4453 | .result = REJECT, | 4720 | .result = REJECT, |
| 4454 | .result_unpriv = REJECT, | 4721 | .result_unpriv = REJECT, |
| 4722 | .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, | ||
| 4455 | } | 4723 | } |
| 4456 | }; | 4724 | }; |
| 4457 | 4725 | ||
| @@ -4530,11 +4798,11 @@ static void do_test_fixup(struct bpf_test *test, struct bpf_insn *prog, | |||
| 4530 | static void do_test_single(struct bpf_test *test, bool unpriv, | 4798 | static void do_test_single(struct bpf_test *test, bool unpriv, |
| 4531 | int *passes, int *errors) | 4799 | int *passes, int *errors) |
| 4532 | { | 4800 | { |
| 4801 | int fd_prog, expected_ret, reject_from_alignment; | ||
| 4533 | struct bpf_insn *prog = test->insns; | 4802 | struct bpf_insn *prog = test->insns; |
| 4534 | int prog_len = probe_filter_length(prog); | 4803 | int prog_len = probe_filter_length(prog); |
| 4535 | int prog_type = test->prog_type; | 4804 | int prog_type = test->prog_type; |
| 4536 | int fd_f1 = -1, fd_f2 = -1, fd_f3 = -1; | 4805 | int fd_f1 = -1, fd_f2 = -1, fd_f3 = -1; |
| 4537 | int fd_prog, expected_ret; | ||
| 4538 | const char *expected_err; | 4806 | const char *expected_err; |
| 4539 | 4807 | ||
| 4540 | do_test_fixup(test, prog, &fd_f1, &fd_f2, &fd_f3); | 4808 | do_test_fixup(test, prog, &fd_f1, &fd_f2, &fd_f3); |
| @@ -4547,8 +4815,19 @@ static void do_test_single(struct bpf_test *test, bool unpriv, | |||
| 4547 | test->result_unpriv : test->result; | 4815 | test->result_unpriv : test->result; |
| 4548 | expected_err = unpriv && test->errstr_unpriv ? | 4816 | expected_err = unpriv && test->errstr_unpriv ? |
| 4549 | test->errstr_unpriv : test->errstr; | 4817 | test->errstr_unpriv : test->errstr; |
| 4818 | |||
| 4819 | reject_from_alignment = fd_prog < 0 && | ||
| 4820 | (test->flags & F_NEEDS_EFFICIENT_UNALIGNED_ACCESS) && | ||
| 4821 | strstr(bpf_vlog, "Unknown alignment."); | ||
| 4822 | #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS | ||
| 4823 | if (reject_from_alignment) { | ||
| 4824 | printf("FAIL\nFailed due to alignment despite having efficient unaligned access: '%s'!\n", | ||
| 4825 | strerror(errno)); | ||
| 4826 | goto fail_log; | ||
| 4827 | } | ||
| 4828 | #endif | ||
| 4550 | if (expected_ret == ACCEPT) { | 4829 | if (expected_ret == ACCEPT) { |
| 4551 | if (fd_prog < 0) { | 4830 | if (fd_prog < 0 && !reject_from_alignment) { |
| 4552 | printf("FAIL\nFailed to load prog '%s'!\n", | 4831 | printf("FAIL\nFailed to load prog '%s'!\n", |
| 4553 | strerror(errno)); | 4832 | strerror(errno)); |
| 4554 | goto fail_log; | 4833 | goto fail_log; |
| @@ -4558,14 +4837,15 @@ static void do_test_single(struct bpf_test *test, bool unpriv, | |||
| 4558 | printf("FAIL\nUnexpected success to load!\n"); | 4837 | printf("FAIL\nUnexpected success to load!\n"); |
| 4559 | goto fail_log; | 4838 | goto fail_log; |
| 4560 | } | 4839 | } |
| 4561 | if (!strstr(bpf_vlog, expected_err)) { | 4840 | if (!strstr(bpf_vlog, expected_err) && !reject_from_alignment) { |
| 4562 | printf("FAIL\nUnexpected error message!\n"); | 4841 | printf("FAIL\nUnexpected error message!\n"); |
| 4563 | goto fail_log; | 4842 | goto fail_log; |
| 4564 | } | 4843 | } |
| 4565 | } | 4844 | } |
| 4566 | 4845 | ||
| 4567 | (*passes)++; | 4846 | (*passes)++; |
| 4568 | printf("OK\n"); | 4847 | printf("OK%s\n", reject_from_alignment ? |
| 4848 | " (NOTE: reject due to unknown alignment)" : ""); | ||
| 4569 | close_fds: | 4849 | close_fds: |
| 4570 | close(fd_prog); | 4850 | close(fd_prog); |
| 4571 | close(fd_f1); | 4851 | close(fd_f1); |
diff --git a/tools/testing/selftests/powerpc/Makefile b/tools/testing/selftests/powerpc/Makefile index 1c5d0575802e..bf13fc2297aa 100644 --- a/tools/testing/selftests/powerpc/Makefile +++ b/tools/testing/selftests/powerpc/Makefile | |||
| @@ -34,34 +34,34 @@ endif | |||
| 34 | all: $(SUB_DIRS) | 34 | all: $(SUB_DIRS) |
| 35 | 35 | ||
| 36 | $(SUB_DIRS): | 36 | $(SUB_DIRS): |
| 37 | BUILD_TARGET=$$OUTPUT/$@; mkdir -p $$BUILD_TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -k -C $@ all | 37 | BUILD_TARGET=$(OUTPUT)/$@; mkdir -p $$BUILD_TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -k -C $@ all |
| 38 | 38 | ||
| 39 | include ../lib.mk | 39 | include ../lib.mk |
| 40 | 40 | ||
| 41 | override define RUN_TESTS | 41 | override define RUN_TESTS |
| 42 | @for TARGET in $(SUB_DIRS); do \ | 42 | @for TARGET in $(SUB_DIRS); do \ |
| 43 | BUILD_TARGET=$$OUTPUT/$$TARGET; \ | 43 | BUILD_TARGET=$(OUTPUT)/$$TARGET; \ |
| 44 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\ | 44 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\ |
| 45 | done; | 45 | done; |
| 46 | endef | 46 | endef |
| 47 | 47 | ||
| 48 | override define INSTALL_RULE | 48 | override define INSTALL_RULE |
| 49 | @for TARGET in $(SUB_DIRS); do \ | 49 | @for TARGET in $(SUB_DIRS); do \ |
| 50 | BUILD_TARGET=$$OUTPUT/$$TARGET; \ | 50 | BUILD_TARGET=$(OUTPUT)/$$TARGET; \ |
| 51 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install;\ | 51 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install;\ |
| 52 | done; | 52 | done; |
| 53 | endef | 53 | endef |
| 54 | 54 | ||
| 55 | override define EMIT_TESTS | 55 | override define EMIT_TESTS |
| 56 | @for TARGET in $(SUB_DIRS); do \ | 56 | @for TARGET in $(SUB_DIRS); do \ |
| 57 | BUILD_TARGET=$$OUTPUT/$$TARGET; \ | 57 | BUILD_TARGET=$(OUTPUT)/$$TARGET; \ |
| 58 | $(MAKE) OUTPUT=$$BUILD_TARGET -s -C $$TARGET emit_tests;\ | 58 | $(MAKE) OUTPUT=$$BUILD_TARGET -s -C $$TARGET emit_tests;\ |
| 59 | done; | 59 | done; |
| 60 | endef | 60 | endef |
| 61 | 61 | ||
| 62 | clean: | 62 | clean: |
| 63 | @for TARGET in $(SUB_DIRS); do \ | 63 | @for TARGET in $(SUB_DIRS); do \ |
| 64 | BUILD_TARGET=$$OUTPUT/$$TARGET; \ | 64 | BUILD_TARGET=$(OUTPUT)/$$TARGET; \ |
| 65 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean; \ | 65 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean; \ |
| 66 | done; | 66 | done; |
| 67 | rm -f tags | 67 | rm -f tags |
diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c index 276139a24e6f..702f8108608d 100644 --- a/virt/kvm/arm/vgic/vgic-init.c +++ b/virt/kvm/arm/vgic/vgic-init.c | |||
| @@ -392,6 +392,25 @@ static irqreturn_t vgic_maintenance_handler(int irq, void *data) | |||
| 392 | } | 392 | } |
| 393 | 393 | ||
| 394 | /** | 394 | /** |
| 395 | * kvm_vgic_init_cpu_hardware - initialize the GIC VE hardware | ||
| 396 | * | ||
| 397 | * For a specific CPU, initialize the GIC VE hardware. | ||
| 398 | */ | ||
| 399 | void kvm_vgic_init_cpu_hardware(void) | ||
| 400 | { | ||
| 401 | BUG_ON(preemptible()); | ||
| 402 | |||
| 403 | /* | ||
| 404 | * We want to make sure the list registers start out clear so that we | ||
| 405 | * only have the program the used registers. | ||
| 406 | */ | ||
| 407 | if (kvm_vgic_global_state.type == VGIC_V2) | ||
| 408 | vgic_v2_init_lrs(); | ||
| 409 | else | ||
| 410 | kvm_call_hyp(__vgic_v3_init_lrs); | ||
| 411 | } | ||
| 412 | |||
| 413 | /** | ||
| 395 | * kvm_vgic_hyp_init: populates the kvm_vgic_global_state variable | 414 | * kvm_vgic_hyp_init: populates the kvm_vgic_global_state variable |
| 396 | * according to the host GIC model. Accordingly calls either | 415 | * according to the host GIC model. Accordingly calls either |
| 397 | * vgic_v2/v3_probe which registers the KVM_DEVICE that can be | 416 | * vgic_v2/v3_probe which registers the KVM_DEVICE that can be |
diff --git a/virt/kvm/arm/vgic/vgic-mmio-v2.c b/virt/kvm/arm/vgic/vgic-mmio-v2.c index a3ad7ff95c9b..0a4283ed9aa7 100644 --- a/virt/kvm/arm/vgic/vgic-mmio-v2.c +++ b/virt/kvm/arm/vgic/vgic-mmio-v2.c | |||
| @@ -229,7 +229,15 @@ static unsigned long vgic_mmio_read_vcpuif(struct kvm_vcpu *vcpu, | |||
| 229 | val = vmcr.ctlr; | 229 | val = vmcr.ctlr; |
| 230 | break; | 230 | break; |
| 231 | case GIC_CPU_PRIMASK: | 231 | case GIC_CPU_PRIMASK: |
| 232 | val = vmcr.pmr; | 232 | /* |
| 233 | * Our KVM_DEV_TYPE_ARM_VGIC_V2 device ABI exports the | ||
| 234 | * the PMR field as GICH_VMCR.VMPriMask rather than | ||
| 235 | * GICC_PMR.Priority, so we expose the upper five bits of | ||
| 236 | * priority mask to userspace using the lower bits in the | ||
| 237 | * unsigned long. | ||
| 238 | */ | ||
| 239 | val = (vmcr.pmr & GICV_PMR_PRIORITY_MASK) >> | ||
| 240 | GICV_PMR_PRIORITY_SHIFT; | ||
| 233 | break; | 241 | break; |
| 234 | case GIC_CPU_BINPOINT: | 242 | case GIC_CPU_BINPOINT: |
| 235 | val = vmcr.bpr; | 243 | val = vmcr.bpr; |
| @@ -262,7 +270,15 @@ static void vgic_mmio_write_vcpuif(struct kvm_vcpu *vcpu, | |||
| 262 | vmcr.ctlr = val; | 270 | vmcr.ctlr = val; |
| 263 | break; | 271 | break; |
| 264 | case GIC_CPU_PRIMASK: | 272 | case GIC_CPU_PRIMASK: |
| 265 | vmcr.pmr = val; | 273 | /* |
| 274 | * Our KVM_DEV_TYPE_ARM_VGIC_V2 device ABI exports the | ||
| 275 | * the PMR field as GICH_VMCR.VMPriMask rather than | ||
| 276 | * GICC_PMR.Priority, so we expose the upper five bits of | ||
| 277 | * priority mask to userspace using the lower bits in the | ||
| 278 | * unsigned long. | ||
| 279 | */ | ||
| 280 | vmcr.pmr = (val << GICV_PMR_PRIORITY_SHIFT) & | ||
| 281 | GICV_PMR_PRIORITY_MASK; | ||
| 266 | break; | 282 | break; |
| 267 | case GIC_CPU_BINPOINT: | 283 | case GIC_CPU_BINPOINT: |
| 268 | vmcr.bpr = val; | 284 | vmcr.bpr = val; |
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c index b834ecdf3225..b637d9c7afe3 100644 --- a/virt/kvm/arm/vgic/vgic-v2.c +++ b/virt/kvm/arm/vgic/vgic-v2.c | |||
| @@ -36,6 +36,21 @@ static unsigned long *u64_to_bitmask(u64 *val) | |||
| 36 | return (unsigned long *)val; | 36 | return (unsigned long *)val; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | static inline void vgic_v2_write_lr(int lr, u32 val) | ||
| 40 | { | ||
| 41 | void __iomem *base = kvm_vgic_global_state.vctrl_base; | ||
| 42 | |||
| 43 | writel_relaxed(val, base + GICH_LR0 + (lr * 4)); | ||
| 44 | } | ||
| 45 | |||
| 46 | void vgic_v2_init_lrs(void) | ||
| 47 | { | ||
| 48 | int i; | ||
| 49 | |||
| 50 | for (i = 0; i < kvm_vgic_global_state.nr_lr; i++) | ||
| 51 | vgic_v2_write_lr(i, 0); | ||
| 52 | } | ||
| 53 | |||
| 39 | void vgic_v2_process_maintenance(struct kvm_vcpu *vcpu) | 54 | void vgic_v2_process_maintenance(struct kvm_vcpu *vcpu) |
| 40 | { | 55 | { |
| 41 | struct vgic_v2_cpu_if *cpuif = &vcpu->arch.vgic_cpu.vgic_v2; | 56 | struct vgic_v2_cpu_if *cpuif = &vcpu->arch.vgic_cpu.vgic_v2; |
| @@ -191,8 +206,8 @@ void vgic_v2_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcrp) | |||
| 191 | GICH_VMCR_ALIAS_BINPOINT_MASK; | 206 | GICH_VMCR_ALIAS_BINPOINT_MASK; |
| 192 | vmcr |= (vmcrp->bpr << GICH_VMCR_BINPOINT_SHIFT) & | 207 | vmcr |= (vmcrp->bpr << GICH_VMCR_BINPOINT_SHIFT) & |
| 193 | GICH_VMCR_BINPOINT_MASK; | 208 | GICH_VMCR_BINPOINT_MASK; |
| 194 | vmcr |= (vmcrp->pmr << GICH_VMCR_PRIMASK_SHIFT) & | 209 | vmcr |= ((vmcrp->pmr >> GICV_PMR_PRIORITY_SHIFT) << |
| 195 | GICH_VMCR_PRIMASK_MASK; | 210 | GICH_VMCR_PRIMASK_SHIFT) & GICH_VMCR_PRIMASK_MASK; |
| 196 | 211 | ||
| 197 | vcpu->arch.vgic_cpu.vgic_v2.vgic_vmcr = vmcr; | 212 | vcpu->arch.vgic_cpu.vgic_v2.vgic_vmcr = vmcr; |
| 198 | } | 213 | } |
| @@ -207,8 +222,8 @@ void vgic_v2_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcrp) | |||
| 207 | GICH_VMCR_ALIAS_BINPOINT_SHIFT; | 222 | GICH_VMCR_ALIAS_BINPOINT_SHIFT; |
| 208 | vmcrp->bpr = (vmcr & GICH_VMCR_BINPOINT_MASK) >> | 223 | vmcrp->bpr = (vmcr & GICH_VMCR_BINPOINT_MASK) >> |
| 209 | GICH_VMCR_BINPOINT_SHIFT; | 224 | GICH_VMCR_BINPOINT_SHIFT; |
| 210 | vmcrp->pmr = (vmcr & GICH_VMCR_PRIMASK_MASK) >> | 225 | vmcrp->pmr = ((vmcr & GICH_VMCR_PRIMASK_MASK) >> |
| 211 | GICH_VMCR_PRIMASK_SHIFT; | 226 | GICH_VMCR_PRIMASK_SHIFT) << GICV_PMR_PRIORITY_SHIFT; |
| 212 | } | 227 | } |
| 213 | 228 | ||
| 214 | void vgic_v2_enable(struct kvm_vcpu *vcpu) | 229 | void vgic_v2_enable(struct kvm_vcpu *vcpu) |
diff --git a/virt/kvm/arm/vgic/vgic.h b/virt/kvm/arm/vgic/vgic.h index db28f7cadab2..6cf557e9f718 100644 --- a/virt/kvm/arm/vgic/vgic.h +++ b/virt/kvm/arm/vgic/vgic.h | |||
| @@ -81,11 +81,18 @@ static inline bool irq_is_pending(struct vgic_irq *irq) | |||
| 81 | return irq->pending_latch || irq->line_level; | 81 | return irq->pending_latch || irq->line_level; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | /* | ||
| 85 | * This struct provides an intermediate representation of the fields contained | ||
| 86 | * in the GICH_VMCR and ICH_VMCR registers, such that code exporting the GIC | ||
| 87 | * state to userspace can generate either GICv2 or GICv3 CPU interface | ||
| 88 | * registers regardless of the hardware backed GIC used. | ||
| 89 | */ | ||
| 84 | struct vgic_vmcr { | 90 | struct vgic_vmcr { |
| 85 | u32 ctlr; | 91 | u32 ctlr; |
| 86 | u32 abpr; | 92 | u32 abpr; |
| 87 | u32 bpr; | 93 | u32 bpr; |
| 88 | u32 pmr; | 94 | u32 pmr; /* Priority mask field in the GICC_PMR and |
| 95 | * ICC_PMR_EL1 priority field format */ | ||
| 89 | /* Below member variable are valid only for GICv3 */ | 96 | /* Below member variable are valid only for GICv3 */ |
| 90 | u32 grpen0; | 97 | u32 grpen0; |
| 91 | u32 grpen1; | 98 | u32 grpen1; |
| @@ -130,6 +137,8 @@ int vgic_v2_map_resources(struct kvm *kvm); | |||
| 130 | int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address, | 137 | int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address, |
| 131 | enum vgic_type); | 138 | enum vgic_type); |
| 132 | 139 | ||
| 140 | void vgic_v2_init_lrs(void); | ||
| 141 | |||
| 133 | static inline void vgic_get_irq_kref(struct vgic_irq *irq) | 142 | static inline void vgic_get_irq_kref(struct vgic_irq *irq) |
| 134 | { | 143 | { |
| 135 | if (irq->intid < VGIC_MIN_LPI) | 144 | if (irq->intid < VGIC_MIN_LPI) |
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index a29786dd9522..4d28a9ddbee0 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c | |||
| @@ -870,7 +870,8 @@ kvm_deassign_ioeventfd_idx(struct kvm *kvm, enum kvm_bus bus_idx, | |||
| 870 | continue; | 870 | continue; |
| 871 | 871 | ||
| 872 | kvm_io_bus_unregister_dev(kvm, bus_idx, &p->dev); | 872 | kvm_io_bus_unregister_dev(kvm, bus_idx, &p->dev); |
| 873 | kvm->buses[bus_idx]->ioeventfd_count--; | 873 | if (kvm->buses[bus_idx]) |
| 874 | kvm->buses[bus_idx]->ioeventfd_count--; | ||
| 874 | ioeventfd_release(p); | 875 | ioeventfd_release(p); |
| 875 | ret = 0; | 876 | ret = 0; |
| 876 | break; | 877 | break; |
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a17d78759727..88257b311cb5 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
| @@ -727,8 +727,11 @@ static void kvm_destroy_vm(struct kvm *kvm) | |||
| 727 | list_del(&kvm->vm_list); | 727 | list_del(&kvm->vm_list); |
| 728 | spin_unlock(&kvm_lock); | 728 | spin_unlock(&kvm_lock); |
| 729 | kvm_free_irq_routing(kvm); | 729 | kvm_free_irq_routing(kvm); |
| 730 | for (i = 0; i < KVM_NR_BUSES; i++) | 730 | for (i = 0; i < KVM_NR_BUSES; i++) { |
| 731 | kvm_io_bus_destroy(kvm->buses[i]); | 731 | if (kvm->buses[i]) |
| 732 | kvm_io_bus_destroy(kvm->buses[i]); | ||
| 733 | kvm->buses[i] = NULL; | ||
| 734 | } | ||
| 732 | kvm_coalesced_mmio_free(kvm); | 735 | kvm_coalesced_mmio_free(kvm); |
| 733 | #if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) | 736 | #if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) |
| 734 | mmu_notifier_unregister(&kvm->mmu_notifier, kvm->mm); | 737 | mmu_notifier_unregister(&kvm->mmu_notifier, kvm->mm); |
| @@ -1062,7 +1065,7 @@ int __kvm_set_memory_region(struct kvm *kvm, | |||
| 1062 | * changes) is disallowed above, so any other attribute changes getting | 1065 | * changes) is disallowed above, so any other attribute changes getting |
| 1063 | * here can be skipped. | 1066 | * here can be skipped. |
| 1064 | */ | 1067 | */ |
| 1065 | if ((change == KVM_MR_CREATE) || (change == KVM_MR_MOVE)) { | 1068 | if (as_id == 0 && (change == KVM_MR_CREATE || change == KVM_MR_MOVE)) { |
| 1066 | r = kvm_iommu_map_pages(kvm, &new); | 1069 | r = kvm_iommu_map_pages(kvm, &new); |
| 1067 | return r; | 1070 | return r; |
| 1068 | } | 1071 | } |
| @@ -3474,6 +3477,8 @@ int kvm_io_bus_write(struct kvm_vcpu *vcpu, enum kvm_bus bus_idx, gpa_t addr, | |||
| 3474 | }; | 3477 | }; |
| 3475 | 3478 | ||
| 3476 | bus = srcu_dereference(vcpu->kvm->buses[bus_idx], &vcpu->kvm->srcu); | 3479 | bus = srcu_dereference(vcpu->kvm->buses[bus_idx], &vcpu->kvm->srcu); |
| 3480 | if (!bus) | ||
| 3481 | return -ENOMEM; | ||
| 3477 | r = __kvm_io_bus_write(vcpu, bus, &range, val); | 3482 | r = __kvm_io_bus_write(vcpu, bus, &range, val); |
| 3478 | return r < 0 ? r : 0; | 3483 | return r < 0 ? r : 0; |
| 3479 | } | 3484 | } |
| @@ -3491,6 +3496,8 @@ int kvm_io_bus_write_cookie(struct kvm_vcpu *vcpu, enum kvm_bus bus_idx, | |||
| 3491 | }; | 3496 | }; |
| 3492 | 3497 | ||
| 3493 | bus = srcu_dereference(vcpu->kvm->buses[bus_idx], &vcpu->kvm->srcu); | 3498 | bus = srcu_dereference(vcpu->kvm->buses[bus_idx], &vcpu->kvm->srcu); |
| 3499 | if (!bus) | ||
| 3500 | return -ENOMEM; | ||
| 3494 | 3501 | ||
| 3495 | /* First try the device referenced by cookie. */ | 3502 | /* First try the device referenced by cookie. */ |
| 3496 | if ((cookie >= 0) && (cookie < bus->dev_count) && | 3503 | if ((cookie >= 0) && (cookie < bus->dev_count) && |
| @@ -3541,6 +3548,8 @@ int kvm_io_bus_read(struct kvm_vcpu *vcpu, enum kvm_bus bus_idx, gpa_t addr, | |||
| 3541 | }; | 3548 | }; |
| 3542 | 3549 | ||
| 3543 | bus = srcu_dereference(vcpu->kvm->buses[bus_idx], &vcpu->kvm->srcu); | 3550 | bus = srcu_dereference(vcpu->kvm->buses[bus_idx], &vcpu->kvm->srcu); |
| 3551 | if (!bus) | ||
| 3552 | return -ENOMEM; | ||
| 3544 | r = __kvm_io_bus_read(vcpu, bus, &range, val); | 3553 | r = __kvm_io_bus_read(vcpu, bus, &range, val); |
| 3545 | return r < 0 ? r : 0; | 3554 | return r < 0 ? r : 0; |
| 3546 | } | 3555 | } |
| @@ -3553,6 +3562,9 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, | |||
| 3553 | struct kvm_io_bus *new_bus, *bus; | 3562 | struct kvm_io_bus *new_bus, *bus; |
| 3554 | 3563 | ||
| 3555 | bus = kvm->buses[bus_idx]; | 3564 | bus = kvm->buses[bus_idx]; |
| 3565 | if (!bus) | ||
| 3566 | return -ENOMEM; | ||
| 3567 | |||
| 3556 | /* exclude ioeventfd which is limited by maximum fd */ | 3568 | /* exclude ioeventfd which is limited by maximum fd */ |
| 3557 | if (bus->dev_count - bus->ioeventfd_count > NR_IOBUS_DEVS - 1) | 3569 | if (bus->dev_count - bus->ioeventfd_count > NR_IOBUS_DEVS - 1) |
| 3558 | return -ENOSPC; | 3570 | return -ENOSPC; |
| @@ -3572,37 +3584,41 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, | |||
| 3572 | } | 3584 | } |
| 3573 | 3585 | ||
| 3574 | /* Caller must hold slots_lock. */ | 3586 | /* Caller must hold slots_lock. */ |
| 3575 | int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, | 3587 | void kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, |
| 3576 | struct kvm_io_device *dev) | 3588 | struct kvm_io_device *dev) |
| 3577 | { | 3589 | { |
| 3578 | int i, r; | 3590 | int i; |
| 3579 | struct kvm_io_bus *new_bus, *bus; | 3591 | struct kvm_io_bus *new_bus, *bus; |
| 3580 | 3592 | ||
| 3581 | bus = kvm->buses[bus_idx]; | 3593 | bus = kvm->buses[bus_idx]; |
| 3582 | r = -ENOENT; | 3594 | if (!bus) |
| 3595 | return; | ||
| 3596 | |||
| 3583 | for (i = 0; i < bus->dev_count; i++) | 3597 | for (i = 0; i < bus->dev_count; i++) |
| 3584 | if (bus->range[i].dev == dev) { | 3598 | if (bus->range[i].dev == dev) { |
| 3585 | r = 0; | ||
| 3586 | break; | 3599 | break; |
| 3587 | } | 3600 | } |
| 3588 | 3601 | ||
| 3589 | if (r) | 3602 | if (i == bus->dev_count) |
| 3590 | return r; | 3603 | return; |
| 3591 | 3604 | ||
| 3592 | new_bus = kmalloc(sizeof(*bus) + ((bus->dev_count - 1) * | 3605 | new_bus = kmalloc(sizeof(*bus) + ((bus->dev_count - 1) * |
| 3593 | sizeof(struct kvm_io_range)), GFP_KERNEL); | 3606 | sizeof(struct kvm_io_range)), GFP_KERNEL); |
| 3594 | if (!new_bus) | 3607 | if (!new_bus) { |
| 3595 | return -ENOMEM; | 3608 | pr_err("kvm: failed to shrink bus, removing it completely\n"); |
| 3609 | goto broken; | ||
| 3610 | } | ||
| 3596 | 3611 | ||
| 3597 | memcpy(new_bus, bus, sizeof(*bus) + i * sizeof(struct kvm_io_range)); | 3612 | memcpy(new_bus, bus, sizeof(*bus) + i * sizeof(struct kvm_io_range)); |
| 3598 | new_bus->dev_count--; | 3613 | new_bus->dev_count--; |
| 3599 | memcpy(new_bus->range + i, bus->range + i + 1, | 3614 | memcpy(new_bus->range + i, bus->range + i + 1, |
| 3600 | (new_bus->dev_count - i) * sizeof(struct kvm_io_range)); | 3615 | (new_bus->dev_count - i) * sizeof(struct kvm_io_range)); |
| 3601 | 3616 | ||
| 3617 | broken: | ||
| 3602 | rcu_assign_pointer(kvm->buses[bus_idx], new_bus); | 3618 | rcu_assign_pointer(kvm->buses[bus_idx], new_bus); |
| 3603 | synchronize_srcu_expedited(&kvm->srcu); | 3619 | synchronize_srcu_expedited(&kvm->srcu); |
| 3604 | kfree(bus); | 3620 | kfree(bus); |
| 3605 | return r; | 3621 | return; |
| 3606 | } | 3622 | } |
| 3607 | 3623 | ||
| 3608 | struct kvm_io_device *kvm_io_bus_get_dev(struct kvm *kvm, enum kvm_bus bus_idx, | 3624 | struct kvm_io_device *kvm_io_bus_get_dev(struct kvm *kvm, enum kvm_bus bus_idx, |
| @@ -3615,6 +3631,8 @@ struct kvm_io_device *kvm_io_bus_get_dev(struct kvm *kvm, enum kvm_bus bus_idx, | |||
| 3615 | srcu_idx = srcu_read_lock(&kvm->srcu); | 3631 | srcu_idx = srcu_read_lock(&kvm->srcu); |
| 3616 | 3632 | ||
| 3617 | bus = srcu_dereference(kvm->buses[bus_idx], &kvm->srcu); | 3633 | bus = srcu_dereference(kvm->buses[bus_idx], &kvm->srcu); |
| 3634 | if (!bus) | ||
| 3635 | goto out_unlock; | ||
| 3618 | 3636 | ||
| 3619 | dev_idx = kvm_io_bus_get_first_dev(bus, addr, 1); | 3637 | dev_idx = kvm_io_bus_get_first_dev(bus, addr, 1); |
| 3620 | if (dev_idx < 0) | 3638 | if (dev_idx < 0) |