Linux 4.14.136
Greg KH
maintainerI'm announcing the release of the 4.14.136 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/serial/mvebu-uart.txt | 2 Makefile | 2 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 arch/arm64/include/asm/compat.h | 1 arch/sh/boards/Kconfig | 14 drivers/android/binder.c | 16 drivers/bluetooth/hci_ath.c | 3 drivers/bluetooth/hci_bcm.c | 3 drivers/bluetooth/hci_intel.c | 3 drivers/bluetooth/hci_ldisc.c | 13 drivers/bluetooth/hci_mrvl.c | 3 drivers/bluetooth/hci_uart.h | 1 drivers/i2c/busses/i2c-qup.c | 2 drivers/iommu/intel-iommu.c | 2 drivers/iommu/iova.c | 18 drivers/isdn/hardware/mISDN/hfcsusb.c | 3 drivers/media/radio/radio-raremono.c | 30 + drivers/media/usb/au0828/au0828-core.c | 12 drivers/media/usb/cpia2/cpia2_usb.c | 3 drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 6 drivers/media/usb/pvrusb2/pvrusb2-std.c | 2 drivers/net/wireless/ath/ath10k/usb.c | 2 drivers/pps/pps.c | 8 fs/ceph/caps.c | 7 fs/exec.c | 2 fs/nfs/client.c | 4 fs/nfs/dir.c | 295 ++++++++-------- fs/nfs/nfs4proc.c | 15 include/linux/iova.h | 6 include/linux/sched/numa_balancing.h | 4 include/net/af_vsock.h | 3 kernel/fork.c | 2 kernel/sched/fair.c | 24 + net/ipv4/ip_tunnel_core.c | 9 net/vmw_vsock/af_vsock.c | 84 +--- net/vmw_vsock/hyperv_transport.c | 118 ++++-- net/vmw_vsock/virtio_transport.c | 2 net/vmw_vsock/virtio_transport_common.c | 22 - net/vmw_vsock/vmci_transport.c | 34 - net/vmw_vsock/vmci_transport_notify.c | 2 net/vmw_vsock/vmci_transport_notify_qstate.c | 2 42 files changed, 477 insertions(+), 313 deletions(-)
Abhishek Sahu (1):
i2c: qup: fixed releasing dma without flush operation completion
Andrey Konovalov (1):
media: pvrusb2: use a different format for warnings
Benjamin Coddington (1):
NFS: Cleanup if nfs_match_client is interrupted
Dmitry Safonov (1):
iommu/vt-d: Don't queue_iova() if there is no flush queue
Fabio Estevam (1):
ath10k: Change the warning message string
Greg Kroah-Hartman (1):
Linux 4.14.136
Jann Horn (1):
sched/fair: Don't free p->numa_faults with concurrent readers
Joerg Roedel (1):
iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA
Luke Nowakowski-Krijger (1):
media: radio-raremono: change devm_k*alloc to k*alloc
Miroslav Lichvar (1):
drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
Oliver Neukum (1):
media: cpia2_usb: first wake up, then free in disconnect
Phong Tran (1):
ISDN: hfcsusb: checking idx of ep configuration
Sean Young (1):
media: au0828: fix null dereference in error path
Stefan Hajnoczi (1):
VSOCK: use TCP state constants for sk_state
Sunil Muthuswamy (2):
vsock: correct removal of socket from the list
hv_sock: Add support for delayed close
Todd Kjos (1):
binder: fix possible UAF when freeing buffer
Trond Myklebust (3):
NFS: Fix dentry revalidation on NFSv4 lookup
NFS: Refactor nfs_lookup_revalidate()
NFSv4: Fix lookup revalidate of regular files
Vladis Dronov (1):
Bluetooth: hci_uart: check for missing tty operations
Will Deacon (1):
arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ
Xin Long (1):
ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL
Yan, Zheng (1):
ceph: hold i_ceph_lock when removing caps for freeing inode
Yoshinori Sato (1):
Fix allyesconfig output.
allen yan (1):
arm64: dts: marvell: Fix A37xx UART0 register size
Greg KH
maintainerDocumentation/devicetree/bindings/serial/mvebu-uart.txt +1 -1
@@ -8,6 +8,6 @@ Required properties: Example: serial@12000 { compatible = "marvell,armada-3700-uart"; - reg = <0x12000 0x400>; + reg = <0x12000 0x200>; interrupts = <43>; };
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 135 +SUBLEVEL = 136 EXTRAVERSION = NAME = Petit Gorille
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +1 -1
@@ -134,7 +134,7 @@ uart0: serial@12000 { compatible = "marvell,armada-3700-uart"; - reg = <0x12000 0x400>; + reg = <0x12000 0x200>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; };
arch/arm64/include/asm/compat.h +1 -0
@@ -234,6 +234,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) }#define compat_user_stack_pointer () (user_stack_pointer(task_pt_regs(current))) +#define COMPAT_MINSIGSTKSZ 2048static inline void __user *arch_compat_alloc_user_space (long len) {
arch/sh/boards/Kconfig +3 -11
@@ -8,27 +8,19 @@ config SH_ALPHA_BOARD bool config SH_DEVICE_TREE - bool "Board Described by Device Tree" + bool select OF select OF_EARLY_FLATTREE select TIMER_OF select COMMON_CLK select GENERIC_CALIBRATE_DELAY - help - Select Board Described by Device Tree to build a kernel that - does not hard-code any board-specific knowledge but instead uses - a device tree blob provided by the boot-loader. You must enable - drivers for any hardware you want to use separately. At this - time, only boards based on the open-hardware J-Core processors - have sufficient driver coverage to use this option; do not - select it if you are using original SuperH hardware. config SH_JCORE_SOC bool "J-Core SoC" - depends on SH_DEVICE_TREE && (CPU_SH2 || CPU_J2) + select SH_DEVICE_TREE select CLKSRC_JCORE_PIT select JCORE_AIC - default y if CPU_J2 + depends on CPU_J2 help Select this option to include drivers core components of the J-Core SoC, including interrupt controllers and timers.
drivers/android/binder.c +14 -2
@@ -1903,8 +1903,18 @@ static struct binder_thread *binder_get_txn_from_and_acq_inner(static void binder_free_transaction (struct binder_transaction *t) { -if (t->buffer) - t->buffer->transaction =NULL ; +struct binder_proc *target_proc = t->to_proc; + +if (target_proc) { +binder_inner_proc_lock (target_proc); +if (t->buffer) + t->buffer->transaction =NULL ; +binder_inner_proc_unlock (target_proc); + } +/* +* If the transaction has no target_proc, then +* t->buffer->transaction has already been cleared. +*/ kfree (t);binder_stats_deleted (BINDER_STAT_TRANSACTION ); }
@@ -3426,10 +3436,12 @@ static int binder_thread_write(struct binder_proc *proc, buffer->debug_id, buffer->transaction ? "active" : "finished"); +binder_inner_proc_lock (proc);if (buffer->transaction) { buffer->transaction->buffer =NULL ; buffer->transaction =NULL ; } +binder_inner_proc_unlock (proc);if (buffer->async_transaction && buffer->target_node) {struct binder_node *buf_node;struct binder_work *w;
drivers/bluetooth/hci_ath.c +3 -0
@@ -101,6 +101,9 @@ static int ath_open(struct hci_uart *hu)BT_DBG ("hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + ath =kzalloc (sizeof (*ath),GFP_KERNEL );if (!ath)return -ENOMEM ;
drivers/bluetooth/hci_bcm.c +3 -0
@@ -305,6 +305,9 @@ static int bcm_open(struct hci_uart *hu)bt_dev_dbg (hu->hdev,"hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + bcm =kzalloc (sizeof (*bcm),GFP_KERNEL );if (!bcm)return -ENOMEM ;
drivers/bluetooth/hci_intel.c +3 -0
@@ -406,6 +406,9 @@ static int intel_open(struct hci_uart *hu)BT_DBG ("hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + intel =kzalloc (sizeof (*intel),GFP_KERNEL );if (!intel)return -ENOMEM ;
drivers/bluetooth/hci_ldisc.c +13 -0
@@ -297,6 +297,19 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb)return 0 ; } +/* Check the underlying device or tty has flow control support */ +bool hci_uart_has_flow_control (struct hci_uart *hu) +{ +/* serdev nodes check if the needed operations are present */ +if (hu->serdev) +return true; + +if (hu->tty->driver->ops->tiocmget && hu->tty->driver->ops->tiocmset) +return true; + +return false; +} +/* Flow control or un-flow control the device */ void hci_uart_set_flow_control (struct hci_uart *hu,bool enable) {
drivers/bluetooth/hci_mrvl.c +3 -0
@@ -66,6 +66,9 @@ static int mrvl_open(struct hci_uart *hu)BT_DBG ("hu %p" , hu); +if (!hci_uart_has_flow_control (hu)) +return -EOPNOTSUPP ; + mrvl =kzalloc (sizeof (*mrvl),GFP_KERNEL );if (!mrvl)return -ENOMEM ;
drivers/bluetooth/hci_uart.h +1 -0
@@ -117,6 +117,7 @@ void hci_uart_unregister_device(struct hci_uart *hu);int hci_uart_tx_wakeup (struct hci_uart *hu);int hci_uart_init_ready (struct hci_uart *hu);void hci_uart_set_baudrate (struct hci_uart *hu,unsigned int speed); +bool hci_uart_has_flow_control (struct hci_uart *hu);void hci_uart_set_flow_control (struct hci_uart *hu,bool enable);void hci_uart_set_speeds (struct hci_uart *hu,unsigned int init_speed,unsigned int oper_speed);
drivers/i2c/busses/i2c-qup.c +2 -0
@@ -844,6 +844,8 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg, }if (ret || qup->bus_err || qup->qup_err) { +reinit_completion (&qup->xfer); +if (qup_i2c_change_state (qup,QUP_RUN_STATE )) {dev_err (qup->dev,"change to run state timed out" ); goto desc_err;
drivers/iommu/intel-iommu.c +1 -1
@@ -3702,7 +3702,7 @@ static void intel_unmap(struct device *dev, dma_addr_t dev_addr, size_t size) freelist =domain_unmap (domain, start_pfn, last_pfn); -if (intel_iommu_strict) { +if (intel_iommu_strict || !has_iova_flush_queue (&domain->iovad)) {iommu_flush_iotlb_psi (iommu, domain, start_pfn, nrpages, !freelist,0 );/* free iova */
drivers/iommu/iova.c +14 -4
@@ -58,9 +58,14 @@ init_iova_domain(struct iova_domain *iovad, unsigned long granule, }EXPORT_SYMBOL_GPL (init_iova_domain); +bool has_iova_flush_queue (struct iova_domain *iovad) +{ +return !!iovad->fq; +} +static void free_iova_flush_queue (struct iova_domain *iovad) { -if (!iovad->fq) +if (!has_iova_flush_queue (iovad))return ;if (timer_pending (&iovad->fq_timer))
@@ -78,13 +83,14 @@ static void free_iova_flush_queue(struct iova_domain *iovad)int init_iova_flush_queue (struct iova_domain *iovad,iova_flush_cb flush_cb,iova_entry_dtor entry_dtor) { +struct iova_fq __percpu *queue;int cpu;atomic64_set (&iovad->fq_flush_start_cnt,0 );atomic64_set (&iovad->fq_flush_finish_cnt,0 ); - iovad->fq = alloc_percpu(struct iova_fq); -if (!iovad->fq) + queue = alloc_percpu(struct iova_fq); +if (!queue)return -ENOMEM ; iovad->flush_cb = flush_cb;
@@ -93,13 +99,17 @@ int init_iova_flush_queue(struct iova_domain *iovad,for_each_possible_cpu (cpu) {struct iova_fq *fq; - fq =per_cpu_ptr (iovad->fq, cpu); + fq =per_cpu_ptr (queue, cpu); fq->head =0 ; fq->tail =0 ;spin_lock_init (&fq->lock); } +smp_wmb (); + + iovad->fq = queue; +setup_timer (&iovad->fq_timer, fq_flush_timeout, (unsigned long )iovad);atomic_set (&iovad->fq_timer_on,0 );
drivers/isdn/hardware/mISDN/hfcsusb.c +3 -0
@@ -1963,6 +1963,9 @@ hfcsusb_probe(struct usb_interface *intf, const struct usb_device_id *id)/* get endpoint base */ idx = ((ep_addr &0x7f ) -1 ) *2 ; +if (idx >15 ) +return -EIO ; +if (ep_addr &0x80 ) idx++; attr = ep->desc.bmAttributes;
drivers/media/radio/radio-raremono.c +23 -7
@@ -283,6 +283,14 @@ static int vidioc_g_frequency(struct file *file, void *priv,return 0 ; } +static void raremono_device_release (struct v4l2_device *v4l2_dev) +{ +struct raremono_device *radio =to_raremono_dev (v4l2_dev); + +kfree (radio->buffer); +kfree (radio); +} +/* File system interface */ static const struct v4l2_file_operations usb_raremono_fops = { .owner =THIS_MODULE ,
@@ -307,12 +315,14 @@ static int usb_raremono_probe(struct usb_interface *intf,struct raremono_device *radio;int retval =0 ; - radio =devm_kzalloc (&intf->dev,sizeof (struct raremono_device ),GFP_KERNEL ); -if (radio) - radio->buffer =devm_kmalloc (&intf->dev,BUFFER_LENGTH ,GFP_KERNEL ); - -if (!radio || !radio->buffer) + radio =kzalloc (sizeof (*radio),GFP_KERNEL ); +if (!radio) +return -ENOMEM ; + radio->buffer =kmalloc (BUFFER_LENGTH ,GFP_KERNEL ); +if (!radio->buffer) { +kfree (radio);return -ENOMEM ; + } radio->usbdev =interface_to_usbdev (intf); radio->intf = intf;
@@ -336,7 +346,8 @@ static int usb_raremono_probe(struct usb_interface *intf,if (retval !=3 || (get_unaligned_be16 (&radio->buffer[1 ]) &0xfff ) ==0x0242 ) {dev_info (&intf->dev,"this is not Thanko's Raremono.\n" ); -return -ENODEV ; + retval = -ENODEV ; + goto free_mem; } dev_info(&intf->dev, "Thanko's Raremono connected: (%04X:%04X)\n",
@@ -345,7 +356,7 @@ static int usb_raremono_probe(struct usb_interface *intf, retval =v4l2_device_register (&intf->dev, &radio->v4l2_dev);if (retval <0 ) {dev_err (&intf->dev,"couldn't register v4l2_device\n" ); -return retval; + goto free_mem; }mutex_init (&radio->lock);
@@ -357,6 +368,7 @@ static int usb_raremono_probe(struct usb_interface *intf, radio->vdev.ioctl_ops = &usb_raremono_ioctl_ops; radio->vdev.lock = &radio->lock; radio->vdev.release = video_device_release_empty; + radio->v4l2_dev.release = raremono_device_release;usb_set_intfdata (intf, &radio->v4l2_dev);
@@ -372,6 +384,10 @@ static int usb_raremono_probe(struct usb_interface *intf, }dev_err (&intf->dev,"could not register video device\n" );v4l2_device_unregister (&radio->v4l2_dev); + +free_mem: +kfree (radio->buffer); +kfree (radio);return retval; }
drivers/media/usb/au0828/au0828-core.c +6 -6
@@ -623,6 +623,12 @@ static int au0828_usb_probe(struct usb_interface *interface,/* Setup */ au0828_card_setup (dev); +/* +* Store the pointer to the au0828_dev so it can be accessed in +* au0828_usb_disconnect +*/ +usb_set_intfdata (interface, dev); +/* Analog TV */ retval =au0828_analog_register (dev, interface);if (retval) {
@@ -641,12 +647,6 @@ static int au0828_usb_probe(struct usb_interface *interface,/* Remote controller */ au0828_rc_register (dev); -/* -* Store the pointer to the au0828_dev so it can be accessed in -* au0828_usb_disconnect -*/ -usb_set_intfdata (interface, dev); -pr_info ("Registered device AU0828 [%s]\n" , dev->board.name ==NULL ?"Unset" : dev->board.name);
drivers/media/usb/cpia2/cpia2_usb.c +2 -1
@@ -901,7 +901,6 @@ static void cpia2_usb_disconnect(struct usb_interface *intf)cpia2_unregister_camera (cam);v4l2_device_disconnect (&cam->v4l2_dev);mutex_unlock (&cam->v4l2_lock); -v4l2_device_put (&cam->v4l2_dev);if (cam->buffers) {DBG ("Wakeup waiting processes\n" );
@@ -913,6 +912,8 @@ static void cpia2_usb_disconnect(struct usb_interface *intf)DBG ("Releasing interface\n" );usb_driver_release_interface (&cpia2_driver, intf); +v4l2_device_put (&cam->v4l2_dev); +LOG ("CPiA2 camera disconnected.\n" ); }
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +2 -2
@@ -1680,7 +1680,7 @@ static int pvr2_decoder_enable(struct pvr2_hdw *hdw,int enablefl) }if (!hdw->flag_decoder_missed) {pvr2_trace (PVR2_TRACE_ERROR_LEGS , -"WARNING: No decoder present" ); +"***WARNING*** No decoder present" ); hdw->flag_decoder_missed = !0 ;trace_stbit ("flag_decoder_missed" , hdw->flag_decoder_missed);
@@ -2365,7 +2365,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,if (hdw_desc->flag_is_experimental) {pvr2_trace (PVR2_TRACE_INFO ,"**********" );pvr2_trace (PVR2_TRACE_INFO , -"WARNING: Support for this device (%s) is experimental." , +"***WARNING*** Support for this device (%s) is experimental." , hdw_desc->description);pvr2_trace (PVR2_TRACE_INFO ,"Important functionality might not be entirely working." );
drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c +3 -3
@@ -343,11 +343,11 @@ static int i2c_hack_cx25840(struct pvr2_hdw *hdw,if ((ret !=0 ) || (*rdata ==0x04 ) || (*rdata ==0x0a )) {pvr2_trace (PVR2_TRACE_ERROR_LEGS , -"WARNING: Detected a wedged cx25840 chip; the device will not work." ); +"***WARNING*** Detected a wedged cx25840 chip; the device will not work." );pvr2_trace (PVR2_TRACE_ERROR_LEGS , -"WARNING: Try power cycling the pvrusb2 device." ); +"***WARNING*** Try power cycling the pvrusb2 device." );pvr2_trace (PVR2_TRACE_ERROR_LEGS , -"WARNING: Disabling further access to the device to prevent other foul-ups." ); +"***WARNING*** Disabling further access to the device to prevent other foul-ups." );// This blocks all further communication with the part. hdw->i2c_func[0x44 ] =NULL ;pvr2_hdw_render_useless (hdw);
drivers/media/usb/pvrusb2/pvrusb2-std.c +1 -1
@@ -353,7 +353,7 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr, bcnt =pvr2_std_id_to_str (buf,sizeof (buf),fmsk);pvr2_trace (PVR2_TRACE_ERROR_LEGS , -"WARNING: Failed to classify the following standard(s): %.*s" , +"***WARNING*** Failed to classify the following standard(s): %.*s" , bcnt,buf); }
drivers/net/wireless/ath/ath10k/usb.c +1 -1
@@ -1025,7 +1025,7 @@ static int ath10k_usb_probe(struct usb_interface *interface, }/* TODO: remove this once USB support is fully implemented */ -ath10k_warn (ar,"WARNING: ath10k USB support is incomplete, don't expect anything to work!\n" ); +ath10k_warn (ar,"Warning: ath10k USB support is incomplete, don't expect anything to work!\n" );return 0 ;
drivers/pps/pps.c +8 -0
@@ -166,6 +166,14 @@ static long pps_cdev_ioctl(struct file *file, pps->params.mode |=PPS_CANWAIT ; pps->params.api_version =PPS_API_VERS ; +/* +* Clear unused fields of pps_kparams to avoid leaking +* uninitialized data of the PPS_SETPARAMS caller via +* PPS_GETPARAMS +*/ + pps->params.assert_off_tu.flags =0 ; + pps->params.clear_off_tu.flags =0 ; +spin_unlock_irq (&pps->lock);break ;
fs/ceph/caps.c +5 -2
@@ -1119,20 +1119,23 @@ static int send_cap_msg(struct cap_msg_args *arg) }/* -* Queue cap releases when an inode is dropped from our cache. Since -* inode is about to be destroyed, there is no need for i_ceph_lock. +* Queue cap releases when an inode is dropped from our cache. */ void ceph_queue_caps_release (struct inode *inode) {struct ceph_inode_info *ci =ceph_inode (inode);struct rb_node *p; +/* lock i_ceph_lock, because ceph_d_revalidate(..., LOOKUP_RCU) +* may call __ceph_caps_issued_mask() on a freeing inode. */ +spin_lock (&ci->i_ceph_lock); p =rb_first (&ci->i_caps);while (p) { struct ceph_cap *cap = rb_entry(p, struct ceph_cap, ci_node); p =rb_next (p);__ceph_remove_cap (cap, true); } +spin_unlock (&ci->i_ceph_lock); }/*
fs/exec.c +1 -1
@@ -1808,7 +1808,7 @@ static int do_execveat_common(int fd, struct filename *filename, current->in_execve =0 ;membarrier_execve (current);acct_update_integrals (current); -task_numa_free (current); +task_numa_free (current, false);free_bprm (bprm);kfree (pathbuf);putname (filename);
fs/nfs/client.c +2 -2
@@ -416,10 +416,10 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) clp =nfs_match_client (cl_init);if (clp) {spin_unlock (&nn->nfs_client_lock); -if (IS_ERR (clp)) -return clp;if (new) new->rpc_ops->free_client (new); +if (IS_ERR (clp)) +return clp;return nfs_found_client (cl_init, clp); }if (new) {
fs/nfs/dir.c +162 -133
369 lines not on this page · raw message
fs/nfs/nfs4proc.c +12 -3
@@ -1317,12 +1317,20 @@ static bool nfs4_mode_match_open_stateid(struct nfs4_state *state,return false; } -static int can_open_cached (struct nfs4_state *state,fmode_t mode,int open_mode) +static int can_open_cached (struct nfs4_state *state,fmode_t mode, +int open_mode,enum open_claim_type4 claim) {int ret =0 ;if (open_mode & (O_EXCL |O_TRUNC )) goto out; +switch (claim) { +case NFS4_OPEN_CLAIM_NULL : +case NFS4_OPEN_CLAIM_FH : + goto out; +default : +break ; + }switch (mode & (FMODE_READ |FMODE_WRITE )) {case FMODE_READ : ret |=test_bit (NFS_O_RDONLY_STATE , &state->flags) !=0
@@ -1617,7 +1625,7 @@ static struct nfs4_state *nfs4_try_open_cached(struct nfs4_opendata *opendata)for (;;) {spin_lock (&state->owner->so_lock); -if (can_open_cached (state, fmode, open_mode)) { +if (can_open_cached (state, fmode, open_mode, claim)) {update_open_stateflags (state, fmode);spin_unlock (&state->owner->so_lock); goto out_return_state;
@@ -2141,7 +2149,8 @@ static void nfs4_open_prepare(struct rpc_task *task, void *calldata)if (data->state !=NULL ) {struct nfs_delegation *delegation; -if (can_open_cached (data->state, data->o_arg.fmode, data->o_arg.open_flags)) +if (can_open_cached (data->state, data->o_arg.fmode, + data->o_arg.open_flags, claim)) goto out_no_action;rcu_read_lock (); delegation =rcu_dereference (NFS_I (data->state->inode)->delegation);
include/linux/iova.h +6 -0
@@ -154,6 +154,7 @@ struct iova *reserve_iova(struct iova_domain *iovad, unsigned long pfn_lo,void copy_reserved_iova (struct iova_domain *from,struct iova_domain *to);void init_iova_domain (struct iova_domain *iovad,unsigned long granule,unsigned long start_pfn,unsigned long pfn_32bit); +bool has_iova_flush_queue (struct iova_domain *iovad);int init_iova_flush_queue (struct iova_domain *iovad,iova_flush_cb flush_cb,iova_entry_dtor entry_dtor);struct iova *find_iova (struct iova_domain *iovad,unsigned long pfn);
@@ -234,6 +235,11 @@ static inline void init_iova_domain(struct iova_domain *iovad, { } +static inline bool has_iova_flush_queue (struct iova_domain *iovad) +{ +return false; +} +static inline int init_iova_flush_queue (struct iova_domain *iovad,iova_flush_cb flush_cb,iova_entry_dtor entry_dtor)
include/linux/sched/numa_balancing.h +2 -2
@@ -19,7 +19,7 @@extern void task_numa_fault (int last_node,int node,int pages,int flags);extern pid_t task_numa_group_id (struct task_struct *p);extern void set_numabalancing_state (bool enabled); -extern void task_numa_free (struct task_struct *p); +extern void task_numa_free (struct task_struct *p,bool final);extern bool should_numa_migrate_memory (struct task_struct *p,struct page *page,int src_nid,int dst_cpu);#else
@@ -34,7 +34,7 @@ static inline pid_t task_numa_group_id(struct task_struct *p)static inline void set_numabalancing_state (bool enabled) { } -static inline void task_numa_free (struct task_struct *p) +static inline void task_numa_free (struct task_struct *p,bool final) { } static inline bool should_numa_migrate_memory(struct task_struct *p,
include/net/af_vsock.h +0 -3
@@ -22,9 +22,6 @@#include "vsock_addr.h" -/* vsock-specific sock->sk_state constants */ -#define VSOCK_SS_LISTEN 255 -#define LAST_RESERVED_PORT 1023#define vsock_sk (__sk) ((struct vsock_sock *)__sk)
kernel/fork.c +1 -1
@@ -415,7 +415,7 @@ void __put_task_struct(struct task_struct *tsk)WARN_ON (tsk == current);cgroup_free (tsk); -task_numa_free (tsk); +task_numa_free (tsk, true);security_task_free (tsk);exit_creds (tsk);delayacct_tsk_free (tsk);
kernel/sched/fair.c +20 -4
@@ -2358,13 +2358,23 @@ static void task_numa_group(struct task_struct *p, int cpupid, int flags,return ; } -void task_numa_free (struct task_struct *p) +/* +* Get rid of NUMA staticstics associated with a task (either current or dead). +* If @final is set, the task is dead and has reached refcount zero, so we can +* safely free all relevant data structures. Otherwise, there might be +* concurrent reads from places like load balancing and procfs, and we should +* reset the data back to default state without freeing ->numa_faults. +*/ +void task_numa_free (struct task_struct *p,bool final) {struct numa_group *grp = p->numa_group; -void *numa_faults = p->numa_faults; +unsigned long *numa_faults = p->numa_faults;unsigned long flags;int i; +if (!numa_faults) +return ; +if (grp) {spin_lock_irqsave (&grp->lock, flags);for (i =0 ; i <NR_NUMA_HINT_FAULT_STATS * nr_node_ids; i++)
@@ -2377,8 +2387,14 @@ void task_numa_free(struct task_struct *p)put_numa_group (grp); } - p->numa_faults =NULL ; -kfree (numa_faults); +if (final) { + p->numa_faults =NULL ; +kfree (numa_faults); + }else { + p->total_numa_faults =0 ; +for (i =0 ; i <NR_NUMA_HINT_FAULT_STATS * nr_node_ids; i++) + numa_faults[i] =0 ; + } }/*
net/ipv4/ip_tunnel_core.c +6 -3
@@ -89,9 +89,12 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,__ip_select_ident (net, iph,skb_shinfo (skb)->gso_segs ?:1 ); err =ip_local_out (net, sk, skb); -if (unlikely (net_xmit_eval (err))) - pkt_len =0 ; -iptunnel_xmit_stats (dev, pkt_len); + +if (dev) { +if (unlikely (net_xmit_eval (err))) + pkt_len =0 ; +iptunnel_xmit_stats (dev, pkt_len); + } }EXPORT_SYMBOL_GPL (iptunnel_xmit);
net/vmw_vsock/af_vsock.c +34 -50
219 lines not on this page · raw message
net/vmw_vsock/hyperv_transport.c +82 -36
186 lines not on this page · raw message
net/vmw_vsock/virtio_transport.c +1 -1
@@ -417,7 +417,7 @@ static void virtio_vsock_event_fill(struct virtio_vsock *vsock)static void virtio_vsock_reset_sock (struct sock *sk) {lock_sock (sk); - sk->sk_state =SS_UNCONNECTED ; + sk->sk_state =TCP_CLOSE ; sk->sk_err =ECONNRESET ; sk->sk_error_report (sk);release_sock (sk);
net/vmw_vsock/virtio_transport_common.c +11 -11
@@ -716,7 +716,7 @@ static void virtio_transport_do_close(struct vsock_sock *vsk,sock_set_flag (sk,SOCK_DONE ); vsk->peer_shutdown =SHUTDOWN_MASK ;if (vsock_stream_has_data (vsk) <=0 ) - sk->sk_state =SS_DISCONNECTING ; + sk->sk_state =TCP_CLOSING ; sk->sk_state_change (sk); if (vsk->close_work_scheduled &&
@@ -756,8 +756,8 @@ static bool virtio_transport_close(struct vsock_sock *vsk) {struct sock *sk = &vsk->sk; -if (!(sk->sk_state ==SS_CONNECTED || - sk->sk_state ==SS_DISCONNECTING )) +if (!(sk->sk_state ==TCP_ESTABLISHED || + sk->sk_state ==TCP_CLOSING ))return true;/* Already received SHUTDOWN from peer, reply with RST */
@@ -816,7 +816,7 @@ virtio_transport_recv_connecting(struct sock *sk,switch (le16_to_cpu (pkt->hdr.op)) {case VIRTIO_VSOCK_OP_RESPONSE : - sk->sk_state =SS_CONNECTED ; + sk->sk_state =TCP_ESTABLISHED ; sk->sk_socket->state =SS_CONNECTED ;vsock_insert_connected (vsk); sk->sk_state_change (sk);
@@ -836,7 +836,7 @@ virtio_transport_recv_connecting(struct sock *sk, destroy:virtio_transport_reset (vsk, pkt); - sk->sk_state =SS_UNCONNECTED ; + sk->sk_state =TCP_CLOSE ; sk->sk_err = skerr; sk->sk_error_report (sk);return err;
@@ -872,7 +872,7 @@ virtio_transport_recv_connected(struct sock *sk, vsk->peer_shutdown |=SEND_SHUTDOWN ;if (vsk->peer_shutdown ==SHUTDOWN_MASK &&vsock_stream_has_data (vsk) <=0 ) - sk->sk_state =SS_DISCONNECTING ; + sk->sk_state =TCP_CLOSING ;if (le32_to_cpu (pkt->hdr.flags)) sk->sk_state_change (sk);break ;
@@ -943,7 +943,7 @@ virtio_transport_recv_listen(struct sock *sk, struct virtio_vsock_pkt *pkt)lock_sock_nested (child,SINGLE_DEPTH_NESTING ); - child->sk_state =SS_CONNECTED ; + child->sk_state =TCP_ESTABLISHED ; vchild =vsock_sk (child); vsock_addr_init(&vchild->local_addr, le64_to_cpu(pkt->hdr.dst_cid),
@@ -1031,18 +1031,18 @@ void virtio_transport_recv_pkt(struct virtio_vsock_pkt *pkt) sk->sk_write_space (sk);switch (sk->sk_state) { -case VSOCK_SS_LISTEN : +case TCP_LISTEN :virtio_transport_recv_listen (sk, pkt);virtio_transport_free_pkt (pkt);break ; -case SS_CONNECTING : +case TCP_SYN_SENT :virtio_transport_recv_connecting (sk, pkt);virtio_transport_free_pkt (pkt);break ; -case SS_CONNECTED : +case TCP_ESTABLISHED :virtio_transport_recv_connected (sk, pkt);break ; -case SS_DISCONNECTING : +case TCP_CLOSING :virtio_transport_recv_disconnecting (sk, pkt);virtio_transport_free_pkt (pkt);break ;
net/vmw_vsock/vmci_transport.c +17 -17
@@ -776,7 +776,7 @@ static int vmci_transport_recv_stream_cb(void *data, struct vmci_datagram *dg)/* The local context ID may be out of date, update it. */ vsk->local_addr.svm_cid = dst.svm_cid; -if (sk->sk_state ==SS_CONNECTED ) +if (sk->sk_state ==TCP_ESTABLISHED )vmci_trans (vsk)->notify_ops->handle_notify_pkt ( sk, pkt, true, &dst, &src, &bh_process_pkt);
@@ -834,7 +834,9 @@ static void vmci_transport_handle_detach(struct sock *sk)* left in our consume queue. */ if (vsock_stream_has_data (vsk) <=0 ) { -if (sk->sk_state ==SS_CONNECTING ) { + sk->sk_state =TCP_CLOSE ; + +if (sk->sk_state ==TCP_SYN_SENT ) {/* The peer may detach from a queue pair while * we are still in the connecting state, i.e., * if the peer VM is killed after attaching to
@@ -843,12 +845,10 @@ static void vmci_transport_handle_detach(struct sock *sk)* event like a reset. */ - sk->sk_state =SS_UNCONNECTED ; sk->sk_err =ECONNRESET ; sk->sk_error_report (sk);return ; } - sk->sk_state =SS_UNCONNECTED ; } sk->sk_state_change (sk); }
@@ -916,17 +916,17 @@ static void vmci_transport_recv_pkt_work(struct work_struct *work)vsock_sk (sk)->local_addr.svm_cid = pkt->dg.dst.context;switch (sk->sk_state) { -case VSOCK_SS_LISTEN : +case TCP_LISTEN :vmci_transport_recv_listen (sk, pkt);break ; -case SS_CONNECTING : +case TCP_SYN_SENT :/* Processing of pending connections for servers goes through * the listening socket, so see vmci_transport_recv_listen() * for that path. */ vmci_transport_recv_connecting_client (sk, pkt);break ; -case SS_CONNECTED : +case TCP_ESTABLISHED :vmci_transport_recv_connected (sk, pkt);break ;default :
@@ -975,7 +975,7 @@ static int vmci_transport_recv_listen(struct sock *sk,vsock_sk (pending)->local_addr.svm_cid = pkt->dg.dst.context;switch (pending->sk_state) { -case SS_CONNECTING : +case TCP_SYN_SENT : err =vmci_transport_recv_connecting_server (sk, pending, pkt);
@@ -1105,7 +1105,7 @@ static int vmci_transport_recv_listen(struct sock *sk,vsock_add_pending (sk, pending); sk->sk_ack_backlog++; - pending->sk_state =SS_CONNECTING ; + pending->sk_state =TCP_SYN_SENT ;vmci_trans (vpending)->produce_size =vmci_trans (vpending)->consume_size = qp_size;vmci_trans (vpending)->queue_pair_size = qp_size;
@@ -1229,11 +1229,11 @@ vmci_transport_recv_connecting_server(struct sock *listener,* the socket will be valid until it is removed from the queue. * * If we fail sending the attach below, we remove the socket from the -* connected list and move the socket to SS_UNCONNECTED before +* connected list and move the socket to TCP_CLOSE before * releasing the lock, so a pending slow path processing of an incoming * packet will not see the socket in the connected state in that case. */ - pending->sk_state =SS_CONNECTED ; + pending->sk_state =TCP_ESTABLISHED ;vsock_insert_connected (vpending);
@@ -1264,7 +1264,7 @@ vmci_transport_recv_connecting_server(struct sock *listener, destroy: pending->sk_err = skerr; - pending->sk_state =SS_UNCONNECTED ; + pending->sk_state =TCP_CLOSE ;/* As long as we drop our reference, all necessary cleanup will handle * when the cleanup function drops its reference and our destruct * implementation is called. Note that since the listen handler will
@@ -1302,7 +1302,7 @@ vmci_transport_recv_connecting_client(struct sock *sk,* accounting (it can already be found since it's in the bound * table). */ - sk->sk_state =SS_CONNECTED ; + sk->sk_state =TCP_ESTABLISHED ; sk->sk_socket->state =SS_CONNECTED ;vsock_insert_connected (vsk); sk->sk_state_change (sk);
@@ -1370,7 +1370,7 @@ vmci_transport_recv_connecting_client(struct sock *sk, destroy:vmci_transport_send_reset (sk, pkt); - sk->sk_state =SS_UNCONNECTED ; + sk->sk_state =TCP_CLOSE ; sk->sk_err = skerr; sk->sk_error_report (sk);return err;
@@ -1558,7 +1558,7 @@ static int vmci_transport_recv_connected(struct sock *sk,sock_set_flag (sk,SOCK_DONE ); vsk->peer_shutdown =SHUTDOWN_MASK ;if (vsock_stream_has_data (vsk) <=0 ) - sk->sk_state =SS_DISCONNECTING ; + sk->sk_state =TCP_CLOSING ; sk->sk_state_change (sk);break ;
@@ -1826,7 +1826,7 @@ static int vmci_transport_connect(struct vsock_sock *vsk) err =vmci_transport_send_conn_request ( sk,vmci_trans (vsk)->queue_pair_size);if (err <0 ) { - sk->sk_state =SS_UNCONNECTED ; + sk->sk_state =TCP_CLOSE ;return err; } }else {
@@ -1836,7 +1836,7 @@ static int vmci_transport_connect(struct vsock_sock *vsk) sk,vmci_trans (vsk)->queue_pair_size, supported_proto_versions);if (err <0 ) { - sk->sk_state =SS_UNCONNECTED ; + sk->sk_state =TCP_CLOSE ;return err; }
net/vmw_vsock/vmci_transport_notify.c +1 -1
@@ -355,7 +355,7 @@ vmci_transport_notify_pkt_poll_in(struct sock *sk,* queue. Ask for notifications when there is something to * read. */ -if (sk->sk_state ==SS_CONNECTED ) { +if (sk->sk_state ==TCP_ESTABLISHED ) {if (!send_waiting_read (sk,1 ))return -1 ;
net/vmw_vsock/vmci_transport_notify_qstate.c +1 -1
@@ -176,7 +176,7 @@ vmci_transport_notify_pkt_poll_in(struct sock *sk,* queue. Ask for notifications when there is something to * read. */ -if (sk->sk_state ==SS_CONNECTED ) +if (sk->sk_state ==TCP_ESTABLISHED )vsock_block_update_write_window (sk); *data_ready_now = false; }