mirror of
https://github.com/joel16/android_kernel_sony_msm8994.git
synced 2024-11-30 15:41:27 +00:00
220f03ace2
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJVoAOcAAoJEDjbvchgkmk+UhcP/1EOwnsJDcZ/sZkkclNgRmrJ yLBCW65caLAI2E3SmIdKvHQwIx7lHzX5gmWRBrvx+fIl4KhaNKEQ0NCOf1ATaVuQ MkYMdkicXWpLiFNdKokezryevGS8T1RME+2QlPFv3++Rby1Gy90YD5tu7YlIrEn7 sPRJQHEPCzVAQ7Lqhd66yHICM6/QvdefXj4pjh7vV8IMb2YwnY4vqYt7RxnJCUfP tqljxrT274kzpA2awzALNh+o3B3/Y4W9ROmlDWviw3JBc9gEqFXYwbDf8KDwA5c0 sp9GPGed/dV5DFuqRcAHksJenFnE3E4gZjo/R5hluHQU27peBuRfXev2hZyBfZqG 796eUOky8fb0OiyxHfT2vhfGeD7CHI/asvIAORjDBVUqzJy9nkkby3XJ0U4tW+pz VkcilD2oHw1uRIFH3JoBWTJ9W6CYSNFG1qxw+brgfKT5otJG/dBiI8kBABx+aTq7 V+A2cvf11oVwDEb93dnVypMGsfCywqzJUwEIRli9fTFjK7Fg9CBSGX38nwVGUaRv M2/NeloTyWqUQE41Nd11gCu+hKQRtUU77nxpZcSeKn1XsbpO9/7dHTwcELRuKnTD 9XDksqPznXmC9KXGj7XMcRkLyWyB//JHjay0FCS6b4S6v7R5nrEIRjcpdB+H1WLd zMOXRH4ZlcOAS/Yt2QMd =8AB3 -----END PGP SIGNATURE----- Merge upstream tag 'v3.10.84' into LA.BF64.1.2.2 This merge brings us up-to-date as of upstream tag v3.10.84 * tag 'v3.10.84' (1494 commits): Linux 3.10.84 fs: Fix S_NOSEC handling KVM: x86: make vapics_in_nmi_mode atomic MIPS: Fix KVM guest fixmap address x86/PCI: Use host bridge _CRS info on Foxconn K8M890-8237A powerpc/perf: Fix book3s kernel to userspace backtraces arm: KVM: force execution of HCPTR access on VM exit Revert "crypto: talitos - convert to use be16_add_cpu()" crypto: talitos - avoid memleak in talitos_alg_alloc() sctp: Fix race between OOTB responce and route removal packet: avoid out of bounds read in round robin fanout packet: read num_members once in packet_rcv_fanout() bridge: fix br_stp_set_bridge_priority race conditions bridge: fix multicast router rlist endless loop sparc: Use GFP_ATOMIC in ldc_alloc_exp_dring() as it can be called in softirq context Linux 3.10.83 bus: mvebu: pass the coherency availability information at init time KVM: nSVM: Check for NRIPS support before updating control field ARM: clk-imx6q: refine sata's parent d_walk() might skip too much ipv6: update ip6_rt_last_gc every time GC is run ipv6: prevent fib6_run_gc() contention xfrm: Increase the garbage collector threshold Btrfs: make xattr replace operations atomic x86/microcode/intel: Guard against stack overflow in the loader fs: take i_mutex during prepare_binprm for set[ug]id executables hpsa: add missing pci_set_master in kdump path hpsa: refine the pci enable/disable handling sb_edac: Fix erroneous bytes->gigabytes conversion ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers. ACPICA: Utilities: Cleanup to convert physical address printing formats. __ptrace_may_access() should not deny sub-threads include/linux/sched.h: don't use task->pid/tgid in same_thread_group/has_group_leader_pid netfilter: Zero the tuple in nfnl_cthelper_parse_tuple() netfilter: nfnetlink_cthelper: Remove 'const' and '&' to avoid warnings config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected get rid of s_files and files_lock fput: turn "list_head delayed_fput_list" into llist_head Linux 3.10.82 lpfc: Add iotag memory barrier pipe: iovec: Fix memory corruption when retrying atomic copy as non-atomic drm/mgag200: Reject non-character-cell-aligned mode widths tracing: Have filter check for balanced ops crypto: caam - fix RNG buffer cache alignment Linux 3.10.81 btrfs: cleanup orphans while looking up default subvolume btrfs: incorrect handling for fiemap_fill_next_extent return cfg80211: wext: clear sinfo struct before calling driver mm/memory_hotplug.c: set zone->wait_table to null after freeing it drm/i915: Fix DDC probe for passive adapters pata_octeon_cf: fix broken build ozwpan: unchecked signed subtraction leads to DoS ozwpan: divide-by-zero leading to panic ozwpan: Use proper check to prevent heap overflow MIPS: Fix enabling of DEBUG_STACKOVERFLOW ring-buffer-benchmark: Fix the wrong sched_priority of producer USB: serial: ftdi_sio: Add support for a Motion Tracker Development Board USB: cp210x: add ID for HubZ dual ZigBee and Z-Wave dongle block: fix ext_dev_lock lockdep report Input: elantech - fix detection of touchpads where the revision matches a known rate ALSA: usb-audio: add MAYA44 USB+ mixer control names ALSA: usb-audio: Add mic volume fix quirk for Logitech Quickcam Fusion ALSA: hda/realtek - Add a fixup for another Acer Aspire 9420 iio: adis16400: Compute the scan mask from channel indices iio: adis16400: Use != channel indices for the two voltage channels iio: adis16400: Report pressure channel scale xen: netback: read hotplug script once at start of day. udp: fix behavior of wrong checksums net_sched: invoke ->attach() after setting dev->qdisc unix/caif: sk_socket can disappear when state is unlocked net: dp83640: fix broken calibration routine. bridge: fix parsing of MLDv2 reports ipv4: Avoid crashing in ip_error net: phy: Allow EEE for all RGMII variants Linux 3.10.80 fs/binfmt_elf.c:load_elf_binary(): return -EINVAL on zero-length mappings vfs: read file_handle only once in handle_to_path ACPI / init: Fix the ordering of acpi_reserve_resources() Input: elantech - fix semi-mt protocol for v3 HW rtlwifi: rtl8192cu: Fix kernel deadlock md/raid5: don't record new size if resize_stripes fails. svcrpc: fix potential GSSX_ACCEPT_SEC_CONTEXT decoding failures ARM: fix missing syscall trace exit ARM: dts: imx27: only map 4 Kbyte for fec registers crypto: s390/ghash - Fix incorrect ghash icv buffer handling. rt2x00: add new rt2800usb device DWA 130 libata: Ignore spurious PHY event on LPM policy change libata: Add helper to determine when PHY events should be ignored ext4: check for zero length extent explicitly ext4: convert write_begin methods to stable_page_writes semantics mmc: atmel-mci: fix bad variable type for clkdiv powerpc: Align TOC to 256 bytes usb: gadget: configfs: Fix interfaces array NULL-termination usb-storage: Add NO_WP_DETECT quirk for Lacie 059f:0651 devices USB: cp210x: add ID for KCF Technologies PRN device USB: pl2303: Remove support for Samsung I330 USB: visor: Match I330 phone more precisely xhci: gracefully handle xhci_irq dead device xhci: Solve full event ring by increasing TRBS_PER_SEGMENT to 256 xhci: fix isoc endpoint dequeue from advancing too far on transaction error target/pscsi: Don't leak scsi_host if hba is VIRTUAL_HOST ASoC: wm8994: correct BCLK DIV 348 to 384 ASoC: wm8960: fix "RINPUT3" audio route error ASoC: mc13783: Fix wrong mask value used in mc13xxx_reg_rmw() calls ALSA: hda - Add headphone quirk for Lifebook E752 ALSA: hda - Add Conexant codecs CX20721, CX20722, CX20723 and CX20724 d_walk() might skip too much lib: Fix strnlen_user() to not touch memory after specified maximum hwmon: (ntc_thermistor) Ensure iio channel is of type IIO_VOLTAGE libceph: request a new osdmap if lingering request maps to no osd lguest: fix out-by-one error in address checking. fs, omfs: add NULL terminator in the end up the token list KVM: MMU: fix CR4.SMEP=1, CR0.WP=0 with shadow pages net: socket: Fix the wrong returns for recvmsg and sendmsg kernel: use the gnu89 standard explicitly staging, rtl8192e, LLVMLinux: Remove unused inline prototype staging: rtl8712, rtl8712: avoid lots of build warnings staging, rtl8192e, LLVMLinux: Change extern inline to static inline drm/i915: Fix declaration of intel_gmbus_{is_forced_bit/is_port_falid} staging: wlags49_h2: fix extern inline functions Linux 3.10.79 ACPICA: Utilities: Cleanup to enforce ACPI_PHYSADDR_TO_PTR()/ACPI_PTR_TO_PHYSADDR(). ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address. revert "softirq: Add support for triggering softirq work on softirqs" sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND) mmc: card: Don't access RPMB partitions for normal read/write pinctrl: Don't just pretend to protect pinctrl_maps, do it for real drm/i915: Add missing MacBook Pro models with dual channel LVDS ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC ARM: dts: imx23-olinuxino: Fix dr_mode of usb0 ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name ARM: dts: imx25: Add #pwm-cells to pwm4 gpio: sysfs: fix memory leaks and device hotplug gpio: unregister gpiochip device before removing it xen/console: Update console event channel on resume mm/memory-failure: call shake_page() when error hits thp tail page nilfs2: fix sanity check of btree level in nilfs_btree_root_broken() ocfs2: dlm: fix race between purge and get lock resource Linux 3.10.78 ARC: signal handling robustify UBI: fix soft lockup in ubi_check_volume() Drivers: hv: vmbus: Don't wait after requesting offers ARM: dts: dove: Fix uart[23] reg property staging: panel: fix lcd type usb: gadget: printer: enqueue printer's response for setup request usb: host: oxu210hp: use new USB_RESUME_TIMEOUT 3w-sas: fix command completion race 3w-9xxx: fix command completion race 3w-xxxx: fix command completion race ext4: fix data corruption caused by unwritten and delayed extents rbd: end I/O the entire obj_request on error serial: of-serial: Remove device_type = "serial" registration ALSA: hda - Fix mute-LED fixed mode ALSA: emu10k1: Emu10k2 32 bit DMA mode ALSA: emu10k1: Fix card shortname string buffer overflow ALSA: emux: Fix mutex deadlock in OSS emulation ALSA: emux: Fix mutex deadlock at unloading ipv4: Missing sk_nulls_node_init() in ping_unhash(). Linux 3.10.77 s390: Fix build error nosave: consolidate __nosave_{begin,end} in <asm/sections.h> memstick: mspro_block: add missing curly braces C6x: time: Ensure consistency in __init wl18xx: show rx_frames_per_rates as an array as it really is lib: memzero_explicit: use barrier instead of OPTIMIZER_HIDE_VAR e1000: add dummy allocator to fix race condition between mtu change and netpoll ksoftirqd: Enable IRQs and call cond_resched() before poking RCU RCU pathwalk breakage when running into a symlink overmounting something drm/i915: cope with large i2c transfers drm/radeon: fix doublescan modes (v2) i2c: core: Export bus recovery functions IB/mlx4: Fix WQE LSO segment calculation IB/core: don't disallow registering region starting at 0x0 IB/core: disallow registering 0-sized memory region stk1160: Make sure current buffer is released mvsas: fix panic on expander attached SATA devices Drivers: hv: vmbus: Fix a bug in the error path in vmbus_open() xtensa: provide __NR_sync_file_range2 instead of __NR_sync_file_range xtensa: xtfpga: fix hardware lockup caused by LCD driver ACPICA: Utilities: split IO address types from data type models. drivers: parport: Kconfig: exclude arm64 for PARPORT_PC scsi: storvsc: Fix a bug in copy_from_bounce_buffer() UBI: fix check for "too many bytes" UBI: initialize LEB number variable UBI: fix out of bounds write UBI: account for bitflips in both the VID header and data tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH ext4: make fsync to sync parent dir in no-journal for real this time arm64: kernel: compiling issue, need delete read_current_timer() video: vgacon: Don't build on arm64 console: Disable VGA text console support on cris drivers: parport: Kconfig: exclude h8300 for PARPORT_PC parport: disable PC-style parallel port support on cris rtlwifi: rtl8192cu: Add new device ID rtlwifi: rtl8192cu: Add new USB ID ptrace: fix race between ptrace_resume() and wait_task_stopped() fs/binfmt_elf.c: fix bug in loading of PIE binaries Input: elantech - fix absolute mode setting on some ASUS laptops ALSA: emu10k1: don't deadlock in proc-functions usb: core: hub: use new USB_RESUME_TIMEOUT usb: host: sl811: use new USB_RESUME_TIMEOUT usb: host: xhci: use new USB_RESUME_TIMEOUT usb: host: isp116x: use new USB_RESUME_TIMEOUT usb: host: r8a66597: use new USB_RESUME_TIMEOUT usb: define a generic USB_RESUME_TIMEOUT macro usb: phy: Find the right match in devm_usb_phy_match ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore ARM: 8320/1: fix integer overflow in ELF_ET_DYN_BASE power_supply: lp8788-charger: Fix leaked power supply on probe fail ring-buffer: Replace this_cpu_*() with __this_cpu_*() spi: spidev: fix possible arithmetic overflow for multi-transfer message cdc-wdm: fix endianness bug in debug statements MIPS: Hibernate: flush TLB entries earlier KVM: use slowpath for cross page cached accesses s390/hibernate: fix save and restore of kernel text section KVM: s390: Zero out current VMDB of STSI before including level3 data. usb: gadget: composite: enable BESL support Btrfs: fix inode eviction infinite loop after cloning into it Btrfs: fix log tree corruption when fs mounted with -o discard tcp: avoid looping in tcp_send_fin() tcp: fix possible deadlock in tcp_send_fin() ip_forward: Drop frames with attached skb->sk Linux 3.10.76 dcache: Fix locking bugs in backported "deal with deadlock in d_walk()" arc: mm: Fix build failure sb_edac: avoid INTERNAL ERROR message in EDAC with unspecified channel x86: mm: move mmap_sem unlock from mm_fault_error() to caller vm: make stack guard page errors return VM_FAULT_SIGSEGV rather than SIGBUS vm: add VM_FAULT_SIGSEGV handling support deal with deadlock in d_walk() move d_rcu from overlapping d_child to overlapping d_alias kconfig: Fix warning "‘jump’ may be used uninitialized" KVM: x86: SYSENTER emulation is broken netfilter: conntrack: disable generic tracking for known protocols Bluetooth: Ignore isochronous endpoints for Intel USB bootloader Bluetooth: Add support for Intel bootloader devices Bluetooth: btusb: Add IMC Networks (Broadcom based) Bluetooth: Add firmware update for Atheros 0cf3:311f Bluetooth: Enable Atheros 0cf3:311e for firmware upload mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support splice: Apply generic position and size checks to each write jfs: fix readdir regression serial: 8250_dw: Fix deadlock in LCR workaround benet: Call dev_kfree_skby_any instead of kfree_skb. ixgb: Call dev_kfree_skby_any instead of dev_kfree_skb. tg3: Call dev_kfree_skby_any instead of dev_kfree_skb. bnx2: Call dev_kfree_skby_any instead of dev_kfree_skb. r8169: Call dev_kfree_skby_any instead of dev_kfree_skb. 8139too: Call dev_kfree_skby_any instead of dev_kfree_skb. 8139cp: Call dev_kfree_skby_any instead of kfree_skb. tcp: tcp_make_synack() should clear skb->tstamp tcp: fix FRTO undo on cumulative ACK of SACKed range ipv6: Don't reduce hop limit for an interface tcp: prevent fetching dst twice in early demux code remove extra definitions of U32_MAX conditionally define U32_MAX Linux 3.10.75 pagemap: do not leak physical addresses to non-privileged userspace console: Fix console name size mismatch IB/mlx4: Saturate RoCE port PMA counters in case of overflow kernel.h: define u8, s8, u32, etc. limits net: llc: use correct size for sysctl timeout entries net: rds: use correct size for max unacked packets and bytes ipc: fix compat msgrcv with negative msgtyp core, nfqueue, openvswitch: fix compilation warning media: s5p-mfc: fix mmap support for 64bit arch iscsi target: fix oops when adding reject pdu ocfs2: _really_ sync the right range be2iscsi: Fix kernel panic when device initialization fails cifs: fix use-after-free bug in find_writable_file usb: xhci: apply XHCI_AVOID_BEI quirk to all Intel xHCI controllers cpuidle: ACPI: do not overwrite name and description of C0 dmaengine: omap-dma: Fix memory leak when terminating running transfer iio: imu: Use iio_trigger_get for indio_dev->trig assignment iio: inv_mpu6050: Clear timestamps fifo while resetting hardware fifo Defer processing of REQ_PREEMPT requests for blocked devices USB: ftdi_sio: Use jtag quirk for SNAP Connect E10 USB: ftdi_sio: Added custom PID for Synapse Wireless product radeon: Do not directly dereference pointers to BIOS area. writeback: fix possible underflow in write bandwidth calculation writeback: add missing INITIAL_JIFFIES init in global_update_bandwidth() mm/memory hotplug: postpone the reset of obsolete pgdat nbd: fix possible memory leak iwlwifi: dvm: run INIT firmware again upon .start() IB/uverbs: Prevent integer overflow in ib_umem_get address arithmetic IB/core: Avoid leakage from kernel to user space tcp: Fix crash in TCP Fast Open selinux: fix sel_write_enforce broken return value ALSA: hda - Fix headphone pin config for Lifebook T731 ALSA: usb - Creative USB X-Fi Pro SB1095 volume knob support ALSA: hda - Add one more node in the EAPD supporting candidate list Linux 3.10.74 net: ethernet: pcnet32: Setup the SRAM and NOUFLO on Am79C97{3, 5} powerpc/mpc85xx: Add ranges to etsec2 nodes hfsplus: fix B-tree corruption after insertion at position 0 dm: hold suspend_lock while suspending device during device deletion vt6655: RFbSetPower fix missing rate RATE_12M perf: Fix irq_work 'tail' recursion Revert "iwlwifi: mvm: fix failure path when power_update fails in add_interface" mac80211: drop unencrypted frames in mesh fwding mac80211: disable u-APSD queues by default nl80211: ignore HT/VHT capabilities without QoS/WMM tcm_qla2xxx: Fix incorrect use of __transport_register_session tcm_fc: missing curly braces in ft_invl_hw_context() ASoC: wm8955: Fix wrong value references for boolean kctl ASoC: adav80x: Fix wrong value references for boolean kctl ASoC: ak4641: Fix wrong value references for boolean kctl ASoC: wm8904: Fix wrong value references for boolean kctl ASoC: wm8903: Fix wrong value references for boolean kctl ASoC: wm2000: Fix wrong value references for boolean kctl ASoC: wm8731: Fix wrong value references for boolean kctl ASoC: tas5086: Fix wrong value references for boolean kctl ASoC: wm8960: Fix wrong value references for boolean kctl ASoC: cs4271: Fix wrong value references for boolean kctl ASoC: sgtl5000: remove useless register write clearing CHRGPUMP_POWERUP Linux 3.10.73 target: Allow Write Exclusive non-reservation holders to READ target: Allow AllRegistrants to re-RESERVE existing reservation target: Fix R_HOLDER bit usage for AllRegistrants target/pscsi: Fix NULL pointer dereference in get_device_type iscsi-target: Avoid early conn_logout_comp for iser connections target: Fix reference leak in target_get_sess_cmd() error path ARM: at91: pm: fix at91rm9200 standby ipvs: rerouting to local clients is not needed anymore ipvs: add missing ip_vs_pe_put in sync code powerpc/smp: Wait until secondaries are active & online x86/vdso: Fix the build on GCC5 x86/fpu: Drop_fpu() should not assume that tsk equals current x86/fpu: Avoid math_state_restore() without used_math() in __restore_xstate_sig() crypto: aesni - fix memory usage in GCM decryption libsas: Fix Kernel Crash in smp_execute_task xen-pciback: limit guest control of command register nilfs2: fix deadlock of segment constructor during recovery regulator: core: Fix enable GPIO reference counting regulator: Only enable disabled regulators on resume ALSA: hda - Treat stereo-to-mono mix properly ALSA: hda - Add workaround for MacBook Air 5,2 built-in mic ALSA: hda - Set single_adc_amp flag for CS420x codecs ALSA: hda - Don't access stereo amps for mono channel widgets ALSA: hda - Fix built-in mic on Compaq Presario CQ60 ALSA: control: Add sanity checks for user ctl id name string spi: pl022: Fix race in giveback() leading to driver lock-up tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE can: add missing initialisations in CAN related skbuffs Change email address for 8250_pci virtio_console: init work unconditionally fuse: notify: don't move pages fuse: set stolen page uptodate drm/radeon: drop setting UPLL to sleep mode drm/radeon: do a posting read in rs600_set_irq drm/radeon: do a posting read in si_set_irq drm/radeon: do a posting read in r600_set_irq drm/radeon: do a posting read in r100_set_irq drm/radeon: do a posting read in evergreen_set_irq drm/radeon: fix DRM_IOCTL_RADEON_CS oops tcp: make connect() mem charging friendly net: compat: Update get_compat_msghdr() to match copy_msghdr_from_user() behaviour tcp: fix tcp fin memory accounting Revert "net: cx82310_eth: use common match macro" rxrpc: bogus MSG_PEEK test in rxrpc_recvmsg() caif: fix MSG_OOB test in caif_seqpkt_recvmsg() inet_diag: fix possible overflow in inet_diag_dump_one_icsk() rds: avoid potential stack overflow net: sysctl_net_core: check SNDBUF and RCVBUF for min length sparc64: Fix several bugs in memmove(). sparc: Touch NMI watchdog when walking cpus and calling printk sparc: perf: Make counting mode actually work sparc: perf: Remove redundant perf_pmu_{en|dis}able calls sparc: semtimedop() unreachable due to comparison error sparc32: destroy_context() and switch_mm() needs to disable interrupts. Linux 3.10.72 ath5k: fix spontaneus AR5312 freezes ACPI / video: Load the module even if ACPI is disabled drm/radeon: fix 1 RB harvest config setup for TN/RL Drivers: hv: vmbus: incorrect device name is printed when child device is unregistered HID: fixup the conflicting keyboard mappings quirk HID: input: fix confusion on conflicting mappings staging: comedi: cb_pcidas64: fix incorrect AI range code handling dm snapshot: fix a possible invalid memory access on unload dm: fix a race condition in dm_get_md dm io: reject unsupported DISCARD requests with EOPNOTSUPP dm mirror: do not degrade the mirror on discard error staging: comedi: comedi_compat32.c: fix COMEDI_CMD copy back clk: sunxi: Support factor clocks with N factor starting not from 0 fixed invalid assignment of 64bit mask to host dma_boundary for scatter gather segment boundary limit. nilfs2: fix potential memory overrun on inode IB/qib: Do not write EEPROM sg: fix read() error reporting ALSA: hda - Add pin configs for ASUS mobo with IDT 92HD73XX codec ALSA: pcm: Don't leave PREPARED state after draining tty: fix up atime/mtime mess, take four sunrpc: fix braino in ->poll() procfs: fix race between symlink removals and traversals debugfs: leave freeing a symlink body until inode eviction autofs4 copy_dev_ioctl(): keep the value of ->size we'd used for allocation USB: serial: fix potential use-after-free after failed probe TTY: fix tty_wait_until_sent on 64-bit machines USB: serial: fix infinite wait_until_sent timeout net: irda: fix wait_until_sent poll timeout xhci: fix reporting of 0-sized URBs in control endpoint xhci: Allocate correct amount of scratchpad buffers usb: ftdi_sio: Add jtag quirk support for Cyber Cortex AV boards USB: usbfs: don't leak kernel data in siginfo USB: serial: cp210x: Adding Seletek device id's KVM: MIPS: Fix trace event to save PC directly KVM: emulate: fix CMPXCHG8B on 32-bit hosts Btrfs:__add_inode_ref: out of bounds memory read when looking for extended ref. Btrfs: fix data loss in the fast fsync path btrfs: fix lost return value due to variable shadowing iio: imu: adis16400: Fix sign extension x86/asm/entry/64: Remove a bogus 'ret_from_fork' optimization PM / QoS: remove duplicate call to pm_qos_update_target target: Check for LBA + sectors wrap-around in sbc_parse_cdb mm/memory.c: actually remap enough memory mm/compaction: fix wrong order check in compact_finished() mm/nommu.c: fix arithmetic overflow in __vm_enough_memory() mm/mmap.c: fix arithmetic overflow in __vm_enough_memory() mm/hugetlb: add migration entry check in __unmap_hugepage_range team: don't traverse port list using rcu in team_set_mac_address udp: only allow UFO for packets from SOCK_DGRAM sockets usb: plusb: Add support for National Instruments host-to-host cable macvtap: make sure neighbour code can push ethernet header net: compat: Ignore MSG_CMSG_COMPAT in compat_sys_{send, recv}msg team: fix possible null pointer dereference in team_handle_frame net: reject creation of netdev names with colons ematch: Fix auto-loading of ematch modules. net: phy: Fix verification of EEE support in phy_init_eee ipv4: ip_check_defrag should not assume that skb_network_offset is zero ipv4: ip_check_defrag should correctly check return value of skb_copy_bits gen_stats.c: Duplicate xstats buffer for later use rtnetlink: call ->dellink on failure when ->newlink exists ipv6: fix ipv6_cow_metrics for non DST_HOST case rtnetlink: ifla_vf_policy: fix misuses of NLA_BINARY Linux 3.10.71 libceph: fix double __remove_osd() problem libceph: change from BUG to WARN for __remove_osd() asserts libceph: assert both regular and lingering lists in __remove_osd() MIPS: Export FP functions used by lose_fpu(1) for KVM x86, mm/ASLR: Fix stack randomization on 64-bit systems blk-throttle: check stats_cpu before reading it from sysfs jffs2: fix handling of corrupted summary length md/raid1: fix read balance when a drive is write-mostly. md/raid5: Fix livelock when array is both resyncing and degraded. metag: Fix KSTK_EIP() and KSTK_ESP() macros gpio: tps65912: fix wrong container_of arguments arm64: compat Fix siginfo_t -> compat_siginfo_t conversion on big endian hx4700: regulator: declare full constraints KVM: x86: update masterclock values on TSC writes KVM: MIPS: Don't leak FPU/DSP to guest ARC: fix page address calculation if PAGE_OFFSET != LINUX_LINK_BASE ntp: Fixup adjtimex freq validation on 32-bit systems kdb: fix incorrect counts in KDB summary command output ARM: pxa: add regulator_has_full_constraints to poodle board file ARM: pxa: add regulator_has_full_constraints to corgi board file vt: provide notifications on selection changes usb: core: buffer: smallest buffer should start at ARCH_DMA_MINALIGN USB: fix use-after-free bug in usb_hcd_unlink_urb() USB: cp210x: add ID for RUGGEDCOM USB Serial Console tty: Prevent untrappable signals from malicious program axonram: Fix bug in direct_access cfq-iosched: fix incorrect filing of rt async cfqq cfq-iosched: handle failure of cfq group allocation iscsi-target: Drop problematic active_ts_list usage NFSv4.1: Fix a kfree() of uninitialised pointers in decode_cb_sequence_args Added Little Endian support to vtpm module tpm/tpm_i2c_stm_st33: Fix potential bug in tpm_stm_i2c_send tpm: Fix NULL return in tpm_ibmvtpm_get_desired_dma tpm_tis: verify interrupt during init ARM: 8284/1: sa1100: clear RCSR_SMR on resume tracing: Fix unmapping loop in tracing_mark_write MIPS: KVM: Deliver guest interrupts after local_irq_disable() nfs: don't call blocking operations while !TASK_RUNNING mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cycles power_supply: 88pm860x: Fix leaked power supply on probe fail ALSA: hdspm - Constrain periods to 2 on older cards ALSA: off by one bug in snd_riptide_joystick_probe() lmedm04: Fix usb_submit_urb BOGUS urb xfer, pipe 1 != type 3 in interrupt urb cpufreq: speedstep-smi: enable interrupts when waiting PCI: Fix infinite loop with ROM image of size 0 PCI: Generate uppercase hex for modalias var in uevent HID: i2c-hid: Limit reads to wMaxInputLength bytes for input events iwlwifi: mvm: always use mac color zero iwlwifi: mvm: fix failure path when power_update fails in add_interface iwlwifi: mvm: validate tid and sta_id in ba_notif iwlwifi: pcie: disable the SCD_BASE_ADDR when we resume from WoWLAN fsnotify: fix handling of renames in audit xfs: set superblock buffer type correctly xfs: inode unlink does not set AGI buffer type xfs: ensure buffer types are set correctly Bluetooth: ath3k: workaround the compatibility issue with xHCI controller Linux 3.10.70 rbd: drop an unsafe assertion media/rc: Send sync space information on the lirc device net: sctp: fix passing wrong parameter header to param_type2af in sctp_process_param ppp: deflate: never return len larger than output buffer ipv4: tcp: get rid of ugly unicast_sock tcp: ipv4: initialize unicast_sock sk_pacing_rate bridge: dont send notification when skb->len == 0 in rtnl_bridge_notify ipv6: replacing a rt6_info needs to purge possible propagated rt6_infos too ping: Fix race in free in receive path udp_diag: Fix socket skipping within chain ipv4: try to cache dst_entries which would cause a redirect net: sctp: fix slab corruption from use after free on INIT collisions netxen: fix netxen_nic_poll() logic ipv6: stop sending PTB packets for MTU < 1280 net: rps: fix cpu unplug ip: zero sockaddr returned on error queue Linux 3.10.69 crypto: crc32c - add missing crypto module alias x86,kvm,vmx: Preserve CR4 across VM entry kvm: vmx: handle invvpid vm exit gracefully smpboot: Add missing get_online_cpus() in smpboot_register_percpu_thread() ALSA: ak411x: Fix stall in work callback ASoC: sgtl5000: add delay before first I2C access ASoC: atmel_ssc_dai: fix start event for I2S mode lib/checksum.c: fix build for generic csum_tcpudp_nofold ext4: prevent bugon on race between write/fcntl arm64: Fix up /proc/cpuinfo nilfs2: fix deadlock of segment constructor over I_SYNC flag lib/checksum.c: fix carry in csum_tcpudp_nofold mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range MIPS: Fix kernel lockup or crash after CPU offline/online MIPS: IRQ: Fix disable_irq on CPU IRQs PCI: Add NEC variants to Stratus ftServer PCIe DMI check gpio: sysfs: fix memory leak in gpiod_sysfs_set_active_low gpio: sysfs: fix memory leak in gpiod_export_link Linux 3.10.68 target: Drop arbitrary maximum I/O size limit iser-target: Fix implicit termination of connections iser-target: Handle ADDR_CHANGE event for listener cm_id iser-target: Fix connected_handler + teardown flow race iser-target: Parallelize CM connection establishment iser-target: Fix flush + disconnect completion handling iscsi,iser-target: Initiate termination only once vhost-scsi: Add missing virtio-scsi -> TCM attribute conversion tcm_loop: Fix wrong I_T nexus association vhost-scsi: Take configfs group dependency during VHOST_SCSI_SET_ENDPOINT ib_isert: Add max_send_sge=2 minimum for control PDU responses IB/isert: Adjust CQ size to HW limits workqueue: fix subtle pool management issue which can stall whole worker_pool gpio: squelch a compiler warning efi-pstore: Make efi-pstore return a unique id pstore/ram: avoid atomic accesses for ioremapped regions pstore: Fix NULL pointer fault if get NULL prz in ramoops_get_next_prz pstore: skip zero size persistent ram buffer in traverse pstore: clarify clearing of _read_cnt in ramoops_context pstore: d_alloc_name() doesn't return an ERR_PTR pstore: Fail to unlink if a driver has not defined pstore_erase ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE ARM: 8108/1: mm: Introduce {pte,pmd}_isset and {pte,pmd}_isclear ARM: DMA: ensure that old section mappings are flushed from the TLB ARM: 7931/1: Correct virt_addr_valid ARM: fix asm/memory.h build error ARM: 7867/1: include: asm: use 'int' instead of 'unsigned long' for 'oldval' in atomic_cmpxchg(). ARM: 7866/1: include: asm: use 'long long' instead of 'u64' within atomic.h ARM: lpae: fix definition of PTE_HWTABLE_PTRS ARM: fix type of PHYS_PFN_OFFSET to unsigned long ARM: LPAE: use phys_addr_t in alloc_init_pud() ARM: LPAE: use signed arithmetic for mask definitions ARM: mm: correct pte_same behaviour for LPAE. ARM: 7829/1: Add ".text.unlikely" and ".text.hot" to arm unwind tables drivers: net: cpsw: discard dual emac default vlan configuration regulator: core: fix race condition in regulator_put() spi/pxa2xx: Clear cur_chip pointer before starting next message dm cache: fix missing ERR_PTR returns and handling dm thin: don't allow messages to be sent to a pool target in READ_ONLY or FAIL mode nl80211: fix per-station group key get/del and memory leak NFSv4.1: Fix an Oops in nfs41_walk_client_list nfs: fix dio deadlock when O_DIRECT flag is flipped Input: i8042 - add noloop quirk for Medion Akoya E7225 (MD98857) ALSA: seq-dummy: remove deadlock-causing events on close powerpc/xmon: Fix another endiannes issue in RTAS call from xmon can: kvaser_usb: Fix state handling upon BUS_ERROR events can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT can: kvaser_usb: Send correct context to URB completion can: kvaser_usb: Do not sleep in atomic context ASoC: wm8960: Fix capture sample rate from 11250 to 11025 spi: dw-mid: fix FIFO size Linux 3.10.67 md/raid5: fetch_block must fetch all the blocks handle_stripe_dirtying wants. ext4: fix warning in ext4_da_update_reserve_space() quota: provide interface for readding allocated space into reserved space crypto: add missing crypto module aliases crypto: include crypto- module prefix in template crypto: prefix module autoloading with "crypto-" drbd: merge_bvec_fn: properly remap bvm->bi_bdev Revert "swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single" ipvs: uninitialized data with IP_VS_IPV6 KEYS: close race between key lookup and freeing sata_dwc_460ex: fix resource leak on error path x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and sync_regs x86, tls: Interpret an all-zero struct user_desc as "no segment" x86, tls, ldt: Stop checking lm in LDT_empty x86/tsc: Change Fast TSC calibration failed from error to info x86, hyperv: Mark the Hyper-V clocksource as being continuous clocksource: exynos_mct: Fix bitmask regression for exynos4_mct_write can: dev: fix crtlmode_supported check bus: mvebu-mbus: fix support of MBus window 13 ARM: dts: imx25: Fix PWM "per" clocks time: adjtimex: Validate the ADJ_FREQUENCY values time: settimeofday: Validate the values of tv from user dm cache: share cache-metadata object across inactive and active DM tables ipr: wait for aborted command responses drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES scripts/recordmcount.pl: There is no -m32 gcc option on Super-H anymore ALSA: usb-audio: Add mic volume fix quirk for Logitech Webcam C210 libata: prevent HSM state change race between ISR and PIO pinctrl: Fix two deadlocks gpio: sysfs: fix gpio device-attribute leak gpio: sysfs: fix gpio-chip device-attribute leak Linux 3.10.66 s390/3215: fix tty output containing tabs s390/3215: fix hanging console issue fsnotify: next_i is freed during fsnotify_unmount_inodes. netfilter: ipset: small potential read beyond the end of buffer mmc: sdhci: Fix sleep in atomic after inserting SD card LOCKD: Fix a race when initialising nlmsvc_timeout x86, um: actually mark system call tables readonly um: Skip futex_atomic_cmpxchg_inatomic() test decompress_bunzip2: off by one in get_next_block() ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances ARM: omap5/dra7xx: Fix frequency typos ARM: clk-imx6q: fix video divider for rev T0 1.0 ARM: imx6q: drop unnecessary semicolon ARM: dts: imx25: Fix the SPI1 clocks Input: I8042 - add Acer Aspire 7738 to the nomux list Input: i8042 - reset keyboard to fix Elantech touchpad detection can: kvaser_usb: Don't send a RESET_CHIP for non-existing channels can: kvaser_usb: Reset all URB tx contexts upon channel close can: kvaser_usb: Don't free packets when tight on URBs USB: keyspan: fix null-deref at probe USB: cp210x: add IDs for CEL USB sticks and MeshWorks devices USB: cp210x: fix ID for production CEL MeshConnect USB Stick usb: dwc3: gadget: Stop TRB preparation after limit is reached usb: dwc3: gadget: Fix TRB preparation during SG OHCI: add a quirk for ULi M5237 blocking on reset gpiolib: of: Correct error handling in of_get_named_gpiod_flags NFSv4.1: Fix client id trunking on Linux ftrace/jprobes/x86: Fix conflict between jprobes and function graph tracing vfio-pci: Fix the check on pci device type in vfio_pci_probe() uvcvideo: Fix destruction order in uvc_delete() smiapp: Take mutex during PLL update in sensor initialisation af9005: fix kernel panic on init if compiled without IR smiapp-pll: Correct clock debug prints video/logo: prevent use of logos after they have been freed storvsc: ring buffer failures may result in I/O freeze iscsi-target: Fail connection on short sendmsg writes hp_accel: Add support for HP ZBook 15 cfg80211: Fix 160 MHz channels with 80+80 and 160 MHz drivers ARC: [nsimosci] move peripherals to match model to FPGA drm/i915: Force the CS stall for invalidate flushes drm/i915: Invalidate media caches on gen7 drm/radeon: properly filter DP1.2 4k modes on non-DP1.2 hw drm/radeon: check the right ring in radeon_evict_flags() drm/vmwgfx: Fix fence event code enic: fix rx skb checksum alx: fix alx_poll() tcp: Do not apply TSO segment limit to non-TSO packets tg3: tg3_disable_ints using uninitialized mailbox value to disable interrupts netlink: Don't reorder loads/stores before marking mmap netlink frame as available netlink: Always copy on mmap TX. Linux 3.10.65 mm: Don't count the stack guard page towards RLIMIT_STACK mm: propagate error from stack expansion even for guard page mm, vmscan: prevent kswapd livelock due to pfmemalloc-throttled process being killed perf session: Do not fail on processing out of order event perf: Fix events installation during moving group perf/x86/intel/uncore: Make sure only uncore events are collected Btrfs: don't delay inode ref updates during log replay ARM: mvebu: disable I/O coherency on non-SMP situations on Armada 370/375/38x/XP scripts/kernel-doc: don't eat struct members with __aligned nilfs2: fix the nilfs_iget() vs. nilfs_new_inode() races nfsd4: fix xdr4 inclusion of escaped char fs: nfsd: Fix signedness bug in compare_blob serial: samsung: wait for transfer completion before clock disable writeback: fix a subtle race condition in I_DIRTY clearing cdc-acm: memory leak in error case genhd: check for int overflow in disk_expand_part_tbl() USB: cdc-acm: check for valid interfaces ALSA: hda - Fix wrong gpio_dir & gpio_mask hint setups for IDT/STAC codecs ALSA: hda - using uninitialized data ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC driver core: Fix unbalanced device reference in drivers_probe x86, vdso: Use asm volatile in __getcpu x86_64, vdso: Fix the vdso address randomization algorithm HID: Add a new id 0x501a for Genius MousePen i608X HID: add battery quirk for USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO keyboard HID: roccat: potential out of bounds in pyra_sysfs_write_settings() HID: i2c-hid: prevent buffer overflow in early IRQ HID: i2c-hid: fix race condition reading reports iommu/vt-d: Fix an off-by-one bug in __domain_mapping() UBI: Fix double free after do_sync_erase() UBI: Fix invalid vfree() pstore-ram: Allow optional mapping with pgprot_noncached pstore-ram: Fix hangs by using write-combine mappings PCI: Restore detection of read-only BARs ASoC: dwc: Ensure FIFOs are flushed to prevent channel swap ASoC: max98090: Fix ill-defined sidetone route ASoC: sigmadsp: Refuse to load firmware files with a non-supported version ath5k: fix hardware queue index assignment swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single can: peak_usb: fix memset() usage can: peak_usb: fix cleanup sequence order in case of error during init ath9k: fix BE/BK queue order ath9k_hw: fix hardware queue allocation ocfs2: fix journal commit deadlock Linux 3.10.64 Btrfs: fix fs corruption on transaction abort if device supports discard Btrfs: do not move em to modified list when unpinning eCryptfs: Remove buggy and unnecessary write in file name decode routine eCryptfs: Force RO mount when encrypted view is enabled udf: Verify symlink size before loading it exit: pidns: alloc_pid() leaks pid_namespace if child_reaper is exiting ncpfs: return proper error from NCP_IOC_SETROOT ioctl crypto: af_alg - fix backlog handling userns: Unbreak the unprivileged remount tests userns: Allow setting gid_maps without privilege when setgroups is disabled userns: Add a knob to disable setgroups on a per user namespace basis userns: Rename id_map_mutex to userns_state_mutex userns: Only allow the creator of the userns unprivileged mappings userns: Check euid no fsuid when establishing an unprivileged uid mapping userns: Don't allow unprivileged creation of gid mappings userns: Don't allow setgroups until a gid mapping has been setablished userns: Document what the invariant required for safe unprivileged mappings. groups: Consolidate the setgroups permission checks umount: Disallow unprivileged mount force mnt: Update unprivileged remount test mnt: Implicitly add MNT_NODEV on remount when it was implicitly added by mount mac80211: free management frame keys when removing station mac80211: fix multicast LED blinking and counter KEYS: Fix stale key registration at error path isofs: Fix unchecked printing of ER records x86/tls: Don't validate lm in set_thread_area() after all dm space map metadata: fix sm_bootstrap_get_nr_blocks() dm bufio: fix memleak when using a dm_buffer's inline bio nfs41: fix nfs4_proc_layoutget error handling megaraid_sas: corrected return of wait_event from abort frame path mmc: block: add newline to sysfs display of force_ro mfd: tc6393xb: Fail ohci suspend if full state restore is required md/bitmap: always wait for writes on unplug. x86, kvm: Clear paravirt_enabled on KVM guests for espfix32's benefit x86_64, switch_to(): Load TLS descriptors before switching DS and ES x86/tls: Disallow unusual TLS segments x86/tls: Validate TLS entries to protect espfix isofs: Fix infinite looping over CE entries Linux 3.10.63 ALSA: usb-audio: Don't resubmit pending URBs at MIDI error recovery powerpc: 32 bit getcpu VDSO function uses 64 bit instructions ARM: sched_clock: Load cycle count after epoch stabilizes igb: bring link up when PHY is powered up ext2: Fix oops in ext2_get_block() called from ext2_quota_write() nEPT: Nested INVEPT net: sctp: use MAX_HEADER for headroom reserve in output path net: mvneta: fix Tx interrupt delay rtnetlink: release net refcnt on error in do_setlink() net/mlx4_core: Limit count field to 24 bits in qp_alloc_res tg3: fix ring init when there are more TX than RX channels ipv6: gre: fix wrong skb->protocol in WCCP sata_fsl: fix error handling of irq_of_parse_and_map ahci: disable MSI on SAMSUNG 0xa800 SSD AHCI: Add DeviceIDs for Sunrise Point-LP SATA controller media: smiapp: Only some selection targets are settable drm/i915: Unlock panel even when LVDS is disabled drm/radeon: kernel panic in drm_calc_vbltimestamp_from_scanoutpos with 3.18.0-rc6 i2c: davinci: generate STP always when NACK is received i2c: omap: fix i207 errata handling i2c: omap: fix NACK and Arbitration Lost irq handling xen-netfront: Remove BUGs on paged skb data which crosses a page boundary mm: fix swapoff hang after page migration and fork mm: frontswap: invalidate expired data on a dup-store failure Linux 3.10.62 nfsd: Fix ACL null pointer deref powerpc/powernv: Honor the generic "no_64bit_msi" flag bnx2fc: do not add shared skbs to the fcoe_rx_list nfsd4: fix leak of inode reference on delegation failure nfsd: Fix slot wake up race in the nfsv4.1 callback code rt2x00: do not align payload on modern H/W can: dev: avoid calling kfree_skb() from interrupt context spi: dw: Fix dynamic speed change. iser-target: Handle DEVICE_REMOVAL event on network portal listener correctly target: Don't call TFO->write_pending if data_length == 0 srp-target: Retry when QP creation fails with ENOMEM Input: xpad - use proper endpoint type ARM: 8222/1: mvebu: enable strex backoff delay ARM: 8216/1: xscale: correct auxiliary register in suspend/resume ALSA: usb-audio: Add ctrl message delay quirk for Marantz/Denon devices can: esd_usb2: fix memory leak on disconnect USB: xhci: don't start a halted endpoint before its new dequeue is set usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000 usb: serial: ftdi_sio: add PIDs for Matrix Orbital products USB: serial: cp210x: add IDs for CEL MeshConnect USB Stick USB: keyspan: fix tty line-status reporting USB: keyspan: fix overrun-error reporting USB: ssu100: fix overrun-error reporting iio: Fix IIO_EVENT_CODE_EXTRACT_DIR bit mask powerpc/pseries: Fix endiannes issue in RTAS call from xmon powerpc/pseries: Honor the generic "no_64bit_msi" flag of/base: Fix PowerPC address parsing hack ASoC: wm_adsp: Avoid attempt to free buffers that might still be in use ASoC: sgtl5000: Fix SMALL_POP bit definition PCI/MSI: Add device flag indicating that 64-bit MSIs don't work ipx: fix locking regression in ipx_sendmsg and ipx_recvmsg pptp: fix stack info leak in pptp_getname() qmi_wwan: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem ieee802154: fix error handling in ieee802154fake_probe() ipv4: Fix incorrect error code when adding an unreachable route inetdevice: fixed signed integer overflow sparc64: Fix constraints on swab helpers. uprobes, x86: Fix _TIF_UPROBE vs _TIF_NOTIFY_RESUME x86, mm: Set NX across entire PMD at boot x86: Require exact match for 'noxsave' command line option x86_64, traps: Rework bad_iret x86_64, traps: Stop using IST for #SS x86_64, traps: Fix the espfix64 #DF fixup and rewrite it in C MIPS: Loongson: Make platform serial setup always built-in. MIPS: oprofile: Fix backtrace on 64-bit kernel Linux 3.10.61 mm: memcg: handle non-error OOM situations more gracefully mm: memcg: do not trap chargers with full callstack on OOM mm: memcg: rework and document OOM waiting and wakeup mm: memcg: enable memcg OOM killer only for user faults x86: finish user fault error path with fatal signal arch: mm: pass userspace fault flag to generic fault handler arch: mm: do not invoke OOM killer on kernel fault OOM arch: mm: remove obsolete init OOM protection mm: invoke oom-killer from remaining unconverted page fault handlers net: sctp: fix skb_over_panic when receiving malformed ASCONF chunks net: sctp: fix panic on duplicate ASCONF chunks net: sctp: fix remote memory pressure from excessive queueing KVM: x86: Don't report guest userspace emulation error to userspace SCSI: hpsa: fix a race in cmd_free/scsi_done net/mlx4_en: Fix BlueFlame race ARM: Correct BUG() assembly to ensure it is endian-agnostic perf/x86/intel: Use proper dTLB-load-misses event on IvyBridge mei: bus: fix possible boundaries violation perf: Handle compat ioctl MIPS: Fix forgotten preempt_enable() when CPU has inclusive pcaches dell-wmi: Fix access out of memory ARM: probes: fix instruction fetch order with <asm/opcodes.h> br: fix use of ->rx_handler_data in code executed on non-rx_handler path netfilter: nf_nat: fix oops on netns removal netfilter: xt_bpf: add mising opaque struct sk_filter definition netfilter: nf_log: release skbuff on nlmsg put failure netfilter: nfnetlink_log: fix maximum packet length logged to userspace netfilter: nf_log: account for size of NLMSG_DONE attribute ipc: always handle a new value of auto_msgmni clocksource: Remove "weak" from clocksource_default_clock() declaration kgdb: Remove "weak" from kgdb_arch_pc() declaration media: ttusb-dec: buffer overflow in ioctl NFSv4: Fix races between nfs_remove_bad_delegation() and delegation return nfs: Fix use of uninitialized variable in nfs_getattr() NFS: Don't try to reclaim delegation open state if recovery failed NFSv4: Ensure that we remove NFSv4.0 delegations when state has expired Input: alps - allow up to 2 invalid packets without resetting device Input: alps - ignore potential bare packets when device is out of sync dm raid: ensure superblock's size matches device's logical block size dm btree: fix a recursion depth bug in btree walking code block: Fix computation of merged request priority parisc: Use compat layer for msgctl, shmat, shmctl and semtimedop syscalls scsi: only re-lock door after EH on devices that were reset nfs: fix pnfs direct write memory leak firewire: cdev: prevent kernel stack leaking into ioctl arguments arm64: __clear_user: handle exceptions on strb ARM: 8198/1: make kuser helpers depend on MMU drm/radeon: add missing crtc unlock when setting up the MC mac80211: fix use-after-free in defragmentation macvtap: Fix csum_start when VLAN tags are present iwlwifi: configure the LTR libceph: do not crash on large auth tickets xtensa: re-wire umount syscall to sys_oldumount ALSA: usb-audio: Fix memory leak in FTU quirk ahci: disable MSI instead of NCQ on Samsung pci-e SSDs on macbooks ahci: Add Device IDs for Intel Sunrise Point PCH audit: keep inode pinned x86, x32, audit: Fix x32's AUDIT_ARCH wrt audit sparc32: Implement xchg and atomic_xchg using ATOMIC_HASH locks sparc64: Do irq_{enter,exit}() around generic_smp_call_function*(). sparc64: Fix crashes in schizo_pcierr_intr_other(). sunvdc: don't call VD_OP_GET_VTOC vio: fix reuse of vio_dring slot sunvdc: limit each sg segment to a page sunvdc: compute vdisk geometry from capacity sunvdc: add cdrom and v1.1 protocol support net: sctp: fix memory leak in auth key management net: sctp: fix NULL pointer dereference in af->from_addr_param on malformed packet gre6: Move the setting of dev->iflink into the ndo_init functions. ip6_tunnel: Use ip6_tnl_dev_init as the ndo_init function. Linux 3.10.60 libceph: ceph-msgr workqueue needs a resque worker Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup of: Fix overflow bug in string property parsing functions sysfs: driver core: Fix glue dir race condition by gdp_mutex i2c: at91: don't account as iowait acer-wmi: Add acpi_backlight=video quirk for the Acer KAV80 rbd: Fix error recovery in rbd_obj_read_sync() drm/radeon: remove invalid pci id usb: gadget: udc: core: fix kernel oops with soft-connect usb: gadget: function: acm: make f_acm pass USB20CV Chapter9 usb: dwc3: gadget: fix set_halt() bug with pending transfers crypto: algif - avoid excessive use of socket buffer in skcipher mm: Remove false WARN_ON from pagecache_isize_extended() x86, apic: Handle a bad TSC more gracefully posix-timers: Fix stack info leak in timer_create() mac80211: fix typo in starting baserate for rts_cts_rate_idx PM / Sleep: fix recovery during resuming from hibernation tty: Fix high cpu load if tty is unreleaseable quota: Properly return errors from dquot_writeback_dquots() ext3: Don't check quota format when there are no quota files nfsd4: fix crash on unknown operation number cpc925_edac: Report UE events properly e7xxx_edac: Report CE events properly i3200_edac: Report CE events properly i82860_edac: Report CE events properly scsi: Fix error handling in SCSI_IOCTL_SEND_COMMAND lib/bitmap.c: fix undefined shift in __bitmap_shift_{left|right}() cgroup/kmemleak: add kmemleak_free() for cgroup deallocations. usb: Do not allow usb_alloc_streams on unconfigured devices USB: opticon: fix non-atomic allocation in write path usb-storage: handle a skipped data phase spi: pxa2xx: toggle clocks on suspend if not disabled by runtime PM spi: pl022: Fix incorrect dma_unmap_sg usb: dwc3: gadget: Properly initialize LINK TRB wireless: rt2x00: add new rt2800usb device USB: option: add Haier CE81B CDMA modem usb: option: add support for Telit LE910 USB: cdc-acm: only raise DTR on transitions from B0 USB: cdc-acm: add device id for GW Instek AFG-2225 usb: serial: ftdi_sio: add "bricked" FTDI device PID usb: serial: ftdi_sio: add Awinda Station and Dongle products USB: serial: cp210x: add Silicon Labs 358x VID and PID serial: Fix divide-by-zero fault in uart_get_divisor() staging:iio:ade7758: Remove "raw" from channel name staging:iio:ade7758: Fix check if channels are enabled in prenable staging:iio:ade7758: Fix NULL pointer deref when enabling buffer staging:iio:ad5933: Drop "raw" from channel names staging:iio:ad5933: Fix NULL pointer deref when enabling buffer OOM, PM: OOM killed task shouldn't escape PM suspend freezer: Do not freeze tasks killed by OOM killer ext4: fix oops when loading block bitmap failed cpufreq: intel_pstate: Fix setting max_perf_pct in performance policy ext4: fix overflow when updating superblock backups after resize ext4: check s_chksum_driver when looking for bg csum presence ext4: fix reservation overflow in ext4_da_write_begin ext4: add ext4_iget_normal() which is to be used for dir tree lookups ext4: grab missed write_count for EXT4_IOC_SWAP_BOOT ext4: don't check quota format when there are no quota files ext4: check EA value offset when loading jbd2: free bh when descriptor block checksum fails MIPS: tlbex: Properly fix HUGE TLB Refill exception handler target: Fix APTPL metadata handling for dynamic MappedLUNs target: Fix queue full status NULL pointer for SCF_TRANSPORT_TASK_SENSE qla_target: don't delete changed nacls ARC: Update order of registers in KGDB to match GDB 7.5 ARC: [nsimosci] Allow "headless" models to boot KVM: x86: Emulator fixes for eip canonical checks on near branches KVM: x86: Fix wrong masking on relative jump/call kvm: x86: don't kill guest on unknown exit reason KVM: x86: Check non-canonical addresses upon WRMSR KVM: x86: Improve thread safety in pit KVM: x86: Prevent host from panicking on shared MSR writes. kvm: fix excessive pages un-pinning in kvm_iommu_map error path. media: tda7432: Fix setting TDA7432_MUTE bit for TDA7432_RF register media: ds3000: fix LNB supply voltage on Tevii S480 on initialization media: em28xx-v4l: give back all active video buffers to the vb2 core properly on streaming stop media: v4l2-common: fix overflow in v4l_bound_align_image() drm/nouveau/bios: memset dcb struct to zero before parsing drm/tilcdc: Fix the error path in tilcdc_load() drm/ast: Fix HW cursor image Input: i8042 - quirks for Fujitsu Lifebook A544 and Lifebook AH544 Input: i8042 - add noloop quirk for Asus X750LN framebuffer: fix border color modules, lock around setting of MODULE_STATE_UNFORMED dm log userspace: fix memory leak in dm_ulog_tfr_init failure path block: fix alignment_offset math that assumes io_min is a power-of-2 drbd: compute the end before rb_insert_augmented() dm bufio: update last_accessed when relinking a buffer virtio_pci: fix virtio spec compliance on restore selinux: fix inode security list corruption pstore: Fix duplicate {console,ftrace}-efi entries mfd: rtsx_pcr: Fix MSI enable error handling mnt: Prevent pivot_root from creating a loop in the mount tree UBI: add missing kmem_cache_free() in process_pool_aeb error path random: add and use memzero_explicit() for clearing data crypto: more robust crypto_memneq fix misuses of f_count() in ppp and netlink kill wbuf_queued/wbuf_dwork_lock ALSA: pcm: Zero-clear reserved fields of PCM status ioctl in compat mode evm: check xattr value length and type in evm_inode_setxattr() x86, pageattr: Prevent overflow in slow_virt_to_phys() for X86_PAE x86_64, entry: Fix out of bounds read on sysenter x86_64, entry: Filter RFLAGS.NT on entry from userspace x86, flags: Rename X86_EFLAGS_BIT1 to X86_EFLAGS_FIXED x86, fpu: shift drop_init_fpu() from save_xstate_sig() to handle_signal() x86, fpu: __restore_xstate_sig()->math_state_restore() needs preempt_disable() x86: Reject x32 executables if x32 ABI not supported vfs: fix data corruption when blocksize < pagesize for mmaped data UBIFS: fix free log space calculation UBIFS: fix a race condition UBIFS: remove mst_mutex fs: Fix theoretical division by 0 in super_cache_scan(). fs: make cont_expand_zero interruptible mmc: rtsx_pci_sdmmc: fix incorrect last byte in R2 response libata-sff: Fix controllers with no ctl port pata_serverworks: disable 64-KB DMA transfers on Broadcom OSB4 IDE Controller Revert "percpu: free percpu allocation info for uniprocessor system" lockd: Try to reconnect if statd has moved drivers/net: macvtap and tun depend on INET ipv4: dst_entry leak in ip_send_unicast_reply() ax88179_178a: fix bonding failure ipv4: fix nexthop attlen check in fib_nh_match tracing/syscalls: Ignore numbers outside NR_syscalls' range Linux 3.10.59 ecryptfs: avoid to access NULL pointer when write metadata in xattr ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks ALSA: usb-audio: Add support for Steinberg UR22 USB interface ALSA: emu10k1: Fix deadlock in synth voice lookup ALSA: pcm: use the same dma mmap codepath both for arm and arm64 arm64: compat: fix compat types affecting struct compat_elf_prpsinfo spi: dw-mid: terminate ongoing transfers at exit kernel: add support for gcc 5 fanotify: enable close-on-exec on events' fd when requested in fanotify_init() mm: clear __GFP_FS when PF_MEMALLOC_NOIO is set Bluetooth: Fix issue with USB suspend in btusb driver Bluetooth: Fix HCI H5 corrupted ack value rt2800: correct BBP1_TX_POWER_CTRL mask PCI: Generate uppercase hex for modalias interface class PCI: Increase IBM ipr SAS Crocodile BARs to at least system page size iwlwifi: Add missing PCI IDs for the 7260 series NFSv4.1: Fix an NFSv4.1 state renewal regression NFSv4: fix open/lock state recovery error handling NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails lzo: check for length overrun in variable length encoding. Revert "lzo: properly check for overruns" Documentation: lzo: document part of the encoding m68k: Disable/restore interrupts in hwreg_present()/hwreg_write() Drivers: hv: vmbus: Fix a bug in vmbus_open() Drivers: hv: vmbus: Cleanup vmbus_establish_gpadl() Drivers: hv: vmbus: Cleanup vmbus_teardown_gpadl() Drivers: hv: vmbus: Cleanup vmbus_post_msg() firmware_class: make sure fw requests contain a name qla2xxx: Use correct offset to req-q-out for reserve calculation mptfusion: enable no_write_same for vmware scsi disks be2iscsi: check ip buffer before copying regmap: fix NULL pointer dereference in _regmap_write/read regmap: debugfs: fix possbile NULL pointer dereference spi: dw-mid: check that DMA was inited before exit spi: dw-mid: respect 8 bit mode x86/intel/quark: Switch off CR4.PGE so TLB flush uses CR3 instead kvm: don't take vcpu mutex for obviously invalid vcpu ioctls KVM: s390: unintended fallthrough for external call kvm: x86: fix stale mmio cache bug fs: Add a missing permission check to do_umount Btrfs: fix race in WAIT_SYNC ioctl Btrfs: fix build_backref_tree issue with multiple shared blocks Btrfs: try not to ENOSPC on log replay Linux 3.10.58 USB: cp210x: add support for Seluxit USB dongle USB: serial: cp210x: added Ketra N1 wireless interface support USB: Add device quirk for ASUS T100 Base Station keyboard ipv6: reallocate addrconf router for ipv6 address when lo device up tcp: fixing TLP's FIN recovery sctp: handle association restarts when the socket is closed. ip6_gre: fix flowi6_proto value in xmit path hyperv: Fix a bug in netvsc_start_xmit() tg3: Allow for recieve of full-size 8021AD frames tg3: Work around HW/FW limitations with vlan encapsulated frames l2tp: fix race while getting PMTU on PPP pseudo-wire openvswitch: fix panic with multiple vlan headers packet: handle too big packets for PACKET_V3 tcp: fix tcp_release_cb() to dispatch via address family for mtu_reduced() sit: Fix ipip6_tunnel_lookup device matching criteria myri10ge: check for DMA mapping errors Linux 3.10.57 cpufreq: ondemand: Change the calculation of target frequency cpufreq: Fix wrong time unit conversion nl80211: clear skb cb before passing to netlink drbd: fix regression 'out of mem, failed to invoke fence-peer helper' jiffies: Fix timeval conversion to jiffies md/raid5: disable 'DISCARD' by default due to safety concerns. media: vb2: fix VBI/poll regression mm: numa: Do not mark PTEs pte_numa when splitting huge pages mm, thp: move invariant bug check out of loop in __split_huge_page_map ring-buffer: Fix infinite spin in reading buffer init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu perf: fix perf bug in fork() udf: Avoid infinite loop when processing indirect ICBs Linux 3.10.56 vm_is_stack: use for_each_thread() rather then buggy while_each_thread() oom_kill: add rcu_read_lock() into find_lock_task_mm() oom_kill: has_intersects_mems_allowed() needs rcu_read_lock() oom_kill: change oom_kill.c to use for_each_thread() introduce for_each_thread() to replace the buggy while_each_thread() kernel/fork.c:copy_process(): unify CLONE_THREAD-or-thread_group_leader code arm: multi_v7_defconfig: Enable Zynq UART driver ext2: Fix fs corruption in ext2_get_xip_mem() serial: 8250_dma: check the result of TX buffer mapping ARM: 7748/1: oabi: handle faults when loading swi instruction from userspace netfilter: nf_conntrack: avoid large timeout for mid-stream pickup PM / sleep: Use valid_state() for platform-dependent sleep states only PM / sleep: Add state field to pm_states[] entries ipvs: fix ipv6 hook registration for local replies ipvs: Maintain all DSCP and ECN bits for ipv6 tun forwarding ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack md/raid1: fix_read_error should act on all non-faulty devices. media: cx18: fix kernel oops with tda8290 tuner Fix nasty 32-bit overflow bug in buffer i/o code. perf kmem: Make it work again on non NUMA machines perf: Fix a race condition in perf_remove_from_context() alarmtimer: Lock k_itimer during timer callback alarmtimer: Do not signal SIGEV_NONE timers parisc: Only use -mfast-indirect-calls option for 32-bit kernel builds powerpc/perf: Fix ABIv2 kernel backtraces sched: Fix unreleased llc_shared_mask bit during CPU hotplug ocfs2/dlm: do not get resource spinlock if lockres is new nilfs2: fix data loss with mmap() fs/notify: don't show f_handle if exportfs_encode_inode_fh failed fsnotify/fdinfo: use named constants instead of hardcoded values kcmp: fix standard comparison bug Revert "mac80211: disable uAPSD if all ACs are under ACM" usb: dwc3: core: fix ordering for PHY suspend usb: dwc3: core: fix order of PM runtime calls usb: host: xhci: fix compliance mode workaround genhd: fix leftover might_sleep() in blk_free_devt() lockd: fix rpcbind crash on lockd startup failure rtlwifi: rtl8192cu: Add new ID percpu: perform tlb flush after pcpu_map_pages() failure percpu: fix pcpu_alloc_pages() failure path percpu: free percpu allocation info for uniprocessor system ata_piix: Add Device IDs for Intel 9 Series PCH Input: i8042 - add nomux quirk for Avatar AVIU-145A6 Input: i8042 - add Fujitsu U574 to no_timeout dmi table Input: atkbd - do not try 'deactivate' keyboard on any LG laptops Input: elantech - fix detection of touchpad on ASUS s301l Input: synaptics - add support for ForcePads Input: serport - add compat handling for SPIOCSTYPE ioctl dm crypt: fix access beyond the end of allocated space block: Fix dev_t minor allocation lifetime workqueue: apply __WQ_ORDERED to create_singlethread_workqueue() Revert "iwlwifi: dvm: don't enable CTS to self" SCSI: libiscsi: fix potential buffer overrun in __iscsi_conn_send_pdu NFC: microread: Potential overflows in microread_target_discovered() iscsi-target: Fix memory corruption in iscsit_logout_post_handler_diffcid iscsi-target: avoid NULL pointer in iscsi_copy_param_list failure Target/iser: Don't put isert_conn inside disconnected handler Target/iser: Get isert_conn reference once got to connected_handler iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name iio:magnetometer: bugfix magnetometers gain values iio: adc: ad_sigma_delta: Fix indio_dev->trig assignment iio: st_sensors: Fix indio_dev->trig assignment iio: meter: ade7758: Fix indio_dev->trig assignment iio: inv_mpu6050: Fix indio_dev->trig assignment iio: gyro: itg3200: Fix indio_dev->trig assignment iio:trigger: modify return value for iio_trigger_get CIFS: Fix SMB2 readdir error handling CIFS: Fix directory rename error ASoC: davinci-mcasp: Correct rx format unit configuration shmem: fix nlink for rename overwrite directory x86 early_ioremap: Increase FIX_BTMAPS_SLOTS to 8 KVM: x86: handle idiv overflow at kvm_write_tsc regmap: Fix handling of volatile registers for format_write() chips ACPICA: Update to GPIO region handler interface. MIPS: mcount: Adjust stack pointer for static trace in MIPS32 MIPS: ZBOOT: add missing <linux/string.h> include ARM: 8165/1: alignment: don't break misaligned NEON load/store ARM: 7897/1: kexec: Use the right ISA for relocate_new_kernel ARM: 8133/1: use irq_set_affinity with force=false when migrating irqs ARM: 8128/1: abort: don't clear the exclusive monitors NFSv4: Fix another bug in the close/open_downgrade code NFSv4: nfs4_state_manager() vs. nfs_server_remove_lists() usb:hub set hub->change_bits when over-current happens usb: dwc3: omap: fix ordering for runtime pm calls USB: EHCI: unlink QHs even after the controller has stopped USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter storage: Add single-LUN quirk for Jaz USB Adapter usb: hub: take hub->hdev reference when processing from eventlist xhci: fix oops when xhci resumes from hibernate with hw lpm capable devices xhci: Fix null pointer dereference if xhci initialization fails USB: zte_ev: fix removed PIDs USB: ftdi_sio: add support for NOVITUS Bono E thermal printer USB: sierra: add 1199:68AA device ID USB: sierra: avoid CDC class functions on "68A3" devices USB: zte_ev: remove duplicate Qualcom PID USB: zte_ev: remove duplicate Gobi PID Revert "USB: option,zte_ev: move most ZTE CDMA devices to zte_ev" USB: option: add VIA Telecom CDS7 chipset device id USB: option: reduce interrupt-urb logging verbosity USB: serial: fix potential heap buffer overflow USB: sisusb: add device id for Magic Control USB video USB: serial: fix potential stack buffer overflow USB: serial: pl2303: add device id for ztek device xtensa: fix a6 and a7 handling in fast_syscall_xtensa xtensa: fix TLBTEMP_BASE_2 region handling in fast_second_level_miss xtensa: fix access to THREAD_RA/THREAD_SP/THREAD_DS xtensa: fix address checks in dma_{alloc,free}_coherent xtensa: replace IOCTL code definitions with constants drm/radeon: add connector quirk for fujitsu board drm/vmwgfx: Fix a potential infinite spin waiting for fifo idle drm/ast: AST2000 cannot be detected correctly drm/i915: Wait for vblank before enabling the TV encoder drm/i915: Remove bogus __init annotation from DMI callbacks HID: logitech-dj: prevent false errors to be shown HID: magicmouse: sanity check report size in raw_event() callback HID: picolcd: sanity check report size in raw_event() callback cfq-iosched: Fix wrong children_weight calculation ALSA: pcm: fix fifo_size frame calculation ALSA: hda - Fix invalid pin powermap without jack detection ALSA: hda - Fix COEF setups for ALC1150 codec ALSA: core: fix buffer overflow in snd_info_get_line() arm64: ptrace: fix compat hardware watchpoint reporting trace: Fix epoll hang when we race with new entries i2c: at91: Fix a race condition during signal handling in at91_do_twi_xfer. i2c: at91: add bound checking on SMBus block length bytes arm64: flush TLS registers during exec ibmveth: Fix endian issues with rx_no_buffer statistic ahci: add pcid for Marvel 0x9182 controller ahci: Add Device IDs for Intel 9 Series PCH pata_scc: propagate return value of scc_wait_after_reset drm/i915: read HEAD register back in init_ring_common() to enforce ordering drm/radeon: load the lm63 driver for an lm64 thermal chip. drm/ttm: Choose a pool to shrink correctly in ttm_dma_pool_shrink_scan(). drm/ttm: Fix possible division by 0 in ttm_dma_pool_shrink_scan(). drm/tilcdc: fix double kfree drm/tilcdc: fix release order on exit drm/tilcdc: panel: fix leak when unloading the module drm/tilcdc: tfp410: fix dangling sysfs connector node drm/tilcdc: slave: fix dangling sysfs connector node drm/tilcdc: panel: fix dangling sysfs connector node carl9170: fix sending URBs with wrong type when using full-speed Linux 3.10.55 libceph: gracefully handle large reply messages from the mon libceph: rename ceph_msg::front_max to front_alloc_len tpm: Provide a generic means to override the chip returned timeouts vfs: fix bad hashing of dentries dcache.c: get rid of pointless macros IB/srp: Fix deadlock between host removal and multipathd blkcg: don't call into policy draining if root_blkg is already gone mtd: nand: omap: Fix 1-bit Hamming code scheme, omap_calculate_ecc() mtd/ftl: fix the double free of the buffers allocated in build_maps() CIFS: Fix wrong restart readdir for SMB1 CIFS: Fix wrong filename length for SMB2 CIFS: Fix wrong directory attributes after rename CIFS: Possible null ptr deref in SMB2_tcon CIFS: Fix async reading on reconnects CIFS: Fix STATUS_CANNOT_DELETE error mapping for SMB2 libceph: do not hard code max auth ticket len libceph: add process_one_ticket() helper libceph: set last_piece in ceph_msg_data_pages_cursor_init() correctly md/raid1,raid10: always abort recover on write error. xfs: don't zero partial page cache pages during O_DIRECT writes xfs: don't zero partial page cache pages during O_DIRECT writes xfs: don't dirty buffers beyond EOF xfs: quotacheck leaves dquot buffers without verifiers RDMA/iwcm: Use a default listen backlog if needed md/raid10: Fix memory leak when raid10 reshape completes. md/raid10: fix memory leak when reshaping a RAID10. md/raid6: avoid data corruption during recovery of double-degraded RAID6 Bluetooth: Avoid use of session socket after the session gets freed Bluetooth: never linger on process exit mnt: Add tests for unprivileged remount cases that have found to be faulty mnt: Change the default remount atime from relatime to the existing value mnt: Correct permission checks in do_remount mnt: Move the test for MNT_LOCK_READONLY from change_mount_flags into do_remount mnt: Only change user settable mount flags in remount ring-buffer: Up rb_iter_peek() loop count to 3 ring-buffer: Always reset iterator to reader page ACPI / cpuidle: fix deadlock between cpuidle_lock and cpu_hotplug.lock ACPI: Run fixed event device notifications in process context ACPICA: Utilities: Fix memory leak in acpi_ut_copy_iobject_to_iobject bfa: Fix undefined bit shift on big-endian architectures with 32-bit DMA address ASoC: pxa-ssp: drop SNDRV_PCM_FMTBIT_S24_LE ASoC: max98090: Fix missing free_irq ASoC: samsung: Correct I2S DAI suspend/resume ops ASoC: wm_adsp: Add missing MODULE_LICENSE ASoC: pcm: fix dpcm_path_put in dpcm runtime update openrisc: Rework signal handling MIPS: Fix accessing to per-cpu data when flushing the cache MIPS: OCTEON: make get_system_type() thread-safe MIPS: asm: thread_info: Add _TIF_SECCOMP flag MIPS: Cleanup flags in syscall flags handlers. MIPS: asm/reg.h: Make 32- and 64-bit definitions available at the same time MIPS: Remove BUG_ON(!is_fpu_owner()) in do_ade() MIPS: tlbex: Fix a missing statement for HUGETLB MIPS: Prevent user from setting FCSR cause bits MIPS: GIC: Prevent array overrun drivers: scsi: storvsc: Correctly handle TEST_UNIT_READY failure Drivers: scsi: storvsc: Implement a eh_timed_out handler powerpc/pseries: Failure on removing device node powerpc/mm: Use read barrier when creating real_pte powerpc/mm/numa: Fix break placement regulator: arizona-ldo1: remove bypass functionality mfd: omap-usb-host: Fix improper mask use. kernel/smp.c:on_each_cpu_cond(): fix warning in fallback path CAPABILITIES: remove undefined caps from all processes tpm: missing tpm_chip_put in tpm_get_random() firmware: Do not use WARN_ON(!spin_is_locked()) spi: omap2-mcspi: Configure hardware when slave driver changes mode spi: orion: fix incorrect handling of cell-index DT property iommu/amd: Fix cleanup_domain for mass device removal media: media-device: Remove duplicated memset() in media_enum_entities() media: au0828: Only alt setting logic when needed media: xc4000: Fix get_frequency() media: xc5000: Fix get_frequency() Linux 3.10.54 USB: fix build error with CONFIG_PM_RUNTIME disabled NFSv4: Fix problems with close in the presence of a delegation NFSv3: Fix another acl regression svcrdma: Select NFSv4.1 backchannel transport based on forward channel NFSD: Decrease nfsd_users in nfsd_startup_generic fail usb: hub: Prevent hub autosuspend if usbcore.autosuspend is -1 USB: whiteheat: Added bounds checking for bulk command response USB: ftdi_sio: Added PID for new ekey device USB: ftdi_sio: add Basic Micro ATOM Nano USB2Serial PID ARM: OMAP2+: hwmod: Rearm wake-up interrupts for DT when MUSB is idled usb: xhci: amd chipset also needs short TX quirk xhci: Treat not finding the event_seg on COMP_STOP the same as COMP_STOP_INVAL Staging: speakup: Update __speakup_paste_selection() tty (ab)usage to match vt jbd2: fix infinite loop when recovering corrupt journal blocks mei: nfc: fix memory leak in error path mei: reset client state on queued connect request Btrfs: fix csum tree corruption, duplicate and outdated checksums hpsa: fix bad -ENOMEM return value in hpsa_big_passthru_ioctl x86/efi: Enforce CONFIG_RELOCATABLE for EFI boot stub x86_64/vsyscall: Fix warn_bad_vsyscall log output x86: don't exclude low BIOS area when allocating address space for non-PCI cards drm/radeon: add additional SI pci ids ext4: fix BUG_ON in mb_free_blocks() kvm: iommu: fix the third parameter of kvm_iommu_put_pages (CVE-2014-3601) Revert "KVM: x86: Increase the number of fixed MTRR regs to 10" KVM: nVMX: fix "acknowledge interrupt on exit" when APICv is in use KVM: x86: always exit on EOIs for interrupts listed in the IOAPIC redir table KVM: x86: Inter-privilege level ret emulation is not implemeneted crypto: ux500 - make interrupt mode plausible serial: core: Preserve termios c_cflag for console resume ext4: fix ext4_discard_allocated_blocks() if we can't allocate the pa struct drivers/i2c/busses: use correct type for dma_map/unmap hwmon: (dme1737) Prevent overflow problem when writing large limits hwmon: (ads1015) Fix out-of-bounds array access hwmon: (lm85) Fix various errors on attribute writes hwmon: (ads1015) Fix off-by-one for valid channel index checking hwmon: (gpio-fan) Prevent overflow problem when writing large limits hwmon: (lm78) Fix overflow problems seen when writing large temperature limits hwmon: (sis5595) Prevent overflow problem when writing large limits drm: omapdrm: fix compiler errors ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX rev3.1.2 case. mei: start disconnect request timer consistently ALSA: hda/realtek - Avoid setting wrong COEF on ALC269 & co ALSA: hda/ca0132 - Don't try loading firmware at resume when already failed ALSA: virtuoso: add Xonar Essence STX II support ALSA: hda - fix an external mic jack problem on a HP machine USB: Fix persist resume of some SS USB devices USB: ehci-pci: USB host controller support for Intel Quark X1000 USB: serial: ftdi_sio: Add support for new Xsens devices USB: serial: ftdi_sio: Annotate the current Xsens PID assignments USB: OHCI: don't lose track of EDs when a controller dies isofs: Fix unbounded recursion when processing relocated directories HID: fix a couple of off-by-ones HID: logitech: perform bounds checking on device_id early enough stable_kernel_rules: Add pointer to netdev-FAQ for network patches Linux 3.10.53 arch/sparc/math-emu/math_32.c: drop stray break operator sparc64: ldc_connect() should not return EINVAL when handshake is in progress. sunsab: Fix detection of BREAK on sunsab serial console bbc-i2c: Fix BBC I2C envctrl on SunBlade 2000 sparc64: Guard against flushing openfirmware mappings. sparc64: Do not insert non-valid PTEs into the TSB hash table. sparc64: Add membar to Niagara2 memcpy code. sparc64: Fix huge TSB mapping on pre-UltraSPARC-III cpus. sparc64: Don't bark so loudly about 32-bit tasks generating 64-bit fault addresses. sparc64: Fix top-level fault handling bugs. sparc64: Handle 32-bit tasks properly in compute_effective_address(). sparc64: Make itc_sync_lock raw sparc64: Fix argument sign extension for compat_sys_futex(). sctp: fix possible seqlock seadlock in sctp_packet_transmit() iovec: make sure the caller actually wants anything in memcpy_fromiovecend net: Correctly set segment mac_len in skb_segment(). macvlan: Initialize vlan_features to turn on offload support. net: sctp: inherit auth_capable on INIT collisions tcp: Fix integer-overflow in TCP vegas tcp: Fix integer-overflows in TCP veno net: sendmsg: fix NULL pointer dereference ip: make IP identifiers less predictable inetpeer: get rid of ip_id_count bnx2x: fix crash during TSO tunneling Linux 3.10.52 x86/espfix/xen: Fix allocation of pages for paravirt page tables lib/btree.c: fix leak of whole btree nodes net/l2tp: don't fall back on UDP [get|set]sockopt net: mvneta: replace Tx timer with a real interrupt net: mvneta: add missing bit descriptions for interrupt masks and causes net: mvneta: do not schedule in mvneta_tx_timeout net: mvneta: use per_cpu stats to fix an SMP lock up net: mvneta: increase the 64-bit rx/tx stats out of the hot path Revert "mac80211: move "bufferable MMPDU" check to fix AP mode scan" staging: vt6655: Fix Warning on boot handle_irq_event_percpu. x86_64/entry/xen: Do not invoke espfix64 on Xen x86, espfix: Make it possible to disable 16-bit support x86, espfix: Make espfix64 a Kconfig option, fix UML x86, espfix: Fix broken header guard x86, espfix: Move espfix definitions into a separate header file x86-64, espfix: Don't leak bits 31:16 of %esp returning to 16-bit stack Revert "x86-64, modify_ldt: Make support for 16-bit segments a runtime option" timer: Fix lock inversion between hrtimer_bases.lock and scheduler locks printk: rename printk_sched to printk_deferred iio: buffer: Fix demux table creation staging: vt6655: Fix disassociated messages every 10 seconds mm, thp: do not allow thp faults to avoid cpuset restrictions scsi: handle flush errors properly rapidio/tsi721_dma: fix failure to obtain transaction descriptor cfg80211: fix mic_failure tracing ARM: 8115/1: LPAE: reduce damage caused by idmap to virtual memory layout crypto: af_alg - properly label AF_ALG socket Linux 3.10.51 core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errors x86/efi: Include a .bss section within the PE/COFF headers s390/ptrace: fix PSW mask check Fix gcc-4.9.0 miscompilation of load_balance() in scheduler mm: hugetlb: fix copy_hugetlb_page_range() x86_32, entry: Store badsys error code in %eax hwmon: (smsc47m192) Fix temperature limit and vrm write operations parisc: Remove SA_RESTORER define coredump: fix the setting of PF_DUMPCORE Input: fix defuzzing logic slab_common: fix the check for duplicate slab names slab_common: Do not check for duplicate slab names tracing: Fix wraparound problems in "uptime" trace clock blkcg: don't call into policy draining if root_blkg is already gone ahci: add support for the Promise FastTrak TX8660 SATA HBA (ahci mode) libata: introduce ata_host->n_tags to avoid oops on SAS controllers libata: support the ata host which implements a queue depth less than 32 block: don't assume last put of shared tags is for the host block: provide compat ioctl for BLKZEROOUT media: tda10071: force modulation to QPSK on DVB-S media: hdpvr: fix two audio bugs Linux 3.10.50 ARC: Implement ptrace(PTRACE_GET_THREAD_AREA) sched: Fix possible divide by zero in avg_atom() calculation locking/mutex: Disable optimistic spinning on some architectures PM / sleep: Fix request_firmware() error at resume dm cache metadata: do not allow the data block size to change dm thin metadata: do not allow the data block size to change alarmtimer: Fix bug where relative alarm timers were treated as absolute drm/radeon: avoid leaking edid data drm/qxl: return IRQ_NONE if it was not our irq drm/radeon: set default bl level to something reasonable irqchip: gic: Fix core ID calculation when topology is read from DT irqchip: gic: Add support for cortex a7 compatible string ring-buffer: Fix polling on trace_pipe mwifiex: fix Tx timeout issue perf/x86/intel: ignore CondChgd bit to avoid false NMI handling ipv4: fix buffer overflow in ip_options_compile() dns_resolver: Null-terminate the right string dns_resolver: assure that dns_query() result is null-terminated sunvnet: clean up objects created in vnet_new() on vnet_exit() net: pppoe: use correct channel MTU when using Multilink PPP net: sctp: fix information leaks in ulpevent layer tipc: clear 'next'-pointer of message fragments before reassembly be2net: set EQ DB clear-intr bit in be_open() netlink: Fix handling of error from netlink_dump(). net: mvneta: Fix big endian issue in mvneta_txq_desc_csum() net: mvneta: fix operation in 10 Mbit/s mode appletalk: Fix socket referencing in skb tcp: fix false undo corner cases igmp: fix the problem when mc leave group net: qmi_wwan: add two Sierra Wireless/Netgear devices net: qmi_wwan: Add ID for Telewell TW-LTE 4G v2 ipv4: icmp: Fix pMTU handling for rare case tcp: Fix divide by zero when pushing during tcp-repair bnx2x: fix possible panic under memory stress net: fix sparse warning in sk_dst_set() ipv4: irq safe sk_dst_[re]set() and ipv4_sk_update_pmtu() fix ipv4: fix dst race in sk_dst_get() 8021q: fix a potential memory leak net: sctp: check proc_dointvec result in proc_sctp_do_auth tcp: fix tcp_match_skb_to_sack() for unaligned SACK at end of an skb ip_tunnel: fix ip_tunnel_lookup shmem: fix splicing from a hole while it's punched shmem: fix faulting into a hole, not taking i_mutex shmem: fix faulting into a hole while it's punched iwlwifi: dvm: don't enable CTS to self igb: do a reset on SR-IOV re-init if device is down hwmon: (adt7470) Fix writes to temperature limit registers hwmon: (da9052) Don't use dash in the name attribute hwmon: (da9055) Don't use dash in the name attribute tracing: Add ftrace_trace_stack into __trace_puts/__trace_bputs tracing: Fix graph tracer with stack tracer on other archs fuse: handle large user and group ID Bluetooth: Ignore H5 non-link packets in non-active state Drivers: hv: util: Fix a bug in the KVP code media: gspca_pac7302: Add new usb-id for Genius i-Look 317 usb: Check if port status is equal to RxDetect Change-Id: I8791794ed100d5090dc52aef615d32e816fcfa1f Signed-off-by: Ian Maund <imaund@codeaurora.org>
7073 lines
187 KiB
C
7073 lines
187 KiB
C
/* memcontrol.c - Memory Controller
|
|
*
|
|
* Copyright IBM Corporation, 2007
|
|
* Author Balbir Singh <balbir@linux.vnet.ibm.com>
|
|
*
|
|
* Copyright 2007 OpenVZ SWsoft Inc
|
|
* Author: Pavel Emelianov <xemul@openvz.org>
|
|
*
|
|
* Memory thresholds
|
|
* Copyright (C) 2009 Nokia Corporation
|
|
* Author: Kirill A. Shutemov
|
|
*
|
|
* Kernel Memory Controller
|
|
* Copyright (C) 2012 Parallels Inc. and Google Inc.
|
|
* Authors: Glauber Costa and Suleiman Souhlal
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/res_counter.h>
|
|
#include <linux/memcontrol.h>
|
|
#include <linux/cgroup.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/hugetlb.h>
|
|
#include <linux/pagemap.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/page-flags.h>
|
|
#include <linux/backing-dev.h>
|
|
#include <linux/bit_spinlock.h>
|
|
#include <linux/rcupdate.h>
|
|
#include <linux/limits.h>
|
|
#include <linux/export.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/rbtree.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/swapops.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/eventfd.h>
|
|
#include <linux/sort.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/vmpressure.h>
|
|
#include <linux/mm_inline.h>
|
|
#include <linux/page_cgroup.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/oom.h>
|
|
#include "internal.h"
|
|
#include <net/sock.h>
|
|
#include <net/ip.h>
|
|
#include <net/tcp_memcontrol.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <trace/events/vmscan.h>
|
|
|
|
struct cgroup_subsys mem_cgroup_subsys __read_mostly;
|
|
EXPORT_SYMBOL(mem_cgroup_subsys);
|
|
|
|
#define MEM_CGROUP_RECLAIM_RETRIES 5
|
|
static struct mem_cgroup *root_mem_cgroup __read_mostly;
|
|
|
|
#ifdef CONFIG_MEMCG_SWAP
|
|
/* Turned on only when memory cgroup is enabled && really_do_swap_account = 1 */
|
|
int do_swap_account __read_mostly;
|
|
|
|
/* for remember boot option*/
|
|
#ifdef CONFIG_MEMCG_SWAP_ENABLED
|
|
static int really_do_swap_account __initdata = 1;
|
|
#else
|
|
static int really_do_swap_account __initdata = 0;
|
|
#endif
|
|
|
|
#else
|
|
#define do_swap_account 0
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Statistics for memory cgroup.
|
|
*/
|
|
enum mem_cgroup_stat_index {
|
|
/*
|
|
* For MEM_CONTAINER_TYPE_ALL, usage = pagecache + rss.
|
|
*/
|
|
MEM_CGROUP_STAT_CACHE, /* # of pages charged as cache */
|
|
MEM_CGROUP_STAT_RSS, /* # of pages charged as anon rss */
|
|
MEM_CGROUP_STAT_RSS_HUGE, /* # of pages charged as anon huge */
|
|
MEM_CGROUP_STAT_FILE_MAPPED, /* # of pages charged as file rss */
|
|
MEM_CGROUP_STAT_SWAP, /* # of pages, swapped out */
|
|
MEM_CGROUP_STAT_NSTATS,
|
|
};
|
|
|
|
static const char * const mem_cgroup_stat_names[] = {
|
|
"cache",
|
|
"rss",
|
|
"rss_huge",
|
|
"mapped_file",
|
|
"swap",
|
|
};
|
|
|
|
enum mem_cgroup_events_index {
|
|
MEM_CGROUP_EVENTS_PGPGIN, /* # of pages paged in */
|
|
MEM_CGROUP_EVENTS_PGPGOUT, /* # of pages paged out */
|
|
MEM_CGROUP_EVENTS_PGFAULT, /* # of page-faults */
|
|
MEM_CGROUP_EVENTS_PGMAJFAULT, /* # of major page-faults */
|
|
MEM_CGROUP_EVENTS_NSTATS,
|
|
};
|
|
|
|
static const char * const mem_cgroup_events_names[] = {
|
|
"pgpgin",
|
|
"pgpgout",
|
|
"pgfault",
|
|
"pgmajfault",
|
|
};
|
|
|
|
static const char * const mem_cgroup_lru_names[] = {
|
|
"inactive_anon",
|
|
"active_anon",
|
|
"inactive_file",
|
|
"active_file",
|
|
"unevictable",
|
|
};
|
|
|
|
/*
|
|
* Per memcg event counter is incremented at every pagein/pageout. With THP,
|
|
* it will be incremated by the number of pages. This counter is used for
|
|
* for trigger some periodic events. This is straightforward and better
|
|
* than using jiffies etc. to handle periodic memcg event.
|
|
*/
|
|
enum mem_cgroup_events_target {
|
|
MEM_CGROUP_TARGET_THRESH,
|
|
MEM_CGROUP_TARGET_SOFTLIMIT,
|
|
MEM_CGROUP_TARGET_NUMAINFO,
|
|
MEM_CGROUP_NTARGETS,
|
|
};
|
|
#define THRESHOLDS_EVENTS_TARGET 128
|
|
#define SOFTLIMIT_EVENTS_TARGET 1024
|
|
#define NUMAINFO_EVENTS_TARGET 1024
|
|
|
|
struct mem_cgroup_stat_cpu {
|
|
long count[MEM_CGROUP_STAT_NSTATS];
|
|
unsigned long events[MEM_CGROUP_EVENTS_NSTATS];
|
|
unsigned long nr_page_events;
|
|
unsigned long targets[MEM_CGROUP_NTARGETS];
|
|
};
|
|
|
|
struct mem_cgroup_reclaim_iter {
|
|
/*
|
|
* last scanned hierarchy member. Valid only if last_dead_count
|
|
* matches memcg->dead_count of the hierarchy root group.
|
|
*/
|
|
struct mem_cgroup *last_visited;
|
|
unsigned long last_dead_count;
|
|
|
|
/* scan generation, increased every round-trip */
|
|
unsigned int generation;
|
|
};
|
|
|
|
/*
|
|
* per-zone information in memory controller.
|
|
*/
|
|
struct mem_cgroup_per_zone {
|
|
struct lruvec lruvec;
|
|
unsigned long lru_size[NR_LRU_LISTS];
|
|
|
|
struct mem_cgroup_reclaim_iter reclaim_iter[DEF_PRIORITY + 1];
|
|
|
|
struct rb_node tree_node; /* RB tree node */
|
|
unsigned long long usage_in_excess;/* Set to the value by which */
|
|
/* the soft limit is exceeded*/
|
|
bool on_tree;
|
|
struct mem_cgroup *memcg; /* Back pointer, we cannot */
|
|
/* use container_of */
|
|
};
|
|
|
|
struct mem_cgroup_per_node {
|
|
struct mem_cgroup_per_zone zoneinfo[MAX_NR_ZONES];
|
|
};
|
|
|
|
struct mem_cgroup_lru_info {
|
|
struct mem_cgroup_per_node *nodeinfo[0];
|
|
};
|
|
|
|
/*
|
|
* Cgroups above their limits are maintained in a RB-Tree, independent of
|
|
* their hierarchy representation
|
|
*/
|
|
|
|
struct mem_cgroup_tree_per_zone {
|
|
struct rb_root rb_root;
|
|
spinlock_t lock;
|
|
};
|
|
|
|
struct mem_cgroup_tree_per_node {
|
|
struct mem_cgroup_tree_per_zone rb_tree_per_zone[MAX_NR_ZONES];
|
|
};
|
|
|
|
struct mem_cgroup_tree {
|
|
struct mem_cgroup_tree_per_node *rb_tree_per_node[MAX_NUMNODES];
|
|
};
|
|
|
|
static struct mem_cgroup_tree soft_limit_tree __read_mostly;
|
|
|
|
struct mem_cgroup_threshold {
|
|
struct eventfd_ctx *eventfd;
|
|
u64 threshold;
|
|
};
|
|
|
|
/* For threshold */
|
|
struct mem_cgroup_threshold_ary {
|
|
/* An array index points to threshold just below or equal to usage. */
|
|
int current_threshold;
|
|
/* Size of entries[] */
|
|
unsigned int size;
|
|
/* Array of thresholds */
|
|
struct mem_cgroup_threshold entries[0];
|
|
};
|
|
|
|
struct mem_cgroup_thresholds {
|
|
/* Primary thresholds array */
|
|
struct mem_cgroup_threshold_ary *primary;
|
|
/*
|
|
* Spare threshold array.
|
|
* This is needed to make mem_cgroup_unregister_event() "never fail".
|
|
* It must be able to store at least primary->size - 1 entries.
|
|
*/
|
|
struct mem_cgroup_threshold_ary *spare;
|
|
};
|
|
|
|
/* for OOM */
|
|
struct mem_cgroup_eventfd_list {
|
|
struct list_head list;
|
|
struct eventfd_ctx *eventfd;
|
|
};
|
|
|
|
static void mem_cgroup_threshold(struct mem_cgroup *memcg);
|
|
static void mem_cgroup_oom_notify(struct mem_cgroup *memcg);
|
|
|
|
/*
|
|
* The memory controller data structure. The memory controller controls both
|
|
* page cache and RSS per cgroup. We would eventually like to provide
|
|
* statistics based on the statistics developed by Rik Van Riel for clock-pro,
|
|
* to help the administrator determine what knobs to tune.
|
|
*
|
|
* TODO: Add a water mark for the memory controller. Reclaim will begin when
|
|
* we hit the water mark. May be even add a low water mark, such that
|
|
* no reclaim occurs from a cgroup at it's low water mark, this is
|
|
* a feature that will be implemented much later in the future.
|
|
*/
|
|
struct mem_cgroup {
|
|
struct cgroup_subsys_state css;
|
|
/*
|
|
* the counter to account for memory usage
|
|
*/
|
|
struct res_counter res;
|
|
|
|
/* vmpressure notifications */
|
|
struct vmpressure vmpressure;
|
|
|
|
union {
|
|
/*
|
|
* the counter to account for mem+swap usage.
|
|
*/
|
|
struct res_counter memsw;
|
|
|
|
/*
|
|
* rcu_freeing is used only when freeing struct mem_cgroup,
|
|
* so put it into a union to avoid wasting more memory.
|
|
* It must be disjoint from the css field. It could be
|
|
* in a union with the res field, but res plays a much
|
|
* larger part in mem_cgroup life than memsw, and might
|
|
* be of interest, even at time of free, when debugging.
|
|
* So share rcu_head with the less interesting memsw.
|
|
*/
|
|
struct rcu_head rcu_freeing;
|
|
/*
|
|
* We also need some space for a worker in deferred freeing.
|
|
* By the time we call it, rcu_freeing is no longer in use.
|
|
*/
|
|
struct work_struct work_freeing;
|
|
};
|
|
|
|
/*
|
|
* the counter to account for kernel memory usage.
|
|
*/
|
|
struct res_counter kmem;
|
|
/*
|
|
* Should the accounting and control be hierarchical, per subtree?
|
|
*/
|
|
bool use_hierarchy;
|
|
unsigned long kmem_account_flags; /* See KMEM_ACCOUNTED_*, below */
|
|
|
|
bool oom_lock;
|
|
atomic_t under_oom;
|
|
atomic_t oom_wakeups;
|
|
|
|
atomic_t refcnt;
|
|
|
|
int swappiness;
|
|
/* OOM-Killer disable */
|
|
int oom_kill_disable;
|
|
|
|
/* set when res.limit == memsw.limit */
|
|
bool memsw_is_minimum;
|
|
|
|
/* protect arrays of thresholds */
|
|
struct mutex thresholds_lock;
|
|
|
|
/* thresholds for memory usage. RCU-protected */
|
|
struct mem_cgroup_thresholds thresholds;
|
|
|
|
/* thresholds for mem+swap usage. RCU-protected */
|
|
struct mem_cgroup_thresholds memsw_thresholds;
|
|
|
|
/* For oom notifier event fd */
|
|
struct list_head oom_notify;
|
|
|
|
/*
|
|
* Should we move charges of a task when a task is moved into this
|
|
* mem_cgroup ? And what type of charges should we move ?
|
|
*/
|
|
unsigned long move_charge_at_immigrate;
|
|
/*
|
|
* set > 0 if pages under this cgroup are moving to other cgroup.
|
|
*/
|
|
atomic_t moving_account;
|
|
/* taken only while moving_account > 0 */
|
|
spinlock_t move_lock;
|
|
/*
|
|
* percpu counter.
|
|
*/
|
|
struct mem_cgroup_stat_cpu __percpu *stat;
|
|
/*
|
|
* used when a cpu is offlined or other synchronizations
|
|
* See mem_cgroup_read_stat().
|
|
*/
|
|
struct mem_cgroup_stat_cpu nocpu_base;
|
|
spinlock_t pcp_counter_lock;
|
|
|
|
atomic_t dead_count;
|
|
#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET)
|
|
struct tcp_memcontrol tcp_mem;
|
|
#endif
|
|
#if defined(CONFIG_MEMCG_KMEM)
|
|
/* analogous to slab_common's slab_caches list. per-memcg */
|
|
struct list_head memcg_slab_caches;
|
|
/* Not a spinlock, we can take a lot of time walking the list */
|
|
struct mutex slab_caches_mutex;
|
|
/* Index in the kmem_cache->memcg_params->memcg_caches array */
|
|
int kmemcg_id;
|
|
#endif
|
|
|
|
int last_scanned_node;
|
|
#if MAX_NUMNODES > 1
|
|
nodemask_t scan_nodes;
|
|
atomic_t numainfo_events;
|
|
atomic_t numainfo_updating;
|
|
#endif
|
|
|
|
/*
|
|
* Per cgroup active and inactive list, similar to the
|
|
* per zone LRU lists.
|
|
*
|
|
* WARNING: This has to be the last element of the struct. Don't
|
|
* add new fields after this point.
|
|
*/
|
|
struct mem_cgroup_lru_info info;
|
|
};
|
|
|
|
static size_t memcg_size(void)
|
|
{
|
|
return sizeof(struct mem_cgroup) +
|
|
nr_node_ids * sizeof(struct mem_cgroup_per_node *);
|
|
}
|
|
|
|
/* internal only representation about the status of kmem accounting. */
|
|
enum {
|
|
KMEM_ACCOUNTED_ACTIVE = 0, /* accounted by this cgroup itself */
|
|
KMEM_ACCOUNTED_ACTIVATED, /* static key enabled. */
|
|
KMEM_ACCOUNTED_DEAD, /* dead memcg with pending kmem charges */
|
|
};
|
|
|
|
/* We account when limit is on, but only after call sites are patched */
|
|
#define KMEM_ACCOUNTED_MASK \
|
|
((1 << KMEM_ACCOUNTED_ACTIVE) | (1 << KMEM_ACCOUNTED_ACTIVATED))
|
|
|
|
#ifdef CONFIG_MEMCG_KMEM
|
|
static inline void memcg_kmem_set_active(struct mem_cgroup *memcg)
|
|
{
|
|
set_bit(KMEM_ACCOUNTED_ACTIVE, &memcg->kmem_account_flags);
|
|
}
|
|
|
|
static bool memcg_kmem_is_active(struct mem_cgroup *memcg)
|
|
{
|
|
return test_bit(KMEM_ACCOUNTED_ACTIVE, &memcg->kmem_account_flags);
|
|
}
|
|
|
|
static void memcg_kmem_set_activated(struct mem_cgroup *memcg)
|
|
{
|
|
set_bit(KMEM_ACCOUNTED_ACTIVATED, &memcg->kmem_account_flags);
|
|
}
|
|
|
|
static void memcg_kmem_clear_activated(struct mem_cgroup *memcg)
|
|
{
|
|
clear_bit(KMEM_ACCOUNTED_ACTIVATED, &memcg->kmem_account_flags);
|
|
}
|
|
|
|
static void memcg_kmem_mark_dead(struct mem_cgroup *memcg)
|
|
{
|
|
if (test_bit(KMEM_ACCOUNTED_ACTIVE, &memcg->kmem_account_flags))
|
|
set_bit(KMEM_ACCOUNTED_DEAD, &memcg->kmem_account_flags);
|
|
}
|
|
|
|
static bool memcg_kmem_test_and_clear_dead(struct mem_cgroup *memcg)
|
|
{
|
|
return test_and_clear_bit(KMEM_ACCOUNTED_DEAD,
|
|
&memcg->kmem_account_flags);
|
|
}
|
|
#endif
|
|
|
|
/* Stuffs for move charges at task migration. */
|
|
/*
|
|
* Types of charges to be moved. "move_charge_at_immitgrate" and
|
|
* "immigrate_flags" are treated as a left-shifted bitmap of these types.
|
|
*/
|
|
enum move_type {
|
|
MOVE_CHARGE_TYPE_ANON, /* private anonymous page and swap of it */
|
|
MOVE_CHARGE_TYPE_FILE, /* file page(including tmpfs) and swap of it */
|
|
NR_MOVE_TYPE,
|
|
};
|
|
|
|
/* "mc" and its members are protected by cgroup_mutex */
|
|
static struct move_charge_struct {
|
|
spinlock_t lock; /* for from, to */
|
|
struct mem_cgroup *from;
|
|
struct mem_cgroup *to;
|
|
unsigned long immigrate_flags;
|
|
unsigned long precharge;
|
|
unsigned long moved_charge;
|
|
unsigned long moved_swap;
|
|
struct task_struct *moving_task; /* a task moving charges */
|
|
wait_queue_head_t waitq; /* a waitq for other context */
|
|
} mc = {
|
|
.lock = __SPIN_LOCK_UNLOCKED(mc.lock),
|
|
.waitq = __WAIT_QUEUE_HEAD_INITIALIZER(mc.waitq),
|
|
};
|
|
|
|
static bool move_anon(void)
|
|
{
|
|
return test_bit(MOVE_CHARGE_TYPE_ANON, &mc.immigrate_flags);
|
|
}
|
|
|
|
static bool move_file(void)
|
|
{
|
|
return test_bit(MOVE_CHARGE_TYPE_FILE, &mc.immigrate_flags);
|
|
}
|
|
|
|
/*
|
|
* Maximum loops in mem_cgroup_hierarchical_reclaim(), used for soft
|
|
* limit reclaim to prevent infinite loops, if they ever occur.
|
|
*/
|
|
#define MEM_CGROUP_MAX_RECLAIM_LOOPS 100
|
|
#define MEM_CGROUP_MAX_SOFT_LIMIT_RECLAIM_LOOPS 2
|
|
|
|
enum charge_type {
|
|
MEM_CGROUP_CHARGE_TYPE_CACHE = 0,
|
|
MEM_CGROUP_CHARGE_TYPE_ANON,
|
|
MEM_CGROUP_CHARGE_TYPE_SWAPOUT, /* for accounting swapcache */
|
|
MEM_CGROUP_CHARGE_TYPE_DROP, /* a page was unused swap cache */
|
|
NR_CHARGE_TYPE,
|
|
};
|
|
|
|
/* for encoding cft->private value on file */
|
|
enum res_type {
|
|
_MEM,
|
|
_MEMSWAP,
|
|
_OOM_TYPE,
|
|
_KMEM,
|
|
};
|
|
|
|
#define MEMFILE_PRIVATE(x, val) ((x) << 16 | (val))
|
|
#define MEMFILE_TYPE(val) ((val) >> 16 & 0xffff)
|
|
#define MEMFILE_ATTR(val) ((val) & 0xffff)
|
|
/* Used for OOM nofiier */
|
|
#define OOM_CONTROL (0)
|
|
|
|
/*
|
|
* Reclaim flags for mem_cgroup_hierarchical_reclaim
|
|
*/
|
|
#define MEM_CGROUP_RECLAIM_NOSWAP_BIT 0x0
|
|
#define MEM_CGROUP_RECLAIM_NOSWAP (1 << MEM_CGROUP_RECLAIM_NOSWAP_BIT)
|
|
#define MEM_CGROUP_RECLAIM_SHRINK_BIT 0x1
|
|
#define MEM_CGROUP_RECLAIM_SHRINK (1 << MEM_CGROUP_RECLAIM_SHRINK_BIT)
|
|
|
|
/*
|
|
* The memcg_create_mutex will be held whenever a new cgroup is created.
|
|
* As a consequence, any change that needs to protect against new child cgroups
|
|
* appearing has to hold it as well.
|
|
*/
|
|
static DEFINE_MUTEX(memcg_create_mutex);
|
|
|
|
static void mem_cgroup_get(struct mem_cgroup *memcg);
|
|
static void mem_cgroup_put(struct mem_cgroup *memcg);
|
|
|
|
static inline
|
|
struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s)
|
|
{
|
|
return container_of(s, struct mem_cgroup, css);
|
|
}
|
|
|
|
/* Some nice accessors for the vmpressure. */
|
|
struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg)
|
|
{
|
|
if (!memcg)
|
|
memcg = root_mem_cgroup;
|
|
return &memcg->vmpressure;
|
|
}
|
|
|
|
struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr)
|
|
{
|
|
return &container_of(vmpr, struct mem_cgroup, vmpressure)->css;
|
|
}
|
|
|
|
struct vmpressure *css_to_vmpressure(struct cgroup_subsys_state *css)
|
|
{
|
|
return &mem_cgroup_from_css(css)->vmpressure;
|
|
}
|
|
|
|
static inline bool mem_cgroup_is_root(struct mem_cgroup *memcg)
|
|
{
|
|
return (memcg == root_mem_cgroup);
|
|
}
|
|
|
|
/* Writing them here to avoid exposing memcg's inner layout */
|
|
#if defined(CONFIG_INET) && defined(CONFIG_MEMCG_KMEM)
|
|
|
|
void sock_update_memcg(struct sock *sk)
|
|
{
|
|
if (mem_cgroup_sockets_enabled) {
|
|
struct mem_cgroup *memcg;
|
|
struct cg_proto *cg_proto;
|
|
|
|
BUG_ON(!sk->sk_prot->proto_cgroup);
|
|
|
|
/* Socket cloning can throw us here with sk_cgrp already
|
|
* filled. It won't however, necessarily happen from
|
|
* process context. So the test for root memcg given
|
|
* the current task's memcg won't help us in this case.
|
|
*
|
|
* Respecting the original socket's memcg is a better
|
|
* decision in this case.
|
|
*/
|
|
if (sk->sk_cgrp) {
|
|
BUG_ON(mem_cgroup_is_root(sk->sk_cgrp->memcg));
|
|
mem_cgroup_get(sk->sk_cgrp->memcg);
|
|
return;
|
|
}
|
|
|
|
rcu_read_lock();
|
|
memcg = mem_cgroup_from_task(current);
|
|
cg_proto = sk->sk_prot->proto_cgroup(memcg);
|
|
if (!mem_cgroup_is_root(memcg) && memcg_proto_active(cg_proto)) {
|
|
mem_cgroup_get(memcg);
|
|
sk->sk_cgrp = cg_proto;
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(sock_update_memcg);
|
|
|
|
void sock_release_memcg(struct sock *sk)
|
|
{
|
|
if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
|
|
struct mem_cgroup *memcg;
|
|
WARN_ON(!sk->sk_cgrp->memcg);
|
|
memcg = sk->sk_cgrp->memcg;
|
|
mem_cgroup_put(memcg);
|
|
}
|
|
}
|
|
|
|
struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg)
|
|
{
|
|
if (!memcg || mem_cgroup_is_root(memcg))
|
|
return NULL;
|
|
|
|
return &memcg->tcp_mem.cg_proto;
|
|
}
|
|
EXPORT_SYMBOL(tcp_proto_cgroup);
|
|
|
|
static void disarm_sock_keys(struct mem_cgroup *memcg)
|
|
{
|
|
if (!memcg_proto_activated(&memcg->tcp_mem.cg_proto))
|
|
return;
|
|
static_key_slow_dec(&memcg_socket_limit_enabled);
|
|
}
|
|
#else
|
|
static void disarm_sock_keys(struct mem_cgroup *memcg)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_MEMCG_KMEM
|
|
/*
|
|
* This will be the memcg's index in each cache's ->memcg_params->memcg_caches.
|
|
* There are two main reasons for not using the css_id for this:
|
|
* 1) this works better in sparse environments, where we have a lot of memcgs,
|
|
* but only a few kmem-limited. Or also, if we have, for instance, 200
|
|
* memcgs, and none but the 200th is kmem-limited, we'd have to have a
|
|
* 200 entry array for that.
|
|
*
|
|
* 2) In order not to violate the cgroup API, we would like to do all memory
|
|
* allocation in ->create(). At that point, we haven't yet allocated the
|
|
* css_id. Having a separate index prevents us from messing with the cgroup
|
|
* core for this
|
|
*
|
|
* The current size of the caches array is stored in
|
|
* memcg_limited_groups_array_size. It will double each time we have to
|
|
* increase it.
|
|
*/
|
|
static DEFINE_IDA(kmem_limited_groups);
|
|
int memcg_limited_groups_array_size;
|
|
|
|
/*
|
|
* MIN_SIZE is different than 1, because we would like to avoid going through
|
|
* the alloc/free process all the time. In a small machine, 4 kmem-limited
|
|
* cgroups is a reasonable guess. In the future, it could be a parameter or
|
|
* tunable, but that is strictly not necessary.
|
|
*
|
|
* MAX_SIZE should be as large as the number of css_ids. Ideally, we could get
|
|
* this constant directly from cgroup, but it is understandable that this is
|
|
* better kept as an internal representation in cgroup.c. In any case, the
|
|
* css_id space is not getting any smaller, and we don't have to necessarily
|
|
* increase ours as well if it increases.
|
|
*/
|
|
#define MEMCG_CACHES_MIN_SIZE 4
|
|
#define MEMCG_CACHES_MAX_SIZE 65535
|
|
|
|
/*
|
|
* A lot of the calls to the cache allocation functions are expected to be
|
|
* inlined by the compiler. Since the calls to memcg_kmem_get_cache are
|
|
* conditional to this static branch, we'll have to allow modules that does
|
|
* kmem_cache_alloc and the such to see this symbol as well
|
|
*/
|
|
struct static_key memcg_kmem_enabled_key;
|
|
EXPORT_SYMBOL(memcg_kmem_enabled_key);
|
|
|
|
static void disarm_kmem_keys(struct mem_cgroup *memcg)
|
|
{
|
|
if (memcg_kmem_is_active(memcg)) {
|
|
static_key_slow_dec(&memcg_kmem_enabled_key);
|
|
ida_simple_remove(&kmem_limited_groups, memcg->kmemcg_id);
|
|
}
|
|
/*
|
|
* This check can't live in kmem destruction function,
|
|
* since the charges will outlive the cgroup
|
|
*/
|
|
WARN_ON(res_counter_read_u64(&memcg->kmem, RES_USAGE) != 0);
|
|
}
|
|
#else
|
|
static void disarm_kmem_keys(struct mem_cgroup *memcg)
|
|
{
|
|
}
|
|
#endif /* CONFIG_MEMCG_KMEM */
|
|
|
|
static void disarm_static_keys(struct mem_cgroup *memcg)
|
|
{
|
|
disarm_sock_keys(memcg);
|
|
disarm_kmem_keys(memcg);
|
|
}
|
|
|
|
static void drain_all_stock_async(struct mem_cgroup *memcg);
|
|
|
|
static struct mem_cgroup_per_zone *
|
|
mem_cgroup_zoneinfo(struct mem_cgroup *memcg, int nid, int zid)
|
|
{
|
|
VM_BUG_ON((unsigned)nid >= nr_node_ids);
|
|
return &memcg->info.nodeinfo[nid]->zoneinfo[zid];
|
|
}
|
|
|
|
struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *memcg)
|
|
{
|
|
return &memcg->css;
|
|
}
|
|
|
|
static struct mem_cgroup_per_zone *
|
|
page_cgroup_zoneinfo(struct mem_cgroup *memcg, struct page *page)
|
|
{
|
|
int nid = page_to_nid(page);
|
|
int zid = page_zonenum(page);
|
|
|
|
return mem_cgroup_zoneinfo(memcg, nid, zid);
|
|
}
|
|
|
|
static struct mem_cgroup_tree_per_zone *
|
|
soft_limit_tree_node_zone(int nid, int zid)
|
|
{
|
|
return &soft_limit_tree.rb_tree_per_node[nid]->rb_tree_per_zone[zid];
|
|
}
|
|
|
|
static struct mem_cgroup_tree_per_zone *
|
|
soft_limit_tree_from_page(struct page *page)
|
|
{
|
|
int nid = page_to_nid(page);
|
|
int zid = page_zonenum(page);
|
|
|
|
return &soft_limit_tree.rb_tree_per_node[nid]->rb_tree_per_zone[zid];
|
|
}
|
|
|
|
static void
|
|
__mem_cgroup_insert_exceeded(struct mem_cgroup *memcg,
|
|
struct mem_cgroup_per_zone *mz,
|
|
struct mem_cgroup_tree_per_zone *mctz,
|
|
unsigned long long new_usage_in_excess)
|
|
{
|
|
struct rb_node **p = &mctz->rb_root.rb_node;
|
|
struct rb_node *parent = NULL;
|
|
struct mem_cgroup_per_zone *mz_node;
|
|
|
|
if (mz->on_tree)
|
|
return;
|
|
|
|
mz->usage_in_excess = new_usage_in_excess;
|
|
if (!mz->usage_in_excess)
|
|
return;
|
|
while (*p) {
|
|
parent = *p;
|
|
mz_node = rb_entry(parent, struct mem_cgroup_per_zone,
|
|
tree_node);
|
|
if (mz->usage_in_excess < mz_node->usage_in_excess)
|
|
p = &(*p)->rb_left;
|
|
/*
|
|
* We can't avoid mem cgroups that are over their soft
|
|
* limit by the same amount
|
|
*/
|
|
else if (mz->usage_in_excess >= mz_node->usage_in_excess)
|
|
p = &(*p)->rb_right;
|
|
}
|
|
rb_link_node(&mz->tree_node, parent, p);
|
|
rb_insert_color(&mz->tree_node, &mctz->rb_root);
|
|
mz->on_tree = true;
|
|
}
|
|
|
|
static void
|
|
__mem_cgroup_remove_exceeded(struct mem_cgroup *memcg,
|
|
struct mem_cgroup_per_zone *mz,
|
|
struct mem_cgroup_tree_per_zone *mctz)
|
|
{
|
|
if (!mz->on_tree)
|
|
return;
|
|
rb_erase(&mz->tree_node, &mctz->rb_root);
|
|
mz->on_tree = false;
|
|
}
|
|
|
|
static void
|
|
mem_cgroup_remove_exceeded(struct mem_cgroup *memcg,
|
|
struct mem_cgroup_per_zone *mz,
|
|
struct mem_cgroup_tree_per_zone *mctz)
|
|
{
|
|
spin_lock(&mctz->lock);
|
|
__mem_cgroup_remove_exceeded(memcg, mz, mctz);
|
|
spin_unlock(&mctz->lock);
|
|
}
|
|
|
|
|
|
static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page)
|
|
{
|
|
unsigned long long excess;
|
|
struct mem_cgroup_per_zone *mz;
|
|
struct mem_cgroup_tree_per_zone *mctz;
|
|
int nid = page_to_nid(page);
|
|
int zid = page_zonenum(page);
|
|
mctz = soft_limit_tree_from_page(page);
|
|
|
|
/*
|
|
* Necessary to update all ancestors when hierarchy is used.
|
|
* because their event counter is not touched.
|
|
*/
|
|
for (; memcg; memcg = parent_mem_cgroup(memcg)) {
|
|
mz = mem_cgroup_zoneinfo(memcg, nid, zid);
|
|
excess = res_counter_soft_limit_excess(&memcg->res);
|
|
/*
|
|
* We have to update the tree if mz is on RB-tree or
|
|
* mem is over its softlimit.
|
|
*/
|
|
if (excess || mz->on_tree) {
|
|
spin_lock(&mctz->lock);
|
|
/* if on-tree, remove it */
|
|
if (mz->on_tree)
|
|
__mem_cgroup_remove_exceeded(memcg, mz, mctz);
|
|
/*
|
|
* Insert again. mz->usage_in_excess will be updated.
|
|
* If excess is 0, no tree ops.
|
|
*/
|
|
__mem_cgroup_insert_exceeded(memcg, mz, mctz, excess);
|
|
spin_unlock(&mctz->lock);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg)
|
|
{
|
|
int node, zone;
|
|
struct mem_cgroup_per_zone *mz;
|
|
struct mem_cgroup_tree_per_zone *mctz;
|
|
|
|
for_each_node(node) {
|
|
for (zone = 0; zone < MAX_NR_ZONES; zone++) {
|
|
mz = mem_cgroup_zoneinfo(memcg, node, zone);
|
|
mctz = soft_limit_tree_node_zone(node, zone);
|
|
mem_cgroup_remove_exceeded(memcg, mz, mctz);
|
|
}
|
|
}
|
|
}
|
|
|
|
static struct mem_cgroup_per_zone *
|
|
__mem_cgroup_largest_soft_limit_node(struct mem_cgroup_tree_per_zone *mctz)
|
|
{
|
|
struct rb_node *rightmost = NULL;
|
|
struct mem_cgroup_per_zone *mz;
|
|
|
|
retry:
|
|
mz = NULL;
|
|
rightmost = rb_last(&mctz->rb_root);
|
|
if (!rightmost)
|
|
goto done; /* Nothing to reclaim from */
|
|
|
|
mz = rb_entry(rightmost, struct mem_cgroup_per_zone, tree_node);
|
|
/*
|
|
* Remove the node now but someone else can add it back,
|
|
* we will to add it back at the end of reclaim to its correct
|
|
* position in the tree.
|
|
*/
|
|
__mem_cgroup_remove_exceeded(mz->memcg, mz, mctz);
|
|
if (!res_counter_soft_limit_excess(&mz->memcg->res) ||
|
|
!css_tryget(&mz->memcg->css))
|
|
goto retry;
|
|
done:
|
|
return mz;
|
|
}
|
|
|
|
static struct mem_cgroup_per_zone *
|
|
mem_cgroup_largest_soft_limit_node(struct mem_cgroup_tree_per_zone *mctz)
|
|
{
|
|
struct mem_cgroup_per_zone *mz;
|
|
|
|
spin_lock(&mctz->lock);
|
|
mz = __mem_cgroup_largest_soft_limit_node(mctz);
|
|
spin_unlock(&mctz->lock);
|
|
return mz;
|
|
}
|
|
|
|
/*
|
|
* Implementation Note: reading percpu statistics for memcg.
|
|
*
|
|
* Both of vmstat[] and percpu_counter has threshold and do periodic
|
|
* synchronization to implement "quick" read. There are trade-off between
|
|
* reading cost and precision of value. Then, we may have a chance to implement
|
|
* a periodic synchronizion of counter in memcg's counter.
|
|
*
|
|
* But this _read() function is used for user interface now. The user accounts
|
|
* memory usage by memory cgroup and he _always_ requires exact value because
|
|
* he accounts memory. Even if we provide quick-and-fuzzy read, we always
|
|
* have to visit all online cpus and make sum. So, for now, unnecessary
|
|
* synchronization is not implemented. (just implemented for cpu hotplug)
|
|
*
|
|
* If there are kernel internal actions which can make use of some not-exact
|
|
* value, and reading all cpu value can be performance bottleneck in some
|
|
* common workload, threashold and synchonization as vmstat[] should be
|
|
* implemented.
|
|
*/
|
|
static long mem_cgroup_read_stat(struct mem_cgroup *memcg,
|
|
enum mem_cgroup_stat_index idx)
|
|
{
|
|
long val = 0;
|
|
int cpu;
|
|
|
|
get_online_cpus();
|
|
for_each_online_cpu(cpu)
|
|
val += per_cpu(memcg->stat->count[idx], cpu);
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
spin_lock(&memcg->pcp_counter_lock);
|
|
val += memcg->nocpu_base.count[idx];
|
|
spin_unlock(&memcg->pcp_counter_lock);
|
|
#endif
|
|
put_online_cpus();
|
|
return val;
|
|
}
|
|
|
|
static void mem_cgroup_swap_statistics(struct mem_cgroup *memcg,
|
|
bool charge)
|
|
{
|
|
int val = (charge) ? 1 : -1;
|
|
this_cpu_add(memcg->stat->count[MEM_CGROUP_STAT_SWAP], val);
|
|
}
|
|
|
|
static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg,
|
|
enum mem_cgroup_events_index idx)
|
|
{
|
|
unsigned long val = 0;
|
|
int cpu;
|
|
|
|
for_each_online_cpu(cpu)
|
|
val += per_cpu(memcg->stat->events[idx], cpu);
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
spin_lock(&memcg->pcp_counter_lock);
|
|
val += memcg->nocpu_base.events[idx];
|
|
spin_unlock(&memcg->pcp_counter_lock);
|
|
#endif
|
|
return val;
|
|
}
|
|
|
|
static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg,
|
|
struct page *page,
|
|
bool anon, int nr_pages)
|
|
{
|
|
preempt_disable();
|
|
|
|
/*
|
|
* Here, RSS means 'mapped anon' and anon's SwapCache. Shmem/tmpfs is
|
|
* counted as CACHE even if it's on ANON LRU.
|
|
*/
|
|
if (anon)
|
|
__this_cpu_add(memcg->stat->count[MEM_CGROUP_STAT_RSS],
|
|
nr_pages);
|
|
else
|
|
__this_cpu_add(memcg->stat->count[MEM_CGROUP_STAT_CACHE],
|
|
nr_pages);
|
|
|
|
if (PageTransHuge(page))
|
|
__this_cpu_add(memcg->stat->count[MEM_CGROUP_STAT_RSS_HUGE],
|
|
nr_pages);
|
|
|
|
/* pagein of a big page is an event. So, ignore page size */
|
|
if (nr_pages > 0)
|
|
__this_cpu_inc(memcg->stat->events[MEM_CGROUP_EVENTS_PGPGIN]);
|
|
else {
|
|
__this_cpu_inc(memcg->stat->events[MEM_CGROUP_EVENTS_PGPGOUT]);
|
|
nr_pages = -nr_pages; /* for event */
|
|
}
|
|
|
|
__this_cpu_add(memcg->stat->nr_page_events, nr_pages);
|
|
|
|
preempt_enable();
|
|
}
|
|
|
|
unsigned long
|
|
mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru)
|
|
{
|
|
struct mem_cgroup_per_zone *mz;
|
|
|
|
mz = container_of(lruvec, struct mem_cgroup_per_zone, lruvec);
|
|
return mz->lru_size[lru];
|
|
}
|
|
|
|
static unsigned long
|
|
mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
|
|
unsigned int lru_mask)
|
|
{
|
|
struct mem_cgroup_per_zone *mz;
|
|
enum lru_list lru;
|
|
unsigned long ret = 0;
|
|
|
|
mz = mem_cgroup_zoneinfo(memcg, nid, zid);
|
|
|
|
for_each_lru(lru) {
|
|
if (BIT(lru) & lru_mask)
|
|
ret += mz->lru_size[lru];
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static unsigned long
|
|
mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg,
|
|
int nid, unsigned int lru_mask)
|
|
{
|
|
u64 total = 0;
|
|
int zid;
|
|
|
|
for (zid = 0; zid < MAX_NR_ZONES; zid++)
|
|
total += mem_cgroup_zone_nr_lru_pages(memcg,
|
|
nid, zid, lru_mask);
|
|
|
|
return total;
|
|
}
|
|
|
|
static unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg,
|
|
unsigned int lru_mask)
|
|
{
|
|
int nid;
|
|
u64 total = 0;
|
|
|
|
for_each_node_state(nid, N_MEMORY)
|
|
total += mem_cgroup_node_nr_lru_pages(memcg, nid, lru_mask);
|
|
return total;
|
|
}
|
|
|
|
static bool mem_cgroup_event_ratelimit(struct mem_cgroup *memcg,
|
|
enum mem_cgroup_events_target target)
|
|
{
|
|
unsigned long val, next;
|
|
|
|
val = __this_cpu_read(memcg->stat->nr_page_events);
|
|
next = __this_cpu_read(memcg->stat->targets[target]);
|
|
/* from time_after() in jiffies.h */
|
|
if ((long)next - (long)val < 0) {
|
|
switch (target) {
|
|
case MEM_CGROUP_TARGET_THRESH:
|
|
next = val + THRESHOLDS_EVENTS_TARGET;
|
|
break;
|
|
case MEM_CGROUP_TARGET_SOFTLIMIT:
|
|
next = val + SOFTLIMIT_EVENTS_TARGET;
|
|
break;
|
|
case MEM_CGROUP_TARGET_NUMAINFO:
|
|
next = val + NUMAINFO_EVENTS_TARGET;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
__this_cpu_write(memcg->stat->targets[target], next);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* Check events in order.
|
|
*
|
|
*/
|
|
static void memcg_check_events(struct mem_cgroup *memcg, struct page *page)
|
|
{
|
|
preempt_disable();
|
|
/* threshold event is triggered in finer grain than soft limit */
|
|
if (unlikely(mem_cgroup_event_ratelimit(memcg,
|
|
MEM_CGROUP_TARGET_THRESH))) {
|
|
bool do_softlimit;
|
|
bool do_numainfo __maybe_unused;
|
|
|
|
do_softlimit = mem_cgroup_event_ratelimit(memcg,
|
|
MEM_CGROUP_TARGET_SOFTLIMIT);
|
|
#if MAX_NUMNODES > 1
|
|
do_numainfo = mem_cgroup_event_ratelimit(memcg,
|
|
MEM_CGROUP_TARGET_NUMAINFO);
|
|
#endif
|
|
preempt_enable();
|
|
|
|
mem_cgroup_threshold(memcg);
|
|
if (unlikely(do_softlimit))
|
|
mem_cgroup_update_tree(memcg, page);
|
|
#if MAX_NUMNODES > 1
|
|
if (unlikely(do_numainfo))
|
|
atomic_inc(&memcg->numainfo_events);
|
|
#endif
|
|
} else
|
|
preempt_enable();
|
|
}
|
|
|
|
struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont)
|
|
{
|
|
return mem_cgroup_from_css(
|
|
cgroup_subsys_state(cont, mem_cgroup_subsys_id));
|
|
}
|
|
|
|
struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p)
|
|
{
|
|
/*
|
|
* mm_update_next_owner() may clear mm->owner to NULL
|
|
* if it races with swapoff, page migration, etc.
|
|
* So this can be called with p == NULL.
|
|
*/
|
|
if (unlikely(!p))
|
|
return NULL;
|
|
|
|
return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id));
|
|
}
|
|
|
|
struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
|
|
{
|
|
struct mem_cgroup *memcg = NULL;
|
|
|
|
if (!mm)
|
|
return NULL;
|
|
/*
|
|
* Because we have no locks, mm->owner's may be being moved to other
|
|
* cgroup. We use css_tryget() here even if this looks
|
|
* pessimistic (rather than adding locks here).
|
|
*/
|
|
rcu_read_lock();
|
|
do {
|
|
memcg = mem_cgroup_from_task(rcu_dereference(mm->owner));
|
|
if (unlikely(!memcg))
|
|
break;
|
|
} while (!css_tryget(&memcg->css));
|
|
rcu_read_unlock();
|
|
return memcg;
|
|
}
|
|
|
|
/*
|
|
* Returns a next (in a pre-order walk) alive memcg (with elevated css
|
|
* ref. count) or NULL if the whole root's subtree has been visited.
|
|
*
|
|
* helper function to be used by mem_cgroup_iter
|
|
*/
|
|
static struct mem_cgroup *__mem_cgroup_iter_next(struct mem_cgroup *root,
|
|
struct mem_cgroup *last_visited)
|
|
{
|
|
struct cgroup *prev_cgroup, *next_cgroup;
|
|
|
|
/*
|
|
* Root is not visited by cgroup iterators so it needs an
|
|
* explicit visit.
|
|
*/
|
|
if (!last_visited)
|
|
return root;
|
|
|
|
prev_cgroup = (last_visited == root) ? NULL
|
|
: last_visited->css.cgroup;
|
|
skip_node:
|
|
next_cgroup = cgroup_next_descendant_pre(
|
|
prev_cgroup, root->css.cgroup);
|
|
|
|
/*
|
|
* Even if we found a group we have to make sure it is
|
|
* alive. css && !memcg means that the groups should be
|
|
* skipped and we should continue the tree walk.
|
|
* last_visited css is safe to use because it is
|
|
* protected by css_get and the tree walk is rcu safe.
|
|
*/
|
|
if (next_cgroup) {
|
|
struct mem_cgroup *mem = mem_cgroup_from_cont(
|
|
next_cgroup);
|
|
if (css_tryget(&mem->css))
|
|
return mem;
|
|
else {
|
|
prev_cgroup = next_cgroup;
|
|
goto skip_node;
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/**
|
|
* mem_cgroup_iter - iterate over memory cgroup hierarchy
|
|
* @root: hierarchy root
|
|
* @prev: previously returned memcg, NULL on first invocation
|
|
* @reclaim: cookie for shared reclaim walks, NULL for full walks
|
|
*
|
|
* Returns references to children of the hierarchy below @root, or
|
|
* @root itself, or %NULL after a full round-trip.
|
|
*
|
|
* Caller must pass the return value in @prev on subsequent
|
|
* invocations for reference counting, or use mem_cgroup_iter_break()
|
|
* to cancel a hierarchy walk before the round-trip is complete.
|
|
*
|
|
* Reclaimers can specify a zone and a priority level in @reclaim to
|
|
* divide up the memcgs in the hierarchy among all concurrent
|
|
* reclaimers operating on the same zone and priority.
|
|
*/
|
|
struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
|
|
struct mem_cgroup *prev,
|
|
struct mem_cgroup_reclaim_cookie *reclaim)
|
|
{
|
|
struct mem_cgroup *memcg = NULL;
|
|
struct mem_cgroup *last_visited = NULL;
|
|
unsigned long uninitialized_var(dead_count);
|
|
|
|
if (mem_cgroup_disabled())
|
|
return NULL;
|
|
|
|
if (!root)
|
|
root = root_mem_cgroup;
|
|
|
|
if (prev && !reclaim)
|
|
last_visited = prev;
|
|
|
|
if (!root->use_hierarchy && root != root_mem_cgroup) {
|
|
if (prev)
|
|
goto out_css_put;
|
|
return root;
|
|
}
|
|
|
|
rcu_read_lock();
|
|
while (!memcg) {
|
|
struct mem_cgroup_reclaim_iter *uninitialized_var(iter);
|
|
|
|
if (reclaim) {
|
|
int nid = zone_to_nid(reclaim->zone);
|
|
int zid = zone_idx(reclaim->zone);
|
|
struct mem_cgroup_per_zone *mz;
|
|
|
|
mz = mem_cgroup_zoneinfo(root, nid, zid);
|
|
iter = &mz->reclaim_iter[reclaim->priority];
|
|
if (prev && reclaim->generation != iter->generation) {
|
|
iter->last_visited = NULL;
|
|
goto out_unlock;
|
|
}
|
|
|
|
/*
|
|
* If the dead_count mismatches, a destruction
|
|
* has happened or is happening concurrently.
|
|
* If the dead_count matches, a destruction
|
|
* might still happen concurrently, but since
|
|
* we checked under RCU, that destruction
|
|
* won't free the object until we release the
|
|
* RCU reader lock. Thus, the dead_count
|
|
* check verifies the pointer is still valid,
|
|
* css_tryget() verifies the cgroup pointed to
|
|
* is alive.
|
|
*/
|
|
dead_count = atomic_read(&root->dead_count);
|
|
if (dead_count == iter->last_dead_count) {
|
|
smp_rmb();
|
|
last_visited = iter->last_visited;
|
|
if (last_visited && last_visited != root &&
|
|
!css_tryget(&last_visited->css))
|
|
last_visited = NULL;
|
|
}
|
|
}
|
|
|
|
memcg = __mem_cgroup_iter_next(root, last_visited);
|
|
|
|
if (reclaim) {
|
|
if (last_visited && last_visited != root)
|
|
css_put(&last_visited->css);
|
|
|
|
iter->last_visited = memcg;
|
|
smp_wmb();
|
|
iter->last_dead_count = dead_count;
|
|
|
|
if (!memcg)
|
|
iter->generation++;
|
|
else if (!prev && memcg)
|
|
reclaim->generation = iter->generation;
|
|
}
|
|
|
|
if (prev && !memcg)
|
|
goto out_unlock;
|
|
}
|
|
out_unlock:
|
|
rcu_read_unlock();
|
|
out_css_put:
|
|
if (prev && prev != root)
|
|
css_put(&prev->css);
|
|
|
|
return memcg;
|
|
}
|
|
|
|
/**
|
|
* mem_cgroup_iter_break - abort a hierarchy walk prematurely
|
|
* @root: hierarchy root
|
|
* @prev: last visited hierarchy member as returned by mem_cgroup_iter()
|
|
*/
|
|
void mem_cgroup_iter_break(struct mem_cgroup *root,
|
|
struct mem_cgroup *prev)
|
|
{
|
|
if (!root)
|
|
root = root_mem_cgroup;
|
|
if (prev && prev != root)
|
|
css_put(&prev->css);
|
|
}
|
|
|
|
/*
|
|
* Iteration constructs for visiting all cgroups (under a tree). If
|
|
* loops are exited prematurely (break), mem_cgroup_iter_break() must
|
|
* be used for reference counting.
|
|
*/
|
|
#define for_each_mem_cgroup_tree(iter, root) \
|
|
for (iter = mem_cgroup_iter(root, NULL, NULL); \
|
|
iter != NULL; \
|
|
iter = mem_cgroup_iter(root, iter, NULL))
|
|
|
|
#define for_each_mem_cgroup(iter) \
|
|
for (iter = mem_cgroup_iter(NULL, NULL, NULL); \
|
|
iter != NULL; \
|
|
iter = mem_cgroup_iter(NULL, iter, NULL))
|
|
|
|
void __mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
|
|
rcu_read_lock();
|
|
memcg = mem_cgroup_from_task(rcu_dereference(mm->owner));
|
|
if (unlikely(!memcg))
|
|
goto out;
|
|
|
|
switch (idx) {
|
|
case PGFAULT:
|
|
this_cpu_inc(memcg->stat->events[MEM_CGROUP_EVENTS_PGFAULT]);
|
|
break;
|
|
case PGMAJFAULT:
|
|
this_cpu_inc(memcg->stat->events[MEM_CGROUP_EVENTS_PGMAJFAULT]);
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
out:
|
|
rcu_read_unlock();
|
|
}
|
|
EXPORT_SYMBOL(__mem_cgroup_count_vm_event);
|
|
|
|
/**
|
|
* mem_cgroup_zone_lruvec - get the lru list vector for a zone and memcg
|
|
* @zone: zone of the wanted lruvec
|
|
* @memcg: memcg of the wanted lruvec
|
|
*
|
|
* Returns the lru list vector holding pages for the given @zone and
|
|
* @mem. This can be the global zone lruvec, if the memory controller
|
|
* is disabled.
|
|
*/
|
|
struct lruvec *mem_cgroup_zone_lruvec(struct zone *zone,
|
|
struct mem_cgroup *memcg)
|
|
{
|
|
struct mem_cgroup_per_zone *mz;
|
|
struct lruvec *lruvec;
|
|
|
|
if (mem_cgroup_disabled()) {
|
|
lruvec = &zone->lruvec;
|
|
goto out;
|
|
}
|
|
|
|
mz = mem_cgroup_zoneinfo(memcg, zone_to_nid(zone), zone_idx(zone));
|
|
lruvec = &mz->lruvec;
|
|
out:
|
|
/*
|
|
* Since a node can be onlined after the mem_cgroup was created,
|
|
* we have to be prepared to initialize lruvec->zone here;
|
|
* and if offlined then reonlined, we need to reinitialize it.
|
|
*/
|
|
if (unlikely(lruvec->zone != zone))
|
|
lruvec->zone = zone;
|
|
return lruvec;
|
|
}
|
|
|
|
/*
|
|
* Following LRU functions are allowed to be used without PCG_LOCK.
|
|
* Operations are called by routine of global LRU independently from memcg.
|
|
* What we have to take care of here is validness of pc->mem_cgroup.
|
|
*
|
|
* Changes to pc->mem_cgroup happens when
|
|
* 1. charge
|
|
* 2. moving account
|
|
* In typical case, "charge" is done before add-to-lru. Exception is SwapCache.
|
|
* It is added to LRU before charge.
|
|
* If PCG_USED bit is not set, page_cgroup is not added to this private LRU.
|
|
* When moving account, the page is not on LRU. It's isolated.
|
|
*/
|
|
|
|
/**
|
|
* mem_cgroup_page_lruvec - return lruvec for adding an lru page
|
|
* @page: the page
|
|
* @zone: zone of the page
|
|
*/
|
|
struct lruvec *mem_cgroup_page_lruvec(struct page *page, struct zone *zone)
|
|
{
|
|
struct mem_cgroup_per_zone *mz;
|
|
struct mem_cgroup *memcg;
|
|
struct page_cgroup *pc;
|
|
struct lruvec *lruvec;
|
|
|
|
if (mem_cgroup_disabled()) {
|
|
lruvec = &zone->lruvec;
|
|
goto out;
|
|
}
|
|
|
|
pc = lookup_page_cgroup(page);
|
|
memcg = pc->mem_cgroup;
|
|
|
|
/*
|
|
* Surreptitiously switch any uncharged offlist page to root:
|
|
* an uncharged page off lru does nothing to secure
|
|
* its former mem_cgroup from sudden removal.
|
|
*
|
|
* Our caller holds lru_lock, and PageCgroupUsed is updated
|
|
* under page_cgroup lock: between them, they make all uses
|
|
* of pc->mem_cgroup safe.
|
|
*/
|
|
if (!PageLRU(page) && !PageCgroupUsed(pc) && memcg != root_mem_cgroup)
|
|
pc->mem_cgroup = memcg = root_mem_cgroup;
|
|
|
|
mz = page_cgroup_zoneinfo(memcg, page);
|
|
lruvec = &mz->lruvec;
|
|
out:
|
|
/*
|
|
* Since a node can be onlined after the mem_cgroup was created,
|
|
* we have to be prepared to initialize lruvec->zone here;
|
|
* and if offlined then reonlined, we need to reinitialize it.
|
|
*/
|
|
if (unlikely(lruvec->zone != zone))
|
|
lruvec->zone = zone;
|
|
return lruvec;
|
|
}
|
|
|
|
/**
|
|
* mem_cgroup_update_lru_size - account for adding or removing an lru page
|
|
* @lruvec: mem_cgroup per zone lru vector
|
|
* @lru: index of lru list the page is sitting on
|
|
* @nr_pages: positive when adding or negative when removing
|
|
*
|
|
* This function must be called when a page is added to or removed from an
|
|
* lru list.
|
|
*/
|
|
void mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru,
|
|
int nr_pages)
|
|
{
|
|
struct mem_cgroup_per_zone *mz;
|
|
unsigned long *lru_size;
|
|
|
|
if (mem_cgroup_disabled())
|
|
return;
|
|
|
|
mz = container_of(lruvec, struct mem_cgroup_per_zone, lruvec);
|
|
lru_size = mz->lru_size + lru;
|
|
*lru_size += nr_pages;
|
|
VM_BUG_ON((long)(*lru_size) < 0);
|
|
}
|
|
|
|
/*
|
|
* Checks whether given mem is same or in the root_mem_cgroup's
|
|
* hierarchy subtree
|
|
*/
|
|
bool __mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
|
|
struct mem_cgroup *memcg)
|
|
{
|
|
if (root_memcg == memcg)
|
|
return true;
|
|
if (!root_memcg->use_hierarchy || !memcg)
|
|
return false;
|
|
return css_is_ancestor(&memcg->css, &root_memcg->css);
|
|
}
|
|
|
|
static bool mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
|
|
struct mem_cgroup *memcg)
|
|
{
|
|
bool ret;
|
|
|
|
rcu_read_lock();
|
|
ret = __mem_cgroup_same_or_subtree(root_memcg, memcg);
|
|
rcu_read_unlock();
|
|
return ret;
|
|
}
|
|
|
|
int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *memcg)
|
|
{
|
|
int ret;
|
|
struct mem_cgroup *curr = NULL;
|
|
struct task_struct *p;
|
|
|
|
p = find_lock_task_mm(task);
|
|
if (p) {
|
|
curr = try_get_mem_cgroup_from_mm(p->mm);
|
|
task_unlock(p);
|
|
} else {
|
|
/*
|
|
* All threads may have already detached their mm's, but the oom
|
|
* killer still needs to detect if they have already been oom
|
|
* killed to prevent needlessly killing additional tasks.
|
|
*/
|
|
task_lock(task);
|
|
curr = mem_cgroup_from_task(task);
|
|
if (curr)
|
|
css_get(&curr->css);
|
|
task_unlock(task);
|
|
}
|
|
if (!curr)
|
|
return 0;
|
|
/*
|
|
* We should check use_hierarchy of "memcg" not "curr". Because checking
|
|
* use_hierarchy of "curr" here make this function true if hierarchy is
|
|
* enabled in "curr" and "curr" is a child of "memcg" in *cgroup*
|
|
* hierarchy(even if use_hierarchy is disabled in "memcg").
|
|
*/
|
|
ret = mem_cgroup_same_or_subtree(memcg, curr);
|
|
css_put(&curr->css);
|
|
return ret;
|
|
}
|
|
|
|
int mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec)
|
|
{
|
|
unsigned long inactive_ratio;
|
|
unsigned long inactive;
|
|
unsigned long active;
|
|
unsigned long gb;
|
|
|
|
inactive = mem_cgroup_get_lru_size(lruvec, LRU_INACTIVE_ANON);
|
|
active = mem_cgroup_get_lru_size(lruvec, LRU_ACTIVE_ANON);
|
|
|
|
gb = (inactive + active) >> (30 - PAGE_SHIFT);
|
|
if (gb)
|
|
inactive_ratio = int_sqrt(10 * gb);
|
|
else
|
|
inactive_ratio = 1;
|
|
|
|
return inactive * inactive_ratio < active;
|
|
}
|
|
|
|
#define mem_cgroup_from_res_counter(counter, member) \
|
|
container_of(counter, struct mem_cgroup, member)
|
|
|
|
/**
|
|
* mem_cgroup_margin - calculate chargeable space of a memory cgroup
|
|
* @memcg: the memory cgroup
|
|
*
|
|
* Returns the maximum amount of memory @mem can be charged with, in
|
|
* pages.
|
|
*/
|
|
static unsigned long mem_cgroup_margin(struct mem_cgroup *memcg)
|
|
{
|
|
unsigned long long margin;
|
|
|
|
margin = res_counter_margin(&memcg->res);
|
|
if (do_swap_account)
|
|
margin = min(margin, res_counter_margin(&memcg->memsw));
|
|
return margin >> PAGE_SHIFT;
|
|
}
|
|
|
|
int mem_cgroup_swappiness(struct mem_cgroup *memcg)
|
|
{
|
|
struct cgroup *cgrp = memcg->css.cgroup;
|
|
|
|
/* root ? */
|
|
if (cgrp->parent == NULL)
|
|
return vm_swappiness;
|
|
|
|
return memcg->swappiness;
|
|
}
|
|
|
|
/*
|
|
* memcg->moving_account is used for checking possibility that some thread is
|
|
* calling move_account(). When a thread on CPU-A starts moving pages under
|
|
* a memcg, other threads should check memcg->moving_account under
|
|
* rcu_read_lock(), like this:
|
|
*
|
|
* CPU-A CPU-B
|
|
* rcu_read_lock()
|
|
* memcg->moving_account+1 if (memcg->mocing_account)
|
|
* take heavy locks.
|
|
* synchronize_rcu() update something.
|
|
* rcu_read_unlock()
|
|
* start move here.
|
|
*/
|
|
|
|
/* for quick checking without looking up memcg */
|
|
atomic_t memcg_moving __read_mostly;
|
|
|
|
static void mem_cgroup_start_move(struct mem_cgroup *memcg)
|
|
{
|
|
atomic_inc(&memcg_moving);
|
|
atomic_inc(&memcg->moving_account);
|
|
synchronize_rcu();
|
|
}
|
|
|
|
static void mem_cgroup_end_move(struct mem_cgroup *memcg)
|
|
{
|
|
/*
|
|
* Now, mem_cgroup_clear_mc() may call this function with NULL.
|
|
* We check NULL in callee rather than caller.
|
|
*/
|
|
if (memcg) {
|
|
atomic_dec(&memcg_moving);
|
|
atomic_dec(&memcg->moving_account);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* 2 routines for checking "mem" is under move_account() or not.
|
|
*
|
|
* mem_cgroup_stolen() - checking whether a cgroup is mc.from or not. This
|
|
* is used for avoiding races in accounting. If true,
|
|
* pc->mem_cgroup may be overwritten.
|
|
*
|
|
* mem_cgroup_under_move() - checking a cgroup is mc.from or mc.to or
|
|
* under hierarchy of moving cgroups. This is for
|
|
* waiting at hith-memory prressure caused by "move".
|
|
*/
|
|
|
|
static bool mem_cgroup_stolen(struct mem_cgroup *memcg)
|
|
{
|
|
VM_BUG_ON(!rcu_read_lock_held());
|
|
return atomic_read(&memcg->moving_account) > 0;
|
|
}
|
|
|
|
static bool mem_cgroup_under_move(struct mem_cgroup *memcg)
|
|
{
|
|
struct mem_cgroup *from;
|
|
struct mem_cgroup *to;
|
|
bool ret = false;
|
|
/*
|
|
* Unlike task_move routines, we access mc.to, mc.from not under
|
|
* mutual exclusion by cgroup_mutex. Here, we take spinlock instead.
|
|
*/
|
|
spin_lock(&mc.lock);
|
|
from = mc.from;
|
|
to = mc.to;
|
|
if (!from)
|
|
goto unlock;
|
|
|
|
ret = mem_cgroup_same_or_subtree(memcg, from)
|
|
|| mem_cgroup_same_or_subtree(memcg, to);
|
|
unlock:
|
|
spin_unlock(&mc.lock);
|
|
return ret;
|
|
}
|
|
|
|
static bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg)
|
|
{
|
|
if (mc.moving_task && current != mc.moving_task) {
|
|
if (mem_cgroup_under_move(memcg)) {
|
|
DEFINE_WAIT(wait);
|
|
prepare_to_wait(&mc.waitq, &wait, TASK_INTERRUPTIBLE);
|
|
/* moving charge context might have finished. */
|
|
if (mc.moving_task)
|
|
schedule();
|
|
finish_wait(&mc.waitq, &wait);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* Take this lock when
|
|
* - a code tries to modify page's memcg while it's USED.
|
|
* - a code tries to modify page state accounting in a memcg.
|
|
* see mem_cgroup_stolen(), too.
|
|
*/
|
|
static void move_lock_mem_cgroup(struct mem_cgroup *memcg,
|
|
unsigned long *flags)
|
|
{
|
|
spin_lock_irqsave(&memcg->move_lock, *flags);
|
|
}
|
|
|
|
static void move_unlock_mem_cgroup(struct mem_cgroup *memcg,
|
|
unsigned long *flags)
|
|
{
|
|
spin_unlock_irqrestore(&memcg->move_lock, *flags);
|
|
}
|
|
|
|
#define K(x) ((x) << (PAGE_SHIFT-10))
|
|
/**
|
|
* mem_cgroup_print_oom_info: Print OOM information relevant to memory controller.
|
|
* @memcg: The memory cgroup that went over limit
|
|
* @p: Task that is going to be killed
|
|
*
|
|
* NOTE: @memcg and @p's mem_cgroup can be different when hierarchy is
|
|
* enabled
|
|
*/
|
|
void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
|
|
{
|
|
struct cgroup *task_cgrp;
|
|
struct cgroup *mem_cgrp;
|
|
/*
|
|
* Need a buffer in BSS, can't rely on allocations. The code relies
|
|
* on the assumption that OOM is serialized for memory controller.
|
|
* If this assumption is broken, revisit this code.
|
|
*/
|
|
static char memcg_name[PATH_MAX];
|
|
int ret;
|
|
struct mem_cgroup *iter;
|
|
unsigned int i;
|
|
|
|
if (!p)
|
|
return;
|
|
|
|
rcu_read_lock();
|
|
|
|
mem_cgrp = memcg->css.cgroup;
|
|
task_cgrp = task_cgroup(p, mem_cgroup_subsys_id);
|
|
|
|
ret = cgroup_path(task_cgrp, memcg_name, PATH_MAX);
|
|
if (ret < 0) {
|
|
/*
|
|
* Unfortunately, we are unable to convert to a useful name
|
|
* But we'll still print out the usage information
|
|
*/
|
|
rcu_read_unlock();
|
|
goto done;
|
|
}
|
|
rcu_read_unlock();
|
|
|
|
pr_info("Task in %s killed", memcg_name);
|
|
|
|
rcu_read_lock();
|
|
ret = cgroup_path(mem_cgrp, memcg_name, PATH_MAX);
|
|
if (ret < 0) {
|
|
rcu_read_unlock();
|
|
goto done;
|
|
}
|
|
rcu_read_unlock();
|
|
|
|
/*
|
|
* Continues from above, so we don't need an KERN_ level
|
|
*/
|
|
pr_cont(" as a result of limit of %s\n", memcg_name);
|
|
done:
|
|
|
|
pr_info("memory: usage %llukB, limit %llukB, failcnt %llu\n",
|
|
res_counter_read_u64(&memcg->res, RES_USAGE) >> 10,
|
|
res_counter_read_u64(&memcg->res, RES_LIMIT) >> 10,
|
|
res_counter_read_u64(&memcg->res, RES_FAILCNT));
|
|
pr_info("memory+swap: usage %llukB, limit %llukB, failcnt %llu\n",
|
|
res_counter_read_u64(&memcg->memsw, RES_USAGE) >> 10,
|
|
res_counter_read_u64(&memcg->memsw, RES_LIMIT) >> 10,
|
|
res_counter_read_u64(&memcg->memsw, RES_FAILCNT));
|
|
pr_info("kmem: usage %llukB, limit %llukB, failcnt %llu\n",
|
|
res_counter_read_u64(&memcg->kmem, RES_USAGE) >> 10,
|
|
res_counter_read_u64(&memcg->kmem, RES_LIMIT) >> 10,
|
|
res_counter_read_u64(&memcg->kmem, RES_FAILCNT));
|
|
|
|
for_each_mem_cgroup_tree(iter, memcg) {
|
|
pr_info("Memory cgroup stats");
|
|
|
|
rcu_read_lock();
|
|
ret = cgroup_path(iter->css.cgroup, memcg_name, PATH_MAX);
|
|
if (!ret)
|
|
pr_cont(" for %s", memcg_name);
|
|
rcu_read_unlock();
|
|
pr_cont(":");
|
|
|
|
for (i = 0; i < MEM_CGROUP_STAT_NSTATS; i++) {
|
|
if (i == MEM_CGROUP_STAT_SWAP && !do_swap_account)
|
|
continue;
|
|
pr_cont(" %s:%ldKB", mem_cgroup_stat_names[i],
|
|
K(mem_cgroup_read_stat(iter, i)));
|
|
}
|
|
|
|
for (i = 0; i < NR_LRU_LISTS; i++)
|
|
pr_cont(" %s:%luKB", mem_cgroup_lru_names[i],
|
|
K(mem_cgroup_nr_lru_pages(iter, BIT(i))));
|
|
|
|
pr_cont("\n");
|
|
}
|
|
}
|
|
|
|
/*
|
|
* This function returns the number of memcg under hierarchy tree. Returns
|
|
* 1(self count) if no children.
|
|
*/
|
|
static int mem_cgroup_count_children(struct mem_cgroup *memcg)
|
|
{
|
|
int num = 0;
|
|
struct mem_cgroup *iter;
|
|
|
|
for_each_mem_cgroup_tree(iter, memcg)
|
|
num++;
|
|
return num;
|
|
}
|
|
|
|
/*
|
|
* Return the memory (and swap, if configured) limit for a memcg.
|
|
*/
|
|
static u64 mem_cgroup_get_limit(struct mem_cgroup *memcg)
|
|
{
|
|
u64 limit;
|
|
|
|
limit = res_counter_read_u64(&memcg->res, RES_LIMIT);
|
|
|
|
/*
|
|
* Do not consider swap space if we cannot swap due to swappiness
|
|
*/
|
|
if (mem_cgroup_swappiness(memcg)) {
|
|
u64 memsw;
|
|
|
|
limit += total_swap_pages << PAGE_SHIFT;
|
|
memsw = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
|
|
|
|
/*
|
|
* If memsw is finite and limits the amount of swap space
|
|
* available to this memcg, return that limit.
|
|
*/
|
|
limit = min(limit, memsw);
|
|
}
|
|
|
|
return limit;
|
|
}
|
|
|
|
static void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
|
|
int order)
|
|
{
|
|
struct mem_cgroup *iter;
|
|
unsigned long chosen_points = 0;
|
|
unsigned long totalpages;
|
|
unsigned int points = 0;
|
|
struct task_struct *chosen = NULL;
|
|
|
|
/*
|
|
* If current has a pending SIGKILL or is exiting, then automatically
|
|
* select it. The goal is to allow it to allocate so that it may
|
|
* quickly exit and free its memory.
|
|
*/
|
|
if (fatal_signal_pending(current) || current->flags & PF_EXITING) {
|
|
set_thread_flag(TIF_MEMDIE);
|
|
return;
|
|
}
|
|
|
|
check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, order, NULL);
|
|
totalpages = mem_cgroup_get_limit(memcg) >> PAGE_SHIFT ? : 1;
|
|
for_each_mem_cgroup_tree(iter, memcg) {
|
|
struct cgroup *cgroup = iter->css.cgroup;
|
|
struct cgroup_iter it;
|
|
struct task_struct *task;
|
|
|
|
cgroup_iter_start(cgroup, &it);
|
|
while ((task = cgroup_iter_next(cgroup, &it))) {
|
|
switch (oom_scan_process_thread(task, totalpages, NULL,
|
|
false)) {
|
|
case OOM_SCAN_SELECT:
|
|
if (chosen)
|
|
put_task_struct(chosen);
|
|
chosen = task;
|
|
chosen_points = ULONG_MAX;
|
|
get_task_struct(chosen);
|
|
/* fall through */
|
|
case OOM_SCAN_CONTINUE:
|
|
continue;
|
|
case OOM_SCAN_ABORT:
|
|
cgroup_iter_end(cgroup, &it);
|
|
mem_cgroup_iter_break(memcg, iter);
|
|
if (chosen)
|
|
put_task_struct(chosen);
|
|
return;
|
|
case OOM_SCAN_OK:
|
|
break;
|
|
};
|
|
points = oom_badness(task, memcg, NULL, totalpages);
|
|
if (points > chosen_points) {
|
|
if (chosen)
|
|
put_task_struct(chosen);
|
|
chosen = task;
|
|
chosen_points = points;
|
|
get_task_struct(chosen);
|
|
}
|
|
}
|
|
cgroup_iter_end(cgroup, &it);
|
|
}
|
|
|
|
if (!chosen)
|
|
return;
|
|
points = chosen_points * 1000 / totalpages;
|
|
oom_kill_process(chosen, gfp_mask, order, points, totalpages, memcg,
|
|
NULL, "Memory cgroup out of memory");
|
|
}
|
|
|
|
static unsigned long mem_cgroup_reclaim(struct mem_cgroup *memcg,
|
|
gfp_t gfp_mask,
|
|
unsigned long flags)
|
|
{
|
|
unsigned long total = 0;
|
|
bool noswap = false;
|
|
int loop;
|
|
|
|
if (flags & MEM_CGROUP_RECLAIM_NOSWAP)
|
|
noswap = true;
|
|
if (!(flags & MEM_CGROUP_RECLAIM_SHRINK) && memcg->memsw_is_minimum)
|
|
noswap = true;
|
|
|
|
for (loop = 0; loop < MEM_CGROUP_MAX_RECLAIM_LOOPS; loop++) {
|
|
if (loop)
|
|
drain_all_stock_async(memcg);
|
|
total += try_to_free_mem_cgroup_pages(memcg, gfp_mask, noswap);
|
|
/*
|
|
* Allow limit shrinkers, which are triggered directly
|
|
* by userspace, to catch signals and stop reclaim
|
|
* after minimal progress, regardless of the margin.
|
|
*/
|
|
if (total && (flags & MEM_CGROUP_RECLAIM_SHRINK))
|
|
break;
|
|
if (mem_cgroup_margin(memcg))
|
|
break;
|
|
/*
|
|
* If nothing was reclaimed after two attempts, there
|
|
* may be no reclaimable pages in this hierarchy.
|
|
*/
|
|
if (loop && !total)
|
|
break;
|
|
}
|
|
return total;
|
|
}
|
|
|
|
/**
|
|
* test_mem_cgroup_node_reclaimable
|
|
* @memcg: the target memcg
|
|
* @nid: the node ID to be checked.
|
|
* @noswap : specify true here if the user wants flle only information.
|
|
*
|
|
* This function returns whether the specified memcg contains any
|
|
* reclaimable pages on a node. Returns true if there are any reclaimable
|
|
* pages in the node.
|
|
*/
|
|
static bool test_mem_cgroup_node_reclaimable(struct mem_cgroup *memcg,
|
|
int nid, bool noswap)
|
|
{
|
|
if (mem_cgroup_node_nr_lru_pages(memcg, nid, LRU_ALL_FILE))
|
|
return true;
|
|
if (noswap || !total_swap_pages)
|
|
return false;
|
|
if (mem_cgroup_node_nr_lru_pages(memcg, nid, LRU_ALL_ANON))
|
|
return true;
|
|
return false;
|
|
|
|
}
|
|
#if MAX_NUMNODES > 1
|
|
|
|
/*
|
|
* Always updating the nodemask is not very good - even if we have an empty
|
|
* list or the wrong list here, we can start from some node and traverse all
|
|
* nodes based on the zonelist. So update the list loosely once per 10 secs.
|
|
*
|
|
*/
|
|
static void mem_cgroup_may_update_nodemask(struct mem_cgroup *memcg)
|
|
{
|
|
int nid;
|
|
/*
|
|
* numainfo_events > 0 means there was at least NUMAINFO_EVENTS_TARGET
|
|
* pagein/pageout changes since the last update.
|
|
*/
|
|
if (!atomic_read(&memcg->numainfo_events))
|
|
return;
|
|
if (atomic_inc_return(&memcg->numainfo_updating) > 1)
|
|
return;
|
|
|
|
/* make a nodemask where this memcg uses memory from */
|
|
memcg->scan_nodes = node_states[N_MEMORY];
|
|
|
|
for_each_node_mask(nid, node_states[N_MEMORY]) {
|
|
|
|
if (!test_mem_cgroup_node_reclaimable(memcg, nid, false))
|
|
node_clear(nid, memcg->scan_nodes);
|
|
}
|
|
|
|
atomic_set(&memcg->numainfo_events, 0);
|
|
atomic_set(&memcg->numainfo_updating, 0);
|
|
}
|
|
|
|
/*
|
|
* Selecting a node where we start reclaim from. Because what we need is just
|
|
* reducing usage counter, start from anywhere is O,K. Considering
|
|
* memory reclaim from current node, there are pros. and cons.
|
|
*
|
|
* Freeing memory from current node means freeing memory from a node which
|
|
* we'll use or we've used. So, it may make LRU bad. And if several threads
|
|
* hit limits, it will see a contention on a node. But freeing from remote
|
|
* node means more costs for memory reclaim because of memory latency.
|
|
*
|
|
* Now, we use round-robin. Better algorithm is welcomed.
|
|
*/
|
|
int mem_cgroup_select_victim_node(struct mem_cgroup *memcg)
|
|
{
|
|
int node;
|
|
|
|
mem_cgroup_may_update_nodemask(memcg);
|
|
node = memcg->last_scanned_node;
|
|
|
|
node = next_node(node, memcg->scan_nodes);
|
|
if (node == MAX_NUMNODES)
|
|
node = first_node(memcg->scan_nodes);
|
|
/*
|
|
* We call this when we hit limit, not when pages are added to LRU.
|
|
* No LRU may hold pages because all pages are UNEVICTABLE or
|
|
* memcg is too small and all pages are not on LRU. In that case,
|
|
* we use curret node.
|
|
*/
|
|
if (unlikely(node == MAX_NUMNODES))
|
|
node = numa_node_id();
|
|
|
|
memcg->last_scanned_node = node;
|
|
return node;
|
|
}
|
|
|
|
/*
|
|
* Check all nodes whether it contains reclaimable pages or not.
|
|
* For quick scan, we make use of scan_nodes. This will allow us to skip
|
|
* unused nodes. But scan_nodes is lazily updated and may not cotain
|
|
* enough new information. We need to do double check.
|
|
*/
|
|
static bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap)
|
|
{
|
|
int nid;
|
|
|
|
/*
|
|
* quick check...making use of scan_node.
|
|
* We can skip unused nodes.
|
|
*/
|
|
if (!nodes_empty(memcg->scan_nodes)) {
|
|
for (nid = first_node(memcg->scan_nodes);
|
|
nid < MAX_NUMNODES;
|
|
nid = next_node(nid, memcg->scan_nodes)) {
|
|
|
|
if (test_mem_cgroup_node_reclaimable(memcg, nid, noswap))
|
|
return true;
|
|
}
|
|
}
|
|
/*
|
|
* Check rest of nodes.
|
|
*/
|
|
for_each_node_state(nid, N_MEMORY) {
|
|
if (node_isset(nid, memcg->scan_nodes))
|
|
continue;
|
|
if (test_mem_cgroup_node_reclaimable(memcg, nid, noswap))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
#else
|
|
int mem_cgroup_select_victim_node(struct mem_cgroup *memcg)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap)
|
|
{
|
|
return test_mem_cgroup_node_reclaimable(memcg, 0, noswap);
|
|
}
|
|
#endif
|
|
|
|
static int mem_cgroup_soft_reclaim(struct mem_cgroup *root_memcg,
|
|
struct zone *zone,
|
|
gfp_t gfp_mask,
|
|
unsigned long *total_scanned)
|
|
{
|
|
struct mem_cgroup *victim = NULL;
|
|
int total = 0;
|
|
int loop = 0;
|
|
unsigned long excess;
|
|
unsigned long nr_scanned;
|
|
struct mem_cgroup_reclaim_cookie reclaim = {
|
|
.zone = zone,
|
|
.priority = 0,
|
|
};
|
|
|
|
excess = res_counter_soft_limit_excess(&root_memcg->res) >> PAGE_SHIFT;
|
|
|
|
while (1) {
|
|
victim = mem_cgroup_iter(root_memcg, victim, &reclaim);
|
|
if (!victim) {
|
|
loop++;
|
|
if (loop >= 2) {
|
|
/*
|
|
* If we have not been able to reclaim
|
|
* anything, it might because there are
|
|
* no reclaimable pages under this hierarchy
|
|
*/
|
|
if (!total)
|
|
break;
|
|
/*
|
|
* We want to do more targeted reclaim.
|
|
* excess >> 2 is not to excessive so as to
|
|
* reclaim too much, nor too less that we keep
|
|
* coming back to reclaim from this cgroup
|
|
*/
|
|
if (total >= (excess >> 2) ||
|
|
(loop > MEM_CGROUP_MAX_RECLAIM_LOOPS))
|
|
break;
|
|
}
|
|
continue;
|
|
}
|
|
if (!mem_cgroup_reclaimable(victim, false))
|
|
continue;
|
|
total += mem_cgroup_shrink_node_zone(victim, gfp_mask, false,
|
|
zone, &nr_scanned);
|
|
*total_scanned += nr_scanned;
|
|
if (!res_counter_soft_limit_excess(&root_memcg->res))
|
|
break;
|
|
}
|
|
mem_cgroup_iter_break(root_memcg, victim);
|
|
return total;
|
|
}
|
|
|
|
static DEFINE_SPINLOCK(memcg_oom_lock);
|
|
|
|
/*
|
|
* Check OOM-Killer is already running under our hierarchy.
|
|
* If someone is running, return false.
|
|
*/
|
|
static bool mem_cgroup_oom_trylock(struct mem_cgroup *memcg)
|
|
{
|
|
struct mem_cgroup *iter, *failed = NULL;
|
|
|
|
spin_lock(&memcg_oom_lock);
|
|
|
|
for_each_mem_cgroup_tree(iter, memcg) {
|
|
if (iter->oom_lock) {
|
|
/*
|
|
* this subtree of our hierarchy is already locked
|
|
* so we cannot give a lock.
|
|
*/
|
|
failed = iter;
|
|
mem_cgroup_iter_break(memcg, iter);
|
|
break;
|
|
} else
|
|
iter->oom_lock = true;
|
|
}
|
|
|
|
if (failed) {
|
|
/*
|
|
* OK, we failed to lock the whole subtree so we have
|
|
* to clean up what we set up to the failing subtree
|
|
*/
|
|
for_each_mem_cgroup_tree(iter, memcg) {
|
|
if (iter == failed) {
|
|
mem_cgroup_iter_break(memcg, iter);
|
|
break;
|
|
}
|
|
iter->oom_lock = false;
|
|
}
|
|
}
|
|
|
|
spin_unlock(&memcg_oom_lock);
|
|
|
|
return !failed;
|
|
}
|
|
|
|
static void mem_cgroup_oom_unlock(struct mem_cgroup *memcg)
|
|
{
|
|
struct mem_cgroup *iter;
|
|
|
|
spin_lock(&memcg_oom_lock);
|
|
for_each_mem_cgroup_tree(iter, memcg)
|
|
iter->oom_lock = false;
|
|
spin_unlock(&memcg_oom_lock);
|
|
}
|
|
|
|
static void mem_cgroup_mark_under_oom(struct mem_cgroup *memcg)
|
|
{
|
|
struct mem_cgroup *iter;
|
|
|
|
for_each_mem_cgroup_tree(iter, memcg)
|
|
atomic_inc(&iter->under_oom);
|
|
}
|
|
|
|
static void mem_cgroup_unmark_under_oom(struct mem_cgroup *memcg)
|
|
{
|
|
struct mem_cgroup *iter;
|
|
|
|
/*
|
|
* When a new child is created while the hierarchy is under oom,
|
|
* mem_cgroup_oom_lock() may not be called. We have to use
|
|
* atomic_add_unless() here.
|
|
*/
|
|
for_each_mem_cgroup_tree(iter, memcg)
|
|
atomic_add_unless(&iter->under_oom, -1, 0);
|
|
}
|
|
|
|
static DECLARE_WAIT_QUEUE_HEAD(memcg_oom_waitq);
|
|
|
|
struct oom_wait_info {
|
|
struct mem_cgroup *memcg;
|
|
wait_queue_t wait;
|
|
};
|
|
|
|
static int memcg_oom_wake_function(wait_queue_t *wait,
|
|
unsigned mode, int sync, void *arg)
|
|
{
|
|
struct mem_cgroup *wake_memcg = (struct mem_cgroup *)arg;
|
|
struct mem_cgroup *oom_wait_memcg;
|
|
struct oom_wait_info *oom_wait_info;
|
|
|
|
oom_wait_info = container_of(wait, struct oom_wait_info, wait);
|
|
oom_wait_memcg = oom_wait_info->memcg;
|
|
|
|
/*
|
|
* Both of oom_wait_info->memcg and wake_memcg are stable under us.
|
|
* Then we can use css_is_ancestor without taking care of RCU.
|
|
*/
|
|
if (!mem_cgroup_same_or_subtree(oom_wait_memcg, wake_memcg)
|
|
&& !mem_cgroup_same_or_subtree(wake_memcg, oom_wait_memcg))
|
|
return 0;
|
|
return autoremove_wake_function(wait, mode, sync, arg);
|
|
}
|
|
|
|
static void memcg_wakeup_oom(struct mem_cgroup *memcg)
|
|
{
|
|
atomic_inc(&memcg->oom_wakeups);
|
|
/* for filtering, pass "memcg" as argument. */
|
|
__wake_up(&memcg_oom_waitq, TASK_NORMAL, 0, memcg);
|
|
}
|
|
|
|
static void memcg_oom_recover(struct mem_cgroup *memcg)
|
|
{
|
|
if (memcg && atomic_read(&memcg->under_oom))
|
|
memcg_wakeup_oom(memcg);
|
|
}
|
|
|
|
static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
|
|
{
|
|
if (!current->memcg_oom.may_oom)
|
|
return;
|
|
/*
|
|
* We are in the middle of the charge context here, so we
|
|
* don't want to block when potentially sitting on a callstack
|
|
* that holds all kinds of filesystem and mm locks.
|
|
*
|
|
* Also, the caller may handle a failed allocation gracefully
|
|
* (like optional page cache readahead) and so an OOM killer
|
|
* invocation might not even be necessary.
|
|
*
|
|
* That's why we don't do anything here except remember the
|
|
* OOM context and then deal with it at the end of the page
|
|
* fault when the stack is unwound, the locks are released,
|
|
* and when we know whether the fault was overall successful.
|
|
*/
|
|
css_get(&memcg->css);
|
|
current->memcg_oom.memcg = memcg;
|
|
current->memcg_oom.gfp_mask = mask;
|
|
current->memcg_oom.order = order;
|
|
}
|
|
|
|
/**
|
|
* mem_cgroup_oom_synchronize - complete memcg OOM handling
|
|
* @handle: actually kill/wait or just clean up the OOM state
|
|
*
|
|
* This has to be called at the end of a page fault if the memcg OOM
|
|
* handler was enabled.
|
|
*
|
|
* Memcg supports userspace OOM handling where failed allocations must
|
|
* sleep on a waitqueue until the userspace task resolves the
|
|
* situation. Sleeping directly in the charge context with all kinds
|
|
* of locks held is not a good idea, instead we remember an OOM state
|
|
* in the task and mem_cgroup_oom_synchronize() has to be called at
|
|
* the end of the page fault to complete the OOM handling.
|
|
*
|
|
* Returns %true if an ongoing memcg OOM situation was detected and
|
|
* completed, %false otherwise.
|
|
*/
|
|
bool mem_cgroup_oom_synchronize(bool handle)
|
|
{
|
|
struct mem_cgroup *memcg = current->memcg_oom.memcg;
|
|
struct oom_wait_info owait;
|
|
bool locked;
|
|
|
|
/* OOM is global, do not handle */
|
|
if (!memcg)
|
|
return false;
|
|
|
|
if (!handle)
|
|
goto cleanup;
|
|
|
|
owait.memcg = memcg;
|
|
owait.wait.flags = 0;
|
|
owait.wait.func = memcg_oom_wake_function;
|
|
owait.wait.private = current;
|
|
INIT_LIST_HEAD(&owait.wait.task_list);
|
|
|
|
prepare_to_wait(&memcg_oom_waitq, &owait.wait, TASK_KILLABLE);
|
|
mem_cgroup_mark_under_oom(memcg);
|
|
|
|
locked = mem_cgroup_oom_trylock(memcg);
|
|
|
|
if (locked)
|
|
mem_cgroup_oom_notify(memcg);
|
|
|
|
if (locked && !memcg->oom_kill_disable) {
|
|
mem_cgroup_unmark_under_oom(memcg);
|
|
finish_wait(&memcg_oom_waitq, &owait.wait);
|
|
mem_cgroup_out_of_memory(memcg, current->memcg_oom.gfp_mask,
|
|
current->memcg_oom.order);
|
|
} else {
|
|
schedule();
|
|
mem_cgroup_unmark_under_oom(memcg);
|
|
finish_wait(&memcg_oom_waitq, &owait.wait);
|
|
}
|
|
|
|
if (locked) {
|
|
mem_cgroup_oom_unlock(memcg);
|
|
/*
|
|
* There is no guarantee that an OOM-lock contender
|
|
* sees the wakeups triggered by the OOM kill
|
|
* uncharges. Wake any sleepers explicitely.
|
|
*/
|
|
memcg_oom_recover(memcg);
|
|
}
|
|
cleanup:
|
|
current->memcg_oom.memcg = NULL;
|
|
css_put(&memcg->css);
|
|
return true;
|
|
}
|
|
|
|
/*
|
|
* Currently used to update mapped file statistics, but the routine can be
|
|
* generalized to update other statistics as well.
|
|
*
|
|
* Notes: Race condition
|
|
*
|
|
* We usually use page_cgroup_lock() for accessing page_cgroup member but
|
|
* it tends to be costly. But considering some conditions, we doesn't need
|
|
* to do so _always_.
|
|
*
|
|
* Considering "charge", lock_page_cgroup() is not required because all
|
|
* file-stat operations happen after a page is attached to radix-tree. There
|
|
* are no race with "charge".
|
|
*
|
|
* Considering "uncharge", we know that memcg doesn't clear pc->mem_cgroup
|
|
* at "uncharge" intentionally. So, we always see valid pc->mem_cgroup even
|
|
* if there are race with "uncharge". Statistics itself is properly handled
|
|
* by flags.
|
|
*
|
|
* Considering "move", this is an only case we see a race. To make the race
|
|
* small, we check mm->moving_account and detect there are possibility of race
|
|
* If there is, we take a lock.
|
|
*/
|
|
|
|
void __mem_cgroup_begin_update_page_stat(struct page *page,
|
|
bool *locked, unsigned long *flags)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
struct page_cgroup *pc;
|
|
|
|
pc = lookup_page_cgroup(page);
|
|
again:
|
|
memcg = pc->mem_cgroup;
|
|
if (unlikely(!memcg || !PageCgroupUsed(pc)))
|
|
return;
|
|
/*
|
|
* If this memory cgroup is not under account moving, we don't
|
|
* need to take move_lock_mem_cgroup(). Because we already hold
|
|
* rcu_read_lock(), any calls to move_account will be delayed until
|
|
* rcu_read_unlock() if mem_cgroup_stolen() == true.
|
|
*/
|
|
if (!mem_cgroup_stolen(memcg))
|
|
return;
|
|
|
|
move_lock_mem_cgroup(memcg, flags);
|
|
if (memcg != pc->mem_cgroup || !PageCgroupUsed(pc)) {
|
|
move_unlock_mem_cgroup(memcg, flags);
|
|
goto again;
|
|
}
|
|
*locked = true;
|
|
}
|
|
|
|
void __mem_cgroup_end_update_page_stat(struct page *page, unsigned long *flags)
|
|
{
|
|
struct page_cgroup *pc = lookup_page_cgroup(page);
|
|
|
|
/*
|
|
* It's guaranteed that pc->mem_cgroup never changes while
|
|
* lock is held because a routine modifies pc->mem_cgroup
|
|
* should take move_lock_mem_cgroup().
|
|
*/
|
|
move_unlock_mem_cgroup(pc->mem_cgroup, flags);
|
|
}
|
|
|
|
void mem_cgroup_update_page_stat(struct page *page,
|
|
enum mem_cgroup_page_stat_item idx, int val)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
struct page_cgroup *pc = lookup_page_cgroup(page);
|
|
unsigned long uninitialized_var(flags);
|
|
|
|
if (mem_cgroup_disabled())
|
|
return;
|
|
|
|
memcg = pc->mem_cgroup;
|
|
if (unlikely(!memcg || !PageCgroupUsed(pc)))
|
|
return;
|
|
|
|
switch (idx) {
|
|
case MEMCG_NR_FILE_MAPPED:
|
|
idx = MEM_CGROUP_STAT_FILE_MAPPED;
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
this_cpu_add(memcg->stat->count[idx], val);
|
|
}
|
|
|
|
/*
|
|
* size of first charge trial. "32" comes from vmscan.c's magic value.
|
|
* TODO: maybe necessary to use big numbers in big irons.
|
|
*/
|
|
#define CHARGE_BATCH 32U
|
|
struct memcg_stock_pcp {
|
|
struct mem_cgroup *cached; /* this never be root cgroup */
|
|
unsigned int nr_pages;
|
|
struct work_struct work;
|
|
unsigned long flags;
|
|
#define FLUSHING_CACHED_CHARGE 0
|
|
};
|
|
static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
|
|
static DEFINE_MUTEX(percpu_charge_mutex);
|
|
|
|
/**
|
|
* consume_stock: Try to consume stocked charge on this cpu.
|
|
* @memcg: memcg to consume from.
|
|
* @nr_pages: how many pages to charge.
|
|
*
|
|
* The charges will only happen if @memcg matches the current cpu's memcg
|
|
* stock, and at least @nr_pages are available in that stock. Failure to
|
|
* service an allocation will refill the stock.
|
|
*
|
|
* returns true if successful, false otherwise.
|
|
*/
|
|
static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
|
|
{
|
|
struct memcg_stock_pcp *stock;
|
|
bool ret = true;
|
|
|
|
if (nr_pages > CHARGE_BATCH)
|
|
return false;
|
|
|
|
stock = &get_cpu_var(memcg_stock);
|
|
if (memcg == stock->cached && stock->nr_pages >= nr_pages)
|
|
stock->nr_pages -= nr_pages;
|
|
else /* need to call res_counter_charge */
|
|
ret = false;
|
|
put_cpu_var(memcg_stock);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Returns stocks cached in percpu to res_counter and reset cached information.
|
|
*/
|
|
static void drain_stock(struct memcg_stock_pcp *stock)
|
|
{
|
|
struct mem_cgroup *old = stock->cached;
|
|
|
|
if (stock->nr_pages) {
|
|
unsigned long bytes = stock->nr_pages * PAGE_SIZE;
|
|
|
|
res_counter_uncharge(&old->res, bytes);
|
|
if (do_swap_account)
|
|
res_counter_uncharge(&old->memsw, bytes);
|
|
stock->nr_pages = 0;
|
|
}
|
|
stock->cached = NULL;
|
|
}
|
|
|
|
/*
|
|
* This must be called under preempt disabled or must be called by
|
|
* a thread which is pinned to local cpu.
|
|
*/
|
|
static void drain_local_stock(struct work_struct *dummy)
|
|
{
|
|
struct memcg_stock_pcp *stock = &__get_cpu_var(memcg_stock);
|
|
drain_stock(stock);
|
|
clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags);
|
|
}
|
|
|
|
static void __init memcg_stock_init(void)
|
|
{
|
|
int cpu;
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
struct memcg_stock_pcp *stock =
|
|
&per_cpu(memcg_stock, cpu);
|
|
INIT_WORK(&stock->work, drain_local_stock);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Cache charges(val) which is from res_counter, to local per_cpu area.
|
|
* This will be consumed by consume_stock() function, later.
|
|
*/
|
|
static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
|
|
{
|
|
struct memcg_stock_pcp *stock = &get_cpu_var(memcg_stock);
|
|
|
|
if (stock->cached != memcg) { /* reset if necessary */
|
|
drain_stock(stock);
|
|
stock->cached = memcg;
|
|
}
|
|
stock->nr_pages += nr_pages;
|
|
put_cpu_var(memcg_stock);
|
|
}
|
|
|
|
/*
|
|
* Drains all per-CPU charge caches for given root_memcg resp. subtree
|
|
* of the hierarchy under it. sync flag says whether we should block
|
|
* until the work is done.
|
|
*/
|
|
static void drain_all_stock(struct mem_cgroup *root_memcg, bool sync)
|
|
{
|
|
int cpu, curcpu;
|
|
|
|
/* Notify other cpus that system-wide "drain" is running */
|
|
get_online_cpus();
|
|
curcpu = get_cpu();
|
|
for_each_online_cpu(cpu) {
|
|
struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
|
|
struct mem_cgroup *memcg;
|
|
|
|
memcg = stock->cached;
|
|
if (!memcg || !stock->nr_pages)
|
|
continue;
|
|
if (!mem_cgroup_same_or_subtree(root_memcg, memcg))
|
|
continue;
|
|
if (!test_and_set_bit(FLUSHING_CACHED_CHARGE, &stock->flags)) {
|
|
if (cpu == curcpu)
|
|
drain_local_stock(&stock->work);
|
|
else
|
|
schedule_work_on(cpu, &stock->work);
|
|
}
|
|
}
|
|
put_cpu();
|
|
|
|
if (!sync)
|
|
goto out;
|
|
|
|
for_each_online_cpu(cpu) {
|
|
struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
|
|
if (test_bit(FLUSHING_CACHED_CHARGE, &stock->flags))
|
|
flush_work(&stock->work);
|
|
}
|
|
out:
|
|
put_online_cpus();
|
|
}
|
|
|
|
/*
|
|
* Tries to drain stocked charges in other cpus. This function is asynchronous
|
|
* and just put a work per cpu for draining localy on each cpu. Caller can
|
|
* expects some charges will be back to res_counter later but cannot wait for
|
|
* it.
|
|
*/
|
|
static void drain_all_stock_async(struct mem_cgroup *root_memcg)
|
|
{
|
|
/*
|
|
* If someone calls draining, avoid adding more kworker runs.
|
|
*/
|
|
if (!mutex_trylock(&percpu_charge_mutex))
|
|
return;
|
|
drain_all_stock(root_memcg, false);
|
|
mutex_unlock(&percpu_charge_mutex);
|
|
}
|
|
|
|
/* This is a synchronous drain interface. */
|
|
static void drain_all_stock_sync(struct mem_cgroup *root_memcg)
|
|
{
|
|
/* called when force_empty is called */
|
|
mutex_lock(&percpu_charge_mutex);
|
|
drain_all_stock(root_memcg, true);
|
|
mutex_unlock(&percpu_charge_mutex);
|
|
}
|
|
|
|
/*
|
|
* This function drains percpu counter value from DEAD cpu and
|
|
* move it to local cpu. Note that this function can be preempted.
|
|
*/
|
|
static void mem_cgroup_drain_pcp_counter(struct mem_cgroup *memcg, int cpu)
|
|
{
|
|
int i;
|
|
|
|
spin_lock(&memcg->pcp_counter_lock);
|
|
for (i = 0; i < MEM_CGROUP_STAT_NSTATS; i++) {
|
|
long x = per_cpu(memcg->stat->count[i], cpu);
|
|
|
|
per_cpu(memcg->stat->count[i], cpu) = 0;
|
|
memcg->nocpu_base.count[i] += x;
|
|
}
|
|
for (i = 0; i < MEM_CGROUP_EVENTS_NSTATS; i++) {
|
|
unsigned long x = per_cpu(memcg->stat->events[i], cpu);
|
|
|
|
per_cpu(memcg->stat->events[i], cpu) = 0;
|
|
memcg->nocpu_base.events[i] += x;
|
|
}
|
|
spin_unlock(&memcg->pcp_counter_lock);
|
|
}
|
|
|
|
static int __cpuinit memcg_cpu_hotplug_callback(struct notifier_block *nb,
|
|
unsigned long action,
|
|
void *hcpu)
|
|
{
|
|
int cpu = (unsigned long)hcpu;
|
|
struct memcg_stock_pcp *stock;
|
|
struct mem_cgroup *iter;
|
|
|
|
if (action == CPU_ONLINE)
|
|
return NOTIFY_OK;
|
|
|
|
if (action != CPU_DEAD && action != CPU_DEAD_FROZEN)
|
|
return NOTIFY_OK;
|
|
|
|
for_each_mem_cgroup(iter)
|
|
mem_cgroup_drain_pcp_counter(iter, cpu);
|
|
|
|
stock = &per_cpu(memcg_stock, cpu);
|
|
drain_stock(stock);
|
|
return NOTIFY_OK;
|
|
}
|
|
|
|
|
|
/* See __mem_cgroup_try_charge() for details */
|
|
enum {
|
|
CHARGE_OK, /* success */
|
|
CHARGE_RETRY, /* need to retry but retry is not bad */
|
|
CHARGE_NOMEM, /* we can't do more. return -ENOMEM */
|
|
CHARGE_WOULDBLOCK, /* GFP_WAIT wasn't set and no enough res. */
|
|
};
|
|
|
|
static int mem_cgroup_do_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,
|
|
unsigned int nr_pages, unsigned int min_pages,
|
|
bool invoke_oom)
|
|
{
|
|
unsigned long csize = nr_pages * PAGE_SIZE;
|
|
struct mem_cgroup *mem_over_limit;
|
|
struct res_counter *fail_res;
|
|
unsigned long flags = 0;
|
|
int ret;
|
|
|
|
ret = res_counter_charge(&memcg->res, csize, &fail_res);
|
|
|
|
if (likely(!ret)) {
|
|
if (!do_swap_account)
|
|
return CHARGE_OK;
|
|
ret = res_counter_charge(&memcg->memsw, csize, &fail_res);
|
|
if (likely(!ret))
|
|
return CHARGE_OK;
|
|
|
|
res_counter_uncharge(&memcg->res, csize);
|
|
mem_over_limit = mem_cgroup_from_res_counter(fail_res, memsw);
|
|
flags |= MEM_CGROUP_RECLAIM_NOSWAP;
|
|
} else
|
|
mem_over_limit = mem_cgroup_from_res_counter(fail_res, res);
|
|
/*
|
|
* Never reclaim on behalf of optional batching, retry with a
|
|
* single page instead.
|
|
*/
|
|
if (nr_pages > min_pages)
|
|
return CHARGE_RETRY;
|
|
|
|
if (!(gfp_mask & __GFP_WAIT))
|
|
return CHARGE_WOULDBLOCK;
|
|
|
|
if (gfp_mask & __GFP_NORETRY)
|
|
return CHARGE_NOMEM;
|
|
|
|
ret = mem_cgroup_reclaim(mem_over_limit, gfp_mask, flags);
|
|
if (mem_cgroup_margin(mem_over_limit) >= nr_pages)
|
|
return CHARGE_RETRY;
|
|
/*
|
|
* Even though the limit is exceeded at this point, reclaim
|
|
* may have been able to free some pages. Retry the charge
|
|
* before killing the task.
|
|
*
|
|
* Only for regular pages, though: huge pages are rather
|
|
* unlikely to succeed so close to the limit, and we fall back
|
|
* to regular pages anyway in case of failure.
|
|
*/
|
|
if (nr_pages <= (1 << PAGE_ALLOC_COSTLY_ORDER) && ret)
|
|
return CHARGE_RETRY;
|
|
|
|
/*
|
|
* At task move, charge accounts can be doubly counted. So, it's
|
|
* better to wait until the end of task_move if something is going on.
|
|
*/
|
|
if (mem_cgroup_wait_acct_move(mem_over_limit))
|
|
return CHARGE_RETRY;
|
|
|
|
if (invoke_oom)
|
|
mem_cgroup_oom(mem_over_limit, gfp_mask, get_order(csize));
|
|
|
|
return CHARGE_NOMEM;
|
|
}
|
|
|
|
/*
|
|
* __mem_cgroup_try_charge() does
|
|
* 1. detect memcg to be charged against from passed *mm and *ptr,
|
|
* 2. update res_counter
|
|
* 3. call memory reclaim if necessary.
|
|
*
|
|
* In some special case, if the task is fatal, fatal_signal_pending() or
|
|
* has TIF_MEMDIE, this function returns -EINTR while writing root_mem_cgroup
|
|
* to *ptr. There are two reasons for this. 1: fatal threads should quit as soon
|
|
* as possible without any hazards. 2: all pages should have a valid
|
|
* pc->mem_cgroup. If mm is NULL and the caller doesn't pass a valid memcg
|
|
* pointer, that is treated as a charge to root_mem_cgroup.
|
|
*
|
|
* So __mem_cgroup_try_charge() will return
|
|
* 0 ... on success, filling *ptr with a valid memcg pointer.
|
|
* -ENOMEM ... charge failure because of resource limits.
|
|
* -EINTR ... if thread is fatal. *ptr is filled with root_mem_cgroup.
|
|
*
|
|
* Unlike the exported interface, an "oom" parameter is added. if oom==true,
|
|
* the oom-killer can be invoked.
|
|
*/
|
|
static int __mem_cgroup_try_charge(struct mm_struct *mm,
|
|
gfp_t gfp_mask,
|
|
unsigned int nr_pages,
|
|
struct mem_cgroup **ptr,
|
|
bool oom)
|
|
{
|
|
unsigned int batch = max(CHARGE_BATCH, nr_pages);
|
|
int nr_oom_retries = MEM_CGROUP_RECLAIM_RETRIES;
|
|
struct mem_cgroup *memcg = NULL;
|
|
int ret;
|
|
|
|
/*
|
|
* Unlike gloval-vm's OOM-kill, we're not in memory shortage
|
|
* in system level. So, allow to go ahead dying process in addition to
|
|
* MEMDIE process.
|
|
*/
|
|
if (unlikely(test_thread_flag(TIF_MEMDIE)
|
|
|| fatal_signal_pending(current)))
|
|
goto bypass;
|
|
|
|
if (unlikely(task_in_memcg_oom(current)))
|
|
goto bypass;
|
|
|
|
/*
|
|
* We always charge the cgroup the mm_struct belongs to.
|
|
* The mm_struct's mem_cgroup changes on task migration if the
|
|
* thread group leader migrates. It's possible that mm is not
|
|
* set, if so charge the root memcg (happens for pagecache usage).
|
|
*/
|
|
if (!*ptr && !mm)
|
|
*ptr = root_mem_cgroup;
|
|
again:
|
|
if (*ptr) { /* css should be a valid one */
|
|
memcg = *ptr;
|
|
if (mem_cgroup_is_root(memcg))
|
|
goto done;
|
|
if (consume_stock(memcg, nr_pages))
|
|
goto done;
|
|
css_get(&memcg->css);
|
|
} else {
|
|
struct task_struct *p;
|
|
|
|
rcu_read_lock();
|
|
p = rcu_dereference(mm->owner);
|
|
/*
|
|
* Because we don't have task_lock(), "p" can exit.
|
|
* In that case, "memcg" can point to root or p can be NULL with
|
|
* race with swapoff. Then, we have small risk of mis-accouning.
|
|
* But such kind of mis-account by race always happens because
|
|
* we don't have cgroup_mutex(). It's overkill and we allo that
|
|
* small race, here.
|
|
* (*) swapoff at el will charge against mm-struct not against
|
|
* task-struct. So, mm->owner can be NULL.
|
|
*/
|
|
memcg = mem_cgroup_from_task(p);
|
|
if (!memcg)
|
|
memcg = root_mem_cgroup;
|
|
if (mem_cgroup_is_root(memcg)) {
|
|
rcu_read_unlock();
|
|
goto done;
|
|
}
|
|
if (consume_stock(memcg, nr_pages)) {
|
|
/*
|
|
* It seems dagerous to access memcg without css_get().
|
|
* But considering how consume_stok works, it's not
|
|
* necessary. If consume_stock success, some charges
|
|
* from this memcg are cached on this cpu. So, we
|
|
* don't need to call css_get()/css_tryget() before
|
|
* calling consume_stock().
|
|
*/
|
|
rcu_read_unlock();
|
|
goto done;
|
|
}
|
|
/* after here, we may be blocked. we need to get refcnt */
|
|
if (!css_tryget(&memcg->css)) {
|
|
rcu_read_unlock();
|
|
goto again;
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
do {
|
|
bool invoke_oom = oom && !nr_oom_retries;
|
|
|
|
/* If killed, bypass charge */
|
|
if (fatal_signal_pending(current)) {
|
|
css_put(&memcg->css);
|
|
goto bypass;
|
|
}
|
|
|
|
ret = mem_cgroup_do_charge(memcg, gfp_mask, batch,
|
|
nr_pages, invoke_oom);
|
|
switch (ret) {
|
|
case CHARGE_OK:
|
|
break;
|
|
case CHARGE_RETRY: /* not in OOM situation but retry */
|
|
batch = nr_pages;
|
|
css_put(&memcg->css);
|
|
memcg = NULL;
|
|
goto again;
|
|
case CHARGE_WOULDBLOCK: /* !__GFP_WAIT */
|
|
css_put(&memcg->css);
|
|
goto nomem;
|
|
case CHARGE_NOMEM: /* OOM routine works */
|
|
if (!oom || invoke_oom) {
|
|
css_put(&memcg->css);
|
|
goto nomem;
|
|
}
|
|
nr_oom_retries--;
|
|
break;
|
|
}
|
|
} while (ret != CHARGE_OK);
|
|
|
|
if (batch > nr_pages)
|
|
refill_stock(memcg, batch - nr_pages);
|
|
css_put(&memcg->css);
|
|
done:
|
|
*ptr = memcg;
|
|
return 0;
|
|
nomem:
|
|
*ptr = NULL;
|
|
return -ENOMEM;
|
|
bypass:
|
|
*ptr = root_mem_cgroup;
|
|
return -EINTR;
|
|
}
|
|
|
|
/*
|
|
* Somemtimes we have to undo a charge we got by try_charge().
|
|
* This function is for that and do uncharge, put css's refcnt.
|
|
* gotten by try_charge().
|
|
*/
|
|
static void __mem_cgroup_cancel_charge(struct mem_cgroup *memcg,
|
|
unsigned int nr_pages)
|
|
{
|
|
if (!mem_cgroup_is_root(memcg)) {
|
|
unsigned long bytes = nr_pages * PAGE_SIZE;
|
|
|
|
res_counter_uncharge(&memcg->res, bytes);
|
|
if (do_swap_account)
|
|
res_counter_uncharge(&memcg->memsw, bytes);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Cancel chrages in this cgroup....doesn't propagate to parent cgroup.
|
|
* This is useful when moving usage to parent cgroup.
|
|
*/
|
|
static void __mem_cgroup_cancel_local_charge(struct mem_cgroup *memcg,
|
|
unsigned int nr_pages)
|
|
{
|
|
unsigned long bytes = nr_pages * PAGE_SIZE;
|
|
|
|
if (mem_cgroup_is_root(memcg))
|
|
return;
|
|
|
|
res_counter_uncharge_until(&memcg->res, memcg->res.parent, bytes);
|
|
if (do_swap_account)
|
|
res_counter_uncharge_until(&memcg->memsw,
|
|
memcg->memsw.parent, bytes);
|
|
}
|
|
|
|
/*
|
|
* A helper function to get mem_cgroup from ID. must be called under
|
|
* rcu_read_lock(). The caller is responsible for calling css_tryget if
|
|
* the mem_cgroup is used for charging. (dropping refcnt from swap can be
|
|
* called against removed memcg.)
|
|
*/
|
|
static struct mem_cgroup *mem_cgroup_lookup(unsigned short id)
|
|
{
|
|
struct cgroup_subsys_state *css;
|
|
|
|
/* ID 0 is unused ID */
|
|
if (!id)
|
|
return NULL;
|
|
css = css_lookup(&mem_cgroup_subsys, id);
|
|
if (!css)
|
|
return NULL;
|
|
return mem_cgroup_from_css(css);
|
|
}
|
|
|
|
struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page)
|
|
{
|
|
struct mem_cgroup *memcg = NULL;
|
|
struct page_cgroup *pc;
|
|
unsigned short id;
|
|
swp_entry_t ent;
|
|
|
|
VM_BUG_ON(!PageLocked(page));
|
|
|
|
pc = lookup_page_cgroup(page);
|
|
lock_page_cgroup(pc);
|
|
if (PageCgroupUsed(pc)) {
|
|
memcg = pc->mem_cgroup;
|
|
if (memcg && !css_tryget(&memcg->css))
|
|
memcg = NULL;
|
|
} else if (PageSwapCache(page)) {
|
|
ent.val = page_private(page);
|
|
id = lookup_swap_cgroup_id(ent);
|
|
rcu_read_lock();
|
|
memcg = mem_cgroup_lookup(id);
|
|
if (memcg && !css_tryget(&memcg->css))
|
|
memcg = NULL;
|
|
rcu_read_unlock();
|
|
}
|
|
unlock_page_cgroup(pc);
|
|
return memcg;
|
|
}
|
|
|
|
static void __mem_cgroup_commit_charge(struct mem_cgroup *memcg,
|
|
struct page *page,
|
|
unsigned int nr_pages,
|
|
enum charge_type ctype,
|
|
bool lrucare)
|
|
{
|
|
struct page_cgroup *pc = lookup_page_cgroup(page);
|
|
struct zone *uninitialized_var(zone);
|
|
struct lruvec *lruvec;
|
|
bool was_on_lru = false;
|
|
bool anon;
|
|
|
|
lock_page_cgroup(pc);
|
|
VM_BUG_ON(PageCgroupUsed(pc));
|
|
/*
|
|
* we don't need page_cgroup_lock about tail pages, becase they are not
|
|
* accessed by any other context at this point.
|
|
*/
|
|
|
|
/*
|
|
* In some cases, SwapCache and FUSE(splice_buf->radixtree), the page
|
|
* may already be on some other mem_cgroup's LRU. Take care of it.
|
|
*/
|
|
if (lrucare) {
|
|
zone = page_zone(page);
|
|
spin_lock_irq(&zone->lru_lock);
|
|
if (PageLRU(page)) {
|
|
lruvec = mem_cgroup_zone_lruvec(zone, pc->mem_cgroup);
|
|
ClearPageLRU(page);
|
|
del_page_from_lru_list(page, lruvec, page_lru(page));
|
|
was_on_lru = true;
|
|
}
|
|
}
|
|
|
|
pc->mem_cgroup = memcg;
|
|
/*
|
|
* We access a page_cgroup asynchronously without lock_page_cgroup().
|
|
* Especially when a page_cgroup is taken from a page, pc->mem_cgroup
|
|
* is accessed after testing USED bit. To make pc->mem_cgroup visible
|
|
* before USED bit, we need memory barrier here.
|
|
* See mem_cgroup_add_lru_list(), etc.
|
|
*/
|
|
smp_wmb();
|
|
SetPageCgroupUsed(pc);
|
|
|
|
if (lrucare) {
|
|
if (was_on_lru) {
|
|
lruvec = mem_cgroup_zone_lruvec(zone, pc->mem_cgroup);
|
|
VM_BUG_ON(PageLRU(page));
|
|
SetPageLRU(page);
|
|
add_page_to_lru_list(page, lruvec, page_lru(page));
|
|
}
|
|
spin_unlock_irq(&zone->lru_lock);
|
|
}
|
|
|
|
if (ctype == MEM_CGROUP_CHARGE_TYPE_ANON)
|
|
anon = true;
|
|
else
|
|
anon = false;
|
|
|
|
mem_cgroup_charge_statistics(memcg, page, anon, nr_pages);
|
|
unlock_page_cgroup(pc);
|
|
|
|
/*
|
|
* "charge_statistics" updated event counter. Then, check it.
|
|
* Insert ancestor (and ancestor's ancestors), to softlimit RB-tree.
|
|
* if they exceeds softlimit.
|
|
*/
|
|
memcg_check_events(memcg, page);
|
|
}
|
|
|
|
static DEFINE_MUTEX(set_limit_mutex);
|
|
|
|
#ifdef CONFIG_MEMCG_KMEM
|
|
static inline bool memcg_can_account_kmem(struct mem_cgroup *memcg)
|
|
{
|
|
return !mem_cgroup_disabled() && !mem_cgroup_is_root(memcg) &&
|
|
(memcg->kmem_account_flags & KMEM_ACCOUNTED_MASK);
|
|
}
|
|
|
|
/*
|
|
* This is a bit cumbersome, but it is rarely used and avoids a backpointer
|
|
* in the memcg_cache_params struct.
|
|
*/
|
|
static struct kmem_cache *memcg_params_to_cache(struct memcg_cache_params *p)
|
|
{
|
|
struct kmem_cache *cachep;
|
|
|
|
VM_BUG_ON(p->is_root_cache);
|
|
cachep = p->root_cache;
|
|
return cachep->memcg_params->memcg_caches[memcg_cache_id(p->memcg)];
|
|
}
|
|
|
|
#ifdef CONFIG_SLABINFO
|
|
static int mem_cgroup_slabinfo_read(struct cgroup *cont, struct cftype *cft,
|
|
struct seq_file *m)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
struct memcg_cache_params *params;
|
|
|
|
if (!memcg_can_account_kmem(memcg))
|
|
return -EIO;
|
|
|
|
print_slabinfo_header(m);
|
|
|
|
mutex_lock(&memcg->slab_caches_mutex);
|
|
list_for_each_entry(params, &memcg->memcg_slab_caches, list)
|
|
cache_show(memcg_params_to_cache(params), m);
|
|
mutex_unlock(&memcg->slab_caches_mutex);
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static int memcg_charge_kmem(struct mem_cgroup *memcg, gfp_t gfp, u64 size)
|
|
{
|
|
struct res_counter *fail_res;
|
|
struct mem_cgroup *_memcg;
|
|
int ret = 0;
|
|
bool may_oom;
|
|
|
|
ret = res_counter_charge(&memcg->kmem, size, &fail_res);
|
|
if (ret)
|
|
return ret;
|
|
|
|
/*
|
|
* Conditions under which we can wait for the oom_killer. Those are
|
|
* the same conditions tested by the core page allocator
|
|
*/
|
|
may_oom = (gfp & __GFP_FS) && !(gfp & __GFP_NORETRY);
|
|
|
|
_memcg = memcg;
|
|
ret = __mem_cgroup_try_charge(NULL, gfp, size >> PAGE_SHIFT,
|
|
&_memcg, may_oom);
|
|
|
|
if (ret == -EINTR) {
|
|
/*
|
|
* __mem_cgroup_try_charge() chosed to bypass to root due to
|
|
* OOM kill or fatal signal. Since our only options are to
|
|
* either fail the allocation or charge it to this cgroup, do
|
|
* it as a temporary condition. But we can't fail. From a
|
|
* kmem/slab perspective, the cache has already been selected,
|
|
* by mem_cgroup_kmem_get_cache(), so it is too late to change
|
|
* our minds.
|
|
*
|
|
* This condition will only trigger if the task entered
|
|
* memcg_charge_kmem in a sane state, but was OOM-killed during
|
|
* __mem_cgroup_try_charge() above. Tasks that were already
|
|
* dying when the allocation triggers should have been already
|
|
* directed to the root cgroup in memcontrol.h
|
|
*/
|
|
res_counter_charge_nofail(&memcg->res, size, &fail_res);
|
|
if (do_swap_account)
|
|
res_counter_charge_nofail(&memcg->memsw, size,
|
|
&fail_res);
|
|
ret = 0;
|
|
} else if (ret)
|
|
res_counter_uncharge(&memcg->kmem, size);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void memcg_uncharge_kmem(struct mem_cgroup *memcg, u64 size)
|
|
{
|
|
res_counter_uncharge(&memcg->res, size);
|
|
if (do_swap_account)
|
|
res_counter_uncharge(&memcg->memsw, size);
|
|
|
|
/* Not down to 0 */
|
|
if (res_counter_uncharge(&memcg->kmem, size))
|
|
return;
|
|
|
|
if (memcg_kmem_test_and_clear_dead(memcg))
|
|
mem_cgroup_put(memcg);
|
|
}
|
|
|
|
void memcg_cache_list_add(struct mem_cgroup *memcg, struct kmem_cache *cachep)
|
|
{
|
|
if (!memcg)
|
|
return;
|
|
|
|
mutex_lock(&memcg->slab_caches_mutex);
|
|
list_add(&cachep->memcg_params->list, &memcg->memcg_slab_caches);
|
|
mutex_unlock(&memcg->slab_caches_mutex);
|
|
}
|
|
|
|
/*
|
|
* helper for acessing a memcg's index. It will be used as an index in the
|
|
* child cache array in kmem_cache, and also to derive its name. This function
|
|
* will return -1 when this is not a kmem-limited memcg.
|
|
*/
|
|
int memcg_cache_id(struct mem_cgroup *memcg)
|
|
{
|
|
return memcg ? memcg->kmemcg_id : -1;
|
|
}
|
|
|
|
/*
|
|
* This ends up being protected by the set_limit mutex, during normal
|
|
* operation, because that is its main call site.
|
|
*
|
|
* But when we create a new cache, we can call this as well if its parent
|
|
* is kmem-limited. That will have to hold set_limit_mutex as well.
|
|
*/
|
|
int memcg_update_cache_sizes(struct mem_cgroup *memcg)
|
|
{
|
|
int num, ret;
|
|
|
|
num = ida_simple_get(&kmem_limited_groups,
|
|
0, MEMCG_CACHES_MAX_SIZE, GFP_KERNEL);
|
|
if (num < 0)
|
|
return num;
|
|
/*
|
|
* After this point, kmem_accounted (that we test atomically in
|
|
* the beginning of this conditional), is no longer 0. This
|
|
* guarantees only one process will set the following boolean
|
|
* to true. We don't need test_and_set because we're protected
|
|
* by the set_limit_mutex anyway.
|
|
*/
|
|
memcg_kmem_set_activated(memcg);
|
|
|
|
ret = memcg_update_all_caches(num+1);
|
|
if (ret) {
|
|
ida_simple_remove(&kmem_limited_groups, num);
|
|
memcg_kmem_clear_activated(memcg);
|
|
return ret;
|
|
}
|
|
|
|
memcg->kmemcg_id = num;
|
|
INIT_LIST_HEAD(&memcg->memcg_slab_caches);
|
|
mutex_init(&memcg->slab_caches_mutex);
|
|
return 0;
|
|
}
|
|
|
|
static size_t memcg_caches_array_size(int num_groups)
|
|
{
|
|
ssize_t size;
|
|
if (num_groups <= 0)
|
|
return 0;
|
|
|
|
size = 2 * num_groups;
|
|
if (size < MEMCG_CACHES_MIN_SIZE)
|
|
size = MEMCG_CACHES_MIN_SIZE;
|
|
else if (size > MEMCG_CACHES_MAX_SIZE)
|
|
size = MEMCG_CACHES_MAX_SIZE;
|
|
|
|
return size;
|
|
}
|
|
|
|
/*
|
|
* We should update the current array size iff all caches updates succeed. This
|
|
* can only be done from the slab side. The slab mutex needs to be held when
|
|
* calling this.
|
|
*/
|
|
void memcg_update_array_size(int num)
|
|
{
|
|
if (num > memcg_limited_groups_array_size)
|
|
memcg_limited_groups_array_size = memcg_caches_array_size(num);
|
|
}
|
|
|
|
static void kmem_cache_destroy_work_func(struct work_struct *w);
|
|
|
|
int memcg_update_cache_size(struct kmem_cache *s, int num_groups)
|
|
{
|
|
struct memcg_cache_params *cur_params = s->memcg_params;
|
|
|
|
VM_BUG_ON(s->memcg_params && !s->memcg_params->is_root_cache);
|
|
|
|
if (num_groups > memcg_limited_groups_array_size) {
|
|
int i;
|
|
ssize_t size = memcg_caches_array_size(num_groups);
|
|
|
|
size *= sizeof(void *);
|
|
size += sizeof(struct memcg_cache_params);
|
|
|
|
s->memcg_params = kzalloc(size, GFP_KERNEL);
|
|
if (!s->memcg_params) {
|
|
s->memcg_params = cur_params;
|
|
return -ENOMEM;
|
|
}
|
|
|
|
s->memcg_params->is_root_cache = true;
|
|
|
|
/*
|
|
* There is the chance it will be bigger than
|
|
* memcg_limited_groups_array_size, if we failed an allocation
|
|
* in a cache, in which case all caches updated before it, will
|
|
* have a bigger array.
|
|
*
|
|
* But if that is the case, the data after
|
|
* memcg_limited_groups_array_size is certainly unused
|
|
*/
|
|
for (i = 0; i < memcg_limited_groups_array_size; i++) {
|
|
if (!cur_params->memcg_caches[i])
|
|
continue;
|
|
s->memcg_params->memcg_caches[i] =
|
|
cur_params->memcg_caches[i];
|
|
}
|
|
|
|
/*
|
|
* Ideally, we would wait until all caches succeed, and only
|
|
* then free the old one. But this is not worth the extra
|
|
* pointer per-cache we'd have to have for this.
|
|
*
|
|
* It is not a big deal if some caches are left with a size
|
|
* bigger than the others. And all updates will reset this
|
|
* anyway.
|
|
*/
|
|
kfree(cur_params);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s,
|
|
struct kmem_cache *root_cache)
|
|
{
|
|
size_t size = sizeof(struct memcg_cache_params);
|
|
|
|
if (!memcg_kmem_enabled())
|
|
return 0;
|
|
|
|
if (!memcg)
|
|
size += memcg_limited_groups_array_size * sizeof(void *);
|
|
|
|
s->memcg_params = kzalloc(size, GFP_KERNEL);
|
|
if (!s->memcg_params)
|
|
return -ENOMEM;
|
|
|
|
if (memcg) {
|
|
s->memcg_params->memcg = memcg;
|
|
s->memcg_params->root_cache = root_cache;
|
|
INIT_WORK(&s->memcg_params->destroy,
|
|
kmem_cache_destroy_work_func);
|
|
} else
|
|
s->memcg_params->is_root_cache = true;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void memcg_release_cache(struct kmem_cache *s)
|
|
{
|
|
struct kmem_cache *root;
|
|
struct mem_cgroup *memcg;
|
|
int id;
|
|
|
|
/*
|
|
* This happens, for instance, when a root cache goes away before we
|
|
* add any memcg.
|
|
*/
|
|
if (!s->memcg_params)
|
|
return;
|
|
|
|
if (s->memcg_params->is_root_cache)
|
|
goto out;
|
|
|
|
memcg = s->memcg_params->memcg;
|
|
id = memcg_cache_id(memcg);
|
|
|
|
root = s->memcg_params->root_cache;
|
|
root->memcg_params->memcg_caches[id] = NULL;
|
|
|
|
mutex_lock(&memcg->slab_caches_mutex);
|
|
list_del(&s->memcg_params->list);
|
|
mutex_unlock(&memcg->slab_caches_mutex);
|
|
|
|
mem_cgroup_put(memcg);
|
|
out:
|
|
kfree(s->memcg_params);
|
|
}
|
|
|
|
/*
|
|
* During the creation a new cache, we need to disable our accounting mechanism
|
|
* altogether. This is true even if we are not creating, but rather just
|
|
* enqueing new caches to be created.
|
|
*
|
|
* This is because that process will trigger allocations; some visible, like
|
|
* explicit kmallocs to auxiliary data structures, name strings and internal
|
|
* cache structures; some well concealed, like INIT_WORK() that can allocate
|
|
* objects during debug.
|
|
*
|
|
* If any allocation happens during memcg_kmem_get_cache, we will recurse back
|
|
* to it. This may not be a bounded recursion: since the first cache creation
|
|
* failed to complete (waiting on the allocation), we'll just try to create the
|
|
* cache again, failing at the same point.
|
|
*
|
|
* memcg_kmem_get_cache is prepared to abort after seeing a positive count of
|
|
* memcg_kmem_skip_account. So we enclose anything that might allocate memory
|
|
* inside the following two functions.
|
|
*/
|
|
static inline void memcg_stop_kmem_account(void)
|
|
{
|
|
VM_BUG_ON(!current->mm);
|
|
current->memcg_kmem_skip_account++;
|
|
}
|
|
|
|
static inline void memcg_resume_kmem_account(void)
|
|
{
|
|
VM_BUG_ON(!current->mm);
|
|
current->memcg_kmem_skip_account--;
|
|
}
|
|
|
|
static void kmem_cache_destroy_work_func(struct work_struct *w)
|
|
{
|
|
struct kmem_cache *cachep;
|
|
struct memcg_cache_params *p;
|
|
|
|
p = container_of(w, struct memcg_cache_params, destroy);
|
|
|
|
cachep = memcg_params_to_cache(p);
|
|
|
|
/*
|
|
* If we get down to 0 after shrink, we could delete right away.
|
|
* However, memcg_release_pages() already puts us back in the workqueue
|
|
* in that case. If we proceed deleting, we'll get a dangling
|
|
* reference, and removing the object from the workqueue in that case
|
|
* is unnecessary complication. We are not a fast path.
|
|
*
|
|
* Note that this case is fundamentally different from racing with
|
|
* shrink_slab(): if memcg_cgroup_destroy_cache() is called in
|
|
* kmem_cache_shrink, not only we would be reinserting a dead cache
|
|
* into the queue, but doing so from inside the worker racing to
|
|
* destroy it.
|
|
*
|
|
* So if we aren't down to zero, we'll just schedule a worker and try
|
|
* again
|
|
*/
|
|
if (atomic_read(&cachep->memcg_params->nr_pages) != 0) {
|
|
kmem_cache_shrink(cachep);
|
|
if (atomic_read(&cachep->memcg_params->nr_pages) == 0)
|
|
return;
|
|
} else
|
|
kmem_cache_destroy(cachep);
|
|
}
|
|
|
|
void mem_cgroup_destroy_cache(struct kmem_cache *cachep)
|
|
{
|
|
if (!cachep->memcg_params->dead)
|
|
return;
|
|
|
|
/*
|
|
* There are many ways in which we can get here.
|
|
*
|
|
* We can get to a memory-pressure situation while the delayed work is
|
|
* still pending to run. The vmscan shrinkers can then release all
|
|
* cache memory and get us to destruction. If this is the case, we'll
|
|
* be executed twice, which is a bug (the second time will execute over
|
|
* bogus data). In this case, cancelling the work should be fine.
|
|
*
|
|
* But we can also get here from the worker itself, if
|
|
* kmem_cache_shrink is enough to shake all the remaining objects and
|
|
* get the page count to 0. In this case, we'll deadlock if we try to
|
|
* cancel the work (the worker runs with an internal lock held, which
|
|
* is the same lock we would hold for cancel_work_sync().)
|
|
*
|
|
* Since we can't possibly know who got us here, just refrain from
|
|
* running if there is already work pending
|
|
*/
|
|
if (work_pending(&cachep->memcg_params->destroy))
|
|
return;
|
|
/*
|
|
* We have to defer the actual destroying to a workqueue, because
|
|
* we might currently be in a context that cannot sleep.
|
|
*/
|
|
schedule_work(&cachep->memcg_params->destroy);
|
|
}
|
|
|
|
/*
|
|
* This lock protects updaters, not readers. We want readers to be as fast as
|
|
* they can, and they will either see NULL or a valid cache value. Our model
|
|
* allow them to see NULL, in which case the root memcg will be selected.
|
|
*
|
|
* We need this lock because multiple allocations to the same cache from a non
|
|
* will span more than one worker. Only one of them can create the cache.
|
|
*/
|
|
static DEFINE_MUTEX(memcg_cache_mutex);
|
|
|
|
/*
|
|
* Called with memcg_cache_mutex held
|
|
*/
|
|
static struct kmem_cache *kmem_cache_dup(struct mem_cgroup *memcg,
|
|
struct kmem_cache *s)
|
|
{
|
|
struct kmem_cache *new;
|
|
static char *tmp_name = NULL;
|
|
|
|
lockdep_assert_held(&memcg_cache_mutex);
|
|
|
|
/*
|
|
* kmem_cache_create_memcg duplicates the given name and
|
|
* cgroup_name for this name requires RCU context.
|
|
* This static temporary buffer is used to prevent from
|
|
* pointless shortliving allocation.
|
|
*/
|
|
if (!tmp_name) {
|
|
tmp_name = kmalloc(PATH_MAX, GFP_KERNEL);
|
|
if (!tmp_name)
|
|
return NULL;
|
|
}
|
|
|
|
rcu_read_lock();
|
|
snprintf(tmp_name, PATH_MAX, "%s(%d:%s)", s->name,
|
|
memcg_cache_id(memcg), cgroup_name(memcg->css.cgroup));
|
|
rcu_read_unlock();
|
|
|
|
new = kmem_cache_create_memcg(memcg, tmp_name, s->object_size, s->align,
|
|
(s->flags & ~SLAB_PANIC), s->ctor, s);
|
|
|
|
if (new)
|
|
new->allocflags |= __GFP_KMEMCG;
|
|
|
|
return new;
|
|
}
|
|
|
|
static struct kmem_cache *memcg_create_kmem_cache(struct mem_cgroup *memcg,
|
|
struct kmem_cache *cachep)
|
|
{
|
|
struct kmem_cache *new_cachep;
|
|
int idx;
|
|
|
|
BUG_ON(!memcg_can_account_kmem(memcg));
|
|
|
|
idx = memcg_cache_id(memcg);
|
|
|
|
mutex_lock(&memcg_cache_mutex);
|
|
new_cachep = cachep->memcg_params->memcg_caches[idx];
|
|
if (new_cachep)
|
|
goto out;
|
|
|
|
new_cachep = kmem_cache_dup(memcg, cachep);
|
|
if (new_cachep == NULL) {
|
|
new_cachep = cachep;
|
|
goto out;
|
|
}
|
|
|
|
mem_cgroup_get(memcg);
|
|
atomic_set(&new_cachep->memcg_params->nr_pages , 0);
|
|
|
|
cachep->memcg_params->memcg_caches[idx] = new_cachep;
|
|
/*
|
|
* the readers won't lock, make sure everybody sees the updated value,
|
|
* so they won't put stuff in the queue again for no reason
|
|
*/
|
|
wmb();
|
|
out:
|
|
mutex_unlock(&memcg_cache_mutex);
|
|
return new_cachep;
|
|
}
|
|
|
|
void kmem_cache_destroy_memcg_children(struct kmem_cache *s)
|
|
{
|
|
struct kmem_cache *c;
|
|
int i;
|
|
|
|
if (!s->memcg_params)
|
|
return;
|
|
if (!s->memcg_params->is_root_cache)
|
|
return;
|
|
|
|
/*
|
|
* If the cache is being destroyed, we trust that there is no one else
|
|
* requesting objects from it. Even if there are, the sanity checks in
|
|
* kmem_cache_destroy should caught this ill-case.
|
|
*
|
|
* Still, we don't want anyone else freeing memcg_caches under our
|
|
* noses, which can happen if a new memcg comes to life. As usual,
|
|
* we'll take the set_limit_mutex to protect ourselves against this.
|
|
*/
|
|
mutex_lock(&set_limit_mutex);
|
|
for (i = 0; i < memcg_limited_groups_array_size; i++) {
|
|
c = s->memcg_params->memcg_caches[i];
|
|
if (!c)
|
|
continue;
|
|
|
|
/*
|
|
* We will now manually delete the caches, so to avoid races
|
|
* we need to cancel all pending destruction workers and
|
|
* proceed with destruction ourselves.
|
|
*
|
|
* kmem_cache_destroy() will call kmem_cache_shrink internally,
|
|
* and that could spawn the workers again: it is likely that
|
|
* the cache still have active pages until this very moment.
|
|
* This would lead us back to mem_cgroup_destroy_cache.
|
|
*
|
|
* But that will not execute at all if the "dead" flag is not
|
|
* set, so flip it down to guarantee we are in control.
|
|
*/
|
|
c->memcg_params->dead = false;
|
|
cancel_work_sync(&c->memcg_params->destroy);
|
|
kmem_cache_destroy(c);
|
|
}
|
|
mutex_unlock(&set_limit_mutex);
|
|
}
|
|
|
|
struct create_work {
|
|
struct mem_cgroup *memcg;
|
|
struct kmem_cache *cachep;
|
|
struct work_struct work;
|
|
};
|
|
|
|
static void mem_cgroup_destroy_all_caches(struct mem_cgroup *memcg)
|
|
{
|
|
struct kmem_cache *cachep;
|
|
struct memcg_cache_params *params;
|
|
|
|
if (!memcg_kmem_is_active(memcg))
|
|
return;
|
|
|
|
mutex_lock(&memcg->slab_caches_mutex);
|
|
list_for_each_entry(params, &memcg->memcg_slab_caches, list) {
|
|
cachep = memcg_params_to_cache(params);
|
|
cachep->memcg_params->dead = true;
|
|
schedule_work(&cachep->memcg_params->destroy);
|
|
}
|
|
mutex_unlock(&memcg->slab_caches_mutex);
|
|
}
|
|
|
|
static void memcg_create_cache_work_func(struct work_struct *w)
|
|
{
|
|
struct create_work *cw;
|
|
|
|
cw = container_of(w, struct create_work, work);
|
|
memcg_create_kmem_cache(cw->memcg, cw->cachep);
|
|
/* Drop the reference gotten when we enqueued. */
|
|
css_put(&cw->memcg->css);
|
|
kfree(cw);
|
|
}
|
|
|
|
/*
|
|
* Enqueue the creation of a per-memcg kmem_cache.
|
|
*/
|
|
static void __memcg_create_cache_enqueue(struct mem_cgroup *memcg,
|
|
struct kmem_cache *cachep)
|
|
{
|
|
struct create_work *cw;
|
|
|
|
cw = kmalloc(sizeof(struct create_work), GFP_NOWAIT);
|
|
if (cw == NULL) {
|
|
css_put(&memcg->css);
|
|
return;
|
|
}
|
|
|
|
cw->memcg = memcg;
|
|
cw->cachep = cachep;
|
|
|
|
INIT_WORK(&cw->work, memcg_create_cache_work_func);
|
|
schedule_work(&cw->work);
|
|
}
|
|
|
|
static void memcg_create_cache_enqueue(struct mem_cgroup *memcg,
|
|
struct kmem_cache *cachep)
|
|
{
|
|
/*
|
|
* We need to stop accounting when we kmalloc, because if the
|
|
* corresponding kmalloc cache is not yet created, the first allocation
|
|
* in __memcg_create_cache_enqueue will recurse.
|
|
*
|
|
* However, it is better to enclose the whole function. Depending on
|
|
* the debugging options enabled, INIT_WORK(), for instance, can
|
|
* trigger an allocation. This too, will make us recurse. Because at
|
|
* this point we can't allow ourselves back into memcg_kmem_get_cache,
|
|
* the safest choice is to do it like this, wrapping the whole function.
|
|
*/
|
|
memcg_stop_kmem_account();
|
|
__memcg_create_cache_enqueue(memcg, cachep);
|
|
memcg_resume_kmem_account();
|
|
}
|
|
/*
|
|
* Return the kmem_cache we're supposed to use for a slab allocation.
|
|
* We try to use the current memcg's version of the cache.
|
|
*
|
|
* If the cache does not exist yet, if we are the first user of it,
|
|
* we either create it immediately, if possible, or create it asynchronously
|
|
* in a workqueue.
|
|
* In the latter case, we will let the current allocation go through with
|
|
* the original cache.
|
|
*
|
|
* Can't be called in interrupt context or from kernel threads.
|
|
* This function needs to be called with rcu_read_lock() held.
|
|
*/
|
|
struct kmem_cache *__memcg_kmem_get_cache(struct kmem_cache *cachep,
|
|
gfp_t gfp)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
int idx;
|
|
|
|
VM_BUG_ON(!cachep->memcg_params);
|
|
VM_BUG_ON(!cachep->memcg_params->is_root_cache);
|
|
|
|
if (!current->mm || current->memcg_kmem_skip_account)
|
|
return cachep;
|
|
|
|
rcu_read_lock();
|
|
memcg = mem_cgroup_from_task(rcu_dereference(current->mm->owner));
|
|
|
|
if (!memcg_can_account_kmem(memcg))
|
|
goto out;
|
|
|
|
idx = memcg_cache_id(memcg);
|
|
|
|
/*
|
|
* barrier to mare sure we're always seeing the up to date value. The
|
|
* code updating memcg_caches will issue a write barrier to match this.
|
|
*/
|
|
read_barrier_depends();
|
|
if (likely(cachep->memcg_params->memcg_caches[idx])) {
|
|
cachep = cachep->memcg_params->memcg_caches[idx];
|
|
goto out;
|
|
}
|
|
|
|
/* The corresponding put will be done in the workqueue. */
|
|
if (!css_tryget(&memcg->css))
|
|
goto out;
|
|
rcu_read_unlock();
|
|
|
|
/*
|
|
* If we are in a safe context (can wait, and not in interrupt
|
|
* context), we could be be predictable and return right away.
|
|
* This would guarantee that the allocation being performed
|
|
* already belongs in the new cache.
|
|
*
|
|
* However, there are some clashes that can arrive from locking.
|
|
* For instance, because we acquire the slab_mutex while doing
|
|
* kmem_cache_dup, this means no further allocation could happen
|
|
* with the slab_mutex held.
|
|
*
|
|
* Also, because cache creation issue get_online_cpus(), this
|
|
* creates a lock chain: memcg_slab_mutex -> cpu_hotplug_mutex,
|
|
* that ends up reversed during cpu hotplug. (cpuset allocates
|
|
* a bunch of GFP_KERNEL memory during cpuup). Due to all that,
|
|
* better to defer everything.
|
|
*/
|
|
memcg_create_cache_enqueue(memcg, cachep);
|
|
return cachep;
|
|
out:
|
|
rcu_read_unlock();
|
|
return cachep;
|
|
}
|
|
EXPORT_SYMBOL(__memcg_kmem_get_cache);
|
|
|
|
/*
|
|
* We need to verify if the allocation against current->mm->owner's memcg is
|
|
* possible for the given order. But the page is not allocated yet, so we'll
|
|
* need a further commit step to do the final arrangements.
|
|
*
|
|
* It is possible for the task to switch cgroups in this mean time, so at
|
|
* commit time, we can't rely on task conversion any longer. We'll then use
|
|
* the handle argument to return to the caller which cgroup we should commit
|
|
* against. We could also return the memcg directly and avoid the pointer
|
|
* passing, but a boolean return value gives better semantics considering
|
|
* the compiled-out case as well.
|
|
*
|
|
* Returning true means the allocation is possible.
|
|
*/
|
|
bool
|
|
__memcg_kmem_newpage_charge(gfp_t gfp, struct mem_cgroup **_memcg, int order)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
int ret;
|
|
|
|
*_memcg = NULL;
|
|
memcg = try_get_mem_cgroup_from_mm(current->mm);
|
|
|
|
/*
|
|
* very rare case described in mem_cgroup_from_task. Unfortunately there
|
|
* isn't much we can do without complicating this too much, and it would
|
|
* be gfp-dependent anyway. Just let it go
|
|
*/
|
|
if (unlikely(!memcg))
|
|
return true;
|
|
|
|
if (!memcg_can_account_kmem(memcg)) {
|
|
css_put(&memcg->css);
|
|
return true;
|
|
}
|
|
|
|
ret = memcg_charge_kmem(memcg, gfp, PAGE_SIZE << order);
|
|
if (!ret)
|
|
*_memcg = memcg;
|
|
|
|
css_put(&memcg->css);
|
|
return (ret == 0);
|
|
}
|
|
|
|
void __memcg_kmem_commit_charge(struct page *page, struct mem_cgroup *memcg,
|
|
int order)
|
|
{
|
|
struct page_cgroup *pc;
|
|
|
|
VM_BUG_ON(mem_cgroup_is_root(memcg));
|
|
|
|
/* The page allocation failed. Revert */
|
|
if (!page) {
|
|
memcg_uncharge_kmem(memcg, PAGE_SIZE << order);
|
|
return;
|
|
}
|
|
|
|
pc = lookup_page_cgroup(page);
|
|
lock_page_cgroup(pc);
|
|
pc->mem_cgroup = memcg;
|
|
SetPageCgroupUsed(pc);
|
|
unlock_page_cgroup(pc);
|
|
}
|
|
|
|
void __memcg_kmem_uncharge_pages(struct page *page, int order)
|
|
{
|
|
struct mem_cgroup *memcg = NULL;
|
|
struct page_cgroup *pc;
|
|
|
|
|
|
pc = lookup_page_cgroup(page);
|
|
/*
|
|
* Fast unlocked return. Theoretically might have changed, have to
|
|
* check again after locking.
|
|
*/
|
|
if (!PageCgroupUsed(pc))
|
|
return;
|
|
|
|
lock_page_cgroup(pc);
|
|
if (PageCgroupUsed(pc)) {
|
|
memcg = pc->mem_cgroup;
|
|
ClearPageCgroupUsed(pc);
|
|
}
|
|
unlock_page_cgroup(pc);
|
|
|
|
/*
|
|
* We trust that only if there is a memcg associated with the page, it
|
|
* is a valid allocation
|
|
*/
|
|
if (!memcg)
|
|
return;
|
|
|
|
VM_BUG_ON(mem_cgroup_is_root(memcg));
|
|
memcg_uncharge_kmem(memcg, PAGE_SIZE << order);
|
|
}
|
|
#else
|
|
static inline void mem_cgroup_destroy_all_caches(struct mem_cgroup *memcg)
|
|
{
|
|
}
|
|
#endif /* CONFIG_MEMCG_KMEM */
|
|
|
|
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
|
|
|
#define PCGF_NOCOPY_AT_SPLIT (1 << PCG_LOCK | 1 << PCG_MIGRATION)
|
|
/*
|
|
* Because tail pages are not marked as "used", set it. We're under
|
|
* zone->lru_lock, 'splitting on pmd' and compound_lock.
|
|
* charge/uncharge will be never happen and move_account() is done under
|
|
* compound_lock(), so we don't have to take care of races.
|
|
*/
|
|
void mem_cgroup_split_huge_fixup(struct page *head)
|
|
{
|
|
struct page_cgroup *head_pc = lookup_page_cgroup(head);
|
|
struct page_cgroup *pc;
|
|
struct mem_cgroup *memcg;
|
|
int i;
|
|
|
|
if (mem_cgroup_disabled())
|
|
return;
|
|
|
|
memcg = head_pc->mem_cgroup;
|
|
for (i = 1; i < HPAGE_PMD_NR; i++) {
|
|
pc = head_pc + i;
|
|
pc->mem_cgroup = memcg;
|
|
smp_wmb();/* see __commit_charge() */
|
|
pc->flags = head_pc->flags & ~PCGF_NOCOPY_AT_SPLIT;
|
|
}
|
|
__this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_RSS_HUGE],
|
|
HPAGE_PMD_NR);
|
|
}
|
|
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
|
|
|
|
/**
|
|
* mem_cgroup_move_account - move account of the page
|
|
* @page: the page
|
|
* @nr_pages: number of regular pages (>1 for huge pages)
|
|
* @pc: page_cgroup of the page.
|
|
* @from: mem_cgroup which the page is moved from.
|
|
* @to: mem_cgroup which the page is moved to. @from != @to.
|
|
*
|
|
* The caller must confirm following.
|
|
* - page is not on LRU (isolate_page() is useful.)
|
|
* - compound_lock is held when nr_pages > 1
|
|
*
|
|
* This function doesn't do "charge" to new cgroup and doesn't do "uncharge"
|
|
* from old cgroup.
|
|
*/
|
|
static int mem_cgroup_move_account(struct page *page,
|
|
unsigned int nr_pages,
|
|
struct page_cgroup *pc,
|
|
struct mem_cgroup *from,
|
|
struct mem_cgroup *to)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
bool anon = PageAnon(page);
|
|
|
|
VM_BUG_ON(from == to);
|
|
VM_BUG_ON(PageLRU(page));
|
|
/*
|
|
* The page is isolated from LRU. So, collapse function
|
|
* will not handle this page. But page splitting can happen.
|
|
* Do this check under compound_page_lock(). The caller should
|
|
* hold it.
|
|
*/
|
|
ret = -EBUSY;
|
|
if (nr_pages > 1 && !PageTransHuge(page))
|
|
goto out;
|
|
|
|
lock_page_cgroup(pc);
|
|
|
|
ret = -EINVAL;
|
|
if (!PageCgroupUsed(pc) || pc->mem_cgroup != from)
|
|
goto unlock;
|
|
|
|
move_lock_mem_cgroup(from, &flags);
|
|
|
|
if (!anon && page_mapped(page)) {
|
|
/* Update mapped_file data for mem_cgroup */
|
|
preempt_disable();
|
|
__this_cpu_dec(from->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]);
|
|
__this_cpu_inc(to->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]);
|
|
preempt_enable();
|
|
}
|
|
mem_cgroup_charge_statistics(from, page, anon, -nr_pages);
|
|
|
|
/* caller should have done css_get */
|
|
pc->mem_cgroup = to;
|
|
mem_cgroup_charge_statistics(to, page, anon, nr_pages);
|
|
move_unlock_mem_cgroup(from, &flags);
|
|
ret = 0;
|
|
unlock:
|
|
unlock_page_cgroup(pc);
|
|
/*
|
|
* check events
|
|
*/
|
|
memcg_check_events(to, page);
|
|
memcg_check_events(from, page);
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* mem_cgroup_move_parent - moves page to the parent group
|
|
* @page: the page to move
|
|
* @pc: page_cgroup of the page
|
|
* @child: page's cgroup
|
|
*
|
|
* move charges to its parent or the root cgroup if the group has no
|
|
* parent (aka use_hierarchy==0).
|
|
* Although this might fail (get_page_unless_zero, isolate_lru_page or
|
|
* mem_cgroup_move_account fails) the failure is always temporary and
|
|
* it signals a race with a page removal/uncharge or migration. In the
|
|
* first case the page is on the way out and it will vanish from the LRU
|
|
* on the next attempt and the call should be retried later.
|
|
* Isolation from the LRU fails only if page has been isolated from
|
|
* the LRU since we looked at it and that usually means either global
|
|
* reclaim or migration going on. The page will either get back to the
|
|
* LRU or vanish.
|
|
* Finaly mem_cgroup_move_account fails only if the page got uncharged
|
|
* (!PageCgroupUsed) or moved to a different group. The page will
|
|
* disappear in the next attempt.
|
|
*/
|
|
static int mem_cgroup_move_parent(struct page *page,
|
|
struct page_cgroup *pc,
|
|
struct mem_cgroup *child)
|
|
{
|
|
struct mem_cgroup *parent;
|
|
unsigned int nr_pages;
|
|
unsigned long uninitialized_var(flags);
|
|
int ret;
|
|
|
|
VM_BUG_ON(mem_cgroup_is_root(child));
|
|
|
|
ret = -EBUSY;
|
|
if (!get_page_unless_zero(page))
|
|
goto out;
|
|
if (isolate_lru_page(page))
|
|
goto put;
|
|
|
|
nr_pages = hpage_nr_pages(page);
|
|
|
|
parent = parent_mem_cgroup(child);
|
|
/*
|
|
* If no parent, move charges to root cgroup.
|
|
*/
|
|
if (!parent)
|
|
parent = root_mem_cgroup;
|
|
|
|
if (nr_pages > 1) {
|
|
VM_BUG_ON(!PageTransHuge(page));
|
|
flags = compound_lock_irqsave(page);
|
|
}
|
|
|
|
ret = mem_cgroup_move_account(page, nr_pages,
|
|
pc, child, parent);
|
|
if (!ret)
|
|
__mem_cgroup_cancel_local_charge(child, nr_pages);
|
|
|
|
if (nr_pages > 1)
|
|
compound_unlock_irqrestore(page, flags);
|
|
putback_lru_page(page);
|
|
put:
|
|
put_page(page);
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Charge the memory controller for page usage.
|
|
* Return
|
|
* 0 if the charge was successful
|
|
* < 0 if the cgroup is over its limit
|
|
*/
|
|
static int mem_cgroup_charge_common(struct page *page, struct mm_struct *mm,
|
|
gfp_t gfp_mask, enum charge_type ctype)
|
|
{
|
|
struct mem_cgroup *memcg = NULL;
|
|
unsigned int nr_pages = 1;
|
|
bool oom = true;
|
|
int ret;
|
|
|
|
if (PageTransHuge(page)) {
|
|
nr_pages <<= compound_order(page);
|
|
VM_BUG_ON(!PageTransHuge(page));
|
|
/*
|
|
* Never OOM-kill a process for a huge page. The
|
|
* fault handler will fall back to regular pages.
|
|
*/
|
|
oom = false;
|
|
}
|
|
|
|
ret = __mem_cgroup_try_charge(mm, gfp_mask, nr_pages, &memcg, oom);
|
|
if (ret == -ENOMEM)
|
|
return ret;
|
|
__mem_cgroup_commit_charge(memcg, page, nr_pages, ctype, false);
|
|
return 0;
|
|
}
|
|
|
|
int mem_cgroup_newpage_charge(struct page *page,
|
|
struct mm_struct *mm, gfp_t gfp_mask)
|
|
{
|
|
if (mem_cgroup_disabled())
|
|
return 0;
|
|
VM_BUG_ON(page_mapped(page));
|
|
VM_BUG_ON(page->mapping && !PageAnon(page));
|
|
VM_BUG_ON(!mm);
|
|
return mem_cgroup_charge_common(page, mm, gfp_mask,
|
|
MEM_CGROUP_CHARGE_TYPE_ANON);
|
|
}
|
|
|
|
/*
|
|
* While swap-in, try_charge -> commit or cancel, the page is locked.
|
|
* And when try_charge() successfully returns, one refcnt to memcg without
|
|
* struct page_cgroup is acquired. This refcnt will be consumed by
|
|
* "commit()" or removed by "cancel()"
|
|
*/
|
|
static int __mem_cgroup_try_charge_swapin(struct mm_struct *mm,
|
|
struct page *page,
|
|
gfp_t mask,
|
|
struct mem_cgroup **memcgp)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
struct page_cgroup *pc;
|
|
int ret;
|
|
|
|
pc = lookup_page_cgroup(page);
|
|
/*
|
|
* Every swap fault against a single page tries to charge the
|
|
* page, bail as early as possible. shmem_unuse() encounters
|
|
* already charged pages, too. The USED bit is protected by
|
|
* the page lock, which serializes swap cache removal, which
|
|
* in turn serializes uncharging.
|
|
*/
|
|
if (PageCgroupUsed(pc))
|
|
return 0;
|
|
if (!do_swap_account)
|
|
goto charge_cur_mm;
|
|
memcg = try_get_mem_cgroup_from_page(page);
|
|
if (!memcg)
|
|
goto charge_cur_mm;
|
|
*memcgp = memcg;
|
|
ret = __mem_cgroup_try_charge(NULL, mask, 1, memcgp, true);
|
|
css_put(&memcg->css);
|
|
if (ret == -EINTR)
|
|
ret = 0;
|
|
return ret;
|
|
charge_cur_mm:
|
|
ret = __mem_cgroup_try_charge(mm, mask, 1, memcgp, true);
|
|
if (ret == -EINTR)
|
|
ret = 0;
|
|
return ret;
|
|
}
|
|
|
|
int mem_cgroup_try_charge_swapin(struct mm_struct *mm, struct page *page,
|
|
gfp_t gfp_mask, struct mem_cgroup **memcgp)
|
|
{
|
|
*memcgp = NULL;
|
|
if (mem_cgroup_disabled())
|
|
return 0;
|
|
/*
|
|
* A racing thread's fault, or swapoff, may have already
|
|
* updated the pte, and even removed page from swap cache: in
|
|
* those cases unuse_pte()'s pte_same() test will fail; but
|
|
* there's also a KSM case which does need to charge the page.
|
|
*/
|
|
if (!PageSwapCache(page)) {
|
|
int ret;
|
|
|
|
ret = __mem_cgroup_try_charge(mm, gfp_mask, 1, memcgp, true);
|
|
if (ret == -EINTR)
|
|
ret = 0;
|
|
return ret;
|
|
}
|
|
return __mem_cgroup_try_charge_swapin(mm, page, gfp_mask, memcgp);
|
|
}
|
|
|
|
void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg)
|
|
{
|
|
if (mem_cgroup_disabled())
|
|
return;
|
|
if (!memcg)
|
|
return;
|
|
__mem_cgroup_cancel_charge(memcg, 1);
|
|
}
|
|
|
|
static void
|
|
__mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *memcg,
|
|
enum charge_type ctype)
|
|
{
|
|
if (mem_cgroup_disabled())
|
|
return;
|
|
if (!memcg)
|
|
return;
|
|
|
|
__mem_cgroup_commit_charge(memcg, page, 1, ctype, true);
|
|
/*
|
|
* Now swap is on-memory. This means this page may be
|
|
* counted both as mem and swap....double count.
|
|
* Fix it by uncharging from memsw. Basically, this SwapCache is stable
|
|
* under lock_page(). But in do_swap_page()::memory.c, reuse_swap_page()
|
|
* may call delete_from_swap_cache() before reach here.
|
|
*/
|
|
if (do_swap_account && PageSwapCache(page)) {
|
|
swp_entry_t ent = {.val = page_private(page)};
|
|
mem_cgroup_uncharge_swap(ent);
|
|
}
|
|
}
|
|
|
|
void mem_cgroup_commit_charge_swapin(struct page *page,
|
|
struct mem_cgroup *memcg)
|
|
{
|
|
__mem_cgroup_commit_charge_swapin(page, memcg,
|
|
MEM_CGROUP_CHARGE_TYPE_ANON);
|
|
}
|
|
|
|
int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
|
|
gfp_t gfp_mask)
|
|
{
|
|
struct mem_cgroup *memcg = NULL;
|
|
enum charge_type type = MEM_CGROUP_CHARGE_TYPE_CACHE;
|
|
int ret;
|
|
|
|
if (mem_cgroup_disabled())
|
|
return 0;
|
|
if (PageCompound(page))
|
|
return 0;
|
|
|
|
if (!PageSwapCache(page))
|
|
ret = mem_cgroup_charge_common(page, mm, gfp_mask, type);
|
|
else { /* page is swapcache/shmem */
|
|
ret = __mem_cgroup_try_charge_swapin(mm, page,
|
|
gfp_mask, &memcg);
|
|
if (!ret)
|
|
__mem_cgroup_commit_charge_swapin(page, memcg, type);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static void mem_cgroup_do_uncharge(struct mem_cgroup *memcg,
|
|
unsigned int nr_pages,
|
|
const enum charge_type ctype)
|
|
{
|
|
struct memcg_batch_info *batch = NULL;
|
|
bool uncharge_memsw = true;
|
|
|
|
/* If swapout, usage of swap doesn't decrease */
|
|
if (!do_swap_account || ctype == MEM_CGROUP_CHARGE_TYPE_SWAPOUT)
|
|
uncharge_memsw = false;
|
|
|
|
batch = ¤t->memcg_batch;
|
|
/*
|
|
* In usual, we do css_get() when we remember memcg pointer.
|
|
* But in this case, we keep res->usage until end of a series of
|
|
* uncharges. Then, it's ok to ignore memcg's refcnt.
|
|
*/
|
|
if (!batch->memcg)
|
|
batch->memcg = memcg;
|
|
/*
|
|
* do_batch > 0 when unmapping pages or inode invalidate/truncate.
|
|
* In those cases, all pages freed continuously can be expected to be in
|
|
* the same cgroup and we have chance to coalesce uncharges.
|
|
* But we do uncharge one by one if this is killed by OOM(TIF_MEMDIE)
|
|
* because we want to do uncharge as soon as possible.
|
|
*/
|
|
|
|
if (!batch->do_batch || test_thread_flag(TIF_MEMDIE))
|
|
goto direct_uncharge;
|
|
|
|
if (nr_pages > 1)
|
|
goto direct_uncharge;
|
|
|
|
/*
|
|
* In typical case, batch->memcg == mem. This means we can
|
|
* merge a series of uncharges to an uncharge of res_counter.
|
|
* If not, we uncharge res_counter ony by one.
|
|
*/
|
|
if (batch->memcg != memcg)
|
|
goto direct_uncharge;
|
|
/* remember freed charge and uncharge it later */
|
|
batch->nr_pages++;
|
|
if (uncharge_memsw)
|
|
batch->memsw_nr_pages++;
|
|
return;
|
|
direct_uncharge:
|
|
res_counter_uncharge(&memcg->res, nr_pages * PAGE_SIZE);
|
|
if (uncharge_memsw)
|
|
res_counter_uncharge(&memcg->memsw, nr_pages * PAGE_SIZE);
|
|
if (unlikely(batch->memcg != memcg))
|
|
memcg_oom_recover(memcg);
|
|
}
|
|
|
|
/*
|
|
* uncharge if !page_mapped(page)
|
|
*/
|
|
static struct mem_cgroup *
|
|
__mem_cgroup_uncharge_common(struct page *page, enum charge_type ctype,
|
|
bool end_migration)
|
|
{
|
|
struct mem_cgroup *memcg = NULL;
|
|
unsigned int nr_pages = 1;
|
|
struct page_cgroup *pc;
|
|
bool anon;
|
|
|
|
if (mem_cgroup_disabled())
|
|
return NULL;
|
|
|
|
if (PageTransHuge(page)) {
|
|
nr_pages <<= compound_order(page);
|
|
VM_BUG_ON(!PageTransHuge(page));
|
|
}
|
|
/*
|
|
* Check if our page_cgroup is valid
|
|
*/
|
|
pc = lookup_page_cgroup(page);
|
|
if (unlikely(!PageCgroupUsed(pc)))
|
|
return NULL;
|
|
|
|
lock_page_cgroup(pc);
|
|
|
|
memcg = pc->mem_cgroup;
|
|
|
|
if (!PageCgroupUsed(pc))
|
|
goto unlock_out;
|
|
|
|
anon = PageAnon(page);
|
|
|
|
switch (ctype) {
|
|
case MEM_CGROUP_CHARGE_TYPE_ANON:
|
|
/*
|
|
* Generally PageAnon tells if it's the anon statistics to be
|
|
* updated; but sometimes e.g. mem_cgroup_uncharge_page() is
|
|
* used before page reached the stage of being marked PageAnon.
|
|
*/
|
|
anon = true;
|
|
/* fallthrough */
|
|
case MEM_CGROUP_CHARGE_TYPE_DROP:
|
|
/* See mem_cgroup_prepare_migration() */
|
|
if (page_mapped(page))
|
|
goto unlock_out;
|
|
/*
|
|
* Pages under migration may not be uncharged. But
|
|
* end_migration() /must/ be the one uncharging the
|
|
* unused post-migration page and so it has to call
|
|
* here with the migration bit still set. See the
|
|
* res_counter handling below.
|
|
*/
|
|
if (!end_migration && PageCgroupMigration(pc))
|
|
goto unlock_out;
|
|
break;
|
|
case MEM_CGROUP_CHARGE_TYPE_SWAPOUT:
|
|
if (!PageAnon(page)) { /* Shared memory */
|
|
if (page->mapping && !page_is_file_cache(page))
|
|
goto unlock_out;
|
|
} else if (page_mapped(page)) /* Anon */
|
|
goto unlock_out;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
mem_cgroup_charge_statistics(memcg, page, anon, -nr_pages);
|
|
|
|
ClearPageCgroupUsed(pc);
|
|
/*
|
|
* pc->mem_cgroup is not cleared here. It will be accessed when it's
|
|
* freed from LRU. This is safe because uncharged page is expected not
|
|
* to be reused (freed soon). Exception is SwapCache, it's handled by
|
|
* special functions.
|
|
*/
|
|
|
|
unlock_page_cgroup(pc);
|
|
/*
|
|
* even after unlock, we have memcg->res.usage here and this memcg
|
|
* will never be freed.
|
|
*/
|
|
memcg_check_events(memcg, page);
|
|
if (do_swap_account && ctype == MEM_CGROUP_CHARGE_TYPE_SWAPOUT) {
|
|
mem_cgroup_swap_statistics(memcg, true);
|
|
mem_cgroup_get(memcg);
|
|
}
|
|
/*
|
|
* Migration does not charge the res_counter for the
|
|
* replacement page, so leave it alone when phasing out the
|
|
* page that is unused after the migration.
|
|
*/
|
|
if (!end_migration && !mem_cgroup_is_root(memcg))
|
|
mem_cgroup_do_uncharge(memcg, nr_pages, ctype);
|
|
|
|
return memcg;
|
|
|
|
unlock_out:
|
|
unlock_page_cgroup(pc);
|
|
return NULL;
|
|
}
|
|
|
|
void mem_cgroup_uncharge_page(struct page *page)
|
|
{
|
|
/* early check. */
|
|
if (page_mapped(page))
|
|
return;
|
|
VM_BUG_ON(page->mapping && !PageAnon(page));
|
|
/*
|
|
* If the page is in swap cache, uncharge should be deferred
|
|
* to the swap path, which also properly accounts swap usage
|
|
* and handles memcg lifetime.
|
|
*
|
|
* Note that this check is not stable and reclaim may add the
|
|
* page to swap cache at any time after this. However, if the
|
|
* page is not in swap cache by the time page->mapcount hits
|
|
* 0, there won't be any page table references to the swap
|
|
* slot, and reclaim will free it and not actually write the
|
|
* page to disk.
|
|
*/
|
|
if (PageSwapCache(page))
|
|
return;
|
|
__mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_ANON, false);
|
|
}
|
|
|
|
void mem_cgroup_uncharge_cache_page(struct page *page)
|
|
{
|
|
VM_BUG_ON(page_mapped(page));
|
|
VM_BUG_ON(page->mapping);
|
|
__mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_CACHE, false);
|
|
}
|
|
|
|
/*
|
|
* Batch_start/batch_end is called in unmap_page_range/invlidate/trucate.
|
|
* In that cases, pages are freed continuously and we can expect pages
|
|
* are in the same memcg. All these calls itself limits the number of
|
|
* pages freed at once, then uncharge_start/end() is called properly.
|
|
* This may be called prural(2) times in a context,
|
|
*/
|
|
|
|
void mem_cgroup_uncharge_start(void)
|
|
{
|
|
current->memcg_batch.do_batch++;
|
|
/* We can do nest. */
|
|
if (current->memcg_batch.do_batch == 1) {
|
|
current->memcg_batch.memcg = NULL;
|
|
current->memcg_batch.nr_pages = 0;
|
|
current->memcg_batch.memsw_nr_pages = 0;
|
|
}
|
|
}
|
|
|
|
void mem_cgroup_uncharge_end(void)
|
|
{
|
|
struct memcg_batch_info *batch = ¤t->memcg_batch;
|
|
|
|
if (!batch->do_batch)
|
|
return;
|
|
|
|
batch->do_batch--;
|
|
if (batch->do_batch) /* If stacked, do nothing. */
|
|
return;
|
|
|
|
if (!batch->memcg)
|
|
return;
|
|
/*
|
|
* This "batch->memcg" is valid without any css_get/put etc...
|
|
* bacause we hide charges behind us.
|
|
*/
|
|
if (batch->nr_pages)
|
|
res_counter_uncharge(&batch->memcg->res,
|
|
batch->nr_pages * PAGE_SIZE);
|
|
if (batch->memsw_nr_pages)
|
|
res_counter_uncharge(&batch->memcg->memsw,
|
|
batch->memsw_nr_pages * PAGE_SIZE);
|
|
memcg_oom_recover(batch->memcg);
|
|
/* forget this pointer (for sanity check) */
|
|
batch->memcg = NULL;
|
|
}
|
|
|
|
#ifdef CONFIG_SWAP
|
|
/*
|
|
* called after __delete_from_swap_cache() and drop "page" account.
|
|
* memcg information is recorded to swap_cgroup of "ent"
|
|
*/
|
|
void
|
|
mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
int ctype = MEM_CGROUP_CHARGE_TYPE_SWAPOUT;
|
|
|
|
if (!swapout) /* this was a swap cache but the swap is unused ! */
|
|
ctype = MEM_CGROUP_CHARGE_TYPE_DROP;
|
|
|
|
memcg = __mem_cgroup_uncharge_common(page, ctype, false);
|
|
|
|
/*
|
|
* record memcg information, if swapout && memcg != NULL,
|
|
* mem_cgroup_get() was called in uncharge().
|
|
*/
|
|
if (do_swap_account && swapout && memcg)
|
|
swap_cgroup_record(ent, css_id(&memcg->css));
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_MEMCG_SWAP
|
|
/*
|
|
* called from swap_entry_free(). remove record in swap_cgroup and
|
|
* uncharge "memsw" account.
|
|
*/
|
|
void mem_cgroup_uncharge_swap(swp_entry_t ent)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
unsigned short id;
|
|
|
|
if (!do_swap_account)
|
|
return;
|
|
|
|
id = swap_cgroup_record(ent, 0);
|
|
rcu_read_lock();
|
|
memcg = mem_cgroup_lookup(id);
|
|
if (memcg) {
|
|
/*
|
|
* We uncharge this because swap is freed.
|
|
* This memcg can be obsolete one. We avoid calling css_tryget
|
|
*/
|
|
if (!mem_cgroup_is_root(memcg))
|
|
res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
|
|
mem_cgroup_swap_statistics(memcg, false);
|
|
mem_cgroup_put(memcg);
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
/**
|
|
* mem_cgroup_move_swap_account - move swap charge and swap_cgroup's record.
|
|
* @entry: swap entry to be moved
|
|
* @from: mem_cgroup which the entry is moved from
|
|
* @to: mem_cgroup which the entry is moved to
|
|
*
|
|
* It succeeds only when the swap_cgroup's record for this entry is the same
|
|
* as the mem_cgroup's id of @from.
|
|
*
|
|
* Returns 0 on success, -EINVAL on failure.
|
|
*
|
|
* The caller must have charged to @to, IOW, called res_counter_charge() about
|
|
* both res and memsw, and called css_get().
|
|
*/
|
|
static int mem_cgroup_move_swap_account(swp_entry_t entry,
|
|
struct mem_cgroup *from, struct mem_cgroup *to)
|
|
{
|
|
unsigned short old_id, new_id;
|
|
|
|
old_id = css_id(&from->css);
|
|
new_id = css_id(&to->css);
|
|
|
|
if (swap_cgroup_cmpxchg(entry, old_id, new_id) == old_id) {
|
|
mem_cgroup_swap_statistics(from, false);
|
|
mem_cgroup_swap_statistics(to, true);
|
|
/*
|
|
* This function is only called from task migration context now.
|
|
* It postpones res_counter and refcount handling till the end
|
|
* of task migration(mem_cgroup_clear_mc()) for performance
|
|
* improvement. But we cannot postpone mem_cgroup_get(to)
|
|
* because if the process that has been moved to @to does
|
|
* swap-in, the refcount of @to might be decreased to 0.
|
|
*/
|
|
mem_cgroup_get(to);
|
|
return 0;
|
|
}
|
|
return -EINVAL;
|
|
}
|
|
#else
|
|
static inline int mem_cgroup_move_swap_account(swp_entry_t entry,
|
|
struct mem_cgroup *from, struct mem_cgroup *to)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Before starting migration, account PAGE_SIZE to mem_cgroup that the old
|
|
* page belongs to.
|
|
*/
|
|
void mem_cgroup_prepare_migration(struct page *page, struct page *newpage,
|
|
struct mem_cgroup **memcgp)
|
|
{
|
|
struct mem_cgroup *memcg = NULL;
|
|
unsigned int nr_pages = 1;
|
|
struct page_cgroup *pc;
|
|
enum charge_type ctype;
|
|
|
|
*memcgp = NULL;
|
|
|
|
if (mem_cgroup_disabled())
|
|
return;
|
|
|
|
if (PageTransHuge(page))
|
|
nr_pages <<= compound_order(page);
|
|
|
|
pc = lookup_page_cgroup(page);
|
|
lock_page_cgroup(pc);
|
|
if (PageCgroupUsed(pc)) {
|
|
memcg = pc->mem_cgroup;
|
|
css_get(&memcg->css);
|
|
/*
|
|
* At migrating an anonymous page, its mapcount goes down
|
|
* to 0 and uncharge() will be called. But, even if it's fully
|
|
* unmapped, migration may fail and this page has to be
|
|
* charged again. We set MIGRATION flag here and delay uncharge
|
|
* until end_migration() is called
|
|
*
|
|
* Corner Case Thinking
|
|
* A)
|
|
* When the old page was mapped as Anon and it's unmap-and-freed
|
|
* while migration was ongoing.
|
|
* If unmap finds the old page, uncharge() of it will be delayed
|
|
* until end_migration(). If unmap finds a new page, it's
|
|
* uncharged when it make mapcount to be 1->0. If unmap code
|
|
* finds swap_migration_entry, the new page will not be mapped
|
|
* and end_migration() will find it(mapcount==0).
|
|
*
|
|
* B)
|
|
* When the old page was mapped but migraion fails, the kernel
|
|
* remaps it. A charge for it is kept by MIGRATION flag even
|
|
* if mapcount goes down to 0. We can do remap successfully
|
|
* without charging it again.
|
|
*
|
|
* C)
|
|
* The "old" page is under lock_page() until the end of
|
|
* migration, so, the old page itself will not be swapped-out.
|
|
* If the new page is swapped out before end_migraton, our
|
|
* hook to usual swap-out path will catch the event.
|
|
*/
|
|
if (PageAnon(page))
|
|
SetPageCgroupMigration(pc);
|
|
}
|
|
unlock_page_cgroup(pc);
|
|
/*
|
|
* If the page is not charged at this point,
|
|
* we return here.
|
|
*/
|
|
if (!memcg)
|
|
return;
|
|
|
|
*memcgp = memcg;
|
|
/*
|
|
* We charge new page before it's used/mapped. So, even if unlock_page()
|
|
* is called before end_migration, we can catch all events on this new
|
|
* page. In the case new page is migrated but not remapped, new page's
|
|
* mapcount will be finally 0 and we call uncharge in end_migration().
|
|
*/
|
|
if (PageAnon(page))
|
|
ctype = MEM_CGROUP_CHARGE_TYPE_ANON;
|
|
else
|
|
ctype = MEM_CGROUP_CHARGE_TYPE_CACHE;
|
|
/*
|
|
* The page is committed to the memcg, but it's not actually
|
|
* charged to the res_counter since we plan on replacing the
|
|
* old one and only one page is going to be left afterwards.
|
|
*/
|
|
__mem_cgroup_commit_charge(memcg, newpage, nr_pages, ctype, false);
|
|
}
|
|
|
|
/* remove redundant charge if migration failed*/
|
|
void mem_cgroup_end_migration(struct mem_cgroup *memcg,
|
|
struct page *oldpage, struct page *newpage, bool migration_ok)
|
|
{
|
|
struct page *used, *unused;
|
|
struct page_cgroup *pc;
|
|
bool anon;
|
|
|
|
if (!memcg)
|
|
return;
|
|
|
|
if (!migration_ok) {
|
|
used = oldpage;
|
|
unused = newpage;
|
|
} else {
|
|
used = newpage;
|
|
unused = oldpage;
|
|
}
|
|
anon = PageAnon(used);
|
|
__mem_cgroup_uncharge_common(unused,
|
|
anon ? MEM_CGROUP_CHARGE_TYPE_ANON
|
|
: MEM_CGROUP_CHARGE_TYPE_CACHE,
|
|
true);
|
|
css_put(&memcg->css);
|
|
/*
|
|
* We disallowed uncharge of pages under migration because mapcount
|
|
* of the page goes down to zero, temporarly.
|
|
* Clear the flag and check the page should be charged.
|
|
*/
|
|
pc = lookup_page_cgroup(oldpage);
|
|
lock_page_cgroup(pc);
|
|
ClearPageCgroupMigration(pc);
|
|
unlock_page_cgroup(pc);
|
|
|
|
/*
|
|
* If a page is a file cache, radix-tree replacement is very atomic
|
|
* and we can skip this check. When it was an Anon page, its mapcount
|
|
* goes down to 0. But because we added MIGRATION flage, it's not
|
|
* uncharged yet. There are several case but page->mapcount check
|
|
* and USED bit check in mem_cgroup_uncharge_page() will do enough
|
|
* check. (see prepare_charge() also)
|
|
*/
|
|
if (anon)
|
|
mem_cgroup_uncharge_page(used);
|
|
}
|
|
|
|
/*
|
|
* At replace page cache, newpage is not under any memcg but it's on
|
|
* LRU. So, this function doesn't touch res_counter but handles LRU
|
|
* in correct way. Both pages are locked so we cannot race with uncharge.
|
|
*/
|
|
void mem_cgroup_replace_page_cache(struct page *oldpage,
|
|
struct page *newpage)
|
|
{
|
|
struct mem_cgroup *memcg = NULL;
|
|
struct page_cgroup *pc;
|
|
enum charge_type type = MEM_CGROUP_CHARGE_TYPE_CACHE;
|
|
|
|
if (mem_cgroup_disabled())
|
|
return;
|
|
|
|
pc = lookup_page_cgroup(oldpage);
|
|
/* fix accounting on old pages */
|
|
lock_page_cgroup(pc);
|
|
if (PageCgroupUsed(pc)) {
|
|
memcg = pc->mem_cgroup;
|
|
mem_cgroup_charge_statistics(memcg, oldpage, false, -1);
|
|
ClearPageCgroupUsed(pc);
|
|
}
|
|
unlock_page_cgroup(pc);
|
|
|
|
/*
|
|
* When called from shmem_replace_page(), in some cases the
|
|
* oldpage has already been charged, and in some cases not.
|
|
*/
|
|
if (!memcg)
|
|
return;
|
|
/*
|
|
* Even if newpage->mapping was NULL before starting replacement,
|
|
* the newpage may be on LRU(or pagevec for LRU) already. We lock
|
|
* LRU while we overwrite pc->mem_cgroup.
|
|
*/
|
|
__mem_cgroup_commit_charge(memcg, newpage, 1, type, true);
|
|
}
|
|
|
|
#ifdef CONFIG_DEBUG_VM
|
|
static struct page_cgroup *lookup_page_cgroup_used(struct page *page)
|
|
{
|
|
struct page_cgroup *pc;
|
|
|
|
pc = lookup_page_cgroup(page);
|
|
/*
|
|
* Can be NULL while feeding pages into the page allocator for
|
|
* the first time, i.e. during boot or memory hotplug;
|
|
* or when mem_cgroup_disabled().
|
|
*/
|
|
if (likely(pc) && PageCgroupUsed(pc))
|
|
return pc;
|
|
return NULL;
|
|
}
|
|
|
|
bool mem_cgroup_bad_page_check(struct page *page)
|
|
{
|
|
if (mem_cgroup_disabled())
|
|
return false;
|
|
|
|
return lookup_page_cgroup_used(page) != NULL;
|
|
}
|
|
|
|
void mem_cgroup_print_bad_page(struct page *page)
|
|
{
|
|
struct page_cgroup *pc;
|
|
|
|
pc = lookup_page_cgroup_used(page);
|
|
if (pc) {
|
|
pr_alert("pc:%p pc->flags:%lx pc->mem_cgroup:%p\n",
|
|
pc, pc->flags, pc->mem_cgroup);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
|
|
unsigned long long val)
|
|
{
|
|
int retry_count;
|
|
u64 memswlimit, memlimit;
|
|
int ret = 0;
|
|
int children = mem_cgroup_count_children(memcg);
|
|
u64 curusage, oldusage;
|
|
int enlarge;
|
|
|
|
/*
|
|
* For keeping hierarchical_reclaim simple, how long we should retry
|
|
* is depends on callers. We set our retry-count to be function
|
|
* of # of children which we should visit in this loop.
|
|
*/
|
|
retry_count = MEM_CGROUP_RECLAIM_RETRIES * children;
|
|
|
|
oldusage = res_counter_read_u64(&memcg->res, RES_USAGE);
|
|
|
|
enlarge = 0;
|
|
while (retry_count) {
|
|
if (signal_pending(current)) {
|
|
ret = -EINTR;
|
|
break;
|
|
}
|
|
/*
|
|
* Rather than hide all in some function, I do this in
|
|
* open coded manner. You see what this really does.
|
|
* We have to guarantee memcg->res.limit <= memcg->memsw.limit.
|
|
*/
|
|
mutex_lock(&set_limit_mutex);
|
|
memswlimit = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
|
|
if (memswlimit < val) {
|
|
ret = -EINVAL;
|
|
mutex_unlock(&set_limit_mutex);
|
|
break;
|
|
}
|
|
|
|
memlimit = res_counter_read_u64(&memcg->res, RES_LIMIT);
|
|
if (memlimit < val)
|
|
enlarge = 1;
|
|
|
|
ret = res_counter_set_limit(&memcg->res, val);
|
|
if (!ret) {
|
|
if (memswlimit == val)
|
|
memcg->memsw_is_minimum = true;
|
|
else
|
|
memcg->memsw_is_minimum = false;
|
|
}
|
|
mutex_unlock(&set_limit_mutex);
|
|
|
|
if (!ret)
|
|
break;
|
|
|
|
mem_cgroup_reclaim(memcg, GFP_KERNEL,
|
|
MEM_CGROUP_RECLAIM_SHRINK);
|
|
curusage = res_counter_read_u64(&memcg->res, RES_USAGE);
|
|
/* Usage is reduced ? */
|
|
if (curusage >= oldusage)
|
|
retry_count--;
|
|
else
|
|
oldusage = curusage;
|
|
}
|
|
if (!ret && enlarge)
|
|
memcg_oom_recover(memcg);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
|
|
unsigned long long val)
|
|
{
|
|
int retry_count;
|
|
u64 memlimit, memswlimit, oldusage, curusage;
|
|
int children = mem_cgroup_count_children(memcg);
|
|
int ret = -EBUSY;
|
|
int enlarge = 0;
|
|
|
|
/* see mem_cgroup_resize_res_limit */
|
|
retry_count = children * MEM_CGROUP_RECLAIM_RETRIES;
|
|
oldusage = res_counter_read_u64(&memcg->memsw, RES_USAGE);
|
|
while (retry_count) {
|
|
if (signal_pending(current)) {
|
|
ret = -EINTR;
|
|
break;
|
|
}
|
|
/*
|
|
* Rather than hide all in some function, I do this in
|
|
* open coded manner. You see what this really does.
|
|
* We have to guarantee memcg->res.limit <= memcg->memsw.limit.
|
|
*/
|
|
mutex_lock(&set_limit_mutex);
|
|
memlimit = res_counter_read_u64(&memcg->res, RES_LIMIT);
|
|
if (memlimit > val) {
|
|
ret = -EINVAL;
|
|
mutex_unlock(&set_limit_mutex);
|
|
break;
|
|
}
|
|
memswlimit = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
|
|
if (memswlimit < val)
|
|
enlarge = 1;
|
|
ret = res_counter_set_limit(&memcg->memsw, val);
|
|
if (!ret) {
|
|
if (memlimit == val)
|
|
memcg->memsw_is_minimum = true;
|
|
else
|
|
memcg->memsw_is_minimum = false;
|
|
}
|
|
mutex_unlock(&set_limit_mutex);
|
|
|
|
if (!ret)
|
|
break;
|
|
|
|
mem_cgroup_reclaim(memcg, GFP_KERNEL,
|
|
MEM_CGROUP_RECLAIM_NOSWAP |
|
|
MEM_CGROUP_RECLAIM_SHRINK);
|
|
curusage = res_counter_read_u64(&memcg->memsw, RES_USAGE);
|
|
/* Usage is reduced ? */
|
|
if (curusage >= oldusage)
|
|
retry_count--;
|
|
else
|
|
oldusage = curusage;
|
|
}
|
|
if (!ret && enlarge)
|
|
memcg_oom_recover(memcg);
|
|
return ret;
|
|
}
|
|
|
|
unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
|
|
gfp_t gfp_mask,
|
|
unsigned long *total_scanned)
|
|
{
|
|
unsigned long nr_reclaimed = 0;
|
|
struct mem_cgroup_per_zone *mz, *next_mz = NULL;
|
|
unsigned long reclaimed;
|
|
int loop = 0;
|
|
struct mem_cgroup_tree_per_zone *mctz;
|
|
unsigned long long excess;
|
|
unsigned long nr_scanned;
|
|
|
|
if (order > 0)
|
|
return 0;
|
|
|
|
mctz = soft_limit_tree_node_zone(zone_to_nid(zone), zone_idx(zone));
|
|
/*
|
|
* This loop can run a while, specially if mem_cgroup's continuously
|
|
* keep exceeding their soft limit and putting the system under
|
|
* pressure
|
|
*/
|
|
do {
|
|
if (next_mz)
|
|
mz = next_mz;
|
|
else
|
|
mz = mem_cgroup_largest_soft_limit_node(mctz);
|
|
if (!mz)
|
|
break;
|
|
|
|
nr_scanned = 0;
|
|
reclaimed = mem_cgroup_soft_reclaim(mz->memcg, zone,
|
|
gfp_mask, &nr_scanned);
|
|
nr_reclaimed += reclaimed;
|
|
*total_scanned += nr_scanned;
|
|
spin_lock(&mctz->lock);
|
|
|
|
/*
|
|
* If we failed to reclaim anything from this memory cgroup
|
|
* it is time to move on to the next cgroup
|
|
*/
|
|
next_mz = NULL;
|
|
if (!reclaimed) {
|
|
do {
|
|
/*
|
|
* Loop until we find yet another one.
|
|
*
|
|
* By the time we get the soft_limit lock
|
|
* again, someone might have aded the
|
|
* group back on the RB tree. Iterate to
|
|
* make sure we get a different mem.
|
|
* mem_cgroup_largest_soft_limit_node returns
|
|
* NULL if no other cgroup is present on
|
|
* the tree
|
|
*/
|
|
next_mz =
|
|
__mem_cgroup_largest_soft_limit_node(mctz);
|
|
if (next_mz == mz)
|
|
css_put(&next_mz->memcg->css);
|
|
else /* next_mz == NULL or other memcg */
|
|
break;
|
|
} while (1);
|
|
}
|
|
__mem_cgroup_remove_exceeded(mz->memcg, mz, mctz);
|
|
excess = res_counter_soft_limit_excess(&mz->memcg->res);
|
|
/*
|
|
* One school of thought says that we should not add
|
|
* back the node to the tree if reclaim returns 0.
|
|
* But our reclaim could return 0, simply because due
|
|
* to priority we are exposing a smaller subset of
|
|
* memory to reclaim from. Consider this as a longer
|
|
* term TODO.
|
|
*/
|
|
/* If excess == 0, no tree ops */
|
|
__mem_cgroup_insert_exceeded(mz->memcg, mz, mctz, excess);
|
|
spin_unlock(&mctz->lock);
|
|
css_put(&mz->memcg->css);
|
|
loop++;
|
|
/*
|
|
* Could not reclaim anything and there are no more
|
|
* mem cgroups to try or we seem to be looping without
|
|
* reclaiming anything.
|
|
*/
|
|
if (!nr_reclaimed &&
|
|
(next_mz == NULL ||
|
|
loop > MEM_CGROUP_MAX_SOFT_LIMIT_RECLAIM_LOOPS))
|
|
break;
|
|
} while (!nr_reclaimed);
|
|
if (next_mz)
|
|
css_put(&next_mz->memcg->css);
|
|
return nr_reclaimed;
|
|
}
|
|
|
|
/**
|
|
* mem_cgroup_force_empty_list - clears LRU of a group
|
|
* @memcg: group to clear
|
|
* @node: NUMA node
|
|
* @zid: zone id
|
|
* @lru: lru to to clear
|
|
*
|
|
* Traverse a specified page_cgroup list and try to drop them all. This doesn't
|
|
* reclaim the pages page themselves - pages are moved to the parent (or root)
|
|
* group.
|
|
*/
|
|
static void mem_cgroup_force_empty_list(struct mem_cgroup *memcg,
|
|
int node, int zid, enum lru_list lru)
|
|
{
|
|
struct lruvec *lruvec;
|
|
unsigned long flags;
|
|
struct list_head *list;
|
|
struct page *busy;
|
|
struct zone *zone;
|
|
|
|
zone = &NODE_DATA(node)->node_zones[zid];
|
|
lruvec = mem_cgroup_zone_lruvec(zone, memcg);
|
|
list = &lruvec->lists[lru];
|
|
|
|
busy = NULL;
|
|
do {
|
|
struct page_cgroup *pc;
|
|
struct page *page;
|
|
|
|
spin_lock_irqsave(&zone->lru_lock, flags);
|
|
if (list_empty(list)) {
|
|
spin_unlock_irqrestore(&zone->lru_lock, flags);
|
|
break;
|
|
}
|
|
page = list_entry(list->prev, struct page, lru);
|
|
if (busy == page) {
|
|
list_move(&page->lru, list);
|
|
busy = NULL;
|
|
spin_unlock_irqrestore(&zone->lru_lock, flags);
|
|
continue;
|
|
}
|
|
spin_unlock_irqrestore(&zone->lru_lock, flags);
|
|
|
|
pc = lookup_page_cgroup(page);
|
|
|
|
if (mem_cgroup_move_parent(page, pc, memcg)) {
|
|
/* found lock contention or "pc" is obsolete. */
|
|
busy = page;
|
|
cond_resched();
|
|
} else
|
|
busy = NULL;
|
|
} while (!list_empty(list));
|
|
}
|
|
|
|
/*
|
|
* make mem_cgroup's charge to be 0 if there is no task by moving
|
|
* all the charges and pages to the parent.
|
|
* This enables deleting this mem_cgroup.
|
|
*
|
|
* Caller is responsible for holding css reference on the memcg.
|
|
*/
|
|
static void mem_cgroup_reparent_charges(struct mem_cgroup *memcg)
|
|
{
|
|
int node, zid;
|
|
u64 usage;
|
|
|
|
do {
|
|
/* This is for making all *used* pages to be on LRU. */
|
|
lru_add_drain_all();
|
|
drain_all_stock_sync(memcg);
|
|
mem_cgroup_start_move(memcg);
|
|
for_each_node_state(node, N_MEMORY) {
|
|
for (zid = 0; zid < MAX_NR_ZONES; zid++) {
|
|
enum lru_list lru;
|
|
for_each_lru(lru) {
|
|
mem_cgroup_force_empty_list(memcg,
|
|
node, zid, lru);
|
|
}
|
|
}
|
|
}
|
|
mem_cgroup_end_move(memcg);
|
|
memcg_oom_recover(memcg);
|
|
cond_resched();
|
|
|
|
/*
|
|
* Kernel memory may not necessarily be trackable to a specific
|
|
* process. So they are not migrated, and therefore we can't
|
|
* expect their value to drop to 0 here.
|
|
* Having res filled up with kmem only is enough.
|
|
*
|
|
* This is a safety check because mem_cgroup_force_empty_list
|
|
* could have raced with mem_cgroup_replace_page_cache callers
|
|
* so the lru seemed empty but the page could have been added
|
|
* right after the check. RES_USAGE should be safe as we always
|
|
* charge before adding to the LRU.
|
|
*/
|
|
usage = res_counter_read_u64(&memcg->res, RES_USAGE) -
|
|
res_counter_read_u64(&memcg->kmem, RES_USAGE);
|
|
} while (usage > 0);
|
|
}
|
|
|
|
/*
|
|
* This mainly exists for tests during the setting of set of use_hierarchy.
|
|
* Since this is the very setting we are changing, the current hierarchy value
|
|
* is meaningless
|
|
*/
|
|
static inline bool __memcg_has_children(struct mem_cgroup *memcg)
|
|
{
|
|
struct cgroup *pos;
|
|
|
|
/* bounce at first found */
|
|
cgroup_for_each_child(pos, memcg->css.cgroup)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* Must be called with memcg_create_mutex held, unless the cgroup is guaranteed
|
|
* to be already dead (as in mem_cgroup_force_empty, for instance). This is
|
|
* from mem_cgroup_count_children(), in the sense that we don't really care how
|
|
* many children we have; we only need to know if we have any. It also counts
|
|
* any memcg without hierarchy as infertile.
|
|
*/
|
|
static inline bool memcg_has_children(struct mem_cgroup *memcg)
|
|
{
|
|
return memcg->use_hierarchy && __memcg_has_children(memcg);
|
|
}
|
|
|
|
/*
|
|
* Reclaims as many pages from the given memcg as possible and moves
|
|
* the rest to the parent.
|
|
*
|
|
* Caller is responsible for holding css reference for memcg.
|
|
*/
|
|
static int mem_cgroup_force_empty(struct mem_cgroup *memcg)
|
|
{
|
|
int nr_retries = MEM_CGROUP_RECLAIM_RETRIES;
|
|
struct cgroup *cgrp = memcg->css.cgroup;
|
|
|
|
/* returns EBUSY if there is a task or if we come here twice. */
|
|
if (cgroup_task_count(cgrp) || !list_empty(&cgrp->children))
|
|
return -EBUSY;
|
|
|
|
/* we call try-to-free pages for make this cgroup empty */
|
|
lru_add_drain_all();
|
|
/* try to free all pages in this cgroup */
|
|
while (nr_retries && res_counter_read_u64(&memcg->res, RES_USAGE) > 0) {
|
|
int progress;
|
|
|
|
if (signal_pending(current))
|
|
return -EINTR;
|
|
|
|
progress = try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL,
|
|
false);
|
|
if (!progress) {
|
|
nr_retries--;
|
|
/* maybe some writeback is necessary */
|
|
congestion_wait(BLK_RW_ASYNC, HZ/10);
|
|
}
|
|
|
|
}
|
|
lru_add_drain();
|
|
mem_cgroup_reparent_charges(memcg);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
int ret;
|
|
|
|
if (mem_cgroup_is_root(memcg))
|
|
return -EINVAL;
|
|
css_get(&memcg->css);
|
|
ret = mem_cgroup_force_empty(memcg);
|
|
css_put(&memcg->css);
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
static u64 mem_cgroup_hierarchy_read(struct cgroup *cont, struct cftype *cft)
|
|
{
|
|
return mem_cgroup_from_cont(cont)->use_hierarchy;
|
|
}
|
|
|
|
static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft,
|
|
u64 val)
|
|
{
|
|
int retval = 0;
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
struct cgroup *parent = cont->parent;
|
|
struct mem_cgroup *parent_memcg = NULL;
|
|
|
|
if (parent)
|
|
parent_memcg = mem_cgroup_from_cont(parent);
|
|
|
|
mutex_lock(&memcg_create_mutex);
|
|
|
|
if (memcg->use_hierarchy == val)
|
|
goto out;
|
|
|
|
/*
|
|
* If parent's use_hierarchy is set, we can't make any modifications
|
|
* in the child subtrees. If it is unset, then the change can
|
|
* occur, provided the current cgroup has no children.
|
|
*
|
|
* For the root cgroup, parent_mem is NULL, we allow value to be
|
|
* set if there are no children.
|
|
*/
|
|
if ((!parent_memcg || !parent_memcg->use_hierarchy) &&
|
|
(val == 1 || val == 0)) {
|
|
if (!__memcg_has_children(memcg))
|
|
memcg->use_hierarchy = val;
|
|
else
|
|
retval = -EBUSY;
|
|
} else
|
|
retval = -EINVAL;
|
|
|
|
out:
|
|
mutex_unlock(&memcg_create_mutex);
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
static unsigned long mem_cgroup_recursive_stat(struct mem_cgroup *memcg,
|
|
enum mem_cgroup_stat_index idx)
|
|
{
|
|
struct mem_cgroup *iter;
|
|
long val = 0;
|
|
|
|
/* Per-cpu values can be negative, use a signed accumulator */
|
|
for_each_mem_cgroup_tree(iter, memcg)
|
|
val += mem_cgroup_read_stat(iter, idx);
|
|
|
|
if (val < 0) /* race ? */
|
|
val = 0;
|
|
return val;
|
|
}
|
|
|
|
static inline u64 mem_cgroup_usage(struct mem_cgroup *memcg, bool swap)
|
|
{
|
|
u64 val;
|
|
|
|
if (!mem_cgroup_is_root(memcg)) {
|
|
if (!swap)
|
|
return res_counter_read_u64(&memcg->res, RES_USAGE);
|
|
else
|
|
return res_counter_read_u64(&memcg->memsw, RES_USAGE);
|
|
}
|
|
|
|
/*
|
|
* Transparent hugepages are still accounted for in MEM_CGROUP_STAT_RSS
|
|
* as well as in MEM_CGROUP_STAT_RSS_HUGE.
|
|
*/
|
|
val = mem_cgroup_recursive_stat(memcg, MEM_CGROUP_STAT_CACHE);
|
|
val += mem_cgroup_recursive_stat(memcg, MEM_CGROUP_STAT_RSS);
|
|
|
|
if (swap)
|
|
val += mem_cgroup_recursive_stat(memcg, MEM_CGROUP_STAT_SWAP);
|
|
|
|
return val << PAGE_SHIFT;
|
|
}
|
|
|
|
static ssize_t mem_cgroup_read(struct cgroup *cont, struct cftype *cft,
|
|
struct file *file, char __user *buf,
|
|
size_t nbytes, loff_t *ppos)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
char str[64];
|
|
u64 val;
|
|
int name, len;
|
|
enum res_type type;
|
|
|
|
type = MEMFILE_TYPE(cft->private);
|
|
name = MEMFILE_ATTR(cft->private);
|
|
|
|
switch (type) {
|
|
case _MEM:
|
|
if (name == RES_USAGE)
|
|
val = mem_cgroup_usage(memcg, false);
|
|
else
|
|
val = res_counter_read_u64(&memcg->res, name);
|
|
break;
|
|
case _MEMSWAP:
|
|
if (name == RES_USAGE)
|
|
val = mem_cgroup_usage(memcg, true);
|
|
else
|
|
val = res_counter_read_u64(&memcg->memsw, name);
|
|
break;
|
|
case _KMEM:
|
|
val = res_counter_read_u64(&memcg->kmem, name);
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
len = scnprintf(str, sizeof(str), "%llu\n", (unsigned long long)val);
|
|
return simple_read_from_buffer(buf, nbytes, ppos, str, len);
|
|
}
|
|
|
|
static int memcg_update_kmem_limit(struct cgroup *cont, u64 val)
|
|
{
|
|
int ret = -EINVAL;
|
|
#ifdef CONFIG_MEMCG_KMEM
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
/*
|
|
* For simplicity, we won't allow this to be disabled. It also can't
|
|
* be changed if the cgroup has children already, or if tasks had
|
|
* already joined.
|
|
*
|
|
* If tasks join before we set the limit, a person looking at
|
|
* kmem.usage_in_bytes will have no way to determine when it took
|
|
* place, which makes the value quite meaningless.
|
|
*
|
|
* After it first became limited, changes in the value of the limit are
|
|
* of course permitted.
|
|
*/
|
|
mutex_lock(&memcg_create_mutex);
|
|
mutex_lock(&set_limit_mutex);
|
|
if (!memcg->kmem_account_flags && val != RESOURCE_MAX) {
|
|
if (cgroup_task_count(cont) || memcg_has_children(memcg)) {
|
|
ret = -EBUSY;
|
|
goto out;
|
|
}
|
|
ret = res_counter_set_limit(&memcg->kmem, val);
|
|
VM_BUG_ON(ret);
|
|
|
|
ret = memcg_update_cache_sizes(memcg);
|
|
if (ret) {
|
|
res_counter_set_limit(&memcg->kmem, RESOURCE_MAX);
|
|
goto out;
|
|
}
|
|
static_key_slow_inc(&memcg_kmem_enabled_key);
|
|
/*
|
|
* setting the active bit after the inc will guarantee no one
|
|
* starts accounting before all call sites are patched
|
|
*/
|
|
memcg_kmem_set_active(memcg);
|
|
|
|
/*
|
|
* kmem charges can outlive the cgroup. In the case of slab
|
|
* pages, for instance, a page contain objects from various
|
|
* processes, so it is unfeasible to migrate them away. We
|
|
* need to reference count the memcg because of that.
|
|
*/
|
|
mem_cgroup_get(memcg);
|
|
} else
|
|
ret = res_counter_set_limit(&memcg->kmem, val);
|
|
out:
|
|
mutex_unlock(&set_limit_mutex);
|
|
mutex_unlock(&memcg_create_mutex);
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
#ifdef CONFIG_MEMCG_KMEM
|
|
static int memcg_propagate_kmem(struct mem_cgroup *memcg)
|
|
{
|
|
int ret = 0;
|
|
struct mem_cgroup *parent = parent_mem_cgroup(memcg);
|
|
if (!parent)
|
|
goto out;
|
|
|
|
memcg->kmem_account_flags = parent->kmem_account_flags;
|
|
/*
|
|
* When that happen, we need to disable the static branch only on those
|
|
* memcgs that enabled it. To achieve this, we would be forced to
|
|
* complicate the code by keeping track of which memcgs were the ones
|
|
* that actually enabled limits, and which ones got it from its
|
|
* parents.
|
|
*
|
|
* It is a lot simpler just to do static_key_slow_inc() on every child
|
|
* that is accounted.
|
|
*/
|
|
if (!memcg_kmem_is_active(memcg))
|
|
goto out;
|
|
|
|
/*
|
|
* destroy(), called if we fail, will issue static_key_slow_inc() and
|
|
* mem_cgroup_put() if kmem is enabled. We have to either call them
|
|
* unconditionally, or clear the KMEM_ACTIVE flag. I personally find
|
|
* this more consistent, since it always leads to the same destroy path
|
|
*/
|
|
mem_cgroup_get(memcg);
|
|
static_key_slow_inc(&memcg_kmem_enabled_key);
|
|
|
|
mutex_lock(&set_limit_mutex);
|
|
ret = memcg_update_cache_sizes(memcg);
|
|
mutex_unlock(&set_limit_mutex);
|
|
out:
|
|
return ret;
|
|
}
|
|
#endif /* CONFIG_MEMCG_KMEM */
|
|
|
|
/*
|
|
* The user of this function is...
|
|
* RES_LIMIT.
|
|
*/
|
|
static int mem_cgroup_write(struct cgroup *cont, struct cftype *cft,
|
|
const char *buffer)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
enum res_type type;
|
|
int name;
|
|
unsigned long long val;
|
|
int ret;
|
|
|
|
type = MEMFILE_TYPE(cft->private);
|
|
name = MEMFILE_ATTR(cft->private);
|
|
|
|
switch (name) {
|
|
case RES_LIMIT:
|
|
if (mem_cgroup_is_root(memcg)) { /* Can't set limit on root */
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
/* This function does all necessary parse...reuse it */
|
|
ret = res_counter_memparse_write_strategy(buffer, &val);
|
|
if (ret)
|
|
break;
|
|
if (type == _MEM)
|
|
ret = mem_cgroup_resize_limit(memcg, val);
|
|
else if (type == _MEMSWAP)
|
|
ret = mem_cgroup_resize_memsw_limit(memcg, val);
|
|
else if (type == _KMEM)
|
|
ret = memcg_update_kmem_limit(cont, val);
|
|
else
|
|
return -EINVAL;
|
|
break;
|
|
case RES_SOFT_LIMIT:
|
|
ret = res_counter_memparse_write_strategy(buffer, &val);
|
|
if (ret)
|
|
break;
|
|
/*
|
|
* For memsw, soft limits are hard to implement in terms
|
|
* of semantics, for now, we support soft limits for
|
|
* control without swap
|
|
*/
|
|
if (type == _MEM)
|
|
ret = res_counter_set_soft_limit(&memcg->res, val);
|
|
else
|
|
ret = -EINVAL;
|
|
break;
|
|
default:
|
|
ret = -EINVAL; /* should be BUG() ? */
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static void memcg_get_hierarchical_limit(struct mem_cgroup *memcg,
|
|
unsigned long long *mem_limit, unsigned long long *memsw_limit)
|
|
{
|
|
struct cgroup *cgroup;
|
|
unsigned long long min_limit, min_memsw_limit, tmp;
|
|
|
|
min_limit = res_counter_read_u64(&memcg->res, RES_LIMIT);
|
|
min_memsw_limit = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
|
|
cgroup = memcg->css.cgroup;
|
|
if (!memcg->use_hierarchy)
|
|
goto out;
|
|
|
|
while (cgroup->parent) {
|
|
cgroup = cgroup->parent;
|
|
memcg = mem_cgroup_from_cont(cgroup);
|
|
if (!memcg->use_hierarchy)
|
|
break;
|
|
tmp = res_counter_read_u64(&memcg->res, RES_LIMIT);
|
|
min_limit = min(min_limit, tmp);
|
|
tmp = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
|
|
min_memsw_limit = min(min_memsw_limit, tmp);
|
|
}
|
|
out:
|
|
*mem_limit = min_limit;
|
|
*memsw_limit = min_memsw_limit;
|
|
}
|
|
|
|
static int mem_cgroup_reset(struct cgroup *cont, unsigned int event)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
int name;
|
|
enum res_type type;
|
|
|
|
type = MEMFILE_TYPE(event);
|
|
name = MEMFILE_ATTR(event);
|
|
|
|
switch (name) {
|
|
case RES_MAX_USAGE:
|
|
if (type == _MEM)
|
|
res_counter_reset_max(&memcg->res);
|
|
else if (type == _MEMSWAP)
|
|
res_counter_reset_max(&memcg->memsw);
|
|
else if (type == _KMEM)
|
|
res_counter_reset_max(&memcg->kmem);
|
|
else
|
|
return -EINVAL;
|
|
break;
|
|
case RES_FAILCNT:
|
|
if (type == _MEM)
|
|
res_counter_reset_failcnt(&memcg->res);
|
|
else if (type == _MEMSWAP)
|
|
res_counter_reset_failcnt(&memcg->memsw);
|
|
else if (type == _KMEM)
|
|
res_counter_reset_failcnt(&memcg->kmem);
|
|
else
|
|
return -EINVAL;
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static u64 mem_cgroup_move_charge_read(struct cgroup *cgrp,
|
|
struct cftype *cft)
|
|
{
|
|
return mem_cgroup_from_cont(cgrp)->move_charge_at_immigrate;
|
|
}
|
|
|
|
#ifdef CONFIG_MMU
|
|
static int mem_cgroup_move_charge_write(struct cgroup *cgrp,
|
|
struct cftype *cft, u64 val)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
|
|
|
|
if (val >= (1 << NR_MOVE_TYPE))
|
|
return -EINVAL;
|
|
|
|
/*
|
|
* No kind of locking is needed in here, because ->can_attach() will
|
|
* check this value once in the beginning of the process, and then carry
|
|
* on with stale data. This means that changes to this value will only
|
|
* affect task migrations starting after the change.
|
|
*/
|
|
memcg->move_charge_at_immigrate = val;
|
|
return 0;
|
|
}
|
|
#else
|
|
static int mem_cgroup_move_charge_write(struct cgroup *cgrp,
|
|
struct cftype *cft, u64 val)
|
|
{
|
|
return -ENOSYS;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_NUMA
|
|
static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft,
|
|
struct seq_file *m)
|
|
{
|
|
int nid;
|
|
unsigned long total_nr, file_nr, anon_nr, unevictable_nr;
|
|
unsigned long node_nr;
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
|
|
total_nr = mem_cgroup_nr_lru_pages(memcg, LRU_ALL);
|
|
seq_printf(m, "total=%lu", total_nr);
|
|
for_each_node_state(nid, N_MEMORY) {
|
|
node_nr = mem_cgroup_node_nr_lru_pages(memcg, nid, LRU_ALL);
|
|
seq_printf(m, " N%d=%lu", nid, node_nr);
|
|
}
|
|
seq_putc(m, '\n');
|
|
|
|
file_nr = mem_cgroup_nr_lru_pages(memcg, LRU_ALL_FILE);
|
|
seq_printf(m, "file=%lu", file_nr);
|
|
for_each_node_state(nid, N_MEMORY) {
|
|
node_nr = mem_cgroup_node_nr_lru_pages(memcg, nid,
|
|
LRU_ALL_FILE);
|
|
seq_printf(m, " N%d=%lu", nid, node_nr);
|
|
}
|
|
seq_putc(m, '\n');
|
|
|
|
anon_nr = mem_cgroup_nr_lru_pages(memcg, LRU_ALL_ANON);
|
|
seq_printf(m, "anon=%lu", anon_nr);
|
|
for_each_node_state(nid, N_MEMORY) {
|
|
node_nr = mem_cgroup_node_nr_lru_pages(memcg, nid,
|
|
LRU_ALL_ANON);
|
|
seq_printf(m, " N%d=%lu", nid, node_nr);
|
|
}
|
|
seq_putc(m, '\n');
|
|
|
|
unevictable_nr = mem_cgroup_nr_lru_pages(memcg, BIT(LRU_UNEVICTABLE));
|
|
seq_printf(m, "unevictable=%lu", unevictable_nr);
|
|
for_each_node_state(nid, N_MEMORY) {
|
|
node_nr = mem_cgroup_node_nr_lru_pages(memcg, nid,
|
|
BIT(LRU_UNEVICTABLE));
|
|
seq_printf(m, " N%d=%lu", nid, node_nr);
|
|
}
|
|
seq_putc(m, '\n');
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
static inline void mem_cgroup_lru_names_not_uptodate(void)
|
|
{
|
|
BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS);
|
|
}
|
|
|
|
static int memcg_stat_show(struct cgroup *cont, struct cftype *cft,
|
|
struct seq_file *m)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
struct mem_cgroup *mi;
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < MEM_CGROUP_STAT_NSTATS; i++) {
|
|
if (i == MEM_CGROUP_STAT_SWAP && !do_swap_account)
|
|
continue;
|
|
seq_printf(m, "%s %ld\n", mem_cgroup_stat_names[i],
|
|
mem_cgroup_read_stat(memcg, i) * PAGE_SIZE);
|
|
}
|
|
|
|
for (i = 0; i < MEM_CGROUP_EVENTS_NSTATS; i++)
|
|
seq_printf(m, "%s %lu\n", mem_cgroup_events_names[i],
|
|
mem_cgroup_read_events(memcg, i));
|
|
|
|
for (i = 0; i < NR_LRU_LISTS; i++)
|
|
seq_printf(m, "%s %lu\n", mem_cgroup_lru_names[i],
|
|
mem_cgroup_nr_lru_pages(memcg, BIT(i)) * PAGE_SIZE);
|
|
|
|
/* Hierarchical information */
|
|
{
|
|
unsigned long long limit, memsw_limit;
|
|
memcg_get_hierarchical_limit(memcg, &limit, &memsw_limit);
|
|
seq_printf(m, "hierarchical_memory_limit %llu\n", limit);
|
|
if (do_swap_account)
|
|
seq_printf(m, "hierarchical_memsw_limit %llu\n",
|
|
memsw_limit);
|
|
}
|
|
|
|
for (i = 0; i < MEM_CGROUP_STAT_NSTATS; i++) {
|
|
long long val = 0;
|
|
|
|
if (i == MEM_CGROUP_STAT_SWAP && !do_swap_account)
|
|
continue;
|
|
for_each_mem_cgroup_tree(mi, memcg)
|
|
val += mem_cgroup_read_stat(mi, i) * PAGE_SIZE;
|
|
seq_printf(m, "total_%s %lld\n", mem_cgroup_stat_names[i], val);
|
|
}
|
|
|
|
for (i = 0; i < MEM_CGROUP_EVENTS_NSTATS; i++) {
|
|
unsigned long long val = 0;
|
|
|
|
for_each_mem_cgroup_tree(mi, memcg)
|
|
val += mem_cgroup_read_events(mi, i);
|
|
seq_printf(m, "total_%s %llu\n",
|
|
mem_cgroup_events_names[i], val);
|
|
}
|
|
|
|
for (i = 0; i < NR_LRU_LISTS; i++) {
|
|
unsigned long long val = 0;
|
|
|
|
for_each_mem_cgroup_tree(mi, memcg)
|
|
val += mem_cgroup_nr_lru_pages(mi, BIT(i)) * PAGE_SIZE;
|
|
seq_printf(m, "total_%s %llu\n", mem_cgroup_lru_names[i], val);
|
|
}
|
|
|
|
#ifdef CONFIG_DEBUG_VM
|
|
{
|
|
int nid, zid;
|
|
struct mem_cgroup_per_zone *mz;
|
|
struct zone_reclaim_stat *rstat;
|
|
unsigned long recent_rotated[2] = {0, 0};
|
|
unsigned long recent_scanned[2] = {0, 0};
|
|
|
|
for_each_online_node(nid)
|
|
for (zid = 0; zid < MAX_NR_ZONES; zid++) {
|
|
mz = mem_cgroup_zoneinfo(memcg, nid, zid);
|
|
rstat = &mz->lruvec.reclaim_stat;
|
|
|
|
recent_rotated[0] += rstat->recent_rotated[0];
|
|
recent_rotated[1] += rstat->recent_rotated[1];
|
|
recent_scanned[0] += rstat->recent_scanned[0];
|
|
recent_scanned[1] += rstat->recent_scanned[1];
|
|
}
|
|
seq_printf(m, "recent_rotated_anon %lu\n", recent_rotated[0]);
|
|
seq_printf(m, "recent_rotated_file %lu\n", recent_rotated[1]);
|
|
seq_printf(m, "recent_scanned_anon %lu\n", recent_scanned[0]);
|
|
seq_printf(m, "recent_scanned_file %lu\n", recent_scanned[1]);
|
|
}
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
static u64 mem_cgroup_swappiness_read(struct cgroup *cgrp, struct cftype *cft)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
|
|
|
|
return mem_cgroup_swappiness(memcg);
|
|
}
|
|
|
|
static int mem_cgroup_swappiness_write(struct cgroup *cgrp, struct cftype *cft,
|
|
u64 val)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
|
|
struct mem_cgroup *parent;
|
|
|
|
if (val > 100)
|
|
return -EINVAL;
|
|
|
|
if (cgrp->parent == NULL)
|
|
return -EINVAL;
|
|
|
|
parent = mem_cgroup_from_cont(cgrp->parent);
|
|
|
|
mutex_lock(&memcg_create_mutex);
|
|
|
|
/* If under hierarchy, only empty-root can set this value */
|
|
if ((parent->use_hierarchy) || memcg_has_children(memcg)) {
|
|
mutex_unlock(&memcg_create_mutex);
|
|
return -EINVAL;
|
|
}
|
|
|
|
memcg->swappiness = val;
|
|
|
|
mutex_unlock(&memcg_create_mutex);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void __mem_cgroup_threshold(struct mem_cgroup *memcg, bool swap)
|
|
{
|
|
struct mem_cgroup_threshold_ary *t;
|
|
u64 usage;
|
|
int i;
|
|
|
|
rcu_read_lock();
|
|
if (!swap)
|
|
t = rcu_dereference(memcg->thresholds.primary);
|
|
else
|
|
t = rcu_dereference(memcg->memsw_thresholds.primary);
|
|
|
|
if (!t)
|
|
goto unlock;
|
|
|
|
usage = mem_cgroup_usage(memcg, swap);
|
|
|
|
/*
|
|
* current_threshold points to threshold just below or equal to usage.
|
|
* If it's not true, a threshold was crossed after last
|
|
* call of __mem_cgroup_threshold().
|
|
*/
|
|
i = t->current_threshold;
|
|
|
|
/*
|
|
* Iterate backward over array of thresholds starting from
|
|
* current_threshold and check if a threshold is crossed.
|
|
* If none of thresholds below usage is crossed, we read
|
|
* only one element of the array here.
|
|
*/
|
|
for (; i >= 0 && unlikely(t->entries[i].threshold > usage); i--)
|
|
eventfd_signal(t->entries[i].eventfd, 1);
|
|
|
|
/* i = current_threshold + 1 */
|
|
i++;
|
|
|
|
/*
|
|
* Iterate forward over array of thresholds starting from
|
|
* current_threshold+1 and check if a threshold is crossed.
|
|
* If none of thresholds above usage is crossed, we read
|
|
* only one element of the array here.
|
|
*/
|
|
for (; i < t->size && unlikely(t->entries[i].threshold <= usage); i++)
|
|
eventfd_signal(t->entries[i].eventfd, 1);
|
|
|
|
/* Update current_threshold */
|
|
t->current_threshold = i - 1;
|
|
unlock:
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
static void mem_cgroup_threshold(struct mem_cgroup *memcg)
|
|
{
|
|
while (memcg) {
|
|
__mem_cgroup_threshold(memcg, false);
|
|
if (do_swap_account)
|
|
__mem_cgroup_threshold(memcg, true);
|
|
|
|
memcg = parent_mem_cgroup(memcg);
|
|
}
|
|
}
|
|
|
|
static int compare_thresholds(const void *a, const void *b)
|
|
{
|
|
const struct mem_cgroup_threshold *_a = a;
|
|
const struct mem_cgroup_threshold *_b = b;
|
|
|
|
if (_a->threshold > _b->threshold)
|
|
return 1;
|
|
|
|
if (_a->threshold < _b->threshold)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mem_cgroup_oom_notify_cb(struct mem_cgroup *memcg)
|
|
{
|
|
struct mem_cgroup_eventfd_list *ev;
|
|
|
|
list_for_each_entry(ev, &memcg->oom_notify, list)
|
|
eventfd_signal(ev->eventfd, 1);
|
|
return 0;
|
|
}
|
|
|
|
static void mem_cgroup_oom_notify(struct mem_cgroup *memcg)
|
|
{
|
|
struct mem_cgroup *iter;
|
|
|
|
for_each_mem_cgroup_tree(iter, memcg)
|
|
mem_cgroup_oom_notify_cb(iter);
|
|
}
|
|
|
|
static int mem_cgroup_usage_register_event(struct cgroup *cgrp,
|
|
struct cftype *cft, struct eventfd_ctx *eventfd, const char *args)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
|
|
struct mem_cgroup_thresholds *thresholds;
|
|
struct mem_cgroup_threshold_ary *new;
|
|
enum res_type type = MEMFILE_TYPE(cft->private);
|
|
u64 threshold, usage;
|
|
int i, size, ret;
|
|
|
|
ret = res_counter_memparse_write_strategy(args, &threshold);
|
|
if (ret)
|
|
return ret;
|
|
|
|
mutex_lock(&memcg->thresholds_lock);
|
|
|
|
if (type == _MEM)
|
|
thresholds = &memcg->thresholds;
|
|
else if (type == _MEMSWAP)
|
|
thresholds = &memcg->memsw_thresholds;
|
|
else
|
|
BUG();
|
|
|
|
usage = mem_cgroup_usage(memcg, type == _MEMSWAP);
|
|
|
|
/* Check if a threshold crossed before adding a new one */
|
|
if (thresholds->primary)
|
|
__mem_cgroup_threshold(memcg, type == _MEMSWAP);
|
|
|
|
size = thresholds->primary ? thresholds->primary->size + 1 : 1;
|
|
|
|
/* Allocate memory for new array of thresholds */
|
|
new = kmalloc(sizeof(*new) + size * sizeof(struct mem_cgroup_threshold),
|
|
GFP_KERNEL);
|
|
if (!new) {
|
|
ret = -ENOMEM;
|
|
goto unlock;
|
|
}
|
|
new->size = size;
|
|
|
|
/* Copy thresholds (if any) to new array */
|
|
if (thresholds->primary) {
|
|
memcpy(new->entries, thresholds->primary->entries, (size - 1) *
|
|
sizeof(struct mem_cgroup_threshold));
|
|
}
|
|
|
|
/* Add new threshold */
|
|
new->entries[size - 1].eventfd = eventfd;
|
|
new->entries[size - 1].threshold = threshold;
|
|
|
|
/* Sort thresholds. Registering of new threshold isn't time-critical */
|
|
sort(new->entries, size, sizeof(struct mem_cgroup_threshold),
|
|
compare_thresholds, NULL);
|
|
|
|
/* Find current threshold */
|
|
new->current_threshold = -1;
|
|
for (i = 0; i < size; i++) {
|
|
if (new->entries[i].threshold <= usage) {
|
|
/*
|
|
* new->current_threshold will not be used until
|
|
* rcu_assign_pointer(), so it's safe to increment
|
|
* it here.
|
|
*/
|
|
++new->current_threshold;
|
|
} else
|
|
break;
|
|
}
|
|
|
|
/* Free old spare buffer and save old primary buffer as spare */
|
|
kfree(thresholds->spare);
|
|
thresholds->spare = thresholds->primary;
|
|
|
|
rcu_assign_pointer(thresholds->primary, new);
|
|
|
|
/* To be sure that nobody uses thresholds */
|
|
synchronize_rcu();
|
|
|
|
unlock:
|
|
mutex_unlock(&memcg->thresholds_lock);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void mem_cgroup_usage_unregister_event(struct cgroup *cgrp,
|
|
struct cftype *cft, struct eventfd_ctx *eventfd)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
|
|
struct mem_cgroup_thresholds *thresholds;
|
|
struct mem_cgroup_threshold_ary *new;
|
|
enum res_type type = MEMFILE_TYPE(cft->private);
|
|
u64 usage;
|
|
int i, j, size;
|
|
|
|
mutex_lock(&memcg->thresholds_lock);
|
|
if (type == _MEM)
|
|
thresholds = &memcg->thresholds;
|
|
else if (type == _MEMSWAP)
|
|
thresholds = &memcg->memsw_thresholds;
|
|
else
|
|
BUG();
|
|
|
|
if (!thresholds->primary)
|
|
goto unlock;
|
|
|
|
usage = mem_cgroup_usage(memcg, type == _MEMSWAP);
|
|
|
|
/* Check if a threshold crossed before removing */
|
|
__mem_cgroup_threshold(memcg, type == _MEMSWAP);
|
|
|
|
/* Calculate new number of threshold */
|
|
size = 0;
|
|
for (i = 0; i < thresholds->primary->size; i++) {
|
|
if (thresholds->primary->entries[i].eventfd != eventfd)
|
|
size++;
|
|
}
|
|
|
|
new = thresholds->spare;
|
|
|
|
/* Set thresholds array to NULL if we don't have thresholds */
|
|
if (!size) {
|
|
kfree(new);
|
|
new = NULL;
|
|
goto swap_buffers;
|
|
}
|
|
|
|
new->size = size;
|
|
|
|
/* Copy thresholds and find current threshold */
|
|
new->current_threshold = -1;
|
|
for (i = 0, j = 0; i < thresholds->primary->size; i++) {
|
|
if (thresholds->primary->entries[i].eventfd == eventfd)
|
|
continue;
|
|
|
|
new->entries[j] = thresholds->primary->entries[i];
|
|
if (new->entries[j].threshold <= usage) {
|
|
/*
|
|
* new->current_threshold will not be used
|
|
* until rcu_assign_pointer(), so it's safe to increment
|
|
* it here.
|
|
*/
|
|
++new->current_threshold;
|
|
}
|
|
j++;
|
|
}
|
|
|
|
swap_buffers:
|
|
/* Swap primary and spare array */
|
|
thresholds->spare = thresholds->primary;
|
|
/* If all events are unregistered, free the spare array */
|
|
if (!new) {
|
|
kfree(thresholds->spare);
|
|
thresholds->spare = NULL;
|
|
}
|
|
|
|
rcu_assign_pointer(thresholds->primary, new);
|
|
|
|
/* To be sure that nobody uses thresholds */
|
|
synchronize_rcu();
|
|
unlock:
|
|
mutex_unlock(&memcg->thresholds_lock);
|
|
}
|
|
|
|
static int mem_cgroup_oom_register_event(struct cgroup *cgrp,
|
|
struct cftype *cft, struct eventfd_ctx *eventfd, const char *args)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
|
|
struct mem_cgroup_eventfd_list *event;
|
|
enum res_type type = MEMFILE_TYPE(cft->private);
|
|
|
|
BUG_ON(type != _OOM_TYPE);
|
|
event = kmalloc(sizeof(*event), GFP_KERNEL);
|
|
if (!event)
|
|
return -ENOMEM;
|
|
|
|
spin_lock(&memcg_oom_lock);
|
|
|
|
event->eventfd = eventfd;
|
|
list_add(&event->list, &memcg->oom_notify);
|
|
|
|
/* already in OOM ? */
|
|
if (atomic_read(&memcg->under_oom))
|
|
eventfd_signal(eventfd, 1);
|
|
spin_unlock(&memcg_oom_lock);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void mem_cgroup_oom_unregister_event(struct cgroup *cgrp,
|
|
struct cftype *cft, struct eventfd_ctx *eventfd)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
|
|
struct mem_cgroup_eventfd_list *ev, *tmp;
|
|
enum res_type type = MEMFILE_TYPE(cft->private);
|
|
|
|
BUG_ON(type != _OOM_TYPE);
|
|
|
|
spin_lock(&memcg_oom_lock);
|
|
|
|
list_for_each_entry_safe(ev, tmp, &memcg->oom_notify, list) {
|
|
if (ev->eventfd == eventfd) {
|
|
list_del(&ev->list);
|
|
kfree(ev);
|
|
}
|
|
}
|
|
|
|
spin_unlock(&memcg_oom_lock);
|
|
}
|
|
|
|
static int mem_cgroup_oom_control_read(struct cgroup *cgrp,
|
|
struct cftype *cft, struct cgroup_map_cb *cb)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
|
|
|
|
cb->fill(cb, "oom_kill_disable", memcg->oom_kill_disable);
|
|
|
|
if (atomic_read(&memcg->under_oom))
|
|
cb->fill(cb, "under_oom", 1);
|
|
else
|
|
cb->fill(cb, "under_oom", 0);
|
|
return 0;
|
|
}
|
|
|
|
static int mem_cgroup_oom_control_write(struct cgroup *cgrp,
|
|
struct cftype *cft, u64 val)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
|
|
struct mem_cgroup *parent;
|
|
|
|
/* cannot set to root cgroup and only 0 and 1 are allowed */
|
|
if (!cgrp->parent || !((val == 0) || (val == 1)))
|
|
return -EINVAL;
|
|
|
|
parent = mem_cgroup_from_cont(cgrp->parent);
|
|
|
|
mutex_lock(&memcg_create_mutex);
|
|
/* oom-kill-disable is a flag for subhierarchy. */
|
|
if ((parent->use_hierarchy) || memcg_has_children(memcg)) {
|
|
mutex_unlock(&memcg_create_mutex);
|
|
return -EINVAL;
|
|
}
|
|
memcg->oom_kill_disable = val;
|
|
if (!val)
|
|
memcg_oom_recover(memcg);
|
|
mutex_unlock(&memcg_create_mutex);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_MEMCG_KMEM
|
|
static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
|
|
{
|
|
int ret;
|
|
|
|
memcg->kmemcg_id = -1;
|
|
ret = memcg_propagate_kmem(memcg);
|
|
if (ret)
|
|
return ret;
|
|
|
|
return mem_cgroup_sockets_init(memcg, ss);
|
|
}
|
|
|
|
static void kmem_cgroup_destroy(struct mem_cgroup *memcg)
|
|
{
|
|
mem_cgroup_sockets_destroy(memcg);
|
|
|
|
memcg_kmem_mark_dead(memcg);
|
|
|
|
if (res_counter_read_u64(&memcg->kmem, RES_USAGE) != 0)
|
|
return;
|
|
|
|
/*
|
|
* Charges already down to 0, undo mem_cgroup_get() done in the charge
|
|
* path here, being careful not to race with memcg_uncharge_kmem: it is
|
|
* possible that the charges went down to 0 between mark_dead and the
|
|
* res_counter read, so in that case, we don't need the put
|
|
*/
|
|
if (memcg_kmem_test_and_clear_dead(memcg))
|
|
mem_cgroup_put(memcg);
|
|
}
|
|
#else
|
|
static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static void kmem_cgroup_destroy(struct mem_cgroup *memcg)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
static struct cftype mem_cgroup_files[] = {
|
|
{
|
|
.name = "usage_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_MEM, RES_USAGE),
|
|
.read = mem_cgroup_read,
|
|
.register_event = mem_cgroup_usage_register_event,
|
|
.unregister_event = mem_cgroup_usage_unregister_event,
|
|
},
|
|
{
|
|
.name = "max_usage_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_MEM, RES_MAX_USAGE),
|
|
.trigger = mem_cgroup_reset,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{
|
|
.name = "limit_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_MEM, RES_LIMIT),
|
|
.write_string = mem_cgroup_write,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{
|
|
.name = "soft_limit_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_MEM, RES_SOFT_LIMIT),
|
|
.write_string = mem_cgroup_write,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{
|
|
.name = "failcnt",
|
|
.private = MEMFILE_PRIVATE(_MEM, RES_FAILCNT),
|
|
.trigger = mem_cgroup_reset,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{
|
|
.name = "stat",
|
|
.read_seq_string = memcg_stat_show,
|
|
},
|
|
{
|
|
.name = "force_empty",
|
|
.trigger = mem_cgroup_force_empty_write,
|
|
},
|
|
{
|
|
.name = "use_hierarchy",
|
|
.flags = CFTYPE_INSANE,
|
|
.write_u64 = mem_cgroup_hierarchy_write,
|
|
.read_u64 = mem_cgroup_hierarchy_read,
|
|
},
|
|
{
|
|
.name = "swappiness",
|
|
.read_u64 = mem_cgroup_swappiness_read,
|
|
.write_u64 = mem_cgroup_swappiness_write,
|
|
},
|
|
{
|
|
.name = "move_charge_at_immigrate",
|
|
.read_u64 = mem_cgroup_move_charge_read,
|
|
.write_u64 = mem_cgroup_move_charge_write,
|
|
},
|
|
{
|
|
.name = "oom_control",
|
|
.read_map = mem_cgroup_oom_control_read,
|
|
.write_u64 = mem_cgroup_oom_control_write,
|
|
.register_event = mem_cgroup_oom_register_event,
|
|
.unregister_event = mem_cgroup_oom_unregister_event,
|
|
.private = MEMFILE_PRIVATE(_OOM_TYPE, OOM_CONTROL),
|
|
},
|
|
{
|
|
.name = "pressure_level",
|
|
.register_event = vmpressure_register_event,
|
|
.unregister_event = vmpressure_unregister_event,
|
|
},
|
|
#ifdef CONFIG_NUMA
|
|
{
|
|
.name = "numa_stat",
|
|
.read_seq_string = memcg_numa_stat_show,
|
|
},
|
|
#endif
|
|
#ifdef CONFIG_MEMCG_KMEM
|
|
{
|
|
.name = "kmem.limit_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_KMEM, RES_LIMIT),
|
|
.write_string = mem_cgroup_write,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{
|
|
.name = "kmem.usage_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_KMEM, RES_USAGE),
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{
|
|
.name = "kmem.failcnt",
|
|
.private = MEMFILE_PRIVATE(_KMEM, RES_FAILCNT),
|
|
.trigger = mem_cgroup_reset,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{
|
|
.name = "kmem.max_usage_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_KMEM, RES_MAX_USAGE),
|
|
.trigger = mem_cgroup_reset,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
#ifdef CONFIG_SLABINFO
|
|
{
|
|
.name = "kmem.slabinfo",
|
|
.read_seq_string = mem_cgroup_slabinfo_read,
|
|
},
|
|
#endif
|
|
#endif
|
|
{ }, /* terminate */
|
|
};
|
|
|
|
#ifdef CONFIG_MEMCG_SWAP
|
|
static struct cftype memsw_cgroup_files[] = {
|
|
{
|
|
.name = "memsw.usage_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_MEMSWAP, RES_USAGE),
|
|
.read = mem_cgroup_read,
|
|
.register_event = mem_cgroup_usage_register_event,
|
|
.unregister_event = mem_cgroup_usage_unregister_event,
|
|
},
|
|
{
|
|
.name = "memsw.max_usage_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_MEMSWAP, RES_MAX_USAGE),
|
|
.trigger = mem_cgroup_reset,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{
|
|
.name = "memsw.limit_in_bytes",
|
|
.private = MEMFILE_PRIVATE(_MEMSWAP, RES_LIMIT),
|
|
.write_string = mem_cgroup_write,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{
|
|
.name = "memsw.failcnt",
|
|
.private = MEMFILE_PRIVATE(_MEMSWAP, RES_FAILCNT),
|
|
.trigger = mem_cgroup_reset,
|
|
.read = mem_cgroup_read,
|
|
},
|
|
{ }, /* terminate */
|
|
};
|
|
#endif
|
|
static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *memcg, int node)
|
|
{
|
|
struct mem_cgroup_per_node *pn;
|
|
struct mem_cgroup_per_zone *mz;
|
|
int zone, tmp = node;
|
|
/*
|
|
* This routine is called against possible nodes.
|
|
* But it's BUG to call kmalloc() against offline node.
|
|
*
|
|
* TODO: this routine can waste much memory for nodes which will
|
|
* never be onlined. It's better to use memory hotplug callback
|
|
* function.
|
|
*/
|
|
if (!node_state(node, N_NORMAL_MEMORY))
|
|
tmp = -1;
|
|
pn = kzalloc_node(sizeof(*pn), GFP_KERNEL, tmp);
|
|
if (!pn)
|
|
return 1;
|
|
|
|
for (zone = 0; zone < MAX_NR_ZONES; zone++) {
|
|
mz = &pn->zoneinfo[zone];
|
|
lruvec_init(&mz->lruvec);
|
|
mz->usage_in_excess = 0;
|
|
mz->on_tree = false;
|
|
mz->memcg = memcg;
|
|
}
|
|
memcg->info.nodeinfo[node] = pn;
|
|
return 0;
|
|
}
|
|
|
|
static void free_mem_cgroup_per_zone_info(struct mem_cgroup *memcg, int node)
|
|
{
|
|
kfree(memcg->info.nodeinfo[node]);
|
|
}
|
|
|
|
static struct mem_cgroup *mem_cgroup_alloc(void)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
size_t size = memcg_size();
|
|
|
|
/* Can be very big if nr_node_ids is very big */
|
|
if (size < PAGE_SIZE)
|
|
memcg = kzalloc(size, GFP_KERNEL);
|
|
else
|
|
memcg = vzalloc(size);
|
|
|
|
if (!memcg)
|
|
return NULL;
|
|
|
|
memcg->stat = alloc_percpu(struct mem_cgroup_stat_cpu);
|
|
if (!memcg->stat)
|
|
goto out_free;
|
|
spin_lock_init(&memcg->pcp_counter_lock);
|
|
return memcg;
|
|
|
|
out_free:
|
|
if (size < PAGE_SIZE)
|
|
kfree(memcg);
|
|
else
|
|
vfree(memcg);
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* At destroying mem_cgroup, references from swap_cgroup can remain.
|
|
* (scanning all at force_empty is too costly...)
|
|
*
|
|
* Instead of clearing all references at force_empty, we remember
|
|
* the number of reference from swap_cgroup and free mem_cgroup when
|
|
* it goes down to 0.
|
|
*
|
|
* Removal of cgroup itself succeeds regardless of refs from swap.
|
|
*/
|
|
|
|
static void __mem_cgroup_free(struct mem_cgroup *memcg)
|
|
{
|
|
int node;
|
|
size_t size = memcg_size();
|
|
|
|
mem_cgroup_remove_from_trees(memcg);
|
|
free_css_id(&mem_cgroup_subsys, &memcg->css);
|
|
|
|
for_each_node(node)
|
|
free_mem_cgroup_per_zone_info(memcg, node);
|
|
|
|
free_percpu(memcg->stat);
|
|
|
|
/*
|
|
* We need to make sure that (at least for now), the jump label
|
|
* destruction code runs outside of the cgroup lock. This is because
|
|
* get_online_cpus(), which is called from the static_branch update,
|
|
* can't be called inside the cgroup_lock. cpusets are the ones
|
|
* enforcing this dependency, so if they ever change, we might as well.
|
|
*
|
|
* schedule_work() will guarantee this happens. Be careful if you need
|
|
* to move this code around, and make sure it is outside
|
|
* the cgroup_lock.
|
|
*/
|
|
disarm_static_keys(memcg);
|
|
if (size < PAGE_SIZE)
|
|
kfree(memcg);
|
|
else
|
|
vfree(memcg);
|
|
}
|
|
|
|
|
|
/*
|
|
* Helpers for freeing a kmalloc()ed/vzalloc()ed mem_cgroup by RCU,
|
|
* but in process context. The work_freeing structure is overlaid
|
|
* on the rcu_freeing structure, which itself is overlaid on memsw.
|
|
*/
|
|
static void free_work(struct work_struct *work)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
|
|
memcg = container_of(work, struct mem_cgroup, work_freeing);
|
|
__mem_cgroup_free(memcg);
|
|
}
|
|
|
|
static void free_rcu(struct rcu_head *rcu_head)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
|
|
memcg = container_of(rcu_head, struct mem_cgroup, rcu_freeing);
|
|
INIT_WORK(&memcg->work_freeing, free_work);
|
|
schedule_work(&memcg->work_freeing);
|
|
}
|
|
|
|
static void mem_cgroup_get(struct mem_cgroup *memcg)
|
|
{
|
|
atomic_inc(&memcg->refcnt);
|
|
}
|
|
|
|
static void __mem_cgroup_put(struct mem_cgroup *memcg, int count)
|
|
{
|
|
if (atomic_sub_and_test(count, &memcg->refcnt)) {
|
|
struct mem_cgroup *parent = parent_mem_cgroup(memcg);
|
|
call_rcu(&memcg->rcu_freeing, free_rcu);
|
|
if (parent)
|
|
mem_cgroup_put(parent);
|
|
}
|
|
}
|
|
|
|
static void mem_cgroup_put(struct mem_cgroup *memcg)
|
|
{
|
|
__mem_cgroup_put(memcg, 1);
|
|
}
|
|
|
|
/*
|
|
* Returns the parent mem_cgroup in memcgroup hierarchy with hierarchy enabled.
|
|
*/
|
|
struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg)
|
|
{
|
|
if (!memcg->res.parent)
|
|
return NULL;
|
|
return mem_cgroup_from_res_counter(memcg->res.parent, res);
|
|
}
|
|
EXPORT_SYMBOL(parent_mem_cgroup);
|
|
|
|
static void __init mem_cgroup_soft_limit_tree_init(void)
|
|
{
|
|
struct mem_cgroup_tree_per_node *rtpn;
|
|
struct mem_cgroup_tree_per_zone *rtpz;
|
|
int tmp, node, zone;
|
|
|
|
for_each_node(node) {
|
|
tmp = node;
|
|
if (!node_state(node, N_NORMAL_MEMORY))
|
|
tmp = -1;
|
|
rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, tmp);
|
|
BUG_ON(!rtpn);
|
|
|
|
soft_limit_tree.rb_tree_per_node[node] = rtpn;
|
|
|
|
for (zone = 0; zone < MAX_NR_ZONES; zone++) {
|
|
rtpz = &rtpn->rb_tree_per_zone[zone];
|
|
rtpz->rb_root = RB_ROOT;
|
|
spin_lock_init(&rtpz->lock);
|
|
}
|
|
}
|
|
}
|
|
|
|
static struct cgroup_subsys_state * __ref
|
|
mem_cgroup_css_alloc(struct cgroup *cont)
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
long error = -ENOMEM;
|
|
int node;
|
|
|
|
memcg = mem_cgroup_alloc();
|
|
if (!memcg)
|
|
return ERR_PTR(error);
|
|
|
|
for_each_node(node)
|
|
if (alloc_mem_cgroup_per_zone_info(memcg, node))
|
|
goto free_out;
|
|
|
|
/* root ? */
|
|
if (cont->parent == NULL) {
|
|
root_mem_cgroup = memcg;
|
|
res_counter_init(&memcg->res, NULL);
|
|
res_counter_init(&memcg->memsw, NULL);
|
|
res_counter_init(&memcg->kmem, NULL);
|
|
}
|
|
|
|
memcg->last_scanned_node = MAX_NUMNODES;
|
|
INIT_LIST_HEAD(&memcg->oom_notify);
|
|
atomic_set(&memcg->refcnt, 1);
|
|
memcg->move_charge_at_immigrate = 0;
|
|
mutex_init(&memcg->thresholds_lock);
|
|
spin_lock_init(&memcg->move_lock);
|
|
vmpressure_init(&memcg->vmpressure);
|
|
|
|
return &memcg->css;
|
|
|
|
free_out:
|
|
__mem_cgroup_free(memcg);
|
|
return ERR_PTR(error);
|
|
}
|
|
|
|
static int
|
|
mem_cgroup_css_online(struct cgroup *cont)
|
|
{
|
|
struct mem_cgroup *memcg, *parent;
|
|
int error = 0;
|
|
|
|
if (!cont->parent)
|
|
return 0;
|
|
|
|
mutex_lock(&memcg_create_mutex);
|
|
memcg = mem_cgroup_from_cont(cont);
|
|
parent = mem_cgroup_from_cont(cont->parent);
|
|
|
|
memcg->use_hierarchy = parent->use_hierarchy;
|
|
memcg->oom_kill_disable = parent->oom_kill_disable;
|
|
memcg->swappiness = mem_cgroup_swappiness(parent);
|
|
|
|
if (parent->use_hierarchy) {
|
|
res_counter_init(&memcg->res, &parent->res);
|
|
res_counter_init(&memcg->memsw, &parent->memsw);
|
|
res_counter_init(&memcg->kmem, &parent->kmem);
|
|
|
|
/*
|
|
* We increment refcnt of the parent to ensure that we can
|
|
* safely access it on res_counter_charge/uncharge.
|
|
* This refcnt will be decremented when freeing this
|
|
* mem_cgroup(see mem_cgroup_put).
|
|
*/
|
|
mem_cgroup_get(parent);
|
|
} else {
|
|
res_counter_init(&memcg->res, NULL);
|
|
res_counter_init(&memcg->memsw, NULL);
|
|
res_counter_init(&memcg->kmem, NULL);
|
|
/*
|
|
* Deeper hierachy with use_hierarchy == false doesn't make
|
|
* much sense so let cgroup subsystem know about this
|
|
* unfortunate state in our controller.
|
|
*/
|
|
if (parent != root_mem_cgroup)
|
|
mem_cgroup_subsys.broken_hierarchy = true;
|
|
}
|
|
|
|
error = memcg_init_kmem(memcg, &mem_cgroup_subsys);
|
|
mutex_unlock(&memcg_create_mutex);
|
|
return error;
|
|
}
|
|
|
|
/*
|
|
* Announce all parents that a group from their hierarchy is gone.
|
|
*/
|
|
static void mem_cgroup_invalidate_reclaim_iterators(struct mem_cgroup *memcg)
|
|
{
|
|
struct mem_cgroup *parent = memcg;
|
|
|
|
while ((parent = parent_mem_cgroup(parent)))
|
|
atomic_inc(&parent->dead_count);
|
|
|
|
/*
|
|
* if the root memcg is not hierarchical we have to check it
|
|
* explicitely.
|
|
*/
|
|
if (!root_mem_cgroup->use_hierarchy)
|
|
atomic_inc(&root_mem_cgroup->dead_count);
|
|
}
|
|
|
|
static void mem_cgroup_css_offline(struct cgroup *cont)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
struct cgroup *iter;
|
|
|
|
mem_cgroup_invalidate_reclaim_iterators(memcg);
|
|
|
|
/*
|
|
* This requires that offlining is serialized. Right now that is
|
|
* guaranteed because css_killed_work_fn() holds the cgroup_mutex.
|
|
*/
|
|
rcu_read_lock();
|
|
cgroup_for_each_descendant_post(iter, cont) {
|
|
rcu_read_unlock();
|
|
mem_cgroup_reparent_charges(mem_cgroup_from_cont(iter));
|
|
rcu_read_lock();
|
|
}
|
|
rcu_read_unlock();
|
|
mem_cgroup_reparent_charges(memcg);
|
|
|
|
mem_cgroup_destroy_all_caches(memcg);
|
|
}
|
|
|
|
static void mem_cgroup_css_free(struct cgroup *cont)
|
|
{
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
|
|
|
|
kmem_cgroup_destroy(memcg);
|
|
|
|
mem_cgroup_put(memcg);
|
|
}
|
|
|
|
#ifdef CONFIG_MMU
|
|
/* Handlers for move charge at task migration. */
|
|
#define PRECHARGE_COUNT_AT_ONCE 256
|
|
static int mem_cgroup_do_precharge(unsigned long count)
|
|
{
|
|
int ret = 0;
|
|
int batch_count = PRECHARGE_COUNT_AT_ONCE;
|
|
struct mem_cgroup *memcg = mc.to;
|
|
|
|
if (mem_cgroup_is_root(memcg)) {
|
|
mc.precharge += count;
|
|
/* we don't need css_get for root */
|
|
return ret;
|
|
}
|
|
/* try to charge at once */
|
|
if (count > 1) {
|
|
struct res_counter *dummy;
|
|
/*
|
|
* "memcg" cannot be under rmdir() because we've already checked
|
|
* by cgroup_lock_live_cgroup() that it is not removed and we
|
|
* are still under the same cgroup_mutex. So we can postpone
|
|
* css_get().
|
|
*/
|
|
if (res_counter_charge(&memcg->res, PAGE_SIZE * count, &dummy))
|
|
goto one_by_one;
|
|
if (do_swap_account && res_counter_charge(&memcg->memsw,
|
|
PAGE_SIZE * count, &dummy)) {
|
|
res_counter_uncharge(&memcg->res, PAGE_SIZE * count);
|
|
goto one_by_one;
|
|
}
|
|
mc.precharge += count;
|
|
return ret;
|
|
}
|
|
one_by_one:
|
|
/* fall back to one by one charge */
|
|
while (count--) {
|
|
if (signal_pending(current)) {
|
|
ret = -EINTR;
|
|
break;
|
|
}
|
|
if (!batch_count--) {
|
|
batch_count = PRECHARGE_COUNT_AT_ONCE;
|
|
cond_resched();
|
|
}
|
|
ret = __mem_cgroup_try_charge(NULL,
|
|
GFP_KERNEL, 1, &memcg, false);
|
|
if (ret)
|
|
/* mem_cgroup_clear_mc() will do uncharge later */
|
|
return ret;
|
|
mc.precharge++;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* get_mctgt_type - get target type of moving charge
|
|
* @vma: the vma the pte to be checked belongs
|
|
* @addr: the address corresponding to the pte to be checked
|
|
* @ptent: the pte to be checked
|
|
* @target: the pointer the target page or swap ent will be stored(can be NULL)
|
|
*
|
|
* Returns
|
|
* 0(MC_TARGET_NONE): if the pte is not a target for move charge.
|
|
* 1(MC_TARGET_PAGE): if the page corresponding to this pte is a target for
|
|
* move charge. if @target is not NULL, the page is stored in target->page
|
|
* with extra refcnt got(Callers should handle it).
|
|
* 2(MC_TARGET_SWAP): if the swap entry corresponding to this pte is a
|
|
* target for charge migration. if @target is not NULL, the entry is stored
|
|
* in target->ent.
|
|
*
|
|
* Called with pte lock held.
|
|
*/
|
|
union mc_target {
|
|
struct page *page;
|
|
swp_entry_t ent;
|
|
};
|
|
|
|
enum mc_target_type {
|
|
MC_TARGET_NONE = 0,
|
|
MC_TARGET_PAGE,
|
|
MC_TARGET_SWAP,
|
|
};
|
|
|
|
static struct page *mc_handle_present_pte(struct vm_area_struct *vma,
|
|
unsigned long addr, pte_t ptent)
|
|
{
|
|
struct page *page = vm_normal_page(vma, addr, ptent);
|
|
|
|
if (!page || !page_mapped(page))
|
|
return NULL;
|
|
if (PageAnon(page)) {
|
|
/* we don't move shared anon */
|
|
if (!move_anon())
|
|
return NULL;
|
|
} else if (!move_file())
|
|
/* we ignore mapcount for file pages */
|
|
return NULL;
|
|
if (!get_page_unless_zero(page))
|
|
return NULL;
|
|
|
|
return page;
|
|
}
|
|
|
|
#ifdef CONFIG_SWAP
|
|
static struct page *mc_handle_swap_pte(struct vm_area_struct *vma,
|
|
unsigned long addr, pte_t ptent, swp_entry_t *entry)
|
|
{
|
|
struct page *page = NULL;
|
|
swp_entry_t ent = pte_to_swp_entry(ptent);
|
|
|
|
if (!move_anon() || non_swap_entry(ent))
|
|
return NULL;
|
|
/*
|
|
* Because lookup_swap_cache() updates some statistics counter,
|
|
* we call find_get_page() with swapper_space directly.
|
|
*/
|
|
page = find_get_page(swap_address_space(ent), ent.val);
|
|
if (do_swap_account)
|
|
entry->val = ent.val;
|
|
|
|
return page;
|
|
}
|
|
#else
|
|
static struct page *mc_handle_swap_pte(struct vm_area_struct *vma,
|
|
unsigned long addr, pte_t ptent, swp_entry_t *entry)
|
|
{
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
static struct page *mc_handle_file_pte(struct vm_area_struct *vma,
|
|
unsigned long addr, pte_t ptent, swp_entry_t *entry)
|
|
{
|
|
struct page *page = NULL;
|
|
struct address_space *mapping;
|
|
pgoff_t pgoff;
|
|
|
|
if (!vma->vm_file) /* anonymous vma */
|
|
return NULL;
|
|
if (!move_file())
|
|
return NULL;
|
|
|
|
mapping = vma->vm_file->f_mapping;
|
|
if (pte_none(ptent))
|
|
pgoff = linear_page_index(vma, addr);
|
|
else /* pte_file(ptent) is true */
|
|
pgoff = pte_to_pgoff(ptent);
|
|
|
|
/* page is moved even if it's not RSS of this task(page-faulted). */
|
|
page = find_get_page(mapping, pgoff);
|
|
|
|
#ifdef CONFIG_SWAP
|
|
/* shmem/tmpfs may report page out on swap: account for that too. */
|
|
if (radix_tree_exceptional_entry(page)) {
|
|
swp_entry_t swap = radix_to_swp_entry(page);
|
|
if (do_swap_account)
|
|
*entry = swap;
|
|
page = find_get_page(swap_address_space(swap), swap.val);
|
|
}
|
|
#endif
|
|
return page;
|
|
}
|
|
|
|
static enum mc_target_type get_mctgt_type(struct vm_area_struct *vma,
|
|
unsigned long addr, pte_t ptent, union mc_target *target)
|
|
{
|
|
struct page *page = NULL;
|
|
struct page_cgroup *pc;
|
|
enum mc_target_type ret = MC_TARGET_NONE;
|
|
swp_entry_t ent = { .val = 0 };
|
|
|
|
if (pte_present(ptent))
|
|
page = mc_handle_present_pte(vma, addr, ptent);
|
|
else if (is_swap_pte(ptent))
|
|
page = mc_handle_swap_pte(vma, addr, ptent, &ent);
|
|
else if (pte_none(ptent) || pte_file(ptent))
|
|
page = mc_handle_file_pte(vma, addr, ptent, &ent);
|
|
|
|
if (!page && !ent.val)
|
|
return ret;
|
|
if (page) {
|
|
pc = lookup_page_cgroup(page);
|
|
/*
|
|
* Do only loose check w/o page_cgroup lock.
|
|
* mem_cgroup_move_account() checks the pc is valid or not under
|
|
* the lock.
|
|
*/
|
|
if (PageCgroupUsed(pc) && pc->mem_cgroup == mc.from) {
|
|
ret = MC_TARGET_PAGE;
|
|
if (target)
|
|
target->page = page;
|
|
}
|
|
if (!ret || !target)
|
|
put_page(page);
|
|
}
|
|
/* There is a swap entry and a page doesn't exist or isn't charged */
|
|
if (ent.val && !ret &&
|
|
css_id(&mc.from->css) == lookup_swap_cgroup_id(ent)) {
|
|
ret = MC_TARGET_SWAP;
|
|
if (target)
|
|
target->ent = ent;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
|
/*
|
|
* We don't consider swapping or file mapped pages because THP does not
|
|
* support them for now.
|
|
* Caller should make sure that pmd_trans_huge(pmd) is true.
|
|
*/
|
|
static enum mc_target_type get_mctgt_type_thp(struct vm_area_struct *vma,
|
|
unsigned long addr, pmd_t pmd, union mc_target *target)
|
|
{
|
|
struct page *page = NULL;
|
|
struct page_cgroup *pc;
|
|
enum mc_target_type ret = MC_TARGET_NONE;
|
|
|
|
page = pmd_page(pmd);
|
|
VM_BUG_ON(!page || !PageHead(page));
|
|
if (!move_anon())
|
|
return ret;
|
|
pc = lookup_page_cgroup(page);
|
|
if (PageCgroupUsed(pc) && pc->mem_cgroup == mc.from) {
|
|
ret = MC_TARGET_PAGE;
|
|
if (target) {
|
|
get_page(page);
|
|
target->page = page;
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
#else
|
|
static inline enum mc_target_type get_mctgt_type_thp(struct vm_area_struct *vma,
|
|
unsigned long addr, pmd_t pmd, union mc_target *target)
|
|
{
|
|
return MC_TARGET_NONE;
|
|
}
|
|
#endif
|
|
|
|
static int mem_cgroup_count_precharge_pte_range(pmd_t *pmd,
|
|
unsigned long addr, unsigned long end,
|
|
struct mm_walk *walk)
|
|
{
|
|
struct vm_area_struct *vma = walk->private;
|
|
pte_t *pte;
|
|
spinlock_t *ptl;
|
|
|
|
if (pmd_trans_huge_lock(pmd, vma) == 1) {
|
|
if (get_mctgt_type_thp(vma, addr, *pmd, NULL) == MC_TARGET_PAGE)
|
|
mc.precharge += HPAGE_PMD_NR;
|
|
spin_unlock(&vma->vm_mm->page_table_lock);
|
|
return 0;
|
|
}
|
|
|
|
if (pmd_trans_unstable(pmd))
|
|
return 0;
|
|
pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
|
|
for (; addr != end; pte++, addr += PAGE_SIZE)
|
|
if (get_mctgt_type(vma, addr, *pte, NULL))
|
|
mc.precharge++; /* increment precharge temporarily */
|
|
pte_unmap_unlock(pte - 1, ptl);
|
|
cond_resched();
|
|
|
|
return 0;
|
|
}
|
|
|
|
static unsigned long mem_cgroup_count_precharge(struct mm_struct *mm)
|
|
{
|
|
unsigned long precharge;
|
|
struct vm_area_struct *vma;
|
|
|
|
down_read(&mm->mmap_sem);
|
|
for (vma = mm->mmap; vma; vma = vma->vm_next) {
|
|
struct mm_walk mem_cgroup_count_precharge_walk = {
|
|
.pmd_entry = mem_cgroup_count_precharge_pte_range,
|
|
.mm = mm,
|
|
.private = vma,
|
|
};
|
|
if (is_vm_hugetlb_page(vma))
|
|
continue;
|
|
walk_page_range(vma->vm_start, vma->vm_end,
|
|
&mem_cgroup_count_precharge_walk);
|
|
}
|
|
up_read(&mm->mmap_sem);
|
|
|
|
precharge = mc.precharge;
|
|
mc.precharge = 0;
|
|
|
|
return precharge;
|
|
}
|
|
|
|
static int mem_cgroup_precharge_mc(struct mm_struct *mm)
|
|
{
|
|
unsigned long precharge = mem_cgroup_count_precharge(mm);
|
|
|
|
VM_BUG_ON(mc.moving_task);
|
|
mc.moving_task = current;
|
|
return mem_cgroup_do_precharge(precharge);
|
|
}
|
|
|
|
/* cancels all extra charges on mc.from and mc.to, and wakes up all waiters. */
|
|
static void __mem_cgroup_clear_mc(void)
|
|
{
|
|
struct mem_cgroup *from = mc.from;
|
|
struct mem_cgroup *to = mc.to;
|
|
|
|
/* we must uncharge all the leftover precharges from mc.to */
|
|
if (mc.precharge) {
|
|
__mem_cgroup_cancel_charge(mc.to, mc.precharge);
|
|
mc.precharge = 0;
|
|
}
|
|
/*
|
|
* we didn't uncharge from mc.from at mem_cgroup_move_account(), so
|
|
* we must uncharge here.
|
|
*/
|
|
if (mc.moved_charge) {
|
|
__mem_cgroup_cancel_charge(mc.from, mc.moved_charge);
|
|
mc.moved_charge = 0;
|
|
}
|
|
/* we must fixup refcnts and charges */
|
|
if (mc.moved_swap) {
|
|
/* uncharge swap account from the old cgroup */
|
|
if (!mem_cgroup_is_root(mc.from))
|
|
res_counter_uncharge(&mc.from->memsw,
|
|
PAGE_SIZE * mc.moved_swap);
|
|
__mem_cgroup_put(mc.from, mc.moved_swap);
|
|
|
|
if (!mem_cgroup_is_root(mc.to)) {
|
|
/*
|
|
* we charged both to->res and to->memsw, so we should
|
|
* uncharge to->res.
|
|
*/
|
|
res_counter_uncharge(&mc.to->res,
|
|
PAGE_SIZE * mc.moved_swap);
|
|
}
|
|
/* we've already done mem_cgroup_get(mc.to) */
|
|
mc.moved_swap = 0;
|
|
}
|
|
memcg_oom_recover(from);
|
|
memcg_oom_recover(to);
|
|
wake_up_all(&mc.waitq);
|
|
}
|
|
|
|
static void mem_cgroup_clear_mc(void)
|
|
{
|
|
struct mem_cgroup *from = mc.from;
|
|
|
|
/*
|
|
* we must clear moving_task before waking up waiters at the end of
|
|
* task migration.
|
|
*/
|
|
mc.moving_task = NULL;
|
|
__mem_cgroup_clear_mc();
|
|
spin_lock(&mc.lock);
|
|
mc.from = NULL;
|
|
mc.to = NULL;
|
|
spin_unlock(&mc.lock);
|
|
mem_cgroup_end_move(from);
|
|
}
|
|
|
|
static int mem_cgroup_can_attach(struct cgroup *cgroup,
|
|
struct cgroup_taskset *tset)
|
|
{
|
|
struct task_struct *p = cgroup_taskset_first(tset);
|
|
int ret = 0;
|
|
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgroup);
|
|
unsigned long move_charge_at_immigrate;
|
|
|
|
/*
|
|
* We are now commited to this value whatever it is. Changes in this
|
|
* tunable will only affect upcoming migrations, not the current one.
|
|
* So we need to save it, and keep it going.
|
|
*/
|
|
move_charge_at_immigrate = memcg->move_charge_at_immigrate;
|
|
if (move_charge_at_immigrate) {
|
|
struct mm_struct *mm;
|
|
struct mem_cgroup *from = mem_cgroup_from_task(p);
|
|
|
|
VM_BUG_ON(from == memcg);
|
|
|
|
mm = get_task_mm(p);
|
|
if (!mm)
|
|
return 0;
|
|
/* We move charges only when we move a owner of the mm */
|
|
if (mm->owner == p) {
|
|
VM_BUG_ON(mc.from);
|
|
VM_BUG_ON(mc.to);
|
|
VM_BUG_ON(mc.precharge);
|
|
VM_BUG_ON(mc.moved_charge);
|
|
VM_BUG_ON(mc.moved_swap);
|
|
mem_cgroup_start_move(from);
|
|
spin_lock(&mc.lock);
|
|
mc.from = from;
|
|
mc.to = memcg;
|
|
mc.immigrate_flags = move_charge_at_immigrate;
|
|
spin_unlock(&mc.lock);
|
|
/* We set mc.moving_task later */
|
|
|
|
ret = mem_cgroup_precharge_mc(mm);
|
|
if (ret)
|
|
mem_cgroup_clear_mc();
|
|
}
|
|
mmput(mm);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static void mem_cgroup_cancel_attach(struct cgroup *cgroup,
|
|
struct cgroup_taskset *tset)
|
|
{
|
|
mem_cgroup_clear_mc();
|
|
}
|
|
|
|
static int mem_cgroup_move_charge_pte_range(pmd_t *pmd,
|
|
unsigned long addr, unsigned long end,
|
|
struct mm_walk *walk)
|
|
{
|
|
int ret = 0;
|
|
struct vm_area_struct *vma = walk->private;
|
|
pte_t *pte;
|
|
spinlock_t *ptl;
|
|
enum mc_target_type target_type;
|
|
union mc_target target;
|
|
struct page *page;
|
|
struct page_cgroup *pc;
|
|
|
|
/*
|
|
* We don't take compound_lock() here but no race with splitting thp
|
|
* happens because:
|
|
* - if pmd_trans_huge_lock() returns 1, the relevant thp is not
|
|
* under splitting, which means there's no concurrent thp split,
|
|
* - if another thread runs into split_huge_page() just after we
|
|
* entered this if-block, the thread must wait for page table lock
|
|
* to be unlocked in __split_huge_page_splitting(), where the main
|
|
* part of thp split is not executed yet.
|
|
*/
|
|
if (pmd_trans_huge_lock(pmd, vma) == 1) {
|
|
if (mc.precharge < HPAGE_PMD_NR) {
|
|
spin_unlock(&vma->vm_mm->page_table_lock);
|
|
return 0;
|
|
}
|
|
target_type = get_mctgt_type_thp(vma, addr, *pmd, &target);
|
|
if (target_type == MC_TARGET_PAGE) {
|
|
page = target.page;
|
|
if (!isolate_lru_page(page)) {
|
|
pc = lookup_page_cgroup(page);
|
|
if (!mem_cgroup_move_account(page, HPAGE_PMD_NR,
|
|
pc, mc.from, mc.to)) {
|
|
mc.precharge -= HPAGE_PMD_NR;
|
|
mc.moved_charge += HPAGE_PMD_NR;
|
|
}
|
|
putback_lru_page(page);
|
|
}
|
|
put_page(page);
|
|
}
|
|
spin_unlock(&vma->vm_mm->page_table_lock);
|
|
return 0;
|
|
}
|
|
|
|
if (pmd_trans_unstable(pmd))
|
|
return 0;
|
|
retry:
|
|
pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
|
|
for (; addr != end; addr += PAGE_SIZE) {
|
|
pte_t ptent = *(pte++);
|
|
swp_entry_t ent;
|
|
|
|
if (!mc.precharge)
|
|
break;
|
|
|
|
switch (get_mctgt_type(vma, addr, ptent, &target)) {
|
|
case MC_TARGET_PAGE:
|
|
page = target.page;
|
|
if (isolate_lru_page(page))
|
|
goto put;
|
|
pc = lookup_page_cgroup(page);
|
|
if (!mem_cgroup_move_account(page, 1, pc,
|
|
mc.from, mc.to)) {
|
|
mc.precharge--;
|
|
/* we uncharge from mc.from later. */
|
|
mc.moved_charge++;
|
|
}
|
|
putback_lru_page(page);
|
|
put: /* get_mctgt_type() gets the page */
|
|
put_page(page);
|
|
break;
|
|
case MC_TARGET_SWAP:
|
|
ent = target.ent;
|
|
if (!mem_cgroup_move_swap_account(ent, mc.from, mc.to)) {
|
|
mc.precharge--;
|
|
/* we fixup refcnts and charges later. */
|
|
mc.moved_swap++;
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
pte_unmap_unlock(pte - 1, ptl);
|
|
cond_resched();
|
|
|
|
if (addr != end) {
|
|
/*
|
|
* We have consumed all precharges we got in can_attach().
|
|
* We try charge one by one, but don't do any additional
|
|
* charges to mc.to if we have failed in charge once in attach()
|
|
* phase.
|
|
*/
|
|
ret = mem_cgroup_do_precharge(1);
|
|
if (!ret)
|
|
goto retry;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void mem_cgroup_move_charge(struct mm_struct *mm)
|
|
{
|
|
struct vm_area_struct *vma;
|
|
|
|
lru_add_drain_all();
|
|
retry:
|
|
if (unlikely(!down_read_trylock(&mm->mmap_sem))) {
|
|
/*
|
|
* Someone who are holding the mmap_sem might be waiting in
|
|
* waitq. So we cancel all extra charges, wake up all waiters,
|
|
* and retry. Because we cancel precharges, we might not be able
|
|
* to move enough charges, but moving charge is a best-effort
|
|
* feature anyway, so it wouldn't be a big problem.
|
|
*/
|
|
__mem_cgroup_clear_mc();
|
|
cond_resched();
|
|
goto retry;
|
|
}
|
|
for (vma = mm->mmap; vma; vma = vma->vm_next) {
|
|
int ret;
|
|
struct mm_walk mem_cgroup_move_charge_walk = {
|
|
.pmd_entry = mem_cgroup_move_charge_pte_range,
|
|
.mm = mm,
|
|
.private = vma,
|
|
};
|
|
if (is_vm_hugetlb_page(vma))
|
|
continue;
|
|
ret = walk_page_range(vma->vm_start, vma->vm_end,
|
|
&mem_cgroup_move_charge_walk);
|
|
if (ret)
|
|
/*
|
|
* means we have consumed all precharges and failed in
|
|
* doing additional charge. Just abandon here.
|
|
*/
|
|
break;
|
|
}
|
|
up_read(&mm->mmap_sem);
|
|
}
|
|
|
|
static void mem_cgroup_move_task(struct cgroup *cont,
|
|
struct cgroup_taskset *tset)
|
|
{
|
|
struct task_struct *p = cgroup_taskset_first(tset);
|
|
struct mm_struct *mm = get_task_mm(p);
|
|
|
|
if (mm) {
|
|
if (mc.to)
|
|
mem_cgroup_move_charge(mm);
|
|
mmput(mm);
|
|
}
|
|
if (mc.to)
|
|
mem_cgroup_clear_mc();
|
|
}
|
|
#else /* !CONFIG_MMU */
|
|
static int mem_cgroup_can_attach(struct cgroup *cgroup,
|
|
struct cgroup_taskset *tset)
|
|
{
|
|
return 0;
|
|
}
|
|
static void mem_cgroup_cancel_attach(struct cgroup *cgroup,
|
|
struct cgroup_taskset *tset)
|
|
{
|
|
}
|
|
static void mem_cgroup_move_task(struct cgroup *cont,
|
|
struct cgroup_taskset *tset)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
static int mem_cgroup_allow_attach(struct cgroup *cgrp,
|
|
struct cgroup_taskset *tset)
|
|
{
|
|
const struct cred *cred = current_cred(), *tcred;
|
|
struct task_struct *task;
|
|
|
|
cgroup_taskset_for_each(task, cgrp, tset) {
|
|
tcred = __task_cred(task);
|
|
|
|
if ((current != task) && !capable(CAP_SYS_ADMIN) &&
|
|
cred->euid != tcred->uid && cred->euid != tcred->suid)
|
|
return -EACCES;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Cgroup retains root cgroups across [un]mount cycles making it necessary
|
|
* to verify sane_behavior flag on each mount attempt.
|
|
*/
|
|
static void mem_cgroup_bind(struct cgroup *root)
|
|
{
|
|
/*
|
|
* use_hierarchy is forced with sane_behavior. cgroup core
|
|
* guarantees that @root doesn't have any children, so turning it
|
|
* on for the root memcg is enough.
|
|
*/
|
|
if (cgroup_sane_behavior(root))
|
|
mem_cgroup_from_cont(root)->use_hierarchy = true;
|
|
}
|
|
|
|
struct cgroup_subsys mem_cgroup_subsys = {
|
|
.name = "memory",
|
|
.subsys_id = mem_cgroup_subsys_id,
|
|
.css_alloc = mem_cgroup_css_alloc,
|
|
.css_online = mem_cgroup_css_online,
|
|
.css_offline = mem_cgroup_css_offline,
|
|
.css_free = mem_cgroup_css_free,
|
|
.can_attach = mem_cgroup_can_attach,
|
|
.cancel_attach = mem_cgroup_cancel_attach,
|
|
.attach = mem_cgroup_move_task,
|
|
.allow_attach = mem_cgroup_allow_attach,
|
|
.bind = mem_cgroup_bind,
|
|
.base_cftypes = mem_cgroup_files,
|
|
.early_init = 0,
|
|
.use_id = 1,
|
|
};
|
|
|
|
#ifdef CONFIG_MEMCG_SWAP
|
|
static int __init enable_swap_account(char *s)
|
|
{
|
|
/* consider enabled if no parameter or 1 is given */
|
|
if (!strcmp(s, "1"))
|
|
really_do_swap_account = 1;
|
|
else if (!strcmp(s, "0"))
|
|
really_do_swap_account = 0;
|
|
return 1;
|
|
}
|
|
__setup("swapaccount=", enable_swap_account);
|
|
|
|
static void __init memsw_file_init(void)
|
|
{
|
|
WARN_ON(cgroup_add_cftypes(&mem_cgroup_subsys, memsw_cgroup_files));
|
|
}
|
|
|
|
static void __init enable_swap_cgroup(void)
|
|
{
|
|
if (!mem_cgroup_disabled() && really_do_swap_account) {
|
|
do_swap_account = 1;
|
|
memsw_file_init();
|
|
}
|
|
}
|
|
|
|
#else
|
|
static void __init enable_swap_cgroup(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* subsys_initcall() for memory controller.
|
|
*
|
|
* Some parts like hotcpu_notifier() have to be initialized from this context
|
|
* because of lock dependencies (cgroup_lock -> cpu hotplug) but basically
|
|
* everything that doesn't depend on a specific mem_cgroup structure should
|
|
* be initialized from here.
|
|
*/
|
|
static int __init mem_cgroup_init(void)
|
|
{
|
|
hotcpu_notifier(memcg_cpu_hotplug_callback, 0);
|
|
enable_swap_cgroup();
|
|
mem_cgroup_soft_limit_tree_init();
|
|
memcg_stock_init();
|
|
return 0;
|
|
}
|
|
subsys_initcall(mem_cgroup_init);
|