Changes in 4.9.203 ax88172a: fix information leak on short answers slip: Fix memory leak in slip_open error path ALSA: usb-audio: Fix missing error check at mixer resolution test ALSA: usb-audio: not submit urb for stopped endpoint Input: ff-memless - kill timer in destroy() Input: synaptics-rmi4 - fix video buffer size Input: synaptics-rmi4 - clear IRQ enables for F54 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing IB/hfi1: Ensure full Gen3 speed in a Gen4 system ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() mmc: sdhci-of-at91: fix quirk2 overwrite ath10k: fix kernel panic by moving pci flush after napi_disable iio: dac: mcp4922: fix error handling in mcp4922_write_raw ALSA: pcm: signedness bug in snd_pcm_plug_alloc() arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45 cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set ALSA: seq: Do error checks at creating system ports ath9k: fix tx99 with monitor mode interface gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated ASoC: dpcm: Properly initialise hw->rate_max MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3 ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks i40e: use correct length for strncpy i40e: hold the rtnl lock on clearing interrupt scheme i40e: Prevent deleting MAC address from VF when set by PF IB/rxe: fixes for rdma read retry iwlwifi: mvm: avoid sending too many BARs ARM: dts: pxa: fix power i2c base address rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument net: lan78xx: Bail out if lan78xx_get_endpoints fails ASoC: sgtl5000: avoid division by zero if lo_vag is zero ARM: dts: exynos: Disable pull control for S5M8767 PMIC ath10k: wmi: disable softirq's while calling ieee80211_rx mips: txx9: fix iounmap related issue ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files ARM: dts: omap3-gta04: fixes for tvout / venc ARM: dts: omap3-gta04: tvout: enable as display1 alias ARM: dts: omap3-gta04: fix touchscreen tsc2007 ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot ARM: dts: omap3-gta04: keep vpll2 always on dmaengine: dma-jz4780: Don't depend on MACH_JZ4780 dmaengine: dma-jz4780: Further residue status fix ath9k: add back support for using active monitor interfaces for tx99 signal: Always ignore SIGKILL and SIGSTOP sent to the global init signal: Properly deliver SIGILL from uprobes signal: Properly deliver SIGSEGV from x86 uprobes f2fs: fix memory leak of percpu counter in fill_super() scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir() ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set scsi: pm80xx: Corrected dma_unmap_sg() parameter scsi: pm80xx: Fixed system hang issue during kexec boot kprobes: Don't call BUG_ON() if there is a kprobe in use on free list nvmem: core: return error code instead of NULL from nvmem_device_get media: fix: media: pci: meye: validate offset to avoid arbitrary access media: dvb: fix compat ioctl translation ALSA: intel8x0m: Register irq handler after register initializations pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map() llc: avoid blocking in llc_sap_close() ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value powerpc/vdso: Correct call frame information ARM: dts: socfpga: Fix I2C bus unit-address error pinctrl: at91: don't use the same irqchip with multiple gpiochips cxgb4: Fix endianness issue in t4_fwcache() power: supply: ab8500_fg: silence uninitialized variable warnings power: reset: at91-poweroff: do not procede if at91_shdwc is allocated power: supply: max8998-charger: Fix platform data retrieval component: fix loop condition to call unbind() if bind() fails kernfs: Fix range checks in kernfs_get_target_path ip_gre: fix parsing gre header in ipgre_err ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 ath9k: Fix a locking bug in ath9k_add_interface() s390/qeth: invoke softirqs after napi_schedule() PCI/ACPI: Correct error message for ASPM disabling serial: mxs-auart: Fix potential infinite loop powerpc/iommu: Avoid derefence before pointer check powerpc/64s/hash: Fix stab_rr off by one initialization powerpc/pseries: Disable CPU hotplug across migrations RDMA/i40iw: Fix incorrect iterator type libfdt: Ensure INT_MAX is defined in libfdt_env.h power: supply: twl4030_charger: fix charging current out-of-bounds power: supply: twl4030_charger: disable eoc interrupt on linear charge net: toshiba: fix return type of ndo_start_xmit function net: xilinx: fix return type of ndo_start_xmit function net: broadcom: fix return type of ndo_start_xmit function net: amd: fix return type of ndo_start_xmit function usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started usb: chipidea: Fix otg event handler mlxsw: spectrum: Init shaper for TCs 8..15 ARM: dts: am335x-evm: fix number of cpsw f2fs: fix to recover inode's uid/gid during POR ARM: dts: ux500: Correct SCU unit address ARM: dts: ux500: Fix LCDA clock line muxing ARM: dts: ste: Fix SPI controller node names spi: pic32: Use proper enum in dmaengine_prep_slave_rg cpufeature: avoid warning when compiling with clang ARM: dts: marvell: Fix SPI and I2C bus warnings bnx2x: Ignore bandwidth attention in single function mode net: micrel: fix return type of ndo_start_xmit function x86/CPU: Use correct macros for Cyrix calls MIPS: kexec: Relax memory restriction media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init() media: au0828: Fix incorrect error messages media: davinci: Fix implicit enum conversion warning usb: gadget: uvc: configfs: Drop leaked references to config items usb: gadget: uvc: configfs: Prevent format changes after linking header phy: phy-twl4030-usb: fix denied runtime access usb: gadget: uvc: Factor out video USB request queueing usb: gadget: uvc: Only halt video streaming endpoint in bulk mode coresight: Fix handling of sinks coresight: etm4x: Configure EL2 exception level when kernel is running in HYP coresight: tmc: Fix byte-address alignment for RRP misc: kgdbts: Fix restrict error misc: genwqe: should return proper error value. vfio/pci: Fix potential memory leak in vfio_msi_cap_len vfio/pci: Mask buggy SR-IOV VF INTx support scsi: libsas: always unregister the old device if going to discover new ARM: dts: tegra30: fix xcvr-setup-use-fuses ARM: tegra: apalis_t30: fix mmc1 cmd pull-up ARM: dts: paz00: fix wakeup gpio keycode net: smsc: fix return type of ndo_start_xmit function EDAC: Raise the maximum number of memory controllers ARM: dts: realview: Fix SPI controller node names Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS crypto: s5p-sss: Fix Fix argument list alignment crypto: fix a memory leak in rsa-kcs1pad's encryption mode scsi: NCR5380: Clear all unissued commands on host reset scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data scsi: NCR5380: Check for invalid reselection target scsi: NCR5380: Don't clear busy flag when abort fails scsi: NCR5380: Don't call dsprintk() following reselection interrupt scsi: NCR5380: Handle BUS FREE during reselection arm64: dts: amd: Fix SPI bus warnings arm64: dts: lg: Fix SPI controller node names ARM: dts: lpc32xx: Fix SPI controller node names usb: xhci-mtk: fix ISOC error when interval is zero fuse: use READ_ONCE on congestion_threshold and max_background IB/iser: Fix possible NULL deref at iser_inv_desc() memfd: Use radix_tree_deref_slot_protected to avoid the warning. slcan: Fix memory leak in error path net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size() x86/atomic: Fix smp_mb__{before,after}_atomic() kprobes/x86: Prohibit probing on exception masking instructions uprobes/x86: Prohibit probing on MOV SS instruction fbdev: Ditch fb_edid_add_monspecs block: introduce blk_rq_is_passthrough libata: have ata_scsi_rw_xlat() fail invalid passthrough requests net: ovs: fix return type of ndo_start_xmit function net: xen-netback: fix return type of ndo_start_xmit function ARM: dts: omap5: enable OTG role for DWC3 controller f2fs: return correct errno in f2fs_gc SUNRPC: Fix priority queue fairness kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table arm64/numa: Report correct memblock range for the dummy node ath10k: fix vdev-start timeout on error ata: ahci_brcm: Allow using driver or DSL SoCs ath9k: fix reporting calculated new FFT upper max usb: gadget: udc: fotg210-udc: Fix a sleep-in-atomic-context bug in fotg210_get_status() nl80211: Fix a GET_KEY reply attribute dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction dmaengine: timb_dma: Use proper enum in td_prep_slave_sg mei: samples: fix a signedness bug in amt_host_if_call() cxgb4: Use proper enum in cxgb4_dcb_handle_fw_update cxgb4: Use proper enum in IEEE_FAUX_SYNC powerpc/pseries: Fix DTL buffer registration powerpc/pseries: Fix how we iterate over the DTL entries mtd: rawnand: sh_flctl: Use proper enum for flctl_dma_fifo0_transfer ixgbe: Fix crash with VFs and flow director on interface flap IB/mthca: Fix error return code in __mthca_init_one() IB/mlx4: Avoid implicit enumerated type conversion ACPICA: Never run _REG on system_memory and system_IO ata: ep93xx: Use proper enums for directions media: pxa_camera: Fix check for pdev->dev.of_node ALSA: hda/sigmatel - Disable automute for Elo VuPoint KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR USB: serial: cypress_m8: fix interrupt-out transfer length mtd: physmap_of: Release resources on error cpu/SMT: State SMT is disabled even with nosmt and without "=force" brcmfmac: reduce timeout for action frame scan brcmfmac: fix full timeout waiting for action frame on-channel tx clk: samsung: Use clk_hw API for calling clk framework from clk notifiers i2c: brcmstb: Allow enabling the driver on DSL SoCs NFSv4.x: fix lock recovery during delegation recall dmaengine: ioat: fix prototype of ioat_enumerate_channels Input: st1232 - set INPUT_PROP_DIRECT property Input: silead - try firmware reload after unsuccessful resume x86/olpc: Fix build error with CONFIG_MFD_CS5535=m crypto: mxs-dcp - Fix SHA null hashes and output length crypto: mxs-dcp - Fix AES issues ACPI / SBS: Fix rare oops when removing modules iwlwifi: mvm: don't send keys when entering D3 fbdev: sbuslib: use checked version of put_user() fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper() reset: Fix potential use-after-free in __of_reset_control_get() bcache: recal cached_dev_sectors on detach s390/kasan: avoid vdso instrumentation proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted() backlight: lm3639: Unconditionally call led_classdev_unregister mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup capable printk: Give error on attempt to set log buffer length to over 2G media: isif: fix a NULL pointer dereference bug GFS2: Flush the GFS2 delete workqueue before stopping the kernel threads media: cx231xx: fix potential sign-extension overflow on large shift x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error gpio: syscon: Fix possible NULL ptr usage spi: spidev: Fix OF tree warning logic ARM: 8802/1: Call syscall_trace_exit even when system call skipped orangefs: rate limit the client not running info message hwmon: (pwm-fan) Silence error on probe deferral hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros misc: cxl: Fix possible null pointer dereference mac80211: minstrel: fix CCK rate group streams value spi: rockchip: initialize dma_slave_config properly ARM: dts: omap5: Fix dual-role mode on Super-Speed port arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault Linux 4.9.203 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
441 lines
11 KiB
C
441 lines
11 KiB
C
/*
|
|
*
|
|
* Copyright IBM Corporation, 2012
|
|
* Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of version 2.1 of the GNU Lesser General Public License
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it would be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
*
|
|
*/
|
|
|
|
#include <linux/cgroup.h>
|
|
#include <linux/page_counter.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/hugetlb.h>
|
|
#include <linux/hugetlb_cgroup.h>
|
|
|
|
struct hugetlb_cgroup {
|
|
struct cgroup_subsys_state css;
|
|
/*
|
|
* the counter to account for hugepages from hugetlb.
|
|
*/
|
|
struct page_counter hugepage[HUGE_MAX_HSTATE];
|
|
};
|
|
|
|
#define MEMFILE_PRIVATE(x, val) (((x) << 16) | (val))
|
|
#define MEMFILE_IDX(val) (((val) >> 16) & 0xffff)
|
|
#define MEMFILE_ATTR(val) ((val) & 0xffff)
|
|
|
|
static struct hugetlb_cgroup *root_h_cgroup __read_mostly;
|
|
|
|
static inline
|
|
struct hugetlb_cgroup *hugetlb_cgroup_from_css(struct cgroup_subsys_state *s)
|
|
{
|
|
return s ? container_of(s, struct hugetlb_cgroup, css) : NULL;
|
|
}
|
|
|
|
static inline
|
|
struct hugetlb_cgroup *hugetlb_cgroup_from_task(struct task_struct *task)
|
|
{
|
|
return hugetlb_cgroup_from_css(task_css(task, hugetlb_cgrp_id));
|
|
}
|
|
|
|
static inline bool hugetlb_cgroup_is_root(struct hugetlb_cgroup *h_cg)
|
|
{
|
|
return (h_cg == root_h_cgroup);
|
|
}
|
|
|
|
static inline struct hugetlb_cgroup *
|
|
parent_hugetlb_cgroup(struct hugetlb_cgroup *h_cg)
|
|
{
|
|
return hugetlb_cgroup_from_css(h_cg->css.parent);
|
|
}
|
|
|
|
static inline bool hugetlb_cgroup_have_usage(struct hugetlb_cgroup *h_cg)
|
|
{
|
|
int idx;
|
|
|
|
for (idx = 0; idx < hugetlb_max_hstate; idx++) {
|
|
if (page_counter_read(&h_cg->hugepage[idx]))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
static void hugetlb_cgroup_init(struct hugetlb_cgroup *h_cgroup,
|
|
struct hugetlb_cgroup *parent_h_cgroup)
|
|
{
|
|
int idx;
|
|
|
|
for (idx = 0; idx < HUGE_MAX_HSTATE; idx++) {
|
|
struct page_counter *counter = &h_cgroup->hugepage[idx];
|
|
struct page_counter *parent = NULL;
|
|
unsigned long limit;
|
|
int ret;
|
|
|
|
if (parent_h_cgroup)
|
|
parent = &parent_h_cgroup->hugepage[idx];
|
|
page_counter_init(counter, parent);
|
|
|
|
limit = round_down(PAGE_COUNTER_MAX,
|
|
1 << huge_page_order(&hstates[idx]));
|
|
ret = page_counter_limit(counter, limit);
|
|
VM_BUG_ON(ret);
|
|
}
|
|
}
|
|
|
|
static struct cgroup_subsys_state *
|
|
hugetlb_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
|
|
{
|
|
struct hugetlb_cgroup *parent_h_cgroup = hugetlb_cgroup_from_css(parent_css);
|
|
struct hugetlb_cgroup *h_cgroup;
|
|
|
|
h_cgroup = kzalloc(sizeof(*h_cgroup), GFP_KERNEL);
|
|
if (!h_cgroup)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
if (!parent_h_cgroup)
|
|
root_h_cgroup = h_cgroup;
|
|
|
|
hugetlb_cgroup_init(h_cgroup, parent_h_cgroup);
|
|
return &h_cgroup->css;
|
|
}
|
|
|
|
static void hugetlb_cgroup_css_free(struct cgroup_subsys_state *css)
|
|
{
|
|
struct hugetlb_cgroup *h_cgroup;
|
|
|
|
h_cgroup = hugetlb_cgroup_from_css(css);
|
|
kfree(h_cgroup);
|
|
}
|
|
|
|
|
|
/*
|
|
* Should be called with hugetlb_lock held.
|
|
* Since we are holding hugetlb_lock, pages cannot get moved from
|
|
* active list or uncharged from the cgroup, So no need to get
|
|
* page reference and test for page active here. This function
|
|
* cannot fail.
|
|
*/
|
|
static void hugetlb_cgroup_move_parent(int idx, struct hugetlb_cgroup *h_cg,
|
|
struct page *page)
|
|
{
|
|
unsigned int nr_pages;
|
|
struct page_counter *counter;
|
|
struct hugetlb_cgroup *page_hcg;
|
|
struct hugetlb_cgroup *parent = parent_hugetlb_cgroup(h_cg);
|
|
|
|
page_hcg = hugetlb_cgroup_from_page(page);
|
|
/*
|
|
* We can have pages in active list without any cgroup
|
|
* ie, hugepage with less than 3 pages. We can safely
|
|
* ignore those pages.
|
|
*/
|
|
if (!page_hcg || page_hcg != h_cg)
|
|
goto out;
|
|
|
|
nr_pages = 1 << compound_order(page);
|
|
if (!parent) {
|
|
parent = root_h_cgroup;
|
|
/* root has no limit */
|
|
page_counter_charge(&parent->hugepage[idx], nr_pages);
|
|
}
|
|
counter = &h_cg->hugepage[idx];
|
|
/* Take the pages off the local counter */
|
|
page_counter_cancel(counter, nr_pages);
|
|
|
|
set_hugetlb_cgroup(page, parent);
|
|
out:
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Force the hugetlb cgroup to empty the hugetlb resources by moving them to
|
|
* the parent cgroup.
|
|
*/
|
|
static void hugetlb_cgroup_css_offline(struct cgroup_subsys_state *css)
|
|
{
|
|
struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_css(css);
|
|
struct hstate *h;
|
|
struct page *page;
|
|
int idx = 0;
|
|
|
|
do {
|
|
for_each_hstate(h) {
|
|
spin_lock(&hugetlb_lock);
|
|
list_for_each_entry(page, &h->hugepage_activelist, lru)
|
|
hugetlb_cgroup_move_parent(idx, h_cg, page);
|
|
|
|
spin_unlock(&hugetlb_lock);
|
|
idx++;
|
|
}
|
|
cond_resched();
|
|
} while (hugetlb_cgroup_have_usage(h_cg));
|
|
}
|
|
|
|
int hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages,
|
|
struct hugetlb_cgroup **ptr)
|
|
{
|
|
int ret = 0;
|
|
struct page_counter *counter;
|
|
struct hugetlb_cgroup *h_cg = NULL;
|
|
|
|
if (hugetlb_cgroup_disabled())
|
|
goto done;
|
|
/*
|
|
* We don't charge any cgroup if the compound page have less
|
|
* than 3 pages.
|
|
*/
|
|
if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
|
|
goto done;
|
|
again:
|
|
rcu_read_lock();
|
|
h_cg = hugetlb_cgroup_from_task(current);
|
|
if (!css_tryget(&h_cg->css)) {
|
|
rcu_read_unlock();
|
|
goto again;
|
|
}
|
|
rcu_read_unlock();
|
|
|
|
if (!page_counter_try_charge(&h_cg->hugepage[idx], nr_pages, &counter))
|
|
ret = -ENOMEM;
|
|
css_put(&h_cg->css);
|
|
done:
|
|
*ptr = h_cg;
|
|
return ret;
|
|
}
|
|
|
|
/* Should be called with hugetlb_lock held */
|
|
void hugetlb_cgroup_commit_charge(int idx, unsigned long nr_pages,
|
|
struct hugetlb_cgroup *h_cg,
|
|
struct page *page)
|
|
{
|
|
if (hugetlb_cgroup_disabled() || !h_cg)
|
|
return;
|
|
|
|
set_hugetlb_cgroup(page, h_cg);
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Should be called with hugetlb_lock held
|
|
*/
|
|
void hugetlb_cgroup_uncharge_page(int idx, unsigned long nr_pages,
|
|
struct page *page)
|
|
{
|
|
struct hugetlb_cgroup *h_cg;
|
|
|
|
if (hugetlb_cgroup_disabled())
|
|
return;
|
|
lockdep_assert_held(&hugetlb_lock);
|
|
h_cg = hugetlb_cgroup_from_page(page);
|
|
if (unlikely(!h_cg))
|
|
return;
|
|
set_hugetlb_cgroup(page, NULL);
|
|
page_counter_uncharge(&h_cg->hugepage[idx], nr_pages);
|
|
return;
|
|
}
|
|
|
|
void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
|
|
struct hugetlb_cgroup *h_cg)
|
|
{
|
|
if (hugetlb_cgroup_disabled() || !h_cg)
|
|
return;
|
|
|
|
if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
|
|
return;
|
|
|
|
page_counter_uncharge(&h_cg->hugepage[idx], nr_pages);
|
|
return;
|
|
}
|
|
|
|
enum {
|
|
RES_USAGE,
|
|
RES_LIMIT,
|
|
RES_MAX_USAGE,
|
|
RES_FAILCNT,
|
|
};
|
|
|
|
static u64 hugetlb_cgroup_read_u64(struct cgroup_subsys_state *css,
|
|
struct cftype *cft)
|
|
{
|
|
struct page_counter *counter;
|
|
struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_css(css);
|
|
|
|
counter = &h_cg->hugepage[MEMFILE_IDX(cft->private)];
|
|
|
|
switch (MEMFILE_ATTR(cft->private)) {
|
|
case RES_USAGE:
|
|
return (u64)page_counter_read(counter) * PAGE_SIZE;
|
|
case RES_LIMIT:
|
|
return (u64)counter->limit * PAGE_SIZE;
|
|
case RES_MAX_USAGE:
|
|
return (u64)counter->watermark * PAGE_SIZE;
|
|
case RES_FAILCNT:
|
|
return counter->failcnt;
|
|
default:
|
|
BUG();
|
|
}
|
|
}
|
|
|
|
static DEFINE_MUTEX(hugetlb_limit_mutex);
|
|
|
|
static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of,
|
|
char *buf, size_t nbytes, loff_t off)
|
|
{
|
|
int ret, idx;
|
|
unsigned long nr_pages;
|
|
struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_css(of_css(of));
|
|
|
|
if (hugetlb_cgroup_is_root(h_cg)) /* Can't set limit on root */
|
|
return -EINVAL;
|
|
|
|
buf = strstrip(buf);
|
|
ret = page_counter_memparse(buf, "-1", &nr_pages);
|
|
if (ret)
|
|
return ret;
|
|
|
|
idx = MEMFILE_IDX(of_cft(of)->private);
|
|
nr_pages = round_down(nr_pages, 1 << huge_page_order(&hstates[idx]));
|
|
|
|
switch (MEMFILE_ATTR(of_cft(of)->private)) {
|
|
case RES_LIMIT:
|
|
mutex_lock(&hugetlb_limit_mutex);
|
|
ret = page_counter_limit(&h_cg->hugepage[idx], nr_pages);
|
|
mutex_unlock(&hugetlb_limit_mutex);
|
|
break;
|
|
default:
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
return ret ?: nbytes;
|
|
}
|
|
|
|
static ssize_t hugetlb_cgroup_reset(struct kernfs_open_file *of,
|
|
char *buf, size_t nbytes, loff_t off)
|
|
{
|
|
int ret = 0;
|
|
struct page_counter *counter;
|
|
struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_css(of_css(of));
|
|
|
|
counter = &h_cg->hugepage[MEMFILE_IDX(of_cft(of)->private)];
|
|
|
|
switch (MEMFILE_ATTR(of_cft(of)->private)) {
|
|
case RES_MAX_USAGE:
|
|
page_counter_reset_watermark(counter);
|
|
break;
|
|
case RES_FAILCNT:
|
|
counter->failcnt = 0;
|
|
break;
|
|
default:
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
return ret ?: nbytes;
|
|
}
|
|
|
|
static char *mem_fmt(char *buf, int size, unsigned long hsize)
|
|
{
|
|
if (hsize >= (1UL << 30))
|
|
snprintf(buf, size, "%luGB", hsize >> 30);
|
|
else if (hsize >= (1UL << 20))
|
|
snprintf(buf, size, "%luMB", hsize >> 20);
|
|
else
|
|
snprintf(buf, size, "%luKB", hsize >> 10);
|
|
return buf;
|
|
}
|
|
|
|
static void __init __hugetlb_cgroup_file_init(int idx)
|
|
{
|
|
char buf[32];
|
|
struct cftype *cft;
|
|
struct hstate *h = &hstates[idx];
|
|
|
|
/* format the size */
|
|
mem_fmt(buf, 32, huge_page_size(h));
|
|
|
|
/* Add the limit file */
|
|
cft = &h->cgroup_files[0];
|
|
snprintf(cft->name, MAX_CFTYPE_NAME, "%s.limit_in_bytes", buf);
|
|
cft->private = MEMFILE_PRIVATE(idx, RES_LIMIT);
|
|
cft->read_u64 = hugetlb_cgroup_read_u64;
|
|
cft->write = hugetlb_cgroup_write;
|
|
|
|
/* Add the usage file */
|
|
cft = &h->cgroup_files[1];
|
|
snprintf(cft->name, MAX_CFTYPE_NAME, "%s.usage_in_bytes", buf);
|
|
cft->private = MEMFILE_PRIVATE(idx, RES_USAGE);
|
|
cft->read_u64 = hugetlb_cgroup_read_u64;
|
|
|
|
/* Add the MAX usage file */
|
|
cft = &h->cgroup_files[2];
|
|
snprintf(cft->name, MAX_CFTYPE_NAME, "%s.max_usage_in_bytes", buf);
|
|
cft->private = MEMFILE_PRIVATE(idx, RES_MAX_USAGE);
|
|
cft->write = hugetlb_cgroup_reset;
|
|
cft->read_u64 = hugetlb_cgroup_read_u64;
|
|
|
|
/* Add the failcntfile */
|
|
cft = &h->cgroup_files[3];
|
|
snprintf(cft->name, MAX_CFTYPE_NAME, "%s.failcnt", buf);
|
|
cft->private = MEMFILE_PRIVATE(idx, RES_FAILCNT);
|
|
cft->write = hugetlb_cgroup_reset;
|
|
cft->read_u64 = hugetlb_cgroup_read_u64;
|
|
|
|
/* NULL terminate the last cft */
|
|
cft = &h->cgroup_files[4];
|
|
memset(cft, 0, sizeof(*cft));
|
|
|
|
WARN_ON(cgroup_add_legacy_cftypes(&hugetlb_cgrp_subsys,
|
|
h->cgroup_files));
|
|
}
|
|
|
|
void __init hugetlb_cgroup_file_init(void)
|
|
{
|
|
struct hstate *h;
|
|
|
|
for_each_hstate(h) {
|
|
/*
|
|
* Add cgroup control files only if the huge page consists
|
|
* of more than two normal pages. This is because we use
|
|
* page[2].private for storing cgroup details.
|
|
*/
|
|
if (huge_page_order(h) >= HUGETLB_CGROUP_MIN_ORDER)
|
|
__hugetlb_cgroup_file_init(hstate_index(h));
|
|
}
|
|
}
|
|
|
|
/*
|
|
* hugetlb_lock will make sure a parallel cgroup rmdir won't happen
|
|
* when we migrate hugepages
|
|
*/
|
|
void hugetlb_cgroup_migrate(struct page *oldhpage, struct page *newhpage)
|
|
{
|
|
struct hugetlb_cgroup *h_cg;
|
|
struct hstate *h = page_hstate(oldhpage);
|
|
|
|
if (hugetlb_cgroup_disabled())
|
|
return;
|
|
|
|
VM_BUG_ON_PAGE(!PageHuge(oldhpage), oldhpage);
|
|
spin_lock(&hugetlb_lock);
|
|
h_cg = hugetlb_cgroup_from_page(oldhpage);
|
|
set_hugetlb_cgroup(oldhpage, NULL);
|
|
|
|
/* move the h_cg details to new cgroup */
|
|
set_hugetlb_cgroup(newhpage, h_cg);
|
|
list_move(&newhpage->lru, &h->hugepage_activelist);
|
|
spin_unlock(&hugetlb_lock);
|
|
return;
|
|
}
|
|
|
|
struct cgroup_subsys hugetlb_cgrp_subsys = {
|
|
.css_alloc = hugetlb_cgroup_css_alloc,
|
|
.css_offline = hugetlb_cgroup_css_offline,
|
|
.css_free = hugetlb_cgroup_css_free,
|
|
};
|